From ebfe55f909a21c498fe565868f55923cdf516629 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 17:13:31 +0100
Subject: [PATCH 001/100] fix: enable canvas webview scrolling on mobile nodes

---
 AGENTS.md                                          |  2 ++
 CHANGELOG.md                                       |  1 +
 .../com/steipete/clawdis/node/ui/RootScreen.kt     |  4 ++++
 apps/ios/Sources/Screen/ScreenController.swift     | 14 +++++++++++---
 apps/ios/Tests/ScreenControllerTests.swift         |  9 +++++++++
 src/canvas-host/a2ui/.bundle.hash                  |  2 +-
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index a8d574840..0abed7948 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -41,6 +41,8 @@
 - Also read the shared guardrails at `~/Projects/oracle/AGENTS.md` and `~/Projects/agent-scripts/AGENTS.MD` before making changes; align with any cross-repo rules noted there.
 - SwiftUI state management (iOS/macOS): prefer the `Observation` framework (`@Observable`, `@Bindable`) over `ObservableObject`/`@StateObject`; don’t introduce new `ObservableObject` unless required for compatibility, and migrate existing usages when touching related code.
 - **Restart apps:** “restart iOS/Android apps” means rebuild (recompile/install) and relaunch, not just kill/launch.
+- iOS Team ID lookup: `security find-identity -p codesigning -v` → use Apple Development (…) TEAMID. Fallback: `defaults read com.apple.dt.Xcode IDEProvisioningTeamIdentifiers`.
+- A2UI bundle hash: `src/canvas-host/a2ui/.bundle.hash` is auto-generated; regenerate via `pnpm canvas:a2ui:bundle` (or `scripts/bundle-a2ui.sh`) instead of manual conflict resolution.
 - Notary key file lives at `~/Library/CloudStorage/Dropbox/Backup/AppStore/AuthKey_NJF3NFGTS3.p8` (Sparkle keys live under `~/Library/CloudStorage/Dropbox/Backup/Sparkle`).
 - **Multi-agent safety:** do **not** create/apply/drop `git stash` entries unless Peter explicitly asks (this includes `git pull --rebase --autostash`). Assume other agents may be working; keep unrelated WIP untouched and avoid cross-cutting state changes.
 - **Multi-agent safety:** when Peter says "push", you may `git pull --rebase` to integrate latest changes (never discard other agents' work). When Peter says "commit", scope to your changes only. When Peter says "commit all", commit everything in grouped chunks.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27a8716b5..ab4509c82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Fixes
 - macOS: Voice Wake now fully tears down the Speech pipeline when disabled (cancel pending restarts, drop stale callbacks) to avoid high CPU in the background.
+- iOS/Android nodes: enable scrolling for loaded web pages in the Canvas WebView (default scaffold stays touch-first).
 
 ## 2.0.0-beta4 — 2025-12-27
 
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
index 4ee3afa1a..49bbee928 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
@@ -163,6 +163,10 @@ private fun CanvasView(viewModel: MainViewModel, modifier: Modifier = Modifier)
         // Some embedded web UIs (incl. the "background website") use localStorage/sessionStorage.
         settings.domStorageEnabled = true
         settings.mixedContentMode = WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE
+        isScrollContainer = true
+        overScrollMode = View.OVER_SCROLL_IF_CONTENT_SCROLLS
+        isVerticalScrollBarEnabled = true
+        isHorizontalScrollBarEnabled = true
         webViewClient =
           object : WebViewClient() {
             override fun onReceivedError(
diff --git a/apps/ios/Sources/Screen/ScreenController.swift b/apps/ios/Sources/Screen/ScreenController.swift
index 6b3003360..76a17d55a 100644
--- a/apps/ios/Sources/Screen/ScreenController.swift
+++ b/apps/ios/Sources/Screen/ScreenController.swift
@@ -43,9 +43,7 @@ final class ScreenController {
         self.webView.scrollView.contentInset = .zero
         self.webView.scrollView.scrollIndicatorInsets = .zero
         self.webView.scrollView.automaticallyAdjustsScrollIndicatorInsets = false
-        // Disable scroll to allow touch events to pass through to canvas
-        self.webView.scrollView.isScrollEnabled = false
-        self.webView.scrollView.bounces = false
+        self.applyScrollBehavior()
         self.webView.navigationDelegate = self.navigationDelegate
         self.navigationDelegate.controller = self
         a2uiActionHandler.controller = self
@@ -60,6 +58,7 @@ final class ScreenController {
 
     func reload() {
         let trimmed = self.urlString.trimmingCharacters(in: .whitespacesAndNewlines)
+        self.applyScrollBehavior()
         if trimmed.isEmpty {
             guard let url = Self.canvasScaffoldURL else { return }
             self.errorText = nil
@@ -250,6 +249,15 @@ final class ScreenController {
         return false
     }
 
+    private func applyScrollBehavior() {
+        let trimmed = self.urlString.trimmingCharacters(in: .whitespacesAndNewlines)
+        let allowScroll = !trimmed.isEmpty
+        let scrollView = self.webView.scrollView
+        // Default canvas needs raw touch events; external pages should scroll.
+        scrollView.isScrollEnabled = allowScroll
+        scrollView.bounces = allowScroll
+    }
+
     private static func jsValue(_ value: String?) -> String {
         guard let value else { return "null" }
         if let data = try? JSONSerialization.data(withJSONObject: [value]),
diff --git a/apps/ios/Tests/ScreenControllerTests.swift b/apps/ios/Tests/ScreenControllerTests.swift
index 028a0eae6..835c0081f 100644
--- a/apps/ios/Tests/ScreenControllerTests.swift
+++ b/apps/ios/Tests/ScreenControllerTests.swift
@@ -16,6 +16,15 @@ import WebKit
         #expect(scrollView.bounces == false)
     }
 
+    @Test @MainActor func navigateEnablesScrollForWebPages() {
+        let screen = ScreenController()
+        screen.navigate(to: "https://example.com")
+
+        let scrollView = screen.webView.scrollView
+        #expect(scrollView.isScrollEnabled == true)
+        #expect(scrollView.bounces == true)
+    }
+
     @Test @MainActor func navigateSlashShowsDefaultCanvas() {
         let screen = ScreenController()
         screen.navigate(to: "/")
diff --git a/src/canvas-host/a2ui/.bundle.hash b/src/canvas-host/a2ui/.bundle.hash
index eca4af8df..23e15ecec 100644
--- a/src/canvas-host/a2ui/.bundle.hash
+++ b/src/canvas-host/a2ui/.bundle.hash
@@ -1 +1 @@
-8c6030afb0b9f264b0bb9dcfb738b67d361fc5acac7967b4e056169a44f95184
+401ee2e7aa55e8abfd5e8ee94810a75629253b88371dc70f5b04c4830cdcce8d

From 510e2a1d17a9c6f95737cc592b4b1257a9ac17ae Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 17:31:23 +0100
Subject: [PATCH 002/100] fix: menu devices list

---
 CHANGELOG.md                                  |   1 +
 .../Clawdis/MenuSessionsInjector.swift        | 163 +++---------------
 apps/macos/Sources/Clawdis/NodesMenu.swift    |  61 ++++---
 apps/macos/Sources/Clawdis/NodesStore.swift   |  84 +++++++++
 docs/mac/menu-bar.md                          |   1 +
 5 files changed, 142 insertions(+), 168 deletions(-)
 create mode 100644 apps/macos/Sources/Clawdis/NodesStore.swift

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab4509c82..7cf8b81e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Fixes
 - macOS: Voice Wake now fully tears down the Speech pipeline when disabled (cancel pending restarts, drop stale callbacks) to avoid high CPU in the background.
 - iOS/Android nodes: enable scrolling for loaded web pages in the Canvas WebView (default scaffold stays touch-first).
+- macOS menu: device list now uses `node.list` (devices only; no agent/tool presence entries).
 
 ## 2.0.0-beta4 — 2025-12-27
 
diff --git a/apps/macos/Sources/Clawdis/MenuSessionsInjector.swift b/apps/macos/Sources/Clawdis/MenuSessionsInjector.swift
index a66b1a38d..fb066d303 100644
--- a/apps/macos/Sources/Clawdis/MenuSessionsInjector.swift
+++ b/apps/macos/Sources/Clawdis/MenuSessionsInjector.swift
@@ -22,8 +22,7 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
     private var cachedErrorText: String?
     private var cacheUpdatedAt: Date?
     private let refreshIntervalSeconds: TimeInterval = 12
-    private let nodesStore = InstancesStore.shared
-    private let gatewayDiscovery = GatewayDiscoveryModel()
+    private let nodesStore = NodesStore.shared
     #if DEBUG
     private var testControlChannelConnected: Bool?
     #endif
@@ -43,7 +42,6 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
         }
 
         self.nodesStore.start()
-        self.gatewayDiscovery.start()
     }
 
     func menuWillOpen(_ menu: NSMenu) {
@@ -218,7 +216,7 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
         }
 
         if entries.isEmpty {
-            let title = self.nodesStore.isLoading ? "Loading nodes..." : "No nodes yet"
+            let title = self.nodesStore.isLoading ? "Loading devices..." : "No devices yet"
             menu.insertItem(self.makeMessageItem(text: title, symbolName: "circle.dashed", width: width), at: cursor)
             cursor += 1
         } else {
@@ -239,7 +237,7 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
             if entries.count > 8 {
                 let moreItem = NSMenuItem()
                 moreItem.tag = self.nodesTag
-                moreItem.title = "More Nodes..."
+                moreItem.title = "More Devices..."
                 moreItem.image = NSImage(systemSymbolName: "ellipsis.circle", accessibilityDescription: nil)
                 let overflow = Array(entries.dropFirst(8))
                 moreItem.submenu = self.buildNodesOverflowMenu(entries: overflow, width: width)
@@ -436,7 +434,7 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
         return menu
     }
 
-    private func buildNodesOverflowMenu(entries: [InstanceInfo], width: CGFloat) -> NSMenu {
+    private func buildNodesOverflowMenu(entries: [NodeInfo], width: CGFloat) -> NSMenu {
         let menu = NSMenu()
         for entry in entries {
             let item = NSMenuItem()
@@ -452,21 +450,21 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
         return menu
     }
 
-    private func buildNodeSubmenu(entry: InstanceInfo) -> NSMenu {
+    private func buildNodeSubmenu(entry: NodeInfo) -> NSMenu {
         let menu = NSMenu()
         menu.autoenablesItems = false
 
-        menu.addItem(self.makeNodeCopyItem(label: "ID", value: entry.id))
+        menu.addItem(self.makeNodeCopyItem(label: "Node ID", value: entry.nodeId))
 
-        if let host = entry.host?.nonEmpty {
-            menu.addItem(self.makeNodeCopyItem(label: "Host", value: host))
+        if let name = entry.displayName?.nonEmpty {
+            menu.addItem(self.makeNodeCopyItem(label: "Name", value: name))
         }
 
-        if let ip = entry.ip?.nonEmpty {
+        if let ip = entry.remoteIp?.nonEmpty {
             menu.addItem(self.makeNodeCopyItem(label: "IP", value: ip))
         }
 
-        menu.addItem(self.makeNodeCopyItem(label: "Role", value: NodeMenuEntryFormatter.roleText(entry)))
+        menu.addItem(self.makeNodeCopyItem(label: "Status", value: NodeMenuEntryFormatter.roleText(entry)))
 
         if let platform = NodeMenuEntryFormatter.platformText(entry) {
             menu.addItem(self.makeNodeCopyItem(label: "Platform", value: platform))
@@ -476,19 +474,17 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
             menu.addItem(self.makeNodeCopyItem(label: "Version", value: self.formatVersionLabel(version)))
         }
 
-        menu.addItem(self.makeNodeDetailItem(label: "Last seen", value: entry.ageDescription))
+        menu.addItem(self.makeNodeDetailItem(label: "Connected", value: entry.isConnected ? "Yes" : "No"))
+        menu.addItem(self.makeNodeDetailItem(label: "Paired", value: entry.isPaired ? "Yes" : "No"))
 
-        if entry.lastInputSeconds != nil {
-            menu.addItem(self.makeNodeDetailItem(label: "Last input", value: entry.lastInputDescription))
+        if let caps = entry.caps?.filter({ !$0.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty }),
+           !caps.isEmpty {
+            menu.addItem(self.makeNodeCopyItem(label: "Caps", value: caps.joined(separator: ", ")))
         }
 
-        if let reason = entry.reason?.nonEmpty {
-            menu.addItem(self.makeNodeDetailItem(label: "Reason", value: reason))
-        }
-
-        if let sshURL = self.sshURL(for: entry) {
-            menu.addItem(.separator())
-            menu.addItem(self.makeNodeActionItem(title: "Open SSH", url: sshURL))
+        if let commands = entry.commands?.filter({ !$0.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty }),
+           !commands.isEmpty {
+            menu.addItem(self.makeNodeCopyItem(label: "Commands", value: commands.joined(separator: ", ")))
         }
 
         return menu
@@ -507,12 +503,6 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
         return item
     }
 
-    private func makeNodeActionItem(title: String, url: URL) -> NSMenuItem {
-        let item = NSMenuItem(title: title, action: #selector(self.openNodeSSH(_:)), keyEquivalent: "")
-        item.target = self
-        item.representedObject = url
-        return item
-    }
     private func formatVersionLabel(_ version: String) -> String {
         let trimmed = version.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !trimmed.isEmpty else { return version }
@@ -638,104 +628,6 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
         NSPasteboard.general.setString(value, forType: .string)
     }
 
-    @objc
-    private func openNodeSSH(_ sender: NSMenuItem) {
-        guard let url = sender.representedObject as? URL else { return }
-
-        if let appURL = self.preferredTerminalAppURL() {
-            NSWorkspace.shared.open(
-                [url],
-                withApplicationAt: appURL,
-                configuration: NSWorkspace.OpenConfiguration(),
-                completionHandler: nil)
-        } else {
-            NSWorkspace.shared.open(url)
-        }
-    }
-
-    private func preferredTerminalAppURL() -> URL? {
-        if let ghosty = self.ghostyAppURL() { return ghosty }
-        return NSWorkspace.shared.urlForApplication(withBundleIdentifier: "com.apple.Terminal")
-    }
-
-    private func ghostyAppURL() -> URL? {
-        let candidates = [
-            "/Applications/Ghosty.app",
-            ("~/Applications/Ghosty.app" as NSString).expandingTildeInPath,
-        ]
-        for path in candidates where FileManager.default.fileExists(atPath: path) {
-            return URL(fileURLWithPath: path)
-        }
-        return nil
-    }
-
-    private func sshURL(for entry: InstanceInfo) -> URL? {
-        guard NodeMenuEntryFormatter.isGateway(entry) else { return nil }
-        guard let gateway = self.matchingGateway(for: entry) else { return nil }
-        guard let host = self.sanitizedTailnetHost(gateway.tailnetDns) ?? gateway.lanHost else { return nil }
-        let user = NSUserName()
-        return self.buildSSHURL(user: user, host: host, port: gateway.sshPort)
-    }
-
-    private func matchingGateway(for entry: InstanceInfo) -> GatewayDiscoveryModel.DiscoveredGateway? {
-        let candidates = self.entryHostCandidates(entry)
-        guard !candidates.isEmpty else { return nil }
-        return self.gatewayDiscovery.gateways.first { gateway in
-            let gatewayTokens = self.gatewayHostTokens(gateway)
-            return candidates.contains { gatewayTokens.contains($0) }
-        }
-    }
-
-    private func entryHostCandidates(_ entry: InstanceInfo) -> [String] {
-        let raw: [String?] = [
-            entry.host,
-            entry.ip,
-            NodeMenuEntryFormatter.primaryName(entry),
-        ]
-        return raw.compactMap(self.normalizedHostToken(_:))
-    }
-
-    private func gatewayHostTokens(_ gateway: GatewayDiscoveryModel.DiscoveredGateway) -> [String] {
-        let raw: [String?] = [
-            gateway.displayName,
-            gateway.lanHost,
-            gateway.tailnetDns,
-        ]
-        return raw.compactMap(self.normalizedHostToken(_:))
-    }
-
-    private func normalizedHostToken(_ value: String?) -> String? {
-        guard let value else { return nil }
-        let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines)
-        if trimmed.isEmpty { return nil }
-        let lower = trimmed.lowercased().trimmingCharacters(in: CharacterSet(charactersIn: "."))
-        if lower.hasSuffix(".localdomain") {
-            return lower.replacingOccurrences(of: ".localdomain", with: ".local")
-        }
-        return lower
-    }
-
-    private func sanitizedTailnetHost(_ host: String?) -> String? {
-        guard let host else { return nil }
-        let trimmed = host.trimmingCharacters(in: .whitespacesAndNewlines)
-        if trimmed.isEmpty { return nil }
-        if trimmed.hasSuffix(".internal.") || trimmed.hasSuffix(".internal") {
-            return nil
-        }
-        return trimmed
-    }
-
-    private func buildSSHURL(user: String, host: String, port: Int) -> URL? {
-        var components = URLComponents()
-        components.scheme = "ssh"
-        components.user = user
-        components.host = host
-        if port != 22 {
-            components.port = port
-        }
-        return components.url
-    }
-
     // MARK: - Width + placement
 
     private func findInsertIndex(in menu: NSMenu) -> Int? {
@@ -790,23 +682,14 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
         return width
     }
 
-    private func sortedNodeEntries() -> [InstanceInfo] {
-        let entries = self.nodesStore.instances.filter { entry in
-            let mode = entry.mode?.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-            return mode != "health"
-        }
+    private func sortedNodeEntries() -> [NodeInfo] {
+        let entries = self.nodesStore.nodes
         return entries.sorted { lhs, rhs in
-            let lhsGateway = NodeMenuEntryFormatter.isGateway(lhs)
-            let rhsGateway = NodeMenuEntryFormatter.isGateway(rhs)
-            if lhsGateway != rhsGateway { return lhsGateway }
-
-            let lhsLocal = NodeMenuEntryFormatter.isLocal(lhs)
-            let rhsLocal = NodeMenuEntryFormatter.isLocal(rhs)
-            if lhsLocal != rhsLocal { return lhsLocal }
-
+            if lhs.isConnected != rhs.isConnected { return lhs.isConnected }
+            if lhs.isPaired != rhs.isPaired { return lhs.isPaired }
             let lhsName = NodeMenuEntryFormatter.primaryName(lhs).lowercased()
             let rhsName = NodeMenuEntryFormatter.primaryName(rhs).lowercased()
-            if lhsName == rhsName { return lhs.ts > rhs.ts }
+            if lhsName == rhsName { return lhs.nodeId < rhs.nodeId }
             return lhsName < rhsName
         }
     }
diff --git a/apps/macos/Sources/Clawdis/NodesMenu.swift b/apps/macos/Sources/Clawdis/NodesMenu.swift
index ec068ad8b..45e1b0c44 100644
--- a/apps/macos/Sources/Clawdis/NodesMenu.swift
+++ b/apps/macos/Sources/Clawdis/NodesMenu.swift
@@ -2,40 +2,44 @@ import AppKit
 import SwiftUI
 
 struct NodeMenuEntryFormatter {
-    static func isGateway(_ entry: InstanceInfo) -> Bool {
-        entry.mode?.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() == "gateway"
+    static func isConnected(_ entry: NodeInfo) -> Bool {
+        entry.isConnected
     }
 
-    static func isLocal(_ entry: InstanceInfo) -> Bool {
-        entry.mode?.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() == "local"
+    static func primaryName(_ entry: NodeInfo) -> String {
+        entry.displayName?.nonEmpty ?? entry.nodeId
     }
 
-    static func primaryName(_ entry: InstanceInfo) -> String {
-        if self.isGateway(entry) {
-            let host = entry.host?.nonEmpty
-            if let host, host.lowercased() != "gateway" { return host }
-            return "Gateway"
+    static func summaryText(_ entry: NodeInfo) -> String {
+        let name = self.primaryName(entry)
+        var prefix = "Node: \(name)"
+        if let ip = entry.remoteIp?.nonEmpty {
+            prefix += " (\(ip))"
         }
-        return entry.host?.nonEmpty ?? entry.id
+        var parts = [prefix]
+        if let platform = self.platformText(entry) {
+            parts.append("platform \(platform)")
+        }
+        if let version = entry.version?.nonEmpty {
+            parts.append("app \(self.compactVersion(version))")
+        }
+        parts.append("status \(self.roleText(entry))")
+        return parts.joined(separator: " · ")
     }
 
-    static func summaryText(_ entry: InstanceInfo) -> String {
-        entry.text.nonEmpty ?? self.primaryName(entry)
+    static func roleText(_ entry: NodeInfo) -> String {
+        if entry.isConnected { return "connected" }
+        if entry.isPaired { return "paired" }
+        return "unpaired"
     }
 
-    static func roleText(_ entry: InstanceInfo) -> String {
-        if self.isGateway(entry) { return "gateway" }
-        if let mode = entry.mode?.nonEmpty { return mode }
-        return "node"
-    }
-
-    static func detailLeft(_ entry: InstanceInfo) -> String {
+    static func detailLeft(_ entry: NodeInfo) -> String {
         let role = self.roleText(entry)
-        if let ip = entry.ip?.nonEmpty { return "\(ip) · \(role)" }
+        if let ip = entry.remoteIp?.nonEmpty { return "\(ip) · \(role)" }
         return role
     }
 
-    static func detailRight(_ entry: InstanceInfo) -> String? {
+    static func detailRight(_ entry: NodeInfo) -> String? {
         var parts: [String] = []
         if let platform = self.platformText(entry) { parts.append(platform) }
         if let version = entry.version?.nonEmpty {
@@ -46,7 +50,7 @@ struct NodeMenuEntryFormatter {
         return parts.joined(separator: " · ")
     }
 
-    static func platformText(_ entry: InstanceInfo) -> String? {
+    static func platformText(_ entry: NodeInfo) -> String? {
         if let raw = entry.platform?.nonEmpty {
             return self.prettyPlatform(raw) ?? raw
         }
@@ -99,8 +103,7 @@ struct NodeMenuEntryFormatter {
         return trimmed
     }
 
-    static func leadingSymbol(_ entry: InstanceInfo) -> String {
-        if self.isGateway(entry) { return self.safeSystemSymbol("dot.radiowaves.left.and.right", fallback: "network") }
+    static func leadingSymbol(_ entry: NodeInfo) -> String {
         if let family = entry.deviceFamily?.lowercased() {
             if family.contains("mac") {
                 return self.safeSystemSymbol("laptopcomputer", fallback: "laptopcomputer")
@@ -116,9 +119,11 @@ struct NodeMenuEntryFormatter {
         return "cpu"
     }
 
-    static func isAndroid(_ entry: InstanceInfo) -> Bool {
+    static func isAndroid(_ entry: NodeInfo) -> Bool {
         let family = entry.deviceFamily?.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-        return family == "android"
+        if family == "android" { return true }
+        let platform = entry.platform?.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+        return platform?.contains("android") == true
     }
 
     private static func safeSystemSymbol(_ preferred: String, fallback: String) -> String {
@@ -128,7 +133,7 @@ struct NodeMenuEntryFormatter {
 }
 
 struct NodeMenuRowView: View {
-    let entry: InstanceInfo
+    let entry: NodeInfo
     let width: CGFloat
     @Environment(\.menuItemHighlighted) private var isHighlighted
 
@@ -147,7 +152,7 @@ struct NodeMenuRowView: View {
 
             VStack(alignment: .leading, spacing: 2) {
                 Text(NodeMenuEntryFormatter.primaryName(self.entry))
-                    .font(.callout.weight(NodeMenuEntryFormatter.isGateway(self.entry) ? .semibold : .regular))
+                    .font(.callout.weight(NodeMenuEntryFormatter.isConnected(self.entry) ? .semibold : .regular))
                     .foregroundStyle(self.primaryColor)
                     .lineLimit(1)
                     .truncationMode(.middle)
diff --git a/apps/macos/Sources/Clawdis/NodesStore.swift b/apps/macos/Sources/Clawdis/NodesStore.swift
new file mode 100644
index 000000000..2c00e15f7
--- /dev/null
+++ b/apps/macos/Sources/Clawdis/NodesStore.swift
@@ -0,0 +1,84 @@
+import Foundation
+import Observation
+import OSLog
+
+struct NodeInfo: Identifiable, Codable {
+    let nodeId: String
+    let displayName: String?
+    let platform: String?
+    let version: String?
+    let deviceFamily: String?
+    let modelIdentifier: String?
+    let remoteIp: String?
+    let caps: [String]?
+    let commands: [String]?
+    let permissions: [String: Bool]?
+    let paired: Bool?
+    let connected: Bool?
+
+    var id: String { self.nodeId }
+    var isConnected: Bool { self.connected ?? false }
+    var isPaired: Bool { self.paired ?? false }
+}
+
+private struct NodeListResponse: Codable {
+    let ts: Double?
+    let nodes: [NodeInfo]
+}
+
+@MainActor
+@Observable
+final class NodesStore {
+    static let shared = NodesStore()
+
+    var nodes: [NodeInfo] = []
+    var lastError: String?
+    var statusMessage: String?
+    var isLoading = false
+
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "nodes")
+    private var task: Task<Void, Never>?
+    private let interval: TimeInterval = 30
+    private var startCount = 0
+
+    func start() {
+        self.startCount += 1
+        guard self.startCount == 1 else { return }
+        guard self.task == nil else { return }
+        self.task = Task.detached { [weak self] in
+            guard let self else { return }
+            await self.refresh()
+            while !Task.isCancelled {
+                try? await Task.sleep(nanoseconds: UInt64(self.interval * 1_000_000_000))
+                await self.refresh()
+            }
+        }
+    }
+
+    func stop() {
+        guard self.startCount > 0 else { return }
+        self.startCount -= 1
+        guard self.startCount == 0 else { return }
+        self.task?.cancel()
+        self.task = nil
+    }
+
+    func refresh() async {
+        if self.isLoading { return }
+        self.statusMessage = nil
+        self.isLoading = true
+        defer { self.isLoading = false }
+        do {
+            let data = try await GatewayConnection.shared.requestRaw(method: "node.list", params: nil, timeoutMs: 8000)
+            let decoded = try JSONDecoder().decode(NodeListResponse.self, from: data)
+            self.nodes = decoded.nodes
+            self.lastError = nil
+            self.statusMessage = nil
+        } catch {
+            self.logger.error("node.list failed \(error.localizedDescription, privacy: .public)")
+            self.nodes = []
+            self.lastError = error.localizedDescription
+            self.statusMessage = nil
+        }
+    }
+}
diff --git a/docs/mac/menu-bar.md b/docs/mac/menu-bar.md
index b4a672629..bfe9a8c36 100644
--- a/docs/mac/menu-bar.md
+++ b/docs/mac/menu-bar.md
@@ -8,6 +8,7 @@ read_when:
 ## What is shown
 - We surface the current agent work state in the menu bar icon and in the first status row of the menu.
 - Health status is hidden while work is active; it returns when all sessions are idle.
+- The “Nodes” block in the menu lists **devices** only (gateway bridge nodes via `node.list`), not client/presence entries.
 
 ## State model
 - Sessions: events arrive with `runId` (session key). The “main” session is the key `main`; if absent, we fall back to the most recently updated session.

From aa2700ffa78a47a59b38c3e766dfa704e8aef6aa Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 17:38:21 +0100
Subject: [PATCH 003/100] chore: set ios signing team for device builds

---
 apps/ios/project.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/ios/project.yml b/apps/ios/project.yml
index 033d2f68f..e8dac7a20 100644
--- a/apps/ios/project.yml
+++ b/apps/ios/project.yml
@@ -62,7 +62,11 @@ targets:
           swiftlint lint --config "$SRCROOT/.swiftlint.yml" --use-script-input-file-lists
     settings:
       base:
+        CODE_SIGN_IDENTITY: "Apple Development"
+        CODE_SIGN_STYLE: Manual
+        DEVELOPMENT_TEAM: Y5PE65HELJ
         PRODUCT_BUNDLE_IDENTIFIER: com.steipete.clawdis.ios
+        PROVISIONING_PROFILE_SPECIFIER: "com.steipete.clawdis.ios Development"
         SWIFT_VERSION: "6.0"
     info:
       path: Sources/Info.plist

From 09ef991e1a55988aa623cf7c89a969c70a2457a1 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 18:09:27 +0100
Subject: [PATCH 004/100] chore: harden restart script

---
 scripts/restart-mac.sh | 61 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/scripts/restart-mac.sh b/scripts/restart-mac.sh
index a6bb20b8a..35886e71b 100755
--- a/scripts/restart-mac.sh
+++ b/scripts/restart-mac.sh
@@ -10,6 +10,11 @@ DEBUG_PROCESS_PATTERN="${ROOT_DIR}/apps/macos/.build/debug/Clawdis"
 LOCAL_PROCESS_PATTERN="${ROOT_DIR}/apps/macos/.build-local/debug/Clawdis"
 RELEASE_PROCESS_PATTERN="${ROOT_DIR}/apps/macos/.build/release/Clawdis"
 LAUNCH_AGENT="${HOME}/Library/LaunchAgents/com.steipete.clawdis.plist"
+LOCK_KEY="$(printf '%s' "${ROOT_DIR}" | shasum -a 256 | cut -c1-8)"
+LOCK_DIR="${TMPDIR:-/tmp}/clawdis-restart-${LOCK_KEY}"
+LOCK_PID_FILE="${LOCK_DIR}/pid"
+WAIT_FOR_LOCK=0
+LOG_PATH="${CLAWDIS_RESTART_LOG:-/tmp/clawdis-restart.log}"
 
 log()  { printf '%s\n' "$*"; }
 fail() { printf 'ERROR: %s\n' "$*" >&2; exit 1; }
@@ -25,6 +30,60 @@ run_step() {
   fi
 }
 
+cleanup() {
+  if [[ -d "${LOCK_DIR}" ]]; then
+    rm -rf "${LOCK_DIR}"
+  fi
+}
+
+acquire_lock() {
+  while true; do
+    if mkdir "${LOCK_DIR}" 2>/dev/null; then
+      echo "$$" > "${LOCK_PID_FILE}"
+      return 0
+    fi
+
+    local existing_pid=""
+    if [[ -f "${LOCK_PID_FILE}" ]]; then
+      existing_pid="$(cat "${LOCK_PID_FILE}" 2>/dev/null || true)"
+    fi
+
+    if [[ -n "${existing_pid}" ]] && kill -0 "${existing_pid}" 2>/dev/null; then
+      if [[ "${WAIT_FOR_LOCK}" == "1" ]]; then
+        log "==> Another restart is running (pid ${existing_pid}); waiting..."
+        while kill -0 "${existing_pid}" 2>/dev/null; do
+          sleep 1
+        done
+        continue
+      fi
+      log "==> Another restart is running (pid ${existing_pid}); re-run with --wait."
+      exit 0
+    fi
+
+    rm -rf "${LOCK_DIR}"
+  done
+}
+
+trap cleanup EXIT INT TERM
+
+for arg in "$@"; do
+  case "${arg}" in
+    --wait|-w) WAIT_FOR_LOCK=1 ;;
+    --help|-h)
+      log "Usage: $(basename "$0") [--wait]"
+      exit 0
+      ;;
+    *) ;;
+  esac
+done
+
+mkdir -p "$(dirname "$LOG_PATH")"
+rm -f "$LOG_PATH"
+exec > >(tee "$LOG_PATH") 2>&1
+log "==> Log: ${LOG_PATH}"
+
+acquire_lock
+
 kill_all_clawdis() {
   for _ in {1..10}; do
     pkill -f "${APP_PROCESS_PATTERN}" 2>/dev/null || true
@@ -102,5 +161,5 @@ sleep 1.5
 if pgrep -f "${APP_PROCESS_PATTERN}" >/dev/null 2>&1; then
   log "OK: Clawdis is running."
 else
-  fail "App exited immediately. Check /tmp/clawdis.log or Console.app (User Reports)."
+  fail "App exited immediately. Check ${LOG_PATH} or Console.app (User Reports)."
 fi

From 653932e50dde71078a178bf3210b094ae8c1a2dc Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 18:35:52 +0100
Subject: [PATCH 005/100] fix: show connected nodes only

---
 CHANGELOG.md                                          | 1 +
 apps/macos/Sources/Clawdis/MenuSessionsInjector.swift | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cf8b81e5..5d0f56cf0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - macOS: Voice Wake now fully tears down the Speech pipeline when disabled (cancel pending restarts, drop stale callbacks) to avoid high CPU in the background.
 - iOS/Android nodes: enable scrolling for loaded web pages in the Canvas WebView (default scaffold stays touch-first).
 - macOS menu: device list now uses `node.list` (devices only; no agent/tool presence entries).
+- macOS menu: device list now shows connected nodes only.
 
 ## 2.0.0-beta4 — 2025-12-27
 
diff --git a/apps/macos/Sources/Clawdis/MenuSessionsInjector.swift b/apps/macos/Sources/Clawdis/MenuSessionsInjector.swift
index fb066d303..f9a0c141f 100644
--- a/apps/macos/Sources/Clawdis/MenuSessionsInjector.swift
+++ b/apps/macos/Sources/Clawdis/MenuSessionsInjector.swift
@@ -683,7 +683,7 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
     }
 
     private func sortedNodeEntries() -> [NodeInfo] {
-        let entries = self.nodesStore.nodes
+        let entries = self.nodesStore.nodes.filter { $0.isConnected }
         return entries.sorted { lhs, rhs in
             if lhs.isConnected != rhs.isConnected { return lhs.isConnected }
             if lhs.isPaired != rhs.isPaired { return lhs.isPaired }

From 41be9232fea19e6d6e5cd5aeb8bf634231812c6f Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 20:10:36 +0100
Subject: [PATCH 006/100] fix: prevent iOS screen capture crash

---
 CHANGELOG.md                                  |  1 +
 .../Sources/Screen/ScreenRecordService.swift  | 86 +++++++++++++------
 2 files changed, 59 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d0f56cf0..224f37ab4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - iOS/Android nodes: enable scrolling for loaded web pages in the Canvas WebView (default scaffold stays touch-first).
 - macOS menu: device list now uses `node.list` (devices only; no agent/tool presence entries).
 - macOS menu: device list now shows connected nodes only.
+- iOS node: fix ReplayKit screen recording crash caused by queue isolation assertions during capture.
 
 ## 2.0.0-beta4 — 2025-12-27
 
diff --git a/apps/ios/Sources/Screen/ScreenRecordService.swift b/apps/ios/Sources/Screen/ScreenRecordService.swift
index d1e575868..d9a0a4d26 100644
--- a/apps/ios/Sources/Screen/ScreenRecordService.swift
+++ b/apps/ios/Sources/Screen/ScreenRecordService.swift
@@ -1,7 +1,6 @@
 import AVFoundation
 import ReplayKit
 
-@MainActor
 final class ScreenRecordService {
     private struct UncheckedSendableBox<T>: @unchecked Sendable {
         let value: T
@@ -52,7 +51,9 @@ final class ScreenRecordService {
         try? FileManager.default.removeItem(at: outURL)
 
         let recorder = RPScreenRecorder.shared()
-        recorder.isMicrophoneEnabled = includeAudio
+        await MainActor.run {
+            recorder.isMicrophoneEnabled = includeAudio
+        }
 
         var writer: AVAssetWriter?
         var videoInput: AVAssetWriterInput?
@@ -61,16 +62,23 @@ final class ScreenRecordService {
         var sawVideo = false
         var lastVideoTime: CMTime?
         var handlerError: Error?
-        let lock = NSLock()
+        let stateLock = NSLock()
+
+        func withStateLock<T>(_ body: () -> T) -> T {
+            stateLock.lock()
+            defer { stateLock.unlock() }
+            return body()
+        }
 
         func setHandlerError(_ error: Error) {
-            lock.lock()
-            defer { lock.unlock() }
+            withStateLock {
             if handlerError == nil { handlerError = error }
+            }
         }
 
         try await withCheckedThrowingContinuation { (cont: CheckedContinuation<Void, Error>) in
-            recorder.startCapture(handler: { sample, type, error in
+            Task { @MainActor in
+                recorder.startCapture(handler: { sample, type, error in
                 if let error {
                     setHandlerError(error)
                     return
@@ -80,12 +88,16 @@ final class ScreenRecordService {
                 switch type {
                 case .video:
                     let pts = CMSampleBufferGetPresentationTimeStamp(sample)
-                    if let lastVideoTime {
-                        let delta = CMTimeSubtract(pts, lastVideoTime)
-                        if delta.seconds < (1.0 / fpsValue) { return }
+                    let shouldSkip = withStateLock {
+                        if let lastVideoTime {
+                            let delta = CMTimeSubtract(pts, lastVideoTime)
+                            return delta.seconds < (1.0 / fpsValue)
+                        }
+                        return false
                     }
+                    if shouldSkip { return }
 
-                    if writer == nil {
+                    if withStateLock({ writer == nil }) {
                         guard let imageBuffer = CMSampleBufferGetImageBuffer(sample) else {
                             setHandlerError(ScreenRecordError.captureFailed("Missing image buffer"))
                             return
@@ -111,7 +123,9 @@ final class ScreenRecordService {
                                 aInput.expectsMediaDataInRealTime = true
                                 if w.canAdd(aInput) {
                                     w.add(aInput)
-                                    audioInput = aInput
+                                    withStateLock {
+                                        audioInput = aInput
+                                    }
                                 }
                             }
 
@@ -120,29 +134,37 @@ final class ScreenRecordService {
                                     .writeFailed(w.error?.localizedDescription ?? "Failed to start writer")
                             }
                             w.startSession(atSourceTime: pts)
-                            writer = w
-                            videoInput = vInput
-                            started = true
+                            withStateLock {
+                                writer = w
+                                videoInput = vInput
+                                started = true
+                            }
                         } catch {
                             setHandlerError(error)
                             return
                         }
                     }
 
-                    guard let vInput = videoInput, started else { return }
+                    let vInput = withStateLock { videoInput }
+                    let isStarted = withStateLock { started }
+                    guard let vInput, isStarted else { return }
                     if vInput.isReadyForMoreMediaData {
                         if vInput.append(sample) {
-                            sawVideo = true
-                            lastVideoTime = pts
+                            withStateLock {
+                                sawVideo = true
+                                lastVideoTime = pts
+                            }
                         } else {
-                            if let err = writer?.error {
+                            if let err = withStateLock({ writer?.error }) {
                                 setHandlerError(ScreenRecordError.writeFailed(err.localizedDescription))
                             }
                         }
                     }
 
                 case .audioApp, .audioMic:
-                    guard includeAudio, let aInput = audioInput, started else { return }
+                    let aInput = withStateLock { audioInput }
+                    let isStarted = withStateLock { started }
+                    guard includeAudio, let aInput, isStarted else { return }
                     if aInput.isReadyForMoreMediaData {
                         _ = aInput.append(sample)
                     }
@@ -150,27 +172,35 @@ final class ScreenRecordService {
                 @unknown default:
                     break
                 }
-            }, completionHandler: { error in
+                }, completionHandler: { error in
                 if let error { cont.resume(throwing: error) } else { cont.resume() }
-            })
+                })
+            }
         }
 
         try await Task.sleep(nanoseconds: UInt64(durationMs) * 1_000_000)
 
-        let stopError = await withCheckedContinuation { cont in
-            recorder.stopCapture { error in cont.resume(returning: error) }
+        let stopError = await MainActor.run {
+            await withCheckedContinuation { cont in
+                recorder.stopCapture { error in cont.resume(returning: error) }
+            }
         }
         if let stopError { throw stopError }
 
-        if let handlerError { throw handlerError }
-        guard let writer, let videoInput, sawVideo else {
+        let handlerErrorSnapshot = withStateLock { handlerError }
+        if let handlerErrorSnapshot { throw handlerErrorSnapshot }
+        let writerSnapshot = withStateLock { writer }
+        let videoInputSnapshot = withStateLock { videoInput }
+        let audioInputSnapshot = withStateLock { audioInput }
+        let sawVideoSnapshot = withStateLock { sawVideo }
+        guard let writerSnapshot, let videoInputSnapshot, sawVideoSnapshot else {
             throw ScreenRecordError.captureFailed("No frames captured")
         }
 
-        videoInput.markAsFinished()
-        audioInput?.markAsFinished()
+        videoInputSnapshot.markAsFinished()
+        audioInputSnapshot?.markAsFinished()
 
-        let writerBox = UncheckedSendableBox(value: writer)
+        let writerBox = UncheckedSendableBox(value: writerSnapshot)
         try await withCheckedThrowingContinuation { (cont: CheckedContinuation<Void, Error>) in
             writerBox.value.finishWriting {
                 let writer = writerBox.value

From 65478a6ff371891949a914903553e8a8aac89326 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 20:20:14 +0100
Subject: [PATCH 007/100] fix: avoid main-actor stopCapture error

---
 .../Sources/Screen/ScreenRecordService.swift  | 172 +++++++++---------
 1 file changed, 86 insertions(+), 86 deletions(-)

diff --git a/apps/ios/Sources/Screen/ScreenRecordService.swift b/apps/ios/Sources/Screen/ScreenRecordService.swift
index d9a0a4d26..3201770ee 100644
--- a/apps/ios/Sources/Screen/ScreenRecordService.swift
+++ b/apps/ios/Sources/Screen/ScreenRecordService.swift
@@ -72,116 +72,116 @@ final class ScreenRecordService {
 
         func setHandlerError(_ error: Error) {
             withStateLock {
-            if handlerError == nil { handlerError = error }
+                if handlerError == nil { handlerError = error }
             }
         }
 
         try await withCheckedThrowingContinuation { (cont: CheckedContinuation<Void, Error>) in
             Task { @MainActor in
                 recorder.startCapture(handler: { sample, type, error in
-                if let error {
-                    setHandlerError(error)
-                    return
-                }
-                guard CMSampleBufferDataIsReady(sample) else { return }
-
-                switch type {
-                case .video:
-                    let pts = CMSampleBufferGetPresentationTimeStamp(sample)
-                    let shouldSkip = withStateLock {
-                        if let lastVideoTime {
-                            let delta = CMTimeSubtract(pts, lastVideoTime)
-                            return delta.seconds < (1.0 / fpsValue)
-                        }
-                        return false
+                    if let error {
+                        setHandlerError(error)
+                        return
                     }
-                    if shouldSkip { return }
+                    guard CMSampleBufferDataIsReady(sample) else { return }
 
-                    if withStateLock({ writer == nil }) {
-                        guard let imageBuffer = CMSampleBufferGetImageBuffer(sample) else {
-                            setHandlerError(ScreenRecordError.captureFailed("Missing image buffer"))
-                            return
-                        }
-                        let width = CVPixelBufferGetWidth(imageBuffer)
-                        let height = CVPixelBufferGetHeight(imageBuffer)
-                        do {
-                            let w = try AVAssetWriter(outputURL: outURL, fileType: .mp4)
-                            let settings: [String: Any] = [
-                                AVVideoCodecKey: AVVideoCodecType.h264,
-                                AVVideoWidthKey: width,
-                                AVVideoHeightKey: height,
-                            ]
-                            let vInput = AVAssetWriterInput(mediaType: .video, outputSettings: settings)
-                            vInput.expectsMediaDataInRealTime = true
-                            guard w.canAdd(vInput) else {
-                                throw ScreenRecordError.writeFailed("Cannot add video input")
+                    switch type {
+                    case .video:
+                        let pts = CMSampleBufferGetPresentationTimeStamp(sample)
+                        let shouldSkip = withStateLock {
+                            if let lastVideoTime {
+                                let delta = CMTimeSubtract(pts, lastVideoTime)
+                                return delta.seconds < (1.0 / fpsValue)
                             }
-                            w.add(vInput)
+                            return false
+                        }
+                        if shouldSkip { return }
 
-                            if includeAudio {
-                                let aInput = AVAssetWriterInput(mediaType: .audio, outputSettings: nil)
-                                aInput.expectsMediaDataInRealTime = true
-                                if w.canAdd(aInput) {
-                                    w.add(aInput)
-                                    withStateLock {
-                                        audioInput = aInput
+                        if withStateLock({ writer == nil }) {
+                            guard let imageBuffer = CMSampleBufferGetImageBuffer(sample) else {
+                                setHandlerError(ScreenRecordError.captureFailed("Missing image buffer"))
+                                return
+                            }
+                            let width = CVPixelBufferGetWidth(imageBuffer)
+                            let height = CVPixelBufferGetHeight(imageBuffer)
+                            do {
+                                let w = try AVAssetWriter(outputURL: outURL, fileType: .mp4)
+                                let settings: [String: Any] = [
+                                    AVVideoCodecKey: AVVideoCodecType.h264,
+                                    AVVideoWidthKey: width,
+                                    AVVideoHeightKey: height,
+                                ]
+                                let vInput = AVAssetWriterInput(mediaType: .video, outputSettings: settings)
+                                vInput.expectsMediaDataInRealTime = true
+                                guard w.canAdd(vInput) else {
+                                    throw ScreenRecordError.writeFailed("Cannot add video input")
+                                }
+                                w.add(vInput)
+
+                                if includeAudio {
+                                    let aInput = AVAssetWriterInput(mediaType: .audio, outputSettings: nil)
+                                    aInput.expectsMediaDataInRealTime = true
+                                    if w.canAdd(aInput) {
+                                        w.add(aInput)
+                                        withStateLock {
+                                            audioInput = aInput
+                                        }
                                     }
                                 }
-                            }
 
-                            guard w.startWriting() else {
-                                throw ScreenRecordError
-                                    .writeFailed(w.error?.localizedDescription ?? "Failed to start writer")
-                            }
-                            w.startSession(atSourceTime: pts)
-                            withStateLock {
-                                writer = w
-                                videoInput = vInput
-                                started = true
-                            }
-                        } catch {
-                            setHandlerError(error)
-                            return
-                        }
-                    }
-
-                    let vInput = withStateLock { videoInput }
-                    let isStarted = withStateLock { started }
-                    guard let vInput, isStarted else { return }
-                    if vInput.isReadyForMoreMediaData {
-                        if vInput.append(sample) {
-                            withStateLock {
-                                sawVideo = true
-                                lastVideoTime = pts
-                            }
-                        } else {
-                            if let err = withStateLock({ writer?.error }) {
-                                setHandlerError(ScreenRecordError.writeFailed(err.localizedDescription))
+                                guard w.startWriting() else {
+                                    throw ScreenRecordError
+                                        .writeFailed(w.error?.localizedDescription ?? "Failed to start writer")
+                                }
+                                w.startSession(atSourceTime: pts)
+                                withStateLock {
+                                    writer = w
+                                    videoInput = vInput
+                                    started = true
+                                }
+                            } catch {
+                                setHandlerError(error)
+                                return
                             }
                         }
-                    }
 
-                case .audioApp, .audioMic:
-                    let aInput = withStateLock { audioInput }
-                    let isStarted = withStateLock { started }
-                    guard includeAudio, let aInput, isStarted else { return }
-                    if aInput.isReadyForMoreMediaData {
-                        _ = aInput.append(sample)
-                    }
+                        let vInput = withStateLock { videoInput }
+                        let isStarted = withStateLock { started }
+                        guard let vInput, isStarted else { return }
+                        if vInput.isReadyForMoreMediaData {
+                            if vInput.append(sample) {
+                                withStateLock {
+                                    sawVideo = true
+                                    lastVideoTime = pts
+                                }
+                            } else {
+                                if let err = withStateLock({ writer?.error }) {
+                                    setHandlerError(ScreenRecordError.writeFailed(err.localizedDescription))
+                                }
+                            }
+                        }
 
-                @unknown default:
-                    break
-                }
+                    case .audioApp, .audioMic:
+                        let aInput = withStateLock { audioInput }
+                        let isStarted = withStateLock { started }
+                        guard includeAudio, let aInput, isStarted else { return }
+                        if aInput.isReadyForMoreMediaData {
+                            _ = aInput.append(sample)
+                        }
+
+                    @unknown default:
+                        break
+                    }
                 }, completionHandler: { error in
-                if let error { cont.resume(throwing: error) } else { cont.resume() }
+                    if let error { cont.resume(throwing: error) } else { cont.resume() }
                 })
             }
         }
 
         try await Task.sleep(nanoseconds: UInt64(durationMs) * 1_000_000)
 
-        let stopError = await MainActor.run {
-            await withCheckedContinuation { cont in
+        let stopError = await withCheckedContinuation { cont in
+            Task { @MainActor in
                 recorder.stopCapture { error in cont.resume(returning: error) }
             }
         }

From c14d738d37e9bf4fc286e88fabe421623e66f659 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 20:22:26 +0100
Subject: [PATCH 008/100] fix: avoid screen recorder data races

---
 .../Sources/Screen/ScreenRecordService.swift  | 184 +++++++++---------
 1 file changed, 93 insertions(+), 91 deletions(-)

diff --git a/apps/ios/Sources/Screen/ScreenRecordService.swift b/apps/ios/Sources/Screen/ScreenRecordService.swift
index 3201770ee..79151488c 100644
--- a/apps/ios/Sources/Screen/ScreenRecordService.swift
+++ b/apps/ios/Sources/Screen/ScreenRecordService.swift
@@ -50,11 +50,6 @@ final class ScreenRecordService {
         }()
         try? FileManager.default.removeItem(at: outURL)
 
-        let recorder = RPScreenRecorder.shared()
-        await MainActor.run {
-            recorder.isMicrophoneEnabled = includeAudio
-        }
-
         var writer: AVAssetWriter?
         var videoInput: AVAssetWriterInput?
         var audioInput: AVAssetWriterInput?
@@ -77,104 +72,110 @@ final class ScreenRecordService {
         }
 
         try await withCheckedThrowingContinuation { (cont: CheckedContinuation<Void, Error>) in
-            Task { @MainActor in
-                recorder.startCapture(handler: { sample, type, error in
-                    if let error {
-                        setHandlerError(error)
-                        return
-                    }
-                    guard CMSampleBufferDataIsReady(sample) else { return }
+            let handler: @Sendable (CMSampleBuffer, RPSampleBufferType, Error?) -> Void = { sample, type, error in
+                if let error {
+                    setHandlerError(error)
+                    return
+                }
+                guard CMSampleBufferDataIsReady(sample) else { return }
 
-                    switch type {
-                    case .video:
-                        let pts = CMSampleBufferGetPresentationTimeStamp(sample)
-                        let shouldSkip = withStateLock {
-                            if let lastVideoTime {
-                                let delta = CMTimeSubtract(pts, lastVideoTime)
-                                return delta.seconds < (1.0 / fpsValue)
-                            }
-                            return false
+                switch type {
+                case .video:
+                    let pts = CMSampleBufferGetPresentationTimeStamp(sample)
+                    let shouldSkip = withStateLock {
+                        if let lastVideoTime {
+                            let delta = CMTimeSubtract(pts, lastVideoTime)
+                            return delta.seconds < (1.0 / fpsValue)
                         }
-                        if shouldSkip { return }
+                        return false
+                    }
+                    if shouldSkip { return }
 
-                        if withStateLock({ writer == nil }) {
-                            guard let imageBuffer = CMSampleBufferGetImageBuffer(sample) else {
-                                setHandlerError(ScreenRecordError.captureFailed("Missing image buffer"))
-                                return
+                    if withStateLock({ writer == nil }) {
+                        guard let imageBuffer = CMSampleBufferGetImageBuffer(sample) else {
+                            setHandlerError(ScreenRecordError.captureFailed("Missing image buffer"))
+                            return
+                        }
+                        let width = CVPixelBufferGetWidth(imageBuffer)
+                        let height = CVPixelBufferGetHeight(imageBuffer)
+                        do {
+                            let w = try AVAssetWriter(outputURL: outURL, fileType: .mp4)
+                            let settings: [String: Any] = [
+                                AVVideoCodecKey: AVVideoCodecType.h264,
+                                AVVideoWidthKey: width,
+                                AVVideoHeightKey: height,
+                            ]
+                            let vInput = AVAssetWriterInput(mediaType: .video, outputSettings: settings)
+                            vInput.expectsMediaDataInRealTime = true
+                            guard w.canAdd(vInput) else {
+                                throw ScreenRecordError.writeFailed("Cannot add video input")
                             }
-                            let width = CVPixelBufferGetWidth(imageBuffer)
-                            let height = CVPixelBufferGetHeight(imageBuffer)
-                            do {
-                                let w = try AVAssetWriter(outputURL: outURL, fileType: .mp4)
-                                let settings: [String: Any] = [
-                                    AVVideoCodecKey: AVVideoCodecType.h264,
-                                    AVVideoWidthKey: width,
-                                    AVVideoHeightKey: height,
-                                ]
-                                let vInput = AVAssetWriterInput(mediaType: .video, outputSettings: settings)
-                                vInput.expectsMediaDataInRealTime = true
-                                guard w.canAdd(vInput) else {
-                                    throw ScreenRecordError.writeFailed("Cannot add video input")
-                                }
-                                w.add(vInput)
+                            w.add(vInput)
 
-                                if includeAudio {
-                                    let aInput = AVAssetWriterInput(mediaType: .audio, outputSettings: nil)
-                                    aInput.expectsMediaDataInRealTime = true
-                                    if w.canAdd(aInput) {
-                                        w.add(aInput)
-                                        withStateLock {
-                                            audioInput = aInput
-                                        }
+                            if includeAudio {
+                                let aInput = AVAssetWriterInput(mediaType: .audio, outputSettings: nil)
+                                aInput.expectsMediaDataInRealTime = true
+                                if w.canAdd(aInput) {
+                                    w.add(aInput)
+                                    withStateLock {
+                                        audioInput = aInput
                                     }
                                 }
-
-                                guard w.startWriting() else {
-                                    throw ScreenRecordError
-                                        .writeFailed(w.error?.localizedDescription ?? "Failed to start writer")
-                                }
-                                w.startSession(atSourceTime: pts)
-                                withStateLock {
-                                    writer = w
-                                    videoInput = vInput
-                                    started = true
-                                }
-                            } catch {
-                                setHandlerError(error)
-                                return
                             }
-                        }
 
-                        let vInput = withStateLock { videoInput }
-                        let isStarted = withStateLock { started }
-                        guard let vInput, isStarted else { return }
-                        if vInput.isReadyForMoreMediaData {
-                            if vInput.append(sample) {
-                                withStateLock {
-                                    sawVideo = true
-                                    lastVideoTime = pts
-                                }
-                            } else {
-                                if let err = withStateLock({ writer?.error }) {
-                                    setHandlerError(ScreenRecordError.writeFailed(err.localizedDescription))
-                                }
+                            guard w.startWriting() else {
+                                throw ScreenRecordError
+                                    .writeFailed(w.error?.localizedDescription ?? "Failed to start writer")
                             }
+                            w.startSession(atSourceTime: pts)
+                            withStateLock {
+                                writer = w
+                                videoInput = vInput
+                                started = true
+                            }
+                        } catch {
+                            setHandlerError(error)
+                            return
                         }
-
-                    case .audioApp, .audioMic:
-                        let aInput = withStateLock { audioInput }
-                        let isStarted = withStateLock { started }
-                        guard includeAudio, let aInput, isStarted else { return }
-                        if aInput.isReadyForMoreMediaData {
-                            _ = aInput.append(sample)
-                        }
-
-                    @unknown default:
-                        break
                     }
-                }, completionHandler: { error in
-                    if let error { cont.resume(throwing: error) } else { cont.resume() }
-                })
+
+                    let vInput = withStateLock { videoInput }
+                    let isStarted = withStateLock { started }
+                    guard let vInput, isStarted else { return }
+                    if vInput.isReadyForMoreMediaData {
+                        if vInput.append(sample) {
+                            withStateLock {
+                                sawVideo = true
+                                lastVideoTime = pts
+                            }
+                        } else {
+                            if let err = withStateLock({ writer?.error }) {
+                                setHandlerError(ScreenRecordError.writeFailed(err.localizedDescription))
+                            }
+                        }
+                    }
+
+                case .audioApp, .audioMic:
+                    let aInput = withStateLock { audioInput }
+                    let isStarted = withStateLock { started }
+                    guard includeAudio, let aInput, isStarted else { return }
+                    if aInput.isReadyForMoreMediaData {
+                        _ = aInput.append(sample)
+                    }
+
+                @unknown default:
+                    break
+                }
+            }
+
+            let completion: @Sendable (Error?) -> Void = { error in
+                if let error { cont.resume(throwing: error) } else { cont.resume() }
+            }
+
+            Task { @MainActor in
+                let recorder = RPScreenRecorder.shared()
+                recorder.isMicrophoneEnabled = includeAudio
+                recorder.startCapture(handler: handler, completionHandler: completion)
             }
         }
 
@@ -182,6 +183,7 @@ final class ScreenRecordService {
 
         let stopError = await withCheckedContinuation { cont in
             Task { @MainActor in
+                let recorder = RPScreenRecorder.shared()
                 recorder.stopCapture { error in cont.resume(returning: error) }
             }
         }

From 7a849ab7d114900a960c662f3a713ec58c2825b4 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 20:24:34 +0100
Subject: [PATCH 009/100] fix: isolate ReplayKit capture state

---
 .../Sources/Screen/ScreenRecordService.swift  | 129 +++++++++++-------
 1 file changed, 78 insertions(+), 51 deletions(-)

diff --git a/apps/ios/Sources/Screen/ScreenRecordService.swift b/apps/ios/Sources/Screen/ScreenRecordService.swift
index 79151488c..829f29cd7 100644
--- a/apps/ios/Sources/Screen/ScreenRecordService.swift
+++ b/apps/ios/Sources/Screen/ScreenRecordService.swift
@@ -6,6 +6,23 @@ final class ScreenRecordService {
         let value: T
     }
 
+    private final class CaptureState: @unchecked Sendable {
+        private let lock = NSLock()
+        var writer: AVAssetWriter?
+        var videoInput: AVAssetWriterInput?
+        var audioInput: AVAssetWriterInput?
+        var started = false
+        var sawVideo = false
+        var lastVideoTime: CMTime?
+        var handlerError: Error?
+
+        func withLock<T>(_ body: (CaptureState) -> T) -> T {
+            self.lock.lock()
+            defer { lock.unlock() }
+            return body(self)
+        }
+    }
+
     enum ScreenRecordError: LocalizedError {
         case invalidScreenIndex(Int)
         case captureFailed(String)
@@ -50,31 +67,14 @@ final class ScreenRecordService {
         }()
         try? FileManager.default.removeItem(at: outURL)
 
-        var writer: AVAssetWriter?
-        var videoInput: AVAssetWriterInput?
-        var audioInput: AVAssetWriterInput?
-        var started = false
-        var sawVideo = false
-        var lastVideoTime: CMTime?
-        var handlerError: Error?
-        let stateLock = NSLock()
-
-        func withStateLock<T>(_ body: () -> T) -> T {
-            stateLock.lock()
-            defer { stateLock.unlock() }
-            return body()
-        }
-
-        func setHandlerError(_ error: Error) {
-            withStateLock {
-                if handlerError == nil { handlerError = error }
-            }
-        }
+        let state = CaptureState()
 
         try await withCheckedThrowingContinuation { (cont: CheckedContinuation<Void, Error>) in
             let handler: @Sendable (CMSampleBuffer, RPSampleBufferType, Error?) -> Void = { sample, type, error in
                 if let error {
-                    setHandlerError(error)
+                    state.withLock { state in
+                        if state.handlerError == nil { state.handlerError = error }
+                    }
                     return
                 }
                 guard CMSampleBufferDataIsReady(sample) else { return }
@@ -82,8 +82,8 @@ final class ScreenRecordService {
                 switch type {
                 case .video:
                     let pts = CMSampleBufferGetPresentationTimeStamp(sample)
-                    let shouldSkip = withStateLock {
-                        if let lastVideoTime {
+                    let shouldSkip = state.withLock { state in
+                        if let lastVideoTime = state.lastVideoTime {
                             let delta = CMTimeSubtract(pts, lastVideoTime)
                             return delta.seconds < (1.0 / fpsValue)
                         }
@@ -91,9 +91,13 @@ final class ScreenRecordService {
                     }
                     if shouldSkip { return }
 
-                    if withStateLock({ writer == nil }) {
+                    if state.withLock({ $0.writer == nil }) {
                         guard let imageBuffer = CMSampleBufferGetImageBuffer(sample) else {
-                            setHandlerError(ScreenRecordError.captureFailed("Missing image buffer"))
+                            state.withLock { state in
+                                if state.handlerError == nil {
+                                    state.handlerError = ScreenRecordError.captureFailed("Missing image buffer")
+                                }
+                            }
                             return
                         }
                         let width = CVPixelBufferGetWidth(imageBuffer)
@@ -117,8 +121,8 @@ final class ScreenRecordService {
                                 aInput.expectsMediaDataInRealTime = true
                                 if w.canAdd(aInput) {
                                     w.add(aInput)
-                                    withStateLock {
-                                        audioInput = aInput
+                                    state.withLock { state in
+                                        state.audioInput = aInput
                                     }
                                 }
                             }
@@ -128,36 +132,43 @@ final class ScreenRecordService {
                                     .writeFailed(w.error?.localizedDescription ?? "Failed to start writer")
                             }
                             w.startSession(atSourceTime: pts)
-                            withStateLock {
-                                writer = w
-                                videoInput = vInput
-                                started = true
+                            state.withLock { state in
+                                state.writer = w
+                                state.videoInput = vInput
+                                state.started = true
                             }
                         } catch {
-                            setHandlerError(error)
+                            state.withLock { state in
+                                if state.handlerError == nil { state.handlerError = error }
+                            }
                             return
                         }
                     }
 
-                    let vInput = withStateLock { videoInput }
-                    let isStarted = withStateLock { started }
+                    let vInput = state.withLock { $0.videoInput }
+                    let isStarted = state.withLock { $0.started }
                     guard let vInput, isStarted else { return }
                     if vInput.isReadyForMoreMediaData {
                         if vInput.append(sample) {
-                            withStateLock {
-                                sawVideo = true
-                                lastVideoTime = pts
+                            state.withLock { state in
+                                state.sawVideo = true
+                                state.lastVideoTime = pts
                             }
                         } else {
-                            if let err = withStateLock({ writer?.error }) {
-                                setHandlerError(ScreenRecordError.writeFailed(err.localizedDescription))
+                            let err = state.withLock { $0.writer?.error }
+                            if let err {
+                                state.withLock { state in
+                                    if state.handlerError == nil {
+                                        state.handlerError = ScreenRecordError.writeFailed(err.localizedDescription)
+                                    }
+                                }
                             }
                         }
                     }
 
                 case .audioApp, .audioMic:
-                    let aInput = withStateLock { audioInput }
-                    let isStarted = withStateLock { started }
+                    let aInput = state.withLock { $0.audioInput }
+                    let isStarted = state.withLock { $0.started }
                     guard includeAudio, let aInput, isStarted else { return }
                     if aInput.isReadyForMoreMediaData {
                         _ = aInput.append(sample)
@@ -173,9 +184,10 @@ final class ScreenRecordService {
             }
 
             Task { @MainActor in
-                let recorder = RPScreenRecorder.shared()
-                recorder.isMicrophoneEnabled = includeAudio
-                recorder.startCapture(handler: handler, completionHandler: completion)
+                self.startCapture(
+                    includeAudio: includeAudio,
+                    handler: handler,
+                    completion: completion)
             }
         }
 
@@ -183,18 +195,17 @@ final class ScreenRecordService {
 
         let stopError = await withCheckedContinuation { cont in
             Task { @MainActor in
-                let recorder = RPScreenRecorder.shared()
-                recorder.stopCapture { error in cont.resume(returning: error) }
+                self.stopCapture { error in cont.resume(returning: error) }
             }
         }
         if let stopError { throw stopError }
 
-        let handlerErrorSnapshot = withStateLock { handlerError }
+        let handlerErrorSnapshot = state.withLock { $0.handlerError }
         if let handlerErrorSnapshot { throw handlerErrorSnapshot }
-        let writerSnapshot = withStateLock { writer }
-        let videoInputSnapshot = withStateLock { videoInput }
-        let audioInputSnapshot = withStateLock { audioInput }
-        let sawVideoSnapshot = withStateLock { sawVideo }
+        let writerSnapshot = state.withLock { $0.writer }
+        let videoInputSnapshot = state.withLock { $0.videoInput }
+        let audioInputSnapshot = state.withLock { $0.audioInput }
+        let sawVideoSnapshot = state.withLock { $0.sawVideo }
         guard let writerSnapshot, let videoInputSnapshot, sawVideoSnapshot else {
             throw ScreenRecordError.captureFailed("No frames captured")
         }
@@ -219,6 +230,22 @@ final class ScreenRecordService {
         return outURL.path
     }
 
+    @MainActor
+    private func startCapture(
+        includeAudio: Bool,
+        handler: @escaping (CMSampleBuffer, RPSampleBufferType, Error?) -> Void,
+        completion: @escaping (Error?) -> Void)
+    {
+        let recorder = RPScreenRecorder.shared()
+        recorder.isMicrophoneEnabled = includeAudio
+        recorder.startCapture(handler: handler, completionHandler: completion)
+    }
+
+    @MainActor
+    private func stopCapture(_ completion: @escaping (Error?) -> Void) {
+        RPScreenRecorder.shared().stopCapture(completionHandler: completion)
+    }
+
     private nonisolated static func clampDurationMs(_ ms: Int?) -> Int {
         let v = ms ?? 10000
         return min(60000, max(250, v))

From a8c9b2810b9e74319412a4e949d0300c2367499c Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 20:25:44 +0100
Subject: [PATCH 010/100] fix: align ReplayKit stopCapture call

---
 apps/ios/Sources/Screen/ScreenRecordService.swift | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/ios/Sources/Screen/ScreenRecordService.swift b/apps/ios/Sources/Screen/ScreenRecordService.swift
index 829f29cd7..5cc1221b9 100644
--- a/apps/ios/Sources/Screen/ScreenRecordService.swift
+++ b/apps/ios/Sources/Screen/ScreenRecordService.swift
@@ -233,8 +233,8 @@ final class ScreenRecordService {
     @MainActor
     private func startCapture(
         includeAudio: Bool,
-        handler: @escaping (CMSampleBuffer, RPSampleBufferType, Error?) -> Void,
-        completion: @escaping (Error?) -> Void)
+        handler: @escaping @Sendable (CMSampleBuffer, RPSampleBufferType, Error?) -> Void,
+        completion: @escaping @Sendable (Error?) -> Void)
     {
         let recorder = RPScreenRecorder.shared()
         recorder.isMicrophoneEnabled = includeAudio
@@ -242,8 +242,8 @@ final class ScreenRecordService {
     }
 
     @MainActor
-    private func stopCapture(_ completion: @escaping (Error?) -> Void) {
-        RPScreenRecorder.shared().stopCapture(completionHandler: completion)
+    private func stopCapture(_ completion: @escaping @Sendable (Error?) -> Void) {
+        RPScreenRecorder.shared().stopCapture { error in completion(error) }
     }
 
     private nonisolated static func clampDurationMs(_ ms: Int?) -> Int {

From c11e2d9e5e402033b2d6007ed5383076b5b70275 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 20:26:49 +0100
Subject: [PATCH 011/100] fix: avoid self capture in ReplayKit start

---
 .../Sources/Screen/ScreenRecordService.swift  | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/apps/ios/Sources/Screen/ScreenRecordService.swift b/apps/ios/Sources/Screen/ScreenRecordService.swift
index 5cc1221b9..cada5bbbd 100644
--- a/apps/ios/Sources/Screen/ScreenRecordService.swift
+++ b/apps/ios/Sources/Screen/ScreenRecordService.swift
@@ -184,7 +184,7 @@ final class ScreenRecordService {
             }
 
             Task { @MainActor in
-                self.startCapture(
+                startReplayKitCapture(
                     includeAudio: includeAudio,
                     handler: handler,
                     completion: completion)
@@ -195,7 +195,7 @@ final class ScreenRecordService {
 
         let stopError = await withCheckedContinuation { cont in
             Task { @MainActor in
-                self.stopCapture { error in cont.resume(returning: error) }
+                stopReplayKitCapture { error in cont.resume(returning: error) }
             }
         }
         if let stopError { throw stopError }
@@ -230,22 +230,6 @@ final class ScreenRecordService {
         return outURL.path
     }
 
-    @MainActor
-    private func startCapture(
-        includeAudio: Bool,
-        handler: @escaping @Sendable (CMSampleBuffer, RPSampleBufferType, Error?) -> Void,
-        completion: @escaping @Sendable (Error?) -> Void)
-    {
-        let recorder = RPScreenRecorder.shared()
-        recorder.isMicrophoneEnabled = includeAudio
-        recorder.startCapture(handler: handler, completionHandler: completion)
-    }
-
-    @MainActor
-    private func stopCapture(_ completion: @escaping @Sendable (Error?) -> Void) {
-        RPScreenRecorder.shared().stopCapture { error in completion(error) }
-    }
-
     private nonisolated static func clampDurationMs(_ ms: Int?) -> Int {
         let v = ms ?? 10000
         return min(60000, max(250, v))
@@ -258,6 +242,22 @@ final class ScreenRecordService {
     }
 }
 
+@MainActor
+private func startReplayKitCapture(
+    includeAudio: Bool,
+    handler: @escaping @Sendable (CMSampleBuffer, RPSampleBufferType, Error?) -> Void,
+    completion: @escaping @Sendable (Error?) -> Void)
+{
+    let recorder = RPScreenRecorder.shared()
+    recorder.isMicrophoneEnabled = includeAudio
+    recorder.startCapture(handler: handler, completionHandler: completion)
+}
+
+@MainActor
+private func stopReplayKitCapture(_ completion: @escaping @Sendable (Error?) -> Void) {
+    RPScreenRecorder.shared().stopCapture { error in completion(error) }
+}
+
 #if DEBUG
 extension ScreenRecordService {
     nonisolated static func _test_clampDurationMs(_ ms: Int?) -> Int {

From 24151a2028f31a54aef89ab4c948bcab6d0ba714 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 20:28:06 +0100
Subject: [PATCH 012/100] fix: mark screen recorder sendable

---
 apps/ios/Sources/Screen/ScreenRecordService.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/ios/Sources/Screen/ScreenRecordService.swift b/apps/ios/Sources/Screen/ScreenRecordService.swift
index cada5bbbd..861704310 100644
--- a/apps/ios/Sources/Screen/ScreenRecordService.swift
+++ b/apps/ios/Sources/Screen/ScreenRecordService.swift
@@ -1,7 +1,7 @@
 import AVFoundation
 import ReplayKit
 
-final class ScreenRecordService {
+final class ScreenRecordService: @unchecked Sendable {
     private struct UncheckedSendableBox<T>: @unchecked Sendable {
         let value: T
     }

From 52263bd5a3b754181344a7907bb098e28e83750d Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 20:45:50 +0100
Subject: [PATCH 013/100] fix: avoid cli gateway close race

---
 CHANGELOG.md        | 1 +
 src/gateway/call.ts | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 224f37ab4..10460860c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - macOS menu: device list now uses `node.list` (devices only; no agent/tool presence entries).
 - macOS menu: device list now shows connected nodes only.
 - iOS node: fix ReplayKit screen recording crash caused by queue isolation assertions during capture.
+- CLI: avoid spurious gateway close errors after successful request/response cycles.
 
 ## 2.0.0-beta4 — 2025-12-27
 
diff --git a/src/gateway/call.ts b/src/gateway/call.ts
index 3ebdcd0dd..c2b14623b 100644
--- a/src/gateway/call.ts
+++ b/src/gateway/call.ts
@@ -25,6 +25,7 @@ export async function callGateway<T = unknown>(
   const timeoutMs = opts.timeoutMs ?? 10_000;
   return await new Promise<T>((resolve, reject) => {
     let settled = false;
+    let ignoreClose = false;
     const stop = (err?: Error, value?: T) => {
       if (settled) return;
       settled = true;
@@ -49,19 +50,23 @@ export async function callGateway<T = unknown>(
           const result = await client.request<T>(opts.method, opts.params, {
             expectFinal: opts.expectFinal,
           });
-          client.stop();
+          ignoreClose = true;
           stop(undefined, result);
+          client.stop();
         } catch (err) {
+          ignoreClose = true;
           client.stop();
           stop(err as Error);
         }
       },
       onClose: (code, reason) => {
+        if (settled || ignoreClose) return;
         stop(new Error(`gateway closed (${code}): ${reason}`));
       },
     });
 
     const timer = setTimeout(() => {
+      ignoreClose = true;
       client.stop();
       stop(new Error("gateway timeout"));
     }, timeoutMs);

From cf42fabfd86294547e21b004410e2f43abb8697d Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 21:10:44 +0100
Subject: [PATCH 014/100] test: add ios swift testing + android kotest

---
 CHANGELOG.md                                       |  1 +
 apps/android/app/build.gradle.kts                  |  7 +++++++
 .../node/bridge/BridgeEndpointKotestTest.kt        | 14 ++++++++++++++
 apps/ios/Tests/CameraControllerErrorTests.swift    | 13 +++++++++++++
 4 files changed, 35 insertions(+)
 create mode 100644 apps/android/app/src/test/java/com/steipete/clawdis/node/bridge/BridgeEndpointKotestTest.kt
 create mode 100644 apps/ios/Tests/CameraControllerErrorTests.swift

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10460860c..31ef2cad9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - macOS menu: device list now shows connected nodes only.
 - iOS node: fix ReplayKit screen recording crash caused by queue isolation assertions during capture.
 - CLI: avoid spurious gateway close errors after successful request/response cycles.
+- Tests: add Swift Testing coverage for camera errors and Kotest coverage for Android bridge endpoints.
 
 ## 2.0.0-beta4 — 2025-12-27
 
diff --git a/apps/android/app/build.gradle.kts b/apps/android/app/build.gradle.kts
index c2f1cd817..1b353d83f 100644
--- a/apps/android/app/build.gradle.kts
+++ b/apps/android/app/build.gradle.kts
@@ -93,4 +93,11 @@ dependencies {
 
   testImplementation("junit:junit:4.13.2")
   testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2")
+  testImplementation("io.kotest:kotest-runner-junit5-jvm:6.0.7")
+  testImplementation("io.kotest:kotest-assertions-core-jvm:6.0.7")
+  testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.13.3")
+}
+
+tasks.withType<Test>().configureEach {
+  useJUnitPlatform()
 }
diff --git a/apps/android/app/src/test/java/com/steipete/clawdis/node/bridge/BridgeEndpointKotestTest.kt b/apps/android/app/src/test/java/com/steipete/clawdis/node/bridge/BridgeEndpointKotestTest.kt
new file mode 100644
index 000000000..5e1b09490
--- /dev/null
+++ b/apps/android/app/src/test/java/com/steipete/clawdis/node/bridge/BridgeEndpointKotestTest.kt
@@ -0,0 +1,14 @@
+package com.steipete.clawdis.node.bridge
+
+import io.kotest.core.spec.style.StringSpec
+import io.kotest.matchers.shouldBe
+
+class BridgeEndpointKotestTest : StringSpec({
+  "manual endpoint builds stable id + name" {
+    val endpoint = BridgeEndpoint.manual("10.0.0.5", 18790)
+    endpoint.stableId shouldBe "manual|10.0.0.5|18790"
+    endpoint.name shouldBe "10.0.0.5:18790"
+    endpoint.host shouldBe "10.0.0.5"
+    endpoint.port shouldBe 18790
+  }
+})
diff --git a/apps/ios/Tests/CameraControllerErrorTests.swift b/apps/ios/Tests/CameraControllerErrorTests.swift
new file mode 100644
index 000000000..3b3c94281
--- /dev/null
+++ b/apps/ios/Tests/CameraControllerErrorTests.swift
@@ -0,0 +1,13 @@
+import Testing
+@testable import Clawdis
+
+@Suite struct CameraControllerErrorTests {
+    @Test func errorDescriptionsAreStable() {
+        #expect(CameraController.CameraError.cameraUnavailable.errorDescription == "Camera unavailable")
+        #expect(CameraController.CameraError.microphoneUnavailable.errorDescription == "Microphone unavailable")
+        #expect(CameraController.CameraError.permissionDenied(kind: "Camera").errorDescription == "Camera permission denied")
+        #expect(CameraController.CameraError.invalidParams("bad").errorDescription == "bad")
+        #expect(CameraController.CameraError.captureFailed("nope").errorDescription == "nope")
+        #expect(CameraController.CameraError.exportFailed("export").errorDescription == "export")
+    }
+}

From b0396e196f46f6b6ed8259bd2fa92edc6ac0da62 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 22:11:12 +0100
Subject: [PATCH 015/100] fix: refresh bridge tokens and enrich node settings

---
 CHANGELOG.md                                  |  1 +
 .../clawdis/node/bridge/BridgeDiscovery.kt    | 68 ++++++++++++++----
 .../clawdis/node/bridge/BridgeEndpoint.kt     |  6 +-
 .../steipete/clawdis/node/ui/SettingsSheet.kt | 40 ++++++++++-
 .../Bridge/BridgeConnectionController.swift   | 69 +++++++++++++++++--
 .../Sources/Bridge/BridgeDiscoveryModel.swift | 27 +++++++-
 apps/ios/Sources/Settings/SettingsTab.swift   | 31 +++++++++
 .../BridgeConnectionControllerTests.swift     | 68 ++++++++++++++++++
 8 files changed, 286 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31ef2cad9..4edcae2c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - macOS menu: device list now uses `node.list` (devices only; no agent/tool presence entries).
 - macOS menu: device list now shows connected nodes only.
 - iOS node: fix ReplayKit screen recording crash caused by queue isolation assertions during capture.
+- iOS/Android nodes: bridge auto-connect refreshes stale tokens and settings now show richer bridge/device details.
 - CLI: avoid spurious gateway close errors after successful request/response cycles.
 - Tests: add Swift Testing coverage for camera errors and Kotest coverage for Android bridge endpoints.
 
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BridgeDiscovery.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BridgeDiscovery.kt
index 17e9120c1..b33261ccb 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BridgeDiscovery.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BridgeDiscovery.kt
@@ -130,20 +130,36 @@ class BridgeDiscovery(
       object : NsdManager.ResolveListener {
         override fun onResolveFailed(serviceInfo: NsdServiceInfo, errorCode: Int) {}
 
-        override fun onServiceResolved(resolved: NsdServiceInfo) {
-          val host = resolved.host?.hostAddress ?: return
-          val port = resolved.port
-          if (port <= 0) return
+      override fun onServiceResolved(resolved: NsdServiceInfo) {
+        val host = resolved.host?.hostAddress ?: return
+        val port = resolved.port
+        if (port <= 0) return
 
-          val rawServiceName = resolved.serviceName
-          val serviceName = BonjourEscapes.decode(rawServiceName)
-          val displayName = BonjourEscapes.decode(txt(resolved, "displayName") ?: serviceName)
-          val id = stableId(serviceName, "local.")
-          localById[id] = BridgeEndpoint(stableId = id, name = displayName, host = host, port = port)
-          publish()
-        }
-      },
-    )
+        val rawServiceName = resolved.serviceName
+        val serviceName = BonjourEscapes.decode(rawServiceName)
+        val displayName = BonjourEscapes.decode(txt(resolved, "displayName") ?: serviceName)
+        val lanHost = txt(resolved, "lanHost")
+        val tailnetDns = txt(resolved, "tailnetDns")
+        val gatewayPort = txtInt(resolved, "gatewayPort")
+        val bridgePort = txtInt(resolved, "bridgePort")
+        val canvasPort = txtInt(resolved, "canvasPort")
+        val id = stableId(serviceName, "local.")
+        localById[id] =
+          BridgeEndpoint(
+            stableId = id,
+            name = displayName,
+            host = host,
+            port = port,
+            lanHost = lanHost,
+            tailnetDns = tailnetDns,
+            gatewayPort = gatewayPort,
+            bridgePort = bridgePort,
+            canvasPort = canvasPort,
+          )
+        publish()
+      }
+    },
+  )
   }
 
   private fun publish() {
@@ -189,6 +205,10 @@ class BridgeDiscovery(
     }
   }
 
+  private fun txtInt(info: NsdServiceInfo, key: String): Int? {
+    return txt(info, key)?.toIntOrNull()
+  }
+
   private suspend fun refreshUnicast(domain: String) {
     val ptrName = "${serviceType}${domain}"
     val ptrMsg = lookupUnicastMessage(ptrName, Type.PTR) ?: return
@@ -227,8 +247,24 @@ class BridgeDiscovery(
         }
       val instanceName = BonjourEscapes.decode(decodeInstanceName(instanceFqdn, domain))
       val displayName = BonjourEscapes.decode(txtValue(txt, "displayName") ?: instanceName)
+      val lanHost = txtValue(txt, "lanHost")
+      val tailnetDns = txtValue(txt, "tailnetDns")
+      val gatewayPort = txtIntValue(txt, "gatewayPort")
+      val bridgePort = txtIntValue(txt, "bridgePort")
+      val canvasPort = txtIntValue(txt, "canvasPort")
       val id = stableId(instanceName, domain)
-      next[id] = BridgeEndpoint(stableId = id, name = displayName, host = host, port = port)
+      next[id] =
+        BridgeEndpoint(
+          stableId = id,
+          name = displayName,
+          host = host,
+          port = port,
+          lanHost = lanHost,
+          tailnetDns = tailnetDns,
+          gatewayPort = gatewayPort,
+          bridgePort = bridgePort,
+          canvasPort = canvasPort,
+        )
     }
 
     unicastById.clear()
@@ -434,6 +470,10 @@ class BridgeDiscovery(
     return null
   }
 
+  private fun txtIntValue(records: List<TXTRecord>, key: String): Int? {
+    return txtValue(records, key)?.toIntOrNull()
+  }
+
   private fun decodeDnsTxtString(raw: String): String {
     // dnsjava treats TXT as opaque bytes and decodes as ISO-8859-1 to preserve bytes.
     // Our TXT payload is UTF-8 (written by the gateway), so re-decode when possible.
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BridgeEndpoint.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BridgeEndpoint.kt
index bd359e470..41c415c4b 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BridgeEndpoint.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BridgeEndpoint.kt
@@ -5,6 +5,11 @@ data class BridgeEndpoint(
   val name: String,
   val host: String,
   val port: Int,
+  val lanHost: String? = null,
+  val tailnetDns: String? = null,
+  val gatewayPort: Int? = null,
+  val bridgePort: Int? = null,
+  val canvasPort: Int? = null,
 ) {
   companion object {
     fun manual(host: String, port: Int): BridgeEndpoint =
@@ -16,4 +21,3 @@ data class BridgeEndpoint(
       )
   }
 }
-
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/SettingsSheet.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/SettingsSheet.kt
index 038ef9faf..c7d011892 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/SettingsSheet.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/SettingsSheet.kt
@@ -2,6 +2,7 @@ package com.steipete.clawdis.node.ui
 
 import android.Manifest
 import android.content.pm.PackageManager
+import android.os.Build
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.AnimatedVisibility
@@ -46,6 +47,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
+import com.steipete.clawdis.node.BuildConfig
 import com.steipete.clawdis.node.MainViewModel
 import com.steipete.clawdis.node.NodeForegroundService
 import com.steipete.clawdis.node.VoiceWakeMode
@@ -74,6 +76,22 @@ fun SettingsSheet(viewModel: MainViewModel) {
   val listState = rememberLazyListState()
   val (wakeWordsText, setWakeWordsText) = remember { mutableStateOf("") }
   val (advancedExpanded, setAdvancedExpanded) = remember { mutableStateOf(false) }
+  val deviceModel =
+    remember {
+      listOfNotNull(Build.MANUFACTURER, Build.MODEL)
+        .joinToString(" ")
+        .trim()
+        .ifEmpty { "Android" }
+    }
+  val appVersion =
+    remember {
+      val versionName = BuildConfig.VERSION_NAME.trim().ifEmpty { "dev" }
+      if (BuildConfig.DEBUG && !versionName.contains("dev", ignoreCase = true)) {
+        "$versionName-dev"
+      } else {
+        versionName
+      }
+    }
 
   LaunchedEffect(wakeWords) { setWakeWordsText(wakeWords.joinToString(", ")) }
 
@@ -142,6 +160,8 @@ fun SettingsSheet(viewModel: MainViewModel) {
       )
     }
     item { Text("Instance ID: $instanceId", color = MaterialTheme.colorScheme.onSurfaceVariant) }
+    item { Text("Device: $deviceModel", color = MaterialTheme.colorScheme.onSurfaceVariant) }
+    item { Text("Version: $appVersion", color = MaterialTheme.colorScheme.onSurfaceVariant) }
 
     item { HorizontalDivider() }
 
@@ -181,9 +201,27 @@ fun SettingsSheet(viewModel: MainViewModel) {
         item { Text("No bridges found yet.", color = MaterialTheme.colorScheme.onSurfaceVariant) }
       } else {
         items(items = visibleBridges, key = { it.stableId }) { bridge ->
+          val detailLines =
+            buildList {
+              add("IP: ${bridge.host}:${bridge.port}")
+              bridge.lanHost?.let { add("LAN: $it") }
+              bridge.tailnetDns?.let { add("Tailnet: $it") }
+              if (bridge.gatewayPort != null || bridge.bridgePort != null || bridge.canvasPort != null) {
+                val gw = bridge.gatewayPort?.toString() ?: "—"
+                val br = (bridge.bridgePort ?: bridge.port).toString()
+                val canvas = bridge.canvasPort?.toString() ?: "—"
+                add("Ports: gw $gw · bridge $br · canvas $canvas")
+              }
+            }
           ListItem(
             headlineContent = { Text(bridge.name) },
-            supportingContent = { Text("${bridge.host}:${bridge.port}") },
+            supportingContent = {
+              Column(verticalArrangement = Arrangement.spacedBy(2.dp)) {
+                detailLines.forEach { line ->
+                  Text(line, color = MaterialTheme.colorScheme.onSurfaceVariant)
+                }
+              }
+            },
             trailingContent = {
               Button(
                 onClick = {
diff --git a/apps/ios/Sources/Bridge/BridgeConnectionController.swift b/apps/ios/Sources/Bridge/BridgeConnectionController.swift
index 162e13858..256417319 100644
--- a/apps/ios/Sources/Bridge/BridgeConnectionController.swift
+++ b/apps/ios/Sources/Bridge/BridgeConnectionController.swift
@@ -6,6 +6,15 @@ import Observation
 import SwiftUI
 import UIKit
 
+protocol BridgePairingClient: Sendable {
+    func pairAndHello(
+        endpoint: NWEndpoint,
+        hello: BridgeHello,
+        onStatus: (@Sendable (String) -> Void)?) async throws -> String
+}
+
+extension BridgeClient: BridgePairingClient {}
+
 @MainActor
 @Observable
 final class BridgeConnectionController {
@@ -18,8 +27,15 @@ final class BridgeConnectionController {
     private var didAutoConnect = false
     private var seenStableIDs = Set<String>()
 
-    init(appModel: NodeAppModel, startDiscovery: Bool = true) {
+    private let bridgeClientFactory: @Sendable () -> any BridgePairingClient
+
+    init(
+        appModel: NodeAppModel,
+        startDiscovery: Bool = true,
+        bridgeClientFactory: @escaping @Sendable () -> any BridgePairingClient = { BridgeClient() })
+    {
         self.appModel = appModel
+        self.bridgeClientFactory = bridgeClientFactory
 
         BridgeSettingsStore.bootstrapPersistence()
         let defaults = UserDefaults.standard
@@ -85,7 +101,7 @@ final class BridgeConnectionController {
 
         let token = KeychainStore.loadString(
             service: "com.steipete.clawdis.bridge",
-            account: "bridge-token.\(instanceId)")?
+            account: self.keychainAccount(instanceId: instanceId))?
             .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         guard !token.isEmpty else { return }
 
@@ -99,9 +115,8 @@ final class BridgeConnectionController {
             guard let port = NWEndpoint.Port(rawValue: UInt16(resolvedPort)) else { return }
 
             self.didAutoConnect = true
-            appModel.connectToBridge(
-                endpoint: .hostPort(host: NWEndpoint.Host(manualHost), port: port),
-                hello: self.makeHello(token: token))
+            let endpoint = NWEndpoint.hostPort(host: NWEndpoint.Host(manualHost), port: port)
+            self.startAutoConnect(endpoint: endpoint, token: token, instanceId: instanceId)
             return
         }
 
@@ -112,7 +127,7 @@ final class BridgeConnectionController {
         guard let target = self.bridges.first(where: { $0.stableID == targetStableID }) else { return }
 
         self.didAutoConnect = true
-        appModel.connectToBridge(endpoint: target.endpoint, hello: self.makeHello(token: token))
+        self.startAutoConnect(endpoint: target.endpoint, token: token, instanceId: instanceId)
     }
 
     private func updateLastDiscoveredBridge(from bridges: [BridgeDiscoveryModel.DiscoveredBridge]) {
@@ -140,6 +155,40 @@ final class BridgeConnectionController {
             commands: self.currentCommands())
     }
 
+    private func keychainAccount(instanceId: String) -> String {
+        "bridge-token.\(instanceId)"
+    }
+
+    private func startAutoConnect(endpoint: NWEndpoint, token: String, instanceId: String) {
+        guard let appModel else { return }
+        Task { [weak self] in
+            guard let self else { return }
+            do {
+                let hello = self.makeHello(token: token)
+                let refreshed = try await self.bridgeClientFactory().pairAndHello(
+                    endpoint: endpoint,
+                    hello: hello,
+                    onStatus: { status in
+                        Task { @MainActor in
+                            appModel.bridgeStatusText = status
+                        }
+                    })
+                let resolvedToken = refreshed.isEmpty ? token : refreshed
+                if !refreshed.isEmpty, refreshed != token {
+                    _ = KeychainStore.saveString(
+                        refreshed,
+                        service: "com.steipete.clawdis.bridge",
+                        account: self.keychainAccount(instanceId: instanceId))
+                }
+                appModel.connectToBridge(endpoint: endpoint, hello: self.makeHello(token: resolvedToken))
+            } catch {
+                await MainActor.run {
+                    appModel.bridgeStatusText = "Bridge error: \(error.localizedDescription)"
+                }
+            }
+        }
+    }
+
     private func resolvedDisplayName(defaults: UserDefaults) -> String {
         let key = "node.displayName"
         let existing = defaults.string(forKey: key)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
@@ -265,5 +314,13 @@ extension BridgeConnectionController {
     func _test_appVersion() -> String {
         self.appVersion()
     }
+
+    func _test_setBridges(_ bridges: [BridgeDiscoveryModel.DiscoveredBridge]) {
+        self.bridges = bridges
+    }
+
+    func _test_triggerAutoConnect() {
+        self.maybeAutoConnect()
+    }
 }
 #endif
diff --git a/apps/ios/Sources/Bridge/BridgeDiscoveryModel.swift b/apps/ios/Sources/Bridge/BridgeDiscoveryModel.swift
index 2555de680..45df2a887 100644
--- a/apps/ios/Sources/Bridge/BridgeDiscoveryModel.swift
+++ b/apps/ios/Sources/Bridge/BridgeDiscoveryModel.swift
@@ -18,6 +18,12 @@ final class BridgeDiscoveryModel {
         var endpoint: NWEndpoint
         var stableID: String
         var debugID: String
+        var lanHost: String?
+        var tailnetDns: String?
+        var gatewayPort: Int?
+        var bridgePort: Int?
+        var canvasPort: Int?
+        var cliPath: String?
     }
 
     var bridges: [DiscoveredBridge] = []
@@ -68,7 +74,8 @@ final class BridgeDiscoveryModel {
                         switch result.endpoint {
                         case let .service(name, _, _, _):
                             let decodedName = BonjourEscapes.decode(name)
-                            let advertisedName = result.endpoint.txtRecord?.dictionary["displayName"]
+                            let txt = result.endpoint.txtRecord?.dictionary ?? [:]
+                            let advertisedName = txt["displayName"]
                             let prettyAdvertised = advertisedName
                                 .map(Self.prettifyInstanceName)
                                 .flatMap { $0.isEmpty ? nil : $0 }
@@ -77,7 +84,13 @@ final class BridgeDiscoveryModel {
                                 name: prettyName,
                                 endpoint: result.endpoint,
                                 stableID: BridgeEndpointID.stableID(result.endpoint),
-                                debugID: BridgeEndpointID.prettyDescription(result.endpoint))
+                                debugID: BridgeEndpointID.prettyDescription(result.endpoint),
+                                lanHost: Self.txtValue(txt, key: "lanHost"),
+                                tailnetDns: Self.txtValue(txt, key: "tailnetDns"),
+                                gatewayPort: Self.txtIntValue(txt, key: "gatewayPort"),
+                                bridgePort: Self.txtIntValue(txt, key: "bridgePort"),
+                                canvasPort: Self.txtIntValue(txt, key: "canvasPort"),
+                                cliPath: Self.txtValue(txt, key: "cliPath"))
                         default:
                             return nil
                         }
@@ -191,4 +204,14 @@ final class BridgeDiscoveryModel {
             .replacingOccurrences(of: #"\s+\(\d+\)$"#, with: "", options: .regularExpression)
         return stripped.trimmingCharacters(in: .whitespacesAndNewlines)
     }
+
+    private static func txtValue(_ dict: [String: String], key: String) -> String? {
+        let raw = dict[key]?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        return raw.isEmpty ? nil : raw
+    }
+
+    private static func txtIntValue(_ dict: [String: String], key: String) -> Int? {
+        guard let raw = self.txtValue(dict, key: key) else { return nil }
+        return Int(raw)
+    }
 }
diff --git a/apps/ios/Sources/Settings/SettingsTab.swift b/apps/ios/Sources/Settings/SettingsTab.swift
index 48b5e0aac..34feee23a 100644
--- a/apps/ios/Sources/Settings/SettingsTab.swift
+++ b/apps/ios/Sources/Settings/SettingsTab.swift
@@ -51,6 +51,9 @@ struct SettingsTab: View {
                                 }
                             }
                         }
+                    LabeledContent("Platform", value: self.platformString())
+                    LabeledContent("Version", value: self.appVersion())
+                    LabeledContent("Model", value: self.modelIdentifier())
                 }
 
                 Section("Bridge") {
@@ -227,6 +230,12 @@ struct SettingsTab: View {
                     HStack {
                         VStack(alignment: .leading, spacing: 2) {
                             Text(bridge.name)
+                            let detailLines = self.bridgeDetailLines(bridge)
+                            ForEach(detailLines, id: \.self) { line in
+                                Text(line)
+                                    .font(.footnote)
+                                    .foregroundStyle(.secondary)
+                            }
                         }
                         Spacer()
 
@@ -504,4 +513,26 @@ struct SettingsTab: View {
     private static func httpURLString(host: String?, port: Int?, fallback: String) -> String {
         SettingsNetworkingHelpers.httpURLString(host: host, port: port, fallback: fallback)
     }
+
+    private func bridgeDetailLines(_ bridge: BridgeDiscoveryModel.DiscoveredBridge) -> [String] {
+        var lines: [String] = []
+        if let lanHost = bridge.lanHost { lines.append("LAN: \(lanHost)") }
+        if let tailnet = bridge.tailnetDns { lines.append("Tailnet: \(tailnet)") }
+
+        let gatewayPort = bridge.gatewayPort
+        let bridgePort = bridge.bridgePort
+        let canvasPort = bridge.canvasPort
+        if gatewayPort != nil || bridgePort != nil || canvasPort != nil {
+            let gw = gatewayPort.map(String.init) ?? "—"
+            let br = bridgePort.map(String.init) ?? "—"
+            let canvas = canvasPort.map(String.init) ?? "—"
+            lines.append("Ports: gw \(gw) · bridge \(br) · canvas \(canvas)")
+        }
+
+        if lines.isEmpty {
+            lines.append(bridge.debugID)
+        }
+
+        return lines
+    }
 }
diff --git a/apps/ios/Tests/BridgeConnectionControllerTests.swift b/apps/ios/Tests/BridgeConnectionControllerTests.swift
index 4ff359616..51e22ec5d 100644
--- a/apps/ios/Tests/BridgeConnectionControllerTests.swift
+++ b/apps/ios/Tests/BridgeConnectionControllerTests.swift
@@ -1,5 +1,6 @@
 import ClawdisKit
 import Foundation
+import Network
 import Testing
 import UIKit
 @testable import Clawdis
@@ -15,6 +16,25 @@ private let instanceIdEntry = KeychainEntry(service: nodeService, account: "inst
 private let preferredBridgeEntry = KeychainEntry(service: bridgeService, account: "preferredStableID")
 private let lastBridgeEntry = KeychainEntry(service: bridgeService, account: "lastDiscoveredStableID")
 
+private actor MockBridgePairingClient: BridgePairingClient {
+    private(set) var lastToken: String?
+    private let resultToken: String
+
+    init(resultToken: String) {
+        self.resultToken = resultToken
+    }
+
+    func pairAndHello(
+        endpoint: NWEndpoint,
+        hello: BridgeHello,
+        onStatus: (@Sendable (String) -> Void)?) async throws -> String
+    {
+        self.lastToken = hello.token
+        onStatus?("Testing…")
+        return self.resultToken
+    }
+}
+
 private func withUserDefaults<T>(_ updates: [String: Any?], _ body: () throws -> T) rethrows -> T {
     let defaults = UserDefaults.standard
     var snapshot: [String: Any?] = [:]
@@ -156,4 +176,52 @@ private func withKeychainValues<T>(_ updates: [KeychainEntry: String?], _ body:
             }
         }
     }
+
+    @Test @MainActor func autoConnectRefreshesTokenOnUnauthorized() async {
+        let bridge = BridgeDiscoveryModel.DiscoveredBridge(
+            name: "Gateway",
+            endpoint: .hostPort(host: NWEndpoint.Host("127.0.0.1"), port: 18790),
+            stableID: "bridge-1",
+            debugID: "bridge-debug",
+            lanHost: "Mac.local",
+            tailnetDns: nil,
+            gatewayPort: 18789,
+            bridgePort: 18790,
+            canvasPort: 18793,
+            cliPath: nil)
+        let mock = MockBridgePairingClient(resultToken: "new-token")
+        let account = "bridge-token.ios-test"
+
+        withKeychainValues([
+            instanceIdEntry: nil,
+            preferredBridgeEntry: nil,
+            lastBridgeEntry: nil,
+            KeychainEntry(service: bridgeService, account: account): "old-token",
+        ]) {
+            withUserDefaults([
+                "node.instanceId": "ios-test",
+                "bridge.lastDiscoveredStableID": "bridge-1",
+                "bridge.manual.enabled": false,
+            ]) {
+                let appModel = NodeAppModel()
+                let controller = BridgeConnectionController(
+                    appModel: appModel,
+                    startDiscovery: false,
+                    bridgeClientFactory: { mock })
+                controller._test_setBridges([bridge])
+                controller._test_triggerAutoConnect()
+
+                for _ in 0..<20 {
+                    if appModel.connectedBridgeID == bridge.stableID { break }
+                    try? await Task.sleep(nanoseconds: 50_000_000)
+                }
+
+                #expect(appModel.connectedBridgeID == bridge.stableID)
+                let stored = KeychainStore.loadString(service: bridgeService, account: account)
+                #expect(stored == "new-token")
+                let lastToken = await mock.lastToken
+                #expect(lastToken == "old-token")
+            }
+        }
+    }
 }

From f41ade9417e3db606bec5726635b50d8472015d5 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 22:51:42 +0100
Subject: [PATCH 016/100] feat(skills): add obsidian skill

---
 skills/obsidian/SKILL.md | 55 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 skills/obsidian/SKILL.md

diff --git a/skills/obsidian/SKILL.md b/skills/obsidian/SKILL.md
new file mode 100644
index 000000000..d5026be7b
--- /dev/null
+++ b/skills/obsidian/SKILL.md
@@ -0,0 +1,55 @@
+---
+name: obsidian
+description: Work with Obsidian vaults (plain Markdown notes) and automate via obsidian-cli.
+homepage: https://help.obsidian.md
+metadata: {"clawdis":{"emoji":"💎","requires":{"bins":["obsidian-cli"]},"install":[{"id":"brew","kind":"brew","formula":"yakitrak/yakitrak/obsidian-cli","bins":["obsidian-cli"],"label":"Install obsidian-cli (brew)"}]}}
+---
+
+# Obsidian
+
+Obsidian vault = a normal folder on disk.
+
+Vault structure (typical)
+- Notes: `*.md` (plain text Markdown; edit with any editor)
+- Config: `.obsidian/` (workspace + plugin settings; usually don’t touch from scripts)
+- Canvases: `*.canvas` (JSON)
+- Attachments: whatever folder you chose in Obsidian settings (images/PDFs/etc.)
+
+## Find the active vault(s)
+
+Obsidian desktop tracks vaults here (source of truth):
+- `~/Library/Application Support/obsidian/obsidian.json`
+
+`obsidian-cli` resolves vaults from that file; vault name is typically the **folder name** (path suffix).
+
+Fast “what vault is active / where are the notes?”
+- If you’ve already set a default: `obsidian-cli print-default --path-only`
+- Otherwise, read `~/Library/Application Support/obsidian/obsidian.json` and use the vault entry with `"open": true`.
+
+Notes
+- Multiple vaults common (iCloud vs `~/Documents`, work/personal, etc.). Don’t guess; read config.
+- Avoid writing hardcoded vault paths into scripts; prefer reading the config or using `print-default`.
+
+## obsidian-cli quick start
+
+Pick a default vault (once):
+- `obsidian-cli set-default "<vault-folder-name>"`
+- `obsidian-cli print-default` / `obsidian-cli print-default --path-only`
+
+Search
+- `obsidian-cli search "query"` (note names)
+- `obsidian-cli search-content "query"` (inside notes; shows snippets + lines)
+
+Create
+- `obsidian-cli create "Folder/New note" --content "..." --open`
+- Requires Obsidian URI handler (`obsidian://…`) working (Obsidian installed).
+- Avoid creating notes under “hidden” dot-folders (e.g. `.something/...`) via URI; Obsidian may refuse.
+
+Move/rename (safe refactor)
+- `obsidian-cli move "old/path/note" "new/path/note"`
+- Updates `[[wikilinks]]` and common Markdown links across the vault (this is the main win vs `mv`).
+
+Delete
+- `obsidian-cli delete "path/note"`
+
+Prefer direct edits when appropriate: open the `.md` file and change it; Obsidian will pick it up.

From a61b7056d5004ad1252ae1f2b256d062a80bf29a Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 23:12:03 +0100
Subject: [PATCH 017/100] feat: surface camera activity in status pill

---
 .../clawdis/node/ui/CameraHudOverlay.kt       | 85 +----------------
 .../steipete/clawdis/node/ui/RootScreen.kt    | 43 ++++++++-
 .../steipete/clawdis/node/ui/StatusPill.kt    | 49 +++++++---
 apps/ios/Sources/RootCanvas.swift             | 92 ++++---------------
 apps/ios/Sources/RootTabs.swift               |  1 +
 apps/ios/Sources/Status/StatusPill.swift      | 39 +++++++-
 6 files changed, 134 insertions(+), 175 deletions(-)

diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/CameraHudOverlay.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/CameraHudOverlay.kt
index b205929cd..2e1fec0d9 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/CameraHudOverlay.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/CameraHudOverlay.kt
@@ -1,64 +1,26 @@
 package com.steipete.clawdis.node.ui
 
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.statusBarsPadding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.CheckCircle
-import androidx.compose.material.icons.filled.Error
-import androidx.compose.material.icons.filled.FiberManualRecord
-import androidx.compose.material.icons.filled.PhotoCamera
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import com.steipete.clawdis.node.CameraHudKind
-import com.steipete.clawdis.node.CameraHudState
 import kotlinx.coroutines.delay
 
 @Composable
-fun CameraHudOverlay(
-  hud: CameraHudState?,
-  flashToken: Long,
+fun CameraFlashOverlay(
+  token: Long,
   modifier: Modifier = Modifier,
 ) {
   Box(modifier = modifier.fillMaxSize()) {
-    CameraFlash(token = flashToken)
-
-    AnimatedVisibility(
-      visible = hud != null,
-      enter = slideInVertically(initialOffsetY = { -it / 2 }) + fadeIn(),
-      exit = slideOutVertically(targetOffsetY = { -it / 2 }) + fadeOut(),
-      modifier = Modifier.align(Alignment.TopStart).statusBarsPadding().padding(start = 12.dp, top = 58.dp),
-    ) {
-      if (hud != null) {
-        Toast(hud = hud)
-      }
-    }
+    CameraFlash(token = token)
   }
 }
 
@@ -80,44 +42,3 @@ private fun CameraFlash(token: Long) {
         .background(Color.White),
   )
 }
-
-@Composable
-private fun Toast(hud: CameraHudState) {
-  Surface(
-    shape = RoundedCornerShape(14.dp),
-    color = MaterialTheme.colorScheme.surface.copy(alpha = 0.85f),
-    tonalElevation = 2.dp,
-    shadowElevation = 8.dp,
-  ) {
-    Row(
-      modifier = Modifier.padding(vertical = 10.dp, horizontal = 12.dp),
-      verticalAlignment = Alignment.CenterVertically,
-    ) {
-      when (hud.kind) {
-        CameraHudKind.Photo -> {
-          Icon(Icons.Default.PhotoCamera, contentDescription = null)
-          Spacer(Modifier.size(10.dp))
-          CircularProgressIndicator(modifier = Modifier.size(14.dp), strokeWidth = 2.dp)
-        }
-        CameraHudKind.Recording -> {
-          Icon(Icons.Default.FiberManualRecord, contentDescription = null, tint = Color.Red)
-        }
-        CameraHudKind.Success -> {
-          Icon(Icons.Default.CheckCircle, contentDescription = null)
-        }
-        CameraHudKind.Error -> {
-          Icon(Icons.Default.Error, contentDescription = null)
-        }
-      }
-
-      Spacer(Modifier.size(10.dp))
-      Text(
-        text = hud.message,
-        style = MaterialTheme.typography.bodyMedium,
-        maxLines = 1,
-        overflow = TextOverflow.Ellipsis,
-      )
-    }
-  }
-}
-
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
index 49bbee928..f3cfb4b67 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
@@ -32,6 +32,10 @@ import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ChatBubble
+import androidx.compose.material.icons.filled.CheckCircle
+import androidx.compose.material.icons.filled.Error
+import androidx.compose.material.icons.filled.FiberManualRecord
+import androidx.compose.material.icons.filled.PhotoCamera
 import androidx.compose.material.icons.filled.Settings
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -47,6 +51,7 @@ import androidx.compose.ui.viewinterop.AndroidView
 import androidx.compose.ui.window.Popup
 import androidx.compose.ui.window.PopupProperties
 import androidx.core.content.ContextCompat
+import com.steipete.clawdis.node.CameraHudKind
 import com.steipete.clawdis.node.MainViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -60,6 +65,39 @@ fun RootScreen(viewModel: MainViewModel) {
   val statusText by viewModel.statusText.collectAsState()
   val cameraHud by viewModel.cameraHud.collectAsState()
   val cameraFlashToken by viewModel.cameraFlashToken.collectAsState()
+  val activity =
+    remember(cameraHud) {
+      cameraHud?.let { hud ->
+        when (hud.kind) {
+          CameraHudKind.Photo ->
+            StatusActivity(
+              title = hud.message,
+              icon = Icons.Default.PhotoCamera,
+              contentDescription = "Taking photo",
+            )
+          CameraHudKind.Recording ->
+            StatusActivity(
+              title = hud.message,
+              icon = Icons.Default.FiberManualRecord,
+              contentDescription = "Recording",
+              tint = androidx.compose.ui.graphics.Color.Red,
+            )
+          CameraHudKind.Success ->
+            StatusActivity(
+              title = hud.message,
+              icon = Icons.Default.CheckCircle,
+              contentDescription = "Capture finished",
+            )
+          CameraHudKind.Error ->
+            StatusActivity(
+              title = hud.message,
+              icon = Icons.Default.Error,
+              contentDescription = "Capture failed",
+              tint = androidx.compose.ui.graphics.Color.Red,
+            )
+        }
+      }
+    }
 
   val bridgeState =
     remember(serverName, statusText) {
@@ -80,9 +118,9 @@ fun RootScreen(viewModel: MainViewModel) {
     CanvasView(viewModel = viewModel, modifier = Modifier.fillMaxSize())
   }
 
-  // Camera HUD (flash + toast) must be in a Popup to render above the WebView.
+  // Camera flash must be in a Popup to render above the WebView.
   Popup(alignment = Alignment.Center, properties = PopupProperties(focusable = false)) {
-    CameraHudOverlay(hud = cameraHud, flashToken = cameraFlashToken, modifier = Modifier.fillMaxSize())
+    CameraFlashOverlay(token = cameraFlashToken, modifier = Modifier.fillMaxSize())
   }
 
   // Keep the overlay buttons above the WebView canvas (AndroidView), otherwise they may not receive touches.
@@ -90,6 +128,7 @@ fun RootScreen(viewModel: MainViewModel) {
     StatusPill(
       bridge = bridgeState,
       voiceEnabled = voiceEnabled,
+      activity = activity,
       onClick = { sheet = Sheet.Settings },
       modifier = Modifier.windowInsetsPadding(safeOverlayInsets).padding(start = 12.dp, top = 12.dp),
     )
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/StatusPill.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/StatusPill.kt
index 87a500265..2efcccae7 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/StatusPill.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/StatusPill.kt
@@ -28,6 +28,7 @@ import androidx.compose.ui.unit.dp
 fun StatusPill(
   bridge: BridgeState,
   voiceEnabled: Boolean,
+  activity: StatusActivity? = null,
   onClick: () -> Unit,
   modifier: Modifier = Modifier,
 ) {
@@ -62,23 +63,49 @@ fun StatusPill(
         color = MaterialTheme.colorScheme.onSurfaceVariant,
       )
 
-      Icon(
-        imageVector = if (voiceEnabled) Icons.Default.Mic else Icons.Default.MicOff,
-        contentDescription = if (voiceEnabled) "Voice enabled" else "Voice disabled",
-        tint =
-          if (voiceEnabled) {
-            overlayIconColor()
-          } else {
-            MaterialTheme.colorScheme.onSurfaceVariant
-          },
-        modifier = Modifier.size(18.dp),
-      )
+      if (activity != null) {
+        Row(
+          horizontalArrangement = Arrangement.spacedBy(6.dp),
+          verticalAlignment = Alignment.CenterVertically,
+        ) {
+          Icon(
+            imageVector = activity.icon,
+            contentDescription = activity.contentDescription,
+            tint = activity.tint ?: overlayIconColor(),
+            modifier = Modifier.size(18.dp),
+          )
+          Text(
+            text = activity.title,
+            style = MaterialTheme.typography.labelLarge,
+            maxLines = 1,
+          )
+        }
+      } else {
+        Icon(
+          imageVector = if (voiceEnabled) Icons.Default.Mic else Icons.Default.MicOff,
+          contentDescription = if (voiceEnabled) "Voice enabled" else "Voice disabled",
+          tint =
+            if (voiceEnabled) {
+              overlayIconColor()
+            } else {
+              MaterialTheme.colorScheme.onSurfaceVariant
+            },
+          modifier = Modifier.size(18.dp),
+        )
+      }
 
       Spacer(modifier = Modifier.width(2.dp))
     }
   }
 }
 
+data class StatusActivity(
+  val title: String,
+  val icon: androidx.compose.ui.graphics.vector.ImageVector,
+  val contentDescription: String,
+  val tint: Color? = null,
+)
+
 enum class BridgeState(val title: String, val color: Color) {
   Connected("Connected", Color(0xFF2ECC71)),
   Connecting("Connecting…", Color(0xFFF1C40F)),
diff --git a/apps/ios/Sources/RootCanvas.swift b/apps/ios/Sources/RootCanvas.swift
index 9a5fb0b76..4d552618e 100644
--- a/apps/ios/Sources/RootCanvas.swift
+++ b/apps/ios/Sources/RootCanvas.swift
@@ -152,6 +152,7 @@ private struct CanvasContent: View {
             StatusPill(
                 bridge: self.bridgeStatus,
                 voiceWakeEnabled: self.voiceWakeEnabled,
+                activity: self.statusActivity,
                 brighten: self.brightenButtons,
                 onTap: {
                     self.openSettings()
@@ -169,33 +170,30 @@ private struct CanvasContent: View {
                     .transition(.move(edge: .top).combined(with: .opacity))
             }
         }
-        .overlay(alignment: .topLeading) {
-            if let cameraHUDText, !cameraHUDText.isEmpty, let cameraHUDKind {
-                CameraCaptureToast(
-                    text: cameraHUDText,
-                    kind: self.mapCameraKind(cameraHUDKind),
-                    brighten: self.brightenButtons)
-                    .padding(SwiftUI.Edge.Set.leading, 10)
-                    .safeAreaPadding(SwiftUI.Edge.Set.top, 106)
-                    .transition(
-                        AnyTransition.move(edge: SwiftUI.Edge.top)
-                            .combined(with: AnyTransition.opacity))
-            }
-        }
     }
 
-    private func mapCameraKind(_ kind: NodeAppModel.CameraHUDKind) -> CameraCaptureToast.Kind {
-        switch kind {
+    private var statusActivity: StatusPill.Activity? {
+        guard let cameraHUDText, !cameraHUDText.isEmpty, let cameraHUDKind else { return nil }
+        let systemImage: String
+        let tint: Color?
+        switch cameraHUDKind {
         case .photo:
-            .photo
+            systemImage = "camera.fill"
+            tint = nil
         case .recording:
-            .recording
+            systemImage = "video.fill"
+            tint = .red
         case .success:
-            .success
+            systemImage = "checkmark.circle.fill"
+            tint = .green
         case .error:
-            .error
+            systemImage = "exclamationmark.triangle.fill"
+            tint = .red
         }
+
+        return StatusPill.Activity(title: cameraHUDText, systemImage: systemImage, tint: tint)
     }
+
 }
 
 private struct OverlayButton: View {
@@ -261,59 +259,3 @@ private struct CameraFlashOverlay: View {
             }
     }
 }
-
-private struct CameraCaptureToast: View {
-    enum Kind {
-        case photo
-        case recording
-        case success
-        case error
-    }
-
-    var text: String
-    var kind: Kind
-    var brighten: Bool = false
-
-    var body: some View {
-        HStack(spacing: 10) {
-            self.icon
-                .font(.system(size: 14, weight: .semibold))
-                .foregroundStyle(.primary)
-
-            Text(self.text)
-                .font(.system(size: 14, weight: .semibold))
-                .foregroundStyle(.primary)
-                .lineLimit(1)
-                .truncationMode(.tail)
-        }
-        .padding(.vertical, 10)
-        .padding(.horizontal, 12)
-        .background {
-            RoundedRectangle(cornerRadius: 14, style: .continuous)
-                .fill(.ultraThinMaterial)
-                .overlay {
-                    RoundedRectangle(cornerRadius: 14, style: .continuous)
-                        .strokeBorder(.white.opacity(self.brighten ? 0.24 : 0.18), lineWidth: 0.5)
-                }
-                .shadow(color: .black.opacity(0.25), radius: 12, y: 6)
-        }
-        .accessibilityLabel("Camera")
-        .accessibilityValue(self.text)
-    }
-
-    @ViewBuilder
-    private var icon: some View {
-        switch self.kind {
-        case .photo:
-            Image(systemName: "camera.fill")
-        case .recording:
-            Image(systemName: "record.circle.fill")
-                .symbolRenderingMode(.palette)
-                .foregroundStyle(.red, .primary)
-        case .success:
-            Image(systemName: "checkmark.circle.fill")
-        case .error:
-            Image(systemName: "exclamationmark.triangle.fill")
-        }
-    }
-}
diff --git a/apps/ios/Sources/RootTabs.swift b/apps/ios/Sources/RootTabs.swift
index dc2508895..913073d4a 100644
--- a/apps/ios/Sources/RootTabs.swift
+++ b/apps/ios/Sources/RootTabs.swift
@@ -26,6 +26,7 @@ struct RootTabs: View {
             StatusPill(
                 bridge: self.bridgeStatus,
                 voiceWakeEnabled: self.voiceWakeEnabled,
+                activity: nil,
                 onTap: { self.selectedTab = 2 })
                 .padding(.leading, 10)
                 .safeAreaPadding(.top, 10)
diff --git a/apps/ios/Sources/Status/StatusPill.swift b/apps/ios/Sources/Status/StatusPill.swift
index 9d3c6f6d6..f5df8e7df 100644
--- a/apps/ios/Sources/Status/StatusPill.swift
+++ b/apps/ios/Sources/Status/StatusPill.swift
@@ -28,8 +28,15 @@ struct StatusPill: View {
         }
     }
 
+    struct Activity: Equatable {
+        var title: String
+        var systemImage: String
+        var tint: Color? = nil
+    }
+
     var bridge: BridgeState
     var voiceWakeEnabled: Bool
+    var activity: Activity? = nil
     var brighten: Bool = false
     var onTap: () -> Void
 
@@ -54,10 +61,24 @@ struct StatusPill: View {
                     .frame(height: 14)
                     .opacity(0.35)
 
-                Image(systemName: self.voiceWakeEnabled ? "mic.fill" : "mic.slash")
-                    .font(.system(size: 13, weight: .semibold))
-                    .foregroundStyle(self.voiceWakeEnabled ? .primary : .secondary)
-                    .accessibilityLabel(self.voiceWakeEnabled ? "Voice Wake enabled" : "Voice Wake disabled")
+                if let activity {
+                    HStack(spacing: 6) {
+                        Image(systemName: activity.systemImage)
+                            .font(.system(size: 13, weight: .semibold))
+                            .foregroundStyle(activity.tint ?? .primary)
+                        Text(activity.title)
+                            .font(.system(size: 13, weight: .semibold))
+                            .foregroundStyle(.primary)
+                            .lineLimit(1)
+                    }
+                    .transition(.opacity.combined(with: .move(edge: .top)))
+                } else {
+                    Image(systemName: self.voiceWakeEnabled ? "mic.fill" : "mic.slash")
+                        .font(.system(size: 13, weight: .semibold))
+                        .foregroundStyle(self.voiceWakeEnabled ? .primary : .secondary)
+                        .accessibilityLabel(self.voiceWakeEnabled ? "Voice Wake enabled" : "Voice Wake disabled")
+                        .transition(.opacity.combined(with: .move(edge: .top)))
+                }
             }
             .padding(.vertical, 8)
             .padding(.horizontal, 12)
@@ -73,7 +94,7 @@ struct StatusPill: View {
         }
         .buttonStyle(.plain)
         .accessibilityLabel("Status")
-        .accessibilityValue("\(self.bridge.title), Voice Wake \(self.voiceWakeEnabled ? "enabled" : "disabled")")
+        .accessibilityValue(self.accessibilityValue)
         .onAppear { self.updatePulse(for: self.bridge, scenePhase: self.scenePhase) }
         .onDisappear { self.pulse = false }
         .onChange(of: self.bridge) { _, newValue in
@@ -82,6 +103,14 @@ struct StatusPill: View {
         .onChange(of: self.scenePhase) { _, newValue in
             self.updatePulse(for: self.bridge, scenePhase: newValue)
         }
+        .animation(.easeInOut(duration: 0.18), value: self.activity?.title)
+    }
+
+    private var accessibilityValue: String {
+        if let activity {
+            return "\(self.bridge.title), \(activity.title)"
+        }
+        return "\(self.bridge.title), Voice Wake \(self.voiceWakeEnabled ? "enabled" : "disabled")"
     }
 
     private func updatePulse(for bridge: BridgeState, scenePhase: ScenePhase) {

From 8f0c8a656128f4b35475646bffa83fc6808df25a Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 23:12:20 +0100
Subject: [PATCH 018/100] fix: cap camera snap payload size

---
 CHANGELOG.md                                  |  2 +
 .../clawdis/node/node/CameraCaptureManager.kt | 36 ++++++--
 .../clawdis/node/node/JpegSizeLimiter.kt      | 61 ++++++++++++++
 .../clawdis/node/node/JpegSizeLimiterTest.kt  | 47 +++++++++++
 .../ios/Sources/Camera/CameraController.swift |  6 +-
 .../Sources/ClawdisKit/JPEGTranscoder.swift   | 82 ++++++++++++++-----
 .../ClawdisKitTests/JPEGTranscoderTests.swift | 57 ++++++++++++-
 docs/camera.md                                |  5 ++
 8 files changed, 267 insertions(+), 29 deletions(-)
 create mode 100644 apps/android/app/src/main/java/com/steipete/clawdis/node/node/JpegSizeLimiter.kt
 create mode 100644 apps/android/app/src/test/java/com/steipete/clawdis/node/node/JpegSizeLimiterTest.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4edcae2c0..f73a670ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@
 - macOS menu: device list now shows connected nodes only.
 - iOS node: fix ReplayKit screen recording crash caused by queue isolation assertions during capture.
 - iOS/Android nodes: bridge auto-connect refreshes stale tokens and settings now show richer bridge/device details.
+- iOS/Android nodes: status pill now surfaces camera activity instead of overlay toasts.
+- iOS/Android nodes: camera snaps recompress to keep base64 payloads under 5 MB.
 - CLI: avoid spurious gateway close errors after successful request/response cycles.
 - Tests: add Swift Testing coverage for camera errors and Kotest coverage for Android bridge endpoints.
 
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/node/CameraCaptureManager.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/node/CameraCaptureManager.kt
index 4f1501340..b25b95ea4 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/node/CameraCaptureManager.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/node/CameraCaptureManager.kt
@@ -28,6 +28,7 @@ import kotlinx.coroutines.withContext
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.util.concurrent.Executor
+import kotlin.math.roundToInt
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 
@@ -99,14 +100,35 @@ class CameraCaptureManager(private val context: Context) {
           decoded
         }
 
-      val out = ByteArrayOutputStream()
-      val jpegQuality = (quality * 100.0).toInt().coerceIn(10, 100)
-      if (!scaled.compress(Bitmap.CompressFormat.JPEG, jpegQuality, out)) {
-        throw IllegalStateException("UNAVAILABLE: failed to encode JPEG")
-      }
-      val base64 = Base64.encodeToString(out.toByteArray(), Base64.NO_WRAP)
+      val maxPayloadBytes = 5 * 1024 * 1024
+      val maxEncodedBytes = (maxPayloadBytes / 4) * 3
+      val result =
+        JpegSizeLimiter.compressToLimit(
+          initialWidth = scaled.width,
+          initialHeight = scaled.height,
+          startQuality = (quality * 100.0).roundToInt().coerceIn(10, 100),
+          maxBytes = maxEncodedBytes,
+          encode = { width, height, q ->
+            val bitmap =
+              if (width == scaled.width && height == scaled.height) {
+                scaled
+              } else {
+                scaled.scale(width, height)
+              }
+            val out = ByteArrayOutputStream()
+            if (!bitmap.compress(Bitmap.CompressFormat.JPEG, q, out)) {
+              if (bitmap !== scaled) bitmap.recycle()
+              throw IllegalStateException("UNAVAILABLE: failed to encode JPEG")
+            }
+            if (bitmap !== scaled) {
+              bitmap.recycle()
+            }
+            out.toByteArray()
+          },
+        )
+      val base64 = Base64.encodeToString(result.bytes, Base64.NO_WRAP)
       Payload(
-        """{"format":"jpg","base64":"$base64","width":${scaled.width},"height":${scaled.height}}""",
+        """{"format":"jpg","base64":"$base64","width":${result.width},"height":${result.height}}""",
       )
     }
 
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/node/JpegSizeLimiter.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/node/JpegSizeLimiter.kt
new file mode 100644
index 000000000..bb9377231
--- /dev/null
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/node/JpegSizeLimiter.kt
@@ -0,0 +1,61 @@
+package com.steipete.clawdis.node.node
+
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.roundToInt
+
+internal data class JpegSizeLimiterResult(
+  val bytes: ByteArray,
+  val width: Int,
+  val height: Int,
+  val quality: Int,
+)
+
+internal object JpegSizeLimiter {
+  fun compressToLimit(
+    initialWidth: Int,
+    initialHeight: Int,
+    startQuality: Int,
+    maxBytes: Int,
+    minQuality: Int = 20,
+    minSize: Int = 256,
+    scaleStep: Double = 0.85,
+    maxScaleAttempts: Int = 6,
+    maxQualityAttempts: Int = 6,
+    encode: (width: Int, height: Int, quality: Int) -> ByteArray,
+  ): JpegSizeLimiterResult {
+    require(initialWidth > 0 && initialHeight > 0) { "Invalid image size" }
+    require(maxBytes > 0) { "Invalid maxBytes" }
+
+    var width = initialWidth
+    var height = initialHeight
+    val clampedStartQuality = startQuality.coerceIn(minQuality, 100)
+    var best = JpegSizeLimiterResult(bytes = encode(width, height, clampedStartQuality), width = width, height = height, quality = clampedStartQuality)
+    if (best.bytes.size <= maxBytes) return best
+
+    repeat(maxScaleAttempts) {
+      var quality = clampedStartQuality
+      repeat(maxQualityAttempts) {
+        val bytes = encode(width, height, quality)
+        best = JpegSizeLimiterResult(bytes = bytes, width = width, height = height, quality = quality)
+        if (bytes.size <= maxBytes) return best
+        if (quality <= minQuality) return@repeat
+        quality = max(minQuality, (quality * 0.75).roundToInt())
+      }
+
+      val minScale = (minSize.toDouble() / min(width, height).toDouble()).coerceAtMost(1.0)
+      val nextScale = max(scaleStep, minScale)
+      val nextWidth = max(minSize, (width * nextScale).roundToInt())
+      val nextHeight = max(minSize, (height * nextScale).roundToInt())
+      if (nextWidth == width && nextHeight == height) return@repeat
+      width = min(nextWidth, width)
+      height = min(nextHeight, height)
+    }
+
+    if (best.bytes.size > maxBytes) {
+      throw IllegalStateException("CAMERA_TOO_LARGE: ${best.bytes.size} bytes > $maxBytes bytes")
+    }
+
+    return best
+  }
+}
diff --git a/apps/android/app/src/test/java/com/steipete/clawdis/node/node/JpegSizeLimiterTest.kt b/apps/android/app/src/test/java/com/steipete/clawdis/node/node/JpegSizeLimiterTest.kt
new file mode 100644
index 000000000..457bd189d
--- /dev/null
+++ b/apps/android/app/src/test/java/com/steipete/clawdis/node/node/JpegSizeLimiterTest.kt
@@ -0,0 +1,47 @@
+package com.steipete.clawdis.node.node
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import kotlin.math.min
+
+class JpegSizeLimiterTest {
+  @Test
+  fun compressesLargePayloadsUnderLimit() {
+    val maxBytes = 5 * 1024 * 1024
+    val result =
+      JpegSizeLimiter.compressToLimit(
+        initialWidth = 4000,
+        initialHeight = 3000,
+        startQuality = 95,
+        maxBytes = maxBytes,
+        encode = { width, height, quality ->
+          val estimated = (width.toLong() * height.toLong() * quality.toLong()) / 100
+          val size = min(maxBytes.toLong() * 2, estimated).toInt()
+          ByteArray(size)
+        },
+      )
+
+    assertTrue(result.bytes.size <= maxBytes)
+    assertTrue(result.width <= 4000)
+    assertTrue(result.height <= 3000)
+    assertTrue(result.quality <= 95)
+  }
+
+  @Test
+  fun keepsSmallPayloadsAsIs() {
+    val maxBytes = 5 * 1024 * 1024
+    val result =
+      JpegSizeLimiter.compressToLimit(
+        initialWidth = 800,
+        initialHeight = 600,
+        startQuality = 90,
+        maxBytes = maxBytes,
+        encode = { _, _, _ -> ByteArray(120_000) },
+      )
+
+    assertEquals(800, result.width)
+    assertEquals(600, result.height)
+    assertEquals(90, result.quality)
+  }
+}
diff --git a/apps/ios/Sources/Camera/CameraController.swift b/apps/ios/Sources/Camera/CameraController.swift
index a57769d31..cf8c6ce50 100644
--- a/apps/ios/Sources/Camera/CameraController.swift
+++ b/apps/ios/Sources/Camera/CameraController.swift
@@ -84,10 +84,14 @@ actor CameraController {
         }
         withExtendedLifetime(delegate) {}
 
+        let maxPayloadBytes = 5 * 1024 * 1024
+        // Base64 inflates payloads by ~4/3, so cap encoded bytes to keep payload <= 5MB.
+        let maxEncodedBytes = (maxPayloadBytes / 4) * 3
         let res = try JPEGTranscoder.transcodeToJPEG(
             imageData: rawData,
             maxWidthPx: maxWidth,
-            quality: quality)
+            quality: quality,
+            maxBytes: maxEncodedBytes)
 
         return (
             format: format.rawValue,
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/JPEGTranscoder.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/JPEGTranscoder.swift
index 39761f131..f4b1cb951 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisKit/JPEGTranscoder.swift
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/JPEGTranscoder.swift
@@ -7,6 +7,7 @@ public enum JPEGTranscodeError: LocalizedError, Sendable {
     case decodeFailed
     case propertiesMissing
     case encodeFailed
+    case sizeLimitExceeded(maxBytes: Int, actualBytes: Int)
 
     public var errorDescription: String? {
         switch self {
@@ -16,6 +17,8 @@ public enum JPEGTranscodeError: LocalizedError, Sendable {
             "Failed to read image properties"
         case .encodeFailed:
             "Failed to encode JPEG"
+        case let .sizeLimitExceeded(maxBytes, actualBytes):
+            "JPEG exceeds size limit (\(actualBytes) bytes > \(maxBytes) bytes)"
         }
     }
 }
@@ -32,7 +35,8 @@ public struct JPEGTranscoder: Sendable {
     public static func transcodeToJPEG(
         imageData: Data,
         maxWidthPx: Int?,
-        quality: Double) throws -> (data: Data, widthPx: Int, heightPx: Int)
+        quality: Double,
+        maxBytes: Int? = nil) throws -> (data: Data, widthPx: Int, heightPx: Int)
     {
         guard let src = CGImageSourceCreateWithData(imageData as CFData, nil) else {
             throw JPEGTranscodeError.decodeFailed
@@ -58,7 +62,7 @@ public struct JPEGTranscoder: Sendable {
         let orientedHeight = rotates90 ? pixelWidth : pixelHeight
 
         let maxDim = max(orientedWidth, orientedHeight)
-        let targetMaxPixelSize: Int = {
+        var targetMaxPixelSize: Int = {
             guard let maxWidthPx, maxWidthPx > 0 else { return maxDim }
             guard orientedWidth > maxWidthPx else { return maxDim } // never upscale
 
@@ -66,28 +70,66 @@ public struct JPEGTranscoder: Sendable {
             return max(1, Int((Double(maxDim) * scale).rounded(.toNearestOrAwayFromZero)))
         }()
 
-        let thumbOpts: [CFString: Any] = [
-            kCGImageSourceCreateThumbnailFromImageAlways: true,
-            kCGImageSourceCreateThumbnailWithTransform: true,
-            kCGImageSourceThumbnailMaxPixelSize: targetMaxPixelSize,
-            kCGImageSourceShouldCacheImmediately: true,
-        ]
+        func encode(maxPixelSize: Int, quality: Double) throws -> (data: Data, widthPx: Int, heightPx: Int) {
+            let thumbOpts: [CFString: Any] = [
+                kCGImageSourceCreateThumbnailFromImageAlways: true,
+                kCGImageSourceCreateThumbnailWithTransform: true,
+                kCGImageSourceThumbnailMaxPixelSize: maxPixelSize,
+                kCGImageSourceShouldCacheImmediately: true,
+            ]
 
-        guard let img = CGImageSourceCreateThumbnailAtIndex(src, 0, thumbOpts as CFDictionary) else {
-            throw JPEGTranscodeError.decodeFailed
+            guard let img = CGImageSourceCreateThumbnailAtIndex(src, 0, thumbOpts as CFDictionary) else {
+                throw JPEGTranscodeError.decodeFailed
+            }
+
+            let out = NSMutableData()
+            guard let dest = CGImageDestinationCreateWithData(out, UTType.jpeg.identifier as CFString, 1, nil) else {
+                throw JPEGTranscodeError.encodeFailed
+            }
+            let q = self.clampQuality(quality)
+            let encodeProps = [kCGImageDestinationLossyCompressionQuality: q] as CFDictionary
+            CGImageDestinationAddImage(dest, img, encodeProps)
+            guard CGImageDestinationFinalize(dest) else {
+                throw JPEGTranscodeError.encodeFailed
+            }
+
+            return (out as Data, img.width, img.height)
         }
 
-        let out = NSMutableData()
-        guard let dest = CGImageDestinationCreateWithData(out, UTType.jpeg.identifier as CFString, 1, nil) else {
-            throw JPEGTranscodeError.encodeFailed
-        }
-        let q = self.clampQuality(quality)
-        let encodeProps = [kCGImageDestinationLossyCompressionQuality: q] as CFDictionary
-        CGImageDestinationAddImage(dest, img, encodeProps)
-        guard CGImageDestinationFinalize(dest) else {
-            throw JPEGTranscodeError.encodeFailed
+        guard let maxBytes, maxBytes > 0 else {
+            return try encode(maxPixelSize: targetMaxPixelSize, quality: quality)
         }
 
-        return (out as Data, img.width, img.height)
+        let minQuality = max(0.2, self.clampQuality(quality) * 0.35)
+        let minPixelSize = 256
+        var best = try encode(maxPixelSize: targetMaxPixelSize, quality: quality)
+        if best.data.count <= maxBytes {
+            return best
+        }
+
+        for _ in 0..<6 {
+            var q = self.clampQuality(quality)
+            for _ in 0..<6 {
+                let candidate = try encode(maxPixelSize: targetMaxPixelSize, quality: q)
+                best = candidate
+                if candidate.data.count <= maxBytes {
+                    return candidate
+                }
+                if q <= minQuality { break }
+                q = max(minQuality, q * 0.75)
+            }
+
+            let nextPixelSize = max(Int(Double(targetMaxPixelSize) * 0.85), minPixelSize)
+            if nextPixelSize == targetMaxPixelSize {
+                break
+            }
+            targetMaxPixelSize = nextPixelSize
+        }
+
+        if best.data.count > maxBytes {
+            throw JPEGTranscodeError.sizeLimitExceeded(maxBytes: maxBytes, actualBytes: best.data.count)
+        }
+
+        return best
     }
 }
diff --git a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/JPEGTranscoderTests.swift b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/JPEGTranscoderTests.swift
index 9c8fcfbda..b12587a4c 100644
--- a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/JPEGTranscoderTests.swift
+++ b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/JPEGTranscoderTests.swift
@@ -47,6 +47,52 @@ import UniformTypeIdentifiers
         return out as Data
     }
 
+    private func makeNoiseJPEG(width: Int, height: Int) throws -> Data {
+        let bytesPerPixel = 4
+        let byteCount = width * height * bytesPerPixel
+        var data = Data(count: byteCount)
+        let cs = CGColorSpaceCreateDeviceRGB()
+        let bitmapInfo = CGImageAlphaInfo.premultipliedLast.rawValue
+
+        let out = try data.withUnsafeMutableBytes { rawBuffer -> Data in
+            guard let base = rawBuffer.baseAddress?.assumingMemoryBound(to: UInt8.self) else {
+                throw NSError(domain: "JPEGTranscoderTests", code: 6)
+            }
+            for idx in 0..<byteCount {
+                base[idx] = UInt8.random(in: 0...255)
+            }
+
+            guard
+                let ctx = CGContext(
+                    data: base,
+                    width: width,
+                    height: height,
+                    bitsPerComponent: 8,
+                    bytesPerRow: width * bytesPerPixel,
+                    space: cs,
+                    bitmapInfo: bitmapInfo)
+            else {
+                throw NSError(domain: "JPEGTranscoderTests", code: 7)
+            }
+
+            guard let img = ctx.makeImage() else {
+                throw NSError(domain: "JPEGTranscoderTests", code: 8)
+            }
+
+            let encoded = NSMutableData()
+            guard let dest = CGImageDestinationCreateWithData(encoded, UTType.jpeg.identifier as CFString, 1, nil) else {
+                throw NSError(domain: "JPEGTranscoderTests", code: 9)
+            }
+            CGImageDestinationAddImage(dest, img, nil)
+            guard CGImageDestinationFinalize(dest) else {
+                throw NSError(domain: "JPEGTranscoderTests", code: 10)
+            }
+            return encoded as Data
+        }
+
+        return out
+    }
+
     @Test func downscalesToMaxWidthPx() throws {
         let input = try makeSolidJPEG(width: 2000, height: 1000)
         let out = try JPEGTranscoder.transcodeToJPEG(imageData: input, maxWidthPx: 1600, quality: 0.9)
@@ -69,5 +115,14 @@ import UniformTypeIdentifiers
         #expect(out.widthPx == 1000)
         #expect(out.heightPx == 2000)
     }
-}
 
+    @Test func respectsMaxBytes() throws {
+        let input = try makeNoiseJPEG(width: 1600, height: 1200)
+        let out = try JPEGTranscoder.transcodeToJPEG(
+            imageData: input,
+            maxWidthPx: 1600,
+            quality: 0.95,
+            maxBytes: 180_000)
+        #expect(out.data.count <= 180_000)
+    }
+}
diff --git a/docs/camera.md b/docs/camera.md
index 302e06d33..0353d1567 100644
--- a/docs/camera.md
+++ b/docs/camera.md
@@ -35,6 +35,7 @@ All camera access is gated behind **user-controlled settings**.
     - `format: "jpg"`
     - `base64: "<...>"`
     - `width`, `height`
+  - Payload guard: photos are recompressed to keep the base64 payload under 5 MB.
 
 - `camera.clip`
   - Params:
@@ -90,6 +91,10 @@ If permissions are missing, the app will prompt when possible; if denied, `camer
 
 Like `canvas.*`, the Android node only allows `camera.*` commands in the **foreground**. Background invocations return `NODE_BACKGROUND_UNAVAILABLE`.
 
+### Payload guard
+
+Photos are recompressed to keep the base64 payload under 5 MB.
+
 ## macOS app
 
 ### User setting (default off)

From 6e83f95c83fe60d22d18f5084ab006156157ffb7 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 22:13:39 +0000
Subject: [PATCH 019/100] fix: clamp tool images to 5MB

---
 CHANGELOG.md                   |  1 +
 src/agents/tool-images.test.ts | 35 ++++++++++++
 src/agents/tool-images.ts      | 98 +++++++++++++++++++---------------
 3 files changed, 90 insertions(+), 44 deletions(-)
 create mode 100644 src/agents/tool-images.test.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f73a670ad..662af8051 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - iOS/Android nodes: status pill now surfaces camera activity instead of overlay toasts.
 - iOS/Android nodes: camera snaps recompress to keep base64 payloads under 5 MB.
 - CLI: avoid spurious gateway close errors after successful request/response cycles.
+- Agent runtime: clamp tool-result images to the 5MB Anthropic limit to avoid hard request rejections.
 - Tests: add Swift Testing coverage for camera errors and Kotest coverage for Android bridge endpoints.
 
 ## 2.0.0-beta4 — 2025-12-27
diff --git a/src/agents/tool-images.test.ts b/src/agents/tool-images.test.ts
new file mode 100644
index 000000000..c6a5baffd
--- /dev/null
+++ b/src/agents/tool-images.test.ts
@@ -0,0 +1,35 @@
+import sharp from "sharp";
+import { describe, expect, it } from "vitest";
+
+import { sanitizeContentBlocksImages } from "./tool-images.js";
+
+describe("tool image sanitizing", () => {
+  it("shrinks oversized images to <=5MB", async () => {
+    const width = 2800;
+    const height = 2800;
+    const raw = Buffer.alloc(width * height * 3, 0xff);
+    const bigPng = await sharp(raw, {
+      raw: { width, height, channels: 3 },
+    })
+      .png({ compressionLevel: 0 })
+      .toBuffer();
+    expect(bigPng.byteLength).toBeGreaterThan(5 * 1024 * 1024);
+
+    const blocks = [
+      {
+        type: "image" as const,
+        data: bigPng.toString("base64"),
+        mimeType: "image/png",
+      },
+    ];
+
+    const out = await sanitizeContentBlocksImages(blocks, "test");
+    const image = out.find((b) => b.type === "image");
+    if (!image || image.type !== "image") {
+      throw new Error("expected image block");
+    }
+    const size = Buffer.from(image.data, "base64").byteLength;
+    expect(size).toBeLessThanOrEqual(5 * 1024 * 1024);
+    expect(image.mimeType).toBe("image/jpeg");
+  }, 20_000);
+});
diff --git a/src/agents/tool-images.ts b/src/agents/tool-images.ts
index a4357b504..167470ad7 100644
--- a/src/agents/tool-images.ts
+++ b/src/agents/tool-images.ts
@@ -1,19 +1,19 @@
 import type { AgentToolResult } from "@mariozechner/pi-ai";
 
 import { getImageMetadata, resizeToJpeg } from "../media/image-ops.js";
-import { detectMime } from "../media/mime.js";
 
 type ToolContentBlock = AgentToolResult<unknown>["content"][number];
 type ImageContentBlock = Extract<ToolContentBlock, { type: "image" }>;
 type TextContentBlock = Extract<ToolContentBlock, { type: "text" }>;
 
-// Anthropic Messages API limitation (observed in Clawdis sessions):
-// When sending many images in a single request (e.g. via session history + tool results),
-// Anthropic rejects any image where *either* dimension exceeds 2000px.
+// Anthropic Messages API limitations (observed in Clawdis sessions):
+// - Images over ~2000px per side can fail in multi-image requests.
+// - Images over 5MB are rejected by the API.
 //
 // To keep sessions resilient (and avoid "silent" WhatsApp non-replies), we auto-downscale
-// all base64 image blocks above this limit while preserving aspect ratio.
+// and recompress base64 image blocks when they exceed these limits.
 const MAX_IMAGE_DIMENSION_PX = 2000;
+const MAX_IMAGE_BYTES = 5 * 1024 * 1024;
 
 function isImageBlock(block: unknown): block is ImageContentBlock {
   if (!block || typeof block !== "object") return false;
@@ -35,66 +35,75 @@ async function resizeImageBase64IfNeeded(params: {
   base64: string;
   mimeType: string;
   maxDimensionPx: number;
+  maxBytes: number;
 }): Promise<{ base64: string; mimeType: string; resized: boolean }> {
   const buf = Buffer.from(params.base64, "base64");
   const meta = await getImageMetadata(buf);
   const width = meta?.width;
   const height = meta?.height;
-  if (
-    typeof width !== "number" ||
-    typeof height !== "number" ||
-    (width <= params.maxDimensionPx && height <= params.maxDimensionPx)
+  const overBytes = buf.byteLength > params.maxBytes;
+  const maxDim = Math.max(width ?? 0, height ?? 0);
+  if (typeof width !== "number" || typeof height !== "number") {
+    if (!overBytes) {
+      return {
+        base64: params.base64,
+        mimeType: params.mimeType,
+        resized: false,
+      };
+    }
+  } else if (
+    !overBytes &&
+    width <= params.maxDimensionPx &&
+    height <= params.maxDimensionPx
   ) {
     return { base64: params.base64, mimeType: params.mimeType, resized: false };
   }
 
-  const mime = params.mimeType.toLowerCase();
-  let out: Buffer;
-  try {
-    const mod = (await import("sharp")) as unknown as {
-      default?: typeof import("sharp");
-    };
-    const sharp = mod.default ?? (mod as unknown as typeof import("sharp"));
-    const img = sharp(buf, { failOnError: false }).resize({
-      width: params.maxDimensionPx,
-      height: params.maxDimensionPx,
-      fit: "inside",
-      withoutEnlargement: true,
-    });
-    if (mime === "image/jpeg" || mime === "image/jpg") {
-      out = await img.jpeg({ quality: 85 }).toBuffer();
-    } else if (mime === "image/webp") {
-      out = await img.webp({ quality: 85 }).toBuffer();
-    } else if (mime === "image/png") {
-      out = await img.png().toBuffer();
-    } else {
-      out = await img.png().toBuffer();
+  const qualities = [85, 75, 65, 55, 45, 35];
+  const sideStart = maxDim > 0 ? Math.min(params.maxDimensionPx, maxDim) : params.maxDimensionPx;
+  const sideGrid = [sideStart, 1800, 1600, 1400, 1200, 1000, 800]
+    .map((v) => Math.min(params.maxDimensionPx, v))
+    .filter((v, i, arr) => v > 0 && arr.indexOf(v) === i)
+    .sort((a, b) => b - a);
+
+  let smallest: { buffer: Buffer; size: number } | null = null;
+  for (const side of sideGrid) {
+    for (const quality of qualities) {
+      const out = await resizeToJpeg({
+        buffer: buf,
+        maxSide: side,
+        quality,
+        withoutEnlargement: true,
+      });
+      if (!smallest || out.byteLength < smallest.size) {
+        smallest = { buffer: out, size: out.byteLength };
+      }
+      if (out.byteLength <= params.maxBytes) {
+        return {
+          base64: out.toString("base64"),
+          mimeType: "image/jpeg",
+          resized: true,
+        };
+      }
     }
-  } catch {
-    // Bun can't load sharp native addons. Fall back to a JPEG conversion.
-    out = await resizeToJpeg({
-      buffer: buf,
-      maxSide: params.maxDimensionPx,
-      quality: 85,
-      withoutEnlargement: true,
-    });
   }
 
-  const sniffed = await detectMime({ buffer: out.slice(0, 256) });
-  const nextMime = sniffed?.startsWith("image/") ? sniffed : params.mimeType;
-
-  return { base64: out.toString("base64"), mimeType: nextMime, resized: true };
+  const best = smallest?.buffer ?? buf;
+  const maxMb = (params.maxBytes / (1024 * 1024)).toFixed(0);
+  const gotMb = (best.byteLength / (1024 * 1024)).toFixed(2);
+  throw new Error(`Image could not be reduced below ${maxMb}MB (got ${gotMb}MB)`);
 }
 
 export async function sanitizeContentBlocksImages(
   blocks: ToolContentBlock[],
   label: string,
-  opts: { maxDimensionPx?: number } = {},
+  opts: { maxDimensionPx?: number; maxBytes?: number } = {},
 ): Promise<ToolContentBlock[]> {
   const maxDimensionPx = Math.max(
     opts.maxDimensionPx ?? MAX_IMAGE_DIMENSION_PX,
     1,
   );
+  const maxBytes = Math.max(opts.maxBytes ?? MAX_IMAGE_BYTES, 1);
   const out: ToolContentBlock[] = [];
 
   for (const block of blocks) {
@@ -117,6 +126,7 @@ export async function sanitizeContentBlocksImages(
         base64: data,
         mimeType: block.mimeType,
         maxDimensionPx,
+        maxBytes,
       });
       out.push({ ...block, data: resized.base64, mimeType: resized.mimeType });
     } catch (err) {
@@ -133,7 +143,7 @@ export async function sanitizeContentBlocksImages(
 export async function sanitizeToolResultImages(
   result: AgentToolResult<unknown>,
   label: string,
-  opts: { maxDimensionPx?: number } = {},
+  opts: { maxDimensionPx?: number; maxBytes?: number } = {},
 ): Promise<AgentToolResult<unknown>> {
   const content = Array.isArray(result.content) ? result.content : [];
   if (!content.some((b) => isImageBlock(b) || isTextBlock(b))) return result;

From 6927b0fb8d990ccac9b09a435610286314117740 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 23:20:35 +0100
Subject: [PATCH 020/100] fix: align camera payload caps

---
 CHANGELOG.md                                             | 5 ++++-
 .../steipete/clawdis/node/node/CameraCaptureManager.kt   | 1 +
 .../main/java/com/steipete/clawdis/node/ui/RootScreen.kt | 1 +
 apps/ios/Sources/Camera/CameraController.swift           | 2 +-
 apps/ios/Sources/RootCanvas.swift                        | 1 +
 apps/macos/Sources/Clawdis/CameraCaptureService.swift    | 9 ++++++++-
 docs/camera.md                                           | 1 +
 7 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 662af8051..c17709774 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## 2.0.0-beta5 — Unreleased
 
+### Features
+- Talk mode: continuous speech conversations (macOS/iOS/Android) with ElevenLabs TTS, reply directives, and optional interrupt-on-speech.
+
 ### Fixes
 - macOS: Voice Wake now fully tears down the Speech pipeline when disabled (cancel pending restarts, drop stale callbacks) to avoid high CPU in the background.
 - iOS/Android nodes: enable scrolling for loaded web pages in the Canvas WebView (default scaffold stays touch-first).
@@ -10,7 +13,7 @@
 - iOS node: fix ReplayKit screen recording crash caused by queue isolation assertions during capture.
 - iOS/Android nodes: bridge auto-connect refreshes stale tokens and settings now show richer bridge/device details.
 - iOS/Android nodes: status pill now surfaces camera activity instead of overlay toasts.
-- iOS/Android nodes: camera snaps recompress to keep base64 payloads under 5 MB.
+- iOS/Android/macOS nodes: camera snaps recompress to keep base64 payloads under 5 MB.
 - CLI: avoid spurious gateway close errors after successful request/response cycles.
 - Agent runtime: clamp tool-result images to the 5MB Anthropic limit to avoid hard request rejections.
 - Tests: add Swift Testing coverage for camera errors and Kotest coverage for Android bridge endpoints.
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/node/CameraCaptureManager.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/node/CameraCaptureManager.kt
index b25b95ea4..416690766 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/node/CameraCaptureManager.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/node/CameraCaptureManager.kt
@@ -101,6 +101,7 @@ class CameraCaptureManager(private val context: Context) {
         }
 
       val maxPayloadBytes = 5 * 1024 * 1024
+      // Base64 inflates payloads by ~4/3; cap encoded bytes so the payload stays under 5MB (API limit).
       val maxEncodedBytes = (maxPayloadBytes / 4) * 3
       val result =
         JpegSizeLimiter.compressToLimit(
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
index f3cfb4b67..2594449b8 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
@@ -67,6 +67,7 @@ fun RootScreen(viewModel: MainViewModel) {
   val cameraFlashToken by viewModel.cameraFlashToken.collectAsState()
   val activity =
     remember(cameraHud) {
+      // Status pill owns transient capture state so it doesn't overlap the connection indicator.
       cameraHud?.let { hud ->
         when (hud.kind) {
           CameraHudKind.Photo ->
diff --git a/apps/ios/Sources/Camera/CameraController.swift b/apps/ios/Sources/Camera/CameraController.swift
index cf8c6ce50..00d633bd9 100644
--- a/apps/ios/Sources/Camera/CameraController.swift
+++ b/apps/ios/Sources/Camera/CameraController.swift
@@ -85,7 +85,7 @@ actor CameraController {
         withExtendedLifetime(delegate) {}
 
         let maxPayloadBytes = 5 * 1024 * 1024
-        // Base64 inflates payloads by ~4/3, so cap encoded bytes to keep payload <= 5MB.
+        // Base64 inflates payloads by ~4/3; cap encoded bytes so the payload stays under 5MB (API limit).
         let maxEncodedBytes = (maxPayloadBytes / 4) * 3
         let res = try JPEGTranscoder.transcodeToJPEG(
             imageData: rawData,
diff --git a/apps/ios/Sources/RootCanvas.swift b/apps/ios/Sources/RootCanvas.swift
index 4d552618e..c02eceb69 100644
--- a/apps/ios/Sources/RootCanvas.swift
+++ b/apps/ios/Sources/RootCanvas.swift
@@ -173,6 +173,7 @@ private struct CanvasContent: View {
     }
 
     private var statusActivity: StatusPill.Activity? {
+        // Status pill owns transient capture state so it doesn't overlap the connection indicator.
         guard let cameraHUDText, !cameraHUDText.isEmpty, let cameraHUDKind else { return nil }
         let systemImage: String
         let tint: Color?
diff --git a/apps/macos/Sources/Clawdis/CameraCaptureService.swift b/apps/macos/Sources/Clawdis/CameraCaptureService.swift
index c087c8fd3..3c9d9c357 100644
--- a/apps/macos/Sources/Clawdis/CameraCaptureService.swift
+++ b/apps/macos/Sources/Clawdis/CameraCaptureService.swift
@@ -79,7 +79,14 @@ actor CameraCaptureService {
         }
         withExtendedLifetime(delegate) {}
 
-        let res = try JPEGTranscoder.transcodeToJPEG(imageData: rawData, maxWidthPx: maxWidth, quality: quality)
+        let maxPayloadBytes = 5 * 1024 * 1024
+        // Base64 inflates payloads by ~4/3; cap encoded bytes so the payload stays under 5MB (API limit).
+        let maxEncodedBytes = (maxPayloadBytes / 4) * 3
+        let res = try JPEGTranscoder.transcodeToJPEG(
+            imageData: rawData,
+            maxWidthPx: maxWidth,
+            quality: quality,
+            maxBytes: maxEncodedBytes)
         return (data: res.data, size: CGSize(width: res.widthPx, height: res.heightPx))
     }
 
diff --git a/docs/camera.md b/docs/camera.md
index 0353d1567..aba3b5268 100644
--- a/docs/camera.md
+++ b/docs/camera.md
@@ -121,6 +121,7 @@ clawdis nodes camera clip --node <id> --no-audio
 
 Notes:
 - `clawdis nodes camera snap` defaults to `maxWidth=1600` unless overridden.
+- Photo payloads are recompressed to keep base64 under 5 MB.
 
 ## Safety + practical limits
 

From 20d7882033a00c44529e2b257e12b004ce2823c1 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 23:21:05 +0100
Subject: [PATCH 021/100] feat: add talk mode across nodes

---
 .../steipete/clawdis/node/MainViewModel.kt    |   8 +
 .../com/steipete/clawdis/node/NodeRuntime.kt  |  26 +
 .../com/steipete/clawdis/node/SecurePrefs.kt  |   8 +
 .../steipete/clawdis/node/ui/SettingsSheet.kt |  24 +
 .../clawdis/node/voice/TalkDirectiveParser.kt | 194 +++++
 .../clawdis/node/voice/TalkModeManager.kt     | 713 ++++++++++++++++++
 .../node/voice/TalkDirectiveParserTest.kt     |  55 ++
 apps/ios/Sources/Model/NodeAppModel.swift     |   8 +
 apps/ios/Sources/Settings/SettingsTab.swift   |   5 +
 apps/ios/Sources/Voice/TalkModeManager.swift  | 518 +++++++++++++
 apps/ios/Sources/Voice/VoiceTab.swift         |   5 +
 apps/macos/Sources/Clawdis/AppState.swift     |  32 +
 .../Sources/Clawdis/ConfigSettings.swift      |  68 ++
 apps/macos/Sources/Clawdis/Constants.swift    |   1 +
 .../Sources/Clawdis/MenuContentView.swift     |  13 +
 .../Sources/Clawdis/TalkAudioPlayer.swift     |  54 ++
 .../Sources/Clawdis/TalkModeController.swift  |  42 ++
 .../Sources/Clawdis/TalkModeRuntime.swift     | 684 +++++++++++++++++
 .../macos/Sources/Clawdis/TalkModeTypes.swift |   8 +
 apps/macos/Sources/Clawdis/TalkOverlay.swift  | 119 +++
 .../Sources/Clawdis/TalkOverlayView.swift     | 139 ++++
 .../Sources/ClawdisKit/TalkDirective.swift    | 194 +++++
 .../ClawdisKitTests/TalkDirectiveTests.swift  |  62 ++
 docs/configuration.md                         |  15 +
 docs/talk.md                                  |  72 ++
 src/config/config.ts                          |  20 +
 26 files changed, 3087 insertions(+)
 create mode 100644 apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkDirectiveParser.kt
 create mode 100644 apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
 create mode 100644 apps/android/app/src/test/java/com/steipete/clawdis/node/voice/TalkDirectiveParserTest.kt
 create mode 100644 apps/ios/Sources/Voice/TalkModeManager.swift
 create mode 100644 apps/macos/Sources/Clawdis/TalkAudioPlayer.swift
 create mode 100644 apps/macos/Sources/Clawdis/TalkModeController.swift
 create mode 100644 apps/macos/Sources/Clawdis/TalkModeRuntime.swift
 create mode 100644 apps/macos/Sources/Clawdis/TalkModeTypes.swift
 create mode 100644 apps/macos/Sources/Clawdis/TalkOverlay.swift
 create mode 100644 apps/macos/Sources/Clawdis/TalkOverlayView.swift
 create mode 100644 apps/shared/ClawdisKit/Sources/ClawdisKit/TalkDirective.swift
 create mode 100644 apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkDirectiveTests.swift
 create mode 100644 docs/talk.md

diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/MainViewModel.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/MainViewModel.kt
index 28d702975..ee1c83c9b 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/MainViewModel.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/MainViewModel.kt
@@ -35,6 +35,10 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
   val voiceWakeMode: StateFlow<VoiceWakeMode> = runtime.voiceWakeMode
   val voiceWakeStatusText: StateFlow<String> = runtime.voiceWakeStatusText
   val voiceWakeIsListening: StateFlow<Boolean> = runtime.voiceWakeIsListening
+  val talkEnabled: StateFlow<Boolean> = runtime.talkEnabled
+  val talkStatusText: StateFlow<String> = runtime.talkStatusText
+  val talkIsListening: StateFlow<Boolean> = runtime.talkIsListening
+  val talkIsSpeaking: StateFlow<Boolean> = runtime.talkIsSpeaking
   val manualEnabled: StateFlow<Boolean> = runtime.manualEnabled
   val manualHost: StateFlow<String> = runtime.manualHost
   val manualPort: StateFlow<Int> = runtime.manualPort
@@ -95,6 +99,10 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
     runtime.setVoiceWakeMode(mode)
   }
 
+  fun setTalkEnabled(enabled: Boolean) {
+    runtime.setTalkEnabled(enabled)
+  }
+
   fun connect(endpoint: BridgeEndpoint) {
     runtime.connect(endpoint)
   }
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
index 0ade08e3b..4984f7e0f 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
@@ -25,6 +25,7 @@ import com.steipete.clawdis.node.protocol.ClawdisCanvasA2UIAction
 import com.steipete.clawdis.node.protocol.ClawdisCanvasA2UICommand
 import com.steipete.clawdis.node.protocol.ClawdisCanvasCommand
 import com.steipete.clawdis.node.protocol.ClawdisScreenCommand
+import com.steipete.clawdis.node.voice.TalkModeManager
 import com.steipete.clawdis.node.voice.VoiceWakeManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -84,6 +85,15 @@ class NodeRuntime(context: Context) {
   val voiceWakeStatusText: StateFlow<String>
     get() = voiceWake.statusText
 
+  val talkStatusText: StateFlow<String>
+    get() = talkMode.statusText
+
+  val talkIsListening: StateFlow<Boolean>
+    get() = talkMode.isListening
+
+  val talkIsSpeaking: StateFlow<Boolean>
+    get() = talkMode.isSpeaking
+
   private val discovery = BridgeDiscovery(appContext, scope = scope)
   val bridges: StateFlow<List<BridgeEndpoint>> = discovery.bridges
   val discoveryStatusText: StateFlow<String> = discovery.statusText
@@ -133,6 +143,9 @@ class NodeRuntime(context: Context) {
     )
 
   private val chat = ChatController(scope = scope, session = session, json = json)
+  private val talkMode: TalkModeManager by lazy {
+    TalkModeManager(context = appContext, scope = scope).also { it.attachSession(session) }
+  }
 
   private fun handleSessionDisconnected(message: String) {
     _statusText.value = message
@@ -163,6 +176,7 @@ class NodeRuntime(context: Context) {
   val preventSleep: StateFlow<Boolean> = prefs.preventSleep
   val wakeWords: StateFlow<List<String>> = prefs.wakeWords
   val voiceWakeMode: StateFlow<VoiceWakeMode> = prefs.voiceWakeMode
+  val talkEnabled: StateFlow<Boolean> = prefs.talkEnabled
   val manualEnabled: StateFlow<Boolean> = prefs.manualEnabled
   val manualHost: StateFlow<String> = prefs.manualHost
   val manualPort: StateFlow<Int> = prefs.manualPort
@@ -218,6 +232,13 @@ class NodeRuntime(context: Context) {
         }
     }
 
+    scope.launch {
+      talkEnabled.collect { enabled ->
+        talkMode.setEnabled(enabled)
+        externalAudioCaptureActive.value = enabled
+      }
+    }
+
     scope.launch(Dispatchers.Default) {
       bridges.collect { list ->
         if (list.isNotEmpty()) {
@@ -311,6 +332,10 @@ class NodeRuntime(context: Context) {
     prefs.setVoiceWakeMode(mode)
   }
 
+  fun setTalkEnabled(value: Boolean) {
+    prefs.setTalkEnabled(value)
+  }
+
   fun connect(endpoint: BridgeEndpoint) {
     scope.launch {
       _statusText.value = "Connecting…"
@@ -548,6 +573,7 @@ class NodeRuntime(context: Context) {
       return
     }
 
+    talkMode.handleBridgeEvent(event, payloadJson)
     chat.handleBridgeEvent(event, payloadJson)
   }
 
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/SecurePrefs.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/SecurePrefs.kt
index 8d7ceb0a2..b288ef29e 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/SecurePrefs.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/SecurePrefs.kt
@@ -73,6 +73,9 @@ class SecurePrefs(context: Context) {
   private val _voiceWakeMode = MutableStateFlow(loadVoiceWakeMode())
   val voiceWakeMode: StateFlow<VoiceWakeMode> = _voiceWakeMode
 
+  private val _talkEnabled = MutableStateFlow(prefs.getBoolean("talk.enabled", false))
+  val talkEnabled: StateFlow<Boolean> = _talkEnabled
+
   fun setLastDiscoveredStableId(value: String) {
     val trimmed = value.trim()
     prefs.edit { putString("bridge.lastDiscoveredStableId", trimmed) }
@@ -158,6 +161,11 @@ class SecurePrefs(context: Context) {
     _voiceWakeMode.value = mode
   }
 
+  fun setTalkEnabled(value: Boolean) {
+    prefs.edit { putBoolean("talk.enabled", value) }
+    _talkEnabled.value = value
+  }
+
   private fun loadVoiceWakeMode(): VoiceWakeMode {
     val raw = prefs.getString(voiceWakeModeKey, null)
     val resolved = VoiceWakeMode.fromRawValue(raw)
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/SettingsSheet.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/SettingsSheet.kt
index c7d011892..2ec4a7119 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/SettingsSheet.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/SettingsSheet.kt
@@ -62,6 +62,8 @@ fun SettingsSheet(viewModel: MainViewModel) {
   val wakeWords by viewModel.wakeWords.collectAsState()
   val voiceWakeMode by viewModel.voiceWakeMode.collectAsState()
   val voiceWakeStatusText by viewModel.voiceWakeStatusText.collectAsState()
+  val talkEnabled by viewModel.talkEnabled.collectAsState()
+  val talkStatusText by viewModel.talkStatusText.collectAsState()
   val isConnected by viewModel.isConnected.collectAsState()
   val manualEnabled by viewModel.manualEnabled.collectAsState()
   val manualHost by viewModel.manualHost.collectAsState()
@@ -307,6 +309,28 @@ fun SettingsSheet(viewModel: MainViewModel) {
 
     // Voice
     item { Text("Voice", style = MaterialTheme.typography.titleSmall) }
+    item {
+      ListItem(
+        headlineContent = { Text("Talk Mode") },
+        supportingContent = { Text(talkStatusText) },
+        trailingContent = {
+          Switch(
+            checked = talkEnabled,
+            onCheckedChange = { on ->
+              if (on) {
+                val micOk =
+                  ContextCompat.checkSelfPermission(context, Manifest.permission.RECORD_AUDIO) ==
+                    PackageManager.PERMISSION_GRANTED
+                if (!micOk) audioPermissionLauncher.launch(Manifest.permission.RECORD_AUDIO)
+                viewModel.setTalkEnabled(true)
+              } else {
+                viewModel.setTalkEnabled(false)
+              }
+            },
+          )
+        },
+      )
+    }
     item {
       val enabled = voiceWakeMode != VoiceWakeMode.Off
       ListItem(
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkDirectiveParser.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkDirectiveParser.kt
new file mode 100644
index 000000000..539f556ff
--- /dev/null
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkDirectiveParser.kt
@@ -0,0 +1,194 @@
+package com.steipete.clawdis.node.voice
+
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+
+private val directiveJson = Json { ignoreUnknownKeys = true }
+
+data class TalkDirective(
+  val voiceId: String? = null,
+  val modelId: String? = null,
+  val speed: Double? = null,
+  val rateWpm: Int? = null,
+  val stability: Double? = null,
+  val similarity: Double? = null,
+  val style: Double? = null,
+  val speakerBoost: Boolean? = null,
+  val seed: Long? = null,
+  val normalize: String? = null,
+  val language: String? = null,
+  val outputFormat: String? = null,
+  val latencyTier: Int? = null,
+  val once: Boolean? = null,
+)
+
+data class TalkDirectiveParseResult(
+  val directive: TalkDirective?,
+  val stripped: String,
+  val unknownKeys: List<String>,
+)
+
+object TalkDirectiveParser {
+  fun parse(text: String): TalkDirectiveParseResult {
+    val normalized = text.replace("\r\n", "\n")
+    val lines = normalized.split("\n").toMutableList()
+    if (lines.isEmpty()) return TalkDirectiveParseResult(null, text, emptyList())
+
+    val firstNonEmpty = lines.indexOfFirst { it.trim().isNotEmpty() }
+    if (firstNonEmpty == -1) return TalkDirectiveParseResult(null, text, emptyList())
+
+    val head = lines[firstNonEmpty].trim()
+    if (!head.startsWith("{") || !head.endsWith("}")) {
+      return TalkDirectiveParseResult(null, text, emptyList())
+    }
+
+    val obj = parseJsonObject(head) ?: return TalkDirectiveParseResult(null, text, emptyList())
+
+    val speakerBoost =
+      boolValue(obj, listOf("speaker_boost", "speakerBoost"))
+        ?: boolValue(obj, listOf("no_speaker_boost", "noSpeakerBoost"))?.not()
+
+    val directive = TalkDirective(
+      voiceId = stringValue(obj, listOf("voice", "voice_id", "voiceId")),
+      modelId = stringValue(obj, listOf("model", "model_id", "modelId")),
+      speed = doubleValue(obj, listOf("speed")),
+      rateWpm = intValue(obj, listOf("rate", "wpm")),
+      stability = doubleValue(obj, listOf("stability")),
+      similarity = doubleValue(obj, listOf("similarity", "similarity_boost", "similarityBoost")),
+      style = doubleValue(obj, listOf("style")),
+      speakerBoost = speakerBoost,
+      seed = longValue(obj, listOf("seed")),
+      normalize = stringValue(obj, listOf("normalize", "apply_text_normalization")),
+      language = stringValue(obj, listOf("lang", "language_code", "language")),
+      outputFormat = stringValue(obj, listOf("output_format", "format")),
+      latencyTier = intValue(obj, listOf("latency", "latency_tier", "latencyTier")),
+      once = boolValue(obj, listOf("once")),
+    )
+
+    val hasDirective = listOf(
+      directive.voiceId,
+      directive.modelId,
+      directive.speed,
+      directive.rateWpm,
+      directive.stability,
+      directive.similarity,
+      directive.style,
+      directive.speakerBoost,
+      directive.seed,
+      directive.normalize,
+      directive.language,
+      directive.outputFormat,
+      directive.latencyTier,
+      directive.once,
+    ).any { it != null }
+
+    if (!hasDirective) return TalkDirectiveParseResult(null, text, emptyList())
+
+    val knownKeys = setOf(
+      "voice", "voice_id", "voiceid",
+      "model", "model_id", "modelid",
+      "speed", "rate", "wpm",
+      "stability", "similarity", "similarity_boost", "similarityboost",
+      "style",
+      "speaker_boost", "speakerboost",
+      "no_speaker_boost", "nospeakerboost",
+      "seed",
+      "normalize", "apply_text_normalization",
+      "lang", "language_code", "language",
+      "output_format", "format",
+      "latency", "latency_tier", "latencytier",
+      "once",
+    )
+    val unknownKeys = obj.keys.filter { !knownKeys.contains(it.lowercase()) }.sorted()
+
+    lines.removeAt(firstNonEmpty)
+    if (firstNonEmpty < lines.size) {
+      if (lines[firstNonEmpty].trim().isEmpty()) {
+        lines.removeAt(firstNonEmpty)
+      }
+    }
+
+    return TalkDirectiveParseResult(directive, lines.joinToString("\n"), unknownKeys)
+  }
+
+  private fun parseJsonObject(line: String): JsonObject? {
+    return try {
+      directiveJson.parseToJsonElement(line) as? JsonObject
+    } catch (_: Throwable) {
+      null
+    }
+  }
+
+  private fun stringValue(obj: JsonObject, keys: List<String>): String? {
+    for (key in keys) {
+      val value = obj[key].asStringOrNull()?.trim()
+      if (!value.isNullOrEmpty()) return value
+    }
+    return null
+  }
+
+  private fun doubleValue(obj: JsonObject, keys: List<String>): Double? {
+    for (key in keys) {
+      val value = obj[key].asDoubleOrNull()
+      if (value != null) return value
+    }
+    return null
+  }
+
+  private fun intValue(obj: JsonObject, keys: List<String>): Int? {
+    for (key in keys) {
+      val value = obj[key].asIntOrNull()
+      if (value != null) return value
+    }
+    return null
+  }
+
+  private fun longValue(obj: JsonObject, keys: List<String>): Long? {
+    for (key in keys) {
+      val value = obj[key].asLongOrNull()
+      if (value != null) return value
+    }
+    return null
+  }
+
+  private fun boolValue(obj: JsonObject, keys: List<String>): Boolean? {
+    for (key in keys) {
+      val value = obj[key].asBooleanOrNull()
+      if (value != null) return value
+    }
+    return null
+  }
+}
+
+private fun JsonElement?.asStringOrNull(): String? = (this as? JsonPrimitive)?.contentOrNull
+
+private fun JsonElement?.asDoubleOrNull(): Double? {
+  val primitive = this as? JsonPrimitive ?: return null
+  if (primitive.isString) return primitive.content.toDoubleOrNull()
+  return primitive.doubleOrNull
+}
+
+private fun JsonElement?.asIntOrNull(): Int? {
+  val primitive = this as? JsonPrimitive ?: return null
+  if (primitive.isString) return primitive.content.toIntOrNull()
+  return primitive.intOrNull
+}
+
+private fun JsonElement?.asLongOrNull(): Long? {
+  val primitive = this as? JsonPrimitive ?: return null
+  if (primitive.isString) return primitive.content.toLongOrNull()
+  return primitive.longOrNull
+}
+
+private fun JsonElement?.asBooleanOrNull(): Boolean? {
+  val primitive = this as? JsonPrimitive ?: return null
+  if (primitive.booleanOrNull != null) return primitive.booleanOrNull
+  val content = primitive.contentOrNull?.trim()?.lowercase() ?: return null
+  return when (content) {
+    "true", "yes", "1" -> true
+    "false", "no", "0" -> false
+    else -> null
+  }
+}
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
new file mode 100644
index 000000000..ecbc51869
--- /dev/null
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
@@ -0,0 +1,713 @@
+package com.steipete.clawdis.node.voice
+
+import android.Manifest
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.media.AudioAttributes
+import android.media.MediaPlayer
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.os.SystemClock
+import android.speech.RecognitionListener
+import android.speech.RecognizerIntent
+import android.speech.SpeechRecognizer
+import android.util.Log
+import androidx.core.content.ContextCompat
+import com.steipete.clawdis.node.bridge.BridgeSession
+import java.io.File
+import java.net.HttpURLConnection
+import java.net.URL
+import java.util.UUID
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.buildJsonObject
+
+class TalkModeManager(
+  private val context: Context,
+  private val scope: CoroutineScope,
+) {
+  companion object {
+    private const val tag = "TalkMode"
+  }
+
+  private val mainHandler = Handler(Looper.getMainLooper())
+  private val json = Json { ignoreUnknownKeys = true }
+
+  private val _isEnabled = MutableStateFlow(false)
+  val isEnabled: StateFlow<Boolean> = _isEnabled
+
+  private val _isListening = MutableStateFlow(false)
+  val isListening: StateFlow<Boolean> = _isListening
+
+  private val _isSpeaking = MutableStateFlow(false)
+  val isSpeaking: StateFlow<Boolean> = _isSpeaking
+
+  private val _statusText = MutableStateFlow("Off")
+  val statusText: StateFlow<String> = _statusText
+
+  private var recognizer: SpeechRecognizer? = null
+  private var restartJob: Job? = null
+  private var stopRequested = false
+  private var listeningMode = false
+
+  private var silenceJob: Job? = null
+  private val silenceWindowMs = 700L
+  private var lastTranscript: String = ""
+  private var lastHeardAtMs: Long? = null
+  private var lastSpokenText: String? = null
+  private var lastInterruptedAtSeconds: Double? = null
+
+  private var defaultVoiceId: String? = null
+  private var currentVoiceId: String? = null
+  private var defaultModelId: String? = null
+  private var currentModelId: String? = null
+  private var defaultOutputFormat: String? = null
+  private var interruptOnSpeech: Boolean = true
+  private var voiceOverrideActive = false
+  private var modelOverrideActive = false
+
+  private var session: BridgeSession? = null
+  private var pendingRunId: String? = null
+  private var pendingFinal: CompletableDeferred<Boolean>? = null
+
+  private var player: MediaPlayer? = null
+  private var currentAudioFile: File? = null
+
+  fun attachSession(session: BridgeSession) {
+    this.session = session
+  }
+
+  fun setEnabled(enabled: Boolean) {
+    if (_isEnabled.value == enabled) return
+    _isEnabled.value = enabled
+    if (enabled) {
+      start()
+    } else {
+      stop()
+    }
+  }
+
+  fun handleBridgeEvent(event: String, payloadJson: String?) {
+    if (event != "chat") return
+    if (payloadJson.isNullOrBlank()) return
+    val pending = pendingRunId ?: return
+    val obj =
+      try {
+        json.parseToJsonElement(payloadJson).asObjectOrNull()
+      } catch (_: Throwable) {
+        null
+      } ?: return
+    val runId = obj["runId"].asStringOrNull() ?: return
+    if (runId != pending) return
+    val state = obj["state"].asStringOrNull() ?: return
+    if (state == "final") {
+      pendingFinal?.complete(true)
+      pendingFinal = null
+      pendingRunId = null
+    }
+  }
+
+  private fun start() {
+    mainHandler.post {
+      if (_isListening.value) return@post
+      stopRequested = false
+      listeningMode = true
+
+      if (!SpeechRecognizer.isRecognitionAvailable(context)) {
+        _statusText.value = "Speech recognizer unavailable"
+        return@post
+      }
+
+      val micOk =
+        ContextCompat.checkSelfPermission(context, Manifest.permission.RECORD_AUDIO) ==
+          PackageManager.PERMISSION_GRANTED
+      if (!micOk) {
+        _statusText.value = "Microphone permission required"
+        return@post
+      }
+
+      try {
+        recognizer?.destroy()
+        recognizer = SpeechRecognizer.createSpeechRecognizer(context).also { it.setRecognitionListener(listener) }
+        startListeningInternal(markListening = true)
+        startSilenceMonitor()
+      } catch (err: Throwable) {
+        _statusText.value = "Start failed: ${err.message ?: err::class.simpleName}"
+      }
+    }
+  }
+
+  private fun stop() {
+    stopRequested = true
+    listeningMode = false
+    restartJob?.cancel()
+    restartJob = null
+    silenceJob?.cancel()
+    silenceJob = null
+    lastTranscript = ""
+    lastHeardAtMs = null
+    _isListening.value = false
+    _statusText.value = "Off"
+    stopSpeaking()
+
+    mainHandler.post {
+      recognizer?.cancel()
+      recognizer?.destroy()
+      recognizer = null
+    }
+  }
+
+  private fun startListeningInternal(markListening: Boolean) {
+    val r = recognizer ?: return
+    val intent =
+      Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH).apply {
+        putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
+        putExtra(RecognizerIntent.EXTRA_PARTIAL_RESULTS, true)
+        putExtra(RecognizerIntent.EXTRA_MAX_RESULTS, 3)
+        putExtra(RecognizerIntent.EXTRA_CALLING_PACKAGE, context.packageName)
+      }
+
+    if (markListening) {
+      _statusText.value = "Listening"
+      _isListening.value = true
+    }
+    r.startListening(intent)
+  }
+
+  private fun scheduleRestart(delayMs: Long = 350) {
+    if (stopRequested) return
+    restartJob?.cancel()
+    restartJob =
+      scope.launch {
+        delay(delayMs)
+        mainHandler.post {
+          if (stopRequested) return@post
+          try {
+            recognizer?.cancel()
+            val shouldListen = listeningMode
+            val shouldInterrupt = _isSpeaking.value && interruptOnSpeech
+            if (!shouldListen && !shouldInterrupt) return@post
+            startListeningInternal(markListening = shouldListen)
+          } catch (_: Throwable) {
+            // handled by onError
+          }
+        }
+      }
+  }
+
+  private fun handleTranscript(text: String, isFinal: Boolean) {
+    val trimmed = text.trim()
+    if (_isSpeaking.value && interruptOnSpeech) {
+      if (shouldInterrupt(trimmed)) {
+        stopSpeaking()
+      }
+      return
+    }
+
+    if (!_isListening.value) return
+
+    if (trimmed.isNotEmpty()) {
+      lastTranscript = trimmed
+      lastHeardAtMs = SystemClock.elapsedRealtime()
+    }
+
+    if (isFinal) {
+      lastTranscript = trimmed
+    }
+  }
+
+  private fun startSilenceMonitor() {
+    silenceJob?.cancel()
+    silenceJob =
+      scope.launch {
+        while (_isEnabled.value) {
+          delay(200)
+          checkSilence()
+        }
+      }
+  }
+
+  private fun checkSilence() {
+    if (!_isListening.value) return
+    val transcript = lastTranscript.trim()
+    if (transcript.isEmpty()) return
+    val lastHeard = lastHeardAtMs ?: return
+    val elapsed = SystemClock.elapsedRealtime() - lastHeard
+    if (elapsed < silenceWindowMs) return
+    scope.launch { finalizeTranscript(transcript) }
+  }
+
+  private suspend fun finalizeTranscript(transcript: String) {
+    listeningMode = false
+    _isListening.value = false
+    _statusText.value = "Thinking…"
+    lastTranscript = ""
+    lastHeardAtMs = null
+
+    reloadConfig()
+    val prompt = buildPrompt(transcript)
+    val bridge = session
+    if (bridge == null) {
+      _statusText.value = "Bridge not connected"
+      start()
+      return
+    }
+
+    try {
+      val runId = sendChat(prompt, bridge)
+      val ok = waitForChatFinal(runId)
+      if (!ok) {
+        _statusText.value = "No reply"
+        start()
+        return
+      }
+      val assistant = fetchLatestAssistantText(bridge)
+      if (assistant.isNullOrBlank()) {
+        _statusText.value = "No reply"
+        start()
+        return
+      }
+      playAssistant(assistant)
+    } catch (err: Throwable) {
+      _statusText.value = "Talk failed: ${err.message ?: err::class.simpleName}"
+    }
+
+    if (_isEnabled.value) {
+      start()
+    }
+  }
+
+  private fun buildPrompt(transcript: String): String {
+    val lines = mutableListOf(
+      "Talk Mode active. Reply in a concise, spoken tone.",
+      "You may optionally prefix the response with JSON (first line) to set ElevenLabs voice, e.g. {\"voice\":\"<id>\",\"once\":true}.",
+    )
+    lastInterruptedAtSeconds?.let {
+      lines.add("Assistant speech interrupted at ${"%.1f".format(it)}s.")
+      lastInterruptedAtSeconds = null
+    }
+    lines.add("")
+    lines.add(transcript)
+    return lines.joinToString("\n")
+  }
+
+  private suspend fun sendChat(message: String, bridge: BridgeSession): String {
+    val runId = UUID.randomUUID().toString()
+    val params =
+      buildJsonObject {
+        put("sessionKey", JsonPrimitive("main"))
+        put("message", JsonPrimitive(message))
+        put("thinking", JsonPrimitive("low"))
+        put("timeoutMs", JsonPrimitive(30_000))
+        put("idempotencyKey", JsonPrimitive(runId))
+      }
+    val res = bridge.request("chat.send", params.toString())
+    val parsed = parseRunId(res) ?: runId
+    if (parsed != runId) {
+      pendingRunId = parsed
+    }
+    return parsed
+  }
+
+  private suspend fun waitForChatFinal(runId: String): Boolean {
+    pendingFinal?.cancel()
+    val deferred = CompletableDeferred<Boolean>()
+    pendingRunId = runId
+    pendingFinal = deferred
+
+    val result =
+      withContext(Dispatchers.IO) {
+        try {
+          kotlinx.coroutines.withTimeout(120_000) { deferred.await() }
+        } catch (_: Throwable) {
+          false
+        }
+      }
+
+    if (!result) {
+      pendingFinal = null
+      pendingRunId = null
+    }
+    return result
+  }
+
+  private suspend fun fetchLatestAssistantText(bridge: BridgeSession): String? {
+    val res = bridge.request("chat.history", "{\"sessionKey\":\"main\"}")
+    val root = json.parseToJsonElement(res).asObjectOrNull() ?: return null
+    val messages = root["messages"] as? JsonArray ?: return null
+    for (item in messages.reversed()) {
+      val obj = item.asObjectOrNull() ?: continue
+      if (obj["role"].asStringOrNull() != "assistant") continue
+      val content = obj["content"] as? JsonArray ?: continue
+      val text =
+        content.mapNotNull { entry ->
+          entry.asObjectOrNull()?.get("text")?.asStringOrNull()?.trim()
+        }.filter { it.isNotEmpty() }
+      if (text.isNotEmpty()) return text.joinToString("\n")
+    }
+    return null
+  }
+
+  private suspend fun playAssistant(text: String) {
+    val parsed = TalkDirectiveParser.parse(text)
+    if (parsed.unknownKeys.isNotEmpty()) {
+      Log.w(tag, "Unknown talk directive keys: ${parsed.unknownKeys}")
+    }
+    val directive = parsed.directive
+    val cleaned = parsed.stripped.trim()
+    if (cleaned.isEmpty()) return
+
+    if (directive?.voiceId != null) {
+      if (directive.once != true) {
+        currentVoiceId = directive.voiceId
+        voiceOverrideActive = true
+      }
+    }
+    if (directive?.modelId != null) {
+      if (directive.once != true) {
+        currentModelId = directive.modelId
+        modelOverrideActive = true
+      }
+    }
+
+    val voiceId = directive?.voiceId ?: currentVoiceId ?: defaultVoiceId
+    if (voiceId.isNullOrBlank()) {
+      _statusText.value = "Missing voice ID"
+      return
+    }
+
+    val apiKey = System.getenv("ELEVENLABS_API_KEY")?.trim()
+    if (apiKey.isNullOrEmpty()) {
+      _statusText.value = "Missing ELEVENLABS_API_KEY"
+      return
+    }
+
+    _statusText.value = "Speaking…"
+    _isSpeaking.value = true
+    lastSpokenText = cleaned
+    ensureInterruptListener()
+
+    try {
+      val request =
+        ElevenLabsRequest(
+          text = cleaned,
+          modelId = directive?.modelId ?: currentModelId ?: defaultModelId,
+          outputFormat = directive?.outputFormat ?: defaultOutputFormat,
+          speed = TalkModeRuntime.resolveSpeed(directive?.speed, directive?.rateWpm),
+          stability = TalkModeRuntime.validatedUnit(directive?.stability),
+          similarity = TalkModeRuntime.validatedUnit(directive?.similarity),
+          style = TalkModeRuntime.validatedUnit(directive?.style),
+          speakerBoost = directive?.speakerBoost,
+          seed = TalkModeRuntime.validatedSeed(directive?.seed),
+          normalize = TalkModeRuntime.validatedNormalize(directive?.normalize),
+          language = TalkModeRuntime.validatedLanguage(directive?.language),
+        )
+      val audio = synthesize(voiceId = voiceId, apiKey = apiKey, request = request)
+      playAudio(audio)
+    } catch (err: Throwable) {
+      _statusText.value = "Speak failed: ${err.message ?: err::class.simpleName}"
+    }
+
+    _isSpeaking.value = false
+  }
+
+  private suspend fun playAudio(data: ByteArray) {
+    stopSpeaking(resetInterrupt = false)
+    val file = File.createTempFile("talk-", ".mp3", context.cacheDir)
+    file.writeBytes(data)
+    currentAudioFile = file
+
+    val player = MediaPlayer()
+    this.player = player
+
+    val finished = CompletableDeferred<Unit>()
+    player.setAudioAttributes(
+      AudioAttributes.Builder()
+        .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+        .setUsage(AudioAttributes.USAGE_ASSISTANT)
+        .build(),
+    )
+    player.setOnCompletionListener {
+      finished.complete(Unit)
+    }
+    player.setOnErrorListener { _, _, _ ->
+      finished.completeExceptionally(IllegalStateException("MediaPlayer error"))
+      true
+    }
+
+    player.setDataSource(file.absolutePath)
+    withContext(Dispatchers.Main) {
+      player.setOnPreparedListener { it.start() }
+      player.prepareAsync()
+    }
+
+    try {
+      finished.await()
+    } finally {
+      cleanupPlayer()
+    }
+  }
+
+  private fun stopSpeaking(resetInterrupt: Boolean = true) {
+    if (!_isSpeaking.value) {
+      cleanupPlayer()
+      return
+    }
+    if (resetInterrupt) {
+      val currentMs = player?.currentPosition?.toDouble() ?: 0.0
+      lastInterruptedAtSeconds = currentMs / 1000.0
+    }
+    cleanupPlayer()
+    _isSpeaking.value = false
+  }
+
+  private fun cleanupPlayer() {
+    player?.stop()
+    player?.release()
+    player = null
+    currentAudioFile?.delete()
+    currentAudioFile = null
+  }
+
+  private fun shouldInterrupt(transcript: String): Boolean {
+    val trimmed = transcript.trim()
+    if (trimmed.length < 3) return false
+    val spoken = lastSpokenText?.lowercase()
+    if (spoken != null && spoken.contains(trimmed.lowercase())) return false
+    return true
+  }
+
+  private suspend fun reloadConfig() {
+    val bridge = session ?: return
+    val envVoice = System.getenv("ELEVENLABS_VOICE_ID")?.trim()
+    val sagVoice = System.getenv("SAG_VOICE_ID")?.trim()
+    try {
+      val res = bridge.request("config.get", "{}")
+      val root = json.parseToJsonElement(res).asObjectOrNull()
+      val config = root?.get("config").asObjectOrNull()
+      val talk = config?.get("talk").asObjectOrNull()
+      val voice = talk?.get("voiceId")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() }
+      val model = talk?.get("modelId")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() }
+      val outputFormat = talk?.get("outputFormat")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() }
+      val interrupt = talk?.get("interruptOnSpeech")?.asBooleanOrNull()
+
+      defaultVoiceId = voice ?: envVoice?.takeIf { it.isNotEmpty() } ?: sagVoice?.takeIf { it.isNotEmpty() }
+      if (!voiceOverrideActive) currentVoiceId = defaultVoiceId
+      defaultModelId = model
+      if (!modelOverrideActive) currentModelId = defaultModelId
+      defaultOutputFormat = outputFormat
+      if (interrupt != null) interruptOnSpeech = interrupt
+    } catch (_: Throwable) {
+      defaultVoiceId = envVoice?.takeIf { it.isNotEmpty() } ?: sagVoice?.takeIf { it.isNotEmpty() }
+    }
+  }
+
+  private fun parseRunId(jsonString: String): String? {
+    val obj = json.parseToJsonElement(jsonString).asObjectOrNull() ?: return null
+    return obj["runId"].asStringOrNull()
+  }
+
+  private suspend fun synthesize(voiceId: String, apiKey: String, request: ElevenLabsRequest): ByteArray {
+    return withContext(Dispatchers.IO) {
+      val url = URL("https://api.elevenlabs.io/v1/text-to-speech/$voiceId")
+      val conn = url.openConnection() as HttpURLConnection
+      conn.requestMethod = "POST"
+      conn.setRequestProperty("Content-Type", "application/json")
+      conn.setRequestProperty("Accept", "audio/mpeg")
+      conn.setRequestProperty("xi-api-key", apiKey)
+      conn.doOutput = true
+
+      val payload = buildRequestPayload(request)
+      conn.outputStream.use { it.write(payload.toByteArray()) }
+
+      val code = conn.responseCode
+      val stream = if (code >= 400) conn.errorStream else conn.inputStream
+      val data = stream.readBytes()
+      if (code >= 400) {
+        val message = String(data)
+        throw IllegalStateException("ElevenLabs failed: $code $message")
+      }
+      data
+    }
+  }
+
+  private fun buildRequestPayload(request: ElevenLabsRequest): String {
+    val voiceSettingsEntries =
+      buildJsonObject {
+        request.speed?.let { put("speed", JsonPrimitive(it)) }
+        request.stability?.let { put("stability", JsonPrimitive(it)) }
+        request.similarity?.let { put("similarity_boost", JsonPrimitive(it)) }
+        request.style?.let { put("style", JsonPrimitive(it)) }
+        request.speakerBoost?.let { put("use_speaker_boost", JsonPrimitive(it)) }
+      }
+
+    val payload =
+      buildJsonObject {
+        put("text", JsonPrimitive(request.text))
+        request.modelId?.takeIf { it.isNotEmpty() }?.let { put("model_id", JsonPrimitive(it)) }
+        request.outputFormat?.takeIf { it.isNotEmpty() }?.let { put("output_format", JsonPrimitive(it)) }
+        request.seed?.let { put("seed", JsonPrimitive(it)) }
+        request.normalize?.let { put("apply_text_normalization", JsonPrimitive(it)) }
+        request.language?.let { put("language_code", JsonPrimitive(it)) }
+        if (voiceSettingsEntries.isNotEmpty()) {
+          put("voice_settings", voiceSettingsEntries)
+        }
+      }
+
+    return payload.toString()
+  }
+
+  private data class ElevenLabsRequest(
+    val text: String,
+    val modelId: String?,
+    val outputFormat: String?,
+    val speed: Double?,
+    val stability: Double?,
+    val similarity: Double?,
+    val style: Double?,
+    val speakerBoost: Boolean?,
+    val seed: Long?,
+    val normalize: String?,
+    val language: String?,
+  )
+
+  private object TalkModeRuntime {
+    fun resolveSpeed(speed: Double?, rateWpm: Int?): Double? {
+      if (rateWpm != null && rateWpm > 0) {
+        val resolved = rateWpm.toDouble() / 175.0
+        if (resolved <= 0.5 || resolved >= 2.0) return null
+        return resolved
+      }
+      if (speed != null) {
+        if (speed <= 0.5 || speed >= 2.0) return null
+        return speed
+      }
+      return null
+    }
+
+    fun validatedUnit(value: Double?): Double? {
+      if (value == null) return null
+      if (value < 0 || value > 1) return null
+      return value
+    }
+
+    fun validatedSeed(value: Long?): Long? {
+      if (value == null) return null
+      if (value < 0 || value > 4294967295L) return null
+      return value
+    }
+
+    fun validatedNormalize(value: String?): String? {
+      val normalized = value?.trim()?.lowercase() ?: return null
+      return if (normalized in listOf("auto", "on", "off")) normalized else null
+    }
+
+    fun validatedLanguage(value: String?): String? {
+      val normalized = value?.trim()?.lowercase() ?: return null
+      if (normalized.length != 2) return null
+      if (!normalized.all { it in 'a'..'z' }) return null
+      return normalized
+    }
+  }
+
+  private fun ensureInterruptListener() {
+    if (!interruptOnSpeech || !_isEnabled.value) return
+    mainHandler.post {
+      if (stopRequested) return@post
+      if (!SpeechRecognizer.isRecognitionAvailable(context)) return@post
+      try {
+        if (recognizer == null) {
+          recognizer = SpeechRecognizer.createSpeechRecognizer(context).also { it.setRecognitionListener(listener) }
+        }
+        recognizer?.cancel()
+        startListeningInternal(markListening = false)
+      } catch (_: Throwable) {
+        // ignore
+      }
+    }
+  }
+
+  private val listener =
+    object : RecognitionListener {
+      override fun onReadyForSpeech(params: Bundle?) {
+        if (_isEnabled.value) {
+          _statusText.value = if (_isListening.value) "Listening" else _statusText.value
+        }
+      }
+
+      override fun onBeginningOfSpeech() {}
+
+      override fun onRmsChanged(rmsdB: Float) {}
+
+      override fun onBufferReceived(buffer: ByteArray?) {}
+
+      override fun onEndOfSpeech() {
+        scheduleRestart()
+      }
+
+      override fun onError(error: Int) {
+        if (stopRequested) return
+        _isListening.value = false
+        if (error == SpeechRecognizer.ERROR_INSUFFICIENT_PERMISSIONS) {
+          _statusText.value = "Microphone permission required"
+          return
+        }
+
+        _statusText.value =
+          when (error) {
+            SpeechRecognizer.ERROR_AUDIO -> "Audio error"
+            SpeechRecognizer.ERROR_CLIENT -> "Client error"
+            SpeechRecognizer.ERROR_NETWORK -> "Network error"
+            SpeechRecognizer.ERROR_NETWORK_TIMEOUT -> "Network timeout"
+            SpeechRecognizer.ERROR_NO_MATCH -> "Listening"
+            SpeechRecognizer.ERROR_RECOGNIZER_BUSY -> "Recognizer busy"
+            SpeechRecognizer.ERROR_SERVER -> "Server error"
+            SpeechRecognizer.ERROR_SPEECH_TIMEOUT -> "Listening"
+            else -> "Speech error ($error)"
+          }
+        scheduleRestart(delayMs = 600)
+      }
+
+      override fun onResults(results: Bundle?) {
+        val list = results?.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION).orEmpty()
+        list.firstOrNull()?.let { handleTranscript(it, isFinal = true) }
+        scheduleRestart()
+      }
+
+      override fun onPartialResults(partialResults: Bundle?) {
+        val list = partialResults?.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION).orEmpty()
+        list.firstOrNull()?.let { handleTranscript(it, isFinal = false) }
+      }
+
+      override fun onEvent(eventType: Int, params: Bundle?) {}
+    }
+}
+
+private fun JsonElement?.asObjectOrNull(): JsonObject? = this as? JsonObject
+
+private fun JsonElement?.asStringOrNull(): String? = (this as? JsonPrimitive)?.contentOrNull
+
+private fun JsonElement?.asBooleanOrNull(): Boolean? {
+  val primitive = this as? JsonPrimitive ?: return null
+  if (primitive.booleanOrNull != null) return primitive.booleanOrNull
+  val content = primitive.contentOrNull?.trim()?.lowercase() ?: return null
+  return when (content) {
+    "true", "yes", "1" -> true
+    "false", "no", "0" -> false
+    else -> null
+  }
+}
diff --git a/apps/android/app/src/test/java/com/steipete/clawdis/node/voice/TalkDirectiveParserTest.kt b/apps/android/app/src/test/java/com/steipete/clawdis/node/voice/TalkDirectiveParserTest.kt
new file mode 100644
index 000000000..d69d2008f
--- /dev/null
+++ b/apps/android/app/src/test/java/com/steipete/clawdis/node/voice/TalkDirectiveParserTest.kt
@@ -0,0 +1,55 @@
+package com.steipete.clawdis.node.voice
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class TalkDirectiveParserTest {
+  @Test
+  fun parsesDirectiveAndStripsHeader() {
+    val input = """
+      {"voice":"voice-123","once":true}
+      Hello from talk mode.
+    """.trimIndent()
+    val result = TalkDirectiveParser.parse(input)
+    assertEquals("voice-123", result.directive?.voiceId)
+    assertEquals(true, result.directive?.once)
+    assertEquals("Hello from talk mode.", result.stripped.trim())
+  }
+
+  @Test
+  fun ignoresUnknownKeysButReportsThem() {
+    val input = """
+      {"voice":"abc","foo":1,"bar":"baz"}
+      Hi there.
+    """.trimIndent()
+    val result = TalkDirectiveParser.parse(input)
+    assertEquals("abc", result.directive?.voiceId)
+    assertTrue(result.unknownKeys.containsAll(listOf("bar", "foo")))
+  }
+
+  @Test
+  fun parsesAlternateKeys() {
+    val input = """
+      {"model_id":"eleven_v3","similarity_boost":0.4,"no_speaker_boost":true,"rate":200}
+      Speak.
+    """.trimIndent()
+    val result = TalkDirectiveParser.parse(input)
+    assertEquals("eleven_v3", result.directive?.modelId)
+    assertEquals(0.4, result.directive?.similarity)
+    assertEquals(false, result.directive?.speakerBoost)
+    assertEquals(200, result.directive?.rateWpm)
+  }
+
+  @Test
+  fun returnsNullWhenNoDirectivePresent() {
+    val input = """
+      {}
+      Hello.
+    """.trimIndent()
+    val result = TalkDirectiveParser.parse(input)
+    assertNull(result.directive)
+    assertEquals(input, result.stripped)
+  }
+}
diff --git a/apps/ios/Sources/Model/NodeAppModel.swift b/apps/ios/Sources/Model/NodeAppModel.swift
index 36b9345e1..4c491ea55 100644
--- a/apps/ios/Sources/Model/NodeAppModel.swift
+++ b/apps/ios/Sources/Model/NodeAppModel.swift
@@ -28,6 +28,7 @@ final class NodeAppModel {
     private var voiceWakeSyncTask: Task<Void, Never>?
     @ObservationIgnored private var cameraHUDDismissTask: Task<Void, Never>?
     let voiceWake = VoiceWakeManager()
+    let talkMode = TalkModeManager()
     private var lastAutoA2uiURL: String?
 
     var bridgeSession: BridgeSession { self.bridge }
@@ -49,6 +50,9 @@ final class NodeAppModel {
 
         let enabled = UserDefaults.standard.bool(forKey: "voiceWake.enabled")
         self.voiceWake.setEnabled(enabled)
+        self.talkMode.attachBridge(self.bridge)
+        let talkEnabled = UserDefaults.standard.bool(forKey: "talk.enabled")
+        self.talkMode.setEnabled(talkEnabled)
 
         // Wire up deep links from canvas taps
         self.screen.onDeepLink = { [weak self] url in
@@ -177,6 +181,10 @@ final class NodeAppModel {
         self.voiceWake.setEnabled(enabled)
     }
 
+    func setTalkEnabled(_ enabled: Bool) {
+        self.talkMode.setEnabled(enabled)
+    }
+
     func connectToBridge(
         endpoint: NWEndpoint,
         hello: BridgeHello)
diff --git a/apps/ios/Sources/Settings/SettingsTab.swift b/apps/ios/Sources/Settings/SettingsTab.swift
index 34feee23a..265b7069c 100644
--- a/apps/ios/Sources/Settings/SettingsTab.swift
+++ b/apps/ios/Sources/Settings/SettingsTab.swift
@@ -20,6 +20,7 @@ struct SettingsTab: View {
     @AppStorage("node.displayName") private var displayName: String = "iOS Node"
     @AppStorage("node.instanceId") private var instanceId: String = UUID().uuidString
     @AppStorage("voiceWake.enabled") private var voiceWakeEnabled: Bool = false
+    @AppStorage("talk.enabled") private var talkEnabled: Bool = false
     @AppStorage("camera.enabled") private var cameraEnabled: Bool = true
     @AppStorage("screen.preventSleep") private var preventSleep: Bool = true
     @AppStorage("bridge.preferredStableID") private var preferredBridgeStableID: String = ""
@@ -156,6 +157,10 @@ struct SettingsTab: View {
                         .onChange(of: self.voiceWakeEnabled) { _, newValue in
                             self.appModel.setVoiceWakeEnabled(newValue)
                         }
+                    Toggle("Talk Mode", isOn: self.$talkEnabled)
+                        .onChange(of: self.talkEnabled) { _, newValue in
+                            self.appModel.setTalkEnabled(newValue)
+                        }
 
                     NavigationLink {
                         VoiceWakeWordsSettingsView()
diff --git a/apps/ios/Sources/Voice/TalkModeManager.swift b/apps/ios/Sources/Voice/TalkModeManager.swift
new file mode 100644
index 000000000..649eaa03a
--- /dev/null
+++ b/apps/ios/Sources/Voice/TalkModeManager.swift
@@ -0,0 +1,518 @@
+import AVFAudio
+import ClawdisKit
+import Foundation
+import Observation
+import Speech
+
+@MainActor
+@Observable
+final class TalkModeManager: NSObject {
+    var isEnabled: Bool = false
+    var isListening: Bool = false
+    var isSpeaking: Bool = false
+    var statusText: String = "Off"
+
+    private let audioEngine = AVAudioEngine()
+    private var speechRecognizer: SFSpeechRecognizer?
+    private var recognitionRequest: SFSpeechAudioBufferRecognitionRequest?
+    private var recognitionTask: SFSpeechRecognitionTask?
+    private var silenceTask: Task<Void, Never>?
+
+    private var lastHeard: Date?
+    private var lastTranscript: String = ""
+    private var lastSpokenText: String?
+    private var lastInterruptedAtSeconds: Double?
+
+    private var defaultVoiceId: String?
+    private var currentVoiceId: String?
+    private var defaultModelId: String?
+    private var currentModelId: String?
+    private var defaultOutputFormat: String?
+    private var interruptOnSpeech: Bool = true
+
+    private var bridge: BridgeSession?
+    private let silenceWindow: TimeInterval = 0.7
+
+    private var player: AVAudioPlayer?
+
+    func attachBridge(_ bridge: BridgeSession) {
+        self.bridge = bridge
+    }
+
+    func setEnabled(_ enabled: Bool) {
+        self.isEnabled = enabled
+        if enabled {
+            Task { await self.start() }
+        } else {
+            self.stop()
+        }
+    }
+
+    func start() async {
+        guard self.isEnabled else { return }
+        if self.isListening { return }
+
+        self.statusText = "Requesting permissions…"
+        let micOk = await Self.requestMicrophonePermission()
+        guard micOk else {
+            self.statusText = "Microphone permission denied"
+            return
+        }
+        let speechOk = await Self.requestSpeechPermission()
+        guard speechOk else {
+            self.statusText = "Speech recognition permission denied"
+            return
+        }
+
+        await self.reloadConfig()
+        do {
+            try Self.configureAudioSession()
+            try self.startRecognition()
+            self.isListening = true
+            self.statusText = "Listening"
+            self.startSilenceMonitor()
+        } catch {
+            self.isListening = false
+            self.statusText = "Start failed: \(error.localizedDescription)"
+        }
+    }
+
+    func stop() {
+        self.isEnabled = false
+        self.isListening = false
+        self.statusText = "Off"
+        self.lastTranscript = ""
+        self.lastHeard = nil
+        self.silenceTask?.cancel()
+        self.silenceTask = nil
+        self.stopRecognition()
+        self.stopSpeaking()
+    }
+
+    private func startRecognition() throws {
+        self.speechRecognizer = SFSpeechRecognizer()
+        guard let recognizer = self.speechRecognizer else {
+            throw NSError(domain: "TalkMode", code: 1, userInfo: [
+                NSLocalizedDescriptionKey: "Speech recognizer unavailable",
+            ])
+        }
+
+        self.recognitionRequest = SFSpeechAudioBufferRecognitionRequest()
+        self.recognitionRequest?.shouldReportPartialResults = true
+        guard let request = self.recognitionRequest else { return }
+
+        let input = self.audioEngine.inputNode
+        let format = input.outputFormat(forBus: 0)
+        input.removeTap(onBus: 0)
+        input.installTap(onBus: 0, bufferSize: 2048, format: format) { [weak request] buffer, _ in
+            request?.append(buffer)
+        }
+
+        self.audioEngine.prepare()
+        try self.audioEngine.start()
+
+        self.recognitionTask = recognizer.recognitionTask(with: request) { [weak self] result, error in
+            guard let self else { return }
+            if let error {
+                self.statusText = "Speech error: \(error.localizedDescription)"
+            }
+            guard let result else { return }
+            let transcript = result.bestTranscription.formattedString
+            Task { @MainActor in
+                await self.handleTranscript(transcript: transcript, isFinal: result.isFinal)
+            }
+        }
+    }
+
+    private func stopRecognition() {
+        self.recognitionTask?.cancel()
+        self.recognitionTask = nil
+        self.recognitionRequest?.endAudio()
+        self.recognitionRequest = nil
+        self.audioEngine.inputNode.removeTap(onBus: 0)
+        self.audioEngine.stop()
+        self.speechRecognizer = nil
+    }
+
+    private func handleTranscript(transcript: String, isFinal: Bool) async {
+        let trimmed = transcript.trimmingCharacters(in: .whitespacesAndNewlines)
+        if self.isSpeaking, self.interruptOnSpeech {
+            if self.shouldInterrupt(with: trimmed) {
+                self.stopSpeaking()
+            }
+            return
+        }
+
+        guard self.isListening else { return }
+        if !trimmed.isEmpty {
+            self.lastTranscript = trimmed
+            self.lastHeard = Date()
+        }
+        if isFinal {
+            self.lastTranscript = trimmed
+        }
+    }
+
+    private func startSilenceMonitor() {
+        self.silenceTask?.cancel()
+        self.silenceTask = Task { [weak self] in
+            guard let self else { return }
+            while self.isEnabled {
+                try? await Task.sleep(nanoseconds: 200_000_000)
+                await self.checkSilence()
+            }
+        }
+    }
+
+    private func checkSilence() async {
+        guard self.isListening else { return }
+        let transcript = self.lastTranscript.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !transcript.isEmpty else { return }
+        guard let lastHeard else { return }
+        if Date().timeIntervalSince(lastHeard) < self.silenceWindow { return }
+        await self.finalizeTranscript(transcript)
+    }
+
+    private func finalizeTranscript(_ transcript: String) async {
+        self.isListening = false
+        self.statusText = "Thinking…"
+        self.lastTranscript = ""
+        self.lastHeard = nil
+        self.stopRecognition()
+
+        await self.reloadConfig()
+        let prompt = self.buildPrompt(transcript: transcript)
+        guard let bridge else {
+            self.statusText = "Bridge not connected"
+            await self.start()
+            return
+        }
+
+        do {
+            let runId = try await self.sendChat(prompt, bridge: bridge)
+            let ok = await self.waitForChatFinal(runId: runId, bridge: bridge)
+            if !ok {
+                self.statusText = "No reply"
+                await self.start()
+                return
+            }
+
+            guard let assistantText = try await self.fetchLatestAssistantText(bridge: bridge) else {
+                self.statusText = "No reply"
+                await self.start()
+                return
+            }
+            await self.playAssistant(text: assistantText)
+        } catch {
+            self.statusText = "Talk failed: \(error.localizedDescription)"
+        }
+
+        await self.start()
+    }
+
+    private func buildPrompt(transcript: String) -> String {
+        var lines: [String] = [
+            "Talk Mode active. Reply in a concise, spoken tone.",
+            "You may optionally prefix the response with JSON (first line) to set ElevenLabs voice, e.g. {\"voice\":\"<id>\",\"once\":true}.",
+        ]
+
+        if let interrupted = self.lastInterruptedAtSeconds {
+            let formatted = String(format: "%.1f", interrupted)
+            lines.append("Assistant speech interrupted at \(formatted)s.")
+            self.lastInterruptedAtSeconds = nil
+        }
+
+        lines.append("")
+        lines.append(transcript)
+        return lines.joined(separator: "\n")
+    }
+
+    private func sendChat(_ message: String, bridge: BridgeSession) async throws -> String {
+        struct SendResponse: Decodable { let runId: String }
+        let payload: [String: Any] = [
+            "sessionKey": "main",
+            "message": message,
+            "thinking": "low",
+            "timeoutMs": 30_000,
+            "idempotencyKey": UUID().uuidString,
+        ]
+        let data = try JSONSerialization.data(withJSONObject: payload)
+        let json = String(decoding: data, as: UTF8.self)
+        let res = try await bridge.request(method: "chat.send", paramsJSON: json, timeoutSeconds: 30)
+        let decoded = try JSONDecoder().decode(SendResponse.self, from: res)
+        return decoded.runId
+    }
+
+    private func waitForChatFinal(runId: String, bridge: BridgeSession) async -> Bool {
+        let stream = await bridge.subscribeServerEvents(bufferingNewest: 200)
+        let timeout = Date().addingTimeInterval(120)
+        for await evt in stream {
+            if Date() > timeout { return false }
+            guard evt.event == "chat", let payload = evt.payloadJSON else { continue }
+            guard let data = payload.data(using: .utf8) else { continue }
+            guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else { continue }
+            if (json["runId"] as? String) != runId { continue }
+            if let state = json["state"] as? String, state == "final" {
+                return true
+            }
+        }
+        return false
+    }
+
+    private func fetchLatestAssistantText(bridge: BridgeSession) async throws -> String? {
+        let res = try await bridge.request(method: "chat.history", paramsJSON: "{\"sessionKey\":\"main\"}", timeoutSeconds: 15)
+        guard let json = try JSONSerialization.jsonObject(with: res) as? [String: Any] else { return nil }
+        guard let messages = json["messages"] as? [[String: Any]] else { return nil }
+        for msg in messages.reversed() {
+            guard (msg["role"] as? String) == "assistant" else { continue }
+            guard let content = msg["content"] as? [[String: Any]] else { continue }
+            let text = content.compactMap { $0["text"] as? String }.joined(separator: "\n")
+            let trimmed = text.trimmingCharacters(in: .whitespacesAndNewlines)
+            if !trimmed.isEmpty { return trimmed }
+        }
+        return nil
+    }
+
+    private func playAssistant(text: String) async {
+        let parsed = TalkDirectiveParser.parse(text)
+        let directive = parsed.directive
+        let cleaned = parsed.stripped.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !cleaned.isEmpty else { return }
+
+        if let voice = directive?.voiceId {
+            if directive?.once != true {
+                self.currentVoiceId = voice
+            }
+        }
+        if let model = directive?.modelId {
+            if directive?.once != true {
+                self.currentModelId = model
+            }
+        }
+
+        let voiceId = directive?.voiceId ?? self.currentVoiceId ?? self.defaultVoiceId
+        guard let voiceId, !voiceId.isEmpty else {
+            self.statusText = "Missing voice ID"
+            return
+        }
+
+        guard let apiKey = ProcessInfo.processInfo.environment["ELEVENLABS_API_KEY"], !apiKey.isEmpty else {
+            self.statusText = "Missing ELEVENLABS_API_KEY"
+            return
+        }
+
+        self.statusText = "Speaking…"
+        self.isSpeaking = true
+        self.lastSpokenText = cleaned
+
+        do {
+            let request = ElevenLabsRequest(
+                text: cleaned,
+                modelId: directive?.modelId ?? self.currentModelId ?? self.defaultModelId,
+                outputFormat: directive?.outputFormat ?? self.defaultOutputFormat,
+                speed: TalkModeRuntime.resolveSpeed(
+                    speed: directive?.speed,
+                    rateWPM: directive?.rateWPM),
+                stability: TalkModeRuntime.validatedUnit(directive?.stability),
+                similarity: TalkModeRuntime.validatedUnit(directive?.similarity),
+                style: TalkModeRuntime.validatedUnit(directive?.style),
+                speakerBoost: directive?.speakerBoost,
+                seed: TalkModeRuntime.validatedSeed(directive?.seed),
+                normalize: TalkModeRuntime.validatedNormalize(directive?.normalize),
+                language: TalkModeRuntime.validatedLanguage(directive?.language))
+            let audio = try await ElevenLabsClient(apiKey: apiKey).synthesize(
+                voiceId: voiceId,
+                request: request)
+            try await self.playAudio(data: audio)
+        } catch {
+            self.statusText = "Speak failed: \(error.localizedDescription)"
+        }
+
+        self.isSpeaking = false
+    }
+
+    private func playAudio(data: Data) async throws {
+        self.player?.stop()
+        let player = try AVAudioPlayer(data: data)
+        self.player = player
+        player.prepareToPlay()
+        player.play()
+        while player.isPlaying {
+            try? await Task.sleep(nanoseconds: 120_000_000)
+        }
+    }
+
+    private func stopSpeaking() {
+        guard self.isSpeaking else { return }
+        self.lastInterruptedAtSeconds = self.player?.currentTime
+        self.player?.stop()
+        self.player = nil
+        self.isSpeaking = false
+    }
+
+    private func shouldInterrupt(with transcript: String) -> Bool {
+        let trimmed = transcript.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard trimmed.count >= 3 else { return false }
+        if let spoken = self.lastSpokenText?.lowercased(), spoken.contains(trimmed.lowercased()) {
+            return false
+        }
+        return true
+    }
+
+    private func reloadConfig() async {
+        guard let bridge else { return }
+        do {
+            let res = try await bridge.request(method: "config.get", paramsJSON: "{}", timeoutSeconds: 8)
+            guard let json = try JSONSerialization.jsonObject(with: res) as? [String: Any] else { return }
+            guard let config = json["config"] as? [String: Any] else { return }
+            let talk = config["talk"] as? [String: Any]
+            self.defaultVoiceId = (talk?["voiceId"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
+            self.currentVoiceId = self.defaultVoiceId
+            self.defaultModelId = (talk?["modelId"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
+            self.currentModelId = self.defaultModelId
+            self.defaultOutputFormat = (talk?["outputFormat"] as? String)?
+                .trimmingCharacters(in: .whitespacesAndNewlines)
+            if let interrupt = talk?["interruptOnSpeech"] as? Bool {
+                self.interruptOnSpeech = interrupt
+            }
+        } catch {
+            // ignore
+        }
+    }
+
+    private static func configureAudioSession() throws {
+        let session = AVAudioSession.sharedInstance()
+        try session.setCategory(.playAndRecord, mode: .measurement, options: [
+            .duckOthers,
+            .mixWithOthers,
+            .allowBluetoothHFP,
+            .defaultToSpeaker,
+        ])
+        try session.setActive(true, options: [])
+    }
+
+    private nonisolated static func requestMicrophonePermission() async -> Bool {
+        await withCheckedContinuation(isolation: nil) { cont in
+            AVAudioApplication.requestRecordPermission { ok in
+                cont.resume(returning: ok)
+            }
+        }
+    }
+
+    private nonisolated static func requestSpeechPermission() async -> Bool {
+        await withCheckedContinuation(isolation: nil) { cont in
+            SFSpeechRecognizer.requestAuthorization { status in
+                cont.resume(returning: status == .authorized)
+            }
+        }
+    }
+}
+
+private struct ElevenLabsRequest {
+    let text: String
+    let modelId: String?
+    let outputFormat: String?
+    let speed: Double?
+    let stability: Double?
+    let similarity: Double?
+    let style: Double?
+    let speakerBoost: Bool?
+    let seed: UInt32?
+    let normalize: String?
+    let language: String?
+}
+
+private struct ElevenLabsClient {
+    let apiKey: String
+    let baseUrl = URL(string: "https://api.elevenlabs.io")!
+
+    func synthesize(voiceId: String, request: ElevenLabsRequest) async throws -> Data {
+        var url = self.baseUrl
+        url.appendPathComponent("v1")
+        url.appendPathComponent("text-to-speech")
+        url.appendPathComponent(voiceId)
+
+        var payload: [String: Any] = [
+            "text": request.text,
+        ]
+        if let modelId = request.modelId, !modelId.isEmpty {
+            payload["model_id"] = modelId
+        }
+        if let outputFormat = request.outputFormat, !outputFormat.isEmpty {
+            payload["output_format"] = outputFormat
+        }
+        if let seed = request.seed {
+            payload["seed"] = seed
+        }
+        if let normalize = request.normalize {
+            payload["apply_text_normalization"] = normalize
+        }
+        if let language = request.language {
+            payload["language_code"] = language
+        }
+        var voiceSettings: [String: Any] = [:]
+        if let speed = request.speed { voiceSettings["speed"] = speed }
+        if let stability = request.stability { voiceSettings["stability"] = stability }
+        if let similarity = request.similarity { voiceSettings["similarity_boost"] = similarity }
+        if let style = request.style { voiceSettings["style"] = style }
+        if let speakerBoost = request.speakerBoost { voiceSettings["use_speaker_boost"] = speakerBoost }
+        if !voiceSettings.isEmpty { payload["voice_settings"] = voiceSettings }
+
+        let body = try JSONSerialization.data(withJSONObject: payload, options: [])
+        var req = URLRequest(url: url)
+        req.httpMethod = "POST"
+        req.httpBody = body
+        req.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        req.setValue("audio/mpeg", forHTTPHeaderField: "Accept")
+        req.setValue(self.apiKey, forHTTPHeaderField: "xi-api-key")
+
+        let (data, response) = try await URLSession.shared.data(for: req)
+        if let http = response as? HTTPURLResponse, http.statusCode >= 400 {
+            let message = String(data: data, encoding: .utf8) ?? "unknown"
+            throw NSError(domain: "TalkTTS", code: http.statusCode, userInfo: [
+                NSLocalizedDescriptionKey: "ElevenLabs failed: \(http.statusCode) \(message)",
+            ])
+        }
+        return data
+    }
+}
+
+private enum TalkModeRuntime {
+    static func resolveSpeed(speed: Double?, rateWPM: Int?) -> Double? {
+        if let rateWPM, rateWPM > 0 {
+            let resolved = Double(rateWPM) / 175.0
+            if resolved <= 0.5 || resolved >= 2.0 { return nil }
+            return resolved
+        }
+        if let speed {
+            if speed <= 0.5 || speed >= 2.0 { return nil }
+            return speed
+        }
+        return nil
+    }
+
+    static func validatedUnit(_ value: Double?) -> Double? {
+        guard let value else { return nil }
+        if value < 0 || value > 1 { return nil }
+        return value
+    }
+
+    static func validatedSeed(_ value: Int?) -> UInt32? {
+        guard let value else { return nil }
+        if value < 0 || value > 4294967295 { return nil }
+        return UInt32(value)
+    }
+
+    static func validatedNormalize(_ value: String?) -> String? {
+        guard let value else { return nil }
+        let normalized = value.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+        return ["auto", "on", "off"].contains(normalized) ? normalized : nil
+    }
+
+    static func validatedLanguage(_ value: String?) -> String? {
+        guard let value else { return nil }
+        let normalized = value.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+        guard normalized.count == 2, normalized.allSatisfy({ $0 >= "a" && $0 <= "z" }) else { return nil }
+        return normalized
+    }
+}
diff --git a/apps/ios/Sources/Voice/VoiceTab.swift b/apps/ios/Sources/Voice/VoiceTab.swift
index 59e1cd6d4..4fedd0ce9 100644
--- a/apps/ios/Sources/Voice/VoiceTab.swift
+++ b/apps/ios/Sources/Voice/VoiceTab.swift
@@ -4,6 +4,7 @@ struct VoiceTab: View {
     @Environment(NodeAppModel.self) private var appModel
     @Environment(VoiceWakeManager.self) private var voiceWake
     @AppStorage("voiceWake.enabled") private var voiceWakeEnabled: Bool = false
+    @AppStorage("talk.enabled") private var talkEnabled: Bool = false
 
     var body: some View {
         NavigationStack {
@@ -14,6 +15,7 @@ struct VoiceTab: View {
                     Text(self.voiceWake.statusText)
                         .font(.footnote)
                         .foregroundStyle(.secondary)
+                    LabeledContent("Talk Mode", value: self.talkEnabled ? "Enabled" : "Disabled")
                 }
 
                 Section("Notes") {
@@ -36,6 +38,9 @@ struct VoiceTab: View {
             .onChange(of: self.voiceWakeEnabled) { _, newValue in
                 self.appModel.setVoiceWakeEnabled(newValue)
             }
+            .onChange(of: self.talkEnabled) { _, newValue in
+                self.appModel.setTalkEnabled(newValue)
+            }
         }
     }
 }
diff --git a/apps/macos/Sources/Clawdis/AppState.swift b/apps/macos/Sources/Clawdis/AppState.swift
index 53d81c02d..94e20538a 100644
--- a/apps/macos/Sources/Clawdis/AppState.swift
+++ b/apps/macos/Sources/Clawdis/AppState.swift
@@ -121,6 +121,15 @@ final class AppState {
             forKey: voicePushToTalkEnabledKey) } }
     }
 
+    var talkEnabled: Bool {
+        didSet {
+            self.ifNotPreview {
+                UserDefaults.standard.set(self.talkEnabled, forKey: talkEnabledKey)
+                Task { await TalkModeController.shared.setEnabled(self.talkEnabled) }
+            }
+        }
+    }
+
     var iconOverride: IconOverrideSelection {
         didSet { self.ifNotPreview { UserDefaults.standard.set(self.iconOverride.rawValue, forKey: iconOverrideKey) } }
     }
@@ -216,6 +225,7 @@ final class AppState {
             .stringArray(forKey: voiceWakeAdditionalLocalesKey) ?? []
         self.voicePushToTalkEnabled = UserDefaults.standard
             .object(forKey: voicePushToTalkEnabledKey) as? Bool ?? false
+        self.talkEnabled = UserDefaults.standard.bool(forKey: talkEnabledKey)
         if let storedHeartbeats = UserDefaults.standard.object(forKey: heartbeatsEnabledKey) as? Bool {
             self.heartbeatsEnabled = storedHeartbeats
         } else {
@@ -256,9 +266,13 @@ final class AppState {
         if self.swabbleEnabled, !PermissionManager.voiceWakePermissionsGranted() {
             self.swabbleEnabled = false
         }
+        if self.talkEnabled, !PermissionManager.voiceWakePermissionsGranted() {
+            self.talkEnabled = false
+        }
 
         if !self.isPreview {
             Task { await VoiceWakeRuntime.shared.refresh(state: self) }
+            Task { await TalkModeController.shared.setEnabled(self.talkEnabled) }
         }
     }
 
@@ -312,6 +326,23 @@ final class AppState {
         Task { await VoiceWakeRuntime.shared.refresh(state: self) }
     }
 
+    func setTalkEnabled(_ enabled: Bool) async {
+        guard voiceWakeSupported else {
+            self.talkEnabled = false
+            return
+        }
+
+        self.talkEnabled = enabled
+        guard !self.isPreview else { return }
+
+        if !enabled { return }
+
+        if PermissionManager.voiceWakePermissionsGranted() { return }
+
+        let granted = await PermissionManager.ensureVoiceWakePermissions(interactive: true)
+        self.talkEnabled = granted
+    }
+
     // MARK: - Global wake words sync (Gateway-owned)
 
     func applyGlobalVoiceWakeTriggers(_ triggers: [String]) {
@@ -367,6 +398,7 @@ extension AppState {
         state.voiceWakeLocaleID = Locale.current.identifier
         state.voiceWakeAdditionalLocaleIDs = ["en-US", "de-DE"]
         state.voicePushToTalkEnabled = false
+        state.talkEnabled = false
         state.iconOverride = .system
         state.heartbeatsEnabled = true
         state.connectionMode = .local
diff --git a/apps/macos/Sources/Clawdis/ConfigSettings.swift b/apps/macos/Sources/Clawdis/ConfigSettings.swift
index 043139351..cbbf04d5a 100644
--- a/apps/macos/Sources/Clawdis/ConfigSettings.swift
+++ b/apps/macos/Sources/Clawdis/ConfigSettings.swift
@@ -30,6 +30,10 @@ struct ConfigSettings: View {
     @State private var browserColorHex: String = "#FF4500"
     @State private var browserAttachOnly: Bool = false
 
+    // Talk mode settings (stored in ~/.clawdis/clawdis.json under "talk")
+    @State private var talkVoiceId: String = ""
+    @State private var talkInterruptOnSpeech: Bool = true
+
     var body: some View {
         ScrollView { self.content }
             .onChange(of: self.modelCatalogPath) { _, _ in
@@ -53,6 +57,7 @@ struct ConfigSettings: View {
             self.header
             self.agentSection
             self.heartbeatSection
+            self.talkSection
             self.browserSection
             Spacer(minLength: 0)
         }
@@ -266,6 +271,37 @@ struct ConfigSettings: View {
         .frame(maxWidth: .infinity, alignment: .leading)
     }
 
+    private var talkSection: some View {
+        GroupBox("Talk Mode") {
+            Grid(alignment: .leadingFirstTextBaseline, horizontalSpacing: 14, verticalSpacing: 10) {
+                GridRow {
+                    self.gridLabel("Voice ID")
+                    VStack(alignment: .leading, spacing: 6) {
+                        ComboBox("ElevenLabs voice ID", text: self.$talkVoiceId) {
+                            ForEach(self.talkVoiceSuggestions, id: \.self) { value in
+                                Text(value).tag(value)
+                            }
+                        }
+                        .textFieldStyle(.roundedBorder)
+                        .frame(maxWidth: .infinity)
+                        .onChange(of: self.talkVoiceId) { _, _ in self.autosaveConfig() }
+                        Text("Defaults to ELEVENLABS_VOICE_ID / SAG_VOICE_ID if unset.")
+                            .font(.footnote)
+                            .foregroundStyle(.secondary)
+                    }
+                }
+                GridRow {
+                    self.gridLabel("Interrupt")
+                    Toggle("Stop speaking when you start talking", isOn: self.$talkInterruptOnSpeech)
+                        .labelsHidden()
+                        .toggleStyle(.checkbox)
+                        .onChange(of: self.talkInterruptOnSpeech) { _, _ in self.autosaveConfig() }
+                }
+            }
+        }
+        .frame(maxWidth: .infinity, alignment: .leading)
+    }
+
     private func gridLabel(_ text: String) -> some View {
         Text(text)
             .foregroundStyle(.secondary)
@@ -278,6 +314,7 @@ struct ConfigSettings: View {
         let heartbeatMinutes = agent?["heartbeatMinutes"] as? Int
         let heartbeatBody = agent?["heartbeatBody"] as? String
         let browser = parsed["browser"] as? [String: Any]
+        let talk = parsed["talk"] as? [String: Any]
 
         let loadedModel = (agent?["model"] as? String) ?? ""
         if !loadedModel.isEmpty {
@@ -297,6 +334,13 @@ struct ConfigSettings: View {
             if let color = browser["color"] as? String, !color.isEmpty { self.browserColorHex = color }
             if let attachOnly = browser["attachOnly"] as? Bool { self.browserAttachOnly = attachOnly }
         }
+
+        if let talk {
+            if let voice = talk["voiceId"] as? String { self.talkVoiceId = voice }
+            if let interrupt = talk["interruptOnSpeech"] as? Bool {
+                self.talkInterruptOnSpeech = interrupt
+            }
+        }
     }
 
     private func autosaveConfig() {
@@ -312,6 +356,7 @@ struct ConfigSettings: View {
         var root = self.loadConfigDict()
         var agent = root["agent"] as? [String: Any] ?? [:]
         var browser = root["browser"] as? [String: Any] ?? [:]
+        var talk = root["talk"] as? [String: Any] ?? [:]
 
         let chosenModel = (self.configModel == "__custom__" ? self.customModel : self.configModel)
             .trimmingCharacters(in: .whitespacesAndNewlines)
@@ -337,6 +382,15 @@ struct ConfigSettings: View {
         browser["attachOnly"] = self.browserAttachOnly
         root["browser"] = browser
 
+        let trimmedVoice = self.talkVoiceId.trimmingCharacters(in: .whitespacesAndNewlines)
+        if trimmedVoice.isEmpty {
+            talk.removeValue(forKey: "voiceId")
+        } else {
+            talk["voiceId"] = trimmedVoice
+        }
+        talk["interruptOnSpeech"] = self.talkInterruptOnSpeech
+        root["talk"] = talk
+
         ClawdisConfigFile.saveDict(root)
     }
 
@@ -354,6 +408,20 @@ struct ConfigSettings: View {
         return Color(red: r, green: g, blue: b)
     }
 
+    private var talkVoiceSuggestions: [String] {
+        let env = ProcessInfo.processInfo.environment
+        let candidates = [
+            self.talkVoiceId,
+            env["ELEVENLABS_VOICE_ID"] ?? "",
+            env["SAG_VOICE_ID"] ?? "",
+        ]
+        var seen = Set<String>()
+        return candidates
+            .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
+            .filter { !$0.isEmpty }
+            .filter { seen.insert($0).inserted }
+    }
+
     private var browserPathLabel: String? {
         guard self.browserEnabled else { return nil }
 
diff --git a/apps/macos/Sources/Clawdis/Constants.swift b/apps/macos/Sources/Clawdis/Constants.swift
index 966d1744a..589091261 100644
--- a/apps/macos/Sources/Clawdis/Constants.swift
+++ b/apps/macos/Sources/Clawdis/Constants.swift
@@ -16,6 +16,7 @@ let voiceWakeMicKey = "clawdis.voiceWakeMicID"
 let voiceWakeLocaleKey = "clawdis.voiceWakeLocaleID"
 let voiceWakeAdditionalLocalesKey = "clawdis.voiceWakeAdditionalLocaleIDs"
 let voicePushToTalkEnabledKey = "clawdis.voicePushToTalkEnabled"
+let talkEnabledKey = "clawdis.talkEnabled"
 let iconOverrideKey = "clawdis.iconOverride"
 let connectionModeKey = "clawdis.connectionMode"
 let remoteTargetKey = "clawdis.remoteTarget"
diff --git a/apps/macos/Sources/Clawdis/MenuContentView.swift b/apps/macos/Sources/Clawdis/MenuContentView.swift
index 6a5dc1e89..748ce018d 100644
--- a/apps/macos/Sources/Clawdis/MenuContentView.swift
+++ b/apps/macos/Sources/Clawdis/MenuContentView.swift
@@ -72,6 +72,11 @@ struct MenuContent: View {
             if self.showVoiceWakeMicPicker {
                 self.voiceWakeMicMenu
             }
+            Toggle(isOn: self.talkBinding) {
+                Label("Talk", systemImage: "bubble.left.and.waveform")
+            }
+                .disabled(!voiceWakeSupported)
+                .opacity(voiceWakeSupported ? 1 : 0.5)
             Divider()
             Button {
                 Task { @MainActor in
@@ -331,6 +336,14 @@ struct MenuContent: View {
             })
     }
 
+    private var talkBinding: Binding<Bool> {
+        Binding(
+            get: { self.state.talkEnabled },
+            set: { newValue in
+                Task { await self.state.setTalkEnabled(newValue) }
+            })
+    }
+
     private var showVoiceWakeMicPicker: Bool {
         voiceWakeSupported && self.state.swabbleEnabled
     }
diff --git a/apps/macos/Sources/Clawdis/TalkAudioPlayer.swift b/apps/macos/Sources/Clawdis/TalkAudioPlayer.swift
new file mode 100644
index 000000000..f72de1d02
--- /dev/null
+++ b/apps/macos/Sources/Clawdis/TalkAudioPlayer.swift
@@ -0,0 +1,54 @@
+import AVFoundation
+import Foundation
+import OSLog
+
+@MainActor
+final class TalkAudioPlayer: NSObject, AVAudioPlayerDelegate {
+    static let shared = TalkAudioPlayer()
+
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.tts")
+    private var player: AVAudioPlayer?
+    private var continuation: CheckedContinuation<TalkPlaybackResult, Never>?
+
+    func play(data: Data) async -> TalkPlaybackResult {
+        self.stopInternal(interrupted: true)
+        do {
+            let player = try AVAudioPlayer(data: data)
+            self.player = player
+            player.delegate = self
+            player.prepareToPlay()
+            player.play()
+            return await withCheckedContinuation { continuation in
+                self.continuation = continuation
+            }
+        } catch {
+            self.logger.error("talk audio player failed: \(error.localizedDescription, privacy: .public)")
+            return TalkPlaybackResult(finished: false, interruptedAt: nil)
+        }
+    }
+
+    func stop() -> Double? {
+        guard let player else { return nil }
+        let time = player.currentTime
+        self.stopInternal(interrupted: true, interruptedAt: time)
+        return time
+    }
+
+    func audioPlayerDidFinishPlaying(_: AVAudioPlayer, successfully flag: Bool) {
+        self.stopInternal(interrupted: !flag)
+    }
+
+    private func stopInternal(interrupted: Bool, interruptedAt: Double? = nil) {
+        self.player?.stop()
+        self.player = nil
+        if let continuation {
+            self.continuation = nil
+            continuation.resume(returning: TalkPlaybackResult(finished: !interrupted, interruptedAt: interruptedAt))
+        }
+    }
+}
+
+struct TalkPlaybackResult: Sendable {
+    let finished: Bool
+    let interruptedAt: Double?
+}
diff --git a/apps/macos/Sources/Clawdis/TalkModeController.swift b/apps/macos/Sources/Clawdis/TalkModeController.swift
new file mode 100644
index 000000000..920af0539
--- /dev/null
+++ b/apps/macos/Sources/Clawdis/TalkModeController.swift
@@ -0,0 +1,42 @@
+import Observation
+import OSLog
+
+@MainActor
+@Observable
+final class TalkModeController {
+    static let shared = TalkModeController()
+
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.controller")
+
+    func setEnabled(_ enabled: Bool) async {
+        self.logger.info("talk enabled=\(enabled)")
+        if enabled {
+            TalkOverlayController.shared.present()
+        } else {
+            TalkOverlayController.shared.dismiss()
+        }
+        await TalkModeRuntime.shared.setEnabled(enabled)
+    }
+
+    func updatePhase(_ phase: TalkModePhase) {
+        TalkOverlayController.shared.updatePhase(phase)
+    }
+
+    func updateLevel(_ level: Double) {
+        TalkOverlayController.shared.updateLevel(level)
+    }
+
+    func stopSpeaking(reason: TalkStopReason = .userTap) {
+        Task { await TalkModeRuntime.shared.stopSpeaking(reason: reason) }
+    }
+
+    func exitTalkMode() {
+        Task { await AppStateStore.shared.setTalkEnabled(false) }
+    }
+}
+
+enum TalkStopReason {
+    case userTap
+    case speech
+    case manual
+}
diff --git a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
new file mode 100644
index 000000000..955d9ceda
--- /dev/null
+++ b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
@@ -0,0 +1,684 @@
+import AVFoundation
+import ClawdisChatUI
+import ClawdisKit
+import Foundation
+import OSLog
+import Speech
+
+actor TalkModeRuntime {
+    static let shared = TalkModeRuntime()
+
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.runtime")
+
+    private var recognizer: SFSpeechRecognizer?
+    private var audioEngine: AVAudioEngine?
+    private var recognitionRequest: SFSpeechAudioBufferRecognitionRequest?
+    private var recognitionTask: SFSpeechRecognitionTask?
+    private var recognitionGeneration: Int = 0
+
+    private var captureTask: Task<Void, Never>?
+    private var silenceTask: Task<Void, Never>?
+    private var phase: TalkModePhase = .idle
+    private var isEnabled = false
+
+    private var lastHeard: Date?
+    private var noiseFloorRMS: Double = 1e-4
+    private var lastTranscript: String = ""
+    private var lastSpeechEnergyAt: Date?
+
+    private var defaultVoiceId: String?
+    private var currentVoiceId: String?
+    private var defaultModelId: String?
+    private var currentModelId: String?
+    private var voiceOverrideActive = false
+    private var modelOverrideActive = false
+    private var defaultOutputFormat: String?
+    private var interruptOnSpeech: Bool = true
+    private var lastInterruptedAtSeconds: Double?
+    private var lastSpokenText: String?
+
+    private let silenceWindow: TimeInterval = 0.7
+    private let minSpeechRMS: Double = 1e-3
+    private let speechBoostFactor: Double = 6.0
+
+    // MARK: - Lifecycle
+
+    func setEnabled(_ enabled: Bool) async {
+        guard enabled != self.isEnabled else { return }
+        self.isEnabled = enabled
+        if enabled {
+            await self.start()
+        } else {
+            await self.stop()
+        }
+    }
+
+    private func start() async {
+        guard voiceWakeSupported else { return }
+        guard PermissionManager.voiceWakePermissionsGranted() else {
+            self.logger.debug("talk runtime not starting: permissions missing")
+            return
+        }
+        await self.reloadConfig()
+        await self.startRecognition()
+        self.phase = .listening
+        await MainActor.run { TalkModeController.shared.updatePhase(.listening) }
+        self.startSilenceMonitor()
+    }
+
+    private func stop() async {
+        self.captureTask?.cancel()
+        self.captureTask = nil
+        self.silenceTask?.cancel()
+        self.silenceTask = nil
+        self.lastTranscript = ""
+        self.lastHeard = nil
+        self.lastSpeechEnergyAt = nil
+        self.phase = .idle
+        await self.stopRecognition()
+        await self.stopSpeaking(reason: .manual)
+        await MainActor.run {
+            TalkModeController.shared.updateLevel(0)
+            TalkModeController.shared.updatePhase(.idle)
+        }
+    }
+
+    // MARK: - Speech recognition
+
+    private struct RecognitionUpdate {
+        let transcript: String?
+        let segments: [SFTranscriptionSegment]
+        let isFinal: Bool
+        let error: Error?
+        let generation: Int
+    }
+
+    private func startRecognition() async {
+        await self.stopRecognition()
+        self.recognitionGeneration &+= 1
+        let generation = self.recognitionGeneration
+
+        let locale = await MainActor.run { AppStateStore.shared.voiceWakeLocaleID }
+        self.recognizer = SFSpeechRecognizer(locale: Locale(identifier: locale))
+        guard let recognizer, recognizer.isAvailable else {
+            self.logger.error("talk recognizer unavailable")
+            return
+        }
+
+        self.recognitionRequest = SFSpeechAudioBufferRecognitionRequest()
+        self.recognitionRequest?.shouldReportPartialResults = true
+        guard let request = self.recognitionRequest else { return }
+
+        if self.audioEngine == nil {
+            self.audioEngine = AVAudioEngine()
+        }
+        guard let audioEngine = self.audioEngine else { return }
+
+        let input = audioEngine.inputNode
+        let format = input.outputFormat(forBus: 0)
+        input.removeTap(onBus: 0)
+        input.installTap(onBus: 0, bufferSize: 2048, format: format) { [weak self, weak request] buffer, _ in
+            request?.append(buffer)
+            if let rms = Self.rmsLevel(buffer: buffer) {
+                Task.detached { [weak self] in
+                    await self?.noteAudioLevel(rms: rms)
+                }
+            }
+        }
+
+        audioEngine.prepare()
+        do {
+            try audioEngine.start()
+        } catch {
+            self.logger.error("talk audio engine start failed: \(error.localizedDescription, privacy: .public)")
+            return
+        }
+
+        self.recognitionTask = recognizer.recognitionTask(with: request) { [weak self, generation] result, error in
+            guard let self else { return }
+            let transcript = result?.bestTranscription.formattedString
+            let update = RecognitionUpdate(
+                transcript: transcript,
+                segments: result?.bestTranscription.segments ?? [],
+                isFinal: result?.isFinal ?? false,
+                error: error,
+                generation: generation)
+            Task { await self.handleRecognition(update) }
+        }
+    }
+
+    private func stopRecognition() async {
+        self.recognitionGeneration &+= 1
+        self.recognitionTask?.cancel()
+        self.recognitionTask = nil
+        self.recognitionRequest?.endAudio()
+        self.recognitionRequest = nil
+        self.audioEngine?.inputNode.removeTap(onBus: 0)
+        self.audioEngine?.stop()
+        self.audioEngine = nil
+        self.recognizer = nil
+    }
+
+    private func handleRecognition(_ update: RecognitionUpdate) async {
+        guard update.generation == self.recognitionGeneration else { return }
+        if let error = update.error {
+            self.logger.debug("talk recognition error: \(error.localizedDescription, privacy: .public)")
+        }
+        guard let transcript = update.transcript else { return }
+
+        let trimmed = transcript.trimmingCharacters(in: .whitespacesAndNewlines)
+        if self.phase == .speaking, self.interruptOnSpeech {
+            if await self.shouldInterrupt(transcript: trimmed, segments: update.segments) {
+                await self.stopSpeaking(reason: .speech)
+                self.lastTranscript = ""
+                self.lastHeard = nil
+                await self.startListening()
+            }
+            return
+        }
+
+        guard self.phase == .listening else { return }
+
+        if !trimmed.isEmpty {
+            self.lastTranscript = trimmed
+            self.lastHeard = Date()
+        }
+
+        if update.isFinal {
+            self.lastTranscript = trimmed
+        }
+    }
+
+    // MARK: - Silence handling
+
+    private func startSilenceMonitor() {
+        self.silenceTask?.cancel()
+        self.silenceTask = Task { [weak self] in
+            guard let self else { return }
+            while self.isEnabled {
+                try? await Task.sleep(nanoseconds: 200_000_000)
+                await self.checkSilence()
+            }
+        }
+    }
+
+    private func checkSilence() async {
+        guard self.phase == .listening else { return }
+        let transcript = self.lastTranscript.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !transcript.isEmpty else { return }
+        guard let lastHeard else { return }
+        let elapsed = Date().timeIntervalSince(lastHeard)
+        guard elapsed >= self.silenceWindow else { return }
+        await self.finalizeTranscript(transcript)
+    }
+
+    private func startListening() async {
+        self.phase = .listening
+        self.lastTranscript = ""
+        self.lastHeard = nil
+        await MainActor.run {
+            TalkModeController.shared.updatePhase(.listening)
+            TalkModeController.shared.updateLevel(0)
+        }
+    }
+
+    private func finalizeTranscript(_ text: String) async {
+        self.lastTranscript = ""
+        self.lastHeard = nil
+        self.phase = .thinking
+        await MainActor.run { TalkModeController.shared.updatePhase(.thinking) }
+        await self.stopRecognition()
+        await self.sendAndSpeak(text)
+    }
+
+    // MARK: - Gateway + TTS
+
+    private func sendAndSpeak(_ transcript: String) async {
+        await self.reloadConfig()
+        let prompt = self.buildPrompt(transcript: transcript)
+        let runId = UUID().uuidString
+
+        do {
+            let response = try await GatewayConnection.shared.chatSend(
+                sessionKey: "main",
+                message: prompt,
+                thinking: "low",
+                idempotencyKey: runId,
+                attachments: [])
+            let completion = await self.waitForChatCompletion(
+                runId: response.runId,
+                timeoutSeconds: 120)
+            guard completion == .final else {
+                await self.startListening()
+                await self.startRecognition()
+                return
+            }
+
+            guard let assistantText = await self.latestAssistantText(sessionKey: "main") else {
+                await self.startListening()
+                await self.startRecognition()
+                return
+            }
+
+            await self.playAssistant(text: assistantText)
+            await self.startListening()
+            await self.startRecognition()
+            return
+        } catch {
+            self.logger.error("talk chat.send failed: \(error.localizedDescription, privacy: .public)")
+            await self.startListening()
+            await self.startRecognition()
+            return
+        }
+    }
+
+    private func buildPrompt(transcript: String) -> String {
+        var lines: [String] = [
+            "Talk Mode active. Reply in a concise, spoken tone.",
+            "You may optionally prefix the response with JSON (first line) to set ElevenLabs voice, e.g. {\"voice\":\"<id>\",\"once\":true}.",
+        ]
+
+        if let interrupted = self.lastInterruptedAtSeconds {
+            let formatted = String(format: "%.1f", interrupted)
+            lines.append("Assistant speech interrupted at \(formatted)s.")
+            self.lastInterruptedAtSeconds = nil
+        }
+
+        lines.append("")
+        lines.append(transcript)
+        return lines.joined(separator: "\n")
+    }
+
+    private enum ChatCompletionState {
+        case final
+        case aborted
+        case error
+        case timeout
+    }
+
+    private func waitForChatCompletion(runId: String, timeoutSeconds: Int) async -> ChatCompletionState {
+        await withTaskGroup(of: ChatCompletionState.self) { group in
+            group.addTask { [runId] in
+                let stream = GatewayConnection.shared.subscribe()
+                for await push in stream {
+                    if case let .event(evt) = push, evt.event == "chat", let payload = evt.payload {
+                        if let chat = try? JSONDecoder().decode(
+                            ClawdisChatEventPayload.self,
+                            from: JSONEncoder().encode(payload))
+                        {
+                            guard chat.runId == runId else { continue }
+                            switch chat.state {
+                            case .some("final"): return .final
+                            case .some("aborted"): return .aborted
+                            case .some("error"): return .error
+                            default: break
+                            }
+                        }
+                    }
+                }
+                return .timeout
+            }
+            group.addTask {
+                try? await Task.sleep(nanoseconds: UInt64(timeoutSeconds) * 1_000_000_000)
+                return .timeout
+            }
+            let result = await group.next() ?? .timeout
+            group.cancelAll()
+            return result
+        }
+    }
+
+    private func latestAssistantText(sessionKey: String) async -> String? {
+        do {
+            let history = try await GatewayConnection.shared.chatHistory(sessionKey: sessionKey)
+            let messages = history.messages ?? []
+            let decoded = messages.compactMap { item in
+                guard let data = try? JSONEncoder().encode(item) else { return nil }
+                return try? JSONDecoder().decode(ClawdisChatMessage.self, from: data)
+            }
+            guard let assistant = decoded.last(where: { $0.role == "assistant" }) else { return nil }
+            let text = assistant.content.compactMap { $0.text }.joined(separator: "\n")
+            let trimmed = text.trimmingCharacters(in: .whitespacesAndNewlines)
+            return trimmed.isEmpty ? nil : trimmed
+        } catch {
+            self.logger.error("talk history fetch failed: \(error.localizedDescription, privacy: .public)")
+            return nil
+        }
+    }
+
+    private func playAssistant(text: String) async {
+        let parse = TalkDirectiveParser.parse(text)
+        let directive = parse.directive
+        let cleaned = parse.stripped.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !cleaned.isEmpty else { return }
+
+        if !parse.unknownKeys.isEmpty {
+            self.logger.warning("talk directive ignored keys: \(parse.unknownKeys.joined(separator: ","), privacy: .public)")
+        }
+
+        if let voice = directive?.voiceId {
+            if directive?.once == true {
+                self.logger.info("talk voice override (once) voiceId=\(voice, privacy: .public)")
+            } else {
+                self.currentVoiceId = voice
+                self.voiceOverrideActive = true
+                self.logger.info("talk voice override voiceId=\(voice, privacy: .public)")
+            }
+        }
+
+        if let model = directive?.modelId {
+            if directive?.once == true {
+                self.logger.info("talk model override (once) modelId=\(model, privacy: .public)")
+            } else {
+                self.currentModelId = model
+                self.modelOverrideActive = true
+            }
+        }
+
+        let voiceId =
+            directive?.voiceId ??
+            self.currentVoiceId ??
+            self.defaultVoiceId
+
+        guard let voiceId, !voiceId.isEmpty else {
+            self.logger.error("talk missing voiceId; set talk.voiceId or ELEVENLABS_VOICE_ID")
+            return
+        }
+
+        let apiKey = ProcessInfo.processInfo.environment["ELEVENLABS_API_KEY"] ?? ""
+        if apiKey.isEmpty {
+            self.logger.error("talk missing ELEVENLABS_API_KEY")
+            return
+        }
+
+        await self.startRecognition()
+        await MainActor.run { TalkModeController.shared.updatePhase(.speaking) }
+        self.phase = .speaking
+        self.lastSpokenText = cleaned
+
+        let resolvedSpeed = Self.resolveSpeed(
+            speed: directive?.speed,
+            rateWPM: directive?.rateWPM,
+            logger: self.logger)
+
+        let request = ElevenLabsRequest(
+            text: cleaned,
+            modelId: directive?.modelId ?? self.currentModelId ?? self.defaultModelId,
+            outputFormat: directive?.outputFormat ?? self.defaultOutputFormat,
+            speed: resolvedSpeed,
+            stability: Self.validatedUnit(directive?.stability, name: "stability", logger: self.logger),
+            similarity: Self.validatedUnit(directive?.similarity, name: "similarity", logger: self.logger),
+            style: Self.validatedUnit(directive?.style, name: "style", logger: self.logger),
+            speakerBoost: directive?.speakerBoost,
+            seed: Self.validatedSeed(directive?.seed, logger: self.logger),
+            normalize: Self.validatedNormalize(directive?.normalize, logger: self.logger),
+            language: Self.validatedLanguage(directive?.language, logger: self.logger))
+
+        do {
+            let audio = try await ElevenLabsClient(apiKey: apiKey).synthesize(
+                voiceId: voiceId,
+                request: request)
+            let result = await MainActor.run { await TalkAudioPlayer.shared.play(data: audio) }
+            if !result.finished, let interruptedAt = result.interruptedAt, self.phase == .speaking {
+                if self.interruptOnSpeech {
+                    self.lastInterruptedAtSeconds = interruptedAt
+                }
+            }
+        } catch {
+            self.logger.error("talk TTS failed: \(error.localizedDescription, privacy: .public)")
+        }
+
+        self.phase = .thinking
+        await MainActor.run { TalkModeController.shared.updatePhase(.thinking) }
+    }
+
+    func stopSpeaking(reason: TalkStopReason) async {
+        guard self.phase == .speaking else { return }
+        let interruptedAt = await MainActor.run { TalkAudioPlayer.shared.stop() }
+        if reason == .speech, let interruptedAt {
+            self.lastInterruptedAtSeconds = interruptedAt
+        }
+        self.phase = .thinking
+        await MainActor.run { TalkModeController.shared.updatePhase(.thinking) }
+    }
+
+    // MARK: - Config
+
+    private func reloadConfig() async {
+        let cfg = await self.fetchTalkConfig()
+        self.defaultVoiceId = cfg.voiceId
+        if !self.voiceOverrideActive {
+            self.currentVoiceId = cfg.voiceId
+        }
+        self.defaultModelId = cfg.modelId
+        if !self.modelOverrideActive {
+            self.currentModelId = cfg.modelId
+        }
+        self.defaultOutputFormat = cfg.outputFormat
+        self.interruptOnSpeech = cfg.interruptOnSpeech
+    }
+
+    private struct TalkRuntimeConfig {
+        let voiceId: String?
+        let modelId: String?
+        let outputFormat: String?
+        let interruptOnSpeech: Bool
+    }
+
+    private func fetchTalkConfig() async -> TalkRuntimeConfig {
+        let env = ProcessInfo.processInfo.environment
+        let envVoice = env["ELEVENLABS_VOICE_ID"]?.trimmingCharacters(in: .whitespacesAndNewlines)
+        let sagVoice = env["SAG_VOICE_ID"]?.trimmingCharacters(in: .whitespacesAndNewlines)
+
+        do {
+            let snap: ConfigSnapshot = try await GatewayConnection.shared.requestDecoded(
+                method: .configGet,
+                params: nil,
+                timeoutMs: 8000)
+            let talk = snap.config?["talk"]?.dictionaryValue
+            let voice = talk?["voiceId"]?.stringValue
+            let model = talk?["modelId"]?.stringValue
+            let outputFormat = talk?["outputFormat"]?.stringValue
+            let interrupt = talk?["interruptOnSpeech"]?.boolValue
+            let resolvedVoice =
+                (voice?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false ? voice : nil) ??
+                (envVoice?.isEmpty == false ? envVoice : nil) ??
+                (sagVoice?.isEmpty == false ? sagVoice : nil)
+            return TalkRuntimeConfig(
+                voiceId: resolvedVoice,
+                modelId: model,
+                outputFormat: outputFormat,
+                interruptOnSpeech: interrupt ?? true)
+        } catch {
+            let resolvedVoice =
+                (envVoice?.isEmpty == false ? envVoice : nil) ??
+                (sagVoice?.isEmpty == false ? sagVoice : nil)
+            return TalkRuntimeConfig(
+                voiceId: resolvedVoice,
+                modelId: nil,
+                outputFormat: nil,
+                interruptOnSpeech: true)
+        }
+    }
+
+    // MARK: - Audio level handling
+
+    private func noteAudioLevel(rms: Double) async {
+        if self.phase != .listening && self.phase != .speaking { return }
+        let alpha: Double = rms < self.noiseFloorRMS ? 0.08 : 0.01
+        self.noiseFloorRMS = max(1e-7, self.noiseFloorRMS + (rms - self.noiseFloorRMS) * alpha)
+
+        let threshold = max(self.minSpeechRMS, self.noiseFloorRMS * self.speechBoostFactor)
+        if rms >= threshold {
+            let now = Date()
+            self.lastHeard = now
+            self.lastSpeechEnergyAt = now
+        }
+
+        if self.phase == .listening {
+            let clamped = min(1.0, max(0.0, rms / max(self.minSpeechRMS, threshold)))
+            await MainActor.run { TalkModeController.shared.updateLevel(clamped) }
+        }
+    }
+
+    private static func rmsLevel(buffer: AVAudioPCMBuffer) -> Double? {
+        guard let channelData = buffer.floatChannelData?.pointee else { return nil }
+        let frameCount = Int(buffer.frameLength)
+        guard frameCount > 0 else { return nil }
+        var sum: Double = 0
+        for i in 0..<frameCount {
+            let sample = Double(channelData[i])
+            sum += sample * sample
+        }
+        return sqrt(sum / Double(frameCount))
+    }
+
+    private func shouldInterrupt(transcript: String, segments: [SFTranscriptionSegment]) async -> Bool {
+        let trimmed = transcript.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard trimmed.count >= 3 else { return false }
+        if self.isLikelyEcho(of: trimmed) { return false }
+        let now = Date()
+        if let lastSpeechEnergyAt, now.timeIntervalSince(lastSpeechEnergyAt) > 0.35 {
+            return false
+        }
+        let hasConfidence = segments.contains { $0.confidence > 0.6 }
+        return hasConfidence
+    }
+
+    private func isLikelyEcho(of transcript: String) -> Bool {
+        guard let spoken = self.lastSpokenText?.lowercased(), !spoken.isEmpty else { return false }
+        let probe = transcript.lowercased()
+        if probe.count < 6 {
+            return spoken.contains(probe)
+        }
+        return spoken.contains(probe)
+    }
+
+    private static func resolveSpeed(speed: Double?, rateWPM: Int?, logger: Logger) -> Double? {
+        if let rateWPM, rateWPM > 0 {
+            let resolved = Double(rateWPM) / 175.0
+            if resolved <= 0.5 || resolved >= 2.0 {
+                logger.warning("talk rateWPM out of range: \(rateWPM, privacy: .public)")
+                return nil
+            }
+            return resolved
+        }
+        if let speed {
+            if speed <= 0.5 || speed >= 2.0 {
+                logger.warning("talk speed out of range: \(speed, privacy: .public)")
+                return nil
+            }
+            return speed
+        }
+        return nil
+    }
+
+    private static func validatedUnit(_ value: Double?, name: String, logger: Logger) -> Double? {
+        guard let value else { return nil }
+        if value < 0 || value > 1 {
+            logger.warning("talk \(name, privacy: .public) out of range: \(value, privacy: .public)")
+            return nil
+        }
+        return value
+    }
+
+    private static func validatedSeed(_ value: Int?, logger: Logger) -> UInt32? {
+        guard let value else { return nil }
+        if value < 0 || value > 4294967295 {
+            logger.warning("talk seed out of range: \(value, privacy: .public)")
+            return nil
+        }
+        return UInt32(value)
+    }
+
+    private static func validatedNormalize(_ value: String?, logger: Logger) -> String? {
+        guard let value else { return nil }
+        let normalized = value.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+        guard ["auto", "on", "off"].contains(normalized) else {
+            logger.warning("talk normalize invalid: \(normalized, privacy: .public)")
+            return nil
+        }
+        return normalized
+    }
+
+    private static func validatedLanguage(_ value: String?, logger: Logger) -> String? {
+        guard let value else { return nil }
+        let normalized = value.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+        guard normalized.count == 2, normalized.allSatisfy({ $0 >= "a" && $0 <= "z" }) else {
+            logger.warning("talk language invalid: \(normalized, privacy: .public)")
+            return nil
+        }
+        return normalized
+    }
+}
+
+private struct ElevenLabsRequest {
+    let text: String
+    let modelId: String?
+    let outputFormat: String?
+    let speed: Double?
+    let stability: Double?
+    let similarity: Double?
+    let style: Double?
+    let speakerBoost: Bool?
+    let seed: UInt32?
+    let normalize: String?
+    let language: String?
+}
+
+private struct ElevenLabsClient {
+    let apiKey: String
+    let baseUrl: URL = URL(string: "https://api.elevenlabs.io")!
+
+    func synthesize(voiceId: String, request: ElevenLabsRequest) async throws -> Data {
+        var url = self.baseUrl
+        url.appendPathComponent("v1")
+        url.appendPathComponent("text-to-speech")
+        url.appendPathComponent(voiceId)
+
+        var payload: [String: Any] = [
+            "text": request.text,
+        ]
+        if let modelId = request.modelId, !modelId.isEmpty {
+            payload["model_id"] = modelId
+        }
+        if let outputFormat = request.outputFormat, !outputFormat.isEmpty {
+            payload["output_format"] = outputFormat
+        }
+        if let seed = request.seed {
+            payload["seed"] = seed
+        }
+        if let normalize = request.normalize {
+            payload["apply_text_normalization"] = normalize
+        }
+        if let language = request.language {
+            payload["language_code"] = language
+        }
+        var voiceSettings: [String: Any] = [:]
+        if let speed = request.speed { voiceSettings["speed"] = speed }
+        if let stability = request.stability { voiceSettings["stability"] = stability }
+        if let similarity = request.similarity { voiceSettings["similarity_boost"] = similarity }
+        if let style = request.style { voiceSettings["style"] = style }
+        if let speakerBoost = request.speakerBoost { voiceSettings["use_speaker_boost"] = speakerBoost }
+        if !voiceSettings.isEmpty {
+            payload["voice_settings"] = voiceSettings
+        }
+
+        let body = try JSONSerialization.data(withJSONObject: payload, options: [])
+        var req = URLRequest(url: url)
+        req.httpMethod = "POST"
+        req.httpBody = body
+        req.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        req.setValue("audio/mpeg", forHTTPHeaderField: "Accept")
+        req.setValue(self.apiKey, forHTTPHeaderField: "xi-api-key")
+
+        let (data, response) = try await URLSession.shared.data(for: req)
+        if let http = response as? HTTPURLResponse, http.statusCode >= 400 {
+            let message = String(data: data, encoding: .utf8) ?? "unknown"
+            throw NSError(domain: "TalkTTS", code: http.statusCode, userInfo: [
+                NSLocalizedDescriptionKey: "ElevenLabs failed: \(http.statusCode) \(message)",
+            ])
+        }
+        return data
+    }
+}
diff --git a/apps/macos/Sources/Clawdis/TalkModeTypes.swift b/apps/macos/Sources/Clawdis/TalkModeTypes.swift
new file mode 100644
index 000000000..3ae978255
--- /dev/null
+++ b/apps/macos/Sources/Clawdis/TalkModeTypes.swift
@@ -0,0 +1,8 @@
+import Foundation
+
+enum TalkModePhase: String {
+    case idle
+    case listening
+    case thinking
+    case speaking
+}
diff --git a/apps/macos/Sources/Clawdis/TalkOverlay.swift b/apps/macos/Sources/Clawdis/TalkOverlay.swift
new file mode 100644
index 000000000..63c9d5dce
--- /dev/null
+++ b/apps/macos/Sources/Clawdis/TalkOverlay.swift
@@ -0,0 +1,119 @@
+import AppKit
+import Observation
+import OSLog
+import SwiftUI
+
+@MainActor
+@Observable
+final class TalkOverlayController {
+    static let shared = TalkOverlayController()
+
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.overlay")
+
+    struct Model {
+        var isVisible: Bool = false
+        var phase: TalkModePhase = .idle
+        var level: Double = 0
+    }
+
+    var model = Model()
+    private var window: NSPanel?
+    private var hostingView: NSHostingView<TalkOverlayView>?
+
+    private let width: CGFloat = 92
+    private let height: CGFloat = 92
+    private let padding: CGFloat = 8
+
+    func present() {
+        self.ensureWindow()
+        self.hostingView?.rootView = TalkOverlayView(controller: self)
+        let target = self.targetFrame()
+
+        guard let window else { return }
+        if !self.model.isVisible {
+            self.model.isVisible = true
+            let start = target.offsetBy(dx: 0, dy: -6)
+            window.setFrame(start, display: true)
+            window.alphaValue = 0
+            window.orderFrontRegardless()
+            NSAnimationContext.runAnimationGroup { context in
+                context.duration = 0.18
+                context.timingFunction = CAMediaTimingFunction(name: .easeOut)
+                window.animator().setFrame(target, display: true)
+                window.animator().alphaValue = 1
+            }
+        } else {
+            window.setFrame(target, display: true)
+            window.orderFrontRegardless()
+        }
+    }
+
+    func dismiss() {
+        guard let window else {
+            self.model.isVisible = false
+            return
+        }
+
+        let target = window.frame.offsetBy(dx: 6, dy: 6)
+        NSAnimationContext.runAnimationGroup { context in
+            context.duration = 0.16
+            context.timingFunction = CAMediaTimingFunction(name: .easeOut)
+            window.animator().setFrame(target, display: true)
+            window.animator().alphaValue = 0
+        } completionHandler: {
+            Task { @MainActor in
+                window.orderOut(nil)
+                self.model.isVisible = false
+            }
+        }
+    }
+
+    func updatePhase(_ phase: TalkModePhase) {
+        guard self.model.phase != phase else { return }
+        self.logger.info("talk overlay phase=\(phase.rawValue, privacy: .public)")
+        self.model.phase = phase
+    }
+
+    func updateLevel(_ level: Double) {
+        guard self.model.isVisible else { return }
+        self.model.level = max(0, min(1, level))
+    }
+
+    // MARK: - Private
+
+    private func ensureWindow() {
+        if self.window != nil { return }
+        let panel = NSPanel(
+            contentRect: NSRect(x: 0, y: 0, width: self.width, height: self.height),
+            styleMask: [.nonactivatingPanel, .borderless],
+            backing: .buffered,
+            defer: false)
+        panel.isOpaque = false
+        panel.backgroundColor = .clear
+        panel.hasShadow = false
+        panel.level = NSWindow.Level(rawValue: NSWindow.Level.popUpMenu.rawValue - 4)
+        panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .transient]
+        panel.hidesOnDeactivate = false
+        panel.isMovable = false
+        panel.isFloatingPanel = true
+        panel.becomesKeyOnlyIfNeeded = true
+        panel.titleVisibility = .hidden
+        panel.titlebarAppearsTransparent = true
+
+        let host = NSHostingView(rootView: TalkOverlayView(controller: self))
+        host.translatesAutoresizingMaskIntoConstraints = false
+        panel.contentView = host
+        self.hostingView = host
+        self.window = panel
+    }
+
+    private func targetFrame() -> NSRect {
+        guard let screen = NSScreen.main else { return .zero }
+        let size = NSSize(width: self.width, height: self.height)
+        let visible = screen.visibleFrame
+        let origin = CGPoint(
+            x: visible.maxX - size.width - self.padding,
+            y: visible.maxY - size.height - self.padding)
+        return NSRect(origin: origin, size: size)
+    }
+}
diff --git a/apps/macos/Sources/Clawdis/TalkOverlayView.swift b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
new file mode 100644
index 000000000..2f2be75ca
--- /dev/null
+++ b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
@@ -0,0 +1,139 @@
+import SwiftUI
+
+struct TalkOverlayView: View {
+    var controller: TalkOverlayController
+    @State private var hovering = false
+
+    var body: some View {
+        ZStack(alignment: .topLeading) {
+            TalkCloudView(phase: self.controller.model.phase, level: self.controller.model.level)
+                .frame(width: 76, height: 64)
+                .contentShape(Rectangle())
+                .onTapGesture {
+                    TalkModeController.shared.stopSpeaking(reason: .userTap)
+                }
+                .padding(8)
+
+            Button {
+                TalkModeController.shared.exitTalkMode()
+            } label: {
+                Image(systemName: "xmark")
+                    .font(.system(size: 10, weight: .bold))
+                    .foregroundStyle(Color.white.opacity(self.hovering ? 0.95 : 0.7))
+                    .frame(width: 18, height: 18)
+                    .background(Color.black.opacity(self.hovering ? 0.45 : 0.3))
+                    .clipShape(Circle())
+            }
+            .buttonStyle(.plain)
+            .contentShape(Circle())
+            .padding(4)
+            .onHover { self.hovering = $0 }
+        }
+        .frame(width: 92, height: 92, alignment: .center)
+    }
+}
+
+private struct TalkCloudView: View {
+    let phase: TalkModePhase
+    let level: Double
+
+    var body: some View {
+        TimelineView(.animation) { context in
+            let t = context.date.timeIntervalSinceReferenceDate
+            let pulse = phase == .speaking ? (1 + 0.04 * sin(t * 6)) : 1
+            let sink = phase == .thinking ? (3 + 2 * sin(t * 2)) : 0
+            let listenScale = phase == .listening ? (1 + CGFloat(self.level) * 0.14) : 1
+            let baseScale = phase == .thinking ? 0.94 : 1
+
+            ZStack {
+                CloudShape()
+                    .fill(self.cloudGradient)
+                    .overlay(
+                        CloudShape()
+                            .stroke(Color.white.opacity(0.35), lineWidth: 0.8))
+                    .shadow(color: Color.black.opacity(0.18), radius: 8, x: 0, y: 4)
+                    .scaleEffect(baseScale * pulse * listenScale)
+                    .offset(y: sink)
+
+                if phase == .listening {
+                    Circle()
+                        .stroke(self.ringGradient, lineWidth: 1)
+                        .scaleEffect(1 + CGFloat(self.level) * 0.45)
+                        .opacity(0.3 + CGFloat(self.level) * 0.4)
+                        .animation(.easeOut(duration: 0.08), value: self.level)
+                }
+
+                if phase == .thinking {
+                    TalkThinkingDots(time: t)
+                        .offset(y: 18)
+                }
+
+                if phase == .speaking {
+                    TalkSpeakingRings(time: t)
+                }
+            }
+        }
+    }
+
+    private var cloudGradient: LinearGradient {
+        LinearGradient(
+            colors: [Color(red: 0.95, green: 0.98, blue: 1.0), Color(red: 0.75, green: 0.88, blue: 1.0)],
+            startPoint: .topLeading,
+            endPoint: .bottomTrailing)
+    }
+
+    private var ringGradient: LinearGradient {
+        LinearGradient(
+            colors: [Color.white.opacity(0.6), Color.white.opacity(0.1)],
+            startPoint: .top,
+            endPoint: .bottom)
+    }
+}
+
+private struct TalkThinkingDots: View {
+    let time: TimeInterval
+
+    var body: some View {
+        HStack(spacing: 4) {
+            ForEach(0..<3, id: \.self) { idx in
+                let phase = (time * 2 + Double(idx) * 0.45).truncatingRemainder(dividingBy: 1)
+                Circle()
+                    .fill(Color.white.opacity(0.75))
+                    .frame(width: 5, height: 5)
+                    .opacity(0.35 + 0.55 * phase)
+            }
+        }
+    }
+}
+
+private struct TalkSpeakingRings: View {
+    let time: TimeInterval
+
+    var body: some View {
+        ZStack {
+            ForEach(0..<3, id: \.self) { idx in
+                let phase = (time * 1.1 + Double(idx) / 3).truncatingRemainder(dividingBy: 1)
+                Circle()
+                    .stroke(Color.white.opacity(0.6 - phase * 0.5), lineWidth: 1)
+                    .scaleEffect(0.8 + phase * 0.7)
+                    .opacity(0.6 - phase * 0.6)
+            }
+        }
+    }
+}
+
+private struct CloudShape: Shape {
+    func path(in rect: CGRect) -> Path {
+        let w = rect.width
+        let h = rect.height
+        let baseHeight = h * 0.44
+        let baseRect = CGRect(x: rect.minX, y: rect.minY + h * 0.46, width: w, height: baseHeight)
+
+        var path = Path()
+        path.addRoundedRect(in: baseRect, cornerSize: CGSize(width: baseHeight / 2, height: baseHeight / 2))
+        path.addEllipse(in: CGRect(x: rect.minX + w * 0.05, y: rect.minY + h * 0.28, width: w * 0.36, height: h * 0.36))
+        path.addEllipse(in: CGRect(x: rect.minX + w * 0.28, y: rect.minY + h * 0.05, width: w * 0.44, height: h * 0.44))
+        path.addEllipse(in: CGRect(x: rect.minX + w * 0.62, y: rect.minY + h * 0.3, width: w * 0.3, height: h * 0.3))
+        return path
+    }
+}
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkDirective.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkDirective.swift
new file mode 100644
index 000000000..6bc4c0195
--- /dev/null
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkDirective.swift
@@ -0,0 +1,194 @@
+import Foundation
+
+public struct TalkDirective: Equatable, Sendable {
+    public var voiceId: String?
+    public var modelId: String?
+    public var speed: Double?
+    public var rateWPM: Int?
+    public var stability: Double?
+    public var similarity: Double?
+    public var style: Double?
+    public var speakerBoost: Bool?
+    public var seed: Int?
+    public var normalize: String?
+    public var language: String?
+    public var outputFormat: String?
+    public var latencyTier: Int?
+    public var once: Bool?
+
+    public init(
+        voiceId: String? = nil,
+        modelId: String? = nil,
+        speed: Double? = nil,
+        rateWPM: Int? = nil,
+        stability: Double? = nil,
+        similarity: Double? = nil,
+        style: Double? = nil,
+        speakerBoost: Bool? = nil,
+        seed: Int? = nil,
+        normalize: String? = nil,
+        language: String? = nil,
+        outputFormat: String? = nil,
+        latencyTier: Int? = nil,
+        once: Bool? = nil)
+    {
+        self.voiceId = voiceId
+        self.modelId = modelId
+        self.speed = speed
+        self.rateWPM = rateWPM
+        self.stability = stability
+        self.similarity = similarity
+        self.style = style
+        self.speakerBoost = speakerBoost
+        self.seed = seed
+        self.normalize = normalize
+        self.language = language
+        self.outputFormat = outputFormat
+        self.latencyTier = latencyTier
+        self.once = once
+    }
+}
+
+public struct TalkDirectiveParseResult: Equatable, Sendable {
+    public let directive: TalkDirective?
+    public let stripped: String
+    public let unknownKeys: [String]
+
+    public init(directive: TalkDirective?, stripped: String, unknownKeys: [String]) {
+        self.directive = directive
+        self.stripped = stripped
+        self.unknownKeys = unknownKeys
+    }
+}
+
+public enum TalkDirectiveParser {
+    public static func parse(_ text: String) -> TalkDirectiveParseResult {
+        let normalized = text.replacingOccurrences(of: "\r\n", with: "\n")
+        var lines = normalized.split(separator: "\n", omittingEmptySubsequences: false)
+        guard !lines.isEmpty else { return TalkDirectiveParseResult(directive: nil, stripped: text, unknownKeys: []) }
+
+        guard let firstNonEmpty = lines.firstIndex(where: { !$0.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty })
+        else {
+            return TalkDirectiveParseResult(directive: nil, stripped: text, unknownKeys: [])
+        }
+
+        let head = lines[firstNonEmpty].trimmingCharacters(in: .whitespacesAndNewlines)
+        guard head.hasPrefix("{"), head.hasSuffix("}") else {
+            return TalkDirectiveParseResult(directive: nil, stripped: text, unknownKeys: [])
+        }
+
+        guard let data = head.data(using: .utf8),
+              let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any]
+        else {
+            return TalkDirectiveParseResult(directive: nil, stripped: text, unknownKeys: [])
+        }
+
+        let speakerBoost = boolValue(json, keys: ["speaker_boost", "speakerBoost"])
+            ?? boolValue(json, keys: ["no_speaker_boost", "noSpeakerBoost"]).map { !$0 }
+
+        let directive = TalkDirective(
+            voiceId: stringValue(json, keys: ["voice", "voice_id", "voiceId"]),
+            modelId: stringValue(json, keys: ["model", "model_id", "modelId"]),
+            speed: doubleValue(json, keys: ["speed"]),
+            rateWPM: intValue(json, keys: ["rate", "wpm"]),
+            stability: doubleValue(json, keys: ["stability"]),
+            similarity: doubleValue(json, keys: ["similarity", "similarity_boost", "similarityBoost"]),
+            style: doubleValue(json, keys: ["style"]),
+            speakerBoost: speakerBoost,
+            seed: intValue(json, keys: ["seed"]),
+            normalize: stringValue(json, keys: ["normalize", "apply_text_normalization"]),
+            language: stringValue(json, keys: ["lang", "language_code", "language"]),
+            outputFormat: stringValue(json, keys: ["output_format", "format"]),
+            latencyTier: intValue(json, keys: ["latency", "latency_tier", "latencyTier"]),
+            once: boolValue(json, keys: ["once"]))
+
+        let hasDirective = [
+            directive.voiceId,
+            directive.modelId,
+            directive.speed.map { "\($0)" },
+            directive.rateWPM.map { "\($0)" },
+            directive.stability.map { "\($0)" },
+            directive.similarity.map { "\($0)" },
+            directive.style.map { "\($0)" },
+            directive.speakerBoost.map { "\($0)" },
+            directive.seed.map { "\($0)" },
+            directive.normalize,
+            directive.language,
+            directive.outputFormat,
+            directive.latencyTier.map { "\($0)" },
+            directive.once.map { "\($0)" },
+        ].contains { $0 != nil }
+
+        guard hasDirective else {
+            return TalkDirectiveParseResult(directive: nil, stripped: text, unknownKeys: [])
+        }
+
+        let knownKeys = Set([
+            "voice", "voice_id", "voiceid",
+            "model", "model_id", "modelid",
+            "speed", "rate", "wpm",
+            "stability", "similarity", "similarity_boost", "similarityboost",
+            "style",
+            "speaker_boost", "speakerboost",
+            "no_speaker_boost", "nospeakerboost",
+            "seed",
+            "normalize", "apply_text_normalization",
+            "lang", "language_code", "language",
+            "output_format", "format",
+            "latency", "latency_tier", "latencytier",
+            "once",
+        ])
+        let unknownKeys = json.keys.filter { !knownKeys.contains($0.lowercased()) }.sorted()
+
+        lines.remove(at: firstNonEmpty)
+        if firstNonEmpty < lines.count {
+            let next = lines[firstNonEmpty].trimmingCharacters(in: .whitespacesAndNewlines)
+            if next.isEmpty {
+                lines.remove(at: firstNonEmpty)
+            }
+        }
+
+        let stripped = lines.joined(separator: "\n")
+        return TalkDirectiveParseResult(directive: directive, stripped: stripped, unknownKeys: unknownKeys)
+    }
+
+    private static func stringValue(_ dict: [String: Any], keys: [String]) -> String? {
+        for key in keys {
+            if let value = dict[key] as? String {
+                let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines)
+                if !trimmed.isEmpty { return trimmed }
+            }
+        }
+        return nil
+    }
+
+    private static func doubleValue(_ dict: [String: Any], keys: [String]) -> Double? {
+        for key in keys {
+            if let value = dict[key] as? Double { return value }
+            if let value = dict[key] as? Int { return Double(value) }
+            if let value = dict[key] as? String, let parsed = Double(value) { return parsed }
+        }
+        return nil
+    }
+
+    private static func intValue(_ dict: [String: Any], keys: [String]) -> Int? {
+        for key in keys {
+            if let value = dict[key] as? Int { return value }
+            if let value = dict[key] as? Double { return Int(value) }
+            if let value = dict[key] as? String, let parsed = Int(value) { return parsed }
+        }
+        return nil
+    }
+
+    private static func boolValue(_ dict: [String: Any], keys: [String]) -> Bool? {
+        for key in keys {
+            if let value = dict[key] as? Bool { return value }
+            if let value = dict[key] as? String {
+                let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+                if ["true", "yes", "1"].contains(trimmed) { return true }
+                if ["false", "no", "0"].contains(trimmed) { return false }
+            }
+        }
+        return nil
+    }
+}
diff --git a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkDirectiveTests.swift b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkDirectiveTests.swift
new file mode 100644
index 000000000..cbfdb572b
--- /dev/null
+++ b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkDirectiveTests.swift
@@ -0,0 +1,62 @@
+import XCTest
+@testable import ClawdisKit
+
+final class TalkDirectiveTests: XCTestCase {
+    func testParsesDirectiveAndStripsLine() {
+        let text = """
+        {"voice":"abc123","once":true}
+        Hello there.
+        """
+        let result = TalkDirectiveParser.parse(text)
+        XCTAssertEqual(result.directive?.voiceId, "abc123")
+        XCTAssertEqual(result.directive?.once, true)
+        XCTAssertEqual(result.stripped, "Hello there.")
+    }
+
+    func testIgnoresNonDirective() {
+        let text = "Hello world."
+        let result = TalkDirectiveParser.parse(text)
+        XCTAssertNil(result.directive)
+        XCTAssertEqual(result.stripped, text)
+    }
+
+    func testKeepsDirectiveLineIfNoRecognizedFields() {
+        let text = """
+        {"unknown":"value"}
+        Hello.
+        """
+        let result = TalkDirectiveParser.parse(text)
+        XCTAssertNil(result.directive)
+        XCTAssertEqual(result.stripped, text)
+    }
+
+    func testParsesExtendedOptions() {
+        let text = """
+        {"voice_id":"v1","model_id":"m1","rate":200,"stability":0.5,"similarity":0.8,"style":0.2,"speaker_boost":true,"seed":1234,"normalize":"auto","lang":"en","output_format":"mp3_44100_128"}
+        Hello.
+        """
+        let result = TalkDirectiveParser.parse(text)
+        XCTAssertEqual(result.directive?.voiceId, "v1")
+        XCTAssertEqual(result.directive?.modelId, "m1")
+        XCTAssertEqual(result.directive?.rateWPM, 200)
+        XCTAssertEqual(result.directive?.stability, 0.5)
+        XCTAssertEqual(result.directive?.similarity, 0.8)
+        XCTAssertEqual(result.directive?.style, 0.2)
+        XCTAssertEqual(result.directive?.speakerBoost, true)
+        XCTAssertEqual(result.directive?.seed, 1234)
+        XCTAssertEqual(result.directive?.normalize, "auto")
+        XCTAssertEqual(result.directive?.language, "en")
+        XCTAssertEqual(result.directive?.outputFormat, "mp3_44100_128")
+        XCTAssertEqual(result.stripped, "Hello.")
+    }
+
+    func testTracksUnknownKeys() {
+        let text = """
+        {"voice":"abc","mystery":"value","extra":1}
+        Hi.
+        """
+        let result = TalkDirectiveParser.parse(text)
+        XCTAssertEqual(result.directive?.voiceId, "abc")
+        XCTAssertEqual(result.unknownKeys, ["extra", "mystery"])
+    }
+}
diff --git a/docs/configuration.md b/docs/configuration.md
index a6838f4cc..f15a8f046 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -195,6 +195,21 @@ Controls inbound/outbound prefixes and timestamps.
 }
 ```
 
+### `talk`
+
+Defaults for Talk mode (macOS/iOS/Android). Voice IDs fall back to `ELEVENLABS_VOICE_ID` or `SAG_VOICE_ID` when unset.
+
+```json5
+{
+  talk: {
+    voiceId: "elevenlabs_voice_id",
+    modelId: "eleven_v3",
+    outputFormat: "mp3_44100_128",
+    interruptOnSpeech: true
+  }
+}
+```
+
 ### `agent`
 
 Controls the embedded agent runtime (model/thinking/verbose/timeouts).
diff --git a/docs/talk.md b/docs/talk.md
new file mode 100644
index 000000000..4c3cf53cb
--- /dev/null
+++ b/docs/talk.md
@@ -0,0 +1,72 @@
+---
+summary: "Talk mode: continuous speech conversations with ElevenLabs TTS"
+read_when:
+  - Implementing Talk mode on macOS/iOS/Android
+  - Changing voice/TTS/interrupt behavior
+---
+# Talk Mode
+
+Talk mode is a continuous voice conversation loop:
+1) Listen for speech
+2) Send transcript to the model (main session, chat.send)
+3) Wait for the response
+4) Speak it via ElevenLabs
+
+## Behavior (macOS)
+- **Always-on overlay** while Talk mode is enabled.
+- **Listening → Thinking → Speaking** phase transitions.
+- On a **short pause** (silence window), the current transcript is sent.
+- Replies are **written to WebChat** (same as typing).
+- **Interrupt on speech** (default on): if the user starts talking while the assistant is speaking, we stop playback and note the interruption timestamp for the next prompt.
+
+## Voice directives in replies
+The assistant may prefix its reply with a **single JSON line** to control voice:
+
+```json
+{"voice":"<voice-id>","once":true}
+```
+
+Rules:
+- First non-empty line only.
+- Unknown keys are ignored.
+- `once: true` applies to the current reply only.
+- Without `once`, the voice becomes the new default for Talk mode.
+- The JSON line is stripped before TTS playback.
+
+Supported keys:
+- `voice` / `voice_id` / `voiceId`
+- `model` / `model_id` / `modelId`
+- `speed`, `rate` (WPM), `stability`, `similarity`, `style`, `speakerBoost`
+- `seed`, `normalize`, `lang`, `output_format`, `latency_tier`
+- `once`
+
+## Config (clawdis.json)
+```json5
+{
+  "talk": {
+    "voiceId": "elevenlabs_voice_id",
+    "modelId": "eleven_v3",
+    "outputFormat": "mp3_44100_128",
+    "interruptOnSpeech": true
+  }
+}
+```
+
+Defaults:
+- `interruptOnSpeech`: true
+- `voiceId`: falls back to `ELEVENLABS_VOICE_ID` / `SAG_VOICE_ID`
+
+## macOS UI
+- Menu bar toggle: **Talk**
+- Config tab: **Talk Mode** group (voice id + interrupt toggle)
+- Overlay:
+  - **Listening**: cloud pulses with mic level
+  - **Thinking**: sinking animation
+  - **Speaking**: radiating rings
+  - Click cloud: stop speaking
+  - Click X: exit Talk mode
+
+## Notes
+- Requires Speech + Microphone permissions.
+- Uses `chat.send` against session key `main`.
+- TTS uses ElevenLabs API with `ELEVENLABS_API_KEY`.
diff --git a/src/config/config.ts b/src/config/config.ts
index a9cbb2243..40ae5da06 100644
--- a/src/config/config.ts
+++ b/src/config/config.ts
@@ -219,6 +219,17 @@ export type CanvasHostConfig = {
   port?: number;
 };
 
+export type TalkConfig = {
+  /** Default ElevenLabs voice ID for Talk mode. */
+  voiceId?: string;
+  /** Default ElevenLabs model ID for Talk mode. */
+  modelId?: string;
+  /** Default ElevenLabs output format (e.g. mp3_44100_128). */
+  outputFormat?: string;
+  /** Stop speaking when user starts talking (default: true). */
+  interruptOnSpeech?: boolean;
+};
+
 export type GatewayControlUiConfig = {
   /** If false, the Gateway will not serve the Control UI (/). Default: true. */
   enabled?: boolean;
@@ -391,6 +402,7 @@ export type ClawdisConfig = {
   bridge?: BridgeConfig;
   discovery?: DiscoveryConfig;
   canvasHost?: CanvasHostConfig;
+  talk?: TalkConfig;
   gateway?: GatewayConfig;
   skills?: Record<string, SkillConfig>;
 };
@@ -785,6 +797,14 @@ const ClawdisSchema = z.object({
       port: z.number().int().positive().optional(),
     })
     .optional(),
+  talk: z
+    .object({
+      voiceId: z.string().optional(),
+      modelId: z.string().optional(),
+      outputFormat: z.string().optional(),
+      interruptOnSpeech: z.boolean().optional(),
+    })
+    .optional(),
   gateway: z
     .object({
       mode: z.union([z.literal("local"), z.literal("remote")]).optional(),

From 3c338d1858382c54f1426c497990fd9c0f1d0bed Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 23:26:38 +0100
Subject: [PATCH 022/100] fix: adjust android talk parser for kotlin json

---
 .../clawdis/node/voice/TalkDirectiveParser.kt     | 15 ++++++---------
 .../clawdis/node/voice/TalkModeManager.kt         |  6 +++---
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkDirectiveParser.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkDirectiveParser.kt
index 539f556ff..8dd059279 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkDirectiveParser.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkDirectiveParser.kt
@@ -162,30 +162,27 @@ object TalkDirectiveParser {
   }
 }
 
-private fun JsonElement?.asStringOrNull(): String? = (this as? JsonPrimitive)?.contentOrNull
+private fun JsonElement?.asStringOrNull(): String? =
+  (this as? JsonPrimitive)?.takeIf { it.isString }?.content
 
 private fun JsonElement?.asDoubleOrNull(): Double? {
   val primitive = this as? JsonPrimitive ?: return null
-  if (primitive.isString) return primitive.content.toDoubleOrNull()
-  return primitive.doubleOrNull
+  return primitive.content.toDoubleOrNull()
 }
 
 private fun JsonElement?.asIntOrNull(): Int? {
   val primitive = this as? JsonPrimitive ?: return null
-  if (primitive.isString) return primitive.content.toIntOrNull()
-  return primitive.intOrNull
+  return primitive.content.toIntOrNull()
 }
 
 private fun JsonElement?.asLongOrNull(): Long? {
   val primitive = this as? JsonPrimitive ?: return null
-  if (primitive.isString) return primitive.content.toLongOrNull()
-  return primitive.longOrNull
+  return primitive.content.toLongOrNull()
 }
 
 private fun JsonElement?.asBooleanOrNull(): Boolean? {
   val primitive = this as? JsonPrimitive ?: return null
-  if (primitive.booleanOrNull != null) return primitive.booleanOrNull
-  val content = primitive.contentOrNull?.trim()?.lowercase() ?: return null
+  val content = primitive.content.trim().lowercase()
   return when (content) {
     "true", "yes", "1" -> true
     "false", "no", "0" -> false
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
index ecbc51869..920466739 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
@@ -699,12 +699,12 @@ class TalkModeManager(
 
 private fun JsonElement?.asObjectOrNull(): JsonObject? = this as? JsonObject
 
-private fun JsonElement?.asStringOrNull(): String? = (this as? JsonPrimitive)?.contentOrNull
+private fun JsonElement?.asStringOrNull(): String? =
+  (this as? JsonPrimitive)?.takeIf { it.isString }?.content
 
 private fun JsonElement?.asBooleanOrNull(): Boolean? {
   val primitive = this as? JsonPrimitive ?: return null
-  if (primitive.booleanOrNull != null) return primitive.booleanOrNull
-  val content = primitive.contentOrNull?.trim()?.lowercase() ?: return null
+  val content = primitive.content.trim().lowercase()
   return when (content) {
     "true", "yes", "1" -> true
     "false", "no", "0" -> false

From 303954ae8cdd8b036d00ded09b302bd215593372 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 23:42:22 +0100
Subject: [PATCH 023/100] feat: extend status activity indicators

---
 CHANGELOG.md                                  |  2 +
 .../steipete/clawdis/node/MainViewModel.kt    |  3 +
 .../com/steipete/clawdis/node/NodeRuntime.kt  | 25 ++++--
 .../steipete/clawdis/node/ui/RootScreen.kt    | 81 +++++++++++++++++--
 apps/ios/Sources/Model/NodeAppModel.swift     |  4 +
 apps/ios/Sources/RootCanvas.swift             | 74 ++++++++++++-----
 apps/ios/Sources/RootTabs.swift               | 64 ++++++++++++++-
 .../Sources/Clawdis/MenuContentView.swift     |  8 ++
 .../Clawdis/NodePairingApprovalPrompter.swift | 16 ++++
 9 files changed, 241 insertions(+), 36 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c17709774..01821b781 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@
 - iOS/Android nodes: bridge auto-connect refreshes stale tokens and settings now show richer bridge/device details.
 - iOS/Android nodes: status pill now surfaces camera activity instead of overlay toasts.
 - iOS/Android/macOS nodes: camera snaps recompress to keep base64 payloads under 5 MB.
+- iOS/Android nodes: status pill now surfaces pairing, screen recording, voice wake, and foreground-required states.
+- macOS menu: top status line now shows pending node pairing approvals (incl. repairs).
 - CLI: avoid spurious gateway close errors after successful request/response cycles.
 - Agent runtime: clamp tool-result images to the 5MB Anthropic limit to avoid hard request rejections.
 - Tests: add Swift Testing coverage for camera errors and Kotest coverage for Android bridge endpoints.
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/MainViewModel.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/MainViewModel.kt
index ee1c83c9b..f1fef1640 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/MainViewModel.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/MainViewModel.kt
@@ -23,9 +23,11 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
   val statusText: StateFlow<String> = runtime.statusText
   val serverName: StateFlow<String?> = runtime.serverName
   val remoteAddress: StateFlow<String?> = runtime.remoteAddress
+  val isForeground: StateFlow<Boolean> = runtime.isForeground
 
   val cameraHud: StateFlow<CameraHudState?> = runtime.cameraHud
   val cameraFlashToken: StateFlow<Long> = runtime.cameraFlashToken
+  val screenRecordActive: StateFlow<Boolean> = runtime.screenRecordActive
 
   val instanceId: StateFlow<String> = runtime.instanceId
   val displayName: StateFlow<String> = runtime.displayName
@@ -34,6 +36,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
   val wakeWords: StateFlow<List<String>> = runtime.wakeWords
   val voiceWakeMode: StateFlow<VoiceWakeMode> = runtime.voiceWakeMode
   val voiceWakeStatusText: StateFlow<String> = runtime.voiceWakeStatusText
+  val voiceWakeStatusText: StateFlow<String> = runtime.voiceWakeStatusText
   val voiceWakeIsListening: StateFlow<Boolean> = runtime.voiceWakeIsListening
   val talkEnabled: StateFlow<Boolean> = runtime.talkEnabled
   val talkStatusText: StateFlow<String> = runtime.talkStatusText
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
index 4984f7e0f..21a22a428 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
@@ -111,6 +111,9 @@ class NodeRuntime(context: Context) {
   private val _cameraFlashToken = MutableStateFlow(0L)
   val cameraFlashToken: StateFlow<Long> = _cameraFlashToken.asStateFlow()
 
+  private val _screenRecordActive = MutableStateFlow(false)
+  val screenRecordActive: StateFlow<Boolean> = _screenRecordActive.asStateFlow()
+
   private val _serverName = MutableStateFlow<String?>(null)
   val serverName: StateFlow<String?> = _serverName.asStateFlow()
 
@@ -756,14 +759,20 @@ class NodeRuntime(context: Context) {
         }
       }
       ClawdisScreenCommand.Record.rawValue -> {
-        val res =
-          try {
-            screenRecorder.record(paramsJson)
-          } catch (err: Throwable) {
-            val (code, message) = invokeErrorFromThrowable(err)
-            return BridgeSession.InvokeResult.error(code = code, message = message)
-          }
-        BridgeSession.InvokeResult.ok(res.payloadJson)
+        // Status pill mirrors screen recording state so it stays visible without overlay stacking.
+        _screenRecordActive.value = true
+        try {
+          val res =
+            try {
+              screenRecorder.record(paramsJson)
+            } catch (err: Throwable) {
+              val (code, message) = invokeErrorFromThrowable(err)
+              return BridgeSession.InvokeResult.error(code = code, message = message)
+            }
+          BridgeSession.InvokeResult.ok(res.payloadJson)
+        } finally {
+          _screenRecordActive.value = false
+        }
       }
       else ->
         BridgeSession.InvokeResult.error(
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
index 2594449b8..86d5a334e 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
@@ -36,6 +36,10 @@ import androidx.compose.material.icons.filled.CheckCircle
 import androidx.compose.material.icons.filled.Error
 import androidx.compose.material.icons.filled.FiberManualRecord
 import androidx.compose.material.icons.filled.PhotoCamera
+import androidx.compose.material.icons.filled.RecordVoiceOver
+import androidx.compose.material.icons.filled.Refresh
+import androidx.compose.material.icons.filled.Report
+import androidx.compose.material.icons.filled.ScreenShare
 import androidx.compose.material.icons.filled.Settings
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -65,39 +69,100 @@ fun RootScreen(viewModel: MainViewModel) {
   val statusText by viewModel.statusText.collectAsState()
   val cameraHud by viewModel.cameraHud.collectAsState()
   val cameraFlashToken by viewModel.cameraFlashToken.collectAsState()
+  val screenRecordActive by viewModel.screenRecordActive.collectAsState()
+  val isForeground by viewModel.isForeground.collectAsState()
+  val voiceWakeStatusText by viewModel.voiceWakeStatusText.collectAsState()
   val activity =
-    remember(cameraHud) {
-      // Status pill owns transient capture state so it doesn't overlap the connection indicator.
-      cameraHud?.let { hud ->
-        when (hud.kind) {
+    remember(cameraHud, screenRecordActive, isForeground, statusText, voiceWakeStatusText) {
+      // Status pill owns transient activity state so it doesn't overlap the connection indicator.
+      if (!isForeground) {
+        return@remember StatusActivity(
+          title = "Foreground required",
+          icon = Icons.Default.Report,
+          contentDescription = "Foreground required",
+        )
+      }
+
+      val lowerStatus = statusText.lowercase()
+      if (lowerStatus.contains("repair")) {
+        return@remember StatusActivity(
+          title = "Repairing…",
+          icon = Icons.Default.Refresh,
+          contentDescription = "Repairing",
+        )
+      }
+      if (lowerStatus.contains("pairing") || lowerStatus.contains("approval")) {
+        return@remember StatusActivity(
+          title = "Approval pending",
+          icon = Icons.Default.RecordVoiceOver,
+          contentDescription = "Approval pending",
+        )
+      }
+      if (lowerStatus.contains("reconnecting") || lowerStatus.contains("connecting")) {
+        return@remember StatusActivity(
+          title = "Gateway reconnecting…",
+          icon = Icons.Default.Refresh,
+          contentDescription = "Gateway reconnecting",
+        )
+      }
+
+      if (screenRecordActive) {
+        return@remember StatusActivity(
+          title = "Recording screen…",
+          icon = Icons.Default.ScreenShare,
+          contentDescription = "Recording screen",
+          tint = androidx.compose.ui.graphics.Color.Red,
+        )
+      }
+
+      if (cameraHud != null) {
+        return@remember when (cameraHud.kind) {
           CameraHudKind.Photo ->
             StatusActivity(
-              title = hud.message,
+              title = cameraHud.message,
               icon = Icons.Default.PhotoCamera,
               contentDescription = "Taking photo",
             )
           CameraHudKind.Recording ->
             StatusActivity(
-              title = hud.message,
+              title = cameraHud.message,
               icon = Icons.Default.FiberManualRecord,
               contentDescription = "Recording",
               tint = androidx.compose.ui.graphics.Color.Red,
             )
           CameraHudKind.Success ->
             StatusActivity(
-              title = hud.message,
+              title = cameraHud.message,
               icon = Icons.Default.CheckCircle,
               contentDescription = "Capture finished",
             )
           CameraHudKind.Error ->
             StatusActivity(
-              title = hud.message,
+              title = cameraHud.message,
               icon = Icons.Default.Error,
               contentDescription = "Capture failed",
               tint = androidx.compose.ui.graphics.Color.Red,
             )
         }
       }
+
+      if (voiceWakeStatusText.contains("Microphone permission", ignoreCase = true)) {
+        return@remember StatusActivity(
+          title = "Mic permission",
+          icon = Icons.Default.Error,
+          contentDescription = "Mic permission required",
+        )
+      }
+      if (voiceWakeStatusText == "Paused") {
+        val suffix = if (!isForeground) " (background)" else ""
+        return@remember StatusActivity(
+          title = "Voice Wake paused$suffix",
+          icon = Icons.Default.RecordVoiceOver,
+          contentDescription = "Voice Wake paused",
+        )
+      }
+
+      null
     }
 
   val bridgeState =
diff --git a/apps/ios/Sources/Model/NodeAppModel.swift b/apps/ios/Sources/Model/NodeAppModel.swift
index 4c491ea55..8c2935ffc 100644
--- a/apps/ios/Sources/Model/NodeAppModel.swift
+++ b/apps/ios/Sources/Model/NodeAppModel.swift
@@ -36,6 +36,7 @@ final class NodeAppModel {
     var cameraHUDText: String?
     var cameraHUDKind: CameraHUDKind?
     var cameraFlashNonce: Int = 0
+    var screenRecordActive: Bool = false
 
     init() {
         self.voiceWake.configure { [weak self] cmd in
@@ -598,6 +599,9 @@ final class NodeAppModel {
                         NSLocalizedDescriptionKey: "INVALID_REQUEST: screen format must be mp4",
                     ])
                 }
+                // Status pill mirrors screen recording state so it stays visible without overlay stacking.
+                self.screenRecordActive = true
+                defer { self.screenRecordActive = false }
                 let path = try await self.screenRecorder.record(
                     screenIndex: params.screenIndex,
                     durationMs: params.durationMs,
diff --git a/apps/ios/Sources/RootCanvas.swift b/apps/ios/Sources/RootCanvas.swift
index c02eceb69..b55f84cc1 100644
--- a/apps/ios/Sources/RootCanvas.swift
+++ b/apps/ios/Sources/RootCanvas.swift
@@ -119,6 +119,7 @@ struct RootCanvas: View {
 }
 
 private struct CanvasContent: View {
+    @Environment(NodeAppModel.self) private var appModel
     var systemColorScheme: ColorScheme
     var bridgeStatus: StatusPill.BridgeState
     var voiceWakeEnabled: Bool
@@ -173,28 +174,63 @@ private struct CanvasContent: View {
     }
 
     private var statusActivity: StatusPill.Activity? {
-        // Status pill owns transient capture state so it doesn't overlap the connection indicator.
-        guard let cameraHUDText, !cameraHUDText.isEmpty, let cameraHUDKind else { return nil }
-        let systemImage: String
-        let tint: Color?
-        switch cameraHUDKind {
-        case .photo:
-            systemImage = "camera.fill"
-            tint = nil
-        case .recording:
-            systemImage = "video.fill"
-            tint = .red
-        case .success:
-            systemImage = "checkmark.circle.fill"
-            tint = .green
-        case .error:
-            systemImage = "exclamationmark.triangle.fill"
-            tint = .red
+        // Status pill owns transient activity state so it doesn't overlap the connection indicator.
+        if self.appModel.isBackgrounded {
+            return StatusPill.Activity(
+                title: "Foreground required",
+                systemImage: "exclamationmark.triangle.fill",
+                tint: .orange)
         }
 
-        return StatusPill.Activity(title: cameraHUDText, systemImage: systemImage, tint: tint)
-    }
+        let bridgeStatus = self.appModel.bridgeStatusText.trimmingCharacters(in: .whitespacesAndNewlines)
+        let bridgeLower = bridgeStatus.lowercased()
+        if bridgeLower.contains("repair") {
+            return StatusPill.Activity(title: "Repairing…", systemImage: "wrench.and.screwdriver", tint: .orange)
+        }
+        if bridgeLower.contains("approval") || bridgeLower.contains("pairing") {
+            return StatusPill.Activity(title: "Approval pending", systemImage: "person.crop.circle.badge.clock")
+        }
+        if bridgeLower.contains("reconnecting") || bridgeLower.contains("connecting") {
+            return StatusPill.Activity(title: "Gateway reconnecting…", systemImage: "arrow.triangle.2.circlepath")
+        }
 
+        if self.appModel.screenRecordActive {
+            return StatusPill.Activity(title: "Recording screen…", systemImage: "record.circle.fill", tint: .red)
+        }
+
+        if let cameraHUDText, !cameraHUDText.isEmpty, let cameraHUDKind {
+            let systemImage: String
+            let tint: Color?
+            switch cameraHUDKind {
+            case .photo:
+                systemImage = "camera.fill"
+                tint = nil
+            case .recording:
+                systemImage = "video.fill"
+                tint = .red
+            case .success:
+                systemImage = "checkmark.circle.fill"
+                tint = .green
+            case .error:
+                systemImage = "exclamationmark.triangle.fill"
+                tint = .red
+            }
+            return StatusPill.Activity(title: cameraHUDText, systemImage: systemImage, tint: tint)
+        }
+
+        if self.voiceWakeEnabled {
+            let voiceStatus = self.appModel.voiceWake.statusText
+            if voiceStatus.localizedCaseInsensitiveContains("microphone permission") {
+                return StatusPill.Activity(title: "Mic permission", systemImage: "mic.slash", tint: .orange)
+            }
+            if voiceStatus == "Paused" {
+                let suffix = self.appModel.isBackgrounded ? " (background)" : ""
+                return StatusPill.Activity(title: "Voice Wake paused\(suffix)", systemImage: "pause.circle.fill")
+            }
+        }
+
+        return nil
+    }
 }
 
 private struct OverlayButton: View {
diff --git a/apps/ios/Sources/RootTabs.swift b/apps/ios/Sources/RootTabs.swift
index 913073d4a..a480fc8ab 100644
--- a/apps/ios/Sources/RootTabs.swift
+++ b/apps/ios/Sources/RootTabs.swift
@@ -26,7 +26,7 @@ struct RootTabs: View {
             StatusPill(
                 bridge: self.bridgeStatus,
                 voiceWakeEnabled: self.voiceWakeEnabled,
-                activity: nil,
+                activity: self.statusActivity,
                 onTap: { self.selectedTab = 2 })
                 .padding(.leading, 10)
                 .safeAreaPadding(.top, 10)
@@ -80,4 +80,66 @@ struct RootTabs: View {
 
         return .disconnected
     }
+
+    private var statusActivity: StatusPill.Activity? {
+        // Keep the top pill consistent across tabs (camera + voice wake + pairing states).
+        if self.appModel.isBackgrounded {
+            return StatusPill.Activity(
+                title: "Foreground required",
+                systemImage: "exclamationmark.triangle.fill",
+                tint: .orange)
+        }
+
+        let bridgeStatus = self.appModel.bridgeStatusText.trimmingCharacters(in: .whitespacesAndNewlines)
+        let bridgeLower = bridgeStatus.lowercased()
+        if bridgeLower.contains("repair") {
+            return StatusPill.Activity(title: "Repairing…", systemImage: "wrench.and.screwdriver", tint: .orange)
+        }
+        if bridgeLower.contains("approval") || bridgeLower.contains("pairing") {
+            return StatusPill.Activity(title: "Approval pending", systemImage: "person.crop.circle.badge.clock")
+        }
+        if bridgeLower.contains("reconnecting") || bridgeLower.contains("connecting") {
+            return StatusPill.Activity(title: "Gateway reconnecting…", systemImage: "arrow.triangle.2.circlepath")
+        }
+
+        if self.appModel.screenRecordActive {
+            return StatusPill.Activity(title: "Recording screen…", systemImage: "record.circle.fill", tint: .red)
+        }
+
+        if let cameraHUDText = self.appModel.cameraHUDText,
+           let cameraHUDKind = self.appModel.cameraHUDKind,
+           !cameraHUDText.isEmpty
+        {
+            let systemImage: String
+            let tint: Color?
+            switch cameraHUDKind {
+            case .photo:
+                systemImage = "camera.fill"
+                tint = nil
+            case .recording:
+                systemImage = "video.fill"
+                tint = .red
+            case .success:
+                systemImage = "checkmark.circle.fill"
+                tint = .green
+            case .error:
+                systemImage = "exclamationmark.triangle.fill"
+                tint = .red
+            }
+            return StatusPill.Activity(title: cameraHUDText, systemImage: systemImage, tint: tint)
+        }
+
+        if self.voiceWakeEnabled {
+            let voiceStatus = self.appModel.voiceWake.statusText
+            if voiceStatus.localizedCaseInsensitiveContains("microphone permission") {
+                return StatusPill.Activity(title: "Mic permission", systemImage: "mic.slash", tint: .orange)
+            }
+            if voiceStatus == "Paused" {
+                let suffix = self.appModel.isBackgrounded ? " (background)" : ""
+                return StatusPill.Activity(title: "Voice Wake paused\(suffix)", systemImage: "pause.circle.fill")
+            }
+        }
+
+        return nil
+    }
 }
diff --git a/apps/macos/Sources/Clawdis/MenuContentView.swift b/apps/macos/Sources/Clawdis/MenuContentView.swift
index 748ce018d..dee70ed5d 100644
--- a/apps/macos/Sources/Clawdis/MenuContentView.swift
+++ b/apps/macos/Sources/Clawdis/MenuContentView.swift
@@ -14,6 +14,7 @@ struct MenuContent: View {
     private let heartbeatStore = HeartbeatStore.shared
     private let controlChannel = ControlChannel.shared
     private let activityStore = WorkActivityStore.shared
+    @Bindable private var pairingPrompter = NodePairingApprovalPrompter.shared
     @Environment(\.openSettings) private var openSettings
     @State private var availableMics: [AudioInputDevice] = []
     @State private var loadingMics = false
@@ -32,6 +33,13 @@ struct MenuContent: View {
                 VStack(alignment: .leading, spacing: 2) {
                     Text(self.connectionLabel)
                     self.statusLine(label: self.healthStatus.label, color: self.healthStatus.color)
+                    if self.pairingPrompter.pendingCount > 0 {
+                        let repairCount = self.pairingPrompter.pendingRepairCount
+                        let repairSuffix = repairCount > 0 ? " · \(repairCount) repair" : ""
+                        self.statusLine(
+                            label: "Pairing approval pending (\(self.pairingPrompter.pendingCount))\(repairSuffix)",
+                            color: .orange)
+                    }
                 }
             }
             .disabled(self.state.connectionMode == .unconfigured)
diff --git a/apps/macos/Sources/Clawdis/NodePairingApprovalPrompter.swift b/apps/macos/Sources/Clawdis/NodePairingApprovalPrompter.swift
index 85d8a9f12..932f272f6 100644
--- a/apps/macos/Sources/Clawdis/NodePairingApprovalPrompter.swift
+++ b/apps/macos/Sources/Clawdis/NodePairingApprovalPrompter.swift
@@ -2,6 +2,7 @@ import AppKit
 import ClawdisIPC
 import ClawdisProtocol
 import Foundation
+import Observation
 import OSLog
 import UserNotifications
 
@@ -15,6 +16,7 @@ enum NodePairingReconcilePolicy {
 }
 
 @MainActor
+@Observable
 final class NodePairingApprovalPrompter {
     static let shared = NodePairingApprovalPrompter()
 
@@ -26,6 +28,8 @@ final class NodePairingApprovalPrompter {
     private var isStopping = false
     private var isPresenting = false
     private var queue: [PendingRequest] = []
+    var pendingCount: Int = 0
+    var pendingRepairCount: Int = 0
     private var activeAlert: NSAlert?
     private var activeRequestId: String?
     private var alertHostWindow: NSWindow?
@@ -104,6 +108,7 @@ final class NodePairingApprovalPrompter {
         self.reconcileOnceTask?.cancel()
         self.reconcileOnceTask = nil
         self.queue.removeAll(keepingCapacity: false)
+        self.updatePendingCounts()
         self.isPresenting = false
         self.activeRequestId = nil
         self.alertHostWindow?.orderOut(nil)
@@ -292,6 +297,7 @@ final class NodePairingApprovalPrompter {
     private func enqueue(_ req: PendingRequest) {
         if self.queue.contains(req) { return }
         self.queue.append(req)
+        self.updatePendingCounts()
         self.presentNextIfNeeded()
         self.updateReconcileLoop()
     }
@@ -362,6 +368,7 @@ final class NodePairingApprovalPrompter {
             } else {
                 self.queue.removeAll { $0 == request }
             }
+            self.updatePendingCounts()
             self.isPresenting = false
             self.presentNextIfNeeded()
             self.updateReconcileLoop()
@@ -501,6 +508,8 @@ final class NodePairingApprovalPrompter {
         } else {
             self.queue.removeAll { $0 == req }
         }
+
+        self.updatePendingCounts()
         self.isPresenting = false
         self.presentNextIfNeeded()
         self.updateReconcileLoop()
@@ -599,6 +608,12 @@ final class NodePairingApprovalPrompter {
         }
     }
 
+    private func updatePendingCounts() {
+        // Keep a cheap observable summary for the menu bar status line.
+        self.pendingCount = self.queue.count
+        self.pendingRepairCount = self.queue.filter { $0.isRepair == true }.count
+    }
+
     private func reconcileOnce(timeoutMs: Double) async {
         if self.isStopping { return }
         if self.reconcileInFlight { return }
@@ -643,6 +658,7 @@ final class NodePairingApprovalPrompter {
             return
         }
         self.queue.removeAll { $0.requestId == resolved.requestId }
+        self.updatePendingCounts()
         Task { @MainActor in
             await self.notify(resolution: resolution, request: request, via: "remote")
         }

From 857cd6a28ae318c49a50fa1db45ca8d0b584ea26 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 29 Dec 2025 23:45:58 +0100
Subject: [PATCH 024/100] fix: align ios lint and android build

---
 .../java/com/steipete/clawdis/node/MainViewModel.kt  |  1 -
 .../java/com/steipete/clawdis/node/ui/RootScreen.kt  | 12 ++++++------
 apps/ios/Sources/Status/StatusPill.swift             |  4 ++--
 apps/ios/Sources/Voice/TalkModeManager.swift         |  9 ++++++---
 apps/ios/SwiftSources.input.xcfilelist               |  2 ++
 .../Sources/ClawdisKit/TalkDirective.swift           |  7 ++++---
 6 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/MainViewModel.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/MainViewModel.kt
index f1fef1640..69b394a63 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/MainViewModel.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/MainViewModel.kt
@@ -36,7 +36,6 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
   val wakeWords: StateFlow<List<String>> = runtime.wakeWords
   val voiceWakeMode: StateFlow<VoiceWakeMode> = runtime.voiceWakeMode
   val voiceWakeStatusText: StateFlow<String> = runtime.voiceWakeStatusText
-  val voiceWakeStatusText: StateFlow<String> = runtime.voiceWakeStatusText
   val voiceWakeIsListening: StateFlow<Boolean> = runtime.voiceWakeIsListening
   val talkEnabled: StateFlow<Boolean> = runtime.talkEnabled
   val talkStatusText: StateFlow<String> = runtime.talkStatusText
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
index 86d5a334e..cb11cf303 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
@@ -115,30 +115,30 @@ fun RootScreen(viewModel: MainViewModel) {
         )
       }
 
-      if (cameraHud != null) {
-        return@remember when (cameraHud.kind) {
+      cameraHud?.let { hud ->
+        return@remember when (hud.kind) {
           CameraHudKind.Photo ->
             StatusActivity(
-              title = cameraHud.message,
+              title = hud.message,
               icon = Icons.Default.PhotoCamera,
               contentDescription = "Taking photo",
             )
           CameraHudKind.Recording ->
             StatusActivity(
-              title = cameraHud.message,
+              title = hud.message,
               icon = Icons.Default.FiberManualRecord,
               contentDescription = "Recording",
               tint = androidx.compose.ui.graphics.Color.Red,
             )
           CameraHudKind.Success ->
             StatusActivity(
-              title = cameraHud.message,
+              title = hud.message,
               icon = Icons.Default.CheckCircle,
               contentDescription = "Capture finished",
             )
           CameraHudKind.Error ->
             StatusActivity(
-              title = cameraHud.message,
+              title = hud.message,
               icon = Icons.Default.Error,
               contentDescription = "Capture failed",
               tint = androidx.compose.ui.graphics.Color.Red,
diff --git a/apps/ios/Sources/Status/StatusPill.swift b/apps/ios/Sources/Status/StatusPill.swift
index f5df8e7df..1e30ad16d 100644
--- a/apps/ios/Sources/Status/StatusPill.swift
+++ b/apps/ios/Sources/Status/StatusPill.swift
@@ -31,12 +31,12 @@ struct StatusPill: View {
     struct Activity: Equatable {
         var title: String
         var systemImage: String
-        var tint: Color? = nil
+        var tint: Color?
     }
 
     var bridge: BridgeState
     var voiceWakeEnabled: Bool
-    var activity: Activity? = nil
+    var activity: Activity?
     var brighten: Bool = false
     var onTap: () -> Void
 
diff --git a/apps/ios/Sources/Voice/TalkModeManager.swift b/apps/ios/Sources/Voice/TalkModeManager.swift
index 649eaa03a..82cd451c3 100644
--- a/apps/ios/Sources/Voice/TalkModeManager.swift
+++ b/apps/ios/Sources/Voice/TalkModeManager.swift
@@ -233,7 +233,7 @@ final class TalkModeManager: NSObject {
             "sessionKey": "main",
             "message": message,
             "thinking": "low",
-            "timeoutMs": 30_000,
+            "timeoutMs": 30000,
             "idempotencyKey": UUID().uuidString,
         ]
         let data = try JSONSerialization.data(withJSONObject: payload)
@@ -260,7 +260,10 @@ final class TalkModeManager: NSObject {
     }
 
     private func fetchLatestAssistantText(bridge: BridgeSession) async throws -> String? {
-        let res = try await bridge.request(method: "chat.history", paramsJSON: "{\"sessionKey\":\"main\"}", timeoutSeconds: 15)
+        let res = try await bridge.request(
+            method: "chat.history",
+            paramsJSON: "{\"sessionKey\":\"main\"}",
+            timeoutSeconds: 15)
         guard let json = try JSONSerialization.jsonObject(with: res) as? [String: Any] else { return nil }
         guard let messages = json["messages"] as? [[String: Any]] else { return nil }
         for msg in messages.reversed() {
@@ -499,7 +502,7 @@ private enum TalkModeRuntime {
 
     static func validatedSeed(_ value: Int?) -> UInt32? {
         guard let value else { return nil }
-        if value < 0 || value > 4294967295 { return nil }
+        if value < 0 || value > 4_294_967_295 { return nil }
         return UInt32(value)
     }
 
diff --git a/apps/ios/SwiftSources.input.xcfilelist b/apps/ios/SwiftSources.input.xcfilelist
index 3e2a9a7b0..81d42dce1 100644
--- a/apps/ios/SwiftSources.input.xcfilelist
+++ b/apps/ios/SwiftSources.input.xcfilelist
@@ -54,4 +54,6 @@ Sources/Voice/VoiceWakePreferences.swift
 ../shared/ClawdisKit/Sources/ClawdisKit/ScreenCommands.swift
 ../shared/ClawdisKit/Sources/ClawdisKit/StoragePaths.swift
 ../shared/ClawdisKit/Sources/ClawdisKit/SystemCommands.swift
+../shared/ClawdisKit/Sources/ClawdisKit/TalkDirective.swift
 ../../Swabble/Sources/SwabbleKit/WakeWordGate.swift
+Sources/Voice/TalkModeManager.swift
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkDirective.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkDirective.swift
index 6bc4c0195..af0e2365f 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkDirective.swift
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkDirective.swift
@@ -67,7 +67,8 @@ public enum TalkDirectiveParser {
         var lines = normalized.split(separator: "\n", omittingEmptySubsequences: false)
         guard !lines.isEmpty else { return TalkDirectiveParseResult(directive: nil, stripped: text, unknownKeys: []) }
 
-        guard let firstNonEmpty = lines.firstIndex(where: { !$0.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty })
+        guard let firstNonEmpty =
+            lines.firstIndex(where: { !$0.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty })
         else {
             return TalkDirectiveParseResult(directive: nil, stripped: text, unknownKeys: [])
         }
@@ -83,8 +84,8 @@ public enum TalkDirectiveParser {
             return TalkDirectiveParseResult(directive: nil, stripped: text, unknownKeys: [])
         }
 
-        let speakerBoost = boolValue(json, keys: ["speaker_boost", "speakerBoost"])
-            ?? boolValue(json, keys: ["no_speaker_boost", "noSpeakerBoost"]).map { !$0 }
+        let speakerBoost = self.boolValue(json, keys: ["speaker_boost", "speakerBoost"])
+            ?? self.boolValue(json, keys: ["no_speaker_boost", "noSpeakerBoost"]).map { !$0 }
 
         let directive = TalkDirective(
             voiceId: stringValue(json, keys: ["voice", "voice_id", "voiceId"]),

From c56292a6ec17905b1fce2794ea12a9750f0afe76 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 00:01:21 +0100
Subject: [PATCH 025/100] feat: move talk mode to overlay button

---
 CHANGELOG.md                                  |  2 ++
 .../steipete/clawdis/node/ui/RootScreen.kt    | 33 +++++++++++++++++++
 .../steipete/clawdis/node/ui/SettingsSheet.kt | 24 --------------
 apps/ios/Sources/RootCanvas.swift             | 15 +++++++++
 apps/ios/Sources/Settings/SettingsTab.swift   |  3 ++
 5 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01821b781..cd94a3ce5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 
 ### Fixes
 - macOS: Voice Wake now fully tears down the Speech pipeline when disabled (cancel pending restarts, drop stale callbacks) to avoid high CPU in the background.
+- macOS menu: add a Talk Mode action alongside the Open Dashboard/Chat/Canvas entries.
 - iOS/Android nodes: enable scrolling for loaded web pages in the Canvas WebView (default scaffold stays touch-first).
 - macOS menu: device list now uses `node.list` (devices only; no agent/tool presence entries).
 - macOS menu: device list now shows connected nodes only.
@@ -15,6 +16,7 @@
 - iOS/Android nodes: status pill now surfaces camera activity instead of overlay toasts.
 - iOS/Android/macOS nodes: camera snaps recompress to keep base64 payloads under 5 MB.
 - iOS/Android nodes: status pill now surfaces pairing, screen recording, voice wake, and foreground-required states.
+- iOS/Android nodes: Talk Mode now lives on a side bubble (with an iOS toggle to hide it), and Android settings no longer show the Talk Mode switch.
 - macOS menu: top status line now shows pending node pairing approvals (incl. repairs).
 - CLI: avoid spurious gateway close errors after successful request/response cycles.
 - Agent runtime: clamp tool-result images to the 5MB Anthropic limit to avoid hard request rejections.
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
index cb11cf303..791f76325 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
@@ -13,6 +13,8 @@ import android.webkit.WebResourceError
 import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
 import android.webkit.WebViewClient
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -28,6 +30,8 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FilledTonalIconButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButtonDefaults
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.material.icons.Icons
@@ -72,6 +76,11 @@ fun RootScreen(viewModel: MainViewModel) {
   val screenRecordActive by viewModel.screenRecordActive.collectAsState()
   val isForeground by viewModel.isForeground.collectAsState()
   val voiceWakeStatusText by viewModel.voiceWakeStatusText.collectAsState()
+  val talkEnabled by viewModel.talkEnabled.collectAsState()
+  val audioPermissionLauncher =
+    rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { granted ->
+      if (granted) viewModel.setTalkEnabled(true)
+    }
   val activity =
     remember(cameraHud, screenRecordActive, isForeground, statusText, voiceWakeStatusText) {
       // Status pill owns transient activity state so it doesn't overlap the connection indicator.
@@ -211,6 +220,30 @@ fun RootScreen(viewModel: MainViewModel) {
         icon = { Icon(Icons.Default.ChatBubble, contentDescription = "Chat") },
       )
 
+      // Talk mode gets a dedicated side bubble instead of burying it in settings.
+      OverlayIconButton(
+        onClick = {
+          val next = !talkEnabled
+          if (next) {
+            val micOk =
+              ContextCompat.checkSelfPermission(context, Manifest.permission.RECORD_AUDIO) ==
+                PackageManager.PERMISSION_GRANTED
+            if (!micOk) audioPermissionLauncher.launch(Manifest.permission.RECORD_AUDIO)
+            viewModel.setTalkEnabled(true)
+          } else {
+            viewModel.setTalkEnabled(false)
+          }
+        },
+        icon = {
+          val tint = if (talkEnabled) MaterialTheme.colorScheme.primary else LocalContentColor.current
+          Icon(
+            Icons.Default.RecordVoiceOver,
+            contentDescription = "Talk Mode",
+            tint = tint,
+          )
+        },
+      )
+
       OverlayIconButton(
         onClick = { sheet = Sheet.Settings },
         icon = { Icon(Icons.Default.Settings, contentDescription = "Settings") },
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/SettingsSheet.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/SettingsSheet.kt
index 2ec4a7119..c7d011892 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/SettingsSheet.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/SettingsSheet.kt
@@ -62,8 +62,6 @@ fun SettingsSheet(viewModel: MainViewModel) {
   val wakeWords by viewModel.wakeWords.collectAsState()
   val voiceWakeMode by viewModel.voiceWakeMode.collectAsState()
   val voiceWakeStatusText by viewModel.voiceWakeStatusText.collectAsState()
-  val talkEnabled by viewModel.talkEnabled.collectAsState()
-  val talkStatusText by viewModel.talkStatusText.collectAsState()
   val isConnected by viewModel.isConnected.collectAsState()
   val manualEnabled by viewModel.manualEnabled.collectAsState()
   val manualHost by viewModel.manualHost.collectAsState()
@@ -309,28 +307,6 @@ fun SettingsSheet(viewModel: MainViewModel) {
 
     // Voice
     item { Text("Voice", style = MaterialTheme.typography.titleSmall) }
-    item {
-      ListItem(
-        headlineContent = { Text("Talk Mode") },
-        supportingContent = { Text(talkStatusText) },
-        trailingContent = {
-          Switch(
-            checked = talkEnabled,
-            onCheckedChange = { on ->
-              if (on) {
-                val micOk =
-                  ContextCompat.checkSelfPermission(context, Manifest.permission.RECORD_AUDIO) ==
-                    PackageManager.PERMISSION_GRANTED
-                if (!micOk) audioPermissionLauncher.launch(Manifest.permission.RECORD_AUDIO)
-                viewModel.setTalkEnabled(true)
-              } else {
-                viewModel.setTalkEnabled(false)
-              }
-            },
-          )
-        },
-      )
-    }
     item {
       val enabled = voiceWakeMode != VoiceWakeMode.Off
       ListItem(
diff --git a/apps/ios/Sources/RootCanvas.swift b/apps/ios/Sources/RootCanvas.swift
index b55f84cc1..910d96a3d 100644
--- a/apps/ios/Sources/RootCanvas.swift
+++ b/apps/ios/Sources/RootCanvas.swift
@@ -120,6 +120,8 @@ struct RootCanvas: View {
 
 private struct CanvasContent: View {
     @Environment(NodeAppModel.self) private var appModel
+    @AppStorage("talk.enabled") private var talkEnabled: Bool = false
+    @AppStorage("talk.button.enabled") private var talkButtonEnabled: Bool = true
     var systemColorScheme: ColorScheme
     var bridgeStatus: StatusPill.BridgeState
     var voiceWakeEnabled: Bool
@@ -141,6 +143,19 @@ private struct CanvasContent: View {
                 }
                 .accessibilityLabel("Chat")
 
+                if self.talkButtonEnabled {
+                    // Talk mode lives on a side bubble so it doesn't get buried in settings.
+                    OverlayButton(
+                        systemImage: self.appModel.talkMode.isEnabled ? "waveform.circle.fill" : "waveform.circle",
+                        brighten: self.brightenButtons)
+                    {
+                        let next = !self.appModel.talkMode.isEnabled
+                        self.talkEnabled = next
+                        self.appModel.setTalkEnabled(next)
+                    }
+                    .accessibilityLabel("Talk Mode")
+                }
+
                 OverlayButton(systemImage: "gearshape.fill", brighten: self.brightenButtons) {
                     self.openSettings()
                 }
diff --git a/apps/ios/Sources/Settings/SettingsTab.swift b/apps/ios/Sources/Settings/SettingsTab.swift
index 265b7069c..34b05dfc9 100644
--- a/apps/ios/Sources/Settings/SettingsTab.swift
+++ b/apps/ios/Sources/Settings/SettingsTab.swift
@@ -21,6 +21,7 @@ struct SettingsTab: View {
     @AppStorage("node.instanceId") private var instanceId: String = UUID().uuidString
     @AppStorage("voiceWake.enabled") private var voiceWakeEnabled: Bool = false
     @AppStorage("talk.enabled") private var talkEnabled: Bool = false
+    @AppStorage("talk.button.enabled") private var talkButtonEnabled: Bool = true
     @AppStorage("camera.enabled") private var cameraEnabled: Bool = true
     @AppStorage("screen.preventSleep") private var preventSleep: Bool = true
     @AppStorage("bridge.preferredStableID") private var preferredBridgeStableID: String = ""
@@ -161,6 +162,8 @@ struct SettingsTab: View {
                         .onChange(of: self.talkEnabled) { _, newValue in
                             self.appModel.setTalkEnabled(newValue)
                         }
+                    // Keep this separate so users can hide the side bubble without disabling Talk Mode.
+                    Toggle("Show Talk Button", isOn: self.$talkButtonEnabled)
 
                     NavigationLink {
                         VoiceWakeWordsSettingsView()

From 53eccc1c1ecd4fe8f71719bf10c8a9239cab370a Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 00:17:10 +0100
Subject: [PATCH 026/100] fix: wire talk menu + mac build

---
 AGENTS.md                                     |  1 +
 .../Sources/Clawdis/ConfigSettings.swift      | 23 ++++++++---
 .../Sources/Clawdis/MenuContentView.swift     | 20 ++++-----
 .../Sources/Clawdis/TalkAudioPlayer.swift     |  2 +-
 .../Sources/Clawdis/TalkModeRuntime.swift     | 41 ++++++++++---------
 5 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index 0abed7948..8226882d7 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -41,6 +41,7 @@
 - Also read the shared guardrails at `~/Projects/oracle/AGENTS.md` and `~/Projects/agent-scripts/AGENTS.MD` before making changes; align with any cross-repo rules noted there.
 - SwiftUI state management (iOS/macOS): prefer the `Observation` framework (`@Observable`, `@Bindable`) over `ObservableObject`/`@StateObject`; don’t introduce new `ObservableObject` unless required for compatibility, and migrate existing usages when touching related code.
 - **Restart apps:** “restart iOS/Android apps” means rebuild (recompile/install) and relaunch, not just kill/launch.
+- **Device checks:** before testing, verify connected real devices (iOS/Android) before reaching for simulators/emulators.
 - iOS Team ID lookup: `security find-identity -p codesigning -v` → use Apple Development (…) TEAMID. Fallback: `defaults read com.apple.dt.Xcode IDEProvisioningTeamIdentifiers`.
 - A2UI bundle hash: `src/canvas-host/a2ui/.bundle.hash` is auto-generated; regenerate via `pnpm canvas:a2ui:bundle` (or `scripts/bundle-a2ui.sh`) instead of manual conflict resolution.
 - Notary key file lives at `~/Library/CloudStorage/Dropbox/Backup/AppStore/AuthKey_NJF3NFGTS3.p8` (Sparkle keys live under `~/Library/CloudStorage/Dropbox/Backup/Sparkle`).
diff --git a/apps/macos/Sources/Clawdis/ConfigSettings.swift b/apps/macos/Sources/Clawdis/ConfigSettings.swift
index cbbf04d5a..7c0867d79 100644
--- a/apps/macos/Sources/Clawdis/ConfigSettings.swift
+++ b/apps/macos/Sources/Clawdis/ConfigSettings.swift
@@ -277,14 +277,25 @@ struct ConfigSettings: View {
                 GridRow {
                     self.gridLabel("Voice ID")
                     VStack(alignment: .leading, spacing: 6) {
-                        ComboBox("ElevenLabs voice ID", text: self.$talkVoiceId) {
-                            ForEach(self.talkVoiceSuggestions, id: \.self) { value in
-                                Text(value).tag(value)
+                        HStack(spacing: 8) {
+                            TextField("ElevenLabs voice ID", text: self.$talkVoiceId)
+                                .textFieldStyle(.roundedBorder)
+                                .frame(maxWidth: .infinity)
+                                .onChange(of: self.talkVoiceId) { _, _ in self.autosaveConfig() }
+                            if !self.talkVoiceSuggestions.isEmpty {
+                                Menu {
+                                    ForEach(self.talkVoiceSuggestions, id: \.self) { value in
+                                        Button(value) {
+                                            self.talkVoiceId = value
+                                            self.autosaveConfig()
+                                        }
+                                    }
+                                } label: {
+                                    Label("Suggestions", systemImage: "chevron.up.chevron.down")
+                                }
+                                .fixedSize()
                             }
                         }
-                        .textFieldStyle(.roundedBorder)
-                        .frame(maxWidth: .infinity)
-                        .onChange(of: self.talkVoiceId) { _, _ in self.autosaveConfig() }
                         Text("Defaults to ELEVENLABS_VOICE_ID / SAG_VOICE_ID if unset.")
                             .font(.footnote)
                             .foregroundStyle(.secondary)
diff --git a/apps/macos/Sources/Clawdis/MenuContentView.swift b/apps/macos/Sources/Clawdis/MenuContentView.swift
index dee70ed5d..e1453e5a2 100644
--- a/apps/macos/Sources/Clawdis/MenuContentView.swift
+++ b/apps/macos/Sources/Clawdis/MenuContentView.swift
@@ -80,11 +80,6 @@ struct MenuContent: View {
             if self.showVoiceWakeMicPicker {
                 self.voiceWakeMicMenu
             }
-            Toggle(isOn: self.talkBinding) {
-                Label("Talk", systemImage: "bubble.left.and.waveform")
-            }
-                .disabled(!voiceWakeSupported)
-                .opacity(voiceWakeSupported ? 1 : 0.5)
             Divider()
             Button {
                 Task { @MainActor in
@@ -115,6 +110,13 @@ struct MenuContent: View {
                         systemImage: "rectangle.inset.filled.on.rectangle")
                 }
             }
+            Button {
+                Task { await self.state.setTalkEnabled(!self.state.talkEnabled) }
+            } label: {
+                Label(self.state.talkEnabled ? "Stop Talk Mode" : "Talk Mode", systemImage: "bubble.left.and.waveform")
+            }
+            .disabled(!voiceWakeSupported)
+            .opacity(voiceWakeSupported ? 1 : 0.5)
             Divider()
             Button("Settings…") { self.open(tab: .general) }
                 .keyboardShortcut(",", modifiers: [.command])
@@ -344,14 +346,6 @@ struct MenuContent: View {
             })
     }
 
-    private var talkBinding: Binding<Bool> {
-        Binding(
-            get: { self.state.talkEnabled },
-            set: { newValue in
-                Task { await self.state.setTalkEnabled(newValue) }
-            })
-    }
-
     private var showVoiceWakeMicPicker: Bool {
         voiceWakeSupported && self.state.swabbleEnabled
     }
diff --git a/apps/macos/Sources/Clawdis/TalkAudioPlayer.swift b/apps/macos/Sources/Clawdis/TalkAudioPlayer.swift
index f72de1d02..b1df3886b 100644
--- a/apps/macos/Sources/Clawdis/TalkAudioPlayer.swift
+++ b/apps/macos/Sources/Clawdis/TalkAudioPlayer.swift
@@ -3,7 +3,7 @@ import Foundation
 import OSLog
 
 @MainActor
-final class TalkAudioPlayer: NSObject, AVAudioPlayerDelegate {
+final class TalkAudioPlayer: NSObject, @preconcurrency AVAudioPlayerDelegate {
     static let shared = TalkAudioPlayer()
 
     private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.tts")
diff --git a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
index 955d9ceda..3be350d9d 100644
--- a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
+++ b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
@@ -87,9 +87,9 @@ actor TalkModeRuntime {
 
     private struct RecognitionUpdate {
         let transcript: String?
-        let segments: [SFTranscriptionSegment]
+        let hasConfidence: Bool
         let isFinal: Bool
-        let error: Error?
+        let errorDescription: String?
         let generation: Int
     }
 
@@ -136,12 +136,13 @@ actor TalkModeRuntime {
 
         self.recognitionTask = recognizer.recognitionTask(with: request) { [weak self, generation] result, error in
             guard let self else { return }
+            let segments = result?.bestTranscription.segments ?? []
             let transcript = result?.bestTranscription.formattedString
             let update = RecognitionUpdate(
                 transcript: transcript,
-                segments: result?.bestTranscription.segments ?? [],
+                hasConfidence: segments.contains { $0.confidence > 0.6 },
                 isFinal: result?.isFinal ?? false,
-                error: error,
+                errorDescription: error?.localizedDescription,
                 generation: generation)
             Task { await self.handleRecognition(update) }
         }
@@ -161,14 +162,14 @@ actor TalkModeRuntime {
 
     private func handleRecognition(_ update: RecognitionUpdate) async {
         guard update.generation == self.recognitionGeneration else { return }
-        if let error = update.error {
-            self.logger.debug("talk recognition error: \(error.localizedDescription, privacy: .public)")
+        if let errorDescription = update.errorDescription {
+            self.logger.debug("talk recognition error: \(errorDescription, privacy: .public)")
         }
         guard let transcript = update.transcript else { return }
 
         let trimmed = transcript.trimmingCharacters(in: .whitespacesAndNewlines)
         if self.phase == .speaking, self.interruptOnSpeech {
-            if await self.shouldInterrupt(transcript: trimmed, segments: update.segments) {
+            if await self.shouldInterrupt(transcript: trimmed, hasConfidence: update.hasConfidence) {
                 await self.stopSpeaking(reason: .speech)
                 self.lastTranscript = ""
                 self.lastHeard = nil
@@ -194,11 +195,14 @@ actor TalkModeRuntime {
     private func startSilenceMonitor() {
         self.silenceTask?.cancel()
         self.silenceTask = Task { [weak self] in
-            guard let self else { return }
-            while self.isEnabled {
-                try? await Task.sleep(nanoseconds: 200_000_000)
-                await self.checkSilence()
-            }
+            await self?.silenceLoop()
+        }
+    }
+
+    private func silenceLoop() async {
+        while self.isEnabled {
+            try? await Task.sleep(nanoseconds: 200_000_000)
+            await self.checkSilence()
         }
     }
 
@@ -297,9 +301,9 @@ actor TalkModeRuntime {
     }
 
     private func waitForChatCompletion(runId: String, timeoutSeconds: Int) async -> ChatCompletionState {
-        await withTaskGroup(of: ChatCompletionState.self) { group in
+        let stream = await GatewayConnection.shared.subscribe()
+        return await withTaskGroup(of: ChatCompletionState.self) { group in
             group.addTask { [runId] in
-                let stream = GatewayConnection.shared.subscribe()
                 for await push in stream {
                     if case let .event(evt) = push, evt.event == "chat", let payload = evt.payload {
                         if let chat = try? JSONDecoder().decode(
@@ -332,13 +336,13 @@ actor TalkModeRuntime {
         do {
             let history = try await GatewayConnection.shared.chatHistory(sessionKey: sessionKey)
             let messages = history.messages ?? []
-            let decoded = messages.compactMap { item in
+            let decoded: [ClawdisChatMessage] = messages.compactMap { item in
                 guard let data = try? JSONEncoder().encode(item) else { return nil }
                 return try? JSONDecoder().decode(ClawdisChatMessage.self, from: data)
             }
             guard let assistant = decoded.last(where: { $0.role == "assistant" }) else { return nil }
             let text = assistant.content.compactMap { $0.text }.joined(separator: "\n")
-            let trimmed = text.trimmingCharacters(in: .whitespacesAndNewlines)
+            let trimmed = text.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
             return trimmed.isEmpty ? nil : trimmed
         } catch {
             self.logger.error("talk history fetch failed: \(error.localizedDescription, privacy: .public)")
@@ -418,7 +422,7 @@ actor TalkModeRuntime {
             let audio = try await ElevenLabsClient(apiKey: apiKey).synthesize(
                 voiceId: voiceId,
                 request: request)
-            let result = await MainActor.run { await TalkAudioPlayer.shared.play(data: audio) }
+            let result = await TalkAudioPlayer.shared.play(data: audio)
             if !result.finished, let interruptedAt = result.interruptedAt, self.phase == .speaking {
                 if self.interruptOnSpeech {
                     self.lastInterruptedAtSeconds = interruptedAt
@@ -533,7 +537,7 @@ actor TalkModeRuntime {
         return sqrt(sum / Double(frameCount))
     }
 
-    private func shouldInterrupt(transcript: String, segments: [SFTranscriptionSegment]) async -> Bool {
+    private func shouldInterrupt(transcript: String, hasConfidence: Bool) async -> Bool {
         let trimmed = transcript.trimmingCharacters(in: .whitespacesAndNewlines)
         guard trimmed.count >= 3 else { return false }
         if self.isLikelyEcho(of: trimmed) { return false }
@@ -541,7 +545,6 @@ actor TalkModeRuntime {
         if let lastSpeechEnergyAt, now.timeIntervalSince(lastSpeechEnergyAt) > 0.35 {
             return false
         }
-        let hasConfidence = segments.contains { $0.confidence > 0.6 }
         return hasConfidence
     }
 

From 39fccc36998a1152d801e6070f6afb6205e0b1b0 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 00:51:17 +0100
Subject: [PATCH 027/100] fix: talk overlay + elevenlabs defaults

---
 CHANGELOG.md                                  |   1 +
 .../Sources/Clawdis/ConfigSettings.swift      |  63 ++++++++++
 .../Sources/Clawdis/MenuContentView.swift     |   2 +-
 .../Sources/Clawdis/TalkModeRuntime.swift     | 112 +++++++++++++++--
 .../Sources/Clawdis/TalkOverlayView.swift     | 118 +++++++-----------
 5 files changed, 208 insertions(+), 88 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd94a3ce5..62c9357ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 ### Fixes
 - macOS: Voice Wake now fully tears down the Speech pipeline when disabled (cancel pending restarts, drop stale callbacks) to avoid high CPU in the background.
 - macOS menu: add a Talk Mode action alongside the Open Dashboard/Chat/Canvas entries.
+- macOS Talk Mode: orb overlay refresh, ElevenLabs request logging, API key status in settings, and auto-select first voice when none is configured.
 - iOS/Android nodes: enable scrolling for loaded web pages in the Canvas WebView (default scaffold stays touch-first).
 - macOS menu: device list now uses `node.list` (devices only; no agent/tool presence entries).
 - macOS menu: device list now shows connected nodes only.
diff --git a/apps/macos/Sources/Clawdis/ConfigSettings.swift b/apps/macos/Sources/Clawdis/ConfigSettings.swift
index 7c0867d79..eb22490c0 100644
--- a/apps/macos/Sources/Clawdis/ConfigSettings.swift
+++ b/apps/macos/Sources/Clawdis/ConfigSettings.swift
@@ -33,6 +33,7 @@ struct ConfigSettings: View {
     // Talk mode settings (stored in ~/.clawdis/clawdis.json under "talk")
     @State private var talkVoiceId: String = ""
     @State private var talkInterruptOnSpeech: Bool = true
+    @State private var talkApiKey: String = ""
 
     var body: some View {
         ScrollView { self.content }
@@ -301,6 +302,30 @@ struct ConfigSettings: View {
                             .foregroundStyle(.secondary)
                     }
                 }
+                GridRow {
+                    self.gridLabel("API key")
+                    VStack(alignment: .leading, spacing: 6) {
+                        HStack(spacing: 8) {
+                            SecureField("ELEVENLABS_API_KEY", text: self.$talkApiKey)
+                                .textFieldStyle(.roundedBorder)
+                                .frame(maxWidth: .infinity)
+                                .disabled(self.hasEnvApiKey)
+                                .onChange(of: self.talkApiKey) { _, _ in self.autosaveConfig() }
+                            if !self.hasEnvApiKey && !self.talkApiKey.isEmpty {
+                                Button("Clear") {
+                                    self.talkApiKey = ""
+                                    self.autosaveConfig()
+                                }
+                            }
+                        }
+                        self.statusLine(label: self.apiKeyStatusLabel, color: self.apiKeyStatusColor)
+                        if self.hasEnvApiKey {
+                            Text("Using ELEVENLABS_API_KEY from the environment.")
+                                .font(.footnote)
+                                .foregroundStyle(.secondary)
+                        }
+                    }
+                }
                 GridRow {
                     self.gridLabel("Interrupt")
                     Toggle("Stop speaking when you start talking", isOn: self.$talkInterruptOnSpeech)
@@ -319,6 +344,18 @@ struct ConfigSettings: View {
             .frame(width: self.labelColumnWidth, alignment: .leading)
     }
 
+    private func statusLine(label: String, color: Color) -> some View {
+        HStack(spacing: 6) {
+            Circle()
+                .fill(color)
+                .frame(width: 6, height: 6)
+            Text(label)
+                .font(.footnote)
+                .foregroundStyle(.secondary)
+        }
+        .padding(.top, 2)
+    }
+
     private func loadConfig() {
         let parsed = self.loadConfigDict()
         let agent = parsed["agent"] as? [String: Any]
@@ -348,6 +385,7 @@ struct ConfigSettings: View {
 
         if let talk {
             if let voice = talk["voiceId"] as? String { self.talkVoiceId = voice }
+            if let apiKey = talk["apiKey"] as? String { self.talkApiKey = apiKey }
             if let interrupt = talk["interruptOnSpeech"] as? Bool {
                 self.talkInterruptOnSpeech = interrupt
             }
@@ -399,6 +437,12 @@ struct ConfigSettings: View {
         } else {
             talk["voiceId"] = trimmedVoice
         }
+        let trimmedApiKey = self.talkApiKey.trimmingCharacters(in: .whitespacesAndNewlines)
+        if trimmedApiKey.isEmpty {
+            talk.removeValue(forKey: "apiKey")
+        } else {
+            talk["apiKey"] = trimmedApiKey
+        }
         talk["interruptOnSpeech"] = self.talkInterruptOnSpeech
         root["talk"] = talk
 
@@ -433,6 +477,25 @@ struct ConfigSettings: View {
             .filter { seen.insert($0).inserted }
     }
 
+    private var hasEnvApiKey: Bool {
+        let raw = ProcessInfo.processInfo.environment["ELEVENLABS_API_KEY"] ?? ""
+        return !raw.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+    }
+
+    private var apiKeyStatusLabel: String {
+        if self.hasEnvApiKey { return "ElevenLabs API key: found (environment)" }
+        if !self.talkApiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
+            return "ElevenLabs API key: stored in config"
+        }
+        return "ElevenLabs API key: missing"
+    }
+
+    private var apiKeyStatusColor: Color {
+        if self.hasEnvApiKey { return .green }
+        if !self.talkApiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty { return .green }
+        return .red
+    }
+
     private var browserPathLabel: String? {
         guard self.browserEnabled else { return nil }
 
diff --git a/apps/macos/Sources/Clawdis/MenuContentView.swift b/apps/macos/Sources/Clawdis/MenuContentView.swift
index e1453e5a2..c43986925 100644
--- a/apps/macos/Sources/Clawdis/MenuContentView.swift
+++ b/apps/macos/Sources/Clawdis/MenuContentView.swift
@@ -113,7 +113,7 @@ struct MenuContent: View {
             Button {
                 Task { await self.state.setTalkEnabled(!self.state.talkEnabled) }
             } label: {
-                Label(self.state.talkEnabled ? "Stop Talk Mode" : "Talk Mode", systemImage: "bubble.left.and.waveform")
+                Label(self.state.talkEnabled ? "Stop Talk Mode" : "Talk Mode", systemImage: "waveform.circle.fill")
             }
             .disabled(!voiceWakeSupported)
             .opacity(voiceWakeSupported ? 1 : 0.5)
diff --git a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
index 3be350d9d..0443e26ea 100644
--- a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
+++ b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
@@ -9,6 +9,7 @@ actor TalkModeRuntime {
     static let shared = TalkModeRuntime()
 
     private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.runtime")
+    private let ttsLogger = Logger(subsystem: "com.steipete.clawdis", category: "talk.tts")
 
     private var recognizer: SFSpeechRecognizer?
     private var audioEngine: AVAudioEngine?
@@ -36,6 +37,8 @@ actor TalkModeRuntime {
     private var interruptOnSpeech: Bool = true
     private var lastInterruptedAtSeconds: Double?
     private var lastSpokenText: String?
+    private var apiKey: String?
+    private var fallbackVoiceId: String?
 
     private let silenceWindow: TimeInterval = 0.7
     private let minSpeechRMS: Double = 1e-3
@@ -379,19 +382,17 @@ actor TalkModeRuntime {
             }
         }
 
-        let voiceId =
-            directive?.voiceId ??
-            self.currentVoiceId ??
-            self.defaultVoiceId
-
-        guard let voiceId, !voiceId.isEmpty else {
-            self.logger.error("talk missing voiceId; set talk.voiceId or ELEVENLABS_VOICE_ID")
+        guard let apiKey = self.apiKey, !apiKey.isEmpty else {
+            self.logger.error("talk missing ELEVENLABS_API_KEY")
             return
         }
 
-        let apiKey = ProcessInfo.processInfo.environment["ELEVENLABS_API_KEY"] ?? ""
-        if apiKey.isEmpty {
-            self.logger.error("talk missing ELEVENLABS_API_KEY")
+        let requestedVoice =
+            directive?.voiceId ??
+            self.currentVoiceId ??
+            self.defaultVoiceId
+        guard let voiceId = await self.resolveVoiceId(preferred: requestedVoice, apiKey: apiKey) else {
+            self.logger.error("talk missing voiceId; set talk.voiceId or ELEVENLABS_VOICE_ID")
             return
         }
 
@@ -419,7 +420,7 @@ actor TalkModeRuntime {
             language: Self.validatedLanguage(directive?.language, logger: self.logger))
 
         do {
-            let audio = try await ElevenLabsClient(apiKey: apiKey).synthesize(
+            let audio = try await ElevenLabsClient(apiKey: apiKey, logger: self.ttsLogger).synthesize(
                 voiceId: voiceId,
                 request: request)
             let result = await TalkAudioPlayer.shared.play(data: audio)
@@ -436,6 +437,33 @@ actor TalkModeRuntime {
         await MainActor.run { TalkModeController.shared.updatePhase(.thinking) }
     }
 
+    private func resolveVoiceId(preferred: String?, apiKey: String) async -> String? {
+        let trimmed = preferred?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        if !trimmed.isEmpty { return trimmed }
+        if let fallbackVoiceId { return fallbackVoiceId }
+
+        do {
+            let voices = try await ElevenLabsClient(apiKey: apiKey, logger: self.ttsLogger).listVoices()
+            guard let first = voices.first else {
+                self.ttsLogger.error("elevenlabs voices list empty")
+                return nil
+            }
+            self.fallbackVoiceId = first.voiceId
+            if self.defaultVoiceId == nil {
+                self.defaultVoiceId = first.voiceId
+            }
+            if !self.voiceOverrideActive {
+                self.currentVoiceId = first.voiceId
+            }
+            let name = first.name ?? "unknown"
+            self.ttsLogger.info("talk default voice selected \(name, privacy: .public) (\(first.voiceId, privacy: .public))")
+            return first.voiceId
+        } catch {
+            self.ttsLogger.error("elevenlabs list voices failed: \(error.localizedDescription, privacy: .public)")
+            return nil
+        }
+    }
+
     func stopSpeaking(reason: TalkStopReason) async {
         guard self.phase == .speaking else { return }
         let interruptedAt = await MainActor.run { TalkAudioPlayer.shared.stop() }
@@ -460,6 +488,7 @@ actor TalkModeRuntime {
         }
         self.defaultOutputFormat = cfg.outputFormat
         self.interruptOnSpeech = cfg.interruptOnSpeech
+        self.apiKey = cfg.apiKey
     }
 
     private struct TalkRuntimeConfig {
@@ -467,12 +496,14 @@ actor TalkModeRuntime {
         let modelId: String?
         let outputFormat: String?
         let interruptOnSpeech: Bool
+        let apiKey: String?
     }
 
     private func fetchTalkConfig() async -> TalkRuntimeConfig {
         let env = ProcessInfo.processInfo.environment
         let envVoice = env["ELEVENLABS_VOICE_ID"]?.trimmingCharacters(in: .whitespacesAndNewlines)
         let sagVoice = env["SAG_VOICE_ID"]?.trimmingCharacters(in: .whitespacesAndNewlines)
+        let envApiKey = env["ELEVENLABS_API_KEY"]?.trimmingCharacters(in: .whitespacesAndNewlines)
 
         do {
             let snap: ConfigSnapshot = try await GatewayConnection.shared.requestDecoded(
@@ -484,24 +515,31 @@ actor TalkModeRuntime {
             let model = talk?["modelId"]?.stringValue
             let outputFormat = talk?["outputFormat"]?.stringValue
             let interrupt = talk?["interruptOnSpeech"]?.boolValue
+            let apiKey = talk?["apiKey"]?.stringValue
             let resolvedVoice =
                 (voice?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false ? voice : nil) ??
                 (envVoice?.isEmpty == false ? envVoice : nil) ??
                 (sagVoice?.isEmpty == false ? sagVoice : nil)
+            let resolvedApiKey =
+                (envApiKey?.isEmpty == false ? envApiKey : nil) ??
+                (apiKey?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false ? apiKey : nil)
             return TalkRuntimeConfig(
                 voiceId: resolvedVoice,
                 modelId: model,
                 outputFormat: outputFormat,
-                interruptOnSpeech: interrupt ?? true)
+                interruptOnSpeech: interrupt ?? true,
+                apiKey: resolvedApiKey)
         } catch {
             let resolvedVoice =
                 (envVoice?.isEmpty == false ? envVoice : nil) ??
                 (sagVoice?.isEmpty == false ? sagVoice : nil)
+            let resolvedApiKey = envApiKey?.isEmpty == false ? envApiKey : nil
             return TalkRuntimeConfig(
                 voiceId: resolvedVoice,
                 modelId: nil,
                 outputFormat: nil,
-                interruptOnSpeech: true)
+                interruptOnSpeech: true,
+                apiKey: resolvedApiKey)
         }
     }
 
@@ -631,6 +669,7 @@ private struct ElevenLabsRequest {
 
 private struct ElevenLabsClient {
     let apiKey: String
+    let logger: Logger
     let baseUrl: URL = URL(string: "https://api.elevenlabs.io")!
 
     func synthesize(voiceId: String, request: ElevenLabsRequest) async throws -> Data {
@@ -639,6 +678,11 @@ private struct ElevenLabsClient {
         url.appendPathComponent("text-to-speech")
         url.appendPathComponent(voiceId)
 
+        let charCount = request.text.count
+        self.logger.info(
+            "elevenlabs tts request voice=\(voiceId, privacy: .public) model=\(request.modelId ?? "default", privacy: .public) chars=\(charCount, privacy: .public)")
+        let startedAt = Date()
+
         var payload: [String: Any] = [
             "text": request.text,
         ]
@@ -678,10 +722,52 @@ private struct ElevenLabsClient {
         let (data, response) = try await URLSession.shared.data(for: req)
         if let http = response as? HTTPURLResponse, http.statusCode >= 400 {
             let message = String(data: data, encoding: .utf8) ?? "unknown"
+            self.logger.error(
+                "elevenlabs tts failed status=\(http.statusCode, privacy: .public) message=\(message, privacy: .public)")
             throw NSError(domain: "TalkTTS", code: http.statusCode, userInfo: [
                 NSLocalizedDescriptionKey: "ElevenLabs failed: \(http.statusCode) \(message)",
             ])
         }
+        let elapsed = Date().timeIntervalSince(startedAt)
+        self.logger.info("elevenlabs tts ok bytes=\(data.count, privacy: .public) dur=\(elapsed, privacy: .public)s")
         return data
     }
+
+    func listVoices() async throws -> [ElevenLabsVoice] {
+        var url = self.baseUrl
+        url.appendPathComponent("v1")
+        url.appendPathComponent("voices")
+
+        self.logger.info("elevenlabs voices list request")
+        var req = URLRequest(url: url)
+        req.httpMethod = "GET"
+        req.setValue(self.apiKey, forHTTPHeaderField: "xi-api-key")
+
+        let (data, response) = try await URLSession.shared.data(for: req)
+        if let http = response as? HTTPURLResponse, http.statusCode >= 400 {
+            let message = String(data: data, encoding: .utf8) ?? "unknown"
+            self.logger.error(
+                "elevenlabs voices list failed status=\(http.statusCode, privacy: .public) message=\(message, privacy: .public)")
+            throw NSError(domain: "TalkTTS", code: http.statusCode, userInfo: [
+                NSLocalizedDescriptionKey: "ElevenLabs voices failed: \(http.statusCode) \(message)",
+            ])
+        }
+
+        let decoded = try JSONDecoder().decode(ElevenLabsVoicesResponse.self, from: data)
+        return decoded.voices
+    }
+}
+
+private struct ElevenLabsVoice: Decodable {
+    let voiceId: String
+    let name: String?
+
+    enum CodingKeys: String, CodingKey {
+        case voiceId = "voice_id"
+        case name
+    }
+}
+
+private struct ElevenLabsVoicesResponse: Decodable {
+    let voices: [ElevenLabsVoice]
 }
diff --git a/apps/macos/Sources/Clawdis/TalkOverlayView.swift b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
index 2f2be75ca..29d7a6914 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlayView.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
@@ -6,13 +6,13 @@ struct TalkOverlayView: View {
 
     var body: some View {
         ZStack(alignment: .topLeading) {
-            TalkCloudView(phase: self.controller.model.phase, level: self.controller.model.level)
-                .frame(width: 76, height: 64)
+            TalkOrbView(phase: self.controller.model.phase, level: self.controller.model.level)
+                .frame(width: 72, height: 72)
                 .contentShape(Rectangle())
                 .onTapGesture {
                     TalkModeController.shared.stopSpeaking(reason: .userTap)
                 }
-                .padding(8)
+                .padding(10)
 
             Button {
                 TalkModeController.shared.exitTalkMode()
@@ -33,107 +33,77 @@ struct TalkOverlayView: View {
     }
 }
 
-private struct TalkCloudView: View {
+private struct TalkOrbView: View {
     let phase: TalkModePhase
     let level: Double
 
     var body: some View {
         TimelineView(.animation) { context in
             let t = context.date.timeIntervalSinceReferenceDate
-            let pulse = phase == .speaking ? (1 + 0.04 * sin(t * 6)) : 1
-            let sink = phase == .thinking ? (3 + 2 * sin(t * 2)) : 0
-            let listenScale = phase == .listening ? (1 + CGFloat(self.level) * 0.14) : 1
-            let baseScale = phase == .thinking ? 0.94 : 1
+            let listenScale = phase == .listening ? (1 + CGFloat(self.level) * 0.12) : 1
+            let pulse = phase == .speaking ? (1 + 0.06 * sin(t * 6)) : 1
 
             ZStack {
-                CloudShape()
-                    .fill(self.cloudGradient)
-                    .overlay(
-                        CloudShape()
-                            .stroke(Color.white.opacity(0.35), lineWidth: 0.8))
-                    .shadow(color: Color.black.opacity(0.18), radius: 8, x: 0, y: 4)
-                    .scaleEffect(baseScale * pulse * listenScale)
-                    .offset(y: sink)
+                Circle()
+                    .fill(self.orbGradient)
+                    .overlay(Circle().stroke(Color.white.opacity(0.45), lineWidth: 1))
+                    .shadow(color: Color.black.opacity(0.22), radius: 10, x: 0, y: 5)
+                    .scaleEffect(pulse * listenScale)
 
-                if phase == .listening {
-                    Circle()
-                        .stroke(self.ringGradient, lineWidth: 1)
-                        .scaleEffect(1 + CGFloat(self.level) * 0.45)
-                        .opacity(0.3 + CGFloat(self.level) * 0.4)
-                        .animation(.easeOut(duration: 0.08), value: self.level)
-                }
+                TalkWaveRings(phase: phase, level: level, time: t)
 
                 if phase == .thinking {
-                    TalkThinkingDots(time: t)
-                        .offset(y: 18)
-                }
-
-                if phase == .speaking {
-                    TalkSpeakingRings(time: t)
+                    TalkOrbitArcs(time: t)
                 }
             }
         }
     }
 
-    private var cloudGradient: LinearGradient {
-        LinearGradient(
-            colors: [Color(red: 0.95, green: 0.98, blue: 1.0), Color(red: 0.75, green: 0.88, blue: 1.0)],
-            startPoint: .topLeading,
-            endPoint: .bottomTrailing)
-    }
-
-    private var ringGradient: LinearGradient {
-        LinearGradient(
-            colors: [Color.white.opacity(0.6), Color.white.opacity(0.1)],
-            startPoint: .top,
-            endPoint: .bottom)
+    private var orbGradient: RadialGradient {
+        RadialGradient(
+            colors: [Color.white, Color(red: 0.62, green: 0.88, blue: 1.0)],
+            center: .topLeading,
+            startRadius: 4,
+            endRadius: 52)
     }
 }
 
-private struct TalkThinkingDots: View {
-    let time: TimeInterval
-
-    var body: some View {
-        HStack(spacing: 4) {
-            ForEach(0..<3, id: \.self) { idx in
-                let phase = (time * 2 + Double(idx) * 0.45).truncatingRemainder(dividingBy: 1)
-                Circle()
-                    .fill(Color.white.opacity(0.75))
-                    .frame(width: 5, height: 5)
-                    .opacity(0.35 + 0.55 * phase)
-            }
-        }
-    }
-}
-
-private struct TalkSpeakingRings: View {
+private struct TalkWaveRings: View {
+    let phase: TalkModePhase
+    let level: Double
     let time: TimeInterval
 
     var body: some View {
         ZStack {
             ForEach(0..<3, id: \.self) { idx in
-                let phase = (time * 1.1 + Double(idx) / 3).truncatingRemainder(dividingBy: 1)
+                let speed = phase == .speaking ? 1.4 : phase == .listening ? 0.9 : 0.6
+                let progress = (time * speed + Double(idx) * 0.28).truncatingRemainder(dividingBy: 1)
+                let amplitude = phase == .speaking ? 0.95 : phase == .listening ? 0.5 + level * 0.7 : 0.35
+                let scale = 0.75 + progress * amplitude + (phase == .listening ? level * 0.15 : 0)
+                let alpha = phase == .speaking ? 0.55 : phase == .listening ? 0.45 + level * 0.25 : 0.28
                 Circle()
-                    .stroke(Color.white.opacity(0.6 - phase * 0.5), lineWidth: 1)
-                    .scaleEffect(0.8 + phase * 0.7)
-                    .opacity(0.6 - phase * 0.6)
+                    .stroke(Color.white.opacity(alpha - progress * 0.35), lineWidth: 1.2)
+                    .scaleEffect(scale)
+                    .opacity(alpha - progress * 0.6)
             }
         }
     }
 }
 
-private struct CloudShape: Shape {
-    func path(in rect: CGRect) -> Path {
-        let w = rect.width
-        let h = rect.height
-        let baseHeight = h * 0.44
-        let baseRect = CGRect(x: rect.minX, y: rect.minY + h * 0.46, width: w, height: baseHeight)
+private struct TalkOrbitArcs: View {
+    let time: TimeInterval
 
-        var path = Path()
-        path.addRoundedRect(in: baseRect, cornerSize: CGSize(width: baseHeight / 2, height: baseHeight / 2))
-        path.addEllipse(in: CGRect(x: rect.minX + w * 0.05, y: rect.minY + h * 0.28, width: w * 0.36, height: h * 0.36))
-        path.addEllipse(in: CGRect(x: rect.minX + w * 0.28, y: rect.minY + h * 0.05, width: w * 0.44, height: h * 0.44))
-        path.addEllipse(in: CGRect(x: rect.minX + w * 0.62, y: rect.minY + h * 0.3, width: w * 0.3, height: h * 0.3))
-        return path
+    var body: some View {
+        ZStack {
+            Circle()
+                .trim(from: 0.08, to: 0.26)
+                .stroke(Color.white.opacity(0.75), style: StrokeStyle(lineWidth: 1.4, lineCap: .round))
+                .rotationEffect(.degrees(time * 42))
+            Circle()
+                .trim(from: 0.62, to: 0.86)
+                .stroke(Color.white.opacity(0.55), style: StrokeStyle(lineWidth: 1.2, lineCap: .round))
+                .rotationEffect(.degrees(-time * 35))
+        }
+        .scaleEffect(1.05)
     }
 }

From 37f85bb2d118d8d2b503845bd6f44bc7bfb3b509 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 00:58:58 +0100
Subject: [PATCH 028/100] fix: expand talk overlay bounds

---
 apps/macos/Sources/Clawdis/TalkOverlay.swift     | 6 +++---
 apps/macos/Sources/Clawdis/TalkOverlayView.swift | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/macos/Sources/Clawdis/TalkOverlay.swift b/apps/macos/Sources/Clawdis/TalkOverlay.swift
index 63c9d5dce..59555a104 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlay.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlay.swift
@@ -20,9 +20,9 @@ final class TalkOverlayController {
     private var window: NSPanel?
     private var hostingView: NSHostingView<TalkOverlayView>?
 
-    private let width: CGFloat = 92
-    private let height: CGFloat = 92
-    private let padding: CGFloat = 8
+    private let width: CGFloat = 120
+    private let height: CGFloat = 120
+    private let padding: CGFloat = 6
 
     func present() {
         self.ensureWindow()
diff --git a/apps/macos/Sources/Clawdis/TalkOverlayView.swift b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
index 29d7a6914..f5484c439 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlayView.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
@@ -7,12 +7,12 @@ struct TalkOverlayView: View {
     var body: some View {
         ZStack(alignment: .topLeading) {
             TalkOrbView(phase: self.controller.model.phase, level: self.controller.model.level)
-                .frame(width: 72, height: 72)
+                .frame(width: 80, height: 80)
                 .contentShape(Rectangle())
                 .onTapGesture {
                     TalkModeController.shared.stopSpeaking(reason: .userTap)
                 }
-                .padding(10)
+                .padding(16)
 
             Button {
                 TalkModeController.shared.exitTalkMode()
@@ -29,7 +29,7 @@ struct TalkOverlayView: View {
             .padding(4)
             .onHover { self.hovering = $0 }
         }
-        .frame(width: 92, height: 92, alignment: .center)
+        .frame(width: 120, height: 120, alignment: .center)
     }
 }
 

From 7aabe73521d99ceb549ed222b4621658053ea189 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 00:59:30 +0100
Subject: [PATCH 029/100] chore: sync pending changes

---
 .../Sources/Screen/ScreenRecordService.swift  | 187 +++++++++---------
 1 file changed, 96 insertions(+), 91 deletions(-)

diff --git a/apps/ios/Sources/Screen/ScreenRecordService.swift b/apps/ios/Sources/Screen/ScreenRecordService.swift
index 861704310..b5d75b57d 100644
--- a/apps/ios/Sources/Screen/ScreenRecordService.swift
+++ b/apps/ios/Sources/Screen/ScreenRecordService.swift
@@ -68,114 +68,119 @@ final class ScreenRecordService: @unchecked Sendable {
         try? FileManager.default.removeItem(at: outURL)
 
         let state = CaptureState()
+        let recordQueue = DispatchQueue(label: "com.steipete.clawdis.screenrecord")
 
         try await withCheckedThrowingContinuation { (cont: CheckedContinuation<Void, Error>) in
             let handler: @Sendable (CMSampleBuffer, RPSampleBufferType, Error?) -> Void = { sample, type, error in
-                if let error {
-                    state.withLock { state in
-                        if state.handlerError == nil { state.handlerError = error }
-                    }
-                    return
-                }
-                guard CMSampleBufferDataIsReady(sample) else { return }
-
-                switch type {
-                case .video:
-                    let pts = CMSampleBufferGetPresentationTimeStamp(sample)
-                    let shouldSkip = state.withLock { state in
-                        if let lastVideoTime = state.lastVideoTime {
-                            let delta = CMTimeSubtract(pts, lastVideoTime)
-                            return delta.seconds < (1.0 / fpsValue)
+                // ReplayKit can call the capture handler on a background queue.
+                // Serialize writes to avoid queue asserts.
+                recordQueue.async {
+                    if let error {
+                        state.withLock { state in
+                            if state.handlerError == nil { state.handlerError = error }
                         }
-                        return false
+                        return
                     }
-                    if shouldSkip { return }
+                    guard CMSampleBufferDataIsReady(sample) else { return }
 
-                    if state.withLock({ $0.writer == nil }) {
-                        guard let imageBuffer = CMSampleBufferGetImageBuffer(sample) else {
-                            state.withLock { state in
-                                if state.handlerError == nil {
-                                    state.handlerError = ScreenRecordError.captureFailed("Missing image buffer")
-                                }
+                    switch type {
+                    case .video:
+                        let pts = CMSampleBufferGetPresentationTimeStamp(sample)
+                        let shouldSkip = state.withLock { state in
+                            if let lastVideoTime = state.lastVideoTime {
+                                let delta = CMTimeSubtract(pts, lastVideoTime)
+                                return delta.seconds < (1.0 / fpsValue)
                             }
-                            return
+                            return false
                         }
-                        let width = CVPixelBufferGetWidth(imageBuffer)
-                        let height = CVPixelBufferGetHeight(imageBuffer)
-                        do {
-                            let w = try AVAssetWriter(outputURL: outURL, fileType: .mp4)
-                            let settings: [String: Any] = [
-                                AVVideoCodecKey: AVVideoCodecType.h264,
-                                AVVideoWidthKey: width,
-                                AVVideoHeightKey: height,
-                            ]
-                            let vInput = AVAssetWriterInput(mediaType: .video, outputSettings: settings)
-                            vInput.expectsMediaDataInRealTime = true
-                            guard w.canAdd(vInput) else {
-                                throw ScreenRecordError.writeFailed("Cannot add video input")
-                            }
-                            w.add(vInput)
+                        if shouldSkip { return }
 
-                            if includeAudio {
-                                let aInput = AVAssetWriterInput(mediaType: .audio, outputSettings: nil)
-                                aInput.expectsMediaDataInRealTime = true
-                                if w.canAdd(aInput) {
-                                    w.add(aInput)
-                                    state.withLock { state in
-                                        state.audioInput = aInput
-                                    }
-                                }
-                            }
-
-                            guard w.startWriting() else {
-                                throw ScreenRecordError
-                                    .writeFailed(w.error?.localizedDescription ?? "Failed to start writer")
-                            }
-                            w.startSession(atSourceTime: pts)
-                            state.withLock { state in
-                                state.writer = w
-                                state.videoInput = vInput
-                                state.started = true
-                            }
-                        } catch {
-                            state.withLock { state in
-                                if state.handlerError == nil { state.handlerError = error }
-                            }
-                            return
-                        }
-                    }
-
-                    let vInput = state.withLock { $0.videoInput }
-                    let isStarted = state.withLock { $0.started }
-                    guard let vInput, isStarted else { return }
-                    if vInput.isReadyForMoreMediaData {
-                        if vInput.append(sample) {
-                            state.withLock { state in
-                                state.sawVideo = true
-                                state.lastVideoTime = pts
-                            }
-                        } else {
-                            let err = state.withLock { $0.writer?.error }
-                            if let err {
+                        if state.withLock({ $0.writer == nil }) {
+                            guard let imageBuffer = CMSampleBufferGetImageBuffer(sample) else {
                                 state.withLock { state in
                                     if state.handlerError == nil {
-                                        state.handlerError = ScreenRecordError.writeFailed(err.localizedDescription)
+                                        state.handlerError = ScreenRecordError.captureFailed("Missing image buffer")
+                                    }
+                                }
+                                return
+                            }
+                            let width = CVPixelBufferGetWidth(imageBuffer)
+                            let height = CVPixelBufferGetHeight(imageBuffer)
+                            do {
+                                let w = try AVAssetWriter(outputURL: outURL, fileType: .mp4)
+                                let settings: [String: Any] = [
+                                    AVVideoCodecKey: AVVideoCodecType.h264,
+                                    AVVideoWidthKey: width,
+                                    AVVideoHeightKey: height,
+                                ]
+                                let vInput = AVAssetWriterInput(mediaType: .video, outputSettings: settings)
+                                vInput.expectsMediaDataInRealTime = true
+                                guard w.canAdd(vInput) else {
+                                    throw ScreenRecordError.writeFailed("Cannot add video input")
+                                }
+                                w.add(vInput)
+
+                                if includeAudio {
+                                    let aInput = AVAssetWriterInput(mediaType: .audio, outputSettings: nil)
+                                    aInput.expectsMediaDataInRealTime = true
+                                    if w.canAdd(aInput) {
+                                        w.add(aInput)
+                                        state.withLock { state in
+                                            state.audioInput = aInput
+                                        }
+                                    }
+                                }
+
+                                guard w.startWriting() else {
+                                    throw ScreenRecordError
+                                        .writeFailed(w.error?.localizedDescription ?? "Failed to start writer")
+                                }
+                                w.startSession(atSourceTime: pts)
+                                state.withLock { state in
+                                    state.writer = w
+                                    state.videoInput = vInput
+                                    state.started = true
+                                }
+                            } catch {
+                                state.withLock { state in
+                                    if state.handlerError == nil { state.handlerError = error }
+                                }
+                                return
+                            }
+                        }
+
+                        let vInput = state.withLock { $0.videoInput }
+                        let isStarted = state.withLock { $0.started }
+                        guard let vInput, isStarted else { return }
+                        if vInput.isReadyForMoreMediaData {
+                            if vInput.append(sample) {
+                                state.withLock { state in
+                                    state.sawVideo = true
+                                    state.lastVideoTime = pts
+                                }
+                            } else {
+                                let err = state.withLock { $0.writer?.error }
+                                if let err {
+                                    state.withLock { state in
+                                        if state.handlerError == nil {
+                                            state.handlerError = ScreenRecordError.writeFailed(err.localizedDescription)
+                                        }
                                     }
                                 }
                             }
                         }
-                    }
 
-                case .audioApp, .audioMic:
-                    let aInput = state.withLock { $0.audioInput }
-                    let isStarted = state.withLock { $0.started }
-                    guard includeAudio, let aInput, isStarted else { return }
-                    if aInput.isReadyForMoreMediaData {
-                        _ = aInput.append(sample)
-                    }
+                    case .audioApp, .audioMic:
+                        let aInput = state.withLock { $0.audioInput }
+                        let isStarted = state.withLock { $0.started }
+                        guard includeAudio, let aInput, isStarted else { return }
+                        if aInput.isReadyForMoreMediaData {
+                            _ = aInput.append(sample)
+                        }
 
-                @unknown default:
-                    break
+                    @unknown default:
+                        break
+                    }
                 }
             }
 

From 10e1e7fd4481255290bc5501f1c7de87aed2ea31 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 00:15:57 +0000
Subject: [PATCH 030/100] chore: apply biome formatting

---
 src/agents/tool-images.ts  |  9 +++++++--
 src/web/auto-reply.test.ts | 36 +++++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/agents/tool-images.ts b/src/agents/tool-images.ts
index 167470ad7..5182d5f3c 100644
--- a/src/agents/tool-images.ts
+++ b/src/agents/tool-images.ts
@@ -60,7 +60,10 @@ async function resizeImageBase64IfNeeded(params: {
   }
 
   const qualities = [85, 75, 65, 55, 45, 35];
-  const sideStart = maxDim > 0 ? Math.min(params.maxDimensionPx, maxDim) : params.maxDimensionPx;
+  const sideStart =
+    maxDim > 0
+      ? Math.min(params.maxDimensionPx, maxDim)
+      : params.maxDimensionPx;
   const sideGrid = [sideStart, 1800, 1600, 1400, 1200, 1000, 800]
     .map((v) => Math.min(params.maxDimensionPx, v))
     .filter((v, i, arr) => v > 0 && arr.indexOf(v) === i)
@@ -91,7 +94,9 @@ async function resizeImageBase64IfNeeded(params: {
   const best = smallest?.buffer ?? buf;
   const maxMb = (params.maxBytes / (1024 * 1024)).toFixed(0);
   const gotMb = (best.byteLength / (1024 * 1024)).toFixed(2);
-  throw new Error(`Image could not be reduced below ${maxMb}MB (got ${gotMb}MB)`);
+  throw new Error(
+    `Image could not be reduced below ${maxMb}MB (got ${gotMb}MB)`,
+  );
 }
 
 export async function sanitizeContentBlocksImages(
diff --git a/src/web/auto-reply.test.ts b/src/web/auto-reply.test.ts
index 8edf2dcf7..271ccceec 100644
--- a/src/web/auto-reply.test.ts
+++ b/src/web/auto-reply.test.ts
@@ -318,23 +318,25 @@ describe("web auto-reply", () => {
     let capturedOnMessage:
       | ((msg: import("./inbound.js").WebInboundMessage) => Promise<void>)
       | undefined;
-    const listenerFactory = vi.fn(async (opts: {
-      onMessage: (
-        msg: import("./inbound.js").WebInboundMessage,
-      ) => Promise<void>;
-    }) => {
-      capturedOnMessage = opts.onMessage;
-      let resolveClose: (reason: unknown) => void = () => {};
-      const onClose = new Promise<unknown>((res) => {
-        resolveClose = res;
-        closeResolvers.push(res);
-      });
-      return {
-        close: vi.fn(),
-        onClose,
-        signalClose: (reason?: unknown) => resolveClose(reason),
-      };
-    });
+    const listenerFactory = vi.fn(
+      async (opts: {
+        onMessage: (
+          msg: import("./inbound.js").WebInboundMessage,
+        ) => Promise<void>;
+      }) => {
+        capturedOnMessage = opts.onMessage;
+        let resolveClose: (reason: unknown) => void = () => {};
+        const onClose = new Promise<unknown>((res) => {
+          resolveClose = res;
+          closeResolvers.push(res);
+        });
+        return {
+          close: vi.fn(),
+          onClose,
+          signalClose: (reason?: unknown) => resolveClose(reason),
+        };
+      },
+    );
     const runtime = {
       log: vi.fn(),
       error: vi.fn(),

From 02db68aa6711d2338d26d57cf714eb8ee2194bab Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 01:40:51 +0100
Subject: [PATCH 031/100] fix(macos): hide Restart Gateway when remote

---
 CHANGELOG.md                                  |  1 +
 .../Sources/Clawdis/CommandResolver.swift     | 46 +++++++++++++------
 .../macos/Sources/Clawdis/DebugSettings.swift | 18 ++++++--
 .../Sources/Clawdis/MenuContentView.swift     | 10 ++--
 .../Sources/Clawdis/SettingsRootView.swift    |  2 +-
 .../CommandResolverTests.swift                | 13 ++++--
 .../ConnectionsSettingsSmokeTests.swift       |  6 ++-
 7 files changed, 67 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62c9357ac..8f8317f04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 ### Fixes
 - macOS: Voice Wake now fully tears down the Speech pipeline when disabled (cancel pending restarts, drop stale callbacks) to avoid high CPU in the background.
 - macOS menu: add a Talk Mode action alongside the Open Dashboard/Chat/Canvas entries.
+- macOS Debug: hide “Restart Gateway” when the app won’t start a local gateway (remote mode / attach-only).
 - macOS Talk Mode: orb overlay refresh, ElevenLabs request logging, API key status in settings, and auto-select first voice when none is configured.
 - iOS/Android nodes: enable scrolling for loaded web pages in the Canvas WebView (default scaffold stays touch-first).
 - macOS menu: device list now uses `node.list` (devices only; no agent/tool presence entries).
diff --git a/apps/macos/Sources/Clawdis/CommandResolver.swift b/apps/macos/Sources/Clawdis/CommandResolver.swift
index d418cd5e0..2e8b5c6ce 100644
--- a/apps/macos/Sources/Clawdis/CommandResolver.swift
+++ b/apps/macos/Sources/Clawdis/CommandResolver.swift
@@ -16,6 +16,10 @@ enum CommandResolver {
         RuntimeLocator.resolve(searchPaths: self.preferredPaths())
     }
 
+    static func runtimeResolution(searchPaths: [String]?) -> Result<RuntimeResolution, RuntimeResolutionError> {
+        RuntimeLocator.resolve(searchPaths: searchPaths ?? self.preferredPaths())
+    }
+
     static func makeRuntimeCommand(
         runtime: RuntimeResolution,
         entrypoint: String,
@@ -152,8 +156,8 @@ enum CommandResolver {
         return paths
     }
 
-    static func findExecutable(named name: String) -> String? {
-        for dir in self.preferredPaths() {
+    static func findExecutable(named name: String, searchPaths: [String]? = nil) -> String? {
+        for dir in (searchPaths ?? self.preferredPaths()) {
             let candidate = (dir as NSString).appendingPathComponent(name)
             if FileManager.default.isExecutableFile(atPath: candidate) {
                 return candidate
@@ -162,8 +166,14 @@ enum CommandResolver {
         return nil
     }
 
-    static func clawdisExecutable() -> String? {
-        self.findExecutable(named: self.helperName)
+    static func clawdisExecutable(searchPaths: [String]? = nil) -> String? {
+        self.findExecutable(named: self.helperName, searchPaths: searchPaths)
+    }
+
+    static func projectClawdisExecutable(projectRoot: URL? = nil) -> String? {
+        let root = projectRoot ?? self.projectRoot()
+        let candidate = root.appendingPathComponent("node_modules/.bin").appendingPathComponent(self.helperName).path
+        return FileManager.default.isExecutableFile(atPath: candidate) ? candidate : nil
     }
 
     static func nodeCliPath() -> String? {
@@ -171,17 +181,18 @@ enum CommandResolver {
         return FileManager.default.isReadableFile(atPath: candidate) ? candidate : nil
     }
 
-    static func hasAnyClawdisInvoker() -> Bool {
-        if self.clawdisExecutable() != nil { return true }
-        if self.findExecutable(named: "pnpm") != nil { return true }
-        if self.findExecutable(named: "node") != nil, self.nodeCliPath() != nil { return true }
+    static func hasAnyClawdisInvoker(searchPaths: [String]? = nil) -> Bool {
+        if self.clawdisExecutable(searchPaths: searchPaths) != nil { return true }
+        if self.findExecutable(named: "pnpm", searchPaths: searchPaths) != nil { return true }
+        if self.findExecutable(named: "node", searchPaths: searchPaths) != nil, self.nodeCliPath() != nil { return true }
         return false
     }
 
     static func clawdisNodeCommand(
         subcommand: String,
         extraArgs: [String] = [],
-        defaults: UserDefaults = .standard) -> [String]
+        defaults: UserDefaults = .standard,
+        searchPaths: [String]? = nil) -> [String]
     {
         let settings = self.connectionSettings(defaults: defaults)
         if settings.mode == .remote, let ssh = self.sshNodeCommand(
@@ -192,25 +203,29 @@ enum CommandResolver {
             return ssh
         }
 
-        let runtimeResult = self.runtimeResolution()
+        let runtimeResult = self.runtimeResolution(searchPaths: searchPaths)
 
         switch runtimeResult {
         case let .success(runtime):
-            if let clawdisPath = self.clawdisExecutable() {
+            let root = self.projectRoot()
+            if let clawdisPath = self.projectClawdisExecutable(projectRoot: root) {
                 return [clawdisPath, subcommand] + extraArgs
             }
 
-            if let entry = self.gatewayEntrypoint(in: self.projectRoot()) {
+            if let entry = self.gatewayEntrypoint(in: root) {
                 return self.makeRuntimeCommand(
                     runtime: runtime,
                     entrypoint: entry,
                     subcommand: subcommand,
                     extraArgs: extraArgs)
             }
-            if let pnpm = self.findExecutable(named: "pnpm") {
+            if let pnpm = self.findExecutable(named: "pnpm", searchPaths: searchPaths) {
                 // Use --silent to avoid pnpm lifecycle banners that would corrupt JSON outputs.
                 return [pnpm, "--silent", "clawdis", subcommand] + extraArgs
             }
+            if let clawdisPath = self.clawdisExecutable(searchPaths: searchPaths) {
+                return [clawdisPath, subcommand] + extraArgs
+            }
 
             let missingEntry = """
             clawdis entrypoint missing (looked for dist/index.js or bin/clawdis.js); run pnpm build.
@@ -226,9 +241,10 @@ enum CommandResolver {
     static func clawdisCommand(
         subcommand: String,
         extraArgs: [String] = [],
-        defaults: UserDefaults = .standard) -> [String]
+        defaults: UserDefaults = .standard,
+        searchPaths: [String]? = nil) -> [String]
     {
-        self.clawdisNodeCommand(subcommand: subcommand, extraArgs: extraArgs, defaults: defaults)
+        self.clawdisNodeCommand(subcommand: subcommand, extraArgs: extraArgs, defaults: defaults, searchPaths: searchPaths)
     }
 
     // MARK: - SSH helpers
diff --git a/apps/macos/Sources/Clawdis/DebugSettings.swift b/apps/macos/Sources/Clawdis/DebugSettings.swift
index a730d5ef1..a30cf917a 100644
--- a/apps/macos/Sources/Clawdis/DebugSettings.swift
+++ b/apps/macos/Sources/Clawdis/DebugSettings.swift
@@ -1,8 +1,10 @@
 import AppKit
+import Observation
 import SwiftUI
 import UniformTypeIdentifiers
 
 struct DebugSettings: View {
+    @Bindable var state: AppState
     private let isPreview = ProcessInfo.processInfo.isPreview
     private let labelColumnWidth: CGFloat = 140
     @AppStorage(modelCatalogPathKey) private var modelCatalogPath: String = ModelCatalogLoader.defaultPath
@@ -36,6 +38,10 @@ struct DebugSettings: View {
     @State private var canvasEvalResult: String?
     @State private var canvasSnapshotPath: String?
 
+    init(state: AppState = AppStateStore.shared) {
+        self.state = state
+    }
+
     var body: some View {
         ScrollView(.vertical) {
             VStack(alignment: .leading, spacing: 14) {
@@ -194,7 +200,9 @@ struct DebugSettings: View {
                     .overlay(RoundedRectangle(cornerRadius: 6).stroke(Color.secondary.opacity(0.2)))
 
                     HStack(spacing: 8) {
-                        Button("Restart Gateway") { DebugActions.restartGateway() }
+                        if self.canRestartGateway {
+                            Button("Restart Gateway") { DebugActions.restartGateway() }
+                        }
                         Button("Clear log") { GatewayProcessManager.shared.clearLog() }
                         Spacer(minLength: 0)
                     }
@@ -762,6 +770,10 @@ struct DebugSettings: View {
         CommandResolver.connectionSettings().mode == .remote
     }
 
+    private var canRestartGateway: Bool {
+        self.state.connectionMode == .local && !self.attachExistingGatewayOnly
+    }
+
     private func configURL() -> URL {
         FileManager.default.homeDirectoryForCurrentUser
             .appendingPathComponent(".clawdis")
@@ -902,7 +914,7 @@ private struct PlainSettingsGroupBoxStyle: GroupBoxStyle {
 #if DEBUG
 struct DebugSettings_Previews: PreviewProvider {
     static var previews: some View {
-        DebugSettings()
+        DebugSettings(state: .preview)
             .frame(width: SettingsTab.windowWidth, height: SettingsTab.windowHeight)
     }
 }
@@ -910,7 +922,7 @@ struct DebugSettings_Previews: PreviewProvider {
 @MainActor
 extension DebugSettings {
     static func exerciseForTesting() async {
-        let view = DebugSettings()
+        let view = DebugSettings(state: .preview)
         view.modelsCount = 3
         view.modelsLoading = false
         view.modelsError = "Failed to load models"
diff --git a/apps/macos/Sources/Clawdis/MenuContentView.swift b/apps/macos/Sources/Clawdis/MenuContentView.swift
index c43986925..7cb1d420b 100644
--- a/apps/macos/Sources/Clawdis/MenuContentView.swift
+++ b/apps/macos/Sources/Clawdis/MenuContentView.swift
@@ -209,10 +209,12 @@ struct MenuContent: View {
                     Label("Send Test Notification", systemImage: "bell")
                 }
                 Divider()
-                Button {
-                    DebugActions.restartGateway()
-                } label: {
-                    Label("Restart Gateway", systemImage: "arrow.clockwise")
+                if self.state.connectionMode == .local, !AppStateStore.attachExistingGatewayOnly {
+                    Button {
+                        DebugActions.restartGateway()
+                    } label: {
+                        Label("Restart Gateway", systemImage: "arrow.clockwise")
+                    }
                 }
                 Button {
                     DebugActions.restartApp()
diff --git a/apps/macos/Sources/Clawdis/SettingsRootView.swift b/apps/macos/Sources/Clawdis/SettingsRootView.swift
index 9ede06efb..8cfd39ae5 100644
--- a/apps/macos/Sources/Clawdis/SettingsRootView.swift
+++ b/apps/macos/Sources/Clawdis/SettingsRootView.swift
@@ -57,7 +57,7 @@ struct SettingsRootView: View {
                 .tag(SettingsTab.permissions)
 
             if self.state.debugPaneEnabled {
-                DebugSettings()
+                DebugSettings(state: self.state)
                     .tabItem { Label("Debug", systemImage: "ant") }
                     .tag(SettingsTab.debug)
             }
diff --git a/apps/macos/Tests/ClawdisIPCTests/CommandResolverTests.swift b/apps/macos/Tests/ClawdisIPCTests/CommandResolverTests.swift
index f0a543a87..9a4a650aa 100644
--- a/apps/macos/Tests/ClawdisIPCTests/CommandResolverTests.swift
+++ b/apps/macos/Tests/ClawdisIPCTests/CommandResolverTests.swift
@@ -52,12 +52,17 @@ import Testing
         try FileManager.default.setAttributes([.posixPermissions: 0o755], ofItemAtPath: nodePath.path)
         try self.makeExec(at: scriptPath)
 
-        let cmd = CommandResolver.clawdisCommand(subcommand: "rpc", defaults: defaults)
+        let cmd = CommandResolver.clawdisCommand(
+            subcommand: "rpc",
+            defaults: defaults,
+            searchPaths: [tmp.appendingPathComponent("node_modules/.bin").path])
 
         #expect(cmd.count >= 3)
-        #expect(cmd[0] == nodePath.path)
-        #expect(cmd[1] == scriptPath.path)
-        #expect(cmd[2] == "rpc")
+        if cmd.count >= 3 {
+            #expect(cmd[0] == nodePath.path)
+            #expect(cmd[1] == scriptPath.path)
+            #expect(cmd[2] == "rpc")
+        }
     }
 
     @Test func fallsBackToPnpm() async throws {
diff --git a/apps/macos/Tests/ClawdisIPCTests/ConnectionsSettingsSmokeTests.swift b/apps/macos/Tests/ClawdisIPCTests/ConnectionsSettingsSmokeTests.swift
index 4941b0524..a9ba93a5f 100644
--- a/apps/macos/Tests/ClawdisIPCTests/ConnectionsSettingsSmokeTests.swift
+++ b/apps/macos/Tests/ClawdisIPCTests/ConnectionsSettingsSmokeTests.swift
@@ -43,7 +43,8 @@ struct ConnectionsSettingsSmokeTests {
                     elapsedMs: 120,
                     bot: ProvidersStatusSnapshot.TelegramBot(id: 123, username: "clawdisbot"),
                     webhook: ProvidersStatusSnapshot.TelegramWebhook(url: "https://example.com/hook", hasCustomCert: false)),
-                lastProbeAt: 1_700_000_050_000))
+                lastProbeAt: 1_700_000_050_000),
+            discord: nil)
 
         store.whatsappLoginMessage = "Scan QR"
         store.whatsappLoginQrDataUrl =
@@ -92,7 +93,8 @@ struct ConnectionsSettingsSmokeTests {
                     elapsedMs: 120,
                     bot: nil,
                     webhook: nil),
-                lastProbeAt: 1_700_000_100_000))
+                lastProbeAt: 1_700_000_100_000),
+            discord: nil)
 
         let view = ConnectionsSettings(store: store)
         _ = view.body

From e119a823345f8c73770b9d8f354e423012d4deba Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 01:57:45 +0100
Subject: [PATCH 032/100] feat: talk mode key distribution and tts polling

---
 CHANGELOG.md                                  |  2 +
 .../clawdis/node/voice/TalkModeManager.kt     | 35 +++++++++++--
 apps/ios/Sources/Voice/TalkModeManager.swift  | 34 +++++++++++--
 apps/macos/Sources/Clawdis/AppState.swift     | 12 ++++-
 .../Sources/Clawdis/ConfigSettings.swift      | 22 +++++++++
 .../Sources/Clawdis/GatewayConnection.swift   |  7 +++
 .../Sources/Clawdis/TalkModeController.swift  |  1 +
 .../Sources/Clawdis/TalkModeRuntime.swift     | 32 ++++++++++--
 apps/macos/Sources/Clawdis/TalkOverlay.swift  |  6 +--
 .../Sources/Clawdis/TalkOverlayView.swift     | 17 ++++---
 docs/configuration.md                         |  2 +
 docs/talk.md                                  |  2 +
 src/config/config.test.ts                     | 47 ++++++++++++++++++
 src/config/config.ts                          | 49 ++++++++++++++++++-
 src/gateway/protocol/index.ts                 |  5 ++
 src/gateway/protocol/schema.ts                | 10 ++++
 src/gateway/server.ts                         | 44 +++++++++++++++++
 17 files changed, 303 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f8317f04..97643cee5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@
 - macOS menu: add a Talk Mode action alongside the Open Dashboard/Chat/Canvas entries.
 - macOS Debug: hide “Restart Gateway” when the app won’t start a local gateway (remote mode / attach-only).
 - macOS Talk Mode: orb overlay refresh, ElevenLabs request logging, API key status in settings, and auto-select first voice when none is configured.
+- Talk Mode: wait for chat history to surface the assistant reply before starting TTS (macOS/iOS/Android).
+- Gateway config: inject `talk.apiKey` from `ELEVENLABS_API_KEY`/shell profile so nodes can fetch it on demand.
 - iOS/Android nodes: enable scrolling for loaded web pages in the Canvas WebView (default scaffold stays touch-first).
 - macOS menu: device list now uses `node.list` (devices only; no agent/tool presence entries).
 - macOS menu: device list now shows connected nodes only.
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
index 920466739..5cad01140 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
@@ -76,6 +76,7 @@ class TalkModeManager(
   private var defaultModelId: String? = null
   private var currentModelId: String? = null
   private var defaultOutputFormat: String? = null
+  private var apiKey: String? = null
   private var interruptOnSpeech: Boolean = true
   private var voiceOverrideActive = false
   private var modelOverrideActive = false
@@ -268,6 +269,7 @@ class TalkModeManager(
     }
 
     try {
+      val startedAt = System.currentTimeMillis().toDouble() / 1000.0
       val runId = sendChat(prompt, bridge)
       val ok = waitForChatFinal(runId)
       if (!ok) {
@@ -275,7 +277,7 @@ class TalkModeManager(
         start()
         return
       }
-      val assistant = fetchLatestAssistantText(bridge)
+      val assistant = waitForAssistantText(bridge, startedAt, 12_000)
       if (assistant.isNullOrBlank()) {
         _statusText.value = "No reply"
         start()
@@ -345,13 +347,34 @@ class TalkModeManager(
     return result
   }
 
-  private suspend fun fetchLatestAssistantText(bridge: BridgeSession): String? {
+  private suspend fun waitForAssistantText(
+    bridge: BridgeSession,
+    sinceSeconds: Double,
+    timeoutMs: Long,
+  ): String? {
+    val deadline = SystemClock.elapsedRealtime() + timeoutMs
+    while (SystemClock.elapsedRealtime() < deadline) {
+      val text = fetchLatestAssistantText(bridge, sinceSeconds)
+      if (!text.isNullOrBlank()) return text
+      delay(300)
+    }
+    return null
+  }
+
+  private suspend fun fetchLatestAssistantText(
+    bridge: BridgeSession,
+    sinceSeconds: Double? = null,
+  ): String? {
     val res = bridge.request("chat.history", "{\"sessionKey\":\"main\"}")
     val root = json.parseToJsonElement(res).asObjectOrNull() ?: return null
     val messages = root["messages"] as? JsonArray ?: return null
     for (item in messages.reversed()) {
       val obj = item.asObjectOrNull() ?: continue
       if (obj["role"].asStringOrNull() != "assistant") continue
+      if (sinceSeconds != null) {
+        val timestamp = obj["timestamp"].asDoubleOrNull()
+        if (timestamp != null && timestamp < sinceSeconds - 0.5) continue
+      }
       val content = obj["content"] as? JsonArray ?: continue
       val text =
         content.mapNotNull { entry ->
@@ -390,7 +413,9 @@ class TalkModeManager(
       return
     }
 
-    val apiKey = System.getenv("ELEVENLABS_API_KEY")?.trim()
+    val apiKey =
+      apiKey?.trim()?.takeIf { it.isNotEmpty() }
+        ?: System.getenv("ELEVENLABS_API_KEY")?.trim()
     if (apiKey.isNullOrEmpty()) {
       _statusText.value = "Missing ELEVENLABS_API_KEY"
       return
@@ -495,6 +520,7 @@ class TalkModeManager(
     val bridge = session ?: return
     val envVoice = System.getenv("ELEVENLABS_VOICE_ID")?.trim()
     val sagVoice = System.getenv("SAG_VOICE_ID")?.trim()
+    val envKey = System.getenv("ELEVENLABS_API_KEY")?.trim()
     try {
       val res = bridge.request("config.get", "{}")
       val root = json.parseToJsonElement(res).asObjectOrNull()
@@ -503,6 +529,7 @@ class TalkModeManager(
       val voice = talk?.get("voiceId")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() }
       val model = talk?.get("modelId")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() }
       val outputFormat = talk?.get("outputFormat")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() }
+      val key = talk?.get("apiKey")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() }
       val interrupt = talk?.get("interruptOnSpeech")?.asBooleanOrNull()
 
       defaultVoiceId = voice ?: envVoice?.takeIf { it.isNotEmpty() } ?: sagVoice?.takeIf { it.isNotEmpty() }
@@ -510,9 +537,11 @@ class TalkModeManager(
       defaultModelId = model
       if (!modelOverrideActive) currentModelId = defaultModelId
       defaultOutputFormat = outputFormat
+      apiKey = key ?: envKey?.takeIf { it.isNotEmpty() }
       if (interrupt != null) interruptOnSpeech = interrupt
     } catch (_: Throwable) {
       defaultVoiceId = envVoice?.takeIf { it.isNotEmpty() } ?: sagVoice?.takeIf { it.isNotEmpty() }
+      apiKey = envKey?.takeIf { it.isNotEmpty() }
     }
   }
 
diff --git a/apps/ios/Sources/Voice/TalkModeManager.swift b/apps/ios/Sources/Voice/TalkModeManager.swift
index 82cd451c3..3766845b1 100644
--- a/apps/ios/Sources/Voice/TalkModeManager.swift
+++ b/apps/ios/Sources/Voice/TalkModeManager.swift
@@ -28,6 +28,7 @@ final class TalkModeManager: NSObject {
     private var defaultModelId: String?
     private var currentModelId: String?
     private var defaultOutputFormat: String?
+    private var apiKey: String?
     private var interruptOnSpeech: Bool = true
 
     private var bridge: BridgeSession?
@@ -189,6 +190,7 @@ final class TalkModeManager: NSObject {
         }
 
         do {
+            let startedAt = Date().timeIntervalSince1970
             let runId = try await self.sendChat(prompt, bridge: bridge)
             let ok = await self.waitForChatFinal(runId: runId, bridge: bridge)
             if !ok {
@@ -197,7 +199,11 @@ final class TalkModeManager: NSObject {
                 return
             }
 
-            guard let assistantText = try await self.fetchLatestAssistantText(bridge: bridge) else {
+            guard let assistantText = try await self.waitForAssistantText(
+                bridge: bridge,
+                since: startedAt,
+                timeoutSeconds: 12)
+            else {
                 self.statusText = "No reply"
                 await self.start()
                 return
@@ -259,7 +265,22 @@ final class TalkModeManager: NSObject {
         return false
     }
 
-    private func fetchLatestAssistantText(bridge: BridgeSession) async throws -> String? {
+    private func waitForAssistantText(
+        bridge: BridgeSession,
+        since: Double,
+        timeoutSeconds: Int) async throws -> String?
+    {
+        let deadline = Date().addingTimeInterval(TimeInterval(timeoutSeconds))
+        while Date() < deadline {
+            if let text = try await self.fetchLatestAssistantText(bridge: bridge, since: since) {
+                return text
+            }
+            try? await Task.sleep(nanoseconds: 300_000_000)
+        }
+        return nil
+    }
+
+    private func fetchLatestAssistantText(bridge: BridgeSession, since: Double? = nil) async throws -> String? {
         let res = try await bridge.request(
             method: "chat.history",
             paramsJSON: "{\"sessionKey\":\"main\"}",
@@ -268,6 +289,9 @@ final class TalkModeManager: NSObject {
         guard let messages = json["messages"] as? [[String: Any]] else { return nil }
         for msg in messages.reversed() {
             guard (msg["role"] as? String) == "assistant" else { continue }
+            if let since, let timestamp = msg["timestamp"] as? Double, timestamp < since - 0.5 {
+                continue
+            }
             guard let content = msg["content"] as? [[String: Any]] else { continue }
             let text = content.compactMap { $0["text"] as? String }.joined(separator: "\n")
             let trimmed = text.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -299,7 +323,10 @@ final class TalkModeManager: NSObject {
             return
         }
 
-        guard let apiKey = ProcessInfo.processInfo.environment["ELEVENLABS_API_KEY"], !apiKey.isEmpty else {
+        let resolvedKey =
+            (self.apiKey?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false ? self.apiKey : nil) ??
+            ProcessInfo.processInfo.environment["ELEVENLABS_API_KEY"]
+        guard let apiKey = resolvedKey, !apiKey.isEmpty else {
             self.statusText = "Missing ELEVENLABS_API_KEY"
             return
         }
@@ -375,6 +402,7 @@ final class TalkModeManager: NSObject {
             self.currentModelId = self.defaultModelId
             self.defaultOutputFormat = (talk?["outputFormat"] as? String)?
                 .trimmingCharacters(in: .whitespacesAndNewlines)
+            self.apiKey = (talk?["apiKey"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
             if let interrupt = talk?["interruptOnSpeech"] as? Bool {
                 self.interruptOnSpeech = interrupt
             }
diff --git a/apps/macos/Sources/Clawdis/AppState.swift b/apps/macos/Sources/Clawdis/AppState.swift
index 94e20538a..c73383241 100644
--- a/apps/macos/Sources/Clawdis/AppState.swift
+++ b/apps/macos/Sources/Clawdis/AppState.swift
@@ -329,18 +329,26 @@ final class AppState {
     func setTalkEnabled(_ enabled: Bool) async {
         guard voiceWakeSupported else {
             self.talkEnabled = false
+            await GatewayConnection.shared.talkMode(enabled: false, phase: "disabled")
             return
         }
 
         self.talkEnabled = enabled
         guard !self.isPreview else { return }
 
-        if !enabled { return }
+        if !enabled {
+            await GatewayConnection.shared.talkMode(enabled: false, phase: "disabled")
+            return
+        }
 
-        if PermissionManager.voiceWakePermissionsGranted() { return }
+        if PermissionManager.voiceWakePermissionsGranted() {
+            await GatewayConnection.shared.talkMode(enabled: true, phase: "enabled")
+            return
+        }
 
         let granted = await PermissionManager.ensureVoiceWakePermissions(interactive: true)
         self.talkEnabled = granted
+        await GatewayConnection.shared.talkMode(enabled: granted, phase: granted ? "enabled" : "denied")
     }
 
     // MARK: - Global wake words sync (Gateway-owned)
diff --git a/apps/macos/Sources/Clawdis/ConfigSettings.swift b/apps/macos/Sources/Clawdis/ConfigSettings.swift
index eb22490c0..784fe7a71 100644
--- a/apps/macos/Sources/Clawdis/ConfigSettings.swift
+++ b/apps/macos/Sources/Clawdis/ConfigSettings.swift
@@ -34,6 +34,7 @@ struct ConfigSettings: View {
     @State private var talkVoiceId: String = ""
     @State private var talkInterruptOnSpeech: Bool = true
     @State private var talkApiKey: String = ""
+    @State private var gatewayApiKeyFound = false
 
     var body: some View {
         ScrollView { self.content }
@@ -49,6 +50,7 @@ struct ConfigSettings: View {
                 self.hasLoaded = true
                 self.loadConfig()
                 await self.loadModels()
+                await self.refreshGatewayTalkApiKey()
                 self.allowAutosave = true
             }
     }
@@ -323,6 +325,10 @@ struct ConfigSettings: View {
                             Text("Using ELEVENLABS_API_KEY from the environment.")
                                 .font(.footnote)
                                 .foregroundStyle(.secondary)
+                        } else if self.gatewayApiKeyFound && self.talkApiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
+                            Text("Using API key from the gateway profile.")
+                                .font(.footnote)
+                                .foregroundStyle(.secondary)
                         }
                     }
                 }
@@ -392,6 +398,20 @@ struct ConfigSettings: View {
         }
     }
 
+    private func refreshGatewayTalkApiKey() async {
+        do {
+            let snap: ConfigSnapshot = try await GatewayConnection.shared.requestDecoded(
+                method: .configGet,
+                params: nil,
+                timeoutMs: 8000)
+            let talk = snap.config?["talk"]?.dictionaryValue
+            let apiKey = talk?["apiKey"]?.stringValue?.trimmingCharacters(in: .whitespacesAndNewlines)
+            self.gatewayApiKeyFound = !(apiKey ?? "").isEmpty
+        } catch {
+            self.gatewayApiKeyFound = false
+        }
+    }
+
     private func autosaveConfig() {
         guard self.allowAutosave else { return }
         Task { await self.saveConfig() }
@@ -487,12 +507,14 @@ struct ConfigSettings: View {
         if !self.talkApiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
             return "ElevenLabs API key: stored in config"
         }
+        if self.gatewayApiKeyFound { return "ElevenLabs API key: found (gateway)" }
         return "ElevenLabs API key: missing"
     }
 
     private var apiKeyStatusColor: Color {
         if self.hasEnvApiKey { return .green }
         if !self.talkApiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty { return .green }
+        if self.gatewayApiKeyFound { return .green }
         return .red
     }
 
diff --git a/apps/macos/Sources/Clawdis/GatewayConnection.swift b/apps/macos/Sources/Clawdis/GatewayConnection.swift
index f255f69b9..289507cc5 100644
--- a/apps/macos/Sources/Clawdis/GatewayConnection.swift
+++ b/apps/macos/Sources/Clawdis/GatewayConnection.swift
@@ -51,6 +51,7 @@ actor GatewayConnection {
         case providersStatus = "providers.status"
         case configGet = "config.get"
         case configSet = "config.set"
+        case talkMode = "talk.mode"
         case webLoginStart = "web.login.start"
         case webLoginWait = "web.login.wait"
         case webLogout = "web.logout"
@@ -483,6 +484,12 @@ extension GatewayConnection {
         return res.aborted ?? false
     }
 
+    func talkMode(enabled: Bool, phase: String? = nil) async {
+        var params: [String: AnyCodable] = ["enabled": AnyCodable(enabled)]
+        if let phase { params["phase"] = AnyCodable(phase) }
+        try? await self.requestVoid(method: .talkMode, params: params)
+    }
+
     // MARK: - VoiceWake
 
     func voiceWakeGetTriggers() async throws -> [String] {
diff --git a/apps/macos/Sources/Clawdis/TalkModeController.swift b/apps/macos/Sources/Clawdis/TalkModeController.swift
index 920af0539..707b56995 100644
--- a/apps/macos/Sources/Clawdis/TalkModeController.swift
+++ b/apps/macos/Sources/Clawdis/TalkModeController.swift
@@ -20,6 +20,7 @@ final class TalkModeController {
 
     func updatePhase(_ phase: TalkModePhase) {
         TalkOverlayController.shared.updatePhase(phase)
+        Task { await GatewayConnection.shared.talkMode(enabled: AppStateStore.shared.talkEnabled, phase: phase.rawValue) }
     }
 
     func updateLevel(_ level: Double) {
diff --git a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
index 0443e26ea..54804337e 100644
--- a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
+++ b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
@@ -244,6 +244,7 @@ actor TalkModeRuntime {
         await self.reloadConfig()
         let prompt = self.buildPrompt(transcript: transcript)
         let runId = UUID().uuidString
+        let startedAt = Date().timeIntervalSince1970
 
         do {
             let response = try await GatewayConnection.shared.chatSend(
@@ -261,7 +262,11 @@ actor TalkModeRuntime {
                 return
             }
 
-            guard let assistantText = await self.latestAssistantText(sessionKey: "main") else {
+            guard let assistantText = await self.waitForAssistantText(
+                sessionKey: "main",
+                since: startedAt,
+                timeoutSeconds: 12)
+            else {
                 await self.startListening()
                 await self.startRecognition()
                 return
@@ -335,7 +340,22 @@ actor TalkModeRuntime {
         }
     }
 
-    private func latestAssistantText(sessionKey: String) async -> String? {
+    private func waitForAssistantText(
+        sessionKey: String,
+        since: Double,
+        timeoutSeconds: Int) async -> String?
+    {
+        let deadline = Date().addingTimeInterval(TimeInterval(timeoutSeconds))
+        while Date() < deadline {
+            if let text = await self.latestAssistantText(sessionKey: sessionKey, since: since) {
+                return text
+            }
+            try? await Task.sleep(nanoseconds: 300_000_000)
+        }
+        return nil
+    }
+
+    private func latestAssistantText(sessionKey: String, since: Double? = nil) async -> String? {
         do {
             let history = try await GatewayConnection.shared.chatHistory(sessionKey: sessionKey)
             let messages = history.messages ?? []
@@ -343,7 +363,13 @@ actor TalkModeRuntime {
                 guard let data = try? JSONEncoder().encode(item) else { return nil }
                 return try? JSONDecoder().decode(ClawdisChatMessage.self, from: data)
             }
-            guard let assistant = decoded.last(where: { $0.role == "assistant" }) else { return nil }
+            let assistant = decoded.last { message in
+                guard message.role == "assistant" else { return false }
+                guard let since else { return true }
+                guard let timestamp = message.timestamp else { return false }
+                return timestamp >= since - 0.5
+            }
+            guard let assistant else { return nil }
             let text = assistant.content.compactMap { $0.text }.joined(separator: "\n")
             let trimmed = text.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
             return trimmed.isEmpty ? nil : trimmed
diff --git a/apps/macos/Sources/Clawdis/TalkOverlay.swift b/apps/macos/Sources/Clawdis/TalkOverlay.swift
index 59555a104..e41d758f7 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlay.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlay.swift
@@ -20,9 +20,9 @@ final class TalkOverlayController {
     private var window: NSPanel?
     private var hostingView: NSHostingView<TalkOverlayView>?
 
-    private let width: CGFloat = 120
-    private let height: CGFloat = 120
-    private let padding: CGFloat = 6
+    private let width: CGFloat = 160
+    private let height: CGFloat = 160
+    private let padding: CGFloat = 8
 
     func present() {
         self.ensureWindow()
diff --git a/apps/macos/Sources/Clawdis/TalkOverlayView.swift b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
index f5484c439..d7b400ed3 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlayView.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
@@ -7,12 +7,12 @@ struct TalkOverlayView: View {
     var body: some View {
         ZStack(alignment: .topLeading) {
             TalkOrbView(phase: self.controller.model.phase, level: self.controller.model.level)
-                .frame(width: 80, height: 80)
+                .frame(width: 96, height: 96)
                 .contentShape(Rectangle())
                 .onTapGesture {
                     TalkModeController.shared.stopSpeaking(reason: .userTap)
                 }
-                .padding(16)
+                .padding(26)
 
             Button {
                 TalkModeController.shared.exitTalkMode()
@@ -29,7 +29,7 @@ struct TalkOverlayView: View {
             .padding(4)
             .onHover { self.hovering = $0 }
         }
-        .frame(width: 120, height: 120, alignment: .center)
+        .frame(width: 160, height: 160, alignment: .center)
     }
 }
 
@@ -72,6 +72,7 @@ private struct TalkWaveRings: View {
     let phase: TalkModePhase
     let level: Double
     let time: TimeInterval
+    private let ringColor = Color(red: 0.82, green: 0.94, blue: 1.0)
 
     var body: some View {
         ZStack {
@@ -80,9 +81,9 @@ private struct TalkWaveRings: View {
                 let progress = (time * speed + Double(idx) * 0.28).truncatingRemainder(dividingBy: 1)
                 let amplitude = phase == .speaking ? 0.95 : phase == .listening ? 0.5 + level * 0.7 : 0.35
                 let scale = 0.75 + progress * amplitude + (phase == .listening ? level * 0.15 : 0)
-                let alpha = phase == .speaking ? 0.55 : phase == .listening ? 0.45 + level * 0.25 : 0.28
+                let alpha = phase == .speaking ? 0.72 : phase == .listening ? 0.58 + level * 0.28 : 0.4
                 Circle()
-                    .stroke(Color.white.opacity(alpha - progress * 0.35), lineWidth: 1.2)
+                    .stroke(self.ringColor.opacity(alpha - progress * 0.3), lineWidth: 1.6)
                     .scaleEffect(scale)
                     .opacity(alpha - progress * 0.6)
             }
@@ -97,13 +98,13 @@ private struct TalkOrbitArcs: View {
         ZStack {
             Circle()
                 .trim(from: 0.08, to: 0.26)
-                .stroke(Color.white.opacity(0.75), style: StrokeStyle(lineWidth: 1.4, lineCap: .round))
+                .stroke(Color.white.opacity(0.88), style: StrokeStyle(lineWidth: 1.6, lineCap: .round))
                 .rotationEffect(.degrees(time * 42))
             Circle()
                 .trim(from: 0.62, to: 0.86)
-                .stroke(Color.white.opacity(0.55), style: StrokeStyle(lineWidth: 1.2, lineCap: .round))
+                .stroke(Color.white.opacity(0.7), style: StrokeStyle(lineWidth: 1.4, lineCap: .round))
                 .rotationEffect(.degrees(-time * 35))
         }
-        .scaleEffect(1.05)
+        .scaleEffect(1.08)
     }
 }
diff --git a/docs/configuration.md b/docs/configuration.md
index f15a8f046..a49e916f8 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -198,6 +198,7 @@ Controls inbound/outbound prefixes and timestamps.
 ### `talk`
 
 Defaults for Talk mode (macOS/iOS/Android). Voice IDs fall back to `ELEVENLABS_VOICE_ID` or `SAG_VOICE_ID` when unset.
+`apiKey` falls back to `ELEVENLABS_API_KEY` (or the gateway’s shell profile) when unset.
 
 ```json5
 {
@@ -205,6 +206,7 @@ Defaults for Talk mode (macOS/iOS/Android). Voice IDs fall back to `ELEVENLABS_V
     voiceId: "elevenlabs_voice_id",
     modelId: "eleven_v3",
     outputFormat: "mp3_44100_128",
+    apiKey: "elevenlabs_api_key",
     interruptOnSpeech: true
   }
 }
diff --git a/docs/talk.md b/docs/talk.md
index 4c3cf53cb..41f8239a4 100644
--- a/docs/talk.md
+++ b/docs/talk.md
@@ -47,6 +47,7 @@ Supported keys:
     "voiceId": "elevenlabs_voice_id",
     "modelId": "eleven_v3",
     "outputFormat": "mp3_44100_128",
+    "apiKey": "elevenlabs_api_key",
     "interruptOnSpeech": true
   }
 }
@@ -55,6 +56,7 @@ Supported keys:
 Defaults:
 - `interruptOnSpeech`: true
 - `voiceId`: falls back to `ELEVENLABS_VOICE_ID` / `SAG_VOICE_ID`
+- `apiKey`: falls back to `ELEVENLABS_API_KEY` (or gateway shell profile if available)
 
 ## macOS UI
 - Menu bar toggle: **Talk**
diff --git a/src/config/config.test.ts b/src/config/config.test.ts
index c6669848a..ff2009a35 100644
--- a/src/config/config.test.ts
+++ b/src/config/config.test.ts
@@ -174,3 +174,50 @@ describe("config identity defaults", () => {
     });
   });
 });
+
+describe("talk api key fallback", () => {
+  let previousEnv: string | undefined;
+
+  beforeEach(() => {
+    previousEnv = process.env.ELEVENLABS_API_KEY;
+    delete process.env.ELEVENLABS_API_KEY;
+  });
+
+  afterEach(() => {
+    process.env.ELEVENLABS_API_KEY = previousEnv;
+  });
+
+  it("injects talk.apiKey from profile when config is missing", async () => {
+    await withTempHome(async (home) => {
+      await fs.writeFile(
+        path.join(home, ".profile"),
+        "export ELEVENLABS_API_KEY=profile-key\n",
+        "utf-8",
+      );
+
+      vi.resetModules();
+      const { readConfigFileSnapshot } = await import("./config.js");
+      const snap = await readConfigFileSnapshot();
+
+      expect(snap.config?.talk?.apiKey).toBe("profile-key");
+      expect(snap.exists).toBe(false);
+    });
+  });
+
+  it("prefers ELEVENLABS_API_KEY env over profile", async () => {
+    await withTempHome(async (home) => {
+      await fs.writeFile(
+        path.join(home, ".profile"),
+        "export ELEVENLABS_API_KEY=profile-key\n",
+        "utf-8",
+      );
+      process.env.ELEVENLABS_API_KEY = "env-key";
+
+      vi.resetModules();
+      const { readConfigFileSnapshot } = await import("./config.js");
+      const snap = await readConfigFileSnapshot();
+
+      expect(snap.config?.talk?.apiKey).toBe("env-key");
+    });
+  });
+});
diff --git a/src/config/config.ts b/src/config/config.ts
index 40ae5da06..870ba9621 100644
--- a/src/config/config.ts
+++ b/src/config/config.ts
@@ -226,6 +226,8 @@ export type TalkConfig = {
   modelId?: string;
   /** Default ElevenLabs output format (e.g. mp3_44100_128). */
   outputFormat?: string;
+  /** ElevenLabs API key (optional; falls back to ELEVENLABS_API_KEY). */
+  apiKey?: string;
   /** Stop speaking when user starts talking (default: true). */
   interruptOnSpeech?: boolean;
 };
@@ -802,6 +804,7 @@ const ClawdisSchema = z.object({
       voiceId: z.string().optional(),
       modelId: z.string().optional(),
       outputFormat: z.string().optional(),
+      apiKey: z.string().optional(),
       interruptOnSpeech: z.boolean().optional(),
     })
     .optional(),
@@ -964,17 +967,59 @@ export function parseConfigJson5(
   }
 }
 
+function readTalkApiKeyFromProfile(): string | null {
+  const home = os.homedir();
+  const candidates = [".profile", ".zprofile", ".zshrc", ".bashrc"].map(
+    (name) => path.join(home, name),
+  );
+  for (const candidate of candidates) {
+    if (!fs.existsSync(candidate)) continue;
+    try {
+      const text = fs.readFileSync(candidate, "utf-8");
+      const match = text.match(
+        /(?:^|\n)\s*(?:export\s+)?ELEVENLABS_API_KEY\s*=\s*["']?([^\n"']+)["']?/,
+      );
+      const value = match?.[1]?.trim();
+      if (value) return value;
+    } catch {
+      // Ignore profile read errors.
+    }
+  }
+  return null;
+}
+
+function resolveTalkApiKey(): string | null {
+  const envValue = (process.env.ELEVENLABS_API_KEY ?? "").trim();
+  if (envValue) return envValue;
+  return readTalkApiKeyFromProfile();
+}
+
+function applyTalkApiKey(config: ClawdisConfig): ClawdisConfig {
+  const resolved = resolveTalkApiKey();
+  if (!resolved) return config;
+  const existing = config.talk?.apiKey?.trim();
+  if (existing) return config;
+  return {
+    ...config,
+    talk: {
+      ...config.talk,
+      apiKey: resolved,
+    },
+  };
+}
+
 export async function readConfigFileSnapshot(): Promise<ConfigFileSnapshot> {
   const configPath = CONFIG_PATH_CLAWDIS;
   const exists = fs.existsSync(configPath);
   if (!exists) {
+    const config = applyTalkApiKey({});
     return {
       path: configPath,
       exists: false,
       raw: null,
       parsed: {},
       valid: true,
-      config: {},
+      config,
       issues: [],
     };
   }
@@ -1015,7 +1060,7 @@ export async function readConfigFileSnapshot(): Promise<ConfigFileSnapshot> {
       raw,
       parsed: parsedRes.parsed,
       valid: true,
-      config: validated.config,
+      config: applyTalkApiKey(validated.config),
       issues: [],
     };
   } catch (err) {
diff --git a/src/gateway/protocol/index.ts b/src/gateway/protocol/index.ts
index 725f37cc6..42a46160a 100644
--- a/src/gateway/protocol/index.ts
+++ b/src/gateway/protocol/index.ts
@@ -95,6 +95,8 @@ import {
   SnapshotSchema,
   type StateVersion,
   StateVersionSchema,
+  type TalkModeParams,
+  TalkModeParamsSchema,
   type TickEvent,
   TickEventSchema,
   type WakeParams,
@@ -169,6 +171,8 @@ export const validateConfigGetParams = ajv.compile<ConfigGetParams>(
 export const validateConfigSetParams = ajv.compile<ConfigSetParams>(
   ConfigSetParamsSchema,
 );
+export const validateTalkModeParams =
+  ajv.compile<TalkModeParams>(TalkModeParamsSchema);
 export const validateProvidersStatusParams = ajv.compile<ProvidersStatusParams>(
   ProvidersStatusParamsSchema,
 );
@@ -297,6 +301,7 @@ export type {
   NodePairApproveParams,
   ConfigGetParams,
   ConfigSetParams,
+  TalkModeParams,
   ProvidersStatusParams,
   WebLoginStartParams,
   WebLoginWaitParams,
diff --git a/src/gateway/protocol/schema.ts b/src/gateway/protocol/schema.ts
index 7ea3fc23a..ffd5260f8 100644
--- a/src/gateway/protocol/schema.ts
+++ b/src/gateway/protocol/schema.ts
@@ -339,6 +339,14 @@ export const ConfigSetParamsSchema = Type.Object(
   { additionalProperties: false },
 );
 
+export const TalkModeParamsSchema = Type.Object(
+  {
+    enabled: Type.Boolean(),
+    phase: Type.Optional(Type.String()),
+  },
+  { additionalProperties: false },
+);
+
 export const ProvidersStatusParamsSchema = Type.Object(
   {
     probe: Type.Optional(Type.Boolean()),
@@ -668,6 +676,7 @@ export const ProtocolSchemas: Record<string, TSchema> = {
   SessionsCompactParams: SessionsCompactParamsSchema,
   ConfigGetParams: ConfigGetParamsSchema,
   ConfigSetParams: ConfigSetParamsSchema,
+  TalkModeParams: TalkModeParamsSchema,
   ProvidersStatusParams: ProvidersStatusParamsSchema,
   WebLoginStartParams: WebLoginStartParamsSchema,
   WebLoginWaitParams: WebLoginWaitParamsSchema,
@@ -724,6 +733,7 @@ export type SessionsDeleteParams = Static<typeof SessionsDeleteParamsSchema>;
 export type SessionsCompactParams = Static<typeof SessionsCompactParamsSchema>;
 export type ConfigGetParams = Static<typeof ConfigGetParamsSchema>;
 export type ConfigSetParams = Static<typeof ConfigSetParamsSchema>;
+export type TalkModeParams = Static<typeof TalkModeParamsSchema>;
 export type ProvidersStatusParams = Static<typeof ProvidersStatusParamsSchema>;
 export type WebLoginStartParams = Static<typeof WebLoginStartParamsSchema>;
 export type WebLoginWaitParams = Static<typeof WebLoginWaitParamsSchema>;
diff --git a/src/gateway/server.ts b/src/gateway/server.ts
index 819e8fefb..db6e506f8 100644
--- a/src/gateway/server.ts
+++ b/src/gateway/server.ts
@@ -393,6 +393,7 @@ import {
   validateSkillsInstallParams,
   validateSkillsStatusParams,
   validateSkillsUpdateParams,
+  validateTalkModeParams,
   validateWakeParams,
   validateWebLoginStartParams,
   validateWebLoginWaitParams,
@@ -469,6 +470,7 @@ const METHODS = [
   "status",
   "config.get",
   "config.set",
+  "talk.mode",
   "models.list",
   "skills.status",
   "skills.install",
@@ -518,6 +520,7 @@ const EVENTS = [
   "chat",
   "presence",
   "tick",
+  "talk.mode",
   "shutdown",
   "health",
   "heartbeat",
@@ -2379,6 +2382,25 @@ export async function startGatewayServer(
             }),
           };
         }
+        case "talk.mode": {
+          const params = parseParams();
+          if (!validateTalkModeParams(params)) {
+            return {
+              ok: false,
+              error: {
+                code: ErrorCodes.INVALID_REQUEST,
+                message: `invalid talk.mode params: ${formatValidationErrors(validateTalkModeParams.errors)}`,
+              },
+            };
+          }
+          const payload = {
+            enabled: (params as { enabled: boolean }).enabled,
+            phase: (params as { phase?: string }).phase ?? null,
+            ts: Date.now(),
+          };
+          broadcast("talk.mode", payload, { dropIfSlow: true });
+          return { ok: true, payloadJSON: JSON.stringify(payload) };
+        }
         case "models.list": {
           const params = parseParams();
           if (!validateModelsListParams(params)) {
@@ -4615,6 +4637,28 @@ export async function startGatewayServer(
               );
               break;
             }
+            case "talk.mode": {
+              const params = (req.params ?? {}) as Record<string, unknown>;
+              if (!validateTalkModeParams(params)) {
+                respond(
+                  false,
+                  undefined,
+                  errorShape(
+                    ErrorCodes.INVALID_REQUEST,
+                    `invalid talk.mode params: ${formatValidationErrors(validateTalkModeParams.errors)}`,
+                  ),
+                );
+                break;
+              }
+              const payload = {
+                enabled: (params as { enabled: boolean }).enabled,
+                phase: (params as { phase?: string }).phase ?? null,
+                ts: Date.now(),
+              };
+              broadcast("talk.mode", payload, { dropIfSlow: true });
+              respond(true, payload, undefined);
+              break;
+            }
             case "skills.status": {
               const params = (req.params ?? {}) as Record<string, unknown>;
               if (!validateSkillsStatusParams(params)) {

From 5c7c1af44ef67a33993c44360b3ed8bd43ea029f Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 02:05:14 +0100
Subject: [PATCH 033/100] fix: android talk timestamp parsing

---
 .../java/com/steipete/clawdis/node/voice/TalkModeManager.kt  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
index 5cad01140..2bf35a276 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
@@ -731,6 +731,11 @@ private fun JsonElement?.asObjectOrNull(): JsonObject? = this as? JsonObject
 private fun JsonElement?.asStringOrNull(): String? =
   (this as? JsonPrimitive)?.takeIf { it.isString }?.content
 
+private fun JsonElement?.asDoubleOrNull(): Double? {
+  val primitive = this as? JsonPrimitive ?: return null
+  return primitive.content.toDoubleOrNull()
+}
+
 private fun JsonElement?.asBooleanOrNull(): Boolean? {
   val primitive = this as? JsonPrimitive ?: return null
   val content = primitive.content.trim().lowercase()

From 9846c46434ea67a0b751fa7ab85609cab18906b8 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 03:49:24 +0100
Subject: [PATCH 034/100] fix: tag A2UI platform and boost Android canvas

---
 CHANGELOG.md                                  |  1 +
 apps/android/app/build.gradle.kts             |  1 +
 .../com/steipete/clawdis/node/NodeRuntime.kt  |  2 +-
 .../clawdis/node/bridge/BridgeSession.kt      | 42 +++++++++++++++++-
 .../clawdis/node/node/CanvasController.kt     |  8 ++++
 .../steipete/clawdis/node/ui/RootScreen.kt    | 44 ++++++++++++++++++-
 apps/ios/Sources/Model/NodeAppModel.swift     |  2 +-
 .../macos/Sources/Clawdis/CanvasManager.swift |  2 +-
 .../Clawdis/NodeMode/MacNodeRuntime.swift     |  2 +-
 .../Resources/CanvasScaffold/scaffold.html    | 24 ++++++++++
 src/canvas-host/a2ui/index.html               | 24 ++++++++++
 11 files changed, 145 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97643cee5..2ef7f5e85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - macOS Talk Mode: orb overlay refresh, ElevenLabs request logging, API key status in settings, and auto-select first voice when none is configured.
 - Talk Mode: wait for chat history to surface the assistant reply before starting TTS (macOS/iOS/Android).
 - Gateway config: inject `talk.apiKey` from `ELEVENLABS_API_KEY`/shell profile so nodes can fetch it on demand.
+- Canvas A2UI: tag requests with `platform=android|ios|macos` and boost Android canvas background contrast.
 - iOS/Android nodes: enable scrolling for loaded web pages in the Canvas WebView (default scaffold stays touch-first).
 - macOS menu: device list now uses `node.list` (devices only; no agent/tool presence entries).
 - macOS menu: device list now shows connected nodes only.
diff --git a/apps/android/app/build.gradle.kts b/apps/android/app/build.gradle.kts
index 1b353d83f..db3b17dca 100644
--- a/apps/android/app/build.gradle.kts
+++ b/apps/android/app/build.gradle.kts
@@ -64,6 +64,7 @@ dependencies {
   implementation("androidx.core:core-ktx:1.17.0")
   implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.10.0")
   implementation("androidx.activity:activity-compose:1.12.2")
+  implementation("androidx.webkit:webkit:1.14.0")
 
   implementation("androidx.compose.ui:ui")
   implementation("androidx.compose.ui:ui-tooling-preview")
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
index 21a22a428..50fbd3251 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
@@ -815,7 +815,7 @@ class NodeRuntime(context: Context) {
     val raw = session.currentCanvasHostUrl()?.trim().orEmpty()
     if (raw.isBlank()) return null
     val base = raw.trimEnd('/')
-    return "${base}/__clawdis__/a2ui/"
+    return "${base}/__clawdis__/a2ui/?platform=android"
   }
 
   private suspend fun ensureA2uiReady(a2uiUrl: String): Boolean {
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BridgeSession.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BridgeSession.kt
index e50488d37..5f01959ec 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BridgeSession.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BridgeSession.kt
@@ -11,6 +11,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
+import com.steipete.clawdis.node.BuildConfig
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonObject
@@ -23,6 +24,7 @@ import java.io.BufferedWriter
 import java.io.InputStreamReader
 import java.io.OutputStreamWriter
 import java.net.InetSocketAddress
+import java.net.URI
 import java.net.Socket
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
@@ -213,7 +215,14 @@ class BridgeSession(
         when (first["type"].asStringOrNull()) {
           "hello-ok" -> {
             val name = first["serverName"].asStringOrNull() ?: "Bridge"
-            canvasHostUrl = first["canvasHostUrl"].asStringOrNull()?.trim()?.ifEmpty { null }
+            val rawCanvasUrl = first["canvasHostUrl"].asStringOrNull()?.trim()?.ifEmpty { null }
+            canvasHostUrl = normalizeCanvasHostUrl(rawCanvasUrl, endpoint)
+            if (BuildConfig.DEBUG) {
+              android.util.Log.d(
+                "ClawdisBridge",
+                "canvasHostUrl resolved=${canvasHostUrl ?: "none"} (raw=${rawCanvasUrl ?: "none"})",
+              )
+            }
             onConnected(name, conn.remoteAddress)
           }
           "error" -> {
@@ -292,6 +301,37 @@ class BridgeSession(
         conn.closeQuietly()
       }
     }
+
+  private fun normalizeCanvasHostUrl(raw: String?, endpoint: BridgeEndpoint): String? {
+    val trimmed = raw?.trim().orEmpty()
+    val parsed = trimmed.takeIf { it.isNotBlank() }?.let { runCatching { URI(it) }.getOrNull() }
+    val host = parsed?.host?.trim().orEmpty()
+    val port = parsed?.port ?: -1
+    val scheme = parsed?.scheme?.trim().orEmpty().ifBlank { "http" }
+
+    if (trimmed.isNotBlank() && !isLoopbackHost(host)) {
+      return trimmed
+    }
+
+    val fallbackHost =
+      endpoint.tailnetDns?.trim().takeIf { !it.isNullOrEmpty() }
+        ?: endpoint.lanHost?.trim().takeIf { !it.isNullOrEmpty() }
+        ?: endpoint.host.trim()
+    if (fallbackHost.isEmpty()) return trimmed.ifBlank { null }
+
+    val fallbackPort = endpoint.canvasPort ?: if (port > 0) port else 18793
+    val formattedHost = if (fallbackHost.contains(":")) "[${fallbackHost}]" else fallbackHost
+    return "$scheme://$formattedHost:$fallbackPort"
+  }
+
+  private fun isLoopbackHost(raw: String?): Boolean {
+    val host = raw?.trim()?.lowercase().orEmpty()
+    if (host.isEmpty()) return false
+    if (host == "localhost") return true
+    if (host == "::1") return true
+    if (host == "0.0.0.0" || host == "::") return true
+    return host.startsWith("127.")
+  }
 }
 
 private fun JsonElement?.asObjectOrNull(): JsonObject? = this as? JsonObject
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/node/CanvasController.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/node/CanvasController.kt
index 5b4a09b64..685acdcd2 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/node/CanvasController.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/node/CanvasController.kt
@@ -3,6 +3,7 @@ package com.steipete.clawdis.node.node
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.os.Looper
+import android.util.Log
 import android.webkit.WebView
 import androidx.core.graphics.createBitmap
 import androidx.core.graphics.scale
@@ -16,6 +17,7 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
+import com.steipete.clawdis.node.BuildConfig
 import kotlin.coroutines.resume
 
 class CanvasController {
@@ -81,8 +83,14 @@ class CanvasController {
     val currentUrl = url
     withWebViewOnMain { wv ->
       if (currentUrl == null) {
+        if (BuildConfig.DEBUG) {
+          Log.d("ClawdisCanvas", "load scaffold: $scaffoldAssetUrl")
+        }
         wv.loadUrl(scaffoldAssetUrl)
       } else {
+        if (BuildConfig.DEBUG) {
+          Log.d("ClawdisCanvas", "load url: $currentUrl")
+        }
         wv.loadUrl(currentUrl)
       }
     }
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
index 791f76325..f7681eb49 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
@@ -7,6 +7,8 @@ import android.graphics.Color
 import android.util.Log
 import android.view.View
 import android.webkit.JavascriptInterface
+import android.webkit.ConsoleMessage
+import android.webkit.WebChromeClient
 import android.webkit.WebView
 import android.webkit.WebSettings
 import android.webkit.WebResourceError
@@ -15,6 +17,8 @@ import android.webkit.WebResourceResponse
 import android.webkit.WebViewClient
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.webkit.WebSettingsCompat
+import androidx.webkit.WebViewFeature
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -301,6 +305,15 @@ private fun CanvasView(viewModel: MainViewModel, modifier: Modifier = Modifier)
         // Some embedded web UIs (incl. the "background website") use localStorage/sessionStorage.
         settings.domStorageEnabled = true
         settings.mixedContentMode = WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE
+        if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
+          WebSettingsCompat.setForceDark(settings, WebSettingsCompat.FORCE_DARK_OFF)
+        }
+        if (WebViewFeature.isFeatureSupported(WebViewFeature.ALGORITHMIC_DARKENING)) {
+          WebSettingsCompat.setAlgorithmicDarkeningAllowed(settings, false)
+        }
+        if (isDebuggable) {
+          Log.d("ClawdisWebView", "userAgent: ${settings.userAgentString}")
+        }
         isScrollContainer = true
         overScrollMode = View.OVER_SCROLL_IF_CONTENT_SCROLLS
         isVerticalScrollBarEnabled = true
@@ -331,11 +344,38 @@ private fun CanvasView(viewModel: MainViewModel, modifier: Modifier = Modifier)
             }
 
             override fun onPageFinished(view: WebView, url: String?) {
+              if (isDebuggable) {
+                Log.d("ClawdisWebView", "onPageFinished: $url")
+              }
               viewModel.canvas.onPageFinished()
             }
+
+            override fun onRenderProcessGone(
+              view: WebView,
+              detail: android.webkit.RenderProcessGoneDetail,
+            ): Boolean {
+              if (isDebuggable) {
+                Log.e(
+                  "ClawdisWebView",
+                  "onRenderProcessGone didCrash=${detail.didCrash()} priorityAtExit=${detail.rendererPriorityAtExit()}",
+                )
+              }
+              return true
+            }
           }
-        setBackgroundColor(Color.BLACK)
-        setLayerType(View.LAYER_TYPE_HARDWARE, null)
+        webChromeClient =
+          object : WebChromeClient() {
+            override fun onConsoleMessage(consoleMessage: ConsoleMessage?): Boolean {
+              if (!isDebuggable) return false
+              val msg = consoleMessage ?: return false
+              Log.d(
+                "ClawdisWebView",
+                "console ${msg.messageLevel()} @ ${msg.sourceId()}:${msg.lineNumber()} ${msg.message()}",
+              )
+              return false
+            }
+          }
+        // Use default layer/background; avoid forcing a black fill over WebView content.
 
         val a2uiBridge =
           CanvasA2UIActionBridge { payload ->
diff --git a/apps/ios/Sources/Model/NodeAppModel.swift b/apps/ios/Sources/Model/NodeAppModel.swift
index 8c2935ffc..554441d1f 100644
--- a/apps/ios/Sources/Model/NodeAppModel.swift
+++ b/apps/ios/Sources/Model/NodeAppModel.swift
@@ -150,7 +150,7 @@ final class NodeAppModel {
         guard let raw = await self.bridge.currentCanvasHostUrl() else { return nil }
         let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !trimmed.isEmpty, let base = URL(string: trimmed) else { return nil }
-        return base.appendingPathComponent("__clawdis__/a2ui/").absoluteString
+        return base.appendingPathComponent("__clawdis__/a2ui/").absoluteString + "?platform=ios"
     }
 
     private func showA2UIOnConnectIfNeeded() async {
diff --git a/apps/macos/Sources/Clawdis/CanvasManager.swift b/apps/macos/Sources/Clawdis/CanvasManager.swift
index c19c5d06d..32163744b 100644
--- a/apps/macos/Sources/Clawdis/CanvasManager.swift
+++ b/apps/macos/Sources/Clawdis/CanvasManager.swift
@@ -190,7 +190,7 @@ final class CanvasManager {
     private static func resolveA2UIHostUrl(from raw: String?) -> String? {
         let trimmed = raw?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         guard !trimmed.isEmpty, let base = URL(string: trimmed) else { return nil }
-        return base.appendingPathComponent("__clawdis__/a2ui/").absoluteString
+        return base.appendingPathComponent("__clawdis__/a2ui/").absoluteString + "?platform=macos"
     }
 
     // MARK: - Anchoring
diff --git a/apps/macos/Sources/Clawdis/NodeMode/MacNodeRuntime.swift b/apps/macos/Sources/Clawdis/NodeMode/MacNodeRuntime.swift
index 4b6c8bbc8..b46831034 100644
--- a/apps/macos/Sources/Clawdis/NodeMode/MacNodeRuntime.swift
+++ b/apps/macos/Sources/Clawdis/NodeMode/MacNodeRuntime.swift
@@ -265,7 +265,7 @@ actor MacNodeRuntime {
         guard let raw = await GatewayConnection.shared.canvasHostUrl() else { return nil }
         let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !trimmed.isEmpty, let baseUrl = URL(string: trimmed) else { return nil }
-        return baseUrl.appendingPathComponent("__clawdis__/a2ui/").absoluteString
+        return baseUrl.appendingPathComponent("__clawdis__/a2ui/").absoluteString + "?platform=macos"
     }
 
     private func isA2UIReady(poll: Bool = false) async -> Bool {
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/Resources/CanvasScaffold/scaffold.html b/apps/shared/ClawdisKit/Sources/ClawdisKit/Resources/CanvasScaffold/scaffold.html
index d9a9cebfd..f8942af6f 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisKit/Resources/CanvasScaffold/scaffold.html
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/Resources/CanvasScaffold/scaffold.html
@@ -4,6 +4,21 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
     <title>Canvas</title>
+    <script>
+      (() => {
+        try {
+          const params = new URLSearchParams(window.location.search);
+          const platform = (params.get('platform') || '').trim().toLowerCase();
+          if (platform) {
+            document.documentElement.dataset.platform = platform;
+            return;
+          }
+          if (/android/i.test(navigator.userAgent || '')) {
+            document.documentElement.dataset.platform = 'android';
+          }
+        } catch (_) {}
+      })();
+    </script>
     <style>
       :root { color-scheme: dark; }
       @media (prefers-reduced-motion: reduce) {
@@ -18,6 +33,13 @@
           #000;
         overflow: hidden;
       }
+      :root[data-platform="android"] body {
+        background:
+          radial-gradient(1200px 900px at 15% 20%, rgba(42, 113, 255, 0.38), rgba(0,0,0,0) 55%),
+          radial-gradient(900px 700px at 85% 30%, rgba(255, 0, 138, 0.30), rgba(0,0,0,0) 60%),
+          radial-gradient(1000px 900px at 60% 90%, rgba(0, 209, 255, 0.28), rgba(0,0,0,0) 60%),
+          #07090f;
+      }
       body::before {
         content:"";
         position: fixed;
@@ -35,6 +57,7 @@
         pointer-events: none;
         animation: clawdis-grid-drift 140s ease-in-out infinite alternate;
       }
+      :root[data-platform="android"] body::before { opacity: 0.60; }
       body::after {
         content:"";
         position: fixed;
@@ -52,6 +75,7 @@
         pointer-events: none;
         animation: clawdis-glow-drift 110s ease-in-out infinite alternate;
       }
+      :root[data-platform="android"] body::after { opacity: 0.70; }
       @supports (mix-blend-mode: screen) {
         body::after { mix-blend-mode: screen; }
       }
diff --git a/src/canvas-host/a2ui/index.html b/src/canvas-host/a2ui/index.html
index 113dc5cae..0ed6a917a 100644
--- a/src/canvas-host/a2ui/index.html
+++ b/src/canvas-host/a2ui/index.html
@@ -4,6 +4,21 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>Clawdis Canvas</title>
+    <script>
+      (() => {
+        try {
+          const params = new URLSearchParams(window.location.search);
+          const platform = (params.get('platform') || '').trim().toLowerCase();
+          if (platform) {
+            document.documentElement.dataset.platform = platform;
+            return;
+          }
+          if (/android/i.test(navigator.userAgent || '')) {
+            document.documentElement.dataset.platform = 'android';
+          }
+        } catch (_) {}
+      })();
+    </script>
     <style>
       :root { color-scheme: dark; }
       @media (prefers-reduced-motion: reduce) {
@@ -20,6 +35,13 @@
         color: #e5e7eb;
         overflow: hidden;
       }
+      :root[data-platform="android"] body {
+        background:
+          radial-gradient(1200px 900px at 15% 20%, rgba(42, 113, 255, 0.38), rgba(0,0,0,0) 55%),
+          radial-gradient(900px 700px at 85% 30%, rgba(255, 0, 138, 0.30), rgba(0,0,0,0) 60%),
+          radial-gradient(1000px 900px at 60% 90%, rgba(0, 209, 255, 0.28), rgba(0,0,0,0) 60%),
+          #07090f;
+      }
       body::before {
         content:"";
         position: fixed;
@@ -37,6 +59,7 @@
         pointer-events: none;
         animation: clawdis-grid-drift 140s ease-in-out infinite alternate;
       }
+      :root[data-platform="android"] body::before { opacity: 0.60; }
       body::after {
         content:"";
         position: fixed;
@@ -54,6 +77,7 @@
         pointer-events: none;
         animation: clawdis-glow-drift 110s ease-in-out infinite alternate;
       }
+      :root[data-platform="android"] body::after { opacity: 0.70; }
       @supports (mix-blend-mode: screen) {
         body::after { mix-blend-mode: screen; }
       }

From 2e040ee07adce1668c884d0f3a3c67314b7634f8 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 03:58:18 +0100
Subject: [PATCH 035/100] fix: brighten android canvas

---
 .../Resources/CanvasScaffold/scaffold.html           | 12 ++++++------
 src/canvas-host/a2ui/index.html                      | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/Resources/CanvasScaffold/scaffold.html b/apps/shared/ClawdisKit/Sources/ClawdisKit/Resources/CanvasScaffold/scaffold.html
index f8942af6f..a19b91572 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisKit/Resources/CanvasScaffold/scaffold.html
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/Resources/CanvasScaffold/scaffold.html
@@ -35,10 +35,10 @@
       }
       :root[data-platform="android"] body {
         background:
-          radial-gradient(1200px 900px at 15% 20%, rgba(42, 113, 255, 0.38), rgba(0,0,0,0) 55%),
-          radial-gradient(900px 700px at 85% 30%, rgba(255, 0, 138, 0.30), rgba(0,0,0,0) 60%),
-          radial-gradient(1000px 900px at 60% 90%, rgba(0, 209, 255, 0.28), rgba(0,0,0,0) 60%),
-          #07090f;
+          radial-gradient(1200px 900px at 15% 20%, rgba(42, 113, 255, 0.62), rgba(0,0,0,0) 55%),
+          radial-gradient(900px 700px at 85% 30%, rgba(255, 0, 138, 0.52), rgba(0,0,0,0) 60%),
+          radial-gradient(1000px 900px at 60% 90%, rgba(0, 209, 255, 0.48), rgba(0,0,0,0) 60%),
+          #0b1328;
       }
       body::before {
         content:"";
@@ -57,7 +57,7 @@
         pointer-events: none;
         animation: clawdis-grid-drift 140s ease-in-out infinite alternate;
       }
-      :root[data-platform="android"] body::before { opacity: 0.60; }
+      :root[data-platform="android"] body::before { opacity: 0.80; }
       body::after {
         content:"";
         position: fixed;
@@ -75,7 +75,7 @@
         pointer-events: none;
         animation: clawdis-glow-drift 110s ease-in-out infinite alternate;
       }
-      :root[data-platform="android"] body::after { opacity: 0.70; }
+      :root[data-platform="android"] body::after { opacity: 0.85; }
       @supports (mix-blend-mode: screen) {
         body::after { mix-blend-mode: screen; }
       }
diff --git a/src/canvas-host/a2ui/index.html b/src/canvas-host/a2ui/index.html
index 0ed6a917a..18cf1052a 100644
--- a/src/canvas-host/a2ui/index.html
+++ b/src/canvas-host/a2ui/index.html
@@ -37,10 +37,10 @@
       }
       :root[data-platform="android"] body {
         background:
-          radial-gradient(1200px 900px at 15% 20%, rgba(42, 113, 255, 0.38), rgba(0,0,0,0) 55%),
-          radial-gradient(900px 700px at 85% 30%, rgba(255, 0, 138, 0.30), rgba(0,0,0,0) 60%),
-          radial-gradient(1000px 900px at 60% 90%, rgba(0, 209, 255, 0.28), rgba(0,0,0,0) 60%),
-          #07090f;
+          radial-gradient(1200px 900px at 15% 20%, rgba(42, 113, 255, 0.62), rgba(0,0,0,0) 55%),
+          radial-gradient(900px 700px at 85% 30%, rgba(255, 0, 138, 0.52), rgba(0,0,0,0) 60%),
+          radial-gradient(1000px 900px at 60% 90%, rgba(0, 209, 255, 0.48), rgba(0,0,0,0) 60%),
+          #0b1328;
       }
       body::before {
         content:"";
@@ -59,7 +59,7 @@
         pointer-events: none;
         animation: clawdis-grid-drift 140s ease-in-out infinite alternate;
       }
-      :root[data-platform="android"] body::before { opacity: 0.60; }
+      :root[data-platform="android"] body::before { opacity: 0.80; }
       body::after {
         content:"";
         position: fixed;
@@ -77,7 +77,7 @@
         pointer-events: none;
         animation: clawdis-glow-drift 110s ease-in-out infinite alternate;
       }
-      :root[data-platform="android"] body::after { opacity: 0.70; }
+      :root[data-platform="android"] body::after { opacity: 0.85; }
       @supports (mix-blend-mode: screen) {
         body::after { mix-blend-mode: screen; }
       }

From c5d5c9fcb501cc4b5750776a45940ceb402d3b18 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 04:02:52 +0100
Subject: [PATCH 036/100] fix: make android canvas background visible

---
 .../ClawdisKit/Resources/CanvasScaffold/scaffold.html      | 7 +++++++
 src/canvas-host/a2ui/index.html                            | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/Resources/CanvasScaffold/scaffold.html b/apps/shared/ClawdisKit/Sources/ClawdisKit/Resources/CanvasScaffold/scaffold.html
index a19b91572..3236dc7dc 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisKit/Resources/CanvasScaffold/scaffold.html
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/Resources/CanvasScaffold/scaffold.html
@@ -101,6 +101,13 @@
         touch-action: none;
         z-index: 1;
       }
+      :root[data-platform="android"] #clawdis-canvas {
+        background:
+          radial-gradient(1100px 800px at 20% 15%, rgba(42, 113, 255, 0.78), rgba(0,0,0,0) 58%),
+          radial-gradient(900px 650px at 82% 28%, rgba(255, 0, 138, 0.66), rgba(0,0,0,0) 62%),
+          radial-gradient(1000px 900px at 60% 88%, rgba(0, 209, 255, 0.58), rgba(0,0,0,0) 62%),
+          #141c33;
+      }
       #clawdis-status {
         position: fixed;
         inset: 0;
diff --git a/src/canvas-host/a2ui/index.html b/src/canvas-host/a2ui/index.html
index 18cf1052a..0dc1d46f9 100644
--- a/src/canvas-host/a2ui/index.html
+++ b/src/canvas-host/a2ui/index.html
@@ -103,6 +103,13 @@
         touch-action: none;
         z-index: 1;
       }
+      :root[data-platform="android"] #clawdis-canvas {
+        background:
+          radial-gradient(1100px 800px at 20% 15%, rgba(42, 113, 255, 0.78), rgba(0,0,0,0) 58%),
+          radial-gradient(900px 650px at 82% 28%, rgba(255, 0, 138, 0.66), rgba(0,0,0,0) 62%),
+          radial-gradient(1000px 900px at 60% 88%, rgba(0, 209, 255, 0.58), rgba(0,0,0,0) 62%),
+          #141c33;
+      }
       #clawdis-status {
         position: fixed;
         inset: 0;

From e3d8d5f3000a61df4cb0139288e40d1929c8bb96 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 04:14:16 +0100
Subject: [PATCH 037/100] fix(macos): prevent Talk Mode audio hang

---
 .../Sources/Clawdis/TalkAudioPlayer.swift     | 139 +++++++++++++++---
 .../TalkAudioPlayerTests.swift                |  79 ++++++++++
 2 files changed, 198 insertions(+), 20 deletions(-)
 create mode 100644 apps/macos/Tests/ClawdisIPCTests/TalkAudioPlayerTests.swift

diff --git a/apps/macos/Sources/Clawdis/TalkAudioPlayer.swift b/apps/macos/Sources/Clawdis/TalkAudioPlayer.swift
index b1df3886b..713ede40d 100644
--- a/apps/macos/Sources/Clawdis/TalkAudioPlayer.swift
+++ b/apps/macos/Sources/Clawdis/TalkAudioPlayer.swift
@@ -8,43 +8,142 @@ final class TalkAudioPlayer: NSObject, @preconcurrency AVAudioPlayerDelegate {
 
     private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.tts")
     private var player: AVAudioPlayer?
-    private var continuation: CheckedContinuation<TalkPlaybackResult, Never>?
+    private var playback: Playback?
+
+    private final class Playback: @unchecked Sendable {
+        private let lock = NSLock()
+        private var finished = false
+        private var continuation: CheckedContinuation<TalkPlaybackResult, Never>?
+        private var watchdog: Task<Void, Never>?
+
+        func setContinuation(_ continuation: CheckedContinuation<TalkPlaybackResult, Never>) {
+            self.lock.lock()
+            defer { self.lock.unlock() }
+            self.continuation = continuation
+        }
+
+        func setWatchdog(_ task: Task<Void, Never>?) {
+            self.lock.lock()
+            let old = self.watchdog
+            self.watchdog = task
+            self.lock.unlock()
+            old?.cancel()
+        }
+
+        func cancelWatchdog() {
+            self.setWatchdog(nil)
+        }
+
+        func finish(_ result: TalkPlaybackResult) {
+            let continuation: CheckedContinuation<TalkPlaybackResult, Never>?
+            self.lock.lock()
+            if self.finished {
+                continuation = nil
+            } else {
+                self.finished = true
+                continuation = self.continuation
+                self.continuation = nil
+            }
+            self.lock.unlock()
+            continuation?.resume(returning: result)
+        }
+    }
 
     func play(data: Data) async -> TalkPlaybackResult {
-        self.stopInternal(interrupted: true)
-        do {
-            let player = try AVAudioPlayer(data: data)
-            self.player = player
-            player.delegate = self
-            player.prepareToPlay()
-            player.play()
-            return await withCheckedContinuation { continuation in
-                self.continuation = continuation
+        self.stopInternal()
+
+        let playback = Playback()
+        self.playback = playback
+
+        return await withCheckedContinuation { continuation in
+            playback.setContinuation(continuation)
+            do {
+                let player = try AVAudioPlayer(data: data)
+                self.player = player
+
+                player.delegate = self
+                player.prepareToPlay()
+
+                self.armWatchdog(playback: playback)
+
+                let ok = player.play()
+                if !ok {
+                    self.logger.error("talk audio player refused to play")
+                    self.finish(playback: playback, result: TalkPlaybackResult(finished: false, interruptedAt: nil))
+                }
+            } catch {
+                self.logger.error("talk audio player failed: \(error.localizedDescription, privacy: .public)")
+                self.finish(playback: playback, result: TalkPlaybackResult(finished: false, interruptedAt: nil))
             }
-        } catch {
-            self.logger.error("talk audio player failed: \(error.localizedDescription, privacy: .public)")
-            return TalkPlaybackResult(finished: false, interruptedAt: nil)
         }
     }
 
     func stop() -> Double? {
         guard let player else { return nil }
         let time = player.currentTime
-        self.stopInternal(interrupted: true, interruptedAt: time)
+        self.stopInternal(interruptedAt: time)
         return time
     }
 
     func audioPlayerDidFinishPlaying(_: AVAudioPlayer, successfully flag: Bool) {
-        self.stopInternal(interrupted: !flag)
+        self.stopInternal(finished: flag)
     }
 
-    private func stopInternal(interrupted: Bool, interruptedAt: Double? = nil) {
+    private func stopInternal(finished: Bool = false, interruptedAt: Double? = nil) {
+        guard let playback else { return }
+        let result = TalkPlaybackResult(finished: finished, interruptedAt: interruptedAt)
+        self.finish(playback: playback, result: result)
+    }
+
+    private func finish(playback: Playback, result: TalkPlaybackResult) {
+        playback.cancelWatchdog()
+        playback.finish(result)
+
+        guard self.playback === playback else { return }
+        self.playback = nil
         self.player?.stop()
         self.player = nil
-        if let continuation {
-            self.continuation = nil
-            continuation.resume(returning: TalkPlaybackResult(finished: !interrupted, interruptedAt: interruptedAt))
-        }
+    }
+
+    private func stopInternal() {
+        self.playback?.cancelWatchdog()
+        self.playback = nil
+        self.player?.stop()
+        self.player = nil
+    }
+
+    private func armWatchdog(playback: Playback) {
+        playback.setWatchdog(Task { @MainActor [weak self] in
+            guard let self else { return }
+
+            do {
+                try await Task.sleep(nanoseconds: 650_000_000)
+            } catch {
+                return
+            }
+            if Task.isCancelled { return }
+
+            guard self.playback === playback else { return }
+            if self.player?.isPlaying != true {
+                self.logger.error("talk audio player did not start playing")
+                self.finish(playback: playback, result: TalkPlaybackResult(finished: false, interruptedAt: nil))
+                return
+            }
+
+            let duration = self.player?.duration ?? 0
+            let timeoutSeconds = min(max(2.0, duration + 2.0), 5 * 60.0)
+            do {
+                try await Task.sleep(nanoseconds: UInt64(timeoutSeconds * 1_000_000_000))
+            } catch {
+                return
+            }
+            if Task.isCancelled { return }
+
+            guard self.playback === playback else { return }
+            guard self.player?.isPlaying == true else { return }
+            self.logger.error("talk audio player watchdog fired")
+            self.finish(playback: playback, result: TalkPlaybackResult(finished: false, interruptedAt: nil))
+        })
     }
 }
 
diff --git a/apps/macos/Tests/ClawdisIPCTests/TalkAudioPlayerTests.swift b/apps/macos/Tests/ClawdisIPCTests/TalkAudioPlayerTests.swift
new file mode 100644
index 000000000..e0278e4bb
--- /dev/null
+++ b/apps/macos/Tests/ClawdisIPCTests/TalkAudioPlayerTests.swift
@@ -0,0 +1,79 @@
+import Foundation
+import Testing
+@testable import Clawdis
+
+@Suite(.serialized) struct TalkAudioPlayerTests {
+    @MainActor
+    @Test func playDoesNotHangWhenPlaybackEndsOrFails() async throws {
+        let wav = makeWav16Mono(sampleRate: 8000, samples: 80)
+        defer { _ = TalkAudioPlayer.shared.stop() }
+
+        _ = try await withTimeout(seconds: 2.0) {
+            await TalkAudioPlayer.shared.play(data: wav)
+        }
+
+        #expect(true)
+    }
+}
+
+private struct TimeoutError: Error {}
+
+private func withTimeout<T: Sendable>(
+    seconds: Double,
+    _ work: @escaping @Sendable () async throws -> T) async throws -> T
+{
+    try await withThrowingTaskGroup(of: T.self) { group in
+        group.addTask {
+            try await work()
+        }
+        group.addTask {
+            try await Task.sleep(nanoseconds: UInt64(seconds * 1_000_000_000))
+            throw TimeoutError()
+        }
+        let result = try await group.next()
+        group.cancelAll()
+        guard let result else { throw TimeoutError() }
+        return result
+    }
+}
+
+private func makeWav16Mono(sampleRate: UInt32, samples: Int) -> Data {
+    let channels: UInt16 = 1
+    let bitsPerSample: UInt16 = 16
+    let blockAlign = channels * (bitsPerSample / 8)
+    let byteRate = sampleRate * UInt32(blockAlign)
+    let dataSize = UInt32(samples) * UInt32(blockAlign)
+
+    var data = Data()
+    data.append(contentsOf: [0x52, 0x49, 0x46, 0x46]) // RIFF
+    data.appendLEUInt32(36 + dataSize)
+    data.append(contentsOf: [0x57, 0x41, 0x56, 0x45]) // WAVE
+
+    data.append(contentsOf: [0x66, 0x6D, 0x74, 0x20]) // fmt
+    data.appendLEUInt32(16) // PCM
+    data.appendLEUInt16(1) // audioFormat
+    data.appendLEUInt16(channels)
+    data.appendLEUInt32(sampleRate)
+    data.appendLEUInt32(byteRate)
+    data.appendLEUInt16(blockAlign)
+    data.appendLEUInt16(bitsPerSample)
+
+    data.append(contentsOf: [0x64, 0x61, 0x74, 0x61]) // data
+    data.appendLEUInt32(dataSize)
+
+    // Silence samples.
+    data.append(Data(repeating: 0, count: Int(dataSize)))
+    return data
+}
+
+private extension Data {
+    mutating func appendLEUInt16(_ value: UInt16) {
+        var v = value.littleEndian
+        Swift.withUnsafeBytes(of: &v) { append(contentsOf: $0) }
+    }
+
+    mutating func appendLEUInt32(_ value: UInt32) {
+        var v = value.littleEndian
+        Swift.withUnsafeBytes(of: &v) { append(contentsOf: $0) }
+    }
+}

From d2ac672f47cde655dd4eace0eba4bb6f1efc7b46 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 04:14:36 +0100
Subject: [PATCH 038/100] feat: add ui.seamColor accent

---
 CHANGELOG.md                                  |  3 +
 .../steipete/clawdis/node/MainViewModel.kt    |  1 +
 .../com/steipete/clawdis/node/NodeRuntime.kt  | 32 ++++++++
 .../steipete/clawdis/node/ui/RootScreen.kt    | 22 +++++-
 apps/ios/Sources/Model/NodeAppModel.swift     | 36 +++++++++
 apps/ios/Sources/RootCanvas.swift             | 27 ++++++-
 apps/macos/Sources/Clawdis/AppState.swift     |  4 +
 .../Sources/Clawdis/ConnectionsStore.swift    |  5 ++
 .../Sources/Clawdis/TalkModeRuntime.swift     |  5 ++
 apps/macos/Sources/Clawdis/TalkOverlay.swift  |  8 +-
 .../Sources/Clawdis/TalkOverlayView.swift     | 76 +++++++++++++------
 docs/configuration.md                         | 14 ++++
 src/config/config.ts                          | 13 ++++
 src/config/ui-seam-color.test.ts              | 20 +++++
 14 files changed, 229 insertions(+), 37 deletions(-)
 create mode 100644 src/config/ui-seam-color.test.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ef7f5e85..33e51cee0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,12 +4,15 @@
 
 ### Features
 - Talk mode: continuous speech conversations (macOS/iOS/Android) with ElevenLabs TTS, reply directives, and optional interrupt-on-speech.
+- UI: add optional `ui.seamColor` accent to tint the Talk Mode side bubble (macOS/iOS/Android).
 
 ### Fixes
 - macOS: Voice Wake now fully tears down the Speech pipeline when disabled (cancel pending restarts, drop stale callbacks) to avoid high CPU in the background.
 - macOS menu: add a Talk Mode action alongside the Open Dashboard/Chat/Canvas entries.
 - macOS Debug: hide “Restart Gateway” when the app won’t start a local gateway (remote mode / attach-only).
 - macOS Talk Mode: orb overlay refresh, ElevenLabs request logging, API key status in settings, and auto-select first voice when none is configured.
+- macOS Talk Mode: avoid stuck playback when the audio player never starts (fail-fast + watchdog).
+- macOS Talk Mode: increase overlay window size so wave rings don’t clip; close button is hover-only and closer to the orb.
 - Talk Mode: wait for chat history to surface the assistant reply before starting TTS (macOS/iOS/Android).
 - Gateway config: inject `talk.apiKey` from `ELEVENLABS_API_KEY`/shell profile so nodes can fetch it on demand.
 - Canvas A2UI: tag requests with `platform=android|ios|macos` and boost Android canvas background contrast.
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/MainViewModel.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/MainViewModel.kt
index 69b394a63..e93bd432a 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/MainViewModel.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/MainViewModel.kt
@@ -24,6 +24,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
   val serverName: StateFlow<String?> = runtime.serverName
   val remoteAddress: StateFlow<String?> = runtime.remoteAddress
   val isForeground: StateFlow<Boolean> = runtime.isForeground
+  val seamColorArgb: StateFlow<Long> = runtime.seamColorArgb
 
   val cameraHud: StateFlow<CameraHudState?> = runtime.cameraHud
   val cameraFlashToken: StateFlow<Long> = runtime.cameraFlashToken
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
index 50fbd3251..aa77bd94d 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
@@ -120,6 +120,9 @@ class NodeRuntime(context: Context) {
   private val _remoteAddress = MutableStateFlow<String?>(null)
   val remoteAddress: StateFlow<String?> = _remoteAddress.asStateFlow()
 
+  private val _seamColorArgb = MutableStateFlow(DEFAULT_SEAM_COLOR_ARGB)
+  val seamColorArgb: StateFlow<Long> = _seamColorArgb.asStateFlow()
+
   private val _isForeground = MutableStateFlow(true)
   val isForeground: StateFlow<Boolean> = _isForeground.asStateFlow()
 
@@ -133,6 +136,8 @@ class NodeRuntime(context: Context) {
         _serverName.value = name
         _remoteAddress.value = remote
         _isConnected.value = true
+        _seamColorArgb.value = DEFAULT_SEAM_COLOR_ARGB
+        scope.launch { refreshBrandingFromGateway() }
         scope.launch { refreshWakeWordsFromGateway() }
         maybeNavigateToA2uiOnConnect()
       },
@@ -155,6 +160,7 @@ class NodeRuntime(context: Context) {
     _serverName.value = null
     _remoteAddress.value = null
     _isConnected.value = false
+    _seamColorArgb.value = DEFAULT_SEAM_COLOR_ARGB
     chat.onDisconnected(message)
     showLocalCanvasOnDisconnect()
   }
@@ -618,6 +624,21 @@ class NodeRuntime(context: Context) {
     }
   }
 
+  private suspend fun refreshBrandingFromGateway() {
+    if (!_isConnected.value) return
+    try {
+      val res = session.request("config.get", "{}")
+      val root = json.parseToJsonElement(res).asObjectOrNull()
+      val config = root?.get("config").asObjectOrNull()
+      val ui = config?.get("ui").asObjectOrNull()
+      val raw = ui?.get("seamColor").asStringOrNull()?.trim()
+      val parsed = parseHexColorArgb(raw) ?: return
+      _seamColorArgb.value = parsed
+    } catch (_: Throwable) {
+      // ignore
+    }
+  }
+
   private suspend fun handleInvoke(command: String, paramsJson: String?): BridgeSession.InvokeResult {
     if (
       command.startsWith(ClawdisCanvasCommand.NamespacePrefix) ||
@@ -901,6 +922,8 @@ class NodeRuntime(context: Context) {
 
 private data class Quad<A, B, C, D>(val first: A, val second: B, val third: C, val fourth: D)
 
+private const val DEFAULT_SEAM_COLOR_ARGB: Long = 0xFF9EE0FF
+
 private const val a2uiReadyCheckJS: String =
   """
   (() => {
@@ -955,3 +978,12 @@ private fun JsonElement?.asStringOrNull(): String? =
     is JsonPrimitive -> content
     else -> null
   }
+
+private fun parseHexColorArgb(raw: String?): Long? {
+  val trimmed = raw?.trim().orEmpty()
+  if (trimmed.isEmpty()) return null
+  val hex = if (trimmed.startsWith("#")) trimmed.drop(1) else trimmed
+  if (hex.length != 6) return null
+  val rgb = hex.toLongOrNull(16) ?: return null
+  return 0xFF000000L or rgb
+}
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
index f7681eb49..485014b1b 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
@@ -57,6 +57,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color as ComposeColor
+import androidx.compose.ui.graphics.lerp
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
@@ -81,6 +83,8 @@ fun RootScreen(viewModel: MainViewModel) {
   val isForeground by viewModel.isForeground.collectAsState()
   val voiceWakeStatusText by viewModel.voiceWakeStatusText.collectAsState()
   val talkEnabled by viewModel.talkEnabled.collectAsState()
+  val seamColorArgb by viewModel.seamColorArgb.collectAsState()
+  val seamColor = remember(seamColorArgb) { ComposeColor(seamColorArgb) }
   val audioPermissionLauncher =
     rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { granted ->
       if (granted) viewModel.setTalkEnabled(true)
@@ -225,6 +229,14 @@ fun RootScreen(viewModel: MainViewModel) {
       )
 
       // Talk mode gets a dedicated side bubble instead of burying it in settings.
+      val baseOverlay = overlayContainerColor()
+      val talkContainer =
+        lerp(
+          baseOverlay,
+          seamColor.copy(alpha = baseOverlay.alpha),
+          if (talkEnabled) 0.35f else 0.22f,
+        )
+      val talkContent = if (talkEnabled) seamColor else overlayIconColor()
       OverlayIconButton(
         onClick = {
           val next = !talkEnabled
@@ -238,12 +250,12 @@ fun RootScreen(viewModel: MainViewModel) {
             viewModel.setTalkEnabled(false)
           }
         },
+        containerColor = talkContainer,
+        contentColor = talkContent,
         icon = {
-          val tint = if (talkEnabled) MaterialTheme.colorScheme.primary else LocalContentColor.current
           Icon(
             Icons.Default.RecordVoiceOver,
             contentDescription = "Talk Mode",
-            tint = tint,
           )
         },
       )
@@ -278,14 +290,16 @@ private enum class Sheet {
 private fun OverlayIconButton(
   onClick: () -> Unit,
   icon: @Composable () -> Unit,
+  containerColor: ComposeColor? = null,
+  contentColor: ComposeColor? = null,
 ) {
   FilledTonalIconButton(
     onClick = onClick,
     modifier = Modifier.size(44.dp),
     colors =
       IconButtonDefaults.filledTonalIconButtonColors(
-        containerColor = overlayContainerColor(),
-        contentColor = overlayIconColor(),
+        containerColor = containerColor ?: overlayContainerColor(),
+        contentColor = contentColor ?: overlayIconColor(),
       ),
   ) {
     icon()
diff --git a/apps/ios/Sources/Model/NodeAppModel.swift b/apps/ios/Sources/Model/NodeAppModel.swift
index 554441d1f..02cf7c9af 100644
--- a/apps/ios/Sources/Model/NodeAppModel.swift
+++ b/apps/ios/Sources/Model/NodeAppModel.swift
@@ -22,6 +22,7 @@ final class NodeAppModel {
     var bridgeServerName: String?
     var bridgeRemoteAddress: String?
     var connectedBridgeID: String?
+    var seamColorHex: String?
 
     private let bridge = BridgeSession()
     private var bridgeTask: Task<Void, Never>?
@@ -225,6 +226,7 @@ final class NodeAppModel {
                                     self.bridgeRemoteAddress = addr
                                 }
                             }
+                            await self.refreshBrandingFromGateway()
                             await self.startVoiceWakeSync()
                             await self.showA2UIOnConnectIfNeeded()
                         },
@@ -264,6 +266,7 @@ final class NodeAppModel {
                 self.bridgeServerName = nil
                 self.bridgeRemoteAddress = nil
                 self.connectedBridgeID = nil
+                self.seamColorHex = nil
                 self.showLocalCanvasOnDisconnect()
             }
         }
@@ -279,9 +282,42 @@ final class NodeAppModel {
         self.bridgeServerName = nil
         self.bridgeRemoteAddress = nil
         self.connectedBridgeID = nil
+        self.seamColorHex = nil
         self.showLocalCanvasOnDisconnect()
     }
 
+    var seamColor: Color {
+        Self.color(fromHex: self.seamColorHex) ?? Self.defaultSeamColor
+    }
+
+    private static let defaultSeamColor = Color(red: 0.62, green: 0.88, blue: 1.0)
+
+    private static func color(fromHex raw: String?) -> Color? {
+        let trimmed = (raw ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmed.isEmpty else { return nil }
+        let hex = trimmed.hasPrefix("#") ? String(trimmed.dropFirst()) : trimmed
+        guard hex.count == 6, let value = Int(hex, radix: 16) else { return nil }
+        let r = Double((value >> 16) & 0xFF) / 255.0
+        let g = Double((value >> 8) & 0xFF) / 255.0
+        let b = Double(value & 0xFF) / 255.0
+        return Color(red: r, green: g, blue: b)
+    }
+
+    private func refreshBrandingFromGateway() async {
+        do {
+            let res = try await self.bridge.request(method: "config.get", paramsJSON: "{}", timeoutSeconds: 8)
+            guard let json = try JSONSerialization.jsonObject(with: res) as? [String: Any] else { return }
+            guard let config = json["config"] as? [String: Any] else { return }
+            let ui = config["ui"] as? [String: Any]
+            let raw = (ui?["seamColor"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+            await MainActor.run {
+                self.seamColorHex = raw.isEmpty ? nil : raw
+            }
+        } catch {
+            // ignore
+        }
+    }
+
     func setGlobalWakeWords(_ words: [String]) async {
         let sanitized = VoiceWakePreferences.sanitizeTriggerWords(words)
 
diff --git a/apps/ios/Sources/RootCanvas.swift b/apps/ios/Sources/RootCanvas.swift
index 910d96a3d..ab67996a7 100644
--- a/apps/ios/Sources/RootCanvas.swift
+++ b/apps/ios/Sources/RootCanvas.swift
@@ -147,7 +147,9 @@ private struct CanvasContent: View {
                     // Talk mode lives on a side bubble so it doesn't get buried in settings.
                     OverlayButton(
                         systemImage: self.appModel.talkMode.isEnabled ? "waveform.circle.fill" : "waveform.circle",
-                        brighten: self.brightenButtons)
+                        brighten: self.brightenButtons,
+                        tint: self.appModel.seamColor,
+                        isActive: self.appModel.talkMode.isEnabled)
                     {
                         let next = !self.appModel.talkMode.isEnabled
                         self.talkEnabled = next
@@ -251,13 +253,15 @@ private struct CanvasContent: View {
 private struct OverlayButton: View {
     let systemImage: String
     let brighten: Bool
+    var tint: Color? = nil
+    var isActive: Bool = false
     let action: () -> Void
 
     var body: some View {
         Button(action: self.action) {
             Image(systemName: self.systemImage)
                 .font(.system(size: 16, weight: .semibold))
-                .foregroundStyle(.primary)
+                .foregroundStyle(self.isActive ? (self.tint ?? .primary) : .primary)
                 .padding(10)
                 .background {
                     RoundedRectangle(cornerRadius: 12, style: .continuous)
@@ -275,9 +279,26 @@ private struct OverlayButton: View {
                                         endPoint: .bottomTrailing))
                                 .blendMode(.overlay)
                         }
+                        .overlay {
+                            if let tint {
+                                RoundedRectangle(cornerRadius: 12, style: .continuous)
+                                    .fill(
+                                        LinearGradient(
+                                            colors: [
+                                                tint.opacity(self.isActive ? 0.22 : 0.14),
+                                                tint.opacity(self.isActive ? 0.10 : 0.06),
+                                                .clear,
+                                            ],
+                                            startPoint: .topLeading,
+                                            endPoint: .bottomTrailing))
+                                    .blendMode(.overlay)
+                            }
+                        }
                         .overlay {
                             RoundedRectangle(cornerRadius: 12, style: .continuous)
-                                .strokeBorder(.white.opacity(self.brighten ? 0.24 : 0.18), lineWidth: 0.5)
+                                .strokeBorder(
+                                    (self.tint ?? .white).opacity(self.isActive ? 0.34 : (self.brighten ? 0.24 : 0.18)),
+                                    lineWidth: self.isActive ? 0.7 : 0.5)
                         }
                         .shadow(color: .black.opacity(0.35), radius: 12, y: 6)
                 }
diff --git a/apps/macos/Sources/Clawdis/AppState.swift b/apps/macos/Sources/Clawdis/AppState.swift
index c73383241..65ddaaf90 100644
--- a/apps/macos/Sources/Clawdis/AppState.swift
+++ b/apps/macos/Sources/Clawdis/AppState.swift
@@ -130,6 +130,9 @@ final class AppState {
         }
     }
 
+    /// Gateway-provided UI accent color (hex). Optional; clients provide a default.
+    var seamColorHex: String?
+
     var iconOverride: IconOverrideSelection {
         didSet { self.ifNotPreview { UserDefaults.standard.set(self.iconOverride.rawValue, forKey: iconOverrideKey) } }
     }
@@ -226,6 +229,7 @@ final class AppState {
         self.voicePushToTalkEnabled = UserDefaults.standard
             .object(forKey: voicePushToTalkEnabledKey) as? Bool ?? false
         self.talkEnabled = UserDefaults.standard.bool(forKey: talkEnabledKey)
+        self.seamColorHex = nil
         if let storedHeartbeats = UserDefaults.standard.object(forKey: heartbeatsEnabledKey) as? Bool {
             self.heartbeatsEnabled = storedHeartbeats
         } else {
diff --git a/apps/macos/Sources/Clawdis/ConnectionsStore.swift b/apps/macos/Sources/Clawdis/ConnectionsStore.swift
index d89468a2b..0ff9f0bb5 100644
--- a/apps/macos/Sources/Clawdis/ConnectionsStore.swift
+++ b/apps/macos/Sources/Clawdis/ConnectionsStore.swift
@@ -294,6 +294,11 @@ final class ConnectionsStore {
                 : nil
             self.configRoot = snap.config?.mapValues { $0.foundationValue } ?? [:]
             self.configLoaded = true
+
+            let ui = snap.config?["ui"]?.dictionaryValue
+            let rawSeam = ui?["seamColor"]?.stringValue?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+            AppStateStore.shared.seamColorHex = rawSeam.isEmpty ? nil : rawSeam
+
             let telegram = snap.config?["telegram"]?.dictionaryValue
             self.telegramToken = telegram?["botToken"]?.stringValue ?? ""
             self.telegramRequireMention = telegram?["requireMention"]?.boolValue ?? true
diff --git a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
index 54804337e..73c26a9e5 100644
--- a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
+++ b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
@@ -537,6 +537,11 @@ actor TalkModeRuntime {
                 params: nil,
                 timeoutMs: 8000)
             let talk = snap.config?["talk"]?.dictionaryValue
+            let ui = snap.config?["ui"]?.dictionaryValue
+            let rawSeam = ui?["seamColor"]?.stringValue?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+            await MainActor.run {
+                AppStateStore.shared.seamColorHex = rawSeam.isEmpty ? nil : rawSeam
+            }
             let voice = talk?["voiceId"]?.stringValue
             let model = talk?["modelId"]?.stringValue
             let outputFormat = talk?["outputFormat"]?.stringValue
diff --git a/apps/macos/Sources/Clawdis/TalkOverlay.swift b/apps/macos/Sources/Clawdis/TalkOverlay.swift
index e41d758f7..f36745df0 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlay.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlay.swift
@@ -7,6 +7,7 @@ import SwiftUI
 @Observable
 final class TalkOverlayController {
     static let shared = TalkOverlayController()
+    static let overlaySize: CGFloat = 220
 
     private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.overlay")
 
@@ -19,9 +20,6 @@ final class TalkOverlayController {
     var model = Model()
     private var window: NSPanel?
     private var hostingView: NSHostingView<TalkOverlayView>?
-
-    private let width: CGFloat = 160
-    private let height: CGFloat = 160
     private let padding: CGFloat = 8
 
     func present() {
@@ -84,7 +82,7 @@ final class TalkOverlayController {
     private func ensureWindow() {
         if self.window != nil { return }
         let panel = NSPanel(
-            contentRect: NSRect(x: 0, y: 0, width: self.width, height: self.height),
+            contentRect: NSRect(x: 0, y: 0, width: Self.overlaySize, height: Self.overlaySize),
             styleMask: [.nonactivatingPanel, .borderless],
             backing: .buffered,
             defer: false)
@@ -109,7 +107,7 @@ final class TalkOverlayController {
 
     private func targetFrame() -> NSRect {
         guard let screen = NSScreen.main else { return .zero }
-        let size = NSSize(width: self.width, height: self.height)
+        let size = NSSize(width: Self.overlaySize, height: Self.overlaySize)
         let visible = screen.visibleFrame
         let origin = CGPoint(
             x: visible.maxX - size.width - self.padding,
diff --git a/apps/macos/Sources/Clawdis/TalkOverlayView.swift b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
index d7b400ed3..d502e21ad 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlayView.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
@@ -2,40 +2,66 @@ import SwiftUI
 
 struct TalkOverlayView: View {
     var controller: TalkOverlayController
-    @State private var hovering = false
+    @State private var appState = AppStateStore.shared
+    @State private var hoveringWindow = false
 
     var body: some View {
-        ZStack(alignment: .topLeading) {
-            TalkOrbView(phase: self.controller.model.phase, level: self.controller.model.level)
+        ZStack {
+            TalkOrbView(
+                phase: self.controller.model.phase,
+                level: self.controller.model.level,
+                accent: self.seamColor)
                 .frame(width: 96, height: 96)
-                .contentShape(Rectangle())
+                .contentShape(Circle())
                 .onTapGesture {
                     TalkModeController.shared.stopSpeaking(reason: .userTap)
                 }
-                .padding(26)
-
-            Button {
-                TalkModeController.shared.exitTalkMode()
-            } label: {
-                Image(systemName: "xmark")
-                    .font(.system(size: 10, weight: .bold))
-                    .foregroundStyle(Color.white.opacity(self.hovering ? 0.95 : 0.7))
-                    .frame(width: 18, height: 18)
-                    .background(Color.black.opacity(self.hovering ? 0.45 : 0.3))
-                    .clipShape(Circle())
-            }
-            .buttonStyle(.plain)
-            .contentShape(Circle())
-            .padding(4)
-            .onHover { self.hovering = $0 }
+                .overlay(alignment: .topLeading) {
+                    Button {
+                        TalkModeController.shared.exitTalkMode()
+                    } label: {
+                        Image(systemName: "xmark")
+                            .font(.system(size: 10, weight: .bold))
+                            .foregroundStyle(Color.white.opacity(0.95))
+                            .frame(width: 18, height: 18)
+                            .background(Color.black.opacity(0.4))
+                            .clipShape(Circle())
+                    }
+                    .buttonStyle(.plain)
+                    .contentShape(Circle())
+                    .offset(x: -10, y: -10)
+                    .opacity(self.hoveringWindow ? 1 : 0)
+                    .animation(.easeOut(duration: 0.12), value: self.hoveringWindow)
+                    .allowsHitTesting(self.hoveringWindow)
+                }
         }
-        .frame(width: 160, height: 160, alignment: .center)
+        .frame(width: TalkOverlayController.overlaySize, height: TalkOverlayController.overlaySize, alignment: .center)
+        .contentShape(Rectangle())
+        .onHover { self.hoveringWindow = $0 }
+    }
+
+    private static let defaultSeamColor = Color(red: 0.62, green: 0.88, blue: 1.0)
+
+    private var seamColor: Color {
+        Self.color(fromHex: self.appState.seamColorHex) ?? Self.defaultSeamColor
+    }
+
+    private static func color(fromHex raw: String?) -> Color? {
+        let trimmed = (raw ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmed.isEmpty else { return nil }
+        let hex = trimmed.hasPrefix("#") ? String(trimmed.dropFirst()) : trimmed
+        guard hex.count == 6, let value = Int(hex, radix: 16) else { return nil }
+        let r = Double((value >> 16) & 0xFF) / 255.0
+        let g = Double((value >> 8) & 0xFF) / 255.0
+        let b = Double(value & 0xFF) / 255.0
+        return Color(red: r, green: g, blue: b)
     }
 }
 
 private struct TalkOrbView: View {
     let phase: TalkModePhase
     let level: Double
+    let accent: Color
 
     var body: some View {
         TimelineView(.animation) { context in
@@ -50,7 +76,7 @@ private struct TalkOrbView: View {
                     .shadow(color: Color.black.opacity(0.22), radius: 10, x: 0, y: 5)
                     .scaleEffect(pulse * listenScale)
 
-                TalkWaveRings(phase: phase, level: level, time: t)
+                TalkWaveRings(phase: phase, level: level, time: t, accent: self.accent)
 
                 if phase == .thinking {
                     TalkOrbitArcs(time: t)
@@ -61,7 +87,7 @@ private struct TalkOrbView: View {
 
     private var orbGradient: RadialGradient {
         RadialGradient(
-            colors: [Color.white, Color(red: 0.62, green: 0.88, blue: 1.0)],
+            colors: [Color.white, self.accent],
             center: .topLeading,
             startRadius: 4,
             endRadius: 52)
@@ -72,7 +98,7 @@ private struct TalkWaveRings: View {
     let phase: TalkModePhase
     let level: Double
     let time: TimeInterval
-    private let ringColor = Color(red: 0.82, green: 0.94, blue: 1.0)
+    let accent: Color
 
     var body: some View {
         ZStack {
@@ -83,7 +109,7 @@ private struct TalkWaveRings: View {
                 let scale = 0.75 + progress * amplitude + (phase == .listening ? level * 0.15 : 0)
                 let alpha = phase == .speaking ? 0.72 : phase == .listening ? 0.58 + level * 0.28 : 0.4
                 Circle()
-                    .stroke(self.ringColor.opacity(alpha - progress * 0.3), lineWidth: 1.6)
+                    .stroke(self.accent.opacity(alpha - progress * 0.3), lineWidth: 1.6)
                     .scaleEffect(scale)
                     .opacity(alpha - progress * 0.6)
             }
diff --git a/docs/configuration.md b/docs/configuration.md
index a49e916f8..ac4b3ccf4 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -462,6 +462,20 @@ Defaults:
 }
 ```
 
+### `ui` (Appearance)
+
+Optional accent color used by the native apps for UI chrome (e.g. Talk Mode bubble tint).
+
+If unset, clients fall back to a muted light-blue.
+
+```json5
+{
+  ui: {
+    seamColor: "#FF4500" // hex (RRGGBB or #RRGGBB)
+  }
+}
+```
+
 ### `gateway` (Gateway server mode + bind)
 
 Use `gateway.mode` to explicitly declare whether this machine should run the Gateway.
diff --git a/src/config/config.ts b/src/config/config.ts
index 870ba9621..9d3b23442 100644
--- a/src/config/config.ts
+++ b/src/config/config.ts
@@ -346,6 +346,10 @@ export type ClawdisConfig = {
   };
   logging?: LoggingConfig;
   browser?: BrowserConfig;
+  ui?: {
+    /** Accent color for Clawdis UI chrome (hex). */
+    seamColor?: string;
+  };
   skillsLoad?: SkillsLoadConfig;
   skillsInstall?: SkillsInstallConfig;
   models?: ModelsConfig;
@@ -494,6 +498,10 @@ const TranscribeAudioSchema = z
   })
   .optional();
 
+const HexColorSchema = z
+  .string()
+  .regex(/^#?[0-9a-fA-F]{6}$/, "expected hex color (RRGGBB)");
+
 const SessionSchema = z
   .object({
     scope: z.union([z.literal("per-sender"), z.literal("global")]).optional(),
@@ -672,6 +680,11 @@ const ClawdisSchema = z.object({
       attachOnly: z.boolean().optional(),
     })
     .optional(),
+  ui: z
+    .object({
+      seamColor: HexColorSchema.optional(),
+    })
+    .optional(),
   models: ModelsConfigSchema,
   agent: z
     .object({
diff --git a/src/config/ui-seam-color.test.ts b/src/config/ui-seam-color.test.ts
new file mode 100644
index 000000000..9865e0e93
--- /dev/null
+++ b/src/config/ui-seam-color.test.ts
@@ -0,0 +1,20 @@
+import { describe, expect, it } from "vitest";
+
+import { validateConfigObject } from "./config.js";
+
+describe("ui.seamColor", () => {
+  it("accepts hex colors", () => {
+    const res = validateConfigObject({ ui: { seamColor: "#FF4500" } });
+    expect(res.ok).toBe(true);
+  });
+
+  it("rejects non-hex colors", () => {
+    const res = validateConfigObject({ ui: { seamColor: "lobster" } });
+    expect(res.ok).toBe(false);
+  });
+
+  it("rejects invalid hex length", () => {
+    const res = validateConfigObject({ ui: { seamColor: "#FF4500FF" } });
+    expect(res.ok).toBe(false);
+  });
+});

From c0c6782a17e4927f3d0d286752c117eeea9450d9 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 04:42:02 +0100
Subject: [PATCH 039/100] fix(android): stabilize BridgeSession shutdown

---
 .../steipete/clawdis/node/bridge/BridgeSession.kt   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BridgeSession.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BridgeSession.kt
index 5f01959ec..83e2cb744 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BridgeSession.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/bridge/BridgeSession.kt
@@ -77,6 +77,8 @@ class BridgeSession(
 
   fun disconnect() {
     desired = null
+    // Unblock connectOnce() read loop. Coroutine cancellation alone won't interrupt BufferedReader.readLine().
+    currentConnection?.closeQuietly()
     scope.launch(Dispatchers.IO) {
       job?.cancelAndJoin()
       job = null
@@ -218,10 +220,13 @@ class BridgeSession(
             val rawCanvasUrl = first["canvasHostUrl"].asStringOrNull()?.trim()?.ifEmpty { null }
             canvasHostUrl = normalizeCanvasHostUrl(rawCanvasUrl, endpoint)
             if (BuildConfig.DEBUG) {
-              android.util.Log.d(
-                "ClawdisBridge",
-                "canvasHostUrl resolved=${canvasHostUrl ?: "none"} (raw=${rawCanvasUrl ?: "none"})",
-              )
+              // Local JVM unit tests use android.jar stubs; Log.d can throw "not mocked".
+              runCatching {
+                android.util.Log.d(
+                  "ClawdisBridge",
+                  "canvasHostUrl resolved=${canvasHostUrl ?: "none"} (raw=${rawCanvasUrl ?: "none"})",
+                )
+              }
             }
             onConnected(name, conn.remoteAddress)
           }

From 24f8ff75481572dba1053988095cc22215d7d0a5 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 04:42:08 +0100
Subject: [PATCH 040/100] chore(protocol): regenerate Swift gateway models

---
 .../Sources/ClawdisProtocol/GatewayModels.swift | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/apps/macos/Sources/ClawdisProtocol/GatewayModels.swift b/apps/macos/Sources/ClawdisProtocol/GatewayModels.swift
index 4313c97ef..687313a53 100644
--- a/apps/macos/Sources/ClawdisProtocol/GatewayModels.swift
+++ b/apps/macos/Sources/ClawdisProtocol/GatewayModels.swift
@@ -689,6 +689,23 @@ public struct ConfigSetParams: Codable {
     }
 }
 
+public struct TalkModeParams: Codable {
+    public let enabled: Bool
+    public let phase: String?
+
+    public init(
+        enabled: Bool,
+        phase: String?
+    ) {
+        self.enabled = enabled
+        self.phase = phase
+    }
+    private enum CodingKeys: String, CodingKey {
+        case enabled
+        case phase
+    }
+}
+
 public struct ProvidersStatusParams: Codable {
     public let probe: Bool?
     public let timeoutms: Int?

From 05efc3eacef1b18d2ed9ff49b61150ea100ab3d0 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 04:52:57 +0100
Subject: [PATCH 041/100] fix: avoid iOS talk mode audio tap crash

---
 AGENTS.md                                    |  1 +
 CHANGELOG.md                                 |  1 +
 apps/ios/Sources/RootCanvas.swift            |  2 +-
 apps/ios/Sources/Voice/TalkModeManager.swift | 12 +++++++++---
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index 8226882d7..26b42fd9a 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -23,6 +23,7 @@
 - Naming: match source names with `*.test.ts`; e2e in `*.e2e.test.ts`.
 - Run `pnpm test` (or `pnpm test:coverage`) before pushing when you touch logic.
 - Pure test additions/fixes generally do **not** need a changelog entry unless they alter user-facing behavior or the user asks for one.
+- Mobile: before using a simulator, check for connected real devices (iOS + Android) and prefer them when available.
 
 ## Commit & Pull Request Guidelines
 - Create commits with `scripts/committer "<msg>" <file...>`; avoid manual `git add`/`git commit` so staging stays scoped.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33e51cee0..00b59c776 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 - macOS menu: device list now uses `node.list` (devices only; no agent/tool presence entries).
 - macOS menu: device list now shows connected nodes only.
 - iOS node: fix ReplayKit screen recording crash caused by queue isolation assertions during capture.
+- iOS Talk Mode: avoid audio tap queue assertions when starting recognition.
 - iOS/Android nodes: bridge auto-connect refreshes stale tokens and settings now show richer bridge/device details.
 - iOS/Android nodes: status pill now surfaces camera activity instead of overlay toasts.
 - iOS/Android/macOS nodes: camera snaps recompress to keep base64 payloads under 5 MB.
diff --git a/apps/ios/Sources/RootCanvas.swift b/apps/ios/Sources/RootCanvas.swift
index ab67996a7..17f02c79c 100644
--- a/apps/ios/Sources/RootCanvas.swift
+++ b/apps/ios/Sources/RootCanvas.swift
@@ -253,7 +253,7 @@ private struct CanvasContent: View {
 private struct OverlayButton: View {
     let systemImage: String
     let brighten: Bool
-    var tint: Color? = nil
+    var tint: Color?
     var isActive: Bool = false
     let action: () -> Void
 
diff --git a/apps/ios/Sources/Voice/TalkModeManager.swift b/apps/ios/Sources/Voice/TalkModeManager.swift
index 3766845b1..c11b890a9 100644
--- a/apps/ios/Sources/Voice/TalkModeManager.swift
+++ b/apps/ios/Sources/Voice/TalkModeManager.swift
@@ -7,6 +7,7 @@ import Speech
 @MainActor
 @Observable
 final class TalkModeManager: NSObject {
+    private typealias SpeechRequest = SFSpeechAudioBufferRecognitionRequest
     var isEnabled: Bool = false
     var isListening: Bool = false
     var isSpeaking: Bool = false
@@ -105,9 +106,8 @@ final class TalkModeManager: NSObject {
         let input = self.audioEngine.inputNode
         let format = input.outputFormat(forBus: 0)
         input.removeTap(onBus: 0)
-        input.installTap(onBus: 0, bufferSize: 2048, format: format) { [weak request] buffer, _ in
-            request?.append(buffer)
-        }
+        let tapBlock = Self.makeAudioTapAppendCallback(request: request)
+        input.installTap(onBus: 0, bufferSize: 2048, format: format, block: tapBlock)
 
         self.audioEngine.prepare()
         try self.audioEngine.start()
@@ -135,6 +135,12 @@ final class TalkModeManager: NSObject {
         self.speechRecognizer = nil
     }
 
+    private nonisolated static func makeAudioTapAppendCallback(request: SpeechRequest) -> AVAudioNodeTapBlock {
+        { buffer, _ in
+            request.append(buffer)
+        }
+    }
+
     private func handleTranscript(transcript: String, isFinal: Bool) async {
         let trimmed = transcript.trimmingCharacters(in: .whitespacesAndNewlines)
         if self.isSpeaking, self.interruptOnSpeech {

From b5ae2ccc3c1ed1602536aaf31a9aa4c22a356d2f Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 05:27:11 +0100
Subject: [PATCH 042/100] fix(voice): sync talk mode chat events

---
 .../clawdis/node/voice/TalkModeManager.kt     | 38 ++++++++
 apps/ios/Sources/Voice/TalkModeManager.swift  | 62 +++++++++++++
 .../Sources/Clawdis/GatewayConnection.swift   |  5 +-
 .../Sources/ClawdisChatUI/ChatViewModel.swift | 11 ++-
 src/gateway/server.test.ts                    | 92 ++++++++++++++++++-
 src/gateway/server.ts                         |  7 ++
 6 files changed, 210 insertions(+), 5 deletions(-)

diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
index 2bf35a276..de32c95c3 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
@@ -84,20 +84,24 @@ class TalkModeManager(
   private var session: BridgeSession? = null
   private var pendingRunId: String? = null
   private var pendingFinal: CompletableDeferred<Boolean>? = null
+  private var chatSubscribed = false
 
   private var player: MediaPlayer? = null
   private var currentAudioFile: File? = null
 
   fun attachSession(session: BridgeSession) {
     this.session = session
+    chatSubscribed = false
   }
 
   fun setEnabled(enabled: Boolean) {
     if (_isEnabled.value == enabled) return
     _isEnabled.value = enabled
     if (enabled) {
+      Log.d(tag, "enabled")
       start()
     } else {
+      Log.d(tag, "disabled")
       stop()
     }
   }
@@ -127,9 +131,11 @@ class TalkModeManager(
       if (_isListening.value) return@post
       stopRequested = false
       listeningMode = true
+      Log.d(tag, "start")
 
       if (!SpeechRecognizer.isRecognitionAvailable(context)) {
         _statusText.value = "Speech recognizer unavailable"
+        Log.w(tag, "speech recognizer unavailable")
         return@post
       }
 
@@ -138,6 +144,7 @@ class TalkModeManager(
           PackageManager.PERMISSION_GRANTED
       if (!micOk) {
         _statusText.value = "Microphone permission required"
+        Log.w(tag, "microphone permission required")
         return@post
       }
 
@@ -146,8 +153,10 @@ class TalkModeManager(
         recognizer = SpeechRecognizer.createSpeechRecognizer(context).also { it.setRecognitionListener(listener) }
         startListeningInternal(markListening = true)
         startSilenceMonitor()
+        Log.d(tag, "listening")
       } catch (err: Throwable) {
         _statusText.value = "Start failed: ${err.message ?: err::class.simpleName}"
+        Log.w(tag, "start failed: ${err.message ?: err::class.simpleName}")
       }
     }
   }
@@ -164,6 +173,7 @@ class TalkModeManager(
     _isListening.value = false
     _statusText.value = "Off"
     stopSpeaking()
+    chatSubscribed = false
 
     mainHandler.post {
       recognizer?.cancel()
@@ -264,28 +274,36 @@ class TalkModeManager(
     val bridge = session
     if (bridge == null) {
       _statusText.value = "Bridge not connected"
+      Log.w(tag, "finalize: bridge not connected")
       start()
       return
     }
 
     try {
       val startedAt = System.currentTimeMillis().toDouble() / 1000.0
+      subscribeChatIfNeeded(bridge = bridge, sessionKey = "main")
+      Log.d(tag, "chat.send start chars=${prompt.length}")
       val runId = sendChat(prompt, bridge)
+      Log.d(tag, "chat.send ok runId=$runId")
       val ok = waitForChatFinal(runId)
       if (!ok) {
         _statusText.value = "No reply"
+        Log.w(tag, "chat final timeout runId=$runId")
         start()
         return
       }
       val assistant = waitForAssistantText(bridge, startedAt, 12_000)
       if (assistant.isNullOrBlank()) {
         _statusText.value = "No reply"
+        Log.w(tag, "assistant text timeout runId=$runId")
         start()
         return
       }
+      Log.d(tag, "assistant text ok chars=${assistant.length}")
       playAssistant(assistant)
     } catch (err: Throwable) {
       _statusText.value = "Talk failed: ${err.message ?: err::class.simpleName}"
+      Log.w(tag, "finalize failed: ${err.message ?: err::class.simpleName}")
     }
 
     if (_isEnabled.value) {
@@ -293,6 +311,19 @@ class TalkModeManager(
     }
   }
 
+  private suspend fun subscribeChatIfNeeded(bridge: BridgeSession, sessionKey: String) {
+    if (chatSubscribed) return
+    val key = sessionKey.trim()
+    if (key.isEmpty()) return
+    try {
+      bridge.sendEvent("chat.subscribe", """{"sessionKey":"$key"}""")
+      chatSubscribed = true
+      Log.d(tag, "chat.subscribe ok sessionKey=$key")
+    } catch (err: Throwable) {
+      Log.w(tag, "chat.subscribe failed sessionKey=$key err=${err.message ?: err::class.java.simpleName}")
+    }
+  }
+
   private fun buildPrompt(transcript: String): String {
     val lines = mutableListOf(
       "Talk Mode active. Reply in a concise, spoken tone.",
@@ -410,6 +441,7 @@ class TalkModeManager(
     val voiceId = directive?.voiceId ?: currentVoiceId ?: defaultVoiceId
     if (voiceId.isNullOrBlank()) {
       _statusText.value = "Missing voice ID"
+      Log.w(tag, "missing voiceId")
       return
     }
 
@@ -418,6 +450,7 @@ class TalkModeManager(
         ?: System.getenv("ELEVENLABS_API_KEY")?.trim()
     if (apiKey.isNullOrEmpty()) {
       _statusText.value = "Missing ELEVENLABS_API_KEY"
+      Log.w(tag, "missing ELEVENLABS_API_KEY")
       return
     }
 
@@ -427,6 +460,7 @@ class TalkModeManager(
     ensureInterruptListener()
 
     try {
+      val ttsStarted = SystemClock.elapsedRealtime()
       val request =
         ElevenLabsRequest(
           text = cleaned,
@@ -442,9 +476,11 @@ class TalkModeManager(
           language = TalkModeRuntime.validatedLanguage(directive?.language),
         )
       val audio = synthesize(voiceId = voiceId, apiKey = apiKey, request = request)
+      Log.d(tag, "elevenlabs ok bytes=${audio.size} durMs=${SystemClock.elapsedRealtime() - ttsStarted}")
       playAudio(audio)
     } catch (err: Throwable) {
       _statusText.value = "Speak failed: ${err.message ?: err::class.simpleName}"
+      Log.w(tag, "speak failed: ${err.message ?: err::class.simpleName}")
     }
 
     _isSpeaking.value = false
@@ -480,11 +516,13 @@ class TalkModeManager(
       player.prepareAsync()
     }
 
+    Log.d(tag, "play start")
     try {
       finished.await()
     } finally {
       cleanupPlayer()
     }
+    Log.d(tag, "play done")
   }
 
   private fun stopSpeaking(resetInterrupt: Boolean = true) {
diff --git a/apps/ios/Sources/Voice/TalkModeManager.swift b/apps/ios/Sources/Voice/TalkModeManager.swift
index c11b890a9..6e2e5440d 100644
--- a/apps/ios/Sources/Voice/TalkModeManager.swift
+++ b/apps/ios/Sources/Voice/TalkModeManager.swift
@@ -3,6 +3,7 @@ import ClawdisKit
 import Foundation
 import Observation
 import Speech
+import OSLog
 
 @MainActor
 @Observable
@@ -36,6 +37,9 @@ final class TalkModeManager: NSObject {
     private let silenceWindow: TimeInterval = 0.7
 
     private var player: AVAudioPlayer?
+    private var chatSubscribedSessionKeys = Set<String>()
+
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "TalkMode")
 
     func attachBridge(_ bridge: BridgeSession) {
         self.bridge = bridge
@@ -44,8 +48,10 @@ final class TalkModeManager: NSObject {
     func setEnabled(_ enabled: Bool) {
         self.isEnabled = enabled
         if enabled {
+            self.logger.info("enabled")
             Task { await self.start() }
         } else {
+            self.logger.info("disabled")
             self.stop()
         }
     }
@@ -54,14 +60,17 @@ final class TalkModeManager: NSObject {
         guard self.isEnabled else { return }
         if self.isListening { return }
 
+        self.logger.info("start")
         self.statusText = "Requesting permissions…"
         let micOk = await Self.requestMicrophonePermission()
         guard micOk else {
+            self.logger.warning("start blocked: microphone permission denied")
             self.statusText = "Microphone permission denied"
             return
         }
         let speechOk = await Self.requestSpeechPermission()
         guard speechOk else {
+            self.logger.warning("start blocked: speech permission denied")
             self.statusText = "Speech recognition permission denied"
             return
         }
@@ -73,9 +82,12 @@ final class TalkModeManager: NSObject {
             self.isListening = true
             self.statusText = "Listening"
             self.startSilenceMonitor()
+            await self.subscribeChatIfNeeded(sessionKey: "main")
+            self.logger.info("listening")
         } catch {
             self.isListening = false
             self.statusText = "Start failed: \(error.localizedDescription)"
+            self.logger.error("start failed: \(error.localizedDescription, privacy: .public)")
         }
     }
 
@@ -89,6 +101,11 @@ final class TalkModeManager: NSObject {
         self.silenceTask = nil
         self.stopRecognition()
         self.stopSpeaking()
+        Task { await self.unsubscribeAllChats() }
+    }
+
+    func userTappedOrb() {
+        self.stopSpeaking()
     }
 
     private func startRecognition() throws {
@@ -191,16 +208,21 @@ final class TalkModeManager: NSObject {
         let prompt = self.buildPrompt(transcript: transcript)
         guard let bridge else {
             self.statusText = "Bridge not connected"
+            self.logger.warning("finalize: bridge not connected")
             await self.start()
             return
         }
 
         do {
             let startedAt = Date().timeIntervalSince1970
+            await self.subscribeChatIfNeeded(sessionKey: "main")
+            self.logger.info("chat.send start chars=\(prompt.count, privacy: .public)")
             let runId = try await self.sendChat(prompt, bridge: bridge)
+            self.logger.info("chat.send ok runId=\(runId, privacy: .public)")
             let ok = await self.waitForChatFinal(runId: runId, bridge: bridge)
             if !ok {
                 self.statusText = "No reply"
+                self.logger.warning("chat final timeout runId=\(runId, privacy: .public)")
                 await self.start()
                 return
             }
@@ -211,17 +233,50 @@ final class TalkModeManager: NSObject {
                 timeoutSeconds: 12)
             else {
                 self.statusText = "No reply"
+                self.logger.warning("assistant text timeout runId=\(runId, privacy: .public)")
                 await self.start()
                 return
             }
+            self.logger.info("assistant text ok chars=\(assistantText.count, privacy: .public)")
             await self.playAssistant(text: assistantText)
         } catch {
             self.statusText = "Talk failed: \(error.localizedDescription)"
+            self.logger.error("finalize failed: \(error.localizedDescription, privacy: .public)")
         }
 
         await self.start()
     }
 
+    private func subscribeChatIfNeeded(sessionKey: String) async {
+        let key = sessionKey.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !key.isEmpty else { return }
+        guard let bridge else { return }
+        guard !self.chatSubscribedSessionKeys.contains(key) else { return }
+
+        do {
+            let payload = "{\"sessionKey\":\"\(key)\"}"
+            try await bridge.sendEvent(event: "chat.subscribe", payloadJSON: payload)
+            self.chatSubscribedSessionKeys.insert(key)
+            self.logger.info("chat.subscribe ok sessionKey=\(key, privacy: .public)")
+        } catch {
+            self.logger.warning("chat.subscribe failed sessionKey=\(key, privacy: .public) err=\(error.localizedDescription, privacy: .public)")
+        }
+    }
+
+    private func unsubscribeAllChats() async {
+        guard let bridge else { return }
+        let keys = self.chatSubscribedSessionKeys
+        self.chatSubscribedSessionKeys.removeAll()
+        for key in keys {
+            do {
+                let payload = "{\"sessionKey\":\"\(key)\"}"
+                try await bridge.sendEvent(event: "chat.unsubscribe", payloadJSON: payload)
+            } catch {
+                // ignore
+            }
+        }
+    }
+
     private func buildPrompt(transcript: String) -> String {
         var lines: [String] = [
             "Talk Mode active. Reply in a concise, spoken tone.",
@@ -326,6 +381,7 @@ final class TalkModeManager: NSObject {
         let voiceId = directive?.voiceId ?? self.currentVoiceId ?? self.defaultVoiceId
         guard let voiceId, !voiceId.isEmpty else {
             self.statusText = "Missing voice ID"
+            self.logger.error("missing voiceId")
             return
         }
 
@@ -334,6 +390,7 @@ final class TalkModeManager: NSObject {
             ProcessInfo.processInfo.environment["ELEVENLABS_API_KEY"]
         guard let apiKey = resolvedKey, !apiKey.isEmpty else {
             self.statusText = "Missing ELEVENLABS_API_KEY"
+            self.logger.error("missing ELEVENLABS_API_KEY")
             return
         }
 
@@ -342,6 +399,7 @@ final class TalkModeManager: NSObject {
         self.lastSpokenText = cleaned
 
         do {
+            let started = Date()
             let request = ElevenLabsRequest(
                 text: cleaned,
                 modelId: directive?.modelId ?? self.currentModelId ?? self.defaultModelId,
@@ -359,9 +417,11 @@ final class TalkModeManager: NSObject {
             let audio = try await ElevenLabsClient(apiKey: apiKey).synthesize(
                 voiceId: voiceId,
                 request: request)
+            self.logger.info("elevenlabs ok bytes=\(audio.count, privacy: .public) dur=\(Date().timeIntervalSince(started), privacy: .public)s")
             try await self.playAudio(data: audio)
         } catch {
             self.statusText = "Speak failed: \(error.localizedDescription)"
+            self.logger.error("speak failed: \(error.localizedDescription, privacy: .public)")
         }
 
         self.isSpeaking = false
@@ -372,10 +432,12 @@ final class TalkModeManager: NSObject {
         let player = try AVAudioPlayer(data: data)
         self.player = player
         player.prepareToPlay()
+        self.logger.info("play start")
         player.play()
         while player.isPlaying {
             try? await Task.sleep(nanoseconds: 120_000_000)
         }
+        self.logger.info("play done")
     }
 
     private func stopSpeaking() {
diff --git a/apps/macos/Sources/Clawdis/GatewayConnection.swift b/apps/macos/Sources/Clawdis/GatewayConnection.swift
index 289507cc5..cd87eea2c 100644
--- a/apps/macos/Sources/Clawdis/GatewayConnection.swift
+++ b/apps/macos/Sources/Clawdis/GatewayConnection.swift
@@ -473,7 +473,10 @@ extension GatewayConnection {
             params["attachments"] = AnyCodable(encoded)
         }
 
-        return try await self.requestDecoded(method: .chatSend, params: params)
+        return try await self.requestDecoded(
+            method: .chatSend,
+            params: params,
+            timeoutMs: Double(timeoutMs))
     }
 
     func chatAbort(sessionKey: String, runId: String) async throws -> Bool {
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatViewModel.swift b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatViewModel.swift
index 4c96b8075..4936d4438 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatViewModel.swift
+++ b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatViewModel.swift
@@ -293,8 +293,15 @@ public final class ClawdisChatViewModel {
             return
         }
 
-        if let runId = chat.runId, !self.pendingRuns.contains(runId) {
-            // Ignore events for other runs.
+        let isOurRun = chat.runId.flatMap { self.pendingRuns.contains($0) } ?? false
+        if !isOurRun {
+            // Keep multiple clients in sync: if another client finishes a run for our session, refresh history.
+            switch chat.state {
+            case "final", "aborted", "error":
+                Task { await self.refreshHistoryAfterRun() }
+            default:
+                break
+            }
             return
         }
 
diff --git a/src/gateway/server.test.ts b/src/gateway/server.test.ts
index dec83329d..22852c049 100644
--- a/src/gateway/server.test.ts
+++ b/src/gateway/server.test.ts
@@ -435,7 +435,10 @@ async function waitForSystemEvent(timeoutMs = 2000) {
 }
 
 describe("gateway server", () => {
-  test("voicewake.get returns defaults and voicewake.set broadcasts", async () => {
+  test(
+    "voicewake.get returns defaults and voicewake.set broadcasts",
+    { timeout: 15_000 },
+    async () => {
     const homeDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdis-home-"));
     const prevHome = process.env.HOME;
     process.env.HOME = homeDir;
@@ -486,7 +489,8 @@ describe("gateway server", () => {
     } else {
       process.env.HOME = prevHome;
     }
-  });
+    },
+  );
 
   test("models.list returns model catalog", async () => {
     piSdkMock.enabled = true;
@@ -3328,6 +3332,90 @@ describe("gateway server", () => {
     await server.close();
   });
 
+  test("bridge voice transcript triggers chat events for webchat clients", async () => {
+    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdis-gw-"));
+    testSessionStorePath = path.join(dir, "sessions.json");
+    await fs.writeFile(
+      testSessionStorePath,
+      JSON.stringify(
+        {
+          main: {
+            sessionId: "sess-main",
+            updatedAt: Date.now(),
+          },
+        },
+        null,
+        2,
+      ),
+      "utf-8",
+    );
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws, {
+      client: {
+        name: "webchat",
+        version: "1.0.0",
+        platform: "test",
+        mode: "webchat",
+      },
+    });
+
+    const bridgeCall = bridgeStartCalls.at(-1);
+    expect(bridgeCall?.onEvent).toBeDefined();
+
+    const isVoiceFinalChatEvent = (o: unknown) => {
+      if (!o || typeof o !== "object") return false;
+      const rec = o as Record<string, unknown>;
+      if (rec.type !== "event" || rec.event !== "chat") return false;
+      if (!rec.payload || typeof rec.payload !== "object") return false;
+      const payload = rec.payload as Record<string, unknown>;
+      const runId = typeof payload.runId === "string" ? payload.runId : "";
+      const state = typeof payload.state === "string" ? payload.state : "";
+      return runId.startsWith("voice-") && state === "final";
+    };
+
+    const finalChatP = onceMessage<{
+      type: "event";
+      event: string;
+      payload?: unknown;
+    }>(ws, isVoiceFinalChatEvent, 8000);
+
+    await bridgeCall?.onEvent?.("ios-node", {
+      event: "voice.transcript",
+      payloadJSON: JSON.stringify({ text: "hello", sessionKey: "main" }),
+    });
+
+    emitAgentEvent({
+      runId: "sess-main",
+      seq: 1,
+      ts: Date.now(),
+      stream: "assistant",
+      data: { text: "hi from agent" },
+    });
+    emitAgentEvent({
+      runId: "sess-main",
+      seq: 2,
+      ts: Date.now(),
+      stream: "job",
+      data: { state: "done" },
+    });
+
+    const evt = await finalChatP;
+    const payload =
+      evt.payload && typeof evt.payload === "object"
+        ? (evt.payload as Record<string, unknown>)
+        : {};
+    expect(payload.sessionKey).toBe("main");
+    const message =
+      payload.message && typeof payload.message === "object"
+        ? (payload.message as Record<string, unknown>)
+        : {};
+    expect(message.role).toBe("assistant");
+
+    ws.close();
+    await server.close();
+  });
+
   test("bridge chat.abort cancels while saving the session store", async () => {
     const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdis-gw-"));
     testSessionStorePath = path.join(dir, "sessions.json");
diff --git a/src/gateway/server.ts b/src/gateway/server.ts
index db6e506f8..c6f259b96 100644
--- a/src/gateway/server.ts
+++ b/src/gateway/server.ts
@@ -3064,6 +3064,13 @@ export async function startGatewayServer(
           await saveSessionStore(storePath, store);
         }
 
+        // Ensure chat UI clients refresh when this run completes (even though it wasn't started via chat.send).
+        // This maps agent bus events (keyed by sessionId) to chat events (keyed by clientRunId).
+        chatRunSessions.set(sessionId, {
+          sessionKey,
+          clientRunId: `voice-${randomUUID()}`,
+        });
+
         void agentCommand(
           {
             message: text,

From b3f2416a09f1b4edcc89366618479d1686a0c12a Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 05:27:18 +0100
Subject: [PATCH 043/100] test: reduce flaky timeouts

---
 src/browser/screenshot.test.ts | 6 +++---
 src/web/auto-reply.test.ts     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/browser/screenshot.test.ts b/src/browser/screenshot.test.ts
index 2d5350301..6086fa3a8 100644
--- a/src/browser/screenshot.test.ts
+++ b/src/browser/screenshot.test.ts
@@ -7,8 +7,8 @@ import { normalizeBrowserScreenshot } from "./screenshot.js";
 
 describe("browser screenshot normalization", () => {
   it("shrinks oversized images to <=2000x2000 and <=5MB", async () => {
-    const width = 2800;
-    const height = 2800;
+    const width = 2300;
+    const height = 2300;
     const raw = crypto.randomBytes(width * height * 3);
     const bigPng = await sharp(raw, { raw: { width, height, channels: 3 } })
       .png({ compressionLevel: 0 })
@@ -25,7 +25,7 @@ describe("browser screenshot normalization", () => {
     expect(Number(meta.height)).toBeLessThanOrEqual(2000);
     expect(normalized.buffer[0]).toBe(0xff);
     expect(normalized.buffer[1]).toBe(0xd8);
-  }, 20_000);
+  }, 30_000);
 
   it("keeps already-small screenshots unchanged", async () => {
     const jpeg = await sharp({
diff --git a/src/web/auto-reply.test.ts b/src/web/auto-reply.test.ts
index 271ccceec..c0ca2bf1f 100644
--- a/src/web/auto-reply.test.ts
+++ b/src/web/auto-reply.test.ts
@@ -392,7 +392,7 @@ describe("web auto-reply", () => {
     closeResolvers[1]?.({ status: 499, isLoggedOut: false });
     await Promise.resolve();
     await run;
-  });
+  }, 15_000);
 
   it(
     "stops after hitting max reconnect attempts",

From fb8f72d5a9c25892d6c9674492034b348f66f8d9 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 05:27:29 +0100
Subject: [PATCH 044/100] feat(ui): add centered talk orb

---
 CHANGELOG.md                                  |   4 +
 .../com/steipete/clawdis/node/NodeRuntime.kt  |   2 +-
 .../steipete/clawdis/node/ui/RootScreen.kt    |  14 ++
 .../clawdis/node/ui/TalkOrbOverlay.kt         | 134 ++++++++++++++++++
 apps/ios/Sources/Model/NodeAppModel.swift     |   2 +-
 apps/ios/Sources/RootCanvas.swift             |   6 +
 apps/ios/Sources/Voice/TalkOrbOverlay.swift   |  74 ++++++++++
 apps/macos/Sources/Clawdis/TalkOverlay.swift  |   2 +-
 .../Sources/Clawdis/TalkOverlayView.swift     |  16 +--
 9 files changed, 243 insertions(+), 11 deletions(-)
 create mode 100644 apps/android/app/src/main/java/com/steipete/clawdis/node/ui/TalkOrbOverlay.kt
 create mode 100644 apps/ios/Sources/Voice/TalkOrbOverlay.swift

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00b59c776..7b8b4f870 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,10 @@
 - macOS Talk Mode: avoid stuck playback when the audio player never starts (fail-fast + watchdog).
 - macOS Talk Mode: increase overlay window size so wave rings don’t clip; close button is hover-only and closer to the orb.
 - Talk Mode: wait for chat history to surface the assistant reply before starting TTS (macOS/iOS/Android).
+- iOS/Android Talk Mode: explicitly `chat.subscribe` when Talk Mode is active, so completion events arrive even if the Chat UI isn’t open.
+- Chat UI: refresh history when another client finishes a run in the same session, so Talk Mode + Voice Wake transcripts appear consistently.
+- Gateway: `voice.transcript` now also maps agent bus output to `chat` events, ensuring chat UIs refresh for voice-triggered runs.
+- iOS/Android: show a centered Talk Mode orb overlay while Talk Mode is enabled.
 - Gateway config: inject `talk.apiKey` from `ELEVENLABS_API_KEY`/shell profile so nodes can fetch it on demand.
 - Canvas A2UI: tag requests with `platform=android|ios|macos` and boost Android canvas background contrast.
 - iOS/Android nodes: enable scrolling for loaded web pages in the Canvas WebView (default scaffold stays touch-first).
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
index aa77bd94d..396eb65e9 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
@@ -922,7 +922,7 @@ class NodeRuntime(context: Context) {
 
 private data class Quad<A, B, C, D>(val first: A, val second: B, val third: C, val fourth: D)
 
-private const val DEFAULT_SEAM_COLOR_ARGB: Long = 0xFF9EE0FF
+private const val DEFAULT_SEAM_COLOR_ARGB: Long = 0xFF7FB8D4
 
 private const val a2uiReadyCheckJS: String =
   """
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
index 485014b1b..a404f0490 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
@@ -83,6 +83,9 @@ fun RootScreen(viewModel: MainViewModel) {
   val isForeground by viewModel.isForeground.collectAsState()
   val voiceWakeStatusText by viewModel.voiceWakeStatusText.collectAsState()
   val talkEnabled by viewModel.talkEnabled.collectAsState()
+  val talkStatusText by viewModel.talkStatusText.collectAsState()
+  val talkIsListening by viewModel.talkIsListening.collectAsState()
+  val talkIsSpeaking by viewModel.talkIsSpeaking.collectAsState()
   val seamColorArgb by viewModel.seamColorArgb.collectAsState()
   val seamColor = remember(seamColorArgb) { ComposeColor(seamColorArgb) }
   val audioPermissionLauncher =
@@ -267,6 +270,17 @@ fun RootScreen(viewModel: MainViewModel) {
     }
   }
 
+  if (talkEnabled) {
+    Popup(alignment = Alignment.Center, properties = PopupProperties(focusable = false)) {
+      TalkOrbOverlay(
+        seamColor = seamColor,
+        statusText = talkStatusText,
+        isListening = talkIsListening,
+        isSpeaking = talkIsSpeaking,
+      )
+    }
+  }
+
   val currentSheet = sheet
   if (currentSheet != null) {
     ModalBottomSheet(
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/TalkOrbOverlay.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/TalkOrbOverlay.kt
new file mode 100644
index 000000000..38b8e819e
--- /dev/null
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/TalkOrbOverlay.kt
@@ -0,0 +1,134 @@
+package com.steipete.clawdis.node.ui
+
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun TalkOrbOverlay(
+  seamColor: Color,
+  statusText: String,
+  isListening: Boolean,
+  isSpeaking: Boolean,
+  modifier: Modifier = Modifier,
+) {
+  val transition = rememberInfiniteTransition(label = "talk-orb")
+  val t by
+    transition.animateFloat(
+      initialValue = 0f,
+      targetValue = 1f,
+      animationSpec =
+        infiniteRepeatable(
+          animation = tween(durationMillis = 1500, easing = LinearEasing),
+          repeatMode = RepeatMode.Restart,
+        ),
+      label = "pulse",
+    )
+
+  val trimmed = statusText.trim()
+  val showStatus = trimmed.isNotEmpty() && trimmed != "Off"
+  val phase =
+    when {
+      isSpeaking -> "Speaking"
+      isListening -> "Listening"
+      else -> "Thinking"
+    }
+
+  Column(
+    modifier = modifier.padding(24.dp),
+    horizontalAlignment = Alignment.CenterHorizontally,
+    verticalArrangement = Arrangement.spacedBy(12.dp),
+  ) {
+    Box(contentAlignment = Alignment.Center) {
+      Canvas(modifier = Modifier.size(240.dp)) {
+        val center = this.center
+        val baseRadius = size.minDimension * 0.27f
+
+        val ring1 = 1.05f + (t * 0.25f)
+        val ring2 = 1.20f + (t * 0.55f)
+        val ringAlpha1 = (1f - t) * 0.34f
+        val ringAlpha2 = (1f - t) * 0.22f
+
+        drawCircle(
+          color = seamColor.copy(alpha = ringAlpha1),
+          radius = baseRadius * ring1,
+          center = center,
+          style = Stroke(width = 3.dp.toPx()),
+        )
+        drawCircle(
+          color = seamColor.copy(alpha = ringAlpha2),
+          radius = baseRadius * ring2,
+          center = center,
+          style = Stroke(width = 3.dp.toPx()),
+        )
+
+        drawCircle(
+          brush =
+            Brush.radialGradient(
+              colors =
+                listOf(
+                  seamColor.copy(alpha = 0.92f),
+                  seamColor.copy(alpha = 0.40f),
+                  Color.Black.copy(alpha = 0.56f),
+                ),
+              center = center,
+              radius = baseRadius * 1.35f,
+            ),
+          radius = baseRadius,
+          center = center,
+        )
+
+        drawCircle(
+          color = seamColor.copy(alpha = 0.34f),
+          radius = baseRadius,
+          center = center,
+          style = Stroke(width = 1.dp.toPx()),
+        )
+      }
+    }
+
+    if (showStatus) {
+      Surface(
+        color = Color.Black.copy(alpha = 0.40f),
+        shape = CircleShape,
+      ) {
+        Text(
+          text = trimmed,
+          modifier = Modifier.padding(horizontal = 14.dp, vertical = 8.dp),
+          color = Color.White.copy(alpha = 0.92f),
+          style = MaterialTheme.typography.labelLarge,
+          fontWeight = FontWeight.SemiBold,
+        )
+      }
+    } else {
+      Text(
+        text = phase,
+        color = Color.White.copy(alpha = 0.80f),
+        style = MaterialTheme.typography.labelLarge,
+        fontWeight = FontWeight.SemiBold,
+      )
+    }
+  }
+}
diff --git a/apps/ios/Sources/Model/NodeAppModel.swift b/apps/ios/Sources/Model/NodeAppModel.swift
index 02cf7c9af..26b5e4f1a 100644
--- a/apps/ios/Sources/Model/NodeAppModel.swift
+++ b/apps/ios/Sources/Model/NodeAppModel.swift
@@ -290,7 +290,7 @@ final class NodeAppModel {
         Self.color(fromHex: self.seamColorHex) ?? Self.defaultSeamColor
     }
 
-    private static let defaultSeamColor = Color(red: 0.62, green: 0.88, blue: 1.0)
+    private static let defaultSeamColor = Color(red: 127 / 255.0, green: 184 / 255.0, blue: 212 / 255.0)
 
     private static func color(fromHex raw: String?) -> Color? {
         let trimmed = (raw ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
diff --git a/apps/ios/Sources/RootCanvas.swift b/apps/ios/Sources/RootCanvas.swift
index 17f02c79c..2ca28a15b 100644
--- a/apps/ios/Sources/RootCanvas.swift
+++ b/apps/ios/Sources/RootCanvas.swift
@@ -166,6 +166,12 @@ private struct CanvasContent: View {
             .padding(.top, 10)
             .padding(.trailing, 10)
         }
+        .overlay(alignment: .center) {
+            if self.appModel.talkMode.isEnabled {
+                TalkOrbOverlay()
+                    .transition(.opacity)
+            }
+        }
         .overlay(alignment: .topLeading) {
             StatusPill(
                 bridge: self.bridgeStatus,
diff --git a/apps/ios/Sources/Voice/TalkOrbOverlay.swift b/apps/ios/Sources/Voice/TalkOrbOverlay.swift
new file mode 100644
index 000000000..84a0b56c5
--- /dev/null
+++ b/apps/ios/Sources/Voice/TalkOrbOverlay.swift
@@ -0,0 +1,74 @@
+import SwiftUI
+
+struct TalkOrbOverlay: View {
+    @Environment(NodeAppModel.self) private var appModel
+    @State private var pulse: Bool = false
+
+    var body: some View {
+        let seam = self.appModel.seamColor
+        let status = self.appModel.talkMode.statusText.trimmingCharacters(in: .whitespacesAndNewlines)
+
+        VStack(spacing: 14) {
+            ZStack {
+                Circle()
+                    .stroke(seam.opacity(0.26), lineWidth: 2)
+                    .frame(width: 220, height: 220)
+                    .scaleEffect(self.pulse ? 1.15 : 0.96)
+                    .opacity(self.pulse ? 0.0 : 1.0)
+                    .animation(.easeOut(duration: 1.3).repeatForever(autoreverses: false), value: self.pulse)
+
+                Circle()
+                    .stroke(seam.opacity(0.18), lineWidth: 2)
+                    .frame(width: 220, height: 220)
+                    .scaleEffect(self.pulse ? 1.45 : 1.02)
+                    .opacity(self.pulse ? 0.0 : 0.9)
+                    .animation(.easeOut(duration: 1.9).repeatForever(autoreverses: false).delay(0.2), value: self.pulse)
+
+                Circle()
+                    .fill(
+                        RadialGradient(
+                            colors: [
+                                seam.opacity(0.95),
+                                seam.opacity(0.40),
+                                Color.black.opacity(0.55),
+                            ],
+                            center: .center,
+                            startRadius: 1,
+                            endRadius: 92))
+                    .frame(width: 136, height: 136)
+                    .overlay(
+                        Circle()
+                            .stroke(seam.opacity(0.35), lineWidth: 1)
+                    )
+                    .shadow(color: seam.opacity(0.32), radius: 26, x: 0, y: 0)
+                    .shadow(color: Color.black.opacity(0.50), radius: 22, x: 0, y: 10)
+            }
+            .contentShape(Circle())
+            .onTapGesture {
+                self.appModel.talkMode.userTappedOrb()
+            }
+
+            if !status.isEmpty, status != "Off" {
+                Text(status)
+                    .font(.system(.footnote, design: .rounded).weight(.semibold))
+                    .foregroundStyle(Color.white.opacity(0.92))
+                    .padding(.horizontal, 12)
+                    .padding(.vertical, 8)
+                    .background(
+                        Capsule()
+                            .fill(Color.black.opacity(0.40))
+                            .overlay(
+                                Capsule().stroke(seam.opacity(0.22), lineWidth: 1)
+                            )
+                    )
+            }
+        }
+        .padding(28)
+        .onAppear {
+            self.pulse = true
+        }
+        .accessibilityElement(children: .combine)
+        .accessibilityLabel("Talk Mode \(status)")
+    }
+}
+
diff --git a/apps/macos/Sources/Clawdis/TalkOverlay.swift b/apps/macos/Sources/Clawdis/TalkOverlay.swift
index f36745df0..9ed8f2cb0 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlay.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlay.swift
@@ -7,7 +7,7 @@ import SwiftUI
 @Observable
 final class TalkOverlayController {
     static let shared = TalkOverlayController()
-    static let overlaySize: CGFloat = 220
+    static let overlaySize: CGFloat = 260
 
     private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.overlay")
 
diff --git a/apps/macos/Sources/Clawdis/TalkOverlayView.swift b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
index d502e21ad..1dbc85277 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlayView.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
@@ -26,21 +26,21 @@ struct TalkOverlayView: View {
                             .frame(width: 18, height: 18)
                             .background(Color.black.opacity(0.4))
                             .clipShape(Circle())
-                    }
-                    .buttonStyle(.plain)
-                    .contentShape(Circle())
-                    .offset(x: -10, y: -10)
-                    .opacity(self.hoveringWindow ? 1 : 0)
-                    .animation(.easeOut(duration: 0.12), value: self.hoveringWindow)
-                    .allowsHitTesting(self.hoveringWindow)
                 }
+                .buttonStyle(.plain)
+                .contentShape(Circle())
+                .offset(x: -7, y: -7)
+                .opacity(self.hoveringWindow ? 1 : 0)
+                .animation(.easeOut(duration: 0.12), value: self.hoveringWindow)
+                .allowsHitTesting(self.hoveringWindow)
+            }
         }
         .frame(width: TalkOverlayController.overlaySize, height: TalkOverlayController.overlaySize, alignment: .center)
         .contentShape(Rectangle())
         .onHover { self.hoveringWindow = $0 }
     }
 
-    private static let defaultSeamColor = Color(red: 0.62, green: 0.88, blue: 1.0)
+    private static let defaultSeamColor = Color(red: 127 / 255.0, green: 184 / 255.0, blue: 212 / 255.0)
 
     private var seamColor: Color {
         Self.color(fromHex: self.appState.seamColorHex) ?? Self.defaultSeamColor

From dcee8beb995a6380808def3f7636f1b5a976c28a Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 05:34:53 +0100
Subject: [PATCH 045/100] style: biome format gateway server tests

---
 src/gateway/server.test.ts | 86 ++++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 41 deletions(-)

diff --git a/src/gateway/server.test.ts b/src/gateway/server.test.ts
index 22852c049..29af940d7 100644
--- a/src/gateway/server.test.ts
+++ b/src/gateway/server.test.ts
@@ -439,56 +439,60 @@ describe("gateway server", () => {
     "voicewake.get returns defaults and voicewake.set broadcasts",
     { timeout: 15_000 },
     async () => {
-    const homeDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdis-home-"));
-    const prevHome = process.env.HOME;
-    process.env.HOME = homeDir;
+      const homeDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdis-home-"));
+      const prevHome = process.env.HOME;
+      process.env.HOME = homeDir;
 
-    const { server, ws } = await startServerWithClient();
-    await connectOk(ws);
+      const { server, ws } = await startServerWithClient();
+      await connectOk(ws);
 
-    const initial = await rpcReq<{ triggers: string[] }>(ws, "voicewake.get");
-    expect(initial.ok).toBe(true);
-    expect(initial.payload?.triggers).toEqual(["clawd", "claude", "computer"]);
+      const initial = await rpcReq<{ triggers: string[] }>(ws, "voicewake.get");
+      expect(initial.ok).toBe(true);
+      expect(initial.payload?.triggers).toEqual([
+        "clawd",
+        "claude",
+        "computer",
+      ]);
 
-    const changedP = onceMessage<{
-      type: "event";
-      event: string;
-      payload?: unknown;
-    }>(ws, (o) => o.type === "event" && o.event === "voicewake.changed");
+      const changedP = onceMessage<{
+        type: "event";
+        event: string;
+        payload?: unknown;
+      }>(ws, (o) => o.type === "event" && o.event === "voicewake.changed");
 
-    const setRes = await rpcReq<{ triggers: string[] }>(ws, "voicewake.set", {
-      triggers: ["  hi  ", "", "there"],
-    });
-    expect(setRes.ok).toBe(true);
-    expect(setRes.payload?.triggers).toEqual(["hi", "there"]);
+      const setRes = await rpcReq<{ triggers: string[] }>(ws, "voicewake.set", {
+        triggers: ["  hi  ", "", "there"],
+      });
+      expect(setRes.ok).toBe(true);
+      expect(setRes.payload?.triggers).toEqual(["hi", "there"]);
 
-    const changed = await changedP;
-    expect(changed.event).toBe("voicewake.changed");
-    expect(
-      (changed.payload as { triggers?: unknown } | undefined)?.triggers,
-    ).toEqual(["hi", "there"]);
+      const changed = await changedP;
+      expect(changed.event).toBe("voicewake.changed");
+      expect(
+        (changed.payload as { triggers?: unknown } | undefined)?.triggers,
+      ).toEqual(["hi", "there"]);
 
-    const after = await rpcReq<{ triggers: string[] }>(ws, "voicewake.get");
-    expect(after.ok).toBe(true);
-    expect(after.payload?.triggers).toEqual(["hi", "there"]);
+      const after = await rpcReq<{ triggers: string[] }>(ws, "voicewake.get");
+      expect(after.ok).toBe(true);
+      expect(after.payload?.triggers).toEqual(["hi", "there"]);
 
-    const onDisk = JSON.parse(
-      await fs.readFile(
-        path.join(homeDir, ".clawdis", "settings", "voicewake.json"),
-        "utf8",
-      ),
-    ) as { triggers?: unknown; updatedAtMs?: unknown };
-    expect(onDisk.triggers).toEqual(["hi", "there"]);
-    expect(typeof onDisk.updatedAtMs).toBe("number");
+      const onDisk = JSON.parse(
+        await fs.readFile(
+          path.join(homeDir, ".clawdis", "settings", "voicewake.json"),
+          "utf8",
+        ),
+      ) as { triggers?: unknown; updatedAtMs?: unknown };
+      expect(onDisk.triggers).toEqual(["hi", "there"]);
+      expect(typeof onDisk.updatedAtMs).toBe("number");
 
-    ws.close();
-    await server.close();
+      ws.close();
+      await server.close();
 
-    if (prevHome === undefined) {
-      delete process.env.HOME;
-    } else {
-      process.env.HOME = prevHome;
-    }
+      if (prevHome === undefined) {
+        delete process.env.HOME;
+      } else {
+        process.env.HOME = prevHome;
+      }
     },
   );
 

From be2bc61d38788788005e6bf5e9be1cd2af8689ef Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 05:46:47 +0100
Subject: [PATCH 046/100] fix(talk): hard-timeout ElevenLabs synthesis

---
 CHANGELOG.md                                  |  1 +
 .../Sources/Clawdis/TalkModeRuntime.swift     | 48 +++++++++++++++++--
 apps/macos/Sources/Clawdis/TalkOverlay.swift  |  2 +-
 .../Sources/Clawdis/TalkOverlayView.swift     |  4 +-
 4 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b8b4f870..079a12308 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - macOS menu: add a Talk Mode action alongside the Open Dashboard/Chat/Canvas entries.
 - macOS Debug: hide “Restart Gateway” when the app won’t start a local gateway (remote mode / attach-only).
 - macOS Talk Mode: orb overlay refresh, ElevenLabs request logging, API key status in settings, and auto-select first voice when none is configured.
+- macOS Talk Mode: add hard timeout around ElevenLabs TTS synthesis to avoid getting stuck “speaking” forever on hung requests.
 - macOS Talk Mode: avoid stuck playback when the audio player never starts (fail-fast + watchdog).
 - macOS Talk Mode: increase overlay window size so wave rings don’t clip; close button is hover-only and closer to the orb.
 - Talk Mode: wait for chat history to surface the assistant reply before starting TTS (macOS/iOS/Android).
diff --git a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
index 73c26a9e5..7f5280805 100644
--- a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
+++ b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
@@ -245,6 +245,7 @@ actor TalkModeRuntime {
         let prompt = self.buildPrompt(transcript: transcript)
         let runId = UUID().uuidString
         let startedAt = Date().timeIntervalSince1970
+        self.logger.info("talk send start runId=\(runId, privacy: .public) chars=\(prompt.count, privacy: .public)")
 
         do {
             let response = try await GatewayConnection.shared.chatSend(
@@ -253,9 +254,11 @@ actor TalkModeRuntime {
                 thinking: "low",
                 idempotencyKey: runId,
                 attachments: [])
+            self.logger.info("talk chat.send ok runId=\(response.runId, privacy: .public)")
             let completion = await self.waitForChatCompletion(
                 runId: response.runId,
                 timeoutSeconds: 120)
+            self.logger.info("talk chat completion runId=\(response.runId, privacy: .public) state=\(String(describing: completion), privacy: .public)")
             guard completion == .final else {
                 await self.startListening()
                 await self.startRecognition()
@@ -267,11 +270,13 @@ actor TalkModeRuntime {
                 since: startedAt,
                 timeoutSeconds: 12)
             else {
+                self.logger.warning("talk assistant text missing after completion")
                 await self.startListening()
                 await self.startRecognition()
                 return
             }
 
+            self.logger.info("talk assistant text len=\(assistantText.count, privacy: .public)")
             await self.playAssistant(text: assistantText)
             await self.startListening()
             await self.startRecognition()
@@ -301,11 +306,20 @@ actor TalkModeRuntime {
         return lines.joined(separator: "\n")
     }
 
-    private enum ChatCompletionState {
+    private enum ChatCompletionState: CustomStringConvertible {
         case final
         case aborted
         case error
         case timeout
+
+        var description: String {
+            switch self {
+            case .final: return "final"
+            case .aborted: return "aborted"
+            case .error: return "error"
+            case .timeout: return "timeout"
+            }
+        }
     }
 
     private func waitForChatCompletion(runId: String, timeoutSeconds: Int) async -> ChatCompletionState {
@@ -421,6 +435,7 @@ actor TalkModeRuntime {
             self.logger.error("talk missing voiceId; set talk.voiceId or ELEVENLABS_VOICE_ID")
             return
         }
+        self.ttsLogger.info("talk TTS request voiceId=\(voiceId, privacy: .public) chars=\(cleaned.count, privacy: .public)")
 
         await self.startRecognition()
         await MainActor.run { TalkModeController.shared.updatePhase(.speaking) }
@@ -445,11 +460,28 @@ actor TalkModeRuntime {
             normalize: Self.validatedNormalize(directive?.normalize, logger: self.logger),
             language: Self.validatedLanguage(directive?.language, logger: self.logger))
 
+        let synthTimeoutSeconds = max(20.0, min(90.0, Double(cleaned.count) * 0.12))
+        self.ttsLogger.info("talk TTS synth timeout=\(synthTimeoutSeconds, privacy: .public)s")
+
         do {
-            let audio = try await ElevenLabsClient(apiKey: apiKey, logger: self.ttsLogger).synthesize(
-                voiceId: voiceId,
-                request: request)
+            let client = ElevenLabsClient(apiKey: apiKey, logger: self.ttsLogger)
+            let audio = try await withThrowingTaskGroup(of: Data.self) { group in
+                group.addTask {
+                    try await client.synthesize(voiceId: voiceId, request: request)
+                }
+                group.addTask {
+                    try await Task.sleep(nanoseconds: UInt64(synthTimeoutSeconds * 1_000_000_000))
+                    throw NSError(domain: "TalkTTS", code: 408, userInfo: [
+                        NSLocalizedDescriptionKey: "ElevenLabs TTS timed out after \(synthTimeoutSeconds)s",
+                    ])
+                }
+                let data = try await group.next()!
+                group.cancelAll()
+                return data
+            }
+            self.ttsLogger.info("talk TTS response bytes=\(audio.count, privacy: .public)")
             let result = await TalkAudioPlayer.shared.play(data: audio)
+            self.ttsLogger.info("talk audio result finished=\(result.finished, privacy: .public) interruptedAt=\(String(describing: result.interruptedAt), privacy: .public)")
             if !result.finished, let interruptedAt = result.interruptedAt, self.phase == .speaking {
                 if self.interruptOnSpeech {
                     self.lastInterruptedAtSeconds = interruptedAt
@@ -515,6 +547,10 @@ actor TalkModeRuntime {
         self.defaultOutputFormat = cfg.outputFormat
         self.interruptOnSpeech = cfg.interruptOnSpeech
         self.apiKey = cfg.apiKey
+        let hasApiKey = (cfg.apiKey?.isEmpty == false)
+        let voiceLabel = (cfg.voiceId?.isEmpty == false) ? cfg.voiceId! : "none"
+        let modelLabel = (cfg.modelId?.isEmpty == false) ? cfg.modelId! : "none"
+        self.logger.info("talk config voiceId=\(voiceLabel, privacy: .public) modelId=\(modelLabel, privacy: .public) apiKey=\(hasApiKey, privacy: .public) interrupt=\(cfg.interruptOnSpeech, privacy: .public)")
     }
 
     private struct TalkRuntimeConfig {
@@ -702,6 +738,8 @@ private struct ElevenLabsClient {
     let apiKey: String
     let logger: Logger
     let baseUrl: URL = URL(string: "https://api.elevenlabs.io")!
+    let ttsTimeoutSeconds: TimeInterval = 45
+    let listVoicesTimeoutSeconds: TimeInterval = 15
 
     func synthesize(voiceId: String, request: ElevenLabsRequest) async throws -> Data {
         var url = self.baseUrl
@@ -746,6 +784,7 @@ private struct ElevenLabsClient {
         var req = URLRequest(url: url)
         req.httpMethod = "POST"
         req.httpBody = body
+        req.timeoutInterval = self.ttsTimeoutSeconds
         req.setValue("application/json", forHTTPHeaderField: "Content-Type")
         req.setValue("audio/mpeg", forHTTPHeaderField: "Accept")
         req.setValue(self.apiKey, forHTTPHeaderField: "xi-api-key")
@@ -772,6 +811,7 @@ private struct ElevenLabsClient {
         self.logger.info("elevenlabs voices list request")
         var req = URLRequest(url: url)
         req.httpMethod = "GET"
+        req.timeoutInterval = self.listVoicesTimeoutSeconds
         req.setValue(self.apiKey, forHTTPHeaderField: "xi-api-key")
 
         let (data, response) = try await URLSession.shared.data(for: req)
diff --git a/apps/macos/Sources/Clawdis/TalkOverlay.swift b/apps/macos/Sources/Clawdis/TalkOverlay.swift
index 9ed8f2cb0..3031cb97e 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlay.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlay.swift
@@ -7,7 +7,7 @@ import SwiftUI
 @Observable
 final class TalkOverlayController {
     static let shared = TalkOverlayController()
-    static let overlaySize: CGFloat = 260
+    static let overlaySize: CGFloat = 320
 
     private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.overlay")
 
diff --git a/apps/macos/Sources/Clawdis/TalkOverlayView.swift b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
index 1dbc85277..5611f3d1f 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlayView.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
@@ -6,12 +6,14 @@ struct TalkOverlayView: View {
     @State private var hoveringWindow = false
 
     var body: some View {
-        ZStack {
+        ZStack(alignment: .topTrailing) {
             TalkOrbView(
                 phase: self.controller.model.phase,
                 level: self.controller.model.level,
                 accent: self.seamColor)
                 .frame(width: 96, height: 96)
+                .padding(.top, 6)
+                .padding(.trailing, 6)
                 .contentShape(Circle())
                 .onTapGesture {
                     TalkModeController.shared.stopSpeaking(reason: .userTap)

From afbd18e8df2e45b5a976261ef6f2df16b72faf04 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 06:05:43 +0100
Subject: [PATCH 047/100] fix(talk): harden playback, interrupts, and timeouts

---
 CHANGELOG.md                                  |   5 +
 apps/ios/Sources/Voice/TalkModeManager.swift  | 165 +++++++++++++++---
 apps/ios/Sources/Voice/TalkOrbOverlay.swift   |   8 +-
 apps/ios/SwiftSources.input.xcfilelist        |   1 +
 .../Sources/Clawdis/TalkAudioPlayer.swift     |   9 +-
 .../Sources/Clawdis/TalkModeRuntime.swift     | 165 ++++++++++--------
 .../TalkAudioPlayerTests.swift                |  18 ++
 7 files changed, 262 insertions(+), 109 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 079a12308..4168f520c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,8 +13,13 @@
 - macOS Talk Mode: orb overlay refresh, ElevenLabs request logging, API key status in settings, and auto-select first voice when none is configured.
 - macOS Talk Mode: add hard timeout around ElevenLabs TTS synthesis to avoid getting stuck “speaking” forever on hung requests.
 - macOS Talk Mode: avoid stuck playback when the audio player never starts (fail-fast + watchdog).
+- macOS Talk Mode: fix audio stop ordering so disabling Talk Mode always stops in-flight playback.
+- macOS Talk Mode: throttle audio-level updates (avoid per-buffer task creation) to reduce CPU/task churn.
 - macOS Talk Mode: increase overlay window size so wave rings don’t clip; close button is hover-only and closer to the orb.
 - Talk Mode: wait for chat history to surface the assistant reply before starting TTS (macOS/iOS/Android).
+- iOS Talk Mode: fix chat completion wait to time out even if no events arrive (prevents “Thinking…” hangs).
+- iOS Talk Mode: keep recognition running during playback to support interrupt-on-speech.
+- iOS Talk Mode: preserve directive voice/model overrides across config reloads and add ElevenLabs request timeouts.
 - iOS/Android Talk Mode: explicitly `chat.subscribe` when Talk Mode is active, so completion events arrive even if the Chat UI isn’t open.
 - Chat UI: refresh history when another client finishes a run in the same session, so Talk Mode + Voice Wake transcripts appear consistently.
 - Gateway: `voice.transcript` now also maps agent bus output to `chat` events, ensuring chat UIs refresh for voice-triggered runs.
diff --git a/apps/ios/Sources/Voice/TalkModeManager.swift b/apps/ios/Sources/Voice/TalkModeManager.swift
index 6e2e5440d..9eb441ce6 100644
--- a/apps/ios/Sources/Voice/TalkModeManager.swift
+++ b/apps/ios/Sources/Voice/TalkModeManager.swift
@@ -2,8 +2,8 @@ import AVFAudio
 import ClawdisKit
 import Foundation
 import Observation
-import Speech
 import OSLog
+import Speech
 
 @MainActor
 @Observable
@@ -29,6 +29,8 @@ final class TalkModeManager: NSObject {
     private var currentVoiceId: String?
     private var defaultModelId: String?
     private var currentModelId: String?
+    private var voiceOverrideActive = false
+    private var modelOverrideActive = false
     private var defaultOutputFormat: String?
     private var apiKey: String?
     private var interruptOnSpeech: Bool = true
@@ -101,6 +103,12 @@ final class TalkModeManager: NSObject {
         self.silenceTask = nil
         self.stopRecognition()
         self.stopSpeaking()
+        self.lastInterruptedAtSeconds = nil
+        do {
+            try AVAudioSession.sharedInstance().setActive(false, options: [.notifyOthersOnDeactivation])
+        } catch {
+            self.logger.warning("audio session deactivate failed: \(error.localizedDescription, privacy: .public)")
+        }
         Task { await self.unsubscribeAllChats() }
     }
 
@@ -109,6 +117,7 @@ final class TalkModeManager: NSObject {
     }
 
     private func startRecognition() throws {
+        self.stopRecognition()
         self.speechRecognizer = SFSpeechRecognizer()
         guard let recognizer = self.speechRecognizer else {
             throw NSError(domain: "TalkMode", code: 1, userInfo: [
@@ -132,7 +141,10 @@ final class TalkModeManager: NSObject {
         self.recognitionTask = recognizer.recognitionTask(with: request) { [weak self] result, error in
             guard let self else { return }
             if let error {
-                self.statusText = "Speech error: \(error.localizedDescription)"
+                if !self.isSpeaking {
+                    self.statusText = "Speech error: \(error.localizedDescription)"
+                }
+                self.logger.debug("speech recognition error: \(error.localizedDescription, privacy: .public)")
             }
             guard let result else { return }
             let transcript = result.bestTranscription.formattedString
@@ -189,7 +201,7 @@ final class TalkModeManager: NSObject {
     }
 
     private func checkSilence() async {
-        guard self.isListening else { return }
+        guard self.isListening, !self.isSpeaking else { return }
         let transcript = self.lastTranscript.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !transcript.isEmpty else { return }
         guard let lastHeard else { return }
@@ -219,10 +231,21 @@ final class TalkModeManager: NSObject {
             self.logger.info("chat.send start chars=\(prompt.count, privacy: .public)")
             let runId = try await self.sendChat(prompt, bridge: bridge)
             self.logger.info("chat.send ok runId=\(runId, privacy: .public)")
-            let ok = await self.waitForChatFinal(runId: runId, bridge: bridge)
-            if !ok {
-                self.statusText = "No reply"
-                self.logger.warning("chat final timeout runId=\(runId, privacy: .public)")
+            let completion = await self.waitForChatCompletion(runId: runId, bridge: bridge, timeoutSeconds: 120)
+            guard completion == .final else {
+                switch completion {
+                case .timeout:
+                    self.statusText = "No reply"
+                    self.logger.warning("chat completion timeout runId=\(runId, privacy: .public)")
+                case .aborted:
+                    self.statusText = "Aborted"
+                    self.logger.warning("chat completion aborted runId=\(runId, privacy: .public)")
+                case .error:
+                    self.statusText = "Chat error"
+                    self.logger.warning("chat completion error runId=\(runId, privacy: .public)")
+                case .final:
+                    break
+                }
                 await self.start()
                 return
             }
@@ -259,7 +282,9 @@ final class TalkModeManager: NSObject {
             self.chatSubscribedSessionKeys.insert(key)
             self.logger.info("chat.subscribe ok sessionKey=\(key, privacy: .public)")
         } catch {
-            self.logger.warning("chat.subscribe failed sessionKey=\(key, privacy: .public) err=\(error.localizedDescription, privacy: .public)")
+            self.logger
+                .warning(
+                    "chat.subscribe failed sessionKey=\(key, privacy: .public) err=\(error.localizedDescription, privacy: .public)")
         }
     }
 
@@ -294,6 +319,22 @@ final class TalkModeManager: NSObject {
         return lines.joined(separator: "\n")
     }
 
+    private enum ChatCompletionState: CustomStringConvertible {
+        case final
+        case aborted
+        case error
+        case timeout
+
+        var description: String {
+            switch self {
+            case .final: "final"
+            case .aborted: "aborted"
+            case .error: "error"
+            case .timeout: "timeout"
+            }
+        }
+    }
+
     private func sendChat(_ message: String, bridge: BridgeSession) async throws -> String {
         struct SendResponse: Decodable { let runId: String }
         let payload: [String: Any] = [
@@ -310,20 +351,39 @@ final class TalkModeManager: NSObject {
         return decoded.runId
     }
 
-    private func waitForChatFinal(runId: String, bridge: BridgeSession) async -> Bool {
+    private func waitForChatCompletion(
+        runId: String,
+        bridge: BridgeSession,
+        timeoutSeconds: Int = 120) async -> ChatCompletionState
+    {
         let stream = await bridge.subscribeServerEvents(bufferingNewest: 200)
-        let timeout = Date().addingTimeInterval(120)
-        for await evt in stream {
-            if Date() > timeout { return false }
-            guard evt.event == "chat", let payload = evt.payloadJSON else { continue }
-            guard let data = payload.data(using: .utf8) else { continue }
-            guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else { continue }
-            if (json["runId"] as? String) != runId { continue }
-            if let state = json["state"] as? String, state == "final" {
-                return true
+        return await withTaskGroup(of: ChatCompletionState.self) { group in
+            group.addTask { [runId] in
+                for await evt in stream {
+                    if Task.isCancelled { return .timeout }
+                    guard evt.event == "chat", let payload = evt.payloadJSON else { continue }
+                    guard let data = payload.data(using: .utf8) else { continue }
+                    guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else { continue }
+                    if (json["runId"] as? String) != runId { continue }
+                    if let state = json["state"] as? String {
+                        switch state {
+                        case "final": return .final
+                        case "aborted": return .aborted
+                        case "error": return .error
+                        default: break
+                        }
+                    }
+                }
+                return .timeout
             }
+            group.addTask {
+                try? await Task.sleep(nanoseconds: UInt64(timeoutSeconds) * 1_000_000_000)
+                return .timeout
+            }
+            let result = await group.next() ?? .timeout
+            group.cancelAll()
+            return result
         }
-        return false
     }
 
     private func waitForAssistantText(
@@ -370,11 +430,13 @@ final class TalkModeManager: NSObject {
         if let voice = directive?.voiceId {
             if directive?.once != true {
                 self.currentVoiceId = voice
+                self.voiceOverrideActive = true
             }
         }
         if let model = directive?.modelId {
             if directive?.once != true {
                 self.currentModelId = model
+                self.modelOverrideActive = true
             }
         }
 
@@ -394,16 +456,21 @@ final class TalkModeManager: NSObject {
             return
         }
 
-        self.statusText = "Speaking…"
+        self.statusText = "Generating voice…"
         self.isSpeaking = true
         self.lastSpokenText = cleaned
 
         do {
             let started = Date()
+            let desiredOutputFormat = directive?.outputFormat ?? self.defaultOutputFormat
+            let outputFormat = TalkModeRuntime.validatedOutputFormat(desiredOutputFormat)
+            if outputFormat == nil, let desiredOutputFormat, !desiredOutputFormat.isEmpty {
+                self.logger.warning("talk output_format unsupported for local playback: \(desiredOutputFormat, privacy: .public)")
+            }
             let request = ElevenLabsRequest(
                 text: cleaned,
                 modelId: directive?.modelId ?? self.currentModelId ?? self.defaultModelId,
-                outputFormat: directive?.outputFormat ?? self.defaultOutputFormat,
+                outputFormat: outputFormat,
                 speed: TalkModeRuntime.resolveSpeed(
                     speed: directive?.speed,
                     rateWPM: directive?.rateWPM),
@@ -414,16 +481,43 @@ final class TalkModeManager: NSObject {
                 seed: TalkModeRuntime.validatedSeed(directive?.seed),
                 normalize: TalkModeRuntime.validatedNormalize(directive?.normalize),
                 language: TalkModeRuntime.validatedLanguage(directive?.language))
-            let audio = try await ElevenLabsClient(apiKey: apiKey).synthesize(
-                voiceId: voiceId,
-                request: request)
-            self.logger.info("elevenlabs ok bytes=\(audio.count, privacy: .public) dur=\(Date().timeIntervalSince(started), privacy: .public)s")
+
+            let synthTimeoutSeconds = max(20.0, min(90.0, Double(cleaned.count) * 0.12))
+            let client = ElevenLabsClient(apiKey: apiKey)
+            let audio = try await withThrowingTaskGroup(of: Data.self) { group in
+                group.addTask {
+                    try await client.synthesize(voiceId: voiceId, request: request)
+                }
+                group.addTask {
+                    try await Task.sleep(nanoseconds: UInt64(synthTimeoutSeconds * 1_000_000_000))
+                    throw NSError(domain: "TalkTTS", code: 408, userInfo: [
+                        NSLocalizedDescriptionKey: "ElevenLabs TTS timed out after \(synthTimeoutSeconds)s",
+                    ])
+                }
+                let data = try await group.next()!
+                group.cancelAll()
+                return data
+            }
+            self.logger
+                .info(
+                    "elevenlabs ok bytes=\(audio.count, privacy: .public) dur=\(Date().timeIntervalSince(started), privacy: .public)s")
+
+            if self.interruptOnSpeech {
+                do {
+                    try self.startRecognition()
+                } catch {
+                    self.logger.warning("startRecognition during speak failed: \(error.localizedDescription, privacy: .public)")
+                }
+            }
+
+            self.statusText = "Speaking…"
             try await self.playAudio(data: audio)
         } catch {
             self.statusText = "Speak failed: \(error.localizedDescription)"
             self.logger.error("speak failed: \(error.localizedDescription, privacy: .public)")
         }
 
+        self.stopRecognition()
         self.isSpeaking = false
     }
 
@@ -440,9 +534,11 @@ final class TalkModeManager: NSObject {
         self.logger.info("play done")
     }
 
-    private func stopSpeaking() {
+    private func stopSpeaking(storeInterruption: Bool = true) {
         guard self.isSpeaking else { return }
-        self.lastInterruptedAtSeconds = self.player?.currentTime
+        if storeInterruption {
+            self.lastInterruptedAtSeconds = self.player?.currentTime
+        }
         self.player?.stop()
         self.player = nil
         self.isSpeaking = false
@@ -465,9 +561,13 @@ final class TalkModeManager: NSObject {
             guard let config = json["config"] as? [String: Any] else { return }
             let talk = config["talk"] as? [String: Any]
             self.defaultVoiceId = (talk?["voiceId"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
-            self.currentVoiceId = self.defaultVoiceId
+            if !self.voiceOverrideActive {
+                self.currentVoiceId = self.defaultVoiceId
+            }
             self.defaultModelId = (talk?["modelId"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
-            self.currentModelId = self.defaultModelId
+            if !self.modelOverrideActive {
+                self.currentModelId = self.defaultModelId
+            }
             self.defaultOutputFormat = (talk?["outputFormat"] as? String)?
                 .trimmingCharacters(in: .whitespacesAndNewlines)
             self.apiKey = (talk?["apiKey"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -561,6 +661,7 @@ private struct ElevenLabsClient {
         var req = URLRequest(url: url)
         req.httpMethod = "POST"
         req.httpBody = body
+        req.timeoutInterval = 45
         req.setValue("application/json", forHTTPHeaderField: "Content-Type")
         req.setValue("audio/mpeg", forHTTPHeaderField: "Accept")
         req.setValue(self.apiKey, forHTTPHeaderField: "xi-api-key")
@@ -614,4 +715,10 @@ private enum TalkModeRuntime {
         guard normalized.count == 2, normalized.allSatisfy({ $0 >= "a" && $0 <= "z" }) else { return nil }
         return normalized
     }
+
+    static func validatedOutputFormat(_ value: String?) -> String? {
+        let trimmed = value?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        guard !trimmed.isEmpty else { return nil }
+        return trimmed.hasPrefix("mp3_") ? trimmed : nil
+    }
 }
diff --git a/apps/ios/Sources/Voice/TalkOrbOverlay.swift b/apps/ios/Sources/Voice/TalkOrbOverlay.swift
index 84a0b56c5..3d7907c6d 100644
--- a/apps/ios/Sources/Voice/TalkOrbOverlay.swift
+++ b/apps/ios/Sources/Voice/TalkOrbOverlay.swift
@@ -38,8 +38,7 @@ struct TalkOrbOverlay: View {
                     .frame(width: 136, height: 136)
                     .overlay(
                         Circle()
-                            .stroke(seam.opacity(0.35), lineWidth: 1)
-                    )
+                            .stroke(seam.opacity(0.35), lineWidth: 1))
                     .shadow(color: seam.opacity(0.32), radius: 26, x: 0, y: 0)
                     .shadow(color: Color.black.opacity(0.50), radius: 22, x: 0, y: 10)
             }
@@ -58,9 +57,7 @@ struct TalkOrbOverlay: View {
                         Capsule()
                             .fill(Color.black.opacity(0.40))
                             .overlay(
-                                Capsule().stroke(seam.opacity(0.22), lineWidth: 1)
-                            )
-                    )
+                                Capsule().stroke(seam.opacity(0.22), lineWidth: 1)))
             }
         }
         .padding(28)
@@ -71,4 +68,3 @@ struct TalkOrbOverlay: View {
         .accessibilityLabel("Talk Mode \(status)")
     }
 }
-
diff --git a/apps/ios/SwiftSources.input.xcfilelist b/apps/ios/SwiftSources.input.xcfilelist
index 81d42dce1..5b71e678f 100644
--- a/apps/ios/SwiftSources.input.xcfilelist
+++ b/apps/ios/SwiftSources.input.xcfilelist
@@ -57,3 +57,4 @@ Sources/Voice/VoiceWakePreferences.swift
 ../shared/ClawdisKit/Sources/ClawdisKit/TalkDirective.swift
 ../../Swabble/Sources/SwabbleKit/WakeWordGate.swift
 Sources/Voice/TalkModeManager.swift
+Sources/Voice/TalkOrbOverlay.swift
diff --git a/apps/macos/Sources/Clawdis/TalkAudioPlayer.swift b/apps/macos/Sources/Clawdis/TalkAudioPlayer.swift
index 713ede40d..6a61b5881 100644
--- a/apps/macos/Sources/Clawdis/TalkAudioPlayer.swift
+++ b/apps/macos/Sources/Clawdis/TalkAudioPlayer.swift
@@ -106,8 +106,13 @@ final class TalkAudioPlayer: NSObject, @preconcurrency AVAudioPlayerDelegate {
     }
 
     private func stopInternal() {
-        self.playback?.cancelWatchdog()
-        self.playback = nil
+        if let playback = self.playback {
+            let interruptedAt = self.player?.currentTime
+            self.finish(
+                playback: playback,
+                result: TalkPlaybackResult(finished: false, interruptedAt: interruptedAt))
+            return
+        }
         self.player?.stop()
         self.player = nil
     }
diff --git a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
index 7f5280805..e090cfebe 100644
--- a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
+++ b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
@@ -11,16 +11,37 @@ actor TalkModeRuntime {
     private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.runtime")
     private let ttsLogger = Logger(subsystem: "com.steipete.clawdis", category: "talk.tts")
 
+    private final class RMSMeter: @unchecked Sendable {
+        private let lock = NSLock()
+        private var latestRMS: Double = 0
+
+        func set(_ rms: Double) {
+            self.lock.lock()
+            self.latestRMS = rms
+            self.lock.unlock()
+        }
+
+        func get() -> Double {
+            self.lock.lock()
+            let value = self.latestRMS
+            self.lock.unlock()
+            return value
+        }
+    }
+
     private var recognizer: SFSpeechRecognizer?
     private var audioEngine: AVAudioEngine?
     private var recognitionRequest: SFSpeechAudioBufferRecognitionRequest?
     private var recognitionTask: SFSpeechRecognitionTask?
     private var recognitionGeneration: Int = 0
+    private var rmsTask: Task<Void, Never>?
+    private let rmsMeter = RMSMeter()
 
     private var captureTask: Task<Void, Never>?
     private var silenceTask: Task<Void, Never>?
     private var phase: TalkModePhase = .idle
     private var isEnabled = false
+    private var lifecycleGeneration: Int = 0
 
     private var lastHeard: Date?
     private var noiseFloorRMS: Double = 1e-4
@@ -49,6 +70,7 @@ actor TalkModeRuntime {
     func setEnabled(_ enabled: Bool) async {
         guard enabled != self.isEnabled else { return }
         self.isEnabled = enabled
+        self.lifecycleGeneration &+= 1
         if enabled {
             await self.start()
         } else {
@@ -56,14 +78,21 @@ actor TalkModeRuntime {
         }
     }
 
+    private func isCurrent(_ generation: Int) -> Bool {
+        generation == self.lifecycleGeneration && self.isEnabled
+    }
+
     private func start() async {
+        let gen = self.lifecycleGeneration
         guard voiceWakeSupported else { return }
         guard PermissionManager.voiceWakePermissionsGranted() else {
             self.logger.debug("talk runtime not starting: permissions missing")
             return
         }
         await self.reloadConfig()
+        guard self.isCurrent(gen) else { return }
         await self.startRecognition()
+        guard self.isCurrent(gen) else { return }
         self.phase = .listening
         await MainActor.run { TalkModeController.shared.updatePhase(.listening) }
         self.startSilenceMonitor()
@@ -74,12 +103,15 @@ actor TalkModeRuntime {
         self.captureTask = nil
         self.silenceTask?.cancel()
         self.silenceTask = nil
+
+        // Stop audio before changing phase (stopSpeaking is gated on .speaking).
+        await self.stopSpeaking(reason: .manual)
+
         self.lastTranscript = ""
         self.lastHeard = nil
         self.lastSpeechEnergyAt = nil
         self.phase = .idle
         await self.stopRecognition()
-        await self.stopSpeaking(reason: .manual)
         await MainActor.run {
             TalkModeController.shared.updateLevel(0)
             TalkModeController.shared.updatePhase(.idle)
@@ -120,12 +152,11 @@ actor TalkModeRuntime {
         let input = audioEngine.inputNode
         let format = input.outputFormat(forBus: 0)
         input.removeTap(onBus: 0)
-        input.installTap(onBus: 0, bufferSize: 2048, format: format) { [weak self, weak request] buffer, _ in
+        let meter = self.rmsMeter
+        input.installTap(onBus: 0, bufferSize: 2048, format: format) { [weak request, meter] buffer, _ in
             request?.append(buffer)
             if let rms = Self.rmsLevel(buffer: buffer) {
-                Task.detached { [weak self] in
-                    await self?.noteAudioLevel(rms: rms)
-                }
+                meter.set(rms)
             }
         }
 
@@ -137,6 +168,8 @@ actor TalkModeRuntime {
             return
         }
 
+        self.startRMSTicker(meter: meter)
+
         self.recognitionTask = recognizer.recognitionTask(with: request) { [weak self, generation] result, error in
             guard let self else { return }
             let segments = result?.bestTranscription.segments ?? []
@@ -161,6 +194,19 @@ actor TalkModeRuntime {
         self.audioEngine?.stop()
         self.audioEngine = nil
         self.recognizer = nil
+        self.rmsTask?.cancel()
+        self.rmsTask = nil
+    }
+
+    private func startRMSTicker(meter: RMSMeter) {
+        self.rmsTask?.cancel()
+        self.rmsTask = Task { [weak self, meter] in
+            while let self {
+                try? await Task.sleep(nanoseconds: 50_000_000)
+                if Task.isCancelled { return }
+                await self.noteAudioLevel(rms: meter.get())
+            }
+        }
     }
 
     private func handleRecognition(_ update: RecognitionUpdate) async {
@@ -241,43 +287,42 @@ actor TalkModeRuntime {
     // MARK: - Gateway + TTS
 
     private func sendAndSpeak(_ transcript: String) async {
+        let gen = self.lifecycleGeneration
         await self.reloadConfig()
+        guard self.isCurrent(gen) else { return }
         let prompt = self.buildPrompt(transcript: transcript)
+        let sessionKey = await GatewayConnection.shared.mainSessionKey()
         let runId = UUID().uuidString
         let startedAt = Date().timeIntervalSince1970
-        self.logger.info("talk send start runId=\(runId, privacy: .public) chars=\(prompt.count, privacy: .public)")
+        self.logger.info(
+            "talk send start runId=\(runId, privacy: .public) session=\(sessionKey, privacy: .public) chars=\(prompt.count, privacy: .public)")
 
         do {
             let response = try await GatewayConnection.shared.chatSend(
-                sessionKey: "main",
+                sessionKey: sessionKey,
                 message: prompt,
                 thinking: "low",
                 idempotencyKey: runId,
                 attachments: [])
-            self.logger.info("talk chat.send ok runId=\(response.runId, privacy: .public)")
-            let completion = await self.waitForChatCompletion(
-                runId: response.runId,
-                timeoutSeconds: 120)
-            self.logger.info("talk chat completion runId=\(response.runId, privacy: .public) state=\(String(describing: completion), privacy: .public)")
-            guard completion == .final else {
-                await self.startListening()
-                await self.startRecognition()
-                return
-            }
+            guard self.isCurrent(gen) else { return }
+            self.logger.info(
+                "talk chat.send ok runId=\(response.runId, privacy: .public) session=\(sessionKey, privacy: .public)")
 
             guard let assistantText = await self.waitForAssistantText(
-                sessionKey: "main",
+                sessionKey: sessionKey,
                 since: startedAt,
-                timeoutSeconds: 12)
+                timeoutSeconds: 45)
             else {
-                self.logger.warning("talk assistant text missing after completion")
+                self.logger.warning("talk assistant text missing after timeout")
                 await self.startListening()
                 await self.startRecognition()
                 return
             }
+            guard self.isCurrent(gen) else { return }
 
             self.logger.info("talk assistant text len=\(assistantText.count, privacy: .public)")
             await self.playAssistant(text: assistantText)
+            guard self.isCurrent(gen) else { return }
             await self.startListening()
             await self.startRecognition()
             return
@@ -306,54 +351,6 @@ actor TalkModeRuntime {
         return lines.joined(separator: "\n")
     }
 
-    private enum ChatCompletionState: CustomStringConvertible {
-        case final
-        case aborted
-        case error
-        case timeout
-
-        var description: String {
-            switch self {
-            case .final: return "final"
-            case .aborted: return "aborted"
-            case .error: return "error"
-            case .timeout: return "timeout"
-            }
-        }
-    }
-
-    private func waitForChatCompletion(runId: String, timeoutSeconds: Int) async -> ChatCompletionState {
-        let stream = await GatewayConnection.shared.subscribe()
-        return await withTaskGroup(of: ChatCompletionState.self) { group in
-            group.addTask { [runId] in
-                for await push in stream {
-                    if case let .event(evt) = push, evt.event == "chat", let payload = evt.payload {
-                        if let chat = try? JSONDecoder().decode(
-                            ClawdisChatEventPayload.self,
-                            from: JSONEncoder().encode(payload))
-                        {
-                            guard chat.runId == runId else { continue }
-                            switch chat.state {
-                            case .some("final"): return .final
-                            case .some("aborted"): return .aborted
-                            case .some("error"): return .error
-                            default: break
-                            }
-                        }
-                    }
-                }
-                return .timeout
-            }
-            group.addTask {
-                try? await Task.sleep(nanoseconds: UInt64(timeoutSeconds) * 1_000_000_000)
-                return .timeout
-            }
-            let result = await group.next() ?? .timeout
-            group.cancelAll()
-            return result
-        }
-    }
-
     private func waitForAssistantText(
         sessionKey: String,
         since: Double,
@@ -394,10 +391,12 @@ actor TalkModeRuntime {
     }
 
     private func playAssistant(text: String) async {
+        let gen = self.lifecycleGeneration
         let parse = TalkDirectiveParser.parse(text)
         let directive = parse.directive
         let cleaned = parse.stripped.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !cleaned.isEmpty else { return }
+        guard self.isCurrent(gen) else { return }
 
         if !parse.unknownKeys.isEmpty {
             self.logger.warning("talk directive ignored keys: \(parse.unknownKeys.joined(separator: ","), privacy: .public)")
@@ -435,9 +434,11 @@ actor TalkModeRuntime {
             self.logger.error("talk missing voiceId; set talk.voiceId or ELEVENLABS_VOICE_ID")
             return
         }
+        guard self.isCurrent(gen) else { return }
         self.ttsLogger.info("talk TTS request voiceId=\(voiceId, privacy: .public) chars=\(cleaned.count, privacy: .public)")
 
         await self.startRecognition()
+        guard self.isCurrent(gen) else { return }
         await MainActor.run { TalkModeController.shared.updatePhase(.speaking) }
         self.phase = .speaking
         self.lastSpokenText = cleaned
@@ -450,7 +451,7 @@ actor TalkModeRuntime {
         let request = ElevenLabsRequest(
             text: cleaned,
             modelId: directive?.modelId ?? self.currentModelId ?? self.defaultModelId,
-            outputFormat: directive?.outputFormat ?? self.defaultOutputFormat,
+            outputFormat: Self.validatedOutputFormat(directive?.outputFormat ?? self.defaultOutputFormat, logger: self.logger),
             speed: resolvedSpeed,
             stability: Self.validatedUnit(directive?.stability, name: "stability", logger: self.logger),
             similarity: Self.validatedUnit(directive?.similarity, name: "similarity", logger: self.logger),
@@ -479,6 +480,7 @@ actor TalkModeRuntime {
                 group.cancelAll()
                 return data
             }
+            guard self.isCurrent(gen) else { return }
             self.ttsLogger.info("talk TTS response bytes=\(audio.count, privacy: .public)")
             let result = await TalkAudioPlayer.shared.play(data: audio)
             self.ttsLogger.info("talk audio result finished=\(result.finished, privacy: .public) interruptedAt=\(String(describing: result.interruptedAt), privacy: .public)")
@@ -491,8 +493,10 @@ actor TalkModeRuntime {
             self.logger.error("talk TTS failed: \(error.localizedDescription, privacy: .public)")
         }
 
-        self.phase = .thinking
-        await MainActor.run { TalkModeController.shared.updatePhase(.thinking) }
+        if self.phase == .speaking {
+            self.phase = .thinking
+            await MainActor.run { TalkModeController.shared.updatePhase(.thinking) }
+        }
     }
 
     private func resolveVoiceId(preferred: String?, apiKey: String) async -> String? {
@@ -523,11 +527,18 @@ actor TalkModeRuntime {
     }
 
     func stopSpeaking(reason: TalkStopReason) async {
-        guard self.phase == .speaking else { return }
         let interruptedAt = await MainActor.run { TalkAudioPlayer.shared.stop() }
+        guard self.phase == .speaking else { return }
         if reason == .speech, let interruptedAt {
             self.lastInterruptedAtSeconds = interruptedAt
         }
+        if reason == .manual {
+            return
+        }
+        if reason == .speech || reason == .userTap {
+            await self.startListening()
+            return
+        }
         self.phase = .thinking
         await MainActor.run { TalkModeController.shared.updatePhase(.thinking) }
     }
@@ -718,6 +729,16 @@ actor TalkModeRuntime {
         }
         return normalized
     }
+
+    private static func validatedOutputFormat(_ value: String?, logger: Logger) -> String? {
+        let trimmed = value?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        guard !trimmed.isEmpty else { return nil }
+        guard trimmed.hasPrefix("mp3_") else {
+            logger.warning("talk output_format unsupported for local playback: \(trimmed, privacy: .public)")
+            return nil
+        }
+        return trimmed
+    }
 }
 
 private struct ElevenLabsRequest {
diff --git a/apps/macos/Tests/ClawdisIPCTests/TalkAudioPlayerTests.swift b/apps/macos/Tests/ClawdisIPCTests/TalkAudioPlayerTests.swift
index e0278e4bb..8654f03e3 100644
--- a/apps/macos/Tests/ClawdisIPCTests/TalkAudioPlayerTests.swift
+++ b/apps/macos/Tests/ClawdisIPCTests/TalkAudioPlayerTests.swift
@@ -14,6 +14,24 @@ import Testing
 
         #expect(true)
     }
+
+    @MainActor
+    @Test func playDoesNotHangWhenPlayIsCalledTwice() async throws {
+        let wav = makeWav16Mono(sampleRate: 8000, samples: 800)
+        defer { _ = TalkAudioPlayer.shared.stop() }
+
+        let first = Task { @MainActor in
+            await TalkAudioPlayer.shared.play(data: wav)
+        }
+
+        await Task.yield()
+        _ = await TalkAudioPlayer.shared.play(data: wav)
+
+        _ = try await withTimeout(seconds: 2.0) {
+            await first.value
+        }
+        #expect(true)
+    }
 }
 
 private struct TimeoutError: Error {}

From 7612a83fa2e96688b09e0613863ab06bc2d4c193 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 06:47:19 +0100
Subject: [PATCH 048/100] fix(talk): align sessions and chat UI

---
 .../com/steipete/clawdis/node/NodeRuntime.kt  | 14 ++++-
 .../clawdis/node/voice/TalkModeManager.kt     | 59 ++++++++++++-------
 apps/ios/Sources/Chat/ChatSheet.swift         |  6 +-
 apps/ios/Sources/Model/NodeAppModel.swift     |  9 ++-
 apps/ios/Sources/RootCanvas.swift             |  5 +-
 apps/ios/Sources/Voice/TalkModeManager.swift  | 53 ++++++++++-------
 .../Sources/Clawdis/TalkModeRuntime.swift     | 10 +++-
 .../Sources/Clawdis/WebChatSwiftUI.swift      | 14 ++++-
 .../ClawdisChatUI/ChatMessageViews.swift      |  6 +-
 .../Sources/ClawdisChatUI/ChatTheme.swift     |  6 +-
 .../Sources/ClawdisChatUI/ChatView.swift      |  7 ++-
 .../Sources/ClawdisChatUI/ChatViewModel.swift | 29 ++++++++-
 .../ClawdisKitTests/ChatViewModelTests.swift  | 23 ++++++++
 13 files changed, 181 insertions(+), 60 deletions(-)

diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
index 396eb65e9..7a68abbd3 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
@@ -70,7 +70,7 @@ class NodeRuntime(context: Context) {
           payloadJson =
             buildJsonObject {
               put("message", JsonPrimitive(command))
-              put("sessionKey", JsonPrimitive("main"))
+              put("sessionKey", JsonPrimitive(mainSessionKey.value))
               put("thinking", JsonPrimitive(chatThinkingLevel.value))
               put("deliver", JsonPrimitive(false))
             }.toString(),
@@ -104,6 +104,9 @@ class NodeRuntime(context: Context) {
   private val _statusText = MutableStateFlow("Offline")
   val statusText: StateFlow<String> = _statusText.asStateFlow()
 
+  private val _mainSessionKey = MutableStateFlow("main")
+  val mainSessionKey: StateFlow<String> = _mainSessionKey.asStateFlow()
+
   private val cameraHudSeq = AtomicLong(0)
   private val _cameraHud = MutableStateFlow<CameraHudState?>(null)
   val cameraHud: StateFlow<CameraHudState?> = _cameraHud.asStateFlow()
@@ -161,6 +164,7 @@ class NodeRuntime(context: Context) {
     _remoteAddress.value = null
     _isConnected.value = false
     _seamColorArgb.value = DEFAULT_SEAM_COLOR_ARGB
+    _mainSessionKey.value = "main"
     chat.onDisconnected(message)
     showLocalCanvasOnDisconnect()
   }
@@ -632,8 +636,12 @@ class NodeRuntime(context: Context) {
       val config = root?.get("config").asObjectOrNull()
       val ui = config?.get("ui").asObjectOrNull()
       val raw = ui?.get("seamColor").asStringOrNull()?.trim()
-      val parsed = parseHexColorArgb(raw) ?: return
-      _seamColorArgb.value = parsed
+      val sessionCfg = config?.get("session").asObjectOrNull()
+      val rawMainKey = sessionCfg?.get("mainKey").asStringOrNull()?.trim()
+      _mainSessionKey.value = rawMainKey?.takeIf { it.isNotEmpty() } ?: "main"
+
+      val parsed = parseHexColorArgb(raw)
+      _seamColorArgb.value = parsed ?: DEFAULT_SEAM_COLOR_ARGB
     } catch (_: Throwable) {
       // ignore
     }
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
index de32c95c3..e015aafcf 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
@@ -80,18 +80,19 @@ class TalkModeManager(
   private var interruptOnSpeech: Boolean = true
   private var voiceOverrideActive = false
   private var modelOverrideActive = false
+  private var mainSessionKey: String = "main"
 
   private var session: BridgeSession? = null
   private var pendingRunId: String? = null
   private var pendingFinal: CompletableDeferred<Boolean>? = null
-  private var chatSubscribed = false
+  private var chatSubscribedSessionKey: String? = null
 
   private var player: MediaPlayer? = null
   private var currentAudioFile: File? = null
 
   fun attachSession(session: BridgeSession) {
     this.session = session
-    chatSubscribed = false
+    chatSubscribedSessionKey = null
   }
 
   fun setEnabled(enabled: Boolean) {
@@ -173,7 +174,7 @@ class TalkModeManager(
     _isListening.value = false
     _statusText.value = "Off"
     stopSpeaking()
-    chatSubscribed = false
+    chatSubscribedSessionKey = null
 
     mainHandler.post {
       recognizer?.cancel()
@@ -281,18 +282,15 @@ class TalkModeManager(
 
     try {
       val startedAt = System.currentTimeMillis().toDouble() / 1000.0
-      subscribeChatIfNeeded(bridge = bridge, sessionKey = "main")
-      Log.d(tag, "chat.send start chars=${prompt.length}")
+      subscribeChatIfNeeded(bridge = bridge, sessionKey = mainSessionKey)
+      Log.d(tag, "chat.send start sessionKey=${mainSessionKey.ifBlank { "main" }} chars=${prompt.length}")
       val runId = sendChat(prompt, bridge)
       Log.d(tag, "chat.send ok runId=$runId")
       val ok = waitForChatFinal(runId)
       if (!ok) {
-        _statusText.value = "No reply"
-        Log.w(tag, "chat final timeout runId=$runId")
-        start()
-        return
+        Log.w(tag, "chat final timeout runId=$runId; attempting history fallback")
       }
-      val assistant = waitForAssistantText(bridge, startedAt, 12_000)
+      val assistant = waitForAssistantText(bridge, startedAt, if (ok) 12_000 else 25_000)
       if (assistant.isNullOrBlank()) {
         _statusText.value = "No reply"
         Log.w(tag, "assistant text timeout runId=$runId")
@@ -312,12 +310,12 @@ class TalkModeManager(
   }
 
   private suspend fun subscribeChatIfNeeded(bridge: BridgeSession, sessionKey: String) {
-    if (chatSubscribed) return
     val key = sessionKey.trim()
     if (key.isEmpty()) return
+    if (chatSubscribedSessionKey == key) return
     try {
       bridge.sendEvent("chat.subscribe", """{"sessionKey":"$key"}""")
-      chatSubscribed = true
+      chatSubscribedSessionKey = key
       Log.d(tag, "chat.subscribe ok sessionKey=$key")
     } catch (err: Throwable) {
       Log.w(tag, "chat.subscribe failed sessionKey=$key err=${err.message ?: err::class.java.simpleName}")
@@ -342,7 +340,7 @@ class TalkModeManager(
     val runId = UUID.randomUUID().toString()
     val params =
       buildJsonObject {
-        put("sessionKey", JsonPrimitive("main"))
+        put("sessionKey", JsonPrimitive(mainSessionKey.ifBlank { "main" }))
         put("message", JsonPrimitive(message))
         put("thinking", JsonPrimitive("low"))
         put("timeoutMs", JsonPrimitive(30_000))
@@ -396,7 +394,8 @@ class TalkModeManager(
     bridge: BridgeSession,
     sinceSeconds: Double? = null,
   ): String? {
-    val res = bridge.request("chat.history", "{\"sessionKey\":\"main\"}")
+    val key = mainSessionKey.ifBlank { "main" }
+    val res = bridge.request("chat.history", "{\"sessionKey\":\"$key\"}")
     val root = json.parseToJsonElement(res).asObjectOrNull() ?: return null
     val messages = root["messages"] as? JsonArray ?: return null
     for (item in messages.reversed()) {
@@ -404,7 +403,7 @@ class TalkModeManager(
       if (obj["role"].asStringOrNull() != "assistant") continue
       if (sinceSeconds != null) {
         val timestamp = obj["timestamp"].asDoubleOrNull()
-        if (timestamp != null && timestamp < sinceSeconds - 0.5) continue
+        if (timestamp != null && !TalkModeRuntime.isMessageTimestampAfter(timestamp, sinceSeconds)) continue
       }
       val content = obj["content"] as? JsonArray ?: continue
       val text =
@@ -438,16 +437,15 @@ class TalkModeManager(
       }
     }
 
+    val apiKey =
+      apiKey?.trim()?.takeIf { it.isNotEmpty() }
+        ?: System.getenv("ELEVENLABS_API_KEY")?.trim()
     val voiceId = directive?.voiceId ?: currentVoiceId ?: defaultVoiceId
     if (voiceId.isNullOrBlank()) {
       _statusText.value = "Missing voice ID"
       Log.w(tag, "missing voiceId")
       return
     }
-
-    val apiKey =
-      apiKey?.trim()?.takeIf { it.isNotEmpty() }
-        ?: System.getenv("ELEVENLABS_API_KEY")?.trim()
     if (apiKey.isNullOrEmpty()) {
       _statusText.value = "Missing ELEVENLABS_API_KEY"
       Log.w(tag, "missing ELEVENLABS_API_KEY")
@@ -465,7 +463,8 @@ class TalkModeManager(
         ElevenLabsRequest(
           text = cleaned,
           modelId = directive?.modelId ?: currentModelId ?: defaultModelId,
-          outputFormat = directive?.outputFormat ?: defaultOutputFormat,
+          outputFormat =
+            TalkModeRuntime.validatedOutputFormat(directive?.outputFormat ?: defaultOutputFormat),
           speed = TalkModeRuntime.resolveSpeed(directive?.speed, directive?.rateWpm),
           stability = TalkModeRuntime.validatedUnit(directive?.stability),
           similarity = TalkModeRuntime.validatedUnit(directive?.similarity),
@@ -564,12 +563,15 @@ class TalkModeManager(
       val root = json.parseToJsonElement(res).asObjectOrNull()
       val config = root?.get("config").asObjectOrNull()
       val talk = config?.get("talk").asObjectOrNull()
+      val sessionCfg = config?.get("session").asObjectOrNull()
+      val mainKey = sessionCfg?.get("mainKey").asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() } ?: "main"
       val voice = talk?.get("voiceId")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() }
       val model = talk?.get("modelId")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() }
       val outputFormat = talk?.get("outputFormat")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() }
       val key = talk?.get("apiKey")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() }
       val interrupt = talk?.get("interruptOnSpeech")?.asBooleanOrNull()
 
+      mainSessionKey = mainKey
       defaultVoiceId = voice ?: envVoice?.takeIf { it.isNotEmpty() } ?: sagVoice?.takeIf { it.isNotEmpty() }
       if (!voiceOverrideActive) currentVoiceId = defaultVoiceId
       defaultModelId = model
@@ -593,6 +595,8 @@ class TalkModeManager(
       val url = URL("https://api.elevenlabs.io/v1/text-to-speech/$voiceId")
       val conn = url.openConnection() as HttpURLConnection
       conn.requestMethod = "POST"
+      conn.connectTimeout = 30_000
+      conn.readTimeout = 30_000
       conn.setRequestProperty("Content-Type", "application/json")
       conn.setRequestProperty("Accept", "audio/mpeg")
       conn.setRequestProperty("xi-api-key", apiKey)
@@ -689,6 +693,21 @@ class TalkModeManager(
       if (!normalized.all { it in 'a'..'z' }) return null
       return normalized
     }
+
+    fun validatedOutputFormat(value: String?): String? {
+      val trimmed = value?.trim()?.lowercase() ?: return null
+      if (trimmed.isEmpty()) return null
+      return if (trimmed.startsWith("mp3_")) trimmed else null
+    }
+
+    fun isMessageTimestampAfter(timestamp: Double, sinceSeconds: Double): Boolean {
+      val sinceMs = sinceSeconds * 1000
+      return if (timestamp > 10_000_000_000) {
+        timestamp >= sinceMs - 500
+      } else {
+        timestamp >= sinceSeconds - 0.5
+      }
+    }
   }
 
   private fun ensureInterruptListener() {
diff --git a/apps/ios/Sources/Chat/ChatSheet.swift b/apps/ios/Sources/Chat/ChatSheet.swift
index 706a6b789..1d2d059bb 100644
--- a/apps/ios/Sources/Chat/ChatSheet.swift
+++ b/apps/ios/Sources/Chat/ChatSheet.swift
@@ -4,18 +4,20 @@ import SwiftUI
 struct ChatSheet: View {
     @Environment(\.dismiss) private var dismiss
     @State private var viewModel: ClawdisChatViewModel
+    private let userAccent: Color?
 
-    init(bridge: BridgeSession, sessionKey: String = "main") {
+    init(bridge: BridgeSession, sessionKey: String = "main", userAccent: Color? = nil) {
         let transport = IOSBridgeChatTransport(bridge: bridge)
         self._viewModel = State(
             initialValue: ClawdisChatViewModel(
                 sessionKey: sessionKey,
                 transport: transport))
+        self.userAccent = userAccent
     }
 
     var body: some View {
         NavigationStack {
-            ClawdisChatView(viewModel: self.viewModel)
+            ClawdisChatView(viewModel: self.viewModel, userAccent: self.userAccent)
                 .navigationTitle("Chat")
                 .navigationBarTitleDisplayMode(.inline)
                 .toolbar {
diff --git a/apps/ios/Sources/Model/NodeAppModel.swift b/apps/ios/Sources/Model/NodeAppModel.swift
index 26b5e4f1a..805cd7638 100644
--- a/apps/ios/Sources/Model/NodeAppModel.swift
+++ b/apps/ios/Sources/Model/NodeAppModel.swift
@@ -23,6 +23,7 @@ final class NodeAppModel {
     var bridgeRemoteAddress: String?
     var connectedBridgeID: String?
     var seamColorHex: String?
+    var mainSessionKey: String = "main"
 
     private let bridge = BridgeSession()
     private var bridgeTask: Task<Void, Never>?
@@ -42,7 +43,7 @@ final class NodeAppModel {
     init() {
         self.voiceWake.configure { [weak self] cmd in
             guard let self else { return }
-            let sessionKey = "main"
+            let sessionKey = self.mainSessionKey
             do {
                 try await self.sendVoiceTranscript(text: cmd, sessionKey: sessionKey)
             } catch {
@@ -267,6 +268,7 @@ final class NodeAppModel {
                 self.bridgeRemoteAddress = nil
                 self.connectedBridgeID = nil
                 self.seamColorHex = nil
+                self.mainSessionKey = "main"
                 self.showLocalCanvasOnDisconnect()
             }
         }
@@ -283,6 +285,7 @@ final class NodeAppModel {
         self.bridgeRemoteAddress = nil
         self.connectedBridgeID = nil
         self.seamColorHex = nil
+        self.mainSessionKey = "main"
         self.showLocalCanvasOnDisconnect()
     }
 
@@ -310,8 +313,12 @@ final class NodeAppModel {
             guard let config = json["config"] as? [String: Any] else { return }
             let ui = config["ui"] as? [String: Any]
             let raw = (ui?["seamColor"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+            let session = config["session"] as? [String: Any]
+            let rawMainKey = (session?["mainKey"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+            let mainKey = rawMainKey.isEmpty ? "main" : rawMainKey
             await MainActor.run {
                 self.seamColorHex = raw.isEmpty ? nil : raw
+                self.mainSessionKey = mainKey
             }
         } catch {
             // ignore
diff --git a/apps/ios/Sources/RootCanvas.swift b/apps/ios/Sources/RootCanvas.swift
index 2ca28a15b..9a7360c33 100644
--- a/apps/ios/Sources/RootCanvas.swift
+++ b/apps/ios/Sources/RootCanvas.swift
@@ -51,7 +51,10 @@ struct RootCanvas: View {
             case .settings:
                 SettingsTab()
             case .chat:
-                ChatSheet(bridge: self.appModel.bridgeSession)
+                ChatSheet(
+                    bridge: self.appModel.bridgeSession,
+                    sessionKey: self.appModel.mainSessionKey,
+                    userAccent: self.appModel.seamColor)
             }
         }
         .onAppear { self.updateIdleTimer() }
diff --git a/apps/ios/Sources/Voice/TalkModeManager.swift b/apps/ios/Sources/Voice/TalkModeManager.swift
index 9eb441ce6..a52774b27 100644
--- a/apps/ios/Sources/Voice/TalkModeManager.swift
+++ b/apps/ios/Sources/Voice/TalkModeManager.swift
@@ -34,6 +34,7 @@ final class TalkModeManager: NSObject {
     private var defaultOutputFormat: String?
     private var apiKey: String?
     private var interruptOnSpeech: Bool = true
+    private var mainSessionKey: String = "main"
 
     private var bridge: BridgeSession?
     private let silenceWindow: TimeInterval = 0.7
@@ -84,7 +85,7 @@ final class TalkModeManager: NSObject {
             self.isListening = true
             self.statusText = "Listening"
             self.startSilenceMonitor()
-            await self.subscribeChatIfNeeded(sessionKey: "main")
+            await self.subscribeChatIfNeeded(sessionKey: self.mainSessionKey)
             self.logger.info("listening")
         } catch {
             self.isListening = false
@@ -227,25 +228,22 @@ final class TalkModeManager: NSObject {
 
         do {
             let startedAt = Date().timeIntervalSince1970
-            await self.subscribeChatIfNeeded(sessionKey: "main")
-            self.logger.info("chat.send start chars=\(prompt.count, privacy: .public)")
+            let sessionKey = self.mainSessionKey
+            await self.subscribeChatIfNeeded(sessionKey: sessionKey)
+            self.logger.info("chat.send start sessionKey=\(sessionKey, privacy: .public) chars=\(prompt.count, privacy: .public)")
             let runId = try await self.sendChat(prompt, bridge: bridge)
             self.logger.info("chat.send ok runId=\(runId, privacy: .public)")
             let completion = await self.waitForChatCompletion(runId: runId, bridge: bridge, timeoutSeconds: 120)
-            guard completion == .final else {
-                switch completion {
-                case .timeout:
-                    self.statusText = "No reply"
-                    self.logger.warning("chat completion timeout runId=\(runId, privacy: .public)")
-                case .aborted:
-                    self.statusText = "Aborted"
-                    self.logger.warning("chat completion aborted runId=\(runId, privacy: .public)")
-                case .error:
-                    self.statusText = "Chat error"
-                    self.logger.warning("chat completion error runId=\(runId, privacy: .public)")
-                case .final:
-                    break
-                }
+            if completion == .timeout {
+                self.logger.warning("chat completion timeout runId=\(runId, privacy: .public); attempting history fallback")
+            } else if completion == .aborted {
+                self.statusText = "Aborted"
+                self.logger.warning("chat completion aborted runId=\(runId, privacy: .public)")
+                await self.start()
+                return
+            } else if completion == .error {
+                self.statusText = "Chat error"
+                self.logger.warning("chat completion error runId=\(runId, privacy: .public)")
                 await self.start()
                 return
             }
@@ -253,7 +251,7 @@ final class TalkModeManager: NSObject {
             guard let assistantText = try await self.waitForAssistantText(
                 bridge: bridge,
                 since: startedAt,
-                timeoutSeconds: 12)
+                timeoutSeconds: completion == .final ? 12 : 25)
             else {
                 self.statusText = "No reply"
                 self.logger.warning("assistant text timeout runId=\(runId, privacy: .public)")
@@ -338,7 +336,7 @@ final class TalkModeManager: NSObject {
     private func sendChat(_ message: String, bridge: BridgeSession) async throws -> String {
         struct SendResponse: Decodable { let runId: String }
         let payload: [String: Any] = [
-            "sessionKey": "main",
+            "sessionKey": self.mainSessionKey,
             "message": message,
             "thinking": "low",
             "timeoutMs": 30000,
@@ -404,13 +402,15 @@ final class TalkModeManager: NSObject {
     private func fetchLatestAssistantText(bridge: BridgeSession, since: Double? = nil) async throws -> String? {
         let res = try await bridge.request(
             method: "chat.history",
-            paramsJSON: "{\"sessionKey\":\"main\"}",
+            paramsJSON: "{\"sessionKey\":\"\(self.mainSessionKey)\"}",
             timeoutSeconds: 15)
         guard let json = try JSONSerialization.jsonObject(with: res) as? [String: Any] else { return nil }
         guard let messages = json["messages"] as? [[String: Any]] else { return nil }
         for msg in messages.reversed() {
             guard (msg["role"] as? String) == "assistant" else { continue }
-            if let since, let timestamp = msg["timestamp"] as? Double, timestamp < since - 0.5 {
+            if let since, let timestamp = msg["timestamp"] as? Double,
+               TalkModeRuntime.isMessageTimestampAfter(timestamp, sinceSeconds: since) == false
+            {
                 continue
             }
             guard let content = msg["content"] as? [[String: Any]] else { continue }
@@ -560,6 +560,9 @@ final class TalkModeManager: NSObject {
             guard let json = try JSONSerialization.jsonObject(with: res) as? [String: Any] else { return }
             guard let config = json["config"] as? [String: Any] else { return }
             let talk = config["talk"] as? [String: Any]
+            let session = config["session"] as? [String: Any]
+            let rawMainKey = (session?["mainKey"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+            self.mainSessionKey = rawMainKey.isEmpty ? "main" : rawMainKey
             self.defaultVoiceId = (talk?["voiceId"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
             if !self.voiceOverrideActive {
                 self.currentVoiceId = self.defaultVoiceId
@@ -721,4 +724,12 @@ private enum TalkModeRuntime {
         guard !trimmed.isEmpty else { return nil }
         return trimmed.hasPrefix("mp3_") ? trimmed : nil
     }
+
+    static func isMessageTimestampAfter(_ timestamp: Double, sinceSeconds: Double) -> Bool {
+        let sinceMs = sinceSeconds * 1000
+        if timestamp > 10_000_000_000 {
+            return timestamp >= sinceMs - 500
+        }
+        return timestamp >= sinceSeconds - 0.5
+    }
 }
diff --git a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
index e090cfebe..8b2dd7061 100644
--- a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
+++ b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
@@ -378,7 +378,7 @@ actor TalkModeRuntime {
                 guard message.role == "assistant" else { return false }
                 guard let since else { return true }
                 guard let timestamp = message.timestamp else { return false }
-                return timestamp >= since - 0.5
+                return Self.isMessageTimestampAfter(timestamp, sinceSeconds: since)
             }
             guard let assistant else { return nil }
             let text = assistant.content.compactMap { $0.text }.joined(separator: "\n")
@@ -739,6 +739,14 @@ actor TalkModeRuntime {
         }
         return trimmed
     }
+
+    private static func isMessageTimestampAfter(_ timestamp: Double, sinceSeconds: Double) -> Bool {
+        let sinceMs = sinceSeconds * 1000
+        if timestamp > 10_000_000_000 {
+            return timestamp >= sinceMs - 500
+        }
+        return timestamp >= sinceSeconds - 0.5
+    }
 }
 
 private struct ElevenLabsRequest {
diff --git a/apps/macos/Sources/Clawdis/WebChatSwiftUI.swift b/apps/macos/Sources/Clawdis/WebChatSwiftUI.swift
index b47d140ee..d396bb286 100644
--- a/apps/macos/Sources/Clawdis/WebChatSwiftUI.swift
+++ b/apps/macos/Sources/Clawdis/WebChatSwiftUI.swift
@@ -155,7 +155,8 @@ final class WebChatSwiftUIWindowController {
         self.sessionKey = sessionKey
         self.presentation = presentation
         let vm = ClawdisChatViewModel(sessionKey: sessionKey, transport: transport)
-        self.hosting = NSHostingController(rootView: ClawdisChatView(viewModel: vm))
+        let accent = Self.color(fromHex: AppStateStore.shared.seamColorHex)
+        self.hosting = NSHostingController(rootView: ClawdisChatView(viewModel: vm, userAccent: accent))
         self.contentController = Self.makeContentController(for: presentation, hosting: self.hosting)
         self.window = Self.makeWindow(for: presentation, contentViewController: self.contentController)
     }
@@ -355,4 +356,15 @@ final class WebChatSwiftUIWindowController {
             window.setFrame(frame, display: false)
         }
     }
+
+    private static func color(fromHex raw: String?) -> Color? {
+        let trimmed = (raw ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmed.isEmpty else { return nil }
+        let hex = trimmed.hasPrefix("#") ? String(trimmed.dropFirst()) : trimmed
+        guard hex.count == 6, let value = Int(hex, radix: 16) else { return nil }
+        let r = Double((value >> 16) & 0xFF) / 255.0
+        let g = Double((value >> 8) & 0xFF) / 255.0
+        let b = Double(value & 0xFF) / 255.0
+        return Color(red: r, green: g, blue: b)
+    }
 }
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatMessageViews.swift b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatMessageViews.swift
index 0b14e852a..bd8e97c52 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatMessageViews.swift
+++ b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatMessageViews.swift
@@ -137,9 +137,10 @@ private struct ChatBubbleShape: InsettableShape {
 struct ChatMessageBubble: View {
     let message: ClawdisChatMessage
     let style: ClawdisChatView.Style
+    let userAccent: Color?
 
     var body: some View {
-        ChatMessageBody(message: self.message, isUser: self.isUser, style: self.style)
+        ChatMessageBody(message: self.message, isUser: self.isUser, style: self.style, userAccent: self.userAccent)
             .frame(maxWidth: ChatUIConstants.bubbleMaxWidth, alignment: self.isUser ? .trailing : .leading)
             .frame(maxWidth: .infinity, alignment: self.isUser ? .trailing : .leading)
             .padding(.horizontal, 2)
@@ -153,6 +154,7 @@ private struct ChatMessageBody: View {
     let message: ClawdisChatMessage
     let isUser: Bool
     let style: ClawdisChatView.Style
+    let userAccent: Color?
 
     var body: some View {
         let text = self.primaryText
@@ -287,7 +289,7 @@ private struct ChatMessageBody: View {
 
     private var bubbleFillColor: Color {
         if self.isUser {
-            return ClawdisChatTheme.userBubble
+            return self.userAccent ?? ClawdisChatTheme.userBubble
         }
         if self.style == .onboarding {
             return ClawdisChatTheme.onboardingAssistantBubble
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatTheme.swift b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatTheme.swift
index ac5466c9c..33ed55e94 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatTheme.swift
+++ b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatTheme.swift
@@ -101,11 +101,7 @@ enum ClawdisChatTheme {
     }
 
     static var userBubble: Color {
-        #if os(macOS)
-        Color(nsColor: .systemBlue)
-        #else
-        Color(uiColor: .systemBlue)
-        #endif
+        Color(red: 127 / 255.0, green: 184 / 255.0, blue: 212 / 255.0)
     }
 
     static var assistantBubble: Color {
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatView.swift b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatView.swift
index acba80385..621b9fbc5 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatView.swift
+++ b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatView.swift
@@ -13,6 +13,7 @@ public struct ClawdisChatView: View {
     @State private var hasPerformedInitialScroll = false
     private let showsSessionSwitcher: Bool
     private let style: Style
+    private let userAccent: Color?
 
     private enum Layout {
         #if os(macOS)
@@ -37,11 +38,13 @@ public struct ClawdisChatView: View {
     public init(
         viewModel: ClawdisChatViewModel,
         showsSessionSwitcher: Bool = false,
-        style: Style = .standard)
+        style: Style = .standard,
+        userAccent: Color? = nil)
     {
         self._viewModel = State(initialValue: viewModel)
         self.showsSessionSwitcher = showsSessionSwitcher
         self.style = style
+        self.userAccent = userAccent
     }
 
     public var body: some View {
@@ -74,7 +77,7 @@ public struct ClawdisChatView: View {
                 ScrollView {
                     LazyVStack(spacing: Layout.messageSpacing) {
                         ForEach(self.visibleMessages) { msg in
-                            ChatMessageBubble(message: msg, style: self.style)
+                            ChatMessageBubble(message: msg, style: self.style, userAccent: self.userAccent)
                                 .frame(
                                     maxWidth: .infinity,
                                     alignment: msg.role.lowercased() == "user" ? .trailing : .leading)
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatViewModel.swift b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatViewModel.swift
index 4936d4438..561736d40 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatViewModel.swift
+++ b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatViewModel.swift
@@ -150,9 +150,36 @@ public final class ClawdisChatViewModel {
     }
 
     private static func decodeMessages(_ raw: [AnyCodable]) -> [ClawdisChatMessage] {
-        raw.compactMap { item in
+        let decoded = raw.compactMap { item in
             (try? ChatPayloadDecoding.decode(item, as: ClawdisChatMessage.self))
         }
+        return Self.dedupeMessages(decoded)
+    }
+
+    private static func dedupeMessages(_ messages: [ClawdisChatMessage]) -> [ClawdisChatMessage] {
+        var result: [ClawdisChatMessage] = []
+        result.reserveCapacity(messages.count)
+        var seen = Set<String>()
+
+        for message in messages {
+            guard let key = Self.dedupeKey(for: message) else {
+                result.append(message)
+                continue
+            }
+            if seen.contains(key) { continue }
+            seen.insert(key)
+            result.append(message)
+        }
+
+        return result
+    }
+
+    private static func dedupeKey(for message: ClawdisChatMessage) -> String? {
+        guard let timestamp = message.timestamp else { return nil }
+        let text = message.content.compactMap { $0.text }.joined(separator: "\n")
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !text.isEmpty else { return nil }
+        return "\(message.role)|\(timestamp)|\(text)"
     }
 
     private func performSend() async {
diff --git a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/ChatViewModelTests.swift b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/ChatViewModelTests.swift
index c1522a7fc..b0943fa78 100644
--- a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/ChatViewModelTests.swift
+++ b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/ChatViewModelTests.swift
@@ -117,6 +117,29 @@ private extension TestChatTransportState {
 }
 
 @Suite struct ChatViewModelTests {
+    @Test func dedupesDuplicateHistoryMessages() async throws {
+        let ts = Date().timeIntervalSince1970 * 1000
+        let duplicate = AnyCodable([
+            "role": "assistant",
+            "content": [["type": "text", "text": "Same message"]],
+            "timestamp": ts,
+        ])
+        let history = ClawdisChatHistoryPayload(
+            sessionKey: "main",
+            sessionId: "sess-main",
+            messages: [duplicate, duplicate],
+            thinkingLevel: "off")
+
+        let transport = TestChatTransport(historyResponses: [history])
+        let vm = await MainActor.run { ClawdisChatViewModel(sessionKey: "main", transport: transport) }
+
+        await MainActor.run { vm.load() }
+        try await waitUntil("bootstrap") { await MainActor.run { !vm.messages.isEmpty } }
+
+        #expect(await MainActor.run { vm.messages.count } == 1)
+        #expect(await MainActor.run { vm.messages.first?.role } == "assistant")
+    }
+
     @Test func streamsAssistantAndClearsOnFinal() async throws {
         let sessionId = "sess-main"
         let history1 = ClawdisChatHistoryPayload(

From a7617e4d79ae7cf48ce4e5d39cfcb74a4873e1bd Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 06:47:35 +0100
Subject: [PATCH 049/100] fix(ui): refine talk overlays

---
 CHANGELOG.md                                              | 4 ++++
 .../java/com/steipete/clawdis/node/ui/TalkOrbOverlay.kt   | 2 +-
 apps/ios/Sources/Voice/TalkOrbOverlay.swift               | 8 ++++----
 apps/macos/Sources/Clawdis/TalkOverlay.swift              | 7 ++++---
 apps/macos/Sources/Clawdis/TalkOverlayView.swift          | 6 +++---
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4168f520c..a4ab83493 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,10 @@
 - macOS Talk Mode: fix audio stop ordering so disabling Talk Mode always stops in-flight playback.
 - macOS Talk Mode: throttle audio-level updates (avoid per-buffer task creation) to reduce CPU/task churn.
 - macOS Talk Mode: increase overlay window size so wave rings don’t clip; close button is hover-only and closer to the orb.
+- Talk Mode: align to the gateway’s main session key and fall back to history polling when chat events drop (prevents stuck “thinking” / missing messages).
+- Talk Mode: treat history timestamps as seconds or milliseconds to avoid stale assistant picks (macOS/iOS/Android).
+- Chat UI: dedupe identical history messages to avoid duplicate bubbles.
+- Chat UI: user bubbles use `ui.seamColor` (fallback to a calmer default blue).
 - Talk Mode: wait for chat history to surface the assistant reply before starting TTS (macOS/iOS/Android).
 - iOS Talk Mode: fix chat completion wait to time out even if no events arrive (prevents “Thinking…” hangs).
 - iOS Talk Mode: keep recognition running during playback to support interrupt-on-speech.
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/TalkOrbOverlay.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/TalkOrbOverlay.kt
index 38b8e819e..11b7a3176 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/TalkOrbOverlay.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/TalkOrbOverlay.kt
@@ -62,7 +62,7 @@ fun TalkOrbOverlay(
     verticalArrangement = Arrangement.spacedBy(12.dp),
   ) {
     Box(contentAlignment = Alignment.Center) {
-      Canvas(modifier = Modifier.size(240.dp)) {
+      Canvas(modifier = Modifier.size(300.dp)) {
         val center = this.center
         val baseRadius = size.minDimension * 0.27f
 
diff --git a/apps/ios/Sources/Voice/TalkOrbOverlay.swift b/apps/ios/Sources/Voice/TalkOrbOverlay.swift
index 3d7907c6d..27bfbf4dc 100644
--- a/apps/ios/Sources/Voice/TalkOrbOverlay.swift
+++ b/apps/ios/Sources/Voice/TalkOrbOverlay.swift
@@ -12,14 +12,14 @@ struct TalkOrbOverlay: View {
             ZStack {
                 Circle()
                     .stroke(seam.opacity(0.26), lineWidth: 2)
-                    .frame(width: 220, height: 220)
+                    .frame(width: 280, height: 280)
                     .scaleEffect(self.pulse ? 1.15 : 0.96)
                     .opacity(self.pulse ? 0.0 : 1.0)
                     .animation(.easeOut(duration: 1.3).repeatForever(autoreverses: false), value: self.pulse)
 
                 Circle()
                     .stroke(seam.opacity(0.18), lineWidth: 2)
-                    .frame(width: 220, height: 220)
+                    .frame(width: 280, height: 280)
                     .scaleEffect(self.pulse ? 1.45 : 1.02)
                     .opacity(self.pulse ? 0.0 : 0.9)
                     .animation(.easeOut(duration: 1.9).repeatForever(autoreverses: false).delay(0.2), value: self.pulse)
@@ -34,8 +34,8 @@ struct TalkOrbOverlay: View {
                             ],
                             center: .center,
                             startRadius: 1,
-                            endRadius: 92))
-                    .frame(width: 136, height: 136)
+                            endRadius: 112))
+                    .frame(width: 168, height: 168)
                     .overlay(
                         Circle()
                             .stroke(seam.opacity(0.35), lineWidth: 1))
diff --git a/apps/macos/Sources/Clawdis/TalkOverlay.swift b/apps/macos/Sources/Clawdis/TalkOverlay.swift
index 3031cb97e..bbddd2a77 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlay.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlay.swift
@@ -7,7 +7,8 @@ import SwiftUI
 @Observable
 final class TalkOverlayController {
     static let shared = TalkOverlayController()
-    static let overlaySize: CGFloat = 320
+    static let overlaySize: CGFloat = 360
+    static let windowInset: CGFloat = 88
 
     private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.overlay")
 
@@ -110,8 +111,8 @@ final class TalkOverlayController {
         let size = NSSize(width: Self.overlaySize, height: Self.overlaySize)
         let visible = screen.visibleFrame
         let origin = CGPoint(
-            x: visible.maxX - size.width - self.padding,
-            y: visible.maxY - size.height - self.padding)
+            x: visible.maxX - size.width - self.padding + Self.windowInset,
+            y: visible.maxY - size.height - self.padding + Self.windowInset)
         return NSRect(origin: origin, size: size)
     }
 }
diff --git a/apps/macos/Sources/Clawdis/TalkOverlayView.swift b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
index 5611f3d1f..e9b3091d5 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlayView.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
@@ -12,8 +12,8 @@ struct TalkOverlayView: View {
                 level: self.controller.model.level,
                 accent: self.seamColor)
                 .frame(width: 96, height: 96)
-                .padding(.top, 6)
-                .padding(.trailing, 6)
+                .padding(.top, 6 + TalkOverlayController.windowInset)
+                .padding(.trailing, 6 + TalkOverlayController.windowInset)
                 .contentShape(Circle())
                 .onTapGesture {
                     TalkModeController.shared.stopSpeaking(reason: .userTap)
@@ -31,7 +31,7 @@ struct TalkOverlayView: View {
                 }
                 .buttonStyle(.plain)
                 .contentShape(Circle())
-                .offset(x: -7, y: -7)
+                .offset(x: -5, y: -5)
                 .opacity(self.hoveringWindow ? 1 : 0)
                 .animation(.easeOut(duration: 0.12), value: self.hoveringWindow)
                 .allowsHitTesting(self.hoveringWindow)

From f86772f26ce625314324abba0c7c715913593fc9 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 07:40:02 +0100
Subject: [PATCH 050/100] fix(talk): harden TTS + add system fallback

---
 CHANGELOG.md                                  |   2 +
 .../com/steipete/clawdis/node/NodeRuntime.kt  |   2 +-
 .../clawdis/node/ui/TalkOrbOverlay.kt         |   4 +-
 .../clawdis/node/voice/TalkModeManager.kt     | 177 ++++++++--
 apps/ios/Sources/Model/NodeAppModel.swift     |   2 +-
 apps/ios/Sources/Voice/TalkModeManager.swift  | 291 +++++-----------
 apps/ios/Sources/Voice/TalkOrbOverlay.swift   |   6 +-
 .../Sources/Clawdis/TalkModeRuntime.swift     | 316 ++++++------------
 apps/macos/Sources/Clawdis/TalkOverlay.swift  |   2 +-
 .../Sources/Clawdis/TalkOverlayView.swift     |   4 +-
 .../Sources/Clawdis/WebChatManager.swift      |   4 +
 .../Sources/ClawdisKit/ElevenLabsTTS.swift    | 233 +++++++++++++
 .../Sources/ClawdisKit/TalkDirective.swift    |   8 +-
 .../ClawdisKit/TalkHistoryTimestamp.swift     |  13 +
 .../ClawdisKit/TalkPromptBuilder.swift        |  18 +
 .../TalkSystemSpeechSynthesizer.swift         | 110 ++++++
 .../ClawdisKit/TalkTTSValidation.swift        |  27 ++
 .../ElevenLabsTTSValidationTests.swift        |  20 ++
 .../ClawdisKitTests/TalkDirectiveTests.swift  |  12 +
 .../TalkHistoryTimestampTests.swift           |  16 +
 .../TalkPromptBuilderTests.swift              |  16 +
 .../TalkTTSValidationTests.swift              |  24 ++
 22 files changed, 839 insertions(+), 468 deletions(-)
 create mode 100644 apps/shared/ClawdisKit/Sources/ClawdisKit/ElevenLabsTTS.swift
 create mode 100644 apps/shared/ClawdisKit/Sources/ClawdisKit/TalkHistoryTimestamp.swift
 create mode 100644 apps/shared/ClawdisKit/Sources/ClawdisKit/TalkPromptBuilder.swift
 create mode 100644 apps/shared/ClawdisKit/Sources/ClawdisKit/TalkSystemSpeechSynthesizer.swift
 create mode 100644 apps/shared/ClawdisKit/Sources/ClawdisKit/TalkTTSValidation.swift
 create mode 100644 apps/shared/ClawdisKit/Tests/ClawdisKitTests/ElevenLabsTTSValidationTests.swift
 create mode 100644 apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkHistoryTimestampTests.swift
 create mode 100644 apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkPromptBuilderTests.swift
 create mode 100644 apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkTTSValidationTests.swift

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4ab83493..2a31b58c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@
 - macOS Talk Mode: fix audio stop ordering so disabling Talk Mode always stops in-flight playback.
 - macOS Talk Mode: throttle audio-level updates (avoid per-buffer task creation) to reduce CPU/task churn.
 - macOS Talk Mode: increase overlay window size so wave rings don’t clip; close button is hover-only and closer to the orb.
+- Talk Mode: fall back to system TTS when ElevenLabs is unavailable, returns non-audio, or playback fails (macOS/iOS/Android).
+- ElevenLabs: add retry/backoff for 429/5xx and include content-type in errors for debugging.
 - Talk Mode: align to the gateway’s main session key and fall back to history polling when chat events drop (prevents stuck “thinking” / missing messages).
 - Talk Mode: treat history timestamps as seconds or milliseconds to avoid stale assistant picks (macOS/iOS/Android).
 - Chat UI: dedupe identical history messages to avoid duplicate bubbles.
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
index 7a68abbd3..1b63a4948 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/NodeRuntime.kt
@@ -930,7 +930,7 @@ class NodeRuntime(context: Context) {
 
 private data class Quad<A, B, C, D>(val first: A, val second: B, val third: C, val fourth: D)
 
-private const val DEFAULT_SEAM_COLOR_ARGB: Long = 0xFF7FB8D4
+private const val DEFAULT_SEAM_COLOR_ARGB: Long = 0xFF4F7A9A
 
 private const val a2uiReadyCheckJS: String =
   """
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/TalkOrbOverlay.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/TalkOrbOverlay.kt
index 11b7a3176..c36dbf8e4 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/TalkOrbOverlay.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/TalkOrbOverlay.kt
@@ -62,9 +62,9 @@ fun TalkOrbOverlay(
     verticalArrangement = Arrangement.spacedBy(12.dp),
   ) {
     Box(contentAlignment = Alignment.Center) {
-      Canvas(modifier = Modifier.size(300.dp)) {
+      Canvas(modifier = Modifier.size(360.dp)) {
         val center = this.center
-        val baseRadius = size.minDimension * 0.27f
+        val baseRadius = size.minDimension * 0.30f
 
         val ring1 = 1.05f + (t * 0.25f)
         val ring2 = 1.20f + (t * 0.55f)
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
index e015aafcf..eabd0abbf 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
@@ -13,6 +13,8 @@ import android.os.SystemClock
 import android.speech.RecognitionListener
 import android.speech.RecognizerIntent
 import android.speech.SpeechRecognizer
+import android.speech.tts.TextToSpeech
+import android.speech.tts.UtteranceProgressListener
 import android.util.Log
 import androidx.core.content.ContextCompat
 import com.steipete.clawdis.node.bridge.BridgeSession
@@ -89,6 +91,9 @@ class TalkModeManager(
 
   private var player: MediaPlayer? = null
   private var currentAudioFile: File? = null
+  private var systemTts: TextToSpeech? = null
+  private var systemTtsPending: CompletableDeferred<Unit>? = null
+  private var systemTtsPendingId: String? = null
 
   fun attachSession(session: BridgeSession) {
     this.session = session
@@ -181,6 +186,10 @@ class TalkModeManager(
       recognizer?.destroy()
       recognizer = null
     }
+    systemTts?.stop()
+    systemTtsPending?.cancel()
+    systemTtsPending = null
+    systemTtsPendingId = null
   }
 
   private fun startListeningInternal(markListening: Boolean) {
@@ -441,16 +450,6 @@ class TalkModeManager(
       apiKey?.trim()?.takeIf { it.isNotEmpty() }
         ?: System.getenv("ELEVENLABS_API_KEY")?.trim()
     val voiceId = directive?.voiceId ?: currentVoiceId ?: defaultVoiceId
-    if (voiceId.isNullOrBlank()) {
-      _statusText.value = "Missing voice ID"
-      Log.w(tag, "missing voiceId")
-      return
-    }
-    if (apiKey.isNullOrEmpty()) {
-      _statusText.value = "Missing ELEVENLABS_API_KEY"
-      Log.w(tag, "missing ELEVENLABS_API_KEY")
-      return
-    }
 
     _statusText.value = "Speaking…"
     _isSpeaking.value = true
@@ -458,28 +457,46 @@ class TalkModeManager(
     ensureInterruptListener()
 
     try {
-      val ttsStarted = SystemClock.elapsedRealtime()
-      val request =
-        ElevenLabsRequest(
-          text = cleaned,
-          modelId = directive?.modelId ?: currentModelId ?: defaultModelId,
-          outputFormat =
-            TalkModeRuntime.validatedOutputFormat(directive?.outputFormat ?: defaultOutputFormat),
-          speed = TalkModeRuntime.resolveSpeed(directive?.speed, directive?.rateWpm),
-          stability = TalkModeRuntime.validatedUnit(directive?.stability),
-          similarity = TalkModeRuntime.validatedUnit(directive?.similarity),
-          style = TalkModeRuntime.validatedUnit(directive?.style),
-          speakerBoost = directive?.speakerBoost,
-          seed = TalkModeRuntime.validatedSeed(directive?.seed),
-          normalize = TalkModeRuntime.validatedNormalize(directive?.normalize),
-          language = TalkModeRuntime.validatedLanguage(directive?.language),
-        )
-      val audio = synthesize(voiceId = voiceId, apiKey = apiKey, request = request)
-      Log.d(tag, "elevenlabs ok bytes=${audio.size} durMs=${SystemClock.elapsedRealtime() - ttsStarted}")
-      playAudio(audio)
+      val canUseElevenLabs = !voiceId.isNullOrBlank() && !apiKey.isNullOrEmpty()
+      if (!canUseElevenLabs) {
+        if (voiceId.isNullOrBlank()) {
+          Log.w(tag, "missing voiceId; falling back to system voice")
+        }
+        if (apiKey.isNullOrEmpty()) {
+          Log.w(tag, "missing ELEVENLABS_API_KEY; falling back to system voice")
+        }
+        _statusText.value = "Speaking (System)…"
+        speakWithSystemTts(cleaned)
+      } else {
+        val ttsStarted = SystemClock.elapsedRealtime()
+        val request =
+          ElevenLabsRequest(
+            text = cleaned,
+            modelId = directive?.modelId ?: currentModelId ?: defaultModelId,
+            outputFormat =
+              TalkModeRuntime.validatedOutputFormat(directive?.outputFormat ?: defaultOutputFormat),
+            speed = TalkModeRuntime.resolveSpeed(directive?.speed, directive?.rateWpm),
+            stability = TalkModeRuntime.validatedUnit(directive?.stability),
+            similarity = TalkModeRuntime.validatedUnit(directive?.similarity),
+            style = TalkModeRuntime.validatedUnit(directive?.style),
+            speakerBoost = directive?.speakerBoost,
+            seed = TalkModeRuntime.validatedSeed(directive?.seed),
+            normalize = TalkModeRuntime.validatedNormalize(directive?.normalize),
+            language = TalkModeRuntime.validatedLanguage(directive?.language),
+          )
+        val audio = synthesize(voiceId = voiceId!!, apiKey = apiKey!!, request = request)
+        Log.d(tag, "elevenlabs ok bytes=${audio.size} durMs=${SystemClock.elapsedRealtime() - ttsStarted}")
+        playAudio(audio)
+      }
     } catch (err: Throwable) {
-      _statusText.value = "Speak failed: ${err.message ?: err::class.simpleName}"
-      Log.w(tag, "speak failed: ${err.message ?: err::class.simpleName}")
+      Log.w(tag, "speak failed: ${err.message ?: err::class.simpleName}; falling back to system voice")
+      try {
+        _statusText.value = "Speaking (System)…"
+        speakWithSystemTts(cleaned)
+      } catch (fallbackErr: Throwable) {
+        _statusText.value = "Speak failed: ${fallbackErr.message ?: fallbackErr::class.simpleName}"
+        Log.w(tag, "system voice failed: ${fallbackErr.message ?: fallbackErr::class.simpleName}")
+      }
     }
 
     _isSpeaking.value = false
@@ -524,9 +541,103 @@ class TalkModeManager(
     Log.d(tag, "play done")
   }
 
+  private suspend fun speakWithSystemTts(text: String) {
+    val trimmed = text.trim()
+    if (trimmed.isEmpty()) return
+    val ok = ensureSystemTts()
+    if (!ok) {
+      throw IllegalStateException("system TTS unavailable")
+    }
+
+    val tts = systemTts ?: throw IllegalStateException("system TTS unavailable")
+    val utteranceId = "talk-${UUID.randomUUID()}"
+    val deferred = CompletableDeferred<Unit>()
+    systemTtsPending?.cancel()
+    systemTtsPending = deferred
+    systemTtsPendingId = utteranceId
+
+    withContext(Dispatchers.Main) {
+      val params = Bundle()
+      tts.speak(trimmed, TextToSpeech.QUEUE_FLUSH, params, utteranceId)
+    }
+
+    withContext(Dispatchers.IO) {
+      try {
+        kotlinx.coroutines.withTimeout(180_000) { deferred.await() }
+      } catch (err: Throwable) {
+        throw err
+      }
+    }
+  }
+
+  private suspend fun ensureSystemTts(): Boolean {
+    if (systemTts != null) return true
+    return withContext(Dispatchers.Main) {
+      val deferred = CompletableDeferred<Boolean>()
+      val tts =
+        try {
+          TextToSpeech(context) { status ->
+            deferred.complete(status == TextToSpeech.SUCCESS)
+          }
+        } catch (_: Throwable) {
+          deferred.complete(false)
+          null
+        }
+      if (tts == null) return@withContext false
+
+      tts.setOnUtteranceProgressListener(
+        object : UtteranceProgressListener() {
+          override fun onStart(utteranceId: String?) {}
+
+          override fun onDone(utteranceId: String?) {
+            if (utteranceId == null) return
+            if (utteranceId != systemTtsPendingId) return
+            systemTtsPending?.complete(Unit)
+            systemTtsPending = null
+            systemTtsPendingId = null
+          }
+
+          @Deprecated("Deprecated in Java")
+          override fun onError(utteranceId: String?) {
+            if (utteranceId == null) return
+            if (utteranceId != systemTtsPendingId) return
+            systemTtsPending?.completeExceptionally(IllegalStateException("system TTS error"))
+            systemTtsPending = null
+            systemTtsPendingId = null
+          }
+
+          override fun onError(utteranceId: String?, errorCode: Int) {
+            if (utteranceId == null) return
+            if (utteranceId != systemTtsPendingId) return
+            systemTtsPending?.completeExceptionally(IllegalStateException("system TTS error $errorCode"))
+            systemTtsPending = null
+            systemTtsPendingId = null
+          }
+        },
+      )
+
+      val ok =
+        try {
+          deferred.await()
+        } catch (_: Throwable) {
+          false
+        }
+      if (ok) {
+        systemTts = tts
+      } else {
+        tts.shutdown()
+      }
+      ok
+    }
+  }
+
   private fun stopSpeaking(resetInterrupt: Boolean = true) {
     if (!_isSpeaking.value) {
       cleanupPlayer()
+      systemTts?.stop()
+      systemTtsPending?.cancel()
+      systemTtsPending = null
+      systemTtsPendingId = null
       return
     }
     if (resetInterrupt) {
@@ -534,6 +645,10 @@ class TalkModeManager(
       lastInterruptedAtSeconds = currentMs / 1000.0
     }
     cleanupPlayer()
+    systemTts?.stop()
+    systemTtsPending?.cancel()
+    systemTtsPending = null
+    systemTtsPendingId = null
     _isSpeaking.value = false
   }
 
diff --git a/apps/ios/Sources/Model/NodeAppModel.swift b/apps/ios/Sources/Model/NodeAppModel.swift
index 805cd7638..189c5c160 100644
--- a/apps/ios/Sources/Model/NodeAppModel.swift
+++ b/apps/ios/Sources/Model/NodeAppModel.swift
@@ -293,7 +293,7 @@ final class NodeAppModel {
         Self.color(fromHex: self.seamColorHex) ?? Self.defaultSeamColor
     }
 
-    private static let defaultSeamColor = Color(red: 127 / 255.0, green: 184 / 255.0, blue: 212 / 255.0)
+    private static let defaultSeamColor = Color(red: 79 / 255.0, green: 122 / 255.0, blue: 154 / 255.0)
 
     private static func color(fromHex raw: String?) -> Color? {
         let trimmed = (raw ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
diff --git a/apps/ios/Sources/Voice/TalkModeManager.swift b/apps/ios/Sources/Voice/TalkModeManager.swift
index a52774b27..dff45d4d7 100644
--- a/apps/ios/Sources/Voice/TalkModeManager.swift
+++ b/apps/ios/Sources/Voice/TalkModeManager.swift
@@ -105,6 +105,7 @@ final class TalkModeManager: NSObject {
         self.stopRecognition()
         self.stopSpeaking()
         self.lastInterruptedAtSeconds = nil
+        TalkSystemSpeechSynthesizer.shared.stop()
         do {
             try AVAudioSession.sharedInstance().setActive(false, options: [.notifyOthersOnDeactivation])
         } catch {
@@ -301,20 +302,9 @@ final class TalkModeManager: NSObject {
     }
 
     private func buildPrompt(transcript: String) -> String {
-        var lines: [String] = [
-            "Talk Mode active. Reply in a concise, spoken tone.",
-            "You may optionally prefix the response with JSON (first line) to set ElevenLabs voice, e.g. {\"voice\":\"<id>\",\"once\":true}.",
-        ]
-
-        if let interrupted = self.lastInterruptedAtSeconds {
-            let formatted = String(format: "%.1f", interrupted)
-            lines.append("Assistant speech interrupted at \(formatted)s.")
-            self.lastInterruptedAtSeconds = nil
-        }
-
-        lines.append("")
-        lines.append(transcript)
-        return lines.joined(separator: "\n")
+        let interrupted = self.lastInterruptedAtSeconds
+        self.lastInterruptedAtSeconds = nil
+        return TalkPromptBuilder.build(transcript: transcript, interruptedAtSeconds: interrupted)
     }
 
     private enum ChatCompletionState: CustomStringConvertible {
@@ -409,7 +399,7 @@ final class TalkModeManager: NSObject {
         for msg in messages.reversed() {
             guard (msg["role"] as? String) == "assistant" else { continue }
             if let since, let timestamp = msg["timestamp"] as? Double,
-               TalkModeRuntime.isMessageTimestampAfter(timestamp, sinceSeconds: since) == false
+               TalkHistoryTimestamp.isAfter(timestamp, sinceSeconds: since) == false
             {
                 continue
             }
@@ -440,81 +430,91 @@ final class TalkModeManager: NSObject {
             }
         }
 
-        let voiceId = directive?.voiceId ?? self.currentVoiceId ?? self.defaultVoiceId
-        guard let voiceId, !voiceId.isEmpty else {
-            self.statusText = "Missing voice ID"
-            self.logger.error("missing voiceId")
-            return
-        }
-
-        let resolvedKey =
-            (self.apiKey?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false ? self.apiKey : nil) ??
-            ProcessInfo.processInfo.environment["ELEVENLABS_API_KEY"]
-        guard let apiKey = resolvedKey, !apiKey.isEmpty else {
-            self.statusText = "Missing ELEVENLABS_API_KEY"
-            self.logger.error("missing ELEVENLABS_API_KEY")
-            return
-        }
-
         self.statusText = "Generating voice…"
         self.isSpeaking = true
         self.lastSpokenText = cleaned
 
         do {
             let started = Date()
-            let desiredOutputFormat = directive?.outputFormat ?? self.defaultOutputFormat
-            let outputFormat = TalkModeRuntime.validatedOutputFormat(desiredOutputFormat)
-            if outputFormat == nil, let desiredOutputFormat, !desiredOutputFormat.isEmpty {
-                self.logger.warning("talk output_format unsupported for local playback: \(desiredOutputFormat, privacy: .public)")
-            }
-            let request = ElevenLabsRequest(
-                text: cleaned,
-                modelId: directive?.modelId ?? self.currentModelId ?? self.defaultModelId,
-                outputFormat: outputFormat,
-                speed: TalkModeRuntime.resolveSpeed(
-                    speed: directive?.speed,
-                    rateWPM: directive?.rateWPM),
-                stability: TalkModeRuntime.validatedUnit(directive?.stability),
-                similarity: TalkModeRuntime.validatedUnit(directive?.similarity),
-                style: TalkModeRuntime.validatedUnit(directive?.style),
-                speakerBoost: directive?.speakerBoost,
-                seed: TalkModeRuntime.validatedSeed(directive?.seed),
-                normalize: TalkModeRuntime.validatedNormalize(directive?.normalize),
-                language: TalkModeRuntime.validatedLanguage(directive?.language))
+            let language = ElevenLabsTTSClient.validatedLanguage(directive?.language)
 
-            let synthTimeoutSeconds = max(20.0, min(90.0, Double(cleaned.count) * 0.12))
-            let client = ElevenLabsClient(apiKey: apiKey)
-            let audio = try await withThrowingTaskGroup(of: Data.self) { group in
-                group.addTask {
-                    try await client.synthesize(voiceId: voiceId, request: request)
-                }
-                group.addTask {
-                    try await Task.sleep(nanoseconds: UInt64(synthTimeoutSeconds * 1_000_000_000))
-                    throw NSError(domain: "TalkTTS", code: 408, userInfo: [
-                        NSLocalizedDescriptionKey: "ElevenLabs TTS timed out after \(synthTimeoutSeconds)s",
-                    ])
-                }
-                let data = try await group.next()!
-                group.cancelAll()
-                return data
-            }
-            self.logger
-                .info(
-                    "elevenlabs ok bytes=\(audio.count, privacy: .public) dur=\(Date().timeIntervalSince(started), privacy: .public)s")
+            let voiceId = (directive?.voiceId ?? self.currentVoiceId ?? self.defaultVoiceId)?
+                .trimmingCharacters(in: .whitespacesAndNewlines)
+            let resolvedKey =
+                (self.apiKey?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false ? self.apiKey : nil) ??
+                ProcessInfo.processInfo.environment["ELEVENLABS_API_KEY"]
+            let apiKey = resolvedKey?.trimmingCharacters(in: .whitespacesAndNewlines)
+            let canUseElevenLabs = (voiceId?.isEmpty == false) && (apiKey?.isEmpty == false)
 
-            if self.interruptOnSpeech {
-                do {
-                    try self.startRecognition()
-                } catch {
-                    self.logger.warning("startRecognition during speak failed: \(error.localizedDescription, privacy: .public)")
+            if canUseElevenLabs, let voiceId, let apiKey {
+                let desiredOutputFormat = directive?.outputFormat ?? self.defaultOutputFormat
+                let outputFormat = ElevenLabsTTSClient.validatedOutputFormat(desiredOutputFormat)
+                if outputFormat == nil, let desiredOutputFormat, !desiredOutputFormat.isEmpty {
+                    self.logger.warning("talk output_format unsupported for local playback: \(desiredOutputFormat, privacy: .public)")
                 }
-            }
 
-            self.statusText = "Speaking…"
-            try await self.playAudio(data: audio)
+                let request = ElevenLabsTTSRequest(
+                    text: cleaned,
+                    modelId: directive?.modelId ?? self.currentModelId ?? self.defaultModelId,
+                    outputFormat: outputFormat,
+                    speed: TalkTTSValidation.resolveSpeed(speed: directive?.speed, rateWPM: directive?.rateWPM),
+                    stability: TalkTTSValidation.validatedUnit(directive?.stability),
+                    similarity: TalkTTSValidation.validatedUnit(directive?.similarity),
+                    style: TalkTTSValidation.validatedUnit(directive?.style),
+                    speakerBoost: directive?.speakerBoost,
+                    seed: TalkTTSValidation.validatedSeed(directive?.seed),
+                    normalize: ElevenLabsTTSClient.validatedNormalize(directive?.normalize),
+                    language: language)
+
+                let synthTimeoutSeconds = max(20.0, min(90.0, Double(cleaned.count) * 0.12))
+                let client = ElevenLabsTTSClient(apiKey: apiKey)
+                let audio = try await client.synthesizeWithHardTimeout(
+                    voiceId: voiceId,
+                    request: request,
+                    hardTimeoutSeconds: synthTimeoutSeconds)
+                self.logger
+                    .info(
+                        "elevenlabs ok bytes=\(audio.count, privacy: .public) dur=\(Date().timeIntervalSince(started), privacy: .public)s")
+
+                if self.interruptOnSpeech {
+                    do {
+                        try self.startRecognition()
+                    } catch {
+                        self.logger.warning("startRecognition during speak failed: \(error.localizedDescription, privacy: .public)")
+                    }
+                }
+
+                self.statusText = "Speaking…"
+                try await self.playAudio(data: audio)
+            } else {
+                self.logger.warning("tts unavailable; falling back to system voice (missing key or voiceId)")
+                if self.interruptOnSpeech {
+                    do {
+                        try self.startRecognition()
+                    } catch {
+                        self.logger.warning("startRecognition during speak failed: \(error.localizedDescription, privacy: .public)")
+                    }
+                }
+                self.statusText = "Speaking (System)…"
+                try await TalkSystemSpeechSynthesizer.shared.speak(text: cleaned, language: language)
+            }
         } catch {
-            self.statusText = "Speak failed: \(error.localizedDescription)"
-            self.logger.error("speak failed: \(error.localizedDescription, privacy: .public)")
+            self.logger.error("tts failed: \(error.localizedDescription, privacy: .public); falling back to system voice")
+            do {
+                if self.interruptOnSpeech {
+                    do {
+                        try self.startRecognition()
+                    } catch {
+                        self.logger.warning("startRecognition during speak failed: \(error.localizedDescription, privacy: .public)")
+                    }
+                }
+                self.statusText = "Speaking (System)…"
+                let language = ElevenLabsTTSClient.validatedLanguage(directive?.language)
+                try await TalkSystemSpeechSynthesizer.shared.speak(text: cleaned, language: language)
+            } catch {
+                self.statusText = "Speak failed: \(error.localizedDescription)"
+                self.logger.error("system voice failed: \(error.localizedDescription, privacy: .public)")
+            }
         }
 
         self.stopRecognition()
@@ -527,7 +527,11 @@ final class TalkModeManager: NSObject {
         self.player = player
         player.prepareToPlay()
         self.logger.info("play start")
-        player.play()
+        guard player.play() else {
+            throw NSError(domain: "TalkMode", code: 2, userInfo: [
+                NSLocalizedDescriptionKey: "audio player refused to play",
+            ])
+        }
         while player.isPlaying {
             try? await Task.sleep(nanoseconds: 120_000_000)
         }
@@ -541,6 +545,7 @@ final class TalkModeManager: NSObject {
         }
         self.player?.stop()
         self.player = nil
+        TalkSystemSpeechSynthesizer.shared.stop()
         self.isSpeaking = false
     }
 
@@ -584,7 +589,7 @@ final class TalkModeManager: NSObject {
 
     private static func configureAudioSession() throws {
         let session = AVAudioSession.sharedInstance()
-        try session.setCategory(.playAndRecord, mode: .measurement, options: [
+        try session.setCategory(.playAndRecord, mode: .voiceChat, options: [
             .duckOthers,
             .mixWithOthers,
             .allowBluetoothHFP,
@@ -609,127 +614,3 @@ final class TalkModeManager: NSObject {
         }
     }
 }
-
-private struct ElevenLabsRequest {
-    let text: String
-    let modelId: String?
-    let outputFormat: String?
-    let speed: Double?
-    let stability: Double?
-    let similarity: Double?
-    let style: Double?
-    let speakerBoost: Bool?
-    let seed: UInt32?
-    let normalize: String?
-    let language: String?
-}
-
-private struct ElevenLabsClient {
-    let apiKey: String
-    let baseUrl = URL(string: "https://api.elevenlabs.io")!
-
-    func synthesize(voiceId: String, request: ElevenLabsRequest) async throws -> Data {
-        var url = self.baseUrl
-        url.appendPathComponent("v1")
-        url.appendPathComponent("text-to-speech")
-        url.appendPathComponent(voiceId)
-
-        var payload: [String: Any] = [
-            "text": request.text,
-        ]
-        if let modelId = request.modelId, !modelId.isEmpty {
-            payload["model_id"] = modelId
-        }
-        if let outputFormat = request.outputFormat, !outputFormat.isEmpty {
-            payload["output_format"] = outputFormat
-        }
-        if let seed = request.seed {
-            payload["seed"] = seed
-        }
-        if let normalize = request.normalize {
-            payload["apply_text_normalization"] = normalize
-        }
-        if let language = request.language {
-            payload["language_code"] = language
-        }
-        var voiceSettings: [String: Any] = [:]
-        if let speed = request.speed { voiceSettings["speed"] = speed }
-        if let stability = request.stability { voiceSettings["stability"] = stability }
-        if let similarity = request.similarity { voiceSettings["similarity_boost"] = similarity }
-        if let style = request.style { voiceSettings["style"] = style }
-        if let speakerBoost = request.speakerBoost { voiceSettings["use_speaker_boost"] = speakerBoost }
-        if !voiceSettings.isEmpty { payload["voice_settings"] = voiceSettings }
-
-        let body = try JSONSerialization.data(withJSONObject: payload, options: [])
-        var req = URLRequest(url: url)
-        req.httpMethod = "POST"
-        req.httpBody = body
-        req.timeoutInterval = 45
-        req.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        req.setValue("audio/mpeg", forHTTPHeaderField: "Accept")
-        req.setValue(self.apiKey, forHTTPHeaderField: "xi-api-key")
-
-        let (data, response) = try await URLSession.shared.data(for: req)
-        if let http = response as? HTTPURLResponse, http.statusCode >= 400 {
-            let message = String(data: data, encoding: .utf8) ?? "unknown"
-            throw NSError(domain: "TalkTTS", code: http.statusCode, userInfo: [
-                NSLocalizedDescriptionKey: "ElevenLabs failed: \(http.statusCode) \(message)",
-            ])
-        }
-        return data
-    }
-}
-
-private enum TalkModeRuntime {
-    static func resolveSpeed(speed: Double?, rateWPM: Int?) -> Double? {
-        if let rateWPM, rateWPM > 0 {
-            let resolved = Double(rateWPM) / 175.0
-            if resolved <= 0.5 || resolved >= 2.0 { return nil }
-            return resolved
-        }
-        if let speed {
-            if speed <= 0.5 || speed >= 2.0 { return nil }
-            return speed
-        }
-        return nil
-    }
-
-    static func validatedUnit(_ value: Double?) -> Double? {
-        guard let value else { return nil }
-        if value < 0 || value > 1 { return nil }
-        return value
-    }
-
-    static func validatedSeed(_ value: Int?) -> UInt32? {
-        guard let value else { return nil }
-        if value < 0 || value > 4_294_967_295 { return nil }
-        return UInt32(value)
-    }
-
-    static func validatedNormalize(_ value: String?) -> String? {
-        guard let value else { return nil }
-        let normalized = value.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-        return ["auto", "on", "off"].contains(normalized) ? normalized : nil
-    }
-
-    static func validatedLanguage(_ value: String?) -> String? {
-        guard let value else { return nil }
-        let normalized = value.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-        guard normalized.count == 2, normalized.allSatisfy({ $0 >= "a" && $0 <= "z" }) else { return nil }
-        return normalized
-    }
-
-    static func validatedOutputFormat(_ value: String?) -> String? {
-        let trimmed = value?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        guard !trimmed.isEmpty else { return nil }
-        return trimmed.hasPrefix("mp3_") ? trimmed : nil
-    }
-
-    static func isMessageTimestampAfter(_ timestamp: Double, sinceSeconds: Double) -> Bool {
-        let sinceMs = sinceSeconds * 1000
-        if timestamp > 10_000_000_000 {
-            return timestamp >= sinceMs - 500
-        }
-        return timestamp >= sinceSeconds - 0.5
-    }
-}
diff --git a/apps/ios/Sources/Voice/TalkOrbOverlay.swift b/apps/ios/Sources/Voice/TalkOrbOverlay.swift
index 27bfbf4dc..cce8c1c61 100644
--- a/apps/ios/Sources/Voice/TalkOrbOverlay.swift
+++ b/apps/ios/Sources/Voice/TalkOrbOverlay.swift
@@ -12,14 +12,14 @@ struct TalkOrbOverlay: View {
             ZStack {
                 Circle()
                     .stroke(seam.opacity(0.26), lineWidth: 2)
-                    .frame(width: 280, height: 280)
+                    .frame(width: 320, height: 320)
                     .scaleEffect(self.pulse ? 1.15 : 0.96)
                     .opacity(self.pulse ? 0.0 : 1.0)
                     .animation(.easeOut(duration: 1.3).repeatForever(autoreverses: false), value: self.pulse)
 
                 Circle()
                     .stroke(seam.opacity(0.18), lineWidth: 2)
-                    .frame(width: 280, height: 280)
+                    .frame(width: 320, height: 320)
                     .scaleEffect(self.pulse ? 1.45 : 1.02)
                     .opacity(self.pulse ? 0.0 : 0.9)
                     .animation(.easeOut(duration: 1.9).repeatForever(autoreverses: false).delay(0.2), value: self.pulse)
@@ -35,7 +35,7 @@ struct TalkOrbOverlay: View {
                             center: .center,
                             startRadius: 1,
                             endRadius: 112))
-                    .frame(width: 168, height: 168)
+                    .frame(width: 190, height: 190)
                     .overlay(
                         Circle()
                             .stroke(seam.opacity(0.35), lineWidth: 1))
diff --git a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
index 8b2dd7061..97f8ee12f 100644
--- a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
+++ b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
@@ -291,7 +291,9 @@ actor TalkModeRuntime {
         await self.reloadConfig()
         guard self.isCurrent(gen) else { return }
         let prompt = self.buildPrompt(transcript: transcript)
-        let sessionKey = await GatewayConnection.shared.mainSessionKey()
+        let sessionKey =
+            await MainActor.run { WebChatManager.shared.activeSessionKey } ??
+            await GatewayConnection.shared.mainSessionKey()
         let runId = UUID().uuidString
         let startedAt = Date().timeIntervalSince1970
         self.logger.info(
@@ -335,20 +337,9 @@ actor TalkModeRuntime {
     }
 
     private func buildPrompt(transcript: String) -> String {
-        var lines: [String] = [
-            "Talk Mode active. Reply in a concise, spoken tone.",
-            "You may optionally prefix the response with JSON (first line) to set ElevenLabs voice, e.g. {\"voice\":\"<id>\",\"once\":true}.",
-        ]
-
-        if let interrupted = self.lastInterruptedAtSeconds {
-            let formatted = String(format: "%.1f", interrupted)
-            lines.append("Assistant speech interrupted at \(formatted)s.")
-            self.lastInterruptedAtSeconds = nil
-        }
-
-        lines.append("")
-        lines.append(transcript)
-        return lines.joined(separator: "\n")
+        let interrupted = self.lastInterruptedAtSeconds
+        self.lastInterruptedAtSeconds = nil
+        return TalkPromptBuilder.build(transcript: transcript, interruptedAtSeconds: interrupted)
     }
 
     private func waitForAssistantText(
@@ -378,7 +369,7 @@ actor TalkModeRuntime {
                 guard message.role == "assistant" else { return false }
                 guard let since else { return true }
                 guard let timestamp = message.timestamp else { return false }
-                return Self.isMessageTimestampAfter(timestamp, sinceSeconds: since)
+                return TalkHistoryTimestamp.isAfter(timestamp, sinceSeconds: since)
             }
             guard let assistant else { return nil }
             let text = assistant.content.compactMap { $0.text }.joined(separator: "\n")
@@ -421,76 +412,108 @@ actor TalkModeRuntime {
             }
         }
 
-        guard let apiKey = self.apiKey, !apiKey.isEmpty else {
-            self.logger.error("talk missing ELEVENLABS_API_KEY")
-            return
-        }
-
+        let apiKey = self.apiKey?.trimmingCharacters(in: .whitespacesAndNewlines)
         let requestedVoice =
             directive?.voiceId ??
             self.currentVoiceId ??
             self.defaultVoiceId
-        guard let voiceId = await self.resolveVoiceId(preferred: requestedVoice, apiKey: apiKey) else {
-            self.logger.error("talk missing voiceId; set talk.voiceId or ELEVENLABS_VOICE_ID")
-            return
-        }
-        guard self.isCurrent(gen) else { return }
-        self.ttsLogger.info("talk TTS request voiceId=\(voiceId, privacy: .public) chars=\(cleaned.count, privacy: .public)")
 
-        await self.startRecognition()
-        guard self.isCurrent(gen) else { return }
-        await MainActor.run { TalkModeController.shared.updatePhase(.speaking) }
-        self.phase = .speaking
+        let language = ElevenLabsTTSClient.validatedLanguage(directive?.language)
+
+        let voiceId: String?
+        if let apiKey, !apiKey.isEmpty {
+            voiceId = await self.resolveVoiceId(preferred: requestedVoice, apiKey: apiKey)
+        } else {
+            voiceId = nil
+        }
+
+        if apiKey?.isEmpty != false {
+            self.ttsLogger.warning("talk missing ELEVENLABS_API_KEY; falling back to system voice")
+        } else if voiceId == nil {
+            self.ttsLogger.warning("talk missing voiceId; falling back to system voice")
+        } else if let voiceId {
+            self.ttsLogger.info("talk TTS request voiceId=\(voiceId, privacy: .public) chars=\(cleaned.count, privacy: .public)")
+        }
         self.lastSpokenText = cleaned
 
-        let resolvedSpeed = Self.resolveSpeed(
-            speed: directive?.speed,
-            rateWPM: directive?.rateWPM,
-            logger: self.logger)
-
-        let request = ElevenLabsRequest(
-            text: cleaned,
-            modelId: directive?.modelId ?? self.currentModelId ?? self.defaultModelId,
-            outputFormat: Self.validatedOutputFormat(directive?.outputFormat ?? self.defaultOutputFormat, logger: self.logger),
-            speed: resolvedSpeed,
-            stability: Self.validatedUnit(directive?.stability, name: "stability", logger: self.logger),
-            similarity: Self.validatedUnit(directive?.similarity, name: "similarity", logger: self.logger),
-            style: Self.validatedUnit(directive?.style, name: "style", logger: self.logger),
-            speakerBoost: directive?.speakerBoost,
-            seed: Self.validatedSeed(directive?.seed, logger: self.logger),
-            normalize: Self.validatedNormalize(directive?.normalize, logger: self.logger),
-            language: Self.validatedLanguage(directive?.language, logger: self.logger))
-
         let synthTimeoutSeconds = max(20.0, min(90.0, Double(cleaned.count) * 0.12))
-        self.ttsLogger.info("talk TTS synth timeout=\(synthTimeoutSeconds, privacy: .public)s")
 
         do {
-            let client = ElevenLabsClient(apiKey: apiKey, logger: self.ttsLogger)
-            let audio = try await withThrowingTaskGroup(of: Data.self) { group in
-                group.addTask {
-                    try await client.synthesize(voiceId: voiceId, request: request)
+            if let apiKey, !apiKey.isEmpty, let voiceId {
+                let desiredOutputFormat = directive?.outputFormat ?? self.defaultOutputFormat
+                let outputFormat = ElevenLabsTTSClient.validatedOutputFormat(desiredOutputFormat)
+                if outputFormat == nil, let desiredOutputFormat, !desiredOutputFormat.isEmpty {
+                    self.logger.warning("talk output_format unsupported for local playback: \(desiredOutputFormat, privacy: .public)")
                 }
-                group.addTask {
-                    try await Task.sleep(nanoseconds: UInt64(synthTimeoutSeconds * 1_000_000_000))
-                    throw NSError(domain: "TalkTTS", code: 408, userInfo: [
-                        NSLocalizedDescriptionKey: "ElevenLabs TTS timed out after \(synthTimeoutSeconds)s",
+
+                let request = ElevenLabsTTSRequest(
+                    text: cleaned,
+                    modelId: directive?.modelId ?? self.currentModelId ?? self.defaultModelId,
+                    outputFormat: outputFormat,
+                    speed: TalkTTSValidation.resolveSpeed(speed: directive?.speed, rateWPM: directive?.rateWPM),
+                    stability: TalkTTSValidation.validatedUnit(directive?.stability),
+                    similarity: TalkTTSValidation.validatedUnit(directive?.similarity),
+                    style: TalkTTSValidation.validatedUnit(directive?.style),
+                    speakerBoost: directive?.speakerBoost,
+                    seed: TalkTTSValidation.validatedSeed(directive?.seed),
+                    normalize: ElevenLabsTTSClient.validatedNormalize(directive?.normalize),
+                    language: language)
+
+                self.ttsLogger.info("talk TTS synth timeout=\(synthTimeoutSeconds, privacy: .public)s")
+                let client = ElevenLabsTTSClient(apiKey: apiKey)
+                let audio = try await client.synthesizeWithHardTimeout(
+                    voiceId: voiceId,
+                    request: request,
+                    hardTimeoutSeconds: synthTimeoutSeconds)
+                guard self.isCurrent(gen) else { return }
+                self.ttsLogger.info("talk TTS response bytes=\(audio.count, privacy: .public)")
+
+                if self.interruptOnSpeech {
+                    await self.startRecognition()
+                    guard self.isCurrent(gen) else { return }
+                }
+
+                await MainActor.run { TalkModeController.shared.updatePhase(.speaking) }
+                self.phase = .speaking
+
+                let result = await TalkAudioPlayer.shared.play(data: audio)
+                self.ttsLogger.info("talk audio result finished=\(result.finished, privacy: .public) interruptedAt=\(String(describing: result.interruptedAt), privacy: .public)")
+                if !result.finished, result.interruptedAt == nil {
+                    throw NSError(domain: "TalkAudioPlayer", code: 1, userInfo: [
+                        NSLocalizedDescriptionKey: "audio playback failed",
                     ])
                 }
-                let data = try await group.next()!
-                group.cancelAll()
-                return data
-            }
-            guard self.isCurrent(gen) else { return }
-            self.ttsLogger.info("talk TTS response bytes=\(audio.count, privacy: .public)")
-            let result = await TalkAudioPlayer.shared.play(data: audio)
-            self.ttsLogger.info("talk audio result finished=\(result.finished, privacy: .public) interruptedAt=\(String(describing: result.interruptedAt), privacy: .public)")
-            if !result.finished, let interruptedAt = result.interruptedAt, self.phase == .speaking {
-                if self.interruptOnSpeech {
-                    self.lastInterruptedAtSeconds = interruptedAt
+                if !result.finished, let interruptedAt = result.interruptedAt, self.phase == .speaking {
+                    if self.interruptOnSpeech {
+                        self.lastInterruptedAtSeconds = interruptedAt
+                    }
                 }
+            } else {
+                self.ttsLogger.info("talk system voice start chars=\(cleaned.count, privacy: .public)")
+                if self.interruptOnSpeech {
+                    await self.startRecognition()
+                    guard self.isCurrent(gen) else { return }
+                }
+                await MainActor.run { TalkModeController.shared.updatePhase(.speaking) }
+                self.phase = .speaking
+                await TalkSystemSpeechSynthesizer.shared.stop()
+                try await TalkSystemSpeechSynthesizer.shared.speak(text: cleaned, language: language)
+                self.ttsLogger.info("talk system voice done")
             }
         } catch {
-            self.logger.error("talk TTS failed: \(error.localizedDescription, privacy: .public)")
+            self.ttsLogger.error("talk TTS failed: \(error.localizedDescription, privacy: .public); falling back to system voice")
+            do {
+                if self.interruptOnSpeech {
+                    await self.startRecognition()
+                    guard self.isCurrent(gen) else { return }
+                }
+                await MainActor.run { TalkModeController.shared.updatePhase(.speaking) }
+                self.phase = .speaking
+                await TalkSystemSpeechSynthesizer.shared.stop()
+                try await TalkSystemSpeechSynthesizer.shared.speak(text: cleaned, language: language)
+            } catch {
+                self.ttsLogger.error("talk system voice failed: \(error.localizedDescription, privacy: .public)")
+            }
         }
 
         if self.phase == .speaking {
@@ -505,7 +528,7 @@ actor TalkModeRuntime {
         if let fallbackVoiceId { return fallbackVoiceId }
 
         do {
-            let voices = try await ElevenLabsClient(apiKey: apiKey, logger: self.ttsLogger).listVoices()
+            let voices = try await ElevenLabsTTSClient(apiKey: apiKey).listVoices()
             guard let first = voices.first else {
                 self.ttsLogger.error("elevenlabs voices list empty")
                 return nil
@@ -528,6 +551,7 @@ actor TalkModeRuntime {
 
     func stopSpeaking(reason: TalkStopReason) async {
         let interruptedAt = await MainActor.run { TalkAudioPlayer.shared.stop() }
+        await TalkSystemSpeechSynthesizer.shared.stop()
         guard self.phase == .speaking else { return }
         if reason == .speech, let interruptedAt {
             self.lastInterruptedAtSeconds = interruptedAt
@@ -720,154 +744,4 @@ actor TalkModeRuntime {
         return normalized
     }
 
-    private static func validatedLanguage(_ value: String?, logger: Logger) -> String? {
-        guard let value else { return nil }
-        let normalized = value.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-        guard normalized.count == 2, normalized.allSatisfy({ $0 >= "a" && $0 <= "z" }) else {
-            logger.warning("talk language invalid: \(normalized, privacy: .public)")
-            return nil
-        }
-        return normalized
-    }
-
-    private static func validatedOutputFormat(_ value: String?, logger: Logger) -> String? {
-        let trimmed = value?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        guard !trimmed.isEmpty else { return nil }
-        guard trimmed.hasPrefix("mp3_") else {
-            logger.warning("talk output_format unsupported for local playback: \(trimmed, privacy: .public)")
-            return nil
-        }
-        return trimmed
-    }
-
-    private static func isMessageTimestampAfter(_ timestamp: Double, sinceSeconds: Double) -> Bool {
-        let sinceMs = sinceSeconds * 1000
-        if timestamp > 10_000_000_000 {
-            return timestamp >= sinceMs - 500
-        }
-        return timestamp >= sinceSeconds - 0.5
-    }
-}
-
-private struct ElevenLabsRequest {
-    let text: String
-    let modelId: String?
-    let outputFormat: String?
-    let speed: Double?
-    let stability: Double?
-    let similarity: Double?
-    let style: Double?
-    let speakerBoost: Bool?
-    let seed: UInt32?
-    let normalize: String?
-    let language: String?
-}
-
-private struct ElevenLabsClient {
-    let apiKey: String
-    let logger: Logger
-    let baseUrl: URL = URL(string: "https://api.elevenlabs.io")!
-    let ttsTimeoutSeconds: TimeInterval = 45
-    let listVoicesTimeoutSeconds: TimeInterval = 15
-
-    func synthesize(voiceId: String, request: ElevenLabsRequest) async throws -> Data {
-        var url = self.baseUrl
-        url.appendPathComponent("v1")
-        url.appendPathComponent("text-to-speech")
-        url.appendPathComponent(voiceId)
-
-        let charCount = request.text.count
-        self.logger.info(
-            "elevenlabs tts request voice=\(voiceId, privacy: .public) model=\(request.modelId ?? "default", privacy: .public) chars=\(charCount, privacy: .public)")
-        let startedAt = Date()
-
-        var payload: [String: Any] = [
-            "text": request.text,
-        ]
-        if let modelId = request.modelId, !modelId.isEmpty {
-            payload["model_id"] = modelId
-        }
-        if let outputFormat = request.outputFormat, !outputFormat.isEmpty {
-            payload["output_format"] = outputFormat
-        }
-        if let seed = request.seed {
-            payload["seed"] = seed
-        }
-        if let normalize = request.normalize {
-            payload["apply_text_normalization"] = normalize
-        }
-        if let language = request.language {
-            payload["language_code"] = language
-        }
-        var voiceSettings: [String: Any] = [:]
-        if let speed = request.speed { voiceSettings["speed"] = speed }
-        if let stability = request.stability { voiceSettings["stability"] = stability }
-        if let similarity = request.similarity { voiceSettings["similarity_boost"] = similarity }
-        if let style = request.style { voiceSettings["style"] = style }
-        if let speakerBoost = request.speakerBoost { voiceSettings["use_speaker_boost"] = speakerBoost }
-        if !voiceSettings.isEmpty {
-            payload["voice_settings"] = voiceSettings
-        }
-
-        let body = try JSONSerialization.data(withJSONObject: payload, options: [])
-        var req = URLRequest(url: url)
-        req.httpMethod = "POST"
-        req.httpBody = body
-        req.timeoutInterval = self.ttsTimeoutSeconds
-        req.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        req.setValue("audio/mpeg", forHTTPHeaderField: "Accept")
-        req.setValue(self.apiKey, forHTTPHeaderField: "xi-api-key")
-
-        let (data, response) = try await URLSession.shared.data(for: req)
-        if let http = response as? HTTPURLResponse, http.statusCode >= 400 {
-            let message = String(data: data, encoding: .utf8) ?? "unknown"
-            self.logger.error(
-                "elevenlabs tts failed status=\(http.statusCode, privacy: .public) message=\(message, privacy: .public)")
-            throw NSError(domain: "TalkTTS", code: http.statusCode, userInfo: [
-                NSLocalizedDescriptionKey: "ElevenLabs failed: \(http.statusCode) \(message)",
-            ])
-        }
-        let elapsed = Date().timeIntervalSince(startedAt)
-        self.logger.info("elevenlabs tts ok bytes=\(data.count, privacy: .public) dur=\(elapsed, privacy: .public)s")
-        return data
-    }
-
-    func listVoices() async throws -> [ElevenLabsVoice] {
-        var url = self.baseUrl
-        url.appendPathComponent("v1")
-        url.appendPathComponent("voices")
-
-        self.logger.info("elevenlabs voices list request")
-        var req = URLRequest(url: url)
-        req.httpMethod = "GET"
-        req.timeoutInterval = self.listVoicesTimeoutSeconds
-        req.setValue(self.apiKey, forHTTPHeaderField: "xi-api-key")
-
-        let (data, response) = try await URLSession.shared.data(for: req)
-        if let http = response as? HTTPURLResponse, http.statusCode >= 400 {
-            let message = String(data: data, encoding: .utf8) ?? "unknown"
-            self.logger.error(
-                "elevenlabs voices list failed status=\(http.statusCode, privacy: .public) message=\(message, privacy: .public)")
-            throw NSError(domain: "TalkTTS", code: http.statusCode, userInfo: [
-                NSLocalizedDescriptionKey: "ElevenLabs voices failed: \(http.statusCode) \(message)",
-            ])
-        }
-
-        let decoded = try JSONDecoder().decode(ElevenLabsVoicesResponse.self, from: data)
-        return decoded.voices
-    }
-}
-
-private struct ElevenLabsVoice: Decodable {
-    let voiceId: String
-    let name: String?
-
-    enum CodingKeys: String, CodingKey {
-        case voiceId = "voice_id"
-        case name
-    }
-}
-
-private struct ElevenLabsVoicesResponse: Decodable {
-    let voices: [ElevenLabsVoice]
 }
diff --git a/apps/macos/Sources/Clawdis/TalkOverlay.swift b/apps/macos/Sources/Clawdis/TalkOverlay.swift
index bbddd2a77..7f5ec7848 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlay.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlay.swift
@@ -7,7 +7,7 @@ import SwiftUI
 @Observable
 final class TalkOverlayController {
     static let shared = TalkOverlayController()
-    static let overlaySize: CGFloat = 360
+    static let overlaySize: CGFloat = 440
     static let windowInset: CGFloat = 88
 
     private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.overlay")
diff --git a/apps/macos/Sources/Clawdis/TalkOverlayView.swift b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
index e9b3091d5..c305cbf08 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlayView.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
@@ -31,7 +31,7 @@ struct TalkOverlayView: View {
                 }
                 .buttonStyle(.plain)
                 .contentShape(Circle())
-                .offset(x: -5, y: -5)
+                .offset(x: -2, y: -2)
                 .opacity(self.hoveringWindow ? 1 : 0)
                 .animation(.easeOut(duration: 0.12), value: self.hoveringWindow)
                 .allowsHitTesting(self.hoveringWindow)
@@ -42,7 +42,7 @@ struct TalkOverlayView: View {
         .onHover { self.hoveringWindow = $0 }
     }
 
-    private static let defaultSeamColor = Color(red: 127 / 255.0, green: 184 / 255.0, blue: 212 / 255.0)
+    private static let defaultSeamColor = Color(red: 79 / 255.0, green: 122 / 255.0, blue: 154 / 255.0)
 
     private var seamColor: Color {
         Self.color(fromHex: self.appState.seamColorHex) ?? Self.defaultSeamColor
diff --git a/apps/macos/Sources/Clawdis/WebChatManager.swift b/apps/macos/Sources/Clawdis/WebChatManager.swift
index 3d550ada3..2f77692de 100644
--- a/apps/macos/Sources/Clawdis/WebChatManager.swift
+++ b/apps/macos/Sources/Clawdis/WebChatManager.swift
@@ -29,6 +29,10 @@ final class WebChatManager {
 
     var onPanelVisibilityChanged: ((Bool) -> Void)?
 
+    var activeSessionKey: String? {
+        self.panelSessionKey ?? self.windowSessionKey
+    }
+
     func show(sessionKey: String) {
         self.closePanel()
         if let controller = self.windowController {
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/ElevenLabsTTS.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/ElevenLabsTTS.swift
new file mode 100644
index 000000000..c4b1e7999
--- /dev/null
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/ElevenLabsTTS.swift
@@ -0,0 +1,233 @@
+import Foundation
+
+public struct ElevenLabsVoice: Decodable, Sendable {
+    public let voiceId: String
+    public let name: String?
+
+    enum CodingKeys: String, CodingKey {
+        case voiceId = "voice_id"
+        case name
+    }
+}
+
+public struct ElevenLabsTTSRequest: Sendable {
+    public var text: String
+    public var modelId: String?
+    public var outputFormat: String?
+    public var speed: Double?
+    public var stability: Double?
+    public var similarity: Double?
+    public var style: Double?
+    public var speakerBoost: Bool?
+    public var seed: UInt32?
+    public var normalize: String?
+    public var language: String?
+
+    public init(
+        text: String,
+        modelId: String? = nil,
+        outputFormat: String? = nil,
+        speed: Double? = nil,
+        stability: Double? = nil,
+        similarity: Double? = nil,
+        style: Double? = nil,
+        speakerBoost: Bool? = nil,
+        seed: UInt32? = nil,
+        normalize: String? = nil,
+        language: String? = nil)
+    {
+        self.text = text
+        self.modelId = modelId
+        self.outputFormat = outputFormat
+        self.speed = speed
+        self.stability = stability
+        self.similarity = similarity
+        self.style = style
+        self.speakerBoost = speakerBoost
+        self.seed = seed
+        self.normalize = normalize
+        self.language = language
+    }
+}
+
+public struct ElevenLabsTTSClient: Sendable {
+    public var apiKey: String
+    public var requestTimeoutSeconds: TimeInterval
+    public var listVoicesTimeoutSeconds: TimeInterval
+    public var baseUrl: URL
+
+    public init(
+        apiKey: String,
+        requestTimeoutSeconds: TimeInterval = 45,
+        listVoicesTimeoutSeconds: TimeInterval = 15,
+        baseUrl: URL = URL(string: "https://api.elevenlabs.io")!)
+    {
+        self.apiKey = apiKey
+        self.requestTimeoutSeconds = requestTimeoutSeconds
+        self.listVoicesTimeoutSeconds = listVoicesTimeoutSeconds
+        self.baseUrl = baseUrl
+    }
+
+    public func synthesizeWithHardTimeout(
+        voiceId: String,
+        request: ElevenLabsTTSRequest,
+        hardTimeoutSeconds: TimeInterval) async throws -> Data
+    {
+        try await withThrowingTaskGroup(of: Data.self) { group in
+            group.addTask {
+                try await self.synthesize(voiceId: voiceId, request: request)
+            }
+            group.addTask {
+                try await Task.sleep(nanoseconds: UInt64(hardTimeoutSeconds * 1_000_000_000))
+                throw NSError(domain: "ElevenLabsTTS", code: 408, userInfo: [
+                    NSLocalizedDescriptionKey: "ElevenLabs TTS timed out after \(hardTimeoutSeconds)s",
+                ])
+            }
+            let data = try await group.next()!
+            group.cancelAll()
+            return data
+        }
+    }
+
+    public func synthesize(voiceId: String, request: ElevenLabsTTSRequest) async throws -> Data {
+        var url = self.baseUrl
+        url.appendPathComponent("v1")
+        url.appendPathComponent("text-to-speech")
+        url.appendPathComponent(voiceId)
+
+        let body = try JSONSerialization.data(withJSONObject: Self.buildPayload(request), options: [])
+
+        var lastError: Error?
+        for attempt in 0..<3 {
+            var req = URLRequest(url: url)
+            req.httpMethod = "POST"
+            req.httpBody = body
+            req.timeoutInterval = self.requestTimeoutSeconds
+            req.setValue("application/json", forHTTPHeaderField: "Content-Type")
+            req.setValue("audio/mpeg", forHTTPHeaderField: "Accept")
+            req.setValue(self.apiKey, forHTTPHeaderField: "xi-api-key")
+
+            do {
+                let (data, response) = try await URLSession.shared.data(for: req)
+                if let http = response as? HTTPURLResponse {
+                    let contentType = (http.value(forHTTPHeaderField: "Content-Type") ?? "unknown").lowercased()
+                    if http.statusCode == 429 || http.statusCode >= 500 {
+                        let message = Self.truncatedErrorBody(data)
+                        lastError = NSError(domain: "ElevenLabsTTS", code: http.statusCode, userInfo: [
+                            NSLocalizedDescriptionKey: "ElevenLabs retryable failure: \(http.statusCode) ct=\(contentType) \(message)",
+                        ])
+                        if attempt < 2 {
+                            let retryAfter = Double(http.value(forHTTPHeaderField: "Retry-After") ?? "")
+                            let baseDelay = [0.25, 0.75, 1.5][attempt]
+                            let delaySeconds = max(baseDelay, retryAfter ?? 0)
+                            try? await Task.sleep(nanoseconds: UInt64(delaySeconds * 1_000_000_000))
+                            continue
+                        }
+                        throw lastError!
+                    }
+
+                    if http.statusCode >= 400 {
+                        let message = Self.truncatedErrorBody(data)
+                        throw NSError(domain: "ElevenLabsTTS", code: http.statusCode, userInfo: [
+                            NSLocalizedDescriptionKey: "ElevenLabs failed: \(http.statusCode) ct=\(contentType) \(message)",
+                        ])
+                    }
+
+                    if !contentType.contains("audio") {
+                        let message = Self.truncatedErrorBody(data)
+                        throw NSError(domain: "ElevenLabsTTS", code: 415, userInfo: [
+                            NSLocalizedDescriptionKey: "ElevenLabs returned non-audio ct=\(contentType) \(message)",
+                        ])
+                    }
+                }
+                return data
+            } catch {
+                lastError = error
+                if attempt < 2 {
+                    try? await Task.sleep(nanoseconds: UInt64([0.25, 0.75, 1.5][attempt] * 1_000_000_000))
+                    continue
+                }
+                throw error
+            }
+        }
+        throw lastError ?? NSError(domain: "ElevenLabsTTS", code: 1, userInfo: [
+            NSLocalizedDescriptionKey: "ElevenLabs failed",
+        ])
+    }
+
+    public func listVoices() async throws -> [ElevenLabsVoice] {
+        var url = self.baseUrl
+        url.appendPathComponent("v1")
+        url.appendPathComponent("voices")
+
+        var req = URLRequest(url: url)
+        req.httpMethod = "GET"
+        req.timeoutInterval = self.listVoicesTimeoutSeconds
+        req.setValue(self.apiKey, forHTTPHeaderField: "xi-api-key")
+
+        let (data, response) = try await URLSession.shared.data(for: req)
+        if let http = response as? HTTPURLResponse, http.statusCode >= 400 {
+            let message = Self.truncatedErrorBody(data)
+            throw NSError(domain: "ElevenLabsTTS", code: http.statusCode, userInfo: [
+                NSLocalizedDescriptionKey: "ElevenLabs voices failed: \(http.statusCode) \(message)",
+            ])
+        }
+
+        struct VoicesResponse: Decodable { let voices: [ElevenLabsVoice] }
+        return try JSONDecoder().decode(VoicesResponse.self, from: data).voices
+    }
+
+    public static func validatedOutputFormat(_ value: String?) -> String? {
+        let trimmed = (value ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmed.isEmpty else { return nil }
+        guard trimmed.hasPrefix("mp3_") else { return nil }
+        return trimmed
+    }
+
+    public static func validatedLanguage(_ value: String?) -> String? {
+        let normalized = (value ?? "").trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+        guard normalized.count == 2, normalized.allSatisfy({ $0 >= "a" && $0 <= "z" }) else { return nil }
+        return normalized
+    }
+
+    public static func validatedNormalize(_ value: String?) -> String? {
+        let normalized = (value ?? "").trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+        guard ["auto", "on", "off"].contains(normalized) else { return nil }
+        return normalized
+    }
+
+    private static func buildPayload(_ request: ElevenLabsTTSRequest) -> [String: Any] {
+        var payload: [String: Any] = ["text": request.text]
+        if let modelId = request.modelId?.trimmingCharacters(in: .whitespacesAndNewlines), !modelId.isEmpty {
+            payload["model_id"] = modelId
+        }
+        if let outputFormat = request.outputFormat?.trimmingCharacters(in: .whitespacesAndNewlines), !outputFormat.isEmpty {
+            payload["output_format"] = outputFormat
+        }
+        if let seed = request.seed {
+            payload["seed"] = seed
+        }
+        if let normalize = request.normalize {
+            payload["apply_text_normalization"] = normalize
+        }
+        if let language = request.language {
+            payload["language_code"] = language
+        }
+
+        var voiceSettings: [String: Any] = [:]
+        if let speed = request.speed { voiceSettings["speed"] = speed }
+        if let stability = request.stability { voiceSettings["stability"] = stability }
+        if let similarity = request.similarity { voiceSettings["similarity_boost"] = similarity }
+        if let style = request.style { voiceSettings["style"] = style }
+        if let speakerBoost = request.speakerBoost { voiceSettings["use_speaker_boost"] = speakerBoost }
+        if !voiceSettings.isEmpty {
+            payload["voice_settings"] = voiceSettings
+        }
+        return payload
+    }
+
+    private static func truncatedErrorBody(_ data: Data) -> String {
+        let raw = String(data: data.prefix(4096), encoding: .utf8) ?? "unknown"
+        return raw.replacingOccurrences(of: "\n", with: " ").replacingOccurrences(of: "\r", with: " ")
+    }
+}
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkDirective.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkDirective.swift
index af0e2365f..6c460dc02 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkDirective.swift
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkDirective.swift
@@ -67,12 +67,18 @@ public enum TalkDirectiveParser {
         var lines = normalized.split(separator: "\n", omittingEmptySubsequences: false)
         guard !lines.isEmpty else { return TalkDirectiveParseResult(directive: nil, stripped: text, unknownKeys: []) }
 
-        guard let firstNonEmpty =
+        guard let firstNonEmptyIndex =
             lines.firstIndex(where: { !$0.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty })
         else {
             return TalkDirectiveParseResult(directive: nil, stripped: text, unknownKeys: [])
         }
 
+        var firstNonEmpty = firstNonEmptyIndex
+        if firstNonEmpty > 0 {
+            lines.removeSubrange(0..<firstNonEmpty)
+            firstNonEmpty = 0
+        }
+
         let head = lines[firstNonEmpty].trimmingCharacters(in: .whitespacesAndNewlines)
         guard head.hasPrefix("{"), head.hasSuffix("}") else {
             return TalkDirectiveParseResult(directive: nil, stripped: text, unknownKeys: [])
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkHistoryTimestamp.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkHistoryTimestamp.swift
new file mode 100644
index 000000000..087384dfb
--- /dev/null
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkHistoryTimestamp.swift
@@ -0,0 +1,13 @@
+public enum TalkHistoryTimestamp: Sendable {
+    /// Gateway history timestamps have historically been emitted as either seconds (Double, epoch seconds)
+    /// or milliseconds (Double, epoch ms). This helper accepts either.
+    public static func isAfter(_ timestamp: Double, sinceSeconds: Double) -> Bool {
+        let sinceMs = sinceSeconds * 1000
+        // ~2286-11-20 in epoch seconds. Anything bigger is almost certainly epoch milliseconds.
+        if timestamp > 10_000_000_000 {
+            return timestamp >= sinceMs - 500
+        }
+        return timestamp >= sinceSeconds - 0.5
+    }
+}
+
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkPromptBuilder.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkPromptBuilder.swift
new file mode 100644
index 000000000..95842d685
--- /dev/null
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkPromptBuilder.swift
@@ -0,0 +1,18 @@
+public enum TalkPromptBuilder: Sendable {
+    public static func build(transcript: String, interruptedAtSeconds: Double?) -> String {
+        var lines: [String] = [
+            "Talk Mode active. Reply in a concise, spoken tone.",
+            "You may optionally prefix the response with JSON (first line) to set ElevenLabs voice, e.g. {\"voice\":\"<id>\",\"once\":true}.",
+        ]
+
+        if let interruptedAtSeconds {
+            let formatted = String(format: "%.1f", interruptedAtSeconds)
+            lines.append("Assistant speech interrupted at \(formatted)s.")
+        }
+
+        lines.append("")
+        lines.append(transcript)
+        return lines.joined(separator: "\n")
+    }
+}
+
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkSystemSpeechSynthesizer.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkSystemSpeechSynthesizer.swift
new file mode 100644
index 000000000..d1d4eeb39
--- /dev/null
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkSystemSpeechSynthesizer.swift
@@ -0,0 +1,110 @@
+import AVFoundation
+import Foundation
+
+@MainActor
+public final class TalkSystemSpeechSynthesizer: NSObject {
+    public enum SpeakError: Error {
+        case canceled
+    }
+
+    public static let shared = TalkSystemSpeechSynthesizer()
+
+    private let synth = AVSpeechSynthesizer()
+    private var speakContinuation: CheckedContinuation<Void, Error>?
+    private var currentUtterance: AVSpeechUtterance?
+    private var currentToken = UUID()
+    private var watchdog: Task<Void, Never>?
+
+    public var isSpeaking: Bool { self.synth.isSpeaking }
+
+    private override init() {
+        super.init()
+        self.synth.delegate = self
+    }
+
+    public func stop() {
+        self.currentToken = UUID()
+        self.watchdog?.cancel()
+        self.watchdog = nil
+        self.synth.stopSpeaking(at: .immediate)
+        self.finishCurrent(with: SpeakError.canceled)
+    }
+
+    public func speak(text: String, language: String? = nil) async throws {
+        let trimmed = text.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmed.isEmpty else { return }
+
+        self.stop()
+        let token = UUID()
+        self.currentToken = token
+
+        let utterance = AVSpeechUtterance(string: trimmed)
+        if let language, let voice = AVSpeechSynthesisVoice(language: language) {
+            utterance.voice = voice
+        }
+        self.currentUtterance = utterance
+
+        let estimatedSeconds = max(3.0, min(180.0, Double(trimmed.count) * 0.08))
+        self.watchdog?.cancel()
+        self.watchdog = Task { @MainActor [weak self] in
+            guard let self else { return }
+            try? await Task.sleep(nanoseconds: UInt64(estimatedSeconds * 1_000_000_000))
+            if Task.isCancelled { return }
+            guard self.currentToken == token else { return }
+            if self.synth.isSpeaking {
+                self.synth.stopSpeaking(at: .immediate)
+            }
+            self.finishCurrent(
+                with: NSError(domain: "TalkSystemSpeechSynthesizer", code: 408, userInfo: [
+                    NSLocalizedDescriptionKey: "system TTS timed out after \(estimatedSeconds)s",
+                ]))
+        }
+
+        try await withTaskCancellationHandler(operation: {
+            try await withCheckedThrowingContinuation { cont in
+                self.speakContinuation = cont
+                self.synth.speak(utterance)
+            }
+        }, onCancel: {
+            Task { @MainActor in
+                self.stop()
+            }
+        })
+
+        if self.currentToken != token {
+            throw SpeakError.canceled
+        }
+    }
+
+    private func handleFinish(error: Error?) {
+        guard self.currentUtterance != nil else { return }
+        self.watchdog?.cancel()
+        self.watchdog = nil
+        self.finishCurrent(with: error)
+    }
+
+    private func finishCurrent(with error: Error?) {
+        self.currentUtterance = nil
+        let cont = self.speakContinuation
+        self.speakContinuation = nil
+        if let error {
+            cont?.resume(throwing: error)
+        } else {
+            cont?.resume(returning: ())
+        }
+    }
+}
+
+extension TalkSystemSpeechSynthesizer: AVSpeechSynthesizerDelegate {
+    public nonisolated func speechSynthesizer(_ synthesizer: AVSpeechSynthesizer, didFinish utterance: AVSpeechUtterance) {
+        Task { @MainActor in
+            self.handleFinish(error: nil)
+        }
+    }
+
+    public nonisolated func speechSynthesizer(_ synthesizer: AVSpeechSynthesizer, didCancel utterance: AVSpeechUtterance) {
+        Task { @MainActor in
+            self.handleFinish(error: SpeakError.canceled)
+        }
+    }
+}
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkTTSValidation.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkTTSValidation.swift
new file mode 100644
index 000000000..8137998ac
--- /dev/null
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkTTSValidation.swift
@@ -0,0 +1,27 @@
+public enum TalkTTSValidation: Sendable {
+    public static func resolveSpeed(speed: Double?, rateWPM: Int?) -> Double? {
+        if let rateWPM, rateWPM > 0 {
+            let resolved = Double(rateWPM) / 175.0
+            if resolved <= 0.5 || resolved >= 2.0 { return nil }
+            return resolved
+        }
+        if let speed {
+            if speed <= 0.5 || speed >= 2.0 { return nil }
+            return speed
+        }
+        return nil
+    }
+
+    public static func validatedUnit(_ value: Double?) -> Double? {
+        guard let value else { return nil }
+        if value < 0 || value > 1 { return nil }
+        return value
+    }
+
+    public static func validatedSeed(_ value: Int?) -> UInt32? {
+        guard let value else { return nil }
+        if value < 0 || value > 4294967295 { return nil }
+        return UInt32(value)
+    }
+}
+
diff --git a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/ElevenLabsTTSValidationTests.swift b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/ElevenLabsTTSValidationTests.swift
new file mode 100644
index 000000000..716c50508
--- /dev/null
+++ b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/ElevenLabsTTSValidationTests.swift
@@ -0,0 +1,20 @@
+import XCTest
+@testable import ClawdisKit
+
+final class ElevenLabsTTSValidationTests: XCTestCase {
+    func testValidatedOutputFormatAllowsOnlyMp3Presets() {
+        XCTAssertEqual(ElevenLabsTTSClient.validatedOutputFormat("mp3_44100_128"), "mp3_44100_128")
+        XCTAssertNil(ElevenLabsTTSClient.validatedOutputFormat("pcm_16000"))
+    }
+
+    func testValidatedLanguageAcceptsTwoLetterCodes() {
+        XCTAssertEqual(ElevenLabsTTSClient.validatedLanguage("EN"), "en")
+        XCTAssertNil(ElevenLabsTTSClient.validatedLanguage("eng"))
+    }
+
+    func testValidatedNormalizeAcceptsKnownValues() {
+        XCTAssertEqual(ElevenLabsTTSClient.validatedNormalize("AUTO"), "auto")
+        XCTAssertNil(ElevenLabsTTSClient.validatedNormalize("maybe"))
+    }
+}
+
diff --git a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkDirectiveTests.swift b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkDirectiveTests.swift
index cbfdb572b..c1169317f 100644
--- a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkDirectiveTests.swift
+++ b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkDirectiveTests.swift
@@ -50,6 +50,18 @@ final class TalkDirectiveTests: XCTestCase {
         XCTAssertEqual(result.stripped, "Hello.")
     }
 
+    func testSkipsLeadingEmptyLinesWhenParsingDirective() {
+        let text = """
+
+
+        {"voice":"abc123"}
+        Hello there.
+        """
+        let result = TalkDirectiveParser.parse(text)
+        XCTAssertEqual(result.directive?.voiceId, "abc123")
+        XCTAssertEqual(result.stripped, "Hello there.")
+    }
+
     func testTracksUnknownKeys() {
         let text = """
         {"voice":"abc","mystery":"value","extra":1}
diff --git a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkHistoryTimestampTests.swift b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkHistoryTimestampTests.swift
new file mode 100644
index 000000000..e4e6d8aea
--- /dev/null
+++ b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkHistoryTimestampTests.swift
@@ -0,0 +1,16 @@
+import XCTest
+@testable import ClawdisKit
+
+final class TalkHistoryTimestampTests: XCTestCase {
+    func testSecondsTimestampsAreAcceptedWithSmallTolerance() {
+        XCTAssertTrue(TalkHistoryTimestamp.isAfter(999.6, sinceSeconds: 1000))
+        XCTAssertFalse(TalkHistoryTimestamp.isAfter(999.4, sinceSeconds: 1000))
+    }
+
+    func testMillisecondsTimestampsAreAcceptedWithSmallTolerance() {
+        let sinceSeconds = 1_700_000_000.0
+        let sinceMs = sinceSeconds * 1000
+        XCTAssertTrue(TalkHistoryTimestamp.isAfter(sinceMs - 500, sinceSeconds: sinceSeconds))
+        XCTAssertFalse(TalkHistoryTimestamp.isAfter(sinceMs - 501, sinceSeconds: sinceSeconds))
+    }
+}
diff --git a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkPromptBuilderTests.swift b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkPromptBuilderTests.swift
new file mode 100644
index 000000000..c034cf07d
--- /dev/null
+++ b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkPromptBuilderTests.swift
@@ -0,0 +1,16 @@
+import XCTest
+@testable import ClawdisKit
+
+final class TalkPromptBuilderTests: XCTestCase {
+    func testBuildIncludesTranscript() {
+        let prompt = TalkPromptBuilder.build(transcript: "Hello", interruptedAtSeconds: nil)
+        XCTAssertTrue(prompt.contains("Talk Mode active."))
+        XCTAssertTrue(prompt.hasSuffix("\n\nHello"))
+    }
+
+    func testBuildIncludesInterruptionLineWhenProvided() {
+        let prompt = TalkPromptBuilder.build(transcript: "Hi", interruptedAtSeconds: 1.234)
+        XCTAssertTrue(prompt.contains("Assistant speech interrupted at 1.2s."))
+    }
+}
+
diff --git a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkTTSValidationTests.swift b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkTTSValidationTests.swift
new file mode 100644
index 000000000..f2d7c3c9e
--- /dev/null
+++ b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkTTSValidationTests.swift
@@ -0,0 +1,24 @@
+import XCTest
+@testable import ClawdisKit
+
+final class TalkTTSValidationTests: XCTestCase {
+    func testResolveSpeedUsesRateWPMWhenProvided() {
+        let resolved = TalkTTSValidation.resolveSpeed(speed: nil, rateWPM: 175)
+        XCTAssertNotNil(resolved)
+        XCTAssertEqual(resolved ?? 0, 1.0, accuracy: 0.0001)
+        XCTAssertNil(TalkTTSValidation.resolveSpeed(speed: nil, rateWPM: 400))
+    }
+
+    func testValidatedUnitBounds() {
+        XCTAssertEqual(TalkTTSValidation.validatedUnit(0), 0)
+        XCTAssertEqual(TalkTTSValidation.validatedUnit(1), 1)
+        XCTAssertNil(TalkTTSValidation.validatedUnit(-0.01))
+        XCTAssertNil(TalkTTSValidation.validatedUnit(1.01))
+    }
+
+    func testValidatedSeedBounds() {
+        XCTAssertEqual(TalkTTSValidation.validatedSeed(0), 0)
+        XCTAssertEqual(TalkTTSValidation.validatedSeed(1234), 1234)
+        XCTAssertNil(TalkTTSValidation.validatedSeed(-1))
+    }
+}

From 0d95d63258df65e06803a0b4c8fec2f19f480958 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 11:07:34 +0100
Subject: [PATCH 051/100] fix(macos): await-safe session key selection

---
 apps/macos/Sources/Clawdis/TalkModeRuntime.swift | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
index 97f8ee12f..48f64c129 100644
--- a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
+++ b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
@@ -291,9 +291,13 @@ actor TalkModeRuntime {
         await self.reloadConfig()
         guard self.isCurrent(gen) else { return }
         let prompt = self.buildPrompt(transcript: transcript)
-        let sessionKey =
-            await MainActor.run { WebChatManager.shared.activeSessionKey } ??
-            await GatewayConnection.shared.mainSessionKey()
+        let activeSessionKey = await MainActor.run { WebChatManager.shared.activeSessionKey }
+        let sessionKey: String
+        if let activeSessionKey {
+            sessionKey = activeSessionKey
+        } else {
+            sessionKey = await GatewayConnection.shared.mainSessionKey()
+        }
         let runId = UUID().uuidString
         let startedAt = Date().timeIntervalSince1970
         self.logger.info(

From 312443235d925d46027faa2659b74b80e0262ebb Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 11:16:15 +0100
Subject: [PATCH 052/100] fix(ios): unblock device builds

---
 apps/ios/Sources/Model/NodeAppModel.swift     |  2 +-
 apps/ios/Sources/Voice/TalkModeManager.swift  | 21 ++++++++++++-------
 .../Sources/ClawdisChatUI/ChatViewModel.swift |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/apps/ios/Sources/Model/NodeAppModel.swift b/apps/ios/Sources/Model/NodeAppModel.swift
index 189c5c160..f57aa9f99 100644
--- a/apps/ios/Sources/Model/NodeAppModel.swift
+++ b/apps/ios/Sources/Model/NodeAppModel.swift
@@ -43,7 +43,7 @@ final class NodeAppModel {
     init() {
         self.voiceWake.configure { [weak self] cmd in
             guard let self else { return }
-            let sessionKey = self.mainSessionKey
+            let sessionKey = await MainActor.run { self.mainSessionKey }
             do {
                 try await self.sendVoiceTranscript(text: cmd, sessionKey: sessionKey)
             } catch {
diff --git a/apps/ios/Sources/Voice/TalkModeManager.swift b/apps/ios/Sources/Voice/TalkModeManager.swift
index dff45d4d7..8a9845829 100644
--- a/apps/ios/Sources/Voice/TalkModeManager.swift
+++ b/apps/ios/Sources/Voice/TalkModeManager.swift
@@ -231,12 +231,14 @@ final class TalkModeManager: NSObject {
             let startedAt = Date().timeIntervalSince1970
             let sessionKey = self.mainSessionKey
             await self.subscribeChatIfNeeded(sessionKey: sessionKey)
-            self.logger.info("chat.send start sessionKey=\(sessionKey, privacy: .public) chars=\(prompt.count, privacy: .public)")
+            self.logger.info(
+                "chat.send start sessionKey=\(sessionKey, privacy: .public) chars=\(prompt.count, privacy: .public)")
             let runId = try await self.sendChat(prompt, bridge: bridge)
             self.logger.info("chat.send ok runId=\(runId, privacy: .public)")
             let completion = await self.waitForChatCompletion(runId: runId, bridge: bridge, timeoutSeconds: 120)
             if completion == .timeout {
-                self.logger.warning("chat completion timeout runId=\(runId, privacy: .public); attempting history fallback")
+                self.logger.warning(
+                    "chat completion timeout runId=\(runId, privacy: .public); attempting history fallback")
             } else if completion == .aborted {
                 self.statusText = "Aborted"
                 self.logger.warning("chat completion aborted runId=\(runId, privacy: .public)")
@@ -450,7 +452,8 @@ final class TalkModeManager: NSObject {
                 let desiredOutputFormat = directive?.outputFormat ?? self.defaultOutputFormat
                 let outputFormat = ElevenLabsTTSClient.validatedOutputFormat(desiredOutputFormat)
                 if outputFormat == nil, let desiredOutputFormat, !desiredOutputFormat.isEmpty {
-                    self.logger.warning("talk output_format unsupported for local playback: \(desiredOutputFormat, privacy: .public)")
+                    self.logger.warning(
+                        "talk output_format unsupported for local playback: \(desiredOutputFormat, privacy: .public)")
                 }
 
                 let request = ElevenLabsTTSRequest(
@@ -480,7 +483,8 @@ final class TalkModeManager: NSObject {
                     do {
                         try self.startRecognition()
                     } catch {
-                        self.logger.warning("startRecognition during speak failed: \(error.localizedDescription, privacy: .public)")
+                        self.logger.warning(
+                            "startRecognition during speak failed: \(error.localizedDescription, privacy: .public)")
                     }
                 }
 
@@ -492,20 +496,23 @@ final class TalkModeManager: NSObject {
                     do {
                         try self.startRecognition()
                     } catch {
-                        self.logger.warning("startRecognition during speak failed: \(error.localizedDescription, privacy: .public)")
+                        self.logger.warning(
+                            "startRecognition during speak failed: \(error.localizedDescription, privacy: .public)")
                     }
                 }
                 self.statusText = "Speaking (System)…"
                 try await TalkSystemSpeechSynthesizer.shared.speak(text: cleaned, language: language)
             }
         } catch {
-            self.logger.error("tts failed: \(error.localizedDescription, privacy: .public); falling back to system voice")
+            self.logger.error(
+                "tts failed: \(error.localizedDescription, privacy: .public); falling back to system voice")
             do {
                 if self.interruptOnSpeech {
                     do {
                         try self.startRecognition()
                     } catch {
-                        self.logger.warning("startRecognition during speak failed: \(error.localizedDescription, privacy: .public)")
+                        self.logger.warning(
+                            "startRecognition during speak failed: \(error.localizedDescription, privacy: .public)")
                     }
                 }
                 self.statusText = "Speaking (System)…"
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatViewModel.swift b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatViewModel.swift
index 561736d40..85799fbe7 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatViewModel.swift
+++ b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatViewModel.swift
@@ -176,7 +176,7 @@ public final class ClawdisChatViewModel {
 
     private static func dedupeKey(for message: ClawdisChatMessage) -> String? {
         guard let timestamp = message.timestamp else { return nil }
-        let text = message.content.compactMap { $0.text }.joined(separator: "\n")
+        let text = message.content.compactMap(\.text).joined(separator: "\n")
             .trimmingCharacters(in: .whitespacesAndNewlines)
         guard !text.isEmpty else { return nil }
         return "\(message.role)|\(timestamp)|\(text)"

From 715cf311df64fe29ae4bae709f431f43aa5f150f Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 11:20:14 +0100
Subject: [PATCH 053/100] fix(ui): move mac talk orb to corner

---
 apps/macos/Sources/Clawdis/TalkOverlayView.swift | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/macos/Sources/Clawdis/TalkOverlayView.swift b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
index c305cbf08..d121ee3a6 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlayView.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
@@ -4,6 +4,7 @@ struct TalkOverlayView: View {
     var controller: TalkOverlayController
     @State private var appState = AppStateStore.shared
     @State private var hoveringWindow = false
+    private static let orbCornerNudge: CGFloat = 12
 
     var body: some View {
         ZStack(alignment: .topTrailing) {
@@ -12,8 +13,8 @@ struct TalkOverlayView: View {
                 level: self.controller.model.level,
                 accent: self.seamColor)
                 .frame(width: 96, height: 96)
-                .padding(.top, 6 + TalkOverlayController.windowInset)
-                .padding(.trailing, 6 + TalkOverlayController.windowInset)
+                .padding(.top, 6 + TalkOverlayController.windowInset - Self.orbCornerNudge)
+                .padding(.trailing, 6 + TalkOverlayController.windowInset - Self.orbCornerNudge)
                 .contentShape(Circle())
                 .onTapGesture {
                     TalkModeController.shared.stopSpeaking(reason: .userTap)

From 2749c5cac3ce4126b1a7ef6e67a6c79aca828c94 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 11:21:57 +0100
Subject: [PATCH 054/100] fix: clear external streaming bubbles

---
 CHANGELOG.md                                                    | 2 +-
 .../shared/ClawdisKit/Sources/ClawdisChatUI/ChatViewModel.swift | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a31b58c8..bf0fcb59b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,7 @@
 - ElevenLabs: add retry/backoff for 429/5xx and include content-type in errors for debugging.
 - Talk Mode: align to the gateway’s main session key and fall back to history polling when chat events drop (prevents stuck “thinking” / missing messages).
 - Talk Mode: treat history timestamps as seconds or milliseconds to avoid stale assistant picks (macOS/iOS/Android).
-- Chat UI: dedupe identical history messages to avoid duplicate bubbles.
+- Chat UI: clear streaming/tool bubbles when external runs finish, preventing duplicate assistant bubbles.
 - Chat UI: user bubbles use `ui.seamColor` (fallback to a calmer default blue).
 - Talk Mode: wait for chat history to surface the assistant reply before starting TTS (macOS/iOS/Android).
 - iOS Talk Mode: fix chat completion wait to time out even if no events arrive (prevents “Thinking…” hangs).
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatViewModel.swift b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatViewModel.swift
index 85799fbe7..087ef912c 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatViewModel.swift
+++ b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatViewModel.swift
@@ -325,6 +325,8 @@ public final class ClawdisChatViewModel {
             // Keep multiple clients in sync: if another client finishes a run for our session, refresh history.
             switch chat.state {
             case "final", "aborted", "error":
+                self.streamingAssistantText = nil
+                self.pendingToolCallsById = [:]
                 Task { await self.refreshHistoryAfterRun() }
             default:
                 break

From ab27586674c235b975e96d8e813c79b02cab1810 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 11:23:45 +0100
Subject: [PATCH 055/100] test: cover external chat completion

---
 .../ClawdisKitTests/ChatViewModelTests.swift  | 111 ++++++++++++++----
 1 file changed, 88 insertions(+), 23 deletions(-)

diff --git a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/ChatViewModelTests.swift b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/ChatViewModelTests.swift
index b0943fa78..c5d8ebaf9 100644
--- a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/ChatViewModelTests.swift
+++ b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/ChatViewModelTests.swift
@@ -117,29 +117,6 @@ private extension TestChatTransportState {
 }
 
 @Suite struct ChatViewModelTests {
-    @Test func dedupesDuplicateHistoryMessages() async throws {
-        let ts = Date().timeIntervalSince1970 * 1000
-        let duplicate = AnyCodable([
-            "role": "assistant",
-            "content": [["type": "text", "text": "Same message"]],
-            "timestamp": ts,
-        ])
-        let history = ClawdisChatHistoryPayload(
-            sessionKey: "main",
-            sessionId: "sess-main",
-            messages: [duplicate, duplicate],
-            thinkingLevel: "off")
-
-        let transport = TestChatTransport(historyResponses: [history])
-        let vm = await MainActor.run { ClawdisChatViewModel(sessionKey: "main", transport: transport) }
-
-        await MainActor.run { vm.load() }
-        try await waitUntil("bootstrap") { await MainActor.run { !vm.messages.isEmpty } }
-
-        #expect(await MainActor.run { vm.messages.count } == 1)
-        #expect(await MainActor.run { vm.messages.first?.role } == "assistant")
-    }
-
     @Test func streamsAssistantAndClearsOnFinal() async throws {
         let sessionId = "sess-main"
         let history1 = ClawdisChatHistoryPayload(
@@ -214,6 +191,94 @@ private extension TestChatTransportState {
         #expect(await MainActor.run { vm.pendingToolCalls.isEmpty })
     }
 
+    @Test func clearsStreamingOnExternalFinalEvent() async throws {
+        let sessionId = "sess-main"
+        let history = ClawdisChatHistoryPayload(
+            sessionKey: "main",
+            sessionId: sessionId,
+            messages: [],
+            thinkingLevel: "off")
+        let transport = TestChatTransport(historyResponses: [history, history])
+        let vm = await MainActor.run { ClawdisChatViewModel(sessionKey: "main", transport: transport) }
+
+        await MainActor.run { vm.load() }
+        try await waitUntil("bootstrap") { await MainActor.run { vm.healthOK && vm.sessionId == sessionId } }
+
+        transport.emit(
+            .agent(
+                ClawdisAgentEventPayload(
+                    runId: sessionId,
+                    seq: 1,
+                    stream: "assistant",
+                    ts: Int(Date().timeIntervalSince1970 * 1000),
+                    data: ["text": AnyCodable("external stream")])))
+
+        transport.emit(
+            .agent(
+                ClawdisAgentEventPayload(
+                    runId: sessionId,
+                    seq: 2,
+                    stream: "tool",
+                    ts: Int(Date().timeIntervalSince1970 * 1000),
+                    data: [
+                        "phase": AnyCodable("start"),
+                        "name": AnyCodable("demo"),
+                        "toolCallId": AnyCodable("t1"),
+                        "args": AnyCodable(["x": 1]),
+                    ])))
+
+        try await waitUntil("streaming active") { await MainActor.run { vm.streamingAssistantText == "external stream" } }
+        try await waitUntil("tool call pending") { await MainActor.run { vm.pendingToolCalls.count == 1 } }
+
+        transport.emit(
+            .chat(
+                ClawdisChatEventPayload(
+                    runId: "other-run",
+                    sessionKey: "main",
+                    state: "final",
+                    message: nil,
+                    errorMessage: nil)))
+
+        try await waitUntil("streaming cleared") { await MainActor.run { vm.streamingAssistantText == nil } }
+        #expect(await MainActor.run { vm.pendingToolCalls.isEmpty })
+    }
+
+    @Test func clearsStreamingOnExternalErrorEvent() async throws {
+        let sessionId = "sess-main"
+        let history = ClawdisChatHistoryPayload(
+            sessionKey: "main",
+            sessionId: sessionId,
+            messages: [],
+            thinkingLevel: "off")
+        let transport = TestChatTransport(historyResponses: [history, history])
+        let vm = await MainActor.run { ClawdisChatViewModel(sessionKey: "main", transport: transport) }
+
+        await MainActor.run { vm.load() }
+        try await waitUntil("bootstrap") { await MainActor.run { vm.healthOK && vm.sessionId == sessionId } }
+
+        transport.emit(
+            .agent(
+                ClawdisAgentEventPayload(
+                    runId: sessionId,
+                    seq: 1,
+                    stream: "assistant",
+                    ts: Int(Date().timeIntervalSince1970 * 1000),
+                    data: ["text": AnyCodable("external stream")])))
+
+        try await waitUntil("streaming active") { await MainActor.run { vm.streamingAssistantText == "external stream" } }
+
+        transport.emit(
+            .chat(
+                ClawdisChatEventPayload(
+                    runId: "other-run",
+                    sessionKey: "main",
+                    state: "error",
+                    message: nil,
+                    errorMessage: "boom")))
+
+        try await waitUntil("streaming cleared") { await MainActor.run { vm.streamingAssistantText == nil } }
+    }
+
     @Test func abortRequestsDoNotClearPendingUntilAbortedEvent() async throws {
         let sessionId = "sess-main"
         let history = ClawdisChatHistoryPayload(

From 2814815312845a4ce039cc84420f38e499aa0f7b Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 11:35:29 +0100
Subject: [PATCH 056/100] feat: add talk voice alias map

---
 .../clawdis/node/voice/TalkModeManager.kt     |  48 +++++-
 apps/ios/Sources/Voice/TalkModeManager.swift  |  40 ++++-
 .../Sources/Clawdis/TalkModeRuntime.swift     | 144 ++++++++++++++----
 .../ClawdisKit/TalkPromptBuilder.swift        |   3 +-
 docs/configuration.md                         |   5 +
 src/config/config.test.ts                     |  29 ++++
 src/config/config.ts                          |   3 +
 7 files changed, 237 insertions(+), 35 deletions(-)

diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
index eabd0abbf..e72b07651 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
@@ -61,6 +61,12 @@ class TalkModeManager(
   private val _statusText = MutableStateFlow("Off")
   val statusText: StateFlow<String> = _statusText
 
+  private val _lastAssistantText = MutableStateFlow<String?>(null)
+  val lastAssistantText: StateFlow<String?> = _lastAssistantText
+
+  private val _usingFallbackTts = MutableStateFlow(false)
+  val usingFallbackTts: StateFlow<Boolean> = _usingFallbackTts
+
   private var recognizer: SpeechRecognizer? = null
   private var restartJob: Job? = null
   private var stopRequested = false
@@ -79,6 +85,7 @@ class TalkModeManager(
   private var currentModelId: String? = null
   private var defaultOutputFormat: String? = null
   private var apiKey: String? = null
+  private var voiceAliases: Map<String, String> = emptyMap()
   private var interruptOnSpeech: Boolean = true
   private var voiceOverrideActive = false
   private var modelOverrideActive = false
@@ -179,6 +186,7 @@ class TalkModeManager(
     _isListening.value = false
     _statusText.value = "Off"
     stopSpeaking()
+    _usingFallbackTts.value = false
     chatSubscribedSessionKey = null
 
     mainHandler.post {
@@ -334,7 +342,7 @@ class TalkModeManager(
   private fun buildPrompt(transcript: String): String {
     val lines = mutableListOf(
       "Talk Mode active. Reply in a concise, spoken tone.",
-      "You may optionally prefix the response with JSON (first line) to set ElevenLabs voice, e.g. {\"voice\":\"<id>\",\"once\":true}.",
+      "You may optionally prefix the response with JSON (first line) to set ElevenLabs voice (id or alias), e.g. {\"voice\":\"<id>\",\"once\":true}.",
     )
     lastInterruptedAtSeconds?.let {
       lines.add("Assistant speech interrupted at ${"%.1f".format(it)}s.")
@@ -432,10 +440,17 @@ class TalkModeManager(
     val directive = parsed.directive
     val cleaned = parsed.stripped.trim()
     if (cleaned.isEmpty()) return
+    _lastAssistantText.value = cleaned
+
+    val requestedVoice = directive?.voiceId?.trim()?.takeIf { it.isNotEmpty() }
+    val resolvedVoice = resolveVoiceAlias(requestedVoice)
+    if (requestedVoice != null && resolvedVoice == null) {
+      Log.w(tag, "unknown voice alias: $requestedVoice")
+    }
 
     if (directive?.voiceId != null) {
       if (directive.once != true) {
-        currentVoiceId = directive.voiceId
+        currentVoiceId = resolvedVoice
         voiceOverrideActive = true
       }
     }
@@ -449,7 +464,7 @@ class TalkModeManager(
     val apiKey =
       apiKey?.trim()?.takeIf { it.isNotEmpty() }
         ?: System.getenv("ELEVENLABS_API_KEY")?.trim()
-    val voiceId = directive?.voiceId ?: currentVoiceId ?: defaultVoiceId
+    val voiceId = resolvedVoice ?: currentVoiceId ?: defaultVoiceId
 
     _statusText.value = "Speaking…"
     _isSpeaking.value = true
@@ -465,9 +480,11 @@ class TalkModeManager(
         if (apiKey.isNullOrEmpty()) {
           Log.w(tag, "missing ELEVENLABS_API_KEY; falling back to system voice")
         }
+        _usingFallbackTts.value = true
         _statusText.value = "Speaking (System)…"
         speakWithSystemTts(cleaned)
       } else {
+        _usingFallbackTts.value = false
         val ttsStarted = SystemClock.elapsedRealtime()
         val request =
           ElevenLabsRequest(
@@ -491,6 +508,7 @@ class TalkModeManager(
     } catch (err: Throwable) {
       Log.w(tag, "speak failed: ${err.message ?: err::class.simpleName}; falling back to system voice")
       try {
+        _usingFallbackTts.value = true
         _statusText.value = "Speaking (System)…"
         speakWithSystemTts(cleaned)
       } catch (fallbackErr: Throwable) {
@@ -681,6 +699,11 @@ class TalkModeManager(
       val sessionCfg = config?.get("session").asObjectOrNull()
       val mainKey = sessionCfg?.get("mainKey").asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() } ?: "main"
       val voice = talk?.get("voiceId")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() }
+      val aliases =
+        talk?.get("voiceAliases").asObjectOrNull()?.entries?.mapNotNull { (key, value) ->
+          val id = value.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() } ?: return@mapNotNull null
+          normalizeAliasKey(key).takeIf { it.isNotEmpty() }?.let { it to id }
+        }?.toMap().orEmpty()
       val model = talk?.get("modelId")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() }
       val outputFormat = talk?.get("outputFormat")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() }
       val key = talk?.get("apiKey")?.asStringOrNull()?.trim()?.takeIf { it.isNotEmpty() }
@@ -688,6 +711,7 @@ class TalkModeManager(
 
       mainSessionKey = mainKey
       defaultVoiceId = voice ?: envVoice?.takeIf { it.isNotEmpty() } ?: sagVoice?.takeIf { it.isNotEmpty() }
+      voiceAliases = aliases
       if (!voiceOverrideActive) currentVoiceId = defaultVoiceId
       defaultModelId = model
       if (!modelOverrideActive) currentModelId = defaultModelId
@@ -697,6 +721,7 @@ class TalkModeManager(
     } catch (_: Throwable) {
       defaultVoiceId = envVoice?.takeIf { it.isNotEmpty() } ?: sagVoice?.takeIf { it.isNotEmpty() }
       apiKey = envKey?.takeIf { it.isNotEmpty() }
+      voiceAliases = emptyMap()
     }
   }
 
@@ -842,6 +867,23 @@ class TalkModeManager(
     }
   }
 
+  private fun resolveVoiceAlias(value: String?): String? {
+    val trimmed = value?.trim().orEmpty()
+    if (trimmed.isEmpty()) return null
+    val normalized = normalizeAliasKey(trimmed)
+    voiceAliases[normalized]?.let { return it }
+    if (voiceAliases.values.any { it.equals(trimmed, ignoreCase = true) }) return trimmed
+    return if (isLikelyVoiceId(trimmed)) trimmed else null
+  }
+
+  private fun isLikelyVoiceId(value: String): Boolean {
+    if (value.length < 10) return false
+    return value.all { it.isLetterOrDigit() || it == '-' || it == '_' }
+  }
+
+  private fun normalizeAliasKey(value: String): String =
+    value.trim().lowercase()
+
   private val listener =
     object : RecognitionListener {
       override fun onReadyForSpeech(params: Bundle?) {
diff --git a/apps/ios/Sources/Voice/TalkModeManager.swift b/apps/ios/Sources/Voice/TalkModeManager.swift
index 8a9845829..a84a7b4a4 100644
--- a/apps/ios/Sources/Voice/TalkModeManager.swift
+++ b/apps/ios/Sources/Voice/TalkModeManager.swift
@@ -33,6 +33,7 @@ final class TalkModeManager: NSObject {
     private var modelOverrideActive = false
     private var defaultOutputFormat: String?
     private var apiKey: String?
+    private var voiceAliases: [String: String] = [:]
     private var interruptOnSpeech: Bool = true
     private var mainSessionKey: String = "main"
 
@@ -419,7 +420,12 @@ final class TalkModeManager: NSObject {
         let cleaned = parsed.stripped.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !cleaned.isEmpty else { return }
 
-        if let voice = directive?.voiceId {
+        let requestedVoice = directive?.voiceId?.trimmingCharacters(in: .whitespacesAndNewlines)
+        let resolvedVoice = self.resolveVoiceAlias(requestedVoice)
+        if requestedVoice?.isEmpty == false, resolvedVoice == nil {
+            self.logger.warning("unknown voice alias \(requestedVoice ?? "?", privacy: .public)")
+        }
+        if let voice = resolvedVoice {
             if directive?.once != true {
                 self.currentVoiceId = voice
                 self.voiceOverrideActive = true
@@ -440,8 +446,7 @@ final class TalkModeManager: NSObject {
             let started = Date()
             let language = ElevenLabsTTSClient.validatedLanguage(directive?.language)
 
-            let voiceId = (directive?.voiceId ?? self.currentVoiceId ?? self.defaultVoiceId)?
-                .trimmingCharacters(in: .whitespacesAndNewlines)
+            let voiceId = resolvedVoice ?? self.currentVoiceId ?? self.defaultVoiceId
             let resolvedKey =
                 (self.apiKey?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false ? self.apiKey : nil) ??
                 ProcessInfo.processInfo.environment["ELEVENLABS_API_KEY"]
@@ -565,6 +570,22 @@ final class TalkModeManager: NSObject {
         return true
     }
 
+    private func resolveVoiceAlias(_ value: String?) -> String? {
+        let trimmed = (value ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmed.isEmpty else { return nil }
+        let normalized = trimmed.lowercased()
+        if let mapped = self.voiceAliases[normalized] { return mapped }
+        if self.voiceAliases.values.contains(where: { $0.caseInsensitiveCompare(trimmed) == .orderedSame }) {
+            return trimmed
+        }
+        return Self.isLikelyVoiceId(trimmed) ? trimmed : nil
+    }
+
+    private static func isLikelyVoiceId(_ value: String) -> Bool {
+        guard value.count >= 10 else { return false }
+        return value.allSatisfy { $0.isLetter || $0.isNumber || $0 == "-" || $0 == "_" }
+    }
+
     private func reloadConfig() async {
         guard let bridge else { return }
         do {
@@ -576,6 +597,19 @@ final class TalkModeManager: NSObject {
             let rawMainKey = (session?["mainKey"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
             self.mainSessionKey = rawMainKey.isEmpty ? "main" : rawMainKey
             self.defaultVoiceId = (talk?["voiceId"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
+            if let aliases = talk?["voiceAliases"] as? [String: Any] {
+                self.voiceAliases =
+                    aliases.compactMap { key, value in
+                        guard let id = value as? String else { return nil }
+                        let normalizedKey = key.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+                        let trimmedId = id.trimmingCharacters(in: .whitespacesAndNewlines)
+                        guard !normalizedKey.isEmpty, !trimmedId.isEmpty else { return nil }
+                        return (normalizedKey, trimmedId)
+                    }
+                    .reduce(into: [:]) { $0[$1.0] = $1.1 }
+            } else {
+                self.voiceAliases = [:]
+            }
             if !self.voiceOverrideActive {
                 self.currentVoiceId = self.defaultVoiceId
             }
diff --git a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
index 48f64c129..9baf17707 100644
--- a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
+++ b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
@@ -41,6 +41,7 @@ actor TalkModeRuntime {
     private var silenceTask: Task<Void, Never>?
     private var phase: TalkModePhase = .idle
     private var isEnabled = false
+    private var isPaused = false
     private var lifecycleGeneration: Int = 0
 
     private var lastHeard: Date?
@@ -57,6 +58,7 @@ actor TalkModeRuntime {
     private var defaultOutputFormat: String?
     private var interruptOnSpeech: Bool = true
     private var lastInterruptedAtSeconds: Double?
+    private var voiceAliases: [String: String] = [:]
     private var lastSpokenText: String?
     private var apiKey: String?
     private var fallbackVoiceId: String?
@@ -78,6 +80,29 @@ actor TalkModeRuntime {
         }
     }
 
+    func setPaused(_ paused: Bool) async {
+        guard paused != self.isPaused else { return }
+        self.isPaused = paused
+        await MainActor.run { TalkModeController.shared.updateLevel(0) }
+
+        guard self.isEnabled else { return }
+
+        if paused {
+            self.lastTranscript = ""
+            self.lastHeard = nil
+            self.lastSpeechEnergyAt = nil
+            await self.stopRecognition()
+            return
+        }
+
+        if self.phase == .idle || self.phase == .listening {
+            await self.startRecognition()
+            self.phase = .listening
+            await MainActor.run { TalkModeController.shared.updatePhase(.listening) }
+            self.startSilenceMonitor()
+        }
+    }
+
     private func isCurrent(_ generation: Int) -> Bool {
         generation == self.lifecycleGeneration && self.isEnabled
     }
@@ -91,6 +116,14 @@ actor TalkModeRuntime {
         }
         await self.reloadConfig()
         guard self.isCurrent(gen) else { return }
+        if self.isPaused {
+            self.phase = .idle
+            await MainActor.run {
+                TalkModeController.shared.updateLevel(0)
+                TalkModeController.shared.updatePhase(.idle)
+            }
+            return
+        }
         await self.startRecognition()
         guard self.isCurrent(gen) else { return }
         self.phase = .listening
@@ -211,6 +244,7 @@ actor TalkModeRuntime {
 
     private func handleRecognition(_ update: RecognitionUpdate) async {
         guard update.generation == self.recognitionGeneration else { return }
+        guard !self.isPaused else { return }
         if let errorDescription = update.errorDescription {
             self.logger.debug("talk recognition error: \(errorDescription, privacy: .public)")
         }
@@ -256,6 +290,7 @@ actor TalkModeRuntime {
     }
 
     private func checkSilence() async {
+        guard !self.isPaused else { return }
         guard self.phase == .listening else { return }
         let transcript = self.lastTranscript.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !transcript.isEmpty else { return }
@@ -292,11 +327,10 @@ actor TalkModeRuntime {
         guard self.isCurrent(gen) else { return }
         let prompt = self.buildPrompt(transcript: transcript)
         let activeSessionKey = await MainActor.run { WebChatManager.shared.activeSessionKey }
-        let sessionKey: String
-        if let activeSessionKey {
-            sessionKey = activeSessionKey
+        let sessionKey: String = if let activeSessionKey {
+            activeSessionKey
         } else {
-            sessionKey = await GatewayConnection.shared.mainSessionKey()
+            await GatewayConnection.shared.mainSessionKey()
         }
         let runId = UUID().uuidString
         let startedAt = Date().timeIntervalSince1970
@@ -329,17 +363,29 @@ actor TalkModeRuntime {
             self.logger.info("talk assistant text len=\(assistantText.count, privacy: .public)")
             await self.playAssistant(text: assistantText)
             guard self.isCurrent(gen) else { return }
-            await self.startListening()
-            await self.startRecognition()
+            await self.resumeListeningIfNeeded()
             return
         } catch {
             self.logger.error("talk chat.send failed: \(error.localizedDescription, privacy: .public)")
-            await self.startListening()
-            await self.startRecognition()
+            await self.resumeListeningIfNeeded()
             return
         }
     }
 
+    private func resumeListeningIfNeeded() async {
+        if self.isPaused {
+            self.lastTranscript = ""
+            self.lastHeard = nil
+            self.lastSpeechEnergyAt = nil
+            await MainActor.run {
+                TalkModeController.shared.updateLevel(0)
+            }
+            return
+        }
+        await self.startListening()
+        await self.startRecognition()
+    }
+
     private func buildPrompt(transcript: String) -> String {
         let interrupted = self.lastInterruptedAtSeconds
         self.lastInterruptedAtSeconds = nil
@@ -376,7 +422,7 @@ actor TalkModeRuntime {
                 return TalkHistoryTimestamp.isAfter(timestamp, sinceSeconds: since)
             }
             guard let assistant else { return nil }
-            let text = assistant.content.compactMap { $0.text }.joined(separator: "\n")
+            let text = assistant.content.compactMap(\.text).joined(separator: "\n")
             let trimmed = text.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
             return trimmed.isEmpty ? nil : trimmed
         } catch {
@@ -394,10 +440,16 @@ actor TalkModeRuntime {
         guard self.isCurrent(gen) else { return }
 
         if !parse.unknownKeys.isEmpty {
-            self.logger.warning("talk directive ignored keys: \(parse.unknownKeys.joined(separator: ","), privacy: .public)")
+            self.logger
+                .warning("talk directive ignored keys: \(parse.unknownKeys.joined(separator: ","), privacy: .public)")
         }
 
-        if let voice = directive?.voiceId {
+        let requestedVoice = directive?.voiceId?.trimmingCharacters(in: .whitespacesAndNewlines)
+        let resolvedVoice = self.resolveVoiceAlias(requestedVoice)
+        if let requestedVoice, !requestedVoice.isEmpty, resolvedVoice == nil {
+            self.logger.warning("talk unknown voice alias \(requestedVoice, privacy: .public)")
+        }
+        if let voice = resolvedVoice {
             if directive?.once == true {
                 self.logger.info("talk voice override (once) voiceId=\(voice, privacy: .public)")
             } else {
@@ -417,18 +469,17 @@ actor TalkModeRuntime {
         }
 
         let apiKey = self.apiKey?.trimmingCharacters(in: .whitespacesAndNewlines)
-        let requestedVoice =
-            directive?.voiceId ??
+        let preferredVoice =
+            resolvedVoice ??
             self.currentVoiceId ??
             self.defaultVoiceId
 
         let language = ElevenLabsTTSClient.validatedLanguage(directive?.language)
 
-        let voiceId: String?
-        if let apiKey, !apiKey.isEmpty {
-            voiceId = await self.resolveVoiceId(preferred: requestedVoice, apiKey: apiKey)
+        let voiceId: String? = if let apiKey, !apiKey.isEmpty {
+            await self.resolveVoiceId(preferred: preferredVoice, apiKey: apiKey)
         } else {
-            voiceId = nil
+            nil
         }
 
         if apiKey?.isEmpty != false {
@@ -436,7 +487,8 @@ actor TalkModeRuntime {
         } else if voiceId == nil {
             self.ttsLogger.warning("talk missing voiceId; falling back to system voice")
         } else if let voiceId {
-            self.ttsLogger.info("talk TTS request voiceId=\(voiceId, privacy: .public) chars=\(cleaned.count, privacy: .public)")
+            self.ttsLogger
+                .info("talk TTS request voiceId=\(voiceId, privacy: .public) chars=\(cleaned.count, privacy: .public)")
         }
         self.lastSpokenText = cleaned
 
@@ -447,7 +499,9 @@ actor TalkModeRuntime {
                 let desiredOutputFormat = directive?.outputFormat ?? self.defaultOutputFormat
                 let outputFormat = ElevenLabsTTSClient.validatedOutputFormat(desiredOutputFormat)
                 if outputFormat == nil, let desiredOutputFormat, !desiredOutputFormat.isEmpty {
-                    self.logger.warning("talk output_format unsupported for local playback: \(desiredOutputFormat, privacy: .public)")
+                    self.logger
+                        .warning(
+                            "talk output_format unsupported for local playback: \(desiredOutputFormat, privacy: .public)")
                 }
 
                 let request = ElevenLabsTTSRequest(
@@ -481,7 +535,9 @@ actor TalkModeRuntime {
                 self.phase = .speaking
 
                 let result = await TalkAudioPlayer.shared.play(data: audio)
-                self.ttsLogger.info("talk audio result finished=\(result.finished, privacy: .public) interruptedAt=\(String(describing: result.interruptedAt), privacy: .public)")
+                self.ttsLogger
+                    .info(
+                        "talk audio result finished=\(result.finished, privacy: .public) interruptedAt=\(String(describing: result.interruptedAt), privacy: .public)")
                 if !result.finished, result.interruptedAt == nil {
                     throw NSError(domain: "TalkAudioPlayer", code: 1, userInfo: [
                         NSLocalizedDescriptionKey: "audio playback failed",
@@ -505,7 +561,8 @@ actor TalkModeRuntime {
                 self.ttsLogger.info("talk system voice done")
             }
         } catch {
-            self.ttsLogger.error("talk TTS failed: \(error.localizedDescription, privacy: .public); falling back to system voice")
+            self.ttsLogger
+                .error("talk TTS failed: \(error.localizedDescription, privacy: .public); falling back to system voice")
             do {
                 if self.interruptOnSpeech {
                     await self.startRecognition()
@@ -528,7 +585,10 @@ actor TalkModeRuntime {
 
     private func resolveVoiceId(preferred: String?, apiKey: String) async -> String? {
         let trimmed = preferred?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        if !trimmed.isEmpty { return trimmed }
+        if !trimmed.isEmpty {
+            if let resolved = self.resolveVoiceAlias(trimmed) { return resolved }
+            self.ttsLogger.warning("talk unknown voice alias \(trimmed, privacy: .public)")
+        }
         if let fallbackVoiceId { return fallbackVoiceId }
 
         do {
@@ -545,7 +605,8 @@ actor TalkModeRuntime {
                 self.currentVoiceId = first.voiceId
             }
             let name = first.name ?? "unknown"
-            self.ttsLogger.info("talk default voice selected \(name, privacy: .public) (\(first.voiceId, privacy: .public))")
+            self.ttsLogger
+                .info("talk default voice selected \(name, privacy: .public) (\(first.voiceId, privacy: .public))")
             return first.voiceId
         } catch {
             self.ttsLogger.error("elevenlabs list voices failed: \(error.localizedDescription, privacy: .public)")
@@ -553,6 +614,22 @@ actor TalkModeRuntime {
         }
     }
 
+    private func resolveVoiceAlias(_ value: String?) -> String? {
+        let trimmed = (value ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmed.isEmpty else { return nil }
+        let normalized = trimmed.lowercased()
+        if let mapped = self.voiceAliases[normalized] { return mapped }
+        if self.voiceAliases.values.contains(where: { $0.caseInsensitiveCompare(trimmed) == .orderedSame }) {
+            return trimmed
+        }
+        return Self.isLikelyVoiceId(trimmed) ? trimmed : nil
+    }
+
+    private static func isLikelyVoiceId(_ value: String) -> Bool {
+        guard value.count >= 10 else { return false }
+        return value.allSatisfy { $0.isLetter || $0.isNumber || $0 == "-" || $0 == "_" }
+    }
+
     func stopSpeaking(reason: TalkStopReason) async {
         let interruptedAt = await MainActor.run { TalkAudioPlayer.shared.stop() }
         await TalkSystemSpeechSynthesizer.shared.stop()
@@ -576,6 +653,7 @@ actor TalkModeRuntime {
     private func reloadConfig() async {
         let cfg = await self.fetchTalkConfig()
         self.defaultVoiceId = cfg.voiceId
+        self.voiceAliases = cfg.voiceAliases
         if !self.voiceOverrideActive {
             self.currentVoiceId = cfg.voiceId
         }
@@ -589,11 +667,14 @@ actor TalkModeRuntime {
         let hasApiKey = (cfg.apiKey?.isEmpty == false)
         let voiceLabel = (cfg.voiceId?.isEmpty == false) ? cfg.voiceId! : "none"
         let modelLabel = (cfg.modelId?.isEmpty == false) ? cfg.modelId! : "none"
-        self.logger.info("talk config voiceId=\(voiceLabel, privacy: .public) modelId=\(modelLabel, privacy: .public) apiKey=\(hasApiKey, privacy: .public) interrupt=\(cfg.interruptOnSpeech, privacy: .public)")
+        self.logger
+            .info(
+                "talk config voiceId=\(voiceLabel, privacy: .public) modelId=\(modelLabel, privacy: .public) apiKey=\(hasApiKey, privacy: .public) interrupt=\(cfg.interruptOnSpeech, privacy: .public)")
     }
 
     private struct TalkRuntimeConfig {
         let voiceId: String?
+        let voiceAliases: [String: String]
         let modelId: String?
         let outputFormat: String?
         let interruptOnSpeech: Bool
@@ -618,6 +699,14 @@ actor TalkModeRuntime {
                 AppStateStore.shared.seamColorHex = rawSeam.isEmpty ? nil : rawSeam
             }
             let voice = talk?["voiceId"]?.stringValue
+            let rawAliases = talk?["voiceAliases"]?.dictionaryValue
+            let resolvedAliases: [String: String] =
+                rawAliases?.reduce(into: [:]) { acc, entry in
+                    let key = entry.key.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+                    let value = entry.value.stringValue?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+                    guard !key.isEmpty, !value.isEmpty else { return }
+                    acc[key] = value
+                } ?? [:]
             let model = talk?["modelId"]?.stringValue
             let outputFormat = talk?["outputFormat"]?.stringValue
             let interrupt = talk?["interruptOnSpeech"]?.boolValue
@@ -631,6 +720,7 @@ actor TalkModeRuntime {
                 (apiKey?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false ? apiKey : nil)
             return TalkRuntimeConfig(
                 voiceId: resolvedVoice,
+                voiceAliases: resolvedAliases,
                 modelId: model,
                 outputFormat: outputFormat,
                 interruptOnSpeech: interrupt ?? true,
@@ -642,6 +732,7 @@ actor TalkModeRuntime {
             let resolvedApiKey = envApiKey?.isEmpty == false ? envApiKey : nil
             return TalkRuntimeConfig(
                 voiceId: resolvedVoice,
+                voiceAliases: [:],
                 modelId: nil,
                 outputFormat: nil,
                 interruptOnSpeech: true,
@@ -652,7 +743,7 @@ actor TalkModeRuntime {
     // MARK: - Audio level handling
 
     private func noteAudioLevel(rms: Double) async {
-        if self.phase != .listening && self.phase != .speaking { return }
+        if self.phase != .listening, self.phase != .speaking { return }
         let alpha: Double = rms < self.noiseFloorRMS ? 0.08 : 0.01
         self.noiseFloorRMS = max(1e-7, self.noiseFloorRMS + (rms - self.noiseFloorRMS) * alpha)
 
@@ -731,7 +822,7 @@ actor TalkModeRuntime {
 
     private static func validatedSeed(_ value: Int?, logger: Logger) -> UInt32? {
         guard let value else { return nil }
-        if value < 0 || value > 4294967295 {
+        if value < 0 || value > 4_294_967_295 {
             logger.warning("talk seed out of range: \(value, privacy: .public)")
             return nil
         }
@@ -747,5 +838,4 @@ actor TalkModeRuntime {
         }
         return normalized
     }
-
 }
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkPromptBuilder.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkPromptBuilder.swift
index 95842d685..c63f40e9d 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkPromptBuilder.swift
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkPromptBuilder.swift
@@ -2,7 +2,7 @@ public enum TalkPromptBuilder: Sendable {
     public static func build(transcript: String, interruptedAtSeconds: Double?) -> String {
         var lines: [String] = [
             "Talk Mode active. Reply in a concise, spoken tone.",
-            "You may optionally prefix the response with JSON (first line) to set ElevenLabs voice, e.g. {\"voice\":\"<id>\",\"once\":true}.",
+            "You may optionally prefix the response with JSON (first line) to set ElevenLabs voice (id or alias), e.g. {\"voice\":\"<id>\",\"once\":true}.",
         ]
 
         if let interruptedAtSeconds {
@@ -15,4 +15,3 @@ public enum TalkPromptBuilder: Sendable {
         return lines.joined(separator: "\n")
     }
 }
-
diff --git a/docs/configuration.md b/docs/configuration.md
index ac4b3ccf4..91f1baddf 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -199,11 +199,16 @@ Controls inbound/outbound prefixes and timestamps.
 
 Defaults for Talk mode (macOS/iOS/Android). Voice IDs fall back to `ELEVENLABS_VOICE_ID` or `SAG_VOICE_ID` when unset.
 `apiKey` falls back to `ELEVENLABS_API_KEY` (or the gateway’s shell profile) when unset.
+`voiceAliases` lets Talk directives use friendly names (e.g. `"voice":"Clawd"`).
 
 ```json5
 {
   talk: {
     voiceId: "elevenlabs_voice_id",
+    voiceAliases: {
+      Clawd: "EXAVITQu4vr4xnSDxMaL",
+      Roger: "CwhRBWXzGAHq8TQ4Fs17"
+    },
     modelId: "eleven_v3",
     outputFormat: "mp3_44100_128",
     apiKey: "elevenlabs_api_key",
diff --git a/src/config/config.test.ts b/src/config/config.test.ts
index ff2009a35..36ff17454 100644
--- a/src/config/config.test.ts
+++ b/src/config/config.test.ts
@@ -221,3 +221,32 @@ describe("talk api key fallback", () => {
     });
   });
 });
+
+describe("talk.voiceAliases", () => {
+  it("accepts a string map of voice aliases", async () => {
+    vi.resetModules();
+    const { validateConfigObject } = await import("./config.js");
+    const res = validateConfigObject({
+      talk: {
+        voiceAliases: {
+          Clawd: "EXAVITQu4vr4xnSDxMaL",
+          Roger: "CwhRBWXzGAHq8TQ4Fs17",
+        },
+      },
+    });
+    expect(res.ok).toBe(true);
+  });
+
+  it("rejects non-string voice alias values", async () => {
+    vi.resetModules();
+    const { validateConfigObject } = await import("./config.js");
+    const res = validateConfigObject({
+      talk: {
+        voiceAliases: {
+          Clawd: 123,
+        },
+      },
+    });
+    expect(res.ok).toBe(false);
+  });
+});
diff --git a/src/config/config.ts b/src/config/config.ts
index 9d3b23442..89d01fdaf 100644
--- a/src/config/config.ts
+++ b/src/config/config.ts
@@ -222,6 +222,8 @@ export type CanvasHostConfig = {
 export type TalkConfig = {
   /** Default ElevenLabs voice ID for Talk mode. */
   voiceId?: string;
+  /** Optional voice name -> ElevenLabs voice ID map. */
+  voiceAliases?: Record<string, string>;
   /** Default ElevenLabs model ID for Talk mode. */
   modelId?: string;
   /** Default ElevenLabs output format (e.g. mp3_44100_128). */
@@ -815,6 +817,7 @@ const ClawdisSchema = z.object({
   talk: z
     .object({
       voiceId: z.string().optional(),
+      voiceAliases: z.record(z.string(), z.string()).optional(),
       modelId: z.string().optional(),
       outputFormat: z.string().optional(),
       apiKey: z.string().optional(),

From 9c532eac07fae10a788c7ae01cd3ec55110d8d8e Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 11:37:52 +0100
Subject: [PATCH 057/100] feat(talk): pause + drag overlay orb

---
 .../Sources/Clawdis/TalkModeController.swift  | 21 ++++-
 apps/macos/Sources/Clawdis/TalkOverlay.swift  | 16 ++++
 .../Sources/Clawdis/TalkOverlayView.swift     | 79 +++++++++++++++----
 3 files changed, 98 insertions(+), 18 deletions(-)

diff --git a/apps/macos/Sources/Clawdis/TalkModeController.swift b/apps/macos/Sources/Clawdis/TalkModeController.swift
index 707b56995..85e3405ec 100644
--- a/apps/macos/Sources/Clawdis/TalkModeController.swift
+++ b/apps/macos/Sources/Clawdis/TalkModeController.swift
@@ -8,6 +8,9 @@ final class TalkModeController {
 
     private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.controller")
 
+    private(set) var phase: TalkModePhase = .idle
+    private(set) var isPaused: Bool = false
+
     func setEnabled(_ enabled: Bool) async {
         self.logger.info("talk enabled=\(enabled)")
         if enabled {
@@ -19,14 +22,30 @@ final class TalkModeController {
     }
 
     func updatePhase(_ phase: TalkModePhase) {
+        self.phase = phase
         TalkOverlayController.shared.updatePhase(phase)
-        Task { await GatewayConnection.shared.talkMode(enabled: AppStateStore.shared.talkEnabled, phase: phase.rawValue) }
+        let effectivePhase = self.isPaused ? "paused" : phase.rawValue
+        Task { await GatewayConnection.shared.talkMode(enabled: AppStateStore.shared.talkEnabled, phase: effectivePhase) }
     }
 
     func updateLevel(_ level: Double) {
         TalkOverlayController.shared.updateLevel(level)
     }
 
+    func setPaused(_ paused: Bool) {
+        guard self.isPaused != paused else { return }
+        self.logger.info("talk paused=\(paused)")
+        self.isPaused = paused
+        TalkOverlayController.shared.updatePaused(paused)
+        let effectivePhase = paused ? "paused" : self.phase.rawValue
+        Task { await GatewayConnection.shared.talkMode(enabled: AppStateStore.shared.talkEnabled, phase: effectivePhase) }
+        Task { await TalkModeRuntime.shared.setPaused(paused) }
+    }
+
+    func togglePaused() {
+        self.setPaused(!self.isPaused)
+    }
+
     func stopSpeaking(reason: TalkStopReason = .userTap) {
         Task { await TalkModeRuntime.shared.stopSpeaking(reason: reason) }
     }
diff --git a/apps/macos/Sources/Clawdis/TalkOverlay.swift b/apps/macos/Sources/Clawdis/TalkOverlay.swift
index 7f5ec7848..73fc144ac 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlay.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlay.swift
@@ -15,6 +15,7 @@ final class TalkOverlayController {
     struct Model {
         var isVisible: Bool = false
         var phase: TalkModePhase = .idle
+        var isPaused: Bool = false
         var level: Double = 0
     }
 
@@ -73,11 +74,26 @@ final class TalkOverlayController {
         self.model.phase = phase
     }
 
+    func updatePaused(_ paused: Bool) {
+        guard self.model.isPaused != paused else { return }
+        self.logger.info("talk overlay paused=\(paused)")
+        self.model.isPaused = paused
+    }
+
     func updateLevel(_ level: Double) {
         guard self.model.isVisible else { return }
         self.model.level = max(0, min(1, level))
     }
 
+    func currentWindowOrigin() -> CGPoint? {
+        self.window?.frame.origin
+    }
+
+    func setWindowOrigin(_ origin: CGPoint) {
+        guard let window else { return }
+        window.setFrameOrigin(origin)
+    }
+
     // MARK: - Private
 
     private func ensureWindow() {
diff --git a/apps/macos/Sources/Clawdis/TalkOverlayView.swift b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
index d121ee3a6..9600a4ebf 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlayView.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
@@ -4,21 +4,58 @@ struct TalkOverlayView: View {
     var controller: TalkOverlayController
     @State private var appState = AppStateStore.shared
     @State private var hoveringWindow = false
+    @State private var dragStartOrigin: CGPoint?
+    @State private var didDrag: Bool = false
     private static let orbCornerNudge: CGFloat = 12
 
     var body: some View {
         ZStack(alignment: .topTrailing) {
+            let isPaused = self.controller.model.isPaused
             TalkOrbView(
                 phase: self.controller.model.phase,
                 level: self.controller.model.level,
-                accent: self.seamColor)
+                accent: self.seamColor,
+                isPaused: isPaused)
                 .frame(width: 96, height: 96)
                 .padding(.top, 6 + TalkOverlayController.windowInset - Self.orbCornerNudge)
                 .padding(.trailing, 6 + TalkOverlayController.windowInset - Self.orbCornerNudge)
                 .contentShape(Circle())
-                .onTapGesture {
-                    TalkModeController.shared.stopSpeaking(reason: .userTap)
-                }
+                .opacity(isPaused ? 0.55 : 1)
+                .highPriorityGesture(
+                    TapGesture(count: 2).onEnded {
+                        TalkModeController.shared.stopSpeaking(reason: .userTap)
+                    })
+                .highPriorityGesture(
+                    TapGesture().onEnded {
+                        if self.didDrag { return }
+                        TalkModeController.shared.togglePaused()
+                    })
+                .simultaneousGesture(
+                    DragGesture(minimumDistance: 1, coordinateSpace: .global)
+                        .onChanged { value in
+                            if self.dragStartOrigin == nil {
+                                self.dragStartOrigin = self.controller.currentWindowOrigin()
+                                self.didDrag = false
+                                TalkModeController.shared.setPaused(true)
+                            }
+
+                            if abs(value.translation.width) + abs(value.translation.height) > 2 {
+                                self.didDrag = true
+                            }
+
+                            guard let start = self.dragStartOrigin else { return }
+                            let origin = CGPoint(
+                                x: start.x + value.translation.width,
+                                y: start.y - value.translation.height)
+                            self.controller.setWindowOrigin(origin)
+                        }
+                        .onEnded { _ in
+                            self.dragStartOrigin = nil
+                            Task { @MainActor in
+                                try? await Task.sleep(nanoseconds: 80_000_000)
+                                self.didDrag = false
+                            }
+                        })
                 .overlay(alignment: .topLeading) {
                     Button {
                         TalkModeController.shared.exitTalkMode()
@@ -65,24 +102,32 @@ private struct TalkOrbView: View {
     let phase: TalkModePhase
     let level: Double
     let accent: Color
+    let isPaused: Bool
 
     var body: some View {
-        TimelineView(.animation) { context in
-            let t = context.date.timeIntervalSinceReferenceDate
-            let listenScale = phase == .listening ? (1 + CGFloat(self.level) * 0.12) : 1
-            let pulse = phase == .speaking ? (1 + 0.06 * sin(t * 6)) : 1
+        if self.isPaused {
+            Circle()
+                .fill(self.orbGradient)
+                .overlay(Circle().stroke(Color.white.opacity(0.35), lineWidth: 1))
+                .shadow(color: Color.black.opacity(0.18), radius: 10, x: 0, y: 5)
+        } else {
+            TimelineView(.animation) { context in
+                let t = context.date.timeIntervalSinceReferenceDate
+                let listenScale = phase == .listening ? (1 + CGFloat(self.level) * 0.12) : 1
+                let pulse = phase == .speaking ? (1 + 0.06 * sin(t * 6)) : 1
 
-            ZStack {
-                Circle()
-                    .fill(self.orbGradient)
-                    .overlay(Circle().stroke(Color.white.opacity(0.45), lineWidth: 1))
-                    .shadow(color: Color.black.opacity(0.22), radius: 10, x: 0, y: 5)
-                    .scaleEffect(pulse * listenScale)
+                ZStack {
+                    Circle()
+                        .fill(self.orbGradient)
+                        .overlay(Circle().stroke(Color.white.opacity(0.45), lineWidth: 1))
+                        .shadow(color: Color.black.opacity(0.22), radius: 10, x: 0, y: 5)
+                        .scaleEffect(pulse * listenScale)
 
-                TalkWaveRings(phase: phase, level: level, time: t, accent: self.accent)
+                    TalkWaveRings(phase: phase, level: level, time: t, accent: self.accent)
 
-                if phase == .thinking {
-                    TalkOrbitArcs(time: t)
+                    if phase == .thinking {
+                        TalkOrbitArcs(time: t)
+                    }
                 }
             }
         }

From 27adfb76fa61c3ca1bb52677cb5d004c4a598b21 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 12:17:40 +0100
Subject: [PATCH 058/100] fix: stream elevenlabs tts playback

---
 CHANGELOG.md                                  |   3 +
 .../node/voice/StreamingMediaDataSource.kt    |  98 ++++
 .../clawdis/node/voice/TalkModeManager.kt     | 172 ++++++-
 apps/ios/Sources/Voice/TalkModeManager.swift  | 130 ++++--
 .../Sources/Clawdis/TalkModeRuntime.swift     |  47 +-
 .../Sources/ClawdisKit/ElevenLabsTTS.swift    | 102 ++++-
 .../ClawdisKit/PCMStreamingAudioPlayer.swift  | 144 ++++++
 .../ClawdisKit/StreamingAudioPlayer.swift     | 429 ++++++++++++++++++
 .../ClawdisKit/TalkTTSValidation.swift        |  26 +-
 .../TalkTTSValidationTests.swift              |  21 +
 docs/talk.md                                  |  10 +-
 11 files changed, 1091 insertions(+), 91 deletions(-)
 create mode 100644 apps/android/app/src/main/java/com/steipete/clawdis/node/voice/StreamingMediaDataSource.kt
 create mode 100644 apps/shared/ClawdisKit/Sources/ClawdisKit/PCMStreamingAudioPlayer.swift
 create mode 100644 apps/shared/ClawdisKit/Sources/ClawdisKit/StreamingAudioPlayer.swift

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf0fcb59b..d5d05b5ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,9 @@
 - macOS Talk Mode: throttle audio-level updates (avoid per-buffer task creation) to reduce CPU/task churn.
 - macOS Talk Mode: increase overlay window size so wave rings don’t clip; close button is hover-only and closer to the orb.
 - Talk Mode: fall back to system TTS when ElevenLabs is unavailable, returns non-audio, or playback fails (macOS/iOS/Android).
+- Talk Mode: stream PCM on macOS/iOS for lower latency (incremental playback); Android continues MP3 streaming.
+- Talk Mode: validate ElevenLabs v3 stability and latency tier directives before sending requests.
+- iOS/Android Talk Mode: auto-select the first ElevenLabs voice when none is configured.
 - ElevenLabs: add retry/backoff for 429/5xx and include content-type in errors for debugging.
 - Talk Mode: align to the gateway’s main session key and fall back to history polling when chat events drop (prevents stuck “thinking” / missing messages).
 - Talk Mode: treat history timestamps as seconds or milliseconds to avoid stale assistant picks (macOS/iOS/Android).
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/StreamingMediaDataSource.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/StreamingMediaDataSource.kt
new file mode 100644
index 000000000..0be4a016c
--- /dev/null
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/StreamingMediaDataSource.kt
@@ -0,0 +1,98 @@
+package com.steipete.clawdis.node.voice
+
+import android.media.MediaDataSource
+import kotlin.math.min
+
+internal class StreamingMediaDataSource : MediaDataSource() {
+  private data class Chunk(val start: Long, val data: ByteArray)
+
+  private val lock = Object()
+  private val chunks = ArrayList<Chunk>()
+  private var totalSize: Long = 0
+  private var closed = false
+  private var finished = false
+  private var lastReadIndex = 0
+
+  fun append(data: ByteArray) {
+    if (data.isEmpty()) return
+    synchronized(lock) {
+      if (closed || finished) return
+      val chunk = Chunk(totalSize, data)
+      chunks.add(chunk)
+      totalSize += data.size.toLong()
+      lock.notifyAll()
+    }
+  }
+
+  fun finish() {
+    synchronized(lock) {
+      if (closed) return
+      finished = true
+      lock.notifyAll()
+    }
+  }
+
+  fun fail() {
+    synchronized(lock) {
+      closed = true
+      lock.notifyAll()
+    }
+  }
+
+  override fun readAt(position: Long, buffer: ByteArray, offset: Int, size: Int): Int {
+    if (position < 0) return -1
+    synchronized(lock) {
+      while (!closed && !finished && position >= totalSize) {
+        lock.wait()
+      }
+      if (closed) return -1
+      if (position >= totalSize && finished) return -1
+
+      val available = (totalSize - position).toInt()
+      val toRead = min(size, available)
+      var remaining = toRead
+      var destOffset = offset
+      var pos = position
+
+      var index = findChunkIndex(pos)
+      while (remaining > 0 && index < chunks.size) {
+        val chunk = chunks[index]
+        val inChunkOffset = (pos - chunk.start).toInt()
+        if (inChunkOffset >= chunk.data.size) {
+          index++
+          continue
+        }
+        val copyLen = min(remaining, chunk.data.size - inChunkOffset)
+        System.arraycopy(chunk.data, inChunkOffset, buffer, destOffset, copyLen)
+        remaining -= copyLen
+        destOffset += copyLen
+        pos += copyLen
+        if (inChunkOffset + copyLen >= chunk.data.size) {
+          index++
+        }
+      }
+
+      return toRead - remaining
+    }
+  }
+
+  override fun getSize(): Long = -1
+
+  override fun close() {
+    synchronized(lock) {
+      closed = true
+      lock.notifyAll()
+    }
+  }
+
+  private fun findChunkIndex(position: Long): Int {
+    var index = lastReadIndex
+    while (index < chunks.size) {
+      val chunk = chunks[index]
+      if (position < chunk.start + chunk.data.size) break
+      index++
+    }
+    lastReadIndex = index
+    return index
+  }
+}
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
index e72b07651..42536d359 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
@@ -18,7 +18,6 @@ import android.speech.tts.UtteranceProgressListener
 import android.util.Log
 import androidx.core.content.ContextCompat
 import com.steipete.clawdis.node.bridge.BridgeSession
-import java.io.File
 import java.net.HttpURLConnection
 import java.net.URL
 import java.util.UUID
@@ -44,6 +43,7 @@ class TalkModeManager(
 ) {
   companion object {
     private const val tag = "TalkMode"
+    private const val defaultModelIdFallback = "eleven_v3"
   }
 
   private val mainHandler = Handler(Looper.getMainLooper())
@@ -81,6 +81,7 @@ class TalkModeManager(
 
   private var defaultVoiceId: String? = null
   private var currentVoiceId: String? = null
+  private var fallbackVoiceId: String? = null
   private var defaultModelId: String? = null
   private var currentModelId: String? = null
   private var defaultOutputFormat: String? = null
@@ -97,7 +98,7 @@ class TalkModeManager(
   private var chatSubscribedSessionKey: String? = null
 
   private var player: MediaPlayer? = null
-  private var currentAudioFile: File? = null
+  private var streamingSource: StreamingMediaDataSource? = null
   private var systemTts: TextToSpeech? = null
   private var systemTtsPending: CompletableDeferred<Unit>? = null
   private var systemTtsPendingId: String? = null
@@ -464,7 +465,13 @@ class TalkModeManager(
     val apiKey =
       apiKey?.trim()?.takeIf { it.isNotEmpty() }
         ?: System.getenv("ELEVENLABS_API_KEY")?.trim()
-    val voiceId = resolvedVoice ?: currentVoiceId ?: defaultVoiceId
+    val preferredVoice = resolvedVoice ?: currentVoiceId ?: defaultVoiceId
+    val voiceId =
+      if (!apiKey.isNullOrEmpty()) {
+        resolveVoiceId(preferredVoice, apiKey)
+      } else {
+        null
+      }
 
     _statusText.value = "Speaking…"
     _isSpeaking.value = true
@@ -486,24 +493,25 @@ class TalkModeManager(
       } else {
         _usingFallbackTts.value = false
         val ttsStarted = SystemClock.elapsedRealtime()
+        val modelId = directive?.modelId ?: currentModelId ?: defaultModelId
         val request =
           ElevenLabsRequest(
             text = cleaned,
-            modelId = directive?.modelId ?: currentModelId ?: defaultModelId,
+            modelId = modelId,
             outputFormat =
               TalkModeRuntime.validatedOutputFormat(directive?.outputFormat ?: defaultOutputFormat),
             speed = TalkModeRuntime.resolveSpeed(directive?.speed, directive?.rateWpm),
-            stability = TalkModeRuntime.validatedUnit(directive?.stability),
+            stability = TalkModeRuntime.validatedStability(directive?.stability, modelId),
             similarity = TalkModeRuntime.validatedUnit(directive?.similarity),
             style = TalkModeRuntime.validatedUnit(directive?.style),
             speakerBoost = directive?.speakerBoost,
             seed = TalkModeRuntime.validatedSeed(directive?.seed),
             normalize = TalkModeRuntime.validatedNormalize(directive?.normalize),
             language = TalkModeRuntime.validatedLanguage(directive?.language),
+            latencyTier = TalkModeRuntime.validatedLatencyTier(directive?.latencyTier),
           )
-        val audio = synthesize(voiceId = voiceId!!, apiKey = apiKey!!, request = request)
-        Log.d(tag, "elevenlabs ok bytes=${audio.size} durMs=${SystemClock.elapsedRealtime() - ttsStarted}")
-        playAudio(audio)
+        streamAndPlay(voiceId = voiceId!!, apiKey = apiKey!!, request = request)
+        Log.d(tag, "elevenlabs stream ok durMs=${SystemClock.elapsedRealtime() - ttsStarted}")
       }
     } catch (err: Throwable) {
       Log.w(tag, "speak failed: ${err.message ?: err::class.simpleName}; falling back to system voice")
@@ -520,22 +528,28 @@ class TalkModeManager(
     _isSpeaking.value = false
   }
 
-  private suspend fun playAudio(data: ByteArray) {
+  private suspend fun streamAndPlay(voiceId: String, apiKey: String, request: ElevenLabsRequest) {
     stopSpeaking(resetInterrupt = false)
-    val file = File.createTempFile("talk-", ".mp3", context.cacheDir)
-    file.writeBytes(data)
-    currentAudioFile = file
+
+    val dataSource = StreamingMediaDataSource()
+    streamingSource = dataSource
 
     val player = MediaPlayer()
     this.player = player
 
+    val prepared = CompletableDeferred<Unit>()
     val finished = CompletableDeferred<Unit>()
+
     player.setAudioAttributes(
       AudioAttributes.Builder()
         .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
         .setUsage(AudioAttributes.USAGE_ASSISTANT)
         .build(),
     )
+    player.setOnPreparedListener {
+      it.start()
+      prepared.complete(Unit)
+    }
     player.setOnCompletionListener {
       finished.complete(Unit)
     }
@@ -544,16 +558,30 @@ class TalkModeManager(
       true
     }
 
-    player.setDataSource(file.absolutePath)
+    player.setDataSource(dataSource)
     withContext(Dispatchers.Main) {
-      player.setOnPreparedListener { it.start() }
       player.prepareAsync()
     }
 
+    val fetchError = CompletableDeferred<Throwable?>()
+    val fetchJob =
+      scope.launch(Dispatchers.IO) {
+        try {
+          streamTts(voiceId = voiceId, apiKey = apiKey, request = request, sink = dataSource)
+          fetchError.complete(null)
+        } catch (err: Throwable) {
+          dataSource.fail()
+          fetchError.complete(err)
+        }
+      }
+
     Log.d(tag, "play start")
     try {
+      prepared.await()
       finished.await()
+      fetchError.await()?.let { throw it }
     } finally {
+      fetchJob.cancel()
       cleanupPlayer()
     }
     Log.d(tag, "play done")
@@ -674,8 +702,8 @@ class TalkModeManager(
     player?.stop()
     player?.release()
     player = null
-    currentAudioFile?.delete()
-    currentAudioFile = null
+    streamingSource?.close()
+    streamingSource = null
   }
 
   private fun shouldInterrupt(transcript: String): Boolean {
@@ -713,13 +741,15 @@ class TalkModeManager(
       defaultVoiceId = voice ?: envVoice?.takeIf { it.isNotEmpty() } ?: sagVoice?.takeIf { it.isNotEmpty() }
       voiceAliases = aliases
       if (!voiceOverrideActive) currentVoiceId = defaultVoiceId
-      defaultModelId = model
+      defaultModelId = model ?: defaultModelIdFallback
       if (!modelOverrideActive) currentModelId = defaultModelId
       defaultOutputFormat = outputFormat
       apiKey = key ?: envKey?.takeIf { it.isNotEmpty() }
       if (interrupt != null) interruptOnSpeech = interrupt
     } catch (_: Throwable) {
       defaultVoiceId = envVoice?.takeIf { it.isNotEmpty() } ?: sagVoice?.takeIf { it.isNotEmpty() }
+      defaultModelId = defaultModelIdFallback
+      if (!modelOverrideActive) currentModelId = defaultModelId
       apiKey = envKey?.takeIf { it.isNotEmpty() }
       voiceAliases = emptyMap()
     }
@@ -730,9 +760,21 @@ class TalkModeManager(
     return obj["runId"].asStringOrNull()
   }
 
-  private suspend fun synthesize(voiceId: String, apiKey: String, request: ElevenLabsRequest): ByteArray {
-    return withContext(Dispatchers.IO) {
-      val url = URL("https://api.elevenlabs.io/v1/text-to-speech/$voiceId")
+  private suspend fun streamTts(
+    voiceId: String,
+    apiKey: String,
+    request: ElevenLabsRequest,
+    sink: StreamingMediaDataSource,
+  ) {
+    withContext(Dispatchers.IO) {
+      val baseUrl = "https://api.elevenlabs.io/v1/text-to-speech/$voiceId/stream"
+      val latencyTier = request.latencyTier
+      val url =
+        if (latencyTier != null) {
+          URL("$baseUrl?optimize_streaming_latency=$latencyTier")
+        } else {
+          URL(baseUrl)
+        }
       val conn = url.openConnection() as HttpURLConnection
       conn.requestMethod = "POST"
       conn.connectTimeout = 30_000
@@ -746,13 +788,21 @@ class TalkModeManager(
       conn.outputStream.use { it.write(payload.toByteArray()) }
 
       val code = conn.responseCode
-      val stream = if (code >= 400) conn.errorStream else conn.inputStream
-      val data = stream.readBytes()
       if (code >= 400) {
-        val message = String(data)
+        val message = conn.errorStream?.readBytes()?.toString(Charsets.UTF_8) ?: ""
+        sink.fail()
         throw IllegalStateException("ElevenLabs failed: $code $message")
       }
-      data
+
+      val buffer = ByteArray(8 * 1024)
+      conn.inputStream.use { input ->
+        while (true) {
+          val read = input.read(buffer)
+          if (read <= 0) break
+          sink.append(buffer.copyOf(read))
+        }
+      }
+      sink.finish()
     }
   }
 
@@ -794,6 +844,7 @@ class TalkModeManager(
     val seed: Long?,
     val normalize: String?,
     val language: String?,
+    val latencyTier: Int?,
   )
 
   private object TalkModeRuntime {
@@ -816,6 +867,15 @@ class TalkModeManager(
       return value
     }
 
+    fun validatedStability(value: Double?, modelId: String?): Double? {
+      if (value == null) return null
+      val normalized = modelId?.trim()?.lowercase()
+      if (normalized == "eleven_v3") {
+        return if (value == 0.0 || value == 0.5 || value == 1.0) value else null
+      }
+      return validatedUnit(value)
+    }
+
     fun validatedSeed(value: Long?): Long? {
       if (value == null) return null
       if (value < 0 || value > 4294967295L) return null
@@ -840,6 +900,12 @@ class TalkModeManager(
       return if (trimmed.startsWith("mp3_")) trimmed else null
     }
 
+    fun validatedLatencyTier(value: Int?): Int? {
+      if (value == null) return null
+      if (value < 0 || value > 4) return null
+      return value
+    }
+
     fun isMessageTimestampAfter(timestamp: Double, sinceSeconds: Double): Boolean {
       val sinceMs = sinceSeconds * 1000
       return if (timestamp > 10_000_000_000) {
@@ -876,6 +942,62 @@ class TalkModeManager(
     return if (isLikelyVoiceId(trimmed)) trimmed else null
   }
 
+  private suspend fun resolveVoiceId(preferred: String?, apiKey: String): String? {
+    val trimmed = preferred?.trim().orEmpty()
+    if (trimmed.isNotEmpty()) {
+      val resolved = resolveVoiceAlias(trimmed)
+      if (resolved != null) return resolved
+      Log.w(tag, "unknown voice alias $trimmed")
+    }
+    fallbackVoiceId?.let { return it }
+
+    return try {
+      val voices = listVoices(apiKey)
+      val first = voices.firstOrNull() ?: return null
+      fallbackVoiceId = first.voiceId
+      if (defaultVoiceId.isNullOrBlank()) {
+        defaultVoiceId = first.voiceId
+      }
+      if (!voiceOverrideActive) {
+        currentVoiceId = first.voiceId
+      }
+      val name = first.name ?: "unknown"
+      Log.d(tag, "default voice selected $name (${first.voiceId})")
+      first.voiceId
+    } catch (err: Throwable) {
+      Log.w(tag, "list voices failed: ${err.message ?: err::class.simpleName}")
+      null
+    }
+  }
+
+  private suspend fun listVoices(apiKey: String): List<ElevenLabsVoice> {
+    return withContext(Dispatchers.IO) {
+      val url = URL("https://api.elevenlabs.io/v1/voices")
+      val conn = url.openConnection() as HttpURLConnection
+      conn.requestMethod = "GET"
+      conn.connectTimeout = 15_000
+      conn.readTimeout = 15_000
+      conn.setRequestProperty("xi-api-key", apiKey)
+
+      val code = conn.responseCode
+      val stream = if (code >= 400) conn.errorStream else conn.inputStream
+      val data = stream.readBytes()
+      if (code >= 400) {
+        val message = data.toString(Charsets.UTF_8)
+        throw IllegalStateException("ElevenLabs voices failed: $code $message")
+      }
+
+      val root = json.parseToJsonElement(data.toString(Charsets.UTF_8)).asObjectOrNull()
+      val voices = (root?.get("voices") as? JsonArray) ?: JsonArray(emptyList())
+      voices.mapNotNull { entry ->
+        val obj = entry.asObjectOrNull() ?: return@mapNotNull null
+        val voiceId = obj["voice_id"].asStringOrNull() ?: return@mapNotNull null
+        val name = obj["name"].asStringOrNull()
+        ElevenLabsVoice(voiceId, name)
+      }
+    }
+  }
+
   private fun isLikelyVoiceId(value: String): Boolean {
     if (value.length < 10) return false
     return value.all { it.isLetterOrDigit() || it == '-' || it == '_' }
@@ -884,6 +1006,8 @@ class TalkModeManager(
   private fun normalizeAliasKey(value: String): String =
     value.trim().lowercase()
 
+  private data class ElevenLabsVoice(val voiceId: String, val name: String?)
+
   private val listener =
     object : RecognitionListener {
       override fun onReadyForSpeech(params: Bundle?) {
diff --git a/apps/ios/Sources/Voice/TalkModeManager.swift b/apps/ios/Sources/Voice/TalkModeManager.swift
index a84a7b4a4..e93bce006 100644
--- a/apps/ios/Sources/Voice/TalkModeManager.swift
+++ b/apps/ios/Sources/Voice/TalkModeManager.swift
@@ -9,6 +9,7 @@ import Speech
 @Observable
 final class TalkModeManager: NSObject {
     private typealias SpeechRequest = SFSpeechAudioBufferRecognitionRequest
+    private static let defaultModelIdFallback = "eleven_v3"
     var isEnabled: Bool = false
     var isListening: Bool = false
     var isSpeaking: Bool = false
@@ -36,11 +37,12 @@ final class TalkModeManager: NSObject {
     private var voiceAliases: [String: String] = [:]
     private var interruptOnSpeech: Bool = true
     private var mainSessionKey: String = "main"
+    private var fallbackVoiceId: String?
+    private var lastPlaybackWasPCM: Bool = false
 
     private var bridge: BridgeSession?
     private let silenceWindow: TimeInterval = 0.7
 
-    private var player: AVAudioPlayer?
     private var chatSubscribedSessionKeys = Set<String>()
 
     private let logger = Logger(subsystem: "com.steipete.clawdis", category: "TalkMode")
@@ -446,43 +448,43 @@ final class TalkModeManager: NSObject {
             let started = Date()
             let language = ElevenLabsTTSClient.validatedLanguage(directive?.language)
 
-            let voiceId = resolvedVoice ?? self.currentVoiceId ?? self.defaultVoiceId
             let resolvedKey =
                 (self.apiKey?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false ? self.apiKey : nil) ??
                 ProcessInfo.processInfo.environment["ELEVENLABS_API_KEY"]
             let apiKey = resolvedKey?.trimmingCharacters(in: .whitespacesAndNewlines)
+            let preferredVoice = resolvedVoice ?? self.currentVoiceId ?? self.defaultVoiceId
+            let voiceId: String? = if let apiKey, !apiKey.isEmpty {
+                await self.resolveVoiceId(preferred: preferredVoice, apiKey: apiKey)
+            } else {
+                nil
+            }
             let canUseElevenLabs = (voiceId?.isEmpty == false) && (apiKey?.isEmpty == false)
 
             if canUseElevenLabs, let voiceId, let apiKey {
-                let desiredOutputFormat = directive?.outputFormat ?? self.defaultOutputFormat
+                let desiredOutputFormat = directive?.outputFormat ?? self.defaultOutputFormat ?? "pcm_44100"
                 let outputFormat = ElevenLabsTTSClient.validatedOutputFormat(desiredOutputFormat)
                 if outputFormat == nil, let desiredOutputFormat, !desiredOutputFormat.isEmpty {
                     self.logger.warning(
                         "talk output_format unsupported for local playback: \(desiredOutputFormat, privacy: .public)")
                 }
 
+                let modelId = directive?.modelId ?? self.currentModelId ?? self.defaultModelId
                 let request = ElevenLabsTTSRequest(
                     text: cleaned,
-                    modelId: directive?.modelId ?? self.currentModelId ?? self.defaultModelId,
+                    modelId: modelId,
                     outputFormat: outputFormat,
                     speed: TalkTTSValidation.resolveSpeed(speed: directive?.speed, rateWPM: directive?.rateWPM),
-                    stability: TalkTTSValidation.validatedUnit(directive?.stability),
+                    stability: TalkTTSValidation.validatedStability(directive?.stability, modelId: modelId),
                     similarity: TalkTTSValidation.validatedUnit(directive?.similarity),
                     style: TalkTTSValidation.validatedUnit(directive?.style),
                     speakerBoost: directive?.speakerBoost,
                     seed: TalkTTSValidation.validatedSeed(directive?.seed),
                     normalize: ElevenLabsTTSClient.validatedNormalize(directive?.normalize),
-                    language: language)
+                    language: language,
+                    latencyTier: TalkTTSValidation.validatedLatencyTier(directive?.latencyTier))
 
-                let synthTimeoutSeconds = max(20.0, min(90.0, Double(cleaned.count) * 0.12))
                 let client = ElevenLabsTTSClient(apiKey: apiKey)
-                let audio = try await client.synthesizeWithHardTimeout(
-                    voiceId: voiceId,
-                    request: request,
-                    hardTimeoutSeconds: synthTimeoutSeconds)
-                self.logger
-                    .info(
-                        "elevenlabs ok bytes=\(audio.count, privacy: .public) dur=\(Date().timeIntervalSince(started), privacy: .public)s")
+                let stream = client.streamSynthesize(voiceId: voiceId, request: request)
 
                 if self.interruptOnSpeech {
                     do {
@@ -494,7 +496,21 @@ final class TalkModeManager: NSObject {
                 }
 
                 self.statusText = "Speaking…"
-                try await self.playAudio(data: audio)
+                let sampleRate = TalkTTSValidation.pcmSampleRate(from: outputFormat)
+                let result: StreamingPlaybackResult
+                if let sampleRate {
+                    self.lastPlaybackWasPCM = true
+                    result = await PCMStreamingAudioPlayer.shared.play(stream: stream, sampleRate: sampleRate)
+                } else {
+                    self.lastPlaybackWasPCM = false
+                    result = await StreamingAudioPlayer.shared.play(stream: stream)
+                }
+                self.logger
+                    .info(
+                        "elevenlabs stream finished=\(result.finished, privacy: .public) dur=\(Date().timeIntervalSince(started), privacy: .public)s")
+                if !result.finished, let interruptedAt = result.interruptedAt {
+                    self.lastInterruptedAtSeconds = interruptedAt
+                }
             } else {
                 self.logger.warning("tts unavailable; falling back to system voice (missing key or voiceId)")
                 if self.interruptOnSpeech {
@@ -533,30 +549,17 @@ final class TalkModeManager: NSObject {
         self.isSpeaking = false
     }
 
-    private func playAudio(data: Data) async throws {
-        self.player?.stop()
-        let player = try AVAudioPlayer(data: data)
-        self.player = player
-        player.prepareToPlay()
-        self.logger.info("play start")
-        guard player.play() else {
-            throw NSError(domain: "TalkMode", code: 2, userInfo: [
-                NSLocalizedDescriptionKey: "audio player refused to play",
-            ])
-        }
-        while player.isPlaying {
-            try? await Task.sleep(nanoseconds: 120_000_000)
-        }
-        self.logger.info("play done")
-    }
-
     private func stopSpeaking(storeInterruption: Bool = true) {
         guard self.isSpeaking else { return }
+        let interruptedAt = self.lastPlaybackWasPCM
+            ? PCMStreamingAudioPlayer.shared.stop()
+            : StreamingAudioPlayer.shared.stop()
         if storeInterruption {
-            self.lastInterruptedAtSeconds = self.player?.currentTime
+            self.lastInterruptedAtSeconds = interruptedAt
         }
-        self.player?.stop()
-        self.player = nil
+        _ = self.lastPlaybackWasPCM
+            ? StreamingAudioPlayer.shared.stop()
+            : PCMStreamingAudioPlayer.shared.stop()
         TalkSystemSpeechSynthesizer.shared.stop()
         self.isSpeaking = false
     }
@@ -581,6 +584,37 @@ final class TalkModeManager: NSObject {
         return Self.isLikelyVoiceId(trimmed) ? trimmed : nil
     }
 
+    private func resolveVoiceId(preferred: String?, apiKey: String) async -> String? {
+        let trimmed = preferred?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        if !trimmed.isEmpty {
+            if let resolved = self.resolveVoiceAlias(trimmed) { return resolved }
+            self.logger.warning("unknown voice alias \(trimmed, privacy: .public)")
+        }
+        if let fallbackVoiceId { return fallbackVoiceId }
+
+        do {
+            let voices = try await ElevenLabsTTSClient(apiKey: apiKey).listVoices()
+            guard let first = voices.first else {
+                self.logger.warning("elevenlabs voices list empty")
+                return nil
+            }
+            self.fallbackVoiceId = first.voiceId
+            if self.defaultVoiceId == nil {
+                self.defaultVoiceId = first.voiceId
+            }
+            if !self.voiceOverrideActive {
+                self.currentVoiceId = first.voiceId
+            }
+            let name = first.name ?? "unknown"
+            self.logger
+                .info("default voice selected \(name, privacy: .public) (\(first.voiceId, privacy: .public))")
+            return first.voiceId
+        } catch {
+            self.logger.error("elevenlabs list voices failed: \(error.localizedDescription, privacy: .public)")
+            return nil
+        }
+    }
+
     private static func isLikelyVoiceId(_ value: String) -> Bool {
         guard value.count >= 10 else { return false }
         return value.allSatisfy { $0.isLetter || $0.isNumber || $0 == "-" || $0 == "_" }
@@ -598,22 +632,23 @@ final class TalkModeManager: NSObject {
             self.mainSessionKey = rawMainKey.isEmpty ? "main" : rawMainKey
             self.defaultVoiceId = (talk?["voiceId"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
             if let aliases = talk?["voiceAliases"] as? [String: Any] {
-                self.voiceAliases =
-                    aliases.compactMap { key, value in
-                        guard let id = value as? String else { return nil }
-                        let normalizedKey = key.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-                        let trimmedId = id.trimmingCharacters(in: .whitespacesAndNewlines)
-                        guard !normalizedKey.isEmpty, !trimmedId.isEmpty else { return nil }
-                        return (normalizedKey, trimmedId)
-                    }
-                    .reduce(into: [:]) { $0[$1.0] = $1.1 }
+                var resolved: [String: String] = [:]
+                for (key, value) in aliases {
+                    guard let id = value as? String else { continue }
+                    let normalizedKey = key.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+                    let trimmedId = id.trimmingCharacters(in: .whitespacesAndNewlines)
+                    guard !normalizedKey.isEmpty, !trimmedId.isEmpty else { continue }
+                    resolved[normalizedKey] = trimmedId
+                }
+                self.voiceAliases = resolved
             } else {
                 self.voiceAliases = [:]
             }
             if !self.voiceOverrideActive {
                 self.currentVoiceId = self.defaultVoiceId
             }
-            self.defaultModelId = (talk?["modelId"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
+            let model = (talk?["modelId"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
+            self.defaultModelId = (model?.isEmpty == false) ? model : Self.defaultModelIdFallback
             if !self.modelOverrideActive {
                 self.currentModelId = self.defaultModelId
             }
@@ -624,7 +659,10 @@ final class TalkModeManager: NSObject {
                 self.interruptOnSpeech = interrupt
             }
         } catch {
-            // ignore
+            self.defaultModelId = Self.defaultModelIdFallback
+            if !self.modelOverrideActive {
+                self.currentModelId = self.defaultModelId
+            }
         }
     }
 
diff --git a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
index 9baf17707..140c338b8 100644
--- a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
+++ b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
@@ -10,6 +10,7 @@ actor TalkModeRuntime {
 
     private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.runtime")
     private let ttsLogger = Logger(subsystem: "com.steipete.clawdis", category: "talk.tts")
+    private static let defaultModelIdFallback = "eleven_v3"
 
     private final class RMSMeter: @unchecked Sendable {
         private let lock = NSLock()
@@ -62,6 +63,7 @@ actor TalkModeRuntime {
     private var lastSpokenText: String?
     private var apiKey: String?
     private var fallbackVoiceId: String?
+    private var lastPlaybackWasPCM: Bool = false
 
     private let silenceWindow: TimeInterval = 0.7
     private let minSpeechRMS: Double = 1e-3
@@ -496,7 +498,7 @@ actor TalkModeRuntime {
 
         do {
             if let apiKey, !apiKey.isEmpty, let voiceId {
-                let desiredOutputFormat = directive?.outputFormat ?? self.defaultOutputFormat
+                let desiredOutputFormat = directive?.outputFormat ?? self.defaultOutputFormat ?? "pcm_44100"
                 let outputFormat = ElevenLabsTTSClient.validatedOutputFormat(desiredOutputFormat)
                 if outputFormat == nil, let desiredOutputFormat, !desiredOutputFormat.isEmpty {
                     self.logger
@@ -504,27 +506,25 @@ actor TalkModeRuntime {
                             "talk output_format unsupported for local playback: \(desiredOutputFormat, privacy: .public)")
                 }
 
+                let modelId = directive?.modelId ?? self.currentModelId ?? self.defaultModelId
                 let request = ElevenLabsTTSRequest(
                     text: cleaned,
-                    modelId: directive?.modelId ?? self.currentModelId ?? self.defaultModelId,
+                    modelId: modelId,
                     outputFormat: outputFormat,
                     speed: TalkTTSValidation.resolveSpeed(speed: directive?.speed, rateWPM: directive?.rateWPM),
-                    stability: TalkTTSValidation.validatedUnit(directive?.stability),
+                    stability: TalkTTSValidation.validatedStability(directive?.stability, modelId: modelId),
                     similarity: TalkTTSValidation.validatedUnit(directive?.similarity),
                     style: TalkTTSValidation.validatedUnit(directive?.style),
                     speakerBoost: directive?.speakerBoost,
                     seed: TalkTTSValidation.validatedSeed(directive?.seed),
                     normalize: ElevenLabsTTSClient.validatedNormalize(directive?.normalize),
-                    language: language)
+                    language: language,
+                    latencyTier: TalkTTSValidation.validatedLatencyTier(directive?.latencyTier))
 
                 self.ttsLogger.info("talk TTS synth timeout=\(synthTimeoutSeconds, privacy: .public)s")
                 let client = ElevenLabsTTSClient(apiKey: apiKey)
-                let audio = try await client.synthesizeWithHardTimeout(
-                    voiceId: voiceId,
-                    request: request,
-                    hardTimeoutSeconds: synthTimeoutSeconds)
+                let stream = client.streamSynthesize(voiceId: voiceId, request: request)
                 guard self.isCurrent(gen) else { return }
-                self.ttsLogger.info("talk TTS response bytes=\(audio.count, privacy: .public)")
 
                 if self.interruptOnSpeech {
                     await self.startRecognition()
@@ -534,12 +534,20 @@ actor TalkModeRuntime {
                 await MainActor.run { TalkModeController.shared.updatePhase(.speaking) }
                 self.phase = .speaking
 
-                let result = await TalkAudioPlayer.shared.play(data: audio)
+                let sampleRate = TalkTTSValidation.pcmSampleRate(from: outputFormat)
+                let result: StreamingPlaybackResult
+                if let sampleRate {
+                    self.lastPlaybackWasPCM = true
+                    result = await PCMStreamingAudioPlayer.shared.play(stream: stream, sampleRate: sampleRate)
+                } else {
+                    self.lastPlaybackWasPCM = false
+                    result = await StreamingAudioPlayer.shared.play(stream: stream)
+                }
                 self.ttsLogger
                     .info(
                         "talk audio result finished=\(result.finished, privacy: .public) interruptedAt=\(String(describing: result.interruptedAt), privacy: .public)")
                 if !result.finished, result.interruptedAt == nil {
-                    throw NSError(domain: "TalkAudioPlayer", code: 1, userInfo: [
+                    throw NSError(domain: "StreamingAudioPlayer", code: 1, userInfo: [
                         NSLocalizedDescriptionKey: "audio playback failed",
                     ])
                 }
@@ -631,7 +639,15 @@ actor TalkModeRuntime {
     }
 
     func stopSpeaking(reason: TalkStopReason) async {
-        let interruptedAt = await MainActor.run { TalkAudioPlayer.shared.stop() }
+        let interruptedAt = await MainActor.run {
+            let primary = self.lastPlaybackWasPCM
+                ? PCMStreamingAudioPlayer.shared.stop()
+                : StreamingAudioPlayer.shared.stop()
+            _ = self.lastPlaybackWasPCM
+                ? StreamingAudioPlayer.shared.stop()
+                : PCMStreamingAudioPlayer.shared.stop()
+            return primary
+        }
         await TalkSystemSpeechSynthesizer.shared.stop()
         guard self.phase == .speaking else { return }
         if reason == .speech, let interruptedAt {
@@ -707,7 +723,8 @@ actor TalkModeRuntime {
                     guard !key.isEmpty, !value.isEmpty else { return }
                     acc[key] = value
                 } ?? [:]
-            let model = talk?["modelId"]?.stringValue
+            let model = talk?["modelId"]?.stringValue?.trimmingCharacters(in: .whitespacesAndNewlines)
+            let resolvedModel = (model?.isEmpty == false) ? model! : Self.defaultModelIdFallback
             let outputFormat = talk?["outputFormat"]?.stringValue
             let interrupt = talk?["interruptOnSpeech"]?.boolValue
             let apiKey = talk?["apiKey"]?.stringValue
@@ -721,7 +738,7 @@ actor TalkModeRuntime {
             return TalkRuntimeConfig(
                 voiceId: resolvedVoice,
                 voiceAliases: resolvedAliases,
-                modelId: model,
+                modelId: resolvedModel,
                 outputFormat: outputFormat,
                 interruptOnSpeech: interrupt ?? true,
                 apiKey: resolvedApiKey)
@@ -733,7 +750,7 @@ actor TalkModeRuntime {
             return TalkRuntimeConfig(
                 voiceId: resolvedVoice,
                 voiceAliases: [:],
-                modelId: nil,
+                modelId: Self.defaultModelIdFallback,
                 outputFormat: nil,
                 interruptOnSpeech: true,
                 apiKey: resolvedApiKey)
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/ElevenLabsTTS.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/ElevenLabsTTS.swift
index c4b1e7999..38e602094 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisKit/ElevenLabsTTS.swift
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/ElevenLabsTTS.swift
@@ -22,6 +22,7 @@ public struct ElevenLabsTTSRequest: Sendable {
     public var seed: UInt32?
     public var normalize: String?
     public var language: String?
+    public var latencyTier: Int?
 
     public init(
         text: String,
@@ -34,7 +35,8 @@ public struct ElevenLabsTTSRequest: Sendable {
         speakerBoost: Bool? = nil,
         seed: UInt32? = nil,
         normalize: String? = nil,
-        language: String? = nil)
+        language: String? = nil,
+        latencyTier: Int? = nil)
     {
         self.text = text
         self.modelId = modelId
@@ -47,6 +49,7 @@ public struct ElevenLabsTTSRequest: Sendable {
         self.seed = seed
         self.normalize = normalize
         self.language = language
+        self.latencyTier = latencyTier
     }
 }
 
@@ -155,6 +158,72 @@ public struct ElevenLabsTTSClient: Sendable {
         ])
     }
 
+    public func streamSynthesize(
+        voiceId: String,
+        request: ElevenLabsTTSRequest) -> AsyncThrowingStream<Data, Error>
+    {
+        AsyncThrowingStream { continuation in
+            let task = Task {
+                do {
+                    let url = Self.streamingURL(
+                        baseUrl: self.baseUrl,
+                        voiceId: voiceId,
+                        latencyTier: request.latencyTier)
+                    let body = try JSONSerialization.data(withJSONObject: Self.buildPayload(request), options: [])
+
+                    var req = URLRequest(url: url)
+                    req.httpMethod = "POST"
+                    req.httpBody = body
+                    req.timeoutInterval = self.requestTimeoutSeconds
+                    req.setValue("application/json", forHTTPHeaderField: "Content-Type")
+                    req.setValue("audio/mpeg", forHTTPHeaderField: "Accept")
+                    req.setValue(self.apiKey, forHTTPHeaderField: "xi-api-key")
+
+                    let (bytes, response) = try await URLSession.shared.bytes(for: req)
+                    guard let http = response as? HTTPURLResponse else {
+                        throw NSError(domain: "ElevenLabsTTS", code: 1, userInfo: [
+                            NSLocalizedDescriptionKey: "ElevenLabs invalid response",
+                        ])
+                    }
+
+                    let contentType = (http.value(forHTTPHeaderField: "Content-Type") ?? "unknown").lowercased()
+                    if http.statusCode >= 400 {
+                        let message = try await Self.readErrorBody(bytes: bytes)
+                        throw NSError(domain: "ElevenLabsTTS", code: http.statusCode, userInfo: [
+                            NSLocalizedDescriptionKey: "ElevenLabs failed: \(http.statusCode) ct=\(contentType) \(message)",
+                        ])
+                    }
+                    if !contentType.contains("audio") {
+                        let message = try await Self.readErrorBody(bytes: bytes)
+                        throw NSError(domain: "ElevenLabsTTS", code: 415, userInfo: [
+                            NSLocalizedDescriptionKey: "ElevenLabs returned non-audio ct=\(contentType) \(message)",
+                        ])
+                    }
+
+                    var buffer = Data()
+                    buffer.reserveCapacity(16_384)
+                    for try await byte in bytes {
+                        buffer.append(byte)
+                        if buffer.count >= 8_192 {
+                            continuation.yield(buffer)
+                            buffer.removeAll(keepingCapacity: true)
+                        }
+                    }
+                    if !buffer.isEmpty {
+                        continuation.yield(buffer)
+                    }
+                    continuation.finish()
+                } catch {
+                    continuation.finish(throwing: error)
+                }
+            }
+
+            continuation.onTermination = { _ in
+                task.cancel()
+            }
+        }
+    }
+
     public func listVoices() async throws -> [ElevenLabsVoice] {
         var url = self.baseUrl
         url.appendPathComponent("v1")
@@ -180,7 +249,7 @@ public struct ElevenLabsTTSClient: Sendable {
     public static func validatedOutputFormat(_ value: String?) -> String? {
         let trimmed = (value ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
         guard !trimmed.isEmpty else { return nil }
-        guard trimmed.hasPrefix("mp3_") else { return nil }
+        guard trimmed.hasPrefix("mp3_") || trimmed.hasPrefix("pcm_") else { return nil }
         return trimmed
     }
 
@@ -230,4 +299,33 @@ public struct ElevenLabsTTSClient: Sendable {
         let raw = String(data: data.prefix(4096), encoding: .utf8) ?? "unknown"
         return raw.replacingOccurrences(of: "\n", with: " ").replacingOccurrences(of: "\r", with: " ")
     }
+
+    private static func streamingURL(baseUrl: URL, voiceId: String, latencyTier: Int?) -> URL {
+        var url = baseUrl
+        url.appendPathComponent("v1")
+        url.appendPathComponent("text-to-speech")
+        url.appendPathComponent(voiceId)
+        url.appendPathComponent("stream")
+
+        guard let latencyTier else { return url }
+        let latencyItem = URLQueryItem(
+            name: "optimize_streaming_latency",
+            value: "\(latencyTier)")
+        guard var components = URLComponents(url: url, resolvingAgainstBaseURL: false) else {
+            return url
+        }
+        var items = components.queryItems ?? []
+        items.append(latencyItem)
+        components.queryItems = items
+        return components.url ?? url
+    }
+
+    private static func readErrorBody(bytes: URLSession.AsyncBytes) async throws -> String {
+        var data = Data()
+        for try await byte in bytes {
+            data.append(byte)
+            if data.count >= 4096 { break }
+        }
+        return truncatedErrorBody(data)
+    }
 }
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/PCMStreamingAudioPlayer.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/PCMStreamingAudioPlayer.swift
new file mode 100644
index 000000000..66238cd5c
--- /dev/null
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/PCMStreamingAudioPlayer.swift
@@ -0,0 +1,144 @@
+import AVFoundation
+import Foundation
+import OSLog
+
+@MainActor
+public final class PCMStreamingAudioPlayer {
+    public static let shared = PCMStreamingAudioPlayer()
+
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.tts.pcm")
+    private var engine = AVAudioEngine()
+    private var player = AVAudioPlayerNode()
+    private var format: AVAudioFormat?
+    private var pendingBuffers: Int = 0
+    private var inputFinished = false
+    private var continuation: CheckedContinuation<StreamingPlaybackResult, Never>?
+
+    public init() {
+        self.engine.attach(self.player)
+    }
+
+    public func play(stream: AsyncThrowingStream<Data, Error>, sampleRate: Double) async -> StreamingPlaybackResult {
+        self.stopInternal()
+
+        let format = AVAudioFormat(
+            commonFormat: .pcmFormatInt16,
+            sampleRate: sampleRate,
+            channels: 1,
+            interleaved: true)
+
+        guard let format else {
+            return StreamingPlaybackResult(finished: false, interruptedAt: nil)
+        }
+        self.configure(format: format)
+
+        return await withCheckedContinuation { continuation in
+            self.continuation = continuation
+            self.pendingBuffers = 0
+            self.inputFinished = false
+
+            Task.detached { [weak self] in
+                guard let self else { return }
+                do {
+                    for try await chunk in stream {
+                        await self.enqueuePCM(chunk, format: format)
+                    }
+                    await self.finishInput()
+                } catch {
+                    await self.fail(error)
+                }
+            }
+        }
+    }
+
+    public func stop() -> Double? {
+        let interruptedAt = self.currentTimeSeconds()
+        self.stopInternal()
+        self.finish(StreamingPlaybackResult(finished: false, interruptedAt: interruptedAt))
+        return interruptedAt
+    }
+
+    private func configure(format: AVAudioFormat) {
+        if self.format?.sampleRate != format.sampleRate || self.format?.commonFormat != format.commonFormat {
+            self.engine.stop()
+            self.engine = AVAudioEngine()
+            self.player = AVAudioPlayerNode()
+            self.engine.attach(self.player)
+        }
+        self.format = format
+        if self.engine.attachedNodes.contains(self.player) {
+            self.engine.connect(self.player, to: self.engine.mainMixerNode, format: format)
+        }
+    }
+
+    private func enqueuePCM(_ data: Data, format: AVAudioFormat) async {
+        guard !data.isEmpty else { return }
+        let frameCount = data.count / MemoryLayout<Int16>.size
+        guard frameCount > 0 else { return }
+        guard let buffer = AVAudioPCMBuffer(pcmFormat: format, frameCapacity: AVAudioFrameCount(frameCount)) else {
+            return
+        }
+        buffer.frameLength = AVAudioFrameCount(frameCount)
+
+        data.withUnsafeBytes { raw in
+            guard let src = raw.baseAddress else { return }
+            let audioBuffer = buffer.audioBufferList.pointee.mBuffers
+            if let dst = audioBuffer.mData {
+                memcpy(dst, src, frameCount * MemoryLayout<Int16>.size)
+            }
+        }
+
+        self.pendingBuffers += 1
+        self.player.scheduleBuffer(buffer) { [weak self] in
+            Task { @MainActor in
+                guard let self else { return }
+                self.pendingBuffers = max(0, self.pendingBuffers - 1)
+                if self.inputFinished && self.pendingBuffers == 0 {
+                    self.finish(StreamingPlaybackResult(finished: true, interruptedAt: nil))
+                }
+            }
+        }
+
+        if !self.player.isPlaying {
+            do {
+                try self.engine.start()
+                self.player.play()
+            } catch {
+                self.logger.error("pcm engine start failed: \(error.localizedDescription, privacy: .public)")
+                self.fail(error)
+            }
+        }
+    }
+
+    private func finishInput() {
+        self.inputFinished = true
+        if self.pendingBuffers == 0 {
+            self.finish(StreamingPlaybackResult(finished: true, interruptedAt: nil))
+        }
+    }
+
+    private func fail(_ error: Error) {
+        self.logger.error("pcm stream failed: \(error.localizedDescription, privacy: .public)")
+        self.finish(StreamingPlaybackResult(finished: false, interruptedAt: nil))
+    }
+
+    private func stopInternal() {
+        self.player.stop()
+        self.engine.stop()
+        self.pendingBuffers = 0
+        self.inputFinished = false
+    }
+
+    private func finish(_ result: StreamingPlaybackResult) {
+        let continuation = self.continuation
+        self.continuation = nil
+        continuation?.resume(returning: result)
+    }
+
+    private func currentTimeSeconds() -> Double? {
+        guard let nodeTime = self.player.lastRenderTime,
+              let playerTime = self.player.playerTime(forNodeTime: nodeTime)
+        else { return nil }
+        return Double(playerTime.sampleTime) / playerTime.sampleRate
+    }
+}
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/StreamingAudioPlayer.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/StreamingAudioPlayer.swift
new file mode 100644
index 000000000..776c59100
--- /dev/null
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/StreamingAudioPlayer.swift
@@ -0,0 +1,429 @@
+import AudioToolbox
+import Foundation
+import OSLog
+
+public struct StreamingPlaybackResult: Sendable {
+    public let finished: Bool
+    public let interruptedAt: Double?
+
+    public init(finished: Bool, interruptedAt: Double?) {
+        self.finished = finished
+        self.interruptedAt = interruptedAt
+    }
+}
+
+@MainActor
+public final class StreamingAudioPlayer: NSObject {
+    public static let shared = StreamingAudioPlayer()
+
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.tts.stream")
+    private var playback: Playback?
+
+    public func play(stream: AsyncThrowingStream<Data, Error>) async -> StreamingPlaybackResult {
+        self.stopInternal()
+
+        let playback = Playback(logger: self.logger)
+        self.playback = playback
+
+        return await withCheckedContinuation { continuation in
+            playback.setContinuation(continuation)
+            playback.start()
+
+            Task.detached {
+                do {
+                    for try await chunk in stream {
+                        playback.append(chunk)
+                    }
+                    playback.finishInput()
+                } catch {
+                    playback.fail(error)
+                }
+            }
+        }
+    }
+
+    public func stop() -> Double? {
+        guard let playback else { return nil }
+        let interruptedAt = playback.stop(immediate: true)
+        self.finish(playback: playback, result: StreamingPlaybackResult(finished: false, interruptedAt: interruptedAt))
+        return interruptedAt
+    }
+
+    private func stopInternal() {
+        guard let playback else { return }
+        let interruptedAt = playback.stop(immediate: true)
+        self.finish(playback: playback, result: StreamingPlaybackResult(finished: false, interruptedAt: interruptedAt))
+    }
+
+    private func finish(playback: Playback, result: StreamingPlaybackResult) {
+        playback.finish(result)
+        guard self.playback === playback else { return }
+        self.playback = nil
+    }
+}
+
+private final class Playback: @unchecked Sendable {
+    private static let bufferCount: Int = 3
+    private static let bufferSize: Int = 32 * 1024
+
+    private let logger: Logger
+    private let lock = NSLock()
+    private let parseQueue = DispatchQueue(label: "talk.stream.parse")
+    fileprivate let bufferLock = NSLock()
+    fileprivate let bufferSemaphore = DispatchSemaphore(value: bufferCount)
+
+    private var continuation: CheckedContinuation<StreamingPlaybackResult, Never>?
+    private var finished = false
+
+    private var audioFileStream: AudioFileStreamID?
+    private var audioQueue: AudioQueueRef?
+    fileprivate var audioFormat: AudioStreamBasicDescription?
+    fileprivate var maxPacketSize: UInt32 = 0
+
+    fileprivate var availableBuffers: [AudioQueueBufferRef] = []
+    private var currentBuffer: AudioQueueBufferRef?
+    private var currentBufferSize: Int = 0
+    private var currentPacketDescs: [AudioStreamPacketDescription] = []
+
+    private var isRunning = false
+    fileprivate var inputFinished = false
+    private var startRequested = false
+
+    private var sampleRate: Double = 0
+
+    init(logger: Logger) {
+        self.logger = logger
+    }
+
+    func setContinuation(_ continuation: CheckedContinuation<StreamingPlaybackResult, Never>) {
+        self.lock.lock()
+        self.continuation = continuation
+        self.lock.unlock()
+    }
+
+    func start() {
+        let selfPtr = Unmanaged.passUnretained(self).toOpaque()
+        let status = AudioFileStreamOpen(
+            selfPtr,
+            propertyListenerProc,
+            packetsProc,
+            kAudioFileMP3Type,
+            &self.audioFileStream)
+        if status != noErr {
+            self.logger.error("talk stream open failed: \(status)")
+            self.finish(StreamingPlaybackResult(finished: false, interruptedAt: nil))
+        }
+    }
+
+    func append(_ data: Data) {
+        guard !data.isEmpty else { return }
+        self.parseQueue.async { [weak self] in
+            guard let self else { return }
+            guard let audioFileStream = self.audioFileStream else { return }
+            let status = data.withUnsafeBytes { bytes in
+                AudioFileStreamParseBytes(
+                    audioFileStream,
+                    UInt32(bytes.count),
+                    bytes.baseAddress,
+                    [])
+            }
+            if status != noErr {
+                self.logger.error("talk stream parse failed: \(status)")
+                self.fail(NSError(domain: "StreamingAudio", code: Int(status)))
+            }
+        }
+    }
+
+    func finishInput() {
+        self.parseQueue.async { [weak self] in
+            guard let self else { return }
+            self.inputFinished = true
+            if self.audioQueue == nil {
+                self.finish(StreamingPlaybackResult(finished: false, interruptedAt: nil))
+                return
+            }
+            self.enqueueCurrentBuffer(flushOnly: true)
+            self.stop(immediate: false)
+        }
+    }
+
+    func fail(_ error: Error) {
+        self.logger.error("talk stream failed: \(error.localizedDescription, privacy: .public)")
+        _ = self.stop(immediate: true)
+        self.finish(StreamingPlaybackResult(finished: false, interruptedAt: nil))
+    }
+
+    func stop(immediate: Bool) -> Double? {
+        guard let audioQueue else { return nil }
+        let interruptedAt = self.currentTimeSeconds()
+        AudioQueueStop(audioQueue, immediate)
+        return interruptedAt
+    }
+
+    fileprivate func finish(_ result: StreamingPlaybackResult) {
+        let continuation: CheckedContinuation<StreamingPlaybackResult, Never>?
+        self.lock.lock()
+        if self.finished {
+            continuation = nil
+        } else {
+            self.finished = true
+            continuation = self.continuation
+            self.continuation = nil
+        }
+        self.lock.unlock()
+
+        continuation?.resume(returning: result)
+        self.teardown()
+    }
+
+    private func teardown() {
+        if let audioQueue {
+            AudioQueueDispose(audioQueue, true)
+            self.audioQueue = nil
+        }
+        if let audioFileStream {
+            AudioFileStreamClose(audioFileStream)
+            self.audioFileStream = nil
+        }
+        self.bufferLock.lock()
+        self.availableBuffers.removeAll()
+        self.bufferLock.unlock()
+        self.currentBuffer = nil
+        self.currentPacketDescs.removeAll()
+    }
+
+    fileprivate func setupQueueIfNeeded(_ asbd: AudioStreamBasicDescription) {
+        guard self.audioQueue == nil else { return }
+
+        var format = asbd
+        self.audioFormat = format
+        self.sampleRate = format.mSampleRate
+
+        let selfPtr = Unmanaged.passUnretained(self).toOpaque()
+        let status = AudioQueueNewOutput(
+            &format,
+            outputCallbackProc,
+            selfPtr,
+            nil,
+            nil,
+            0,
+            &self.audioQueue)
+        if status != noErr {
+            self.logger.error("talk queue create failed: \(status)")
+            self.finish(StreamingPlaybackResult(finished: false, interruptedAt: nil))
+            return
+        }
+
+        if let audioQueue {
+            AudioQueueAddPropertyListener(audioQueue, kAudioQueueProperty_IsRunning, isRunningCallbackProc, selfPtr)
+        }
+
+        if let audioFileStream {
+            var cookieSize: UInt32 = 0
+            var writable: DarwinBoolean = false
+            let cookieStatus = AudioFileStreamGetPropertyInfo(
+                audioFileStream,
+                kAudioFileStreamProperty_MagicCookieData,
+                &cookieSize,
+                &writable)
+            if cookieStatus == noErr, cookieSize > 0, let audioQueue {
+                var cookie = [UInt8](repeating: 0, count: Int(cookieSize))
+                let readStatus = AudioFileStreamGetProperty(
+                    audioFileStream,
+                    kAudioFileStreamProperty_MagicCookieData,
+                    &cookieSize,
+                    &cookie)
+                if readStatus == noErr {
+                    AudioQueueSetProperty(audioQueue, kAudioQueueProperty_MagicCookie, cookie, cookieSize)
+                }
+            }
+        }
+
+        if let audioQueue {
+            for _ in 0..<Self.bufferCount {
+                var buffer: AudioQueueBufferRef?
+                let allocStatus = AudioQueueAllocateBuffer(audioQueue, UInt32(Self.bufferSize), &buffer)
+                if allocStatus == noErr, let buffer {
+                    self.bufferLock.lock()
+                    self.availableBuffers.append(buffer)
+                    self.bufferLock.unlock()
+                }
+            }
+        }
+    }
+
+    private func enqueueCurrentBuffer(flushOnly: Bool = false) {
+        guard let audioQueue, let buffer = self.currentBuffer else { return }
+        guard self.currentBufferSize > 0 else { return }
+
+        buffer.pointee.mAudioDataByteSize = UInt32(self.currentBufferSize)
+        let packetCount = UInt32(self.currentPacketDescs.count)
+
+        let status = self.currentPacketDescs.withUnsafeBufferPointer { descPtr in
+            AudioQueueEnqueueBuffer(audioQueue, buffer, packetCount, descPtr.baseAddress)
+        }
+        if status != noErr {
+            self.logger.error("talk queue enqueue failed: \(status)")
+        } else {
+            if !self.startRequested {
+                self.startRequested = true
+                let startStatus = AudioQueueStart(audioQueue, nil)
+                if startStatus != noErr {
+                    self.logger.error("talk queue start failed: \(startStatus)")
+                }
+            }
+        }
+
+        self.currentBuffer = nil
+        self.currentBufferSize = 0
+        self.currentPacketDescs.removeAll(keepingCapacity: true)
+        if !flushOnly {
+            self.bufferSemaphore.wait()
+            self.bufferLock.lock()
+            let next = self.availableBuffers.popLast()
+            self.bufferLock.unlock()
+            if let next { self.currentBuffer = next }
+        }
+    }
+
+    fileprivate func handlePackets(
+        numberBytes: UInt32,
+        numberPackets: UInt32,
+        inputData: UnsafeRawPointer,
+        packetDescriptions: UnsafeMutablePointer<AudioStreamPacketDescription>?)
+    {
+        if self.audioQueue == nil, let format = self.audioFormat {
+            self.setupQueueIfNeeded(format)
+        }
+
+        if self.audioQueue == nil {
+            return
+        }
+
+        if self.currentBuffer == nil {
+            self.bufferSemaphore.wait()
+            self.bufferLock.lock()
+            self.currentBuffer = self.availableBuffers.popLast()
+            self.bufferLock.unlock()
+            self.currentBufferSize = 0
+            self.currentPacketDescs.removeAll(keepingCapacity: true)
+        }
+
+        let bytes = inputData.assumingMemoryBound(to: UInt8.self)
+        let packetCount = Int(numberPackets)
+        for index in 0..<packetCount {
+            let packetOffset: Int
+            let packetSize: Int
+
+            if let packetDescriptions {
+                packetOffset = Int(packetDescriptions[index].mStartOffset)
+                packetSize = Int(packetDescriptions[index].mDataByteSize)
+            } else {
+                let size = Int(numberBytes) / packetCount
+                packetOffset = index * size
+                packetSize = size
+            }
+
+            if packetSize > Self.bufferSize {
+                continue
+            }
+
+            if self.currentBufferSize + packetSize > Self.bufferSize {
+                self.enqueueCurrentBuffer()
+            }
+
+            guard let buffer = self.currentBuffer else { continue }
+            let dest = buffer.pointee.mAudioData.advanced(by: self.currentBufferSize)
+            memcpy(dest, bytes.advanced(by: packetOffset), packetSize)
+
+            let desc = AudioStreamPacketDescription(
+                mStartOffset: Int64(self.currentBufferSize),
+                mVariableFramesInPacket: 0,
+                mDataByteSize: UInt32(packetSize))
+            self.currentPacketDescs.append(desc)
+            self.currentBufferSize += packetSize
+        }
+    }
+
+    private func currentTimeSeconds() -> Double? {
+        guard let audioQueue, sampleRate > 0 else { return nil }
+        var timeStamp = AudioTimeStamp()
+        let status = AudioQueueGetCurrentTime(audioQueue, nil, &timeStamp, nil)
+        if status != noErr { return nil }
+        if timeStamp.mSampleTime.isNaN { return nil }
+        return timeStamp.mSampleTime / sampleRate
+    }
+}
+
+private func propertyListenerProc(
+    inClientData: UnsafeMutableRawPointer,
+    inAudioFileStream: AudioFileStreamID,
+    inPropertyID: AudioFileStreamPropertyID,
+    ioFlags: UnsafeMutablePointer<AudioFileStreamPropertyFlags>)
+{
+    let playback = Unmanaged<Playback>.fromOpaque(inClientData).takeUnretainedValue()
+
+    if inPropertyID == kAudioFileStreamProperty_DataFormat {
+        var format = AudioStreamBasicDescription()
+        var size = UInt32(MemoryLayout<AudioStreamBasicDescription>.size)
+        let status = AudioFileStreamGetProperty(inAudioFileStream, inPropertyID, &size, &format)
+        if status == noErr {
+            playback.audioFormat = format
+            playback.setupQueueIfNeeded(format)
+        }
+    } else if inPropertyID == kAudioFileStreamProperty_PacketSizeUpperBound {
+        var maxPacketSize: UInt32 = 0
+        var size = UInt32(MemoryLayout<UInt32>.size)
+        let status = AudioFileStreamGetProperty(inAudioFileStream, inPropertyID, &size, &maxPacketSize)
+        if status == noErr {
+            playback.maxPacketSize = maxPacketSize
+        }
+    }
+}
+
+private func packetsProc(
+    inClientData: UnsafeMutableRawPointer,
+    inNumberBytes: UInt32,
+    inNumberPackets: UInt32,
+    inInputData: UnsafeRawPointer,
+    inPacketDescriptions: UnsafeMutablePointer<AudioStreamPacketDescription>?)
+{
+    let playback = Unmanaged<Playback>.fromOpaque(inClientData).takeUnretainedValue()
+    playback.handlePackets(
+        numberBytes: inNumberBytes,
+        numberPackets: inNumberPackets,
+        inputData: inInputData,
+        packetDescriptions: inPacketDescriptions)
+}
+
+private func outputCallbackProc(
+    inUserData: UnsafeMutableRawPointer?,
+    inAQ: AudioQueueRef,
+    inBuffer: AudioQueueBufferRef)
+{
+    guard let inUserData else { return }
+    let playback = Unmanaged<Playback>.fromOpaque(inUserData).takeUnretainedValue()
+    playback.bufferLock.lock()
+    playback.availableBuffers.append(inBuffer)
+    playback.bufferLock.unlock()
+    playback.bufferSemaphore.signal()
+}
+
+private func isRunningCallbackProc(
+    inUserData: UnsafeMutableRawPointer?,
+    inAQ: AudioQueueRef,
+    inID: AudioQueuePropertyID)
+{
+    guard let inUserData else { return }
+    guard inID == kAudioQueueProperty_IsRunning else { return }
+
+    let playback = Unmanaged<Playback>.fromOpaque(inUserData).takeUnretainedValue()
+    var running: UInt32 = 0
+    var size = UInt32(MemoryLayout<UInt32>.size)
+    let status = AudioQueueGetProperty(inAQ, kAudioQueueProperty_IsRunning, &running, &size)
+    if status != noErr { return }
+
+    if running == 0, playback.inputFinished {
+        playback.finish(StreamingPlaybackResult(finished: true, interruptedAt: nil))
+    }
+}
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkTTSValidation.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkTTSValidation.swift
index 8137998ac..e010f9197 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkTTSValidation.swift
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkTTSValidation.swift
@@ -1,4 +1,6 @@
 public enum TalkTTSValidation: Sendable {
+    private static let v3StabilityValues: Set<Double> = [0.0, 0.5, 1.0]
+
     public static func resolveSpeed(speed: Double?, rateWPM: Int?) -> Double? {
         if let rateWPM, rateWPM > 0 {
             let resolved = Double(rateWPM) / 175.0
@@ -18,10 +20,32 @@ public enum TalkTTSValidation: Sendable {
         return value
     }
 
+    public static func validatedStability(_ value: Double?, modelId: String?) -> Double? {
+        guard let value else { return nil }
+        let normalizedModel = (modelId ?? "").trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+        if normalizedModel == "eleven_v3" {
+            return v3StabilityValues.contains(value) ? value : nil
+        }
+        return validatedUnit(value)
+    }
+
     public static func validatedSeed(_ value: Int?) -> UInt32? {
         guard let value else { return nil }
         if value < 0 || value > 4294967295 { return nil }
         return UInt32(value)
     }
-}
 
+    public static func validatedLatencyTier(_ value: Int?) -> Int? {
+        guard let value else { return nil }
+        if value < 0 || value > 4 { return nil }
+        return value
+    }
+
+    public static func pcmSampleRate(from outputFormat: String?) -> Double? {
+        let trimmed = (outputFormat ?? "").trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+        guard trimmed.hasPrefix("pcm_") else { return nil }
+        let parts = trimmed.split(separator: "_", maxSplits: 1)
+        guard parts.count == 2, let rate = Double(parts[1]), rate > 0 else { return nil }
+        return rate
+    }
+}
diff --git a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkTTSValidationTests.swift b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkTTSValidationTests.swift
index f2d7c3c9e..d3426d768 100644
--- a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkTTSValidationTests.swift
+++ b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkTTSValidationTests.swift
@@ -16,9 +16,30 @@ final class TalkTTSValidationTests: XCTestCase {
         XCTAssertNil(TalkTTSValidation.validatedUnit(1.01))
     }
 
+    func testValidatedStability() {
+        XCTAssertEqual(TalkTTSValidation.validatedStability(0, modelId: "eleven_v3"), 0)
+        XCTAssertEqual(TalkTTSValidation.validatedStability(0.5, modelId: "eleven_v3"), 0.5)
+        XCTAssertEqual(TalkTTSValidation.validatedStability(1, modelId: "eleven_v3"), 1)
+        XCTAssertNil(TalkTTSValidation.validatedStability(0.7, modelId: "eleven_v3"))
+        XCTAssertEqual(TalkTTSValidation.validatedStability(0.7, modelId: "eleven_multilingual_v2"), 0.7)
+    }
+
     func testValidatedSeedBounds() {
         XCTAssertEqual(TalkTTSValidation.validatedSeed(0), 0)
         XCTAssertEqual(TalkTTSValidation.validatedSeed(1234), 1234)
         XCTAssertNil(TalkTTSValidation.validatedSeed(-1))
     }
+
+    func testValidatedLatencyTier() {
+        XCTAssertEqual(TalkTTSValidation.validatedLatencyTier(0), 0)
+        XCTAssertEqual(TalkTTSValidation.validatedLatencyTier(4), 4)
+        XCTAssertNil(TalkTTSValidation.validatedLatencyTier(-1))
+        XCTAssertNil(TalkTTSValidation.validatedLatencyTier(5))
+    }
+
+    func testPcmSampleRateParse() {
+        XCTAssertEqual(TalkTTSValidation.pcmSampleRate(from: "pcm_44100"), 44100)
+        XCTAssertNil(TalkTTSValidation.pcmSampleRate(from: "mp3_44100_128"))
+        XCTAssertNil(TalkTTSValidation.pcmSampleRate(from: "pcm_bad"))
+    }
 }
diff --git a/docs/talk.md b/docs/talk.md
index 41f8239a4..e271d0c68 100644
--- a/docs/talk.md
+++ b/docs/talk.md
@@ -10,7 +10,7 @@ Talk mode is a continuous voice conversation loop:
 1) Listen for speech
 2) Send transcript to the model (main session, chat.send)
 3) Wait for the response
-4) Speak it via ElevenLabs
+4) Speak it via ElevenLabs (streaming playback)
 
 ## Behavior (macOS)
 - **Always-on overlay** while Talk mode is enabled.
@@ -55,8 +55,10 @@ Supported keys:
 
 Defaults:
 - `interruptOnSpeech`: true
-- `voiceId`: falls back to `ELEVENLABS_VOICE_ID` / `SAG_VOICE_ID`
+- `voiceId`: falls back to `ELEVENLABS_VOICE_ID` / `SAG_VOICE_ID` (or first ElevenLabs voice when API key is available)
+- `modelId`: defaults to `eleven_v3` when unset
 - `apiKey`: falls back to `ELEVENLABS_API_KEY` (or gateway shell profile if available)
+- `outputFormat`: defaults to `pcm_44100` on macOS/iOS for faster streaming playback (Android stays on MP3)
 
 ## macOS UI
 - Menu bar toggle: **Talk**
@@ -71,4 +73,6 @@ Defaults:
 ## Notes
 - Requires Speech + Microphone permissions.
 - Uses `chat.send` against session key `main`.
-- TTS uses ElevenLabs API with `ELEVENLABS_API_KEY`.
+- TTS uses ElevenLabs streaming API with `ELEVENLABS_API_KEY` and incremental playback on macOS/iOS/Android for lower latency.
+- `stability` for `eleven_v3` is validated to `0.0`, `0.5`, or `1.0`; other models accept `0..1`.
+- `latency_tier` is validated to `0..4` when set.

From 9df22c009391b62d9b039d288a4753e09043e36d Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 12:20:32 +0100
Subject: [PATCH 059/100] fix: address talk streaming build

---
 apps/macos/Sources/Clawdis/TalkModeRuntime.swift           | 7 ++++---
 .../Sources/ClawdisKit/StreamingAudioPlayer.swift          | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
index 140c338b8..73f76b1cf 100644
--- a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
+++ b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
@@ -500,7 +500,7 @@ actor TalkModeRuntime {
             if let apiKey, !apiKey.isEmpty, let voiceId {
                 let desiredOutputFormat = directive?.outputFormat ?? self.defaultOutputFormat ?? "pcm_44100"
                 let outputFormat = ElevenLabsTTSClient.validatedOutputFormat(desiredOutputFormat)
-                if outputFormat == nil, let desiredOutputFormat, !desiredOutputFormat.isEmpty {
+                if outputFormat == nil, !desiredOutputFormat.isEmpty {
                     self.logger
                         .warning(
                             "talk output_format unsupported for local playback: \(desiredOutputFormat, privacy: .public)")
@@ -639,11 +639,12 @@ actor TalkModeRuntime {
     }
 
     func stopSpeaking(reason: TalkStopReason) async {
+        let usePCM = self.lastPlaybackWasPCM
         let interruptedAt = await MainActor.run {
-            let primary = self.lastPlaybackWasPCM
+            let primary = usePCM
                 ? PCMStreamingAudioPlayer.shared.stop()
                 : StreamingAudioPlayer.shared.stop()
-            _ = self.lastPlaybackWasPCM
+            _ = usePCM
                 ? StreamingAudioPlayer.shared.stop()
                 : PCMStreamingAudioPlayer.shared.stop()
             return primary
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/StreamingAudioPlayer.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/StreamingAudioPlayer.swift
index 776c59100..c7d1d2f5c 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisKit/StreamingAudioPlayer.swift
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/StreamingAudioPlayer.swift
@@ -143,7 +143,7 @@ private final class Playback: @unchecked Sendable {
                 return
             }
             self.enqueueCurrentBuffer(flushOnly: true)
-            self.stop(immediate: false)
+            _ = self.stop(immediate: false)
         }
     }
 

From 66952a682def84cae3f0fc79e448d2b1d6986a99 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 12:27:06 +0100
Subject: [PATCH 060/100] test: add pcm streaming smoke

---
 .../ClawdisKit/PCMStreamingAudioPlayer.swift  |  7 ++---
 .../PCMStreamingAudioPlayerTests.swift        | 26 +++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 apps/shared/ClawdisKit/Tests/ClawdisKitTests/PCMStreamingAudioPlayerTests.swift

diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/PCMStreamingAudioPlayer.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/PCMStreamingAudioPlayer.swift
index 66238cd5c..05d122974 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisKit/PCMStreamingAudioPlayer.swift
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/PCMStreamingAudioPlayer.swift
@@ -89,9 +89,10 @@ public final class PCMStreamingAudioPlayer {
         }
 
         self.pendingBuffers += 1
-        self.player.scheduleBuffer(buffer) { [weak self] in
-            Task { @MainActor in
-                guard let self else { return }
+        Task.detached { [weak self] in
+            guard let self else { return }
+            await self.player.scheduleBuffer(buffer)
+            await MainActor.run {
                 self.pendingBuffers = max(0, self.pendingBuffers - 1)
                 if self.inputFinished && self.pendingBuffers == 0 {
                     self.finish(StreamingPlaybackResult(finished: true, interruptedAt: nil))
diff --git a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/PCMStreamingAudioPlayerTests.swift b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/PCMStreamingAudioPlayerTests.swift
new file mode 100644
index 000000000..c502bfdd2
--- /dev/null
+++ b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/PCMStreamingAudioPlayerTests.swift
@@ -0,0 +1,26 @@
+import XCTest
+@testable import ClawdisKit
+
+final class PCMStreamingAudioPlayerTests: XCTestCase {
+    @MainActor
+    func testStopDuringPCMStreamReturnsInterruptedResult() async {
+        var continuation: AsyncThrowingStream<Data, Error>.Continuation?
+        let stream = AsyncThrowingStream<Data, Error> { cont in
+            continuation = cont
+            let samples = Data(repeating: 0, count: 44_100)
+            cont.yield(samples)
+        }
+
+        let task = Task { @MainActor in
+            await PCMStreamingAudioPlayer.shared.play(stream: stream, sampleRate: 44_100)
+        }
+
+        try? await Task.sleep(nanoseconds: 120_000_000)
+        let interruptedAt = PCMStreamingAudioPlayer.shared.stop()
+        continuation?.finish()
+
+        let result = await task.value
+        XCTAssertFalse(result.finished)
+        XCTAssertNotNil(interruptedAt)
+    }
+}

From 83262a67b1cedec1c64dee3581d4aa5b72f7eafb Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 12:48:09 +0100
Subject: [PATCH 061/100] refactor: extract elevenlabs kit

---
 apps/shared/ClawdisKit/Package.swift          |   7 +-
 .../ClawdisKit/ElevenLabsKitShim.swift        |   9 +
 .../Sources/ClawdisKit/ElevenLabsTTS.swift    | 331 --------------
 .../ClawdisKit/PCMStreamingAudioPlayer.swift  | 145 ------
 .../ClawdisKit/StreamingAudioPlayer.swift     | 429 ------------------
 .../ClawdisKit/TalkTTSValidation.swift        |  51 ---
 .../ElevenLabsTTSValidationTests.swift        |   3 +-
 .../PCMStreamingAudioPlayerTests.swift        |  26 --
 .../TalkTTSValidationTests.swift              |  45 --
 9 files changed, 16 insertions(+), 1030 deletions(-)
 create mode 100644 apps/shared/ClawdisKit/Sources/ClawdisKit/ElevenLabsKitShim.swift
 delete mode 100644 apps/shared/ClawdisKit/Sources/ClawdisKit/ElevenLabsTTS.swift
 delete mode 100644 apps/shared/ClawdisKit/Sources/ClawdisKit/PCMStreamingAudioPlayer.swift
 delete mode 100644 apps/shared/ClawdisKit/Sources/ClawdisKit/StreamingAudioPlayer.swift
 delete mode 100644 apps/shared/ClawdisKit/Sources/ClawdisKit/TalkTTSValidation.swift
 delete mode 100644 apps/shared/ClawdisKit/Tests/ClawdisKitTests/PCMStreamingAudioPlayerTests.swift
 delete mode 100644 apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkTTSValidationTests.swift

diff --git a/apps/shared/ClawdisKit/Package.swift b/apps/shared/ClawdisKit/Package.swift
index 3d7c4a784..c3054011a 100644
--- a/apps/shared/ClawdisKit/Package.swift
+++ b/apps/shared/ClawdisKit/Package.swift
@@ -12,10 +12,15 @@ let package = Package(
         .library(name: "ClawdisKit", targets: ["ClawdisKit"]),
         .library(name: "ClawdisChatUI", targets: ["ClawdisChatUI"]),
     ],
+    dependencies: [
+        .package(path: "../../../ElevenLabsKit"),
+    ],
     targets: [
         .target(
             name: "ClawdisKit",
-            dependencies: [],
+            dependencies: [
+                .product(name: "ElevenLabsKit", package: "ElevenLabsKit"),
+            ],
             resources: [
                 .process("Resources"),
             ],
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/ElevenLabsKitShim.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/ElevenLabsKitShim.swift
new file mode 100644
index 000000000..07fe91ac3
--- /dev/null
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/ElevenLabsKitShim.swift
@@ -0,0 +1,9 @@
+@_exported import ElevenLabsKit
+
+public typealias ElevenLabsVoice = ElevenLabsKit.ElevenLabsVoice
+public typealias ElevenLabsTTSRequest = ElevenLabsKit.ElevenLabsTTSRequest
+public typealias ElevenLabsTTSClient = ElevenLabsKit.ElevenLabsTTSClient
+public typealias TalkTTSValidation = ElevenLabsKit.TalkTTSValidation
+public typealias StreamingAudioPlayer = ElevenLabsKit.StreamingAudioPlayer
+public typealias PCMStreamingAudioPlayer = ElevenLabsKit.PCMStreamingAudioPlayer
+public typealias StreamingPlaybackResult = ElevenLabsKit.StreamingPlaybackResult
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/ElevenLabsTTS.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/ElevenLabsTTS.swift
deleted file mode 100644
index 38e602094..000000000
--- a/apps/shared/ClawdisKit/Sources/ClawdisKit/ElevenLabsTTS.swift
+++ /dev/null
@@ -1,331 +0,0 @@
-import Foundation
-
-public struct ElevenLabsVoice: Decodable, Sendable {
-    public let voiceId: String
-    public let name: String?
-
-    enum CodingKeys: String, CodingKey {
-        case voiceId = "voice_id"
-        case name
-    }
-}
-
-public struct ElevenLabsTTSRequest: Sendable {
-    public var text: String
-    public var modelId: String?
-    public var outputFormat: String?
-    public var speed: Double?
-    public var stability: Double?
-    public var similarity: Double?
-    public var style: Double?
-    public var speakerBoost: Bool?
-    public var seed: UInt32?
-    public var normalize: String?
-    public var language: String?
-    public var latencyTier: Int?
-
-    public init(
-        text: String,
-        modelId: String? = nil,
-        outputFormat: String? = nil,
-        speed: Double? = nil,
-        stability: Double? = nil,
-        similarity: Double? = nil,
-        style: Double? = nil,
-        speakerBoost: Bool? = nil,
-        seed: UInt32? = nil,
-        normalize: String? = nil,
-        language: String? = nil,
-        latencyTier: Int? = nil)
-    {
-        self.text = text
-        self.modelId = modelId
-        self.outputFormat = outputFormat
-        self.speed = speed
-        self.stability = stability
-        self.similarity = similarity
-        self.style = style
-        self.speakerBoost = speakerBoost
-        self.seed = seed
-        self.normalize = normalize
-        self.language = language
-        self.latencyTier = latencyTier
-    }
-}
-
-public struct ElevenLabsTTSClient: Sendable {
-    public var apiKey: String
-    public var requestTimeoutSeconds: TimeInterval
-    public var listVoicesTimeoutSeconds: TimeInterval
-    public var baseUrl: URL
-
-    public init(
-        apiKey: String,
-        requestTimeoutSeconds: TimeInterval = 45,
-        listVoicesTimeoutSeconds: TimeInterval = 15,
-        baseUrl: URL = URL(string: "https://api.elevenlabs.io")!)
-    {
-        self.apiKey = apiKey
-        self.requestTimeoutSeconds = requestTimeoutSeconds
-        self.listVoicesTimeoutSeconds = listVoicesTimeoutSeconds
-        self.baseUrl = baseUrl
-    }
-
-    public func synthesizeWithHardTimeout(
-        voiceId: String,
-        request: ElevenLabsTTSRequest,
-        hardTimeoutSeconds: TimeInterval) async throws -> Data
-    {
-        try await withThrowingTaskGroup(of: Data.self) { group in
-            group.addTask {
-                try await self.synthesize(voiceId: voiceId, request: request)
-            }
-            group.addTask {
-                try await Task.sleep(nanoseconds: UInt64(hardTimeoutSeconds * 1_000_000_000))
-                throw NSError(domain: "ElevenLabsTTS", code: 408, userInfo: [
-                    NSLocalizedDescriptionKey: "ElevenLabs TTS timed out after \(hardTimeoutSeconds)s",
-                ])
-            }
-            let data = try await group.next()!
-            group.cancelAll()
-            return data
-        }
-    }
-
-    public func synthesize(voiceId: String, request: ElevenLabsTTSRequest) async throws -> Data {
-        var url = self.baseUrl
-        url.appendPathComponent("v1")
-        url.appendPathComponent("text-to-speech")
-        url.appendPathComponent(voiceId)
-
-        let body = try JSONSerialization.data(withJSONObject: Self.buildPayload(request), options: [])
-
-        var lastError: Error?
-        for attempt in 0..<3 {
-            var req = URLRequest(url: url)
-            req.httpMethod = "POST"
-            req.httpBody = body
-            req.timeoutInterval = self.requestTimeoutSeconds
-            req.setValue("application/json", forHTTPHeaderField: "Content-Type")
-            req.setValue("audio/mpeg", forHTTPHeaderField: "Accept")
-            req.setValue(self.apiKey, forHTTPHeaderField: "xi-api-key")
-
-            do {
-                let (data, response) = try await URLSession.shared.data(for: req)
-                if let http = response as? HTTPURLResponse {
-                    let contentType = (http.value(forHTTPHeaderField: "Content-Type") ?? "unknown").lowercased()
-                    if http.statusCode == 429 || http.statusCode >= 500 {
-                        let message = Self.truncatedErrorBody(data)
-                        lastError = NSError(domain: "ElevenLabsTTS", code: http.statusCode, userInfo: [
-                            NSLocalizedDescriptionKey: "ElevenLabs retryable failure: \(http.statusCode) ct=\(contentType) \(message)",
-                        ])
-                        if attempt < 2 {
-                            let retryAfter = Double(http.value(forHTTPHeaderField: "Retry-After") ?? "")
-                            let baseDelay = [0.25, 0.75, 1.5][attempt]
-                            let delaySeconds = max(baseDelay, retryAfter ?? 0)
-                            try? await Task.sleep(nanoseconds: UInt64(delaySeconds * 1_000_000_000))
-                            continue
-                        }
-                        throw lastError!
-                    }
-
-                    if http.statusCode >= 400 {
-                        let message = Self.truncatedErrorBody(data)
-                        throw NSError(domain: "ElevenLabsTTS", code: http.statusCode, userInfo: [
-                            NSLocalizedDescriptionKey: "ElevenLabs failed: \(http.statusCode) ct=\(contentType) \(message)",
-                        ])
-                    }
-
-                    if !contentType.contains("audio") {
-                        let message = Self.truncatedErrorBody(data)
-                        throw NSError(domain: "ElevenLabsTTS", code: 415, userInfo: [
-                            NSLocalizedDescriptionKey: "ElevenLabs returned non-audio ct=\(contentType) \(message)",
-                        ])
-                    }
-                }
-                return data
-            } catch {
-                lastError = error
-                if attempt < 2 {
-                    try? await Task.sleep(nanoseconds: UInt64([0.25, 0.75, 1.5][attempt] * 1_000_000_000))
-                    continue
-                }
-                throw error
-            }
-        }
-        throw lastError ?? NSError(domain: "ElevenLabsTTS", code: 1, userInfo: [
-            NSLocalizedDescriptionKey: "ElevenLabs failed",
-        ])
-    }
-
-    public func streamSynthesize(
-        voiceId: String,
-        request: ElevenLabsTTSRequest) -> AsyncThrowingStream<Data, Error>
-    {
-        AsyncThrowingStream { continuation in
-            let task = Task {
-                do {
-                    let url = Self.streamingURL(
-                        baseUrl: self.baseUrl,
-                        voiceId: voiceId,
-                        latencyTier: request.latencyTier)
-                    let body = try JSONSerialization.data(withJSONObject: Self.buildPayload(request), options: [])
-
-                    var req = URLRequest(url: url)
-                    req.httpMethod = "POST"
-                    req.httpBody = body
-                    req.timeoutInterval = self.requestTimeoutSeconds
-                    req.setValue("application/json", forHTTPHeaderField: "Content-Type")
-                    req.setValue("audio/mpeg", forHTTPHeaderField: "Accept")
-                    req.setValue(self.apiKey, forHTTPHeaderField: "xi-api-key")
-
-                    let (bytes, response) = try await URLSession.shared.bytes(for: req)
-                    guard let http = response as? HTTPURLResponse else {
-                        throw NSError(domain: "ElevenLabsTTS", code: 1, userInfo: [
-                            NSLocalizedDescriptionKey: "ElevenLabs invalid response",
-                        ])
-                    }
-
-                    let contentType = (http.value(forHTTPHeaderField: "Content-Type") ?? "unknown").lowercased()
-                    if http.statusCode >= 400 {
-                        let message = try await Self.readErrorBody(bytes: bytes)
-                        throw NSError(domain: "ElevenLabsTTS", code: http.statusCode, userInfo: [
-                            NSLocalizedDescriptionKey: "ElevenLabs failed: \(http.statusCode) ct=\(contentType) \(message)",
-                        ])
-                    }
-                    if !contentType.contains("audio") {
-                        let message = try await Self.readErrorBody(bytes: bytes)
-                        throw NSError(domain: "ElevenLabsTTS", code: 415, userInfo: [
-                            NSLocalizedDescriptionKey: "ElevenLabs returned non-audio ct=\(contentType) \(message)",
-                        ])
-                    }
-
-                    var buffer = Data()
-                    buffer.reserveCapacity(16_384)
-                    for try await byte in bytes {
-                        buffer.append(byte)
-                        if buffer.count >= 8_192 {
-                            continuation.yield(buffer)
-                            buffer.removeAll(keepingCapacity: true)
-                        }
-                    }
-                    if !buffer.isEmpty {
-                        continuation.yield(buffer)
-                    }
-                    continuation.finish()
-                } catch {
-                    continuation.finish(throwing: error)
-                }
-            }
-
-            continuation.onTermination = { _ in
-                task.cancel()
-            }
-        }
-    }
-
-    public func listVoices() async throws -> [ElevenLabsVoice] {
-        var url = self.baseUrl
-        url.appendPathComponent("v1")
-        url.appendPathComponent("voices")
-
-        var req = URLRequest(url: url)
-        req.httpMethod = "GET"
-        req.timeoutInterval = self.listVoicesTimeoutSeconds
-        req.setValue(self.apiKey, forHTTPHeaderField: "xi-api-key")
-
-        let (data, response) = try await URLSession.shared.data(for: req)
-        if let http = response as? HTTPURLResponse, http.statusCode >= 400 {
-            let message = Self.truncatedErrorBody(data)
-            throw NSError(domain: "ElevenLabsTTS", code: http.statusCode, userInfo: [
-                NSLocalizedDescriptionKey: "ElevenLabs voices failed: \(http.statusCode) \(message)",
-            ])
-        }
-
-        struct VoicesResponse: Decodable { let voices: [ElevenLabsVoice] }
-        return try JSONDecoder().decode(VoicesResponse.self, from: data).voices
-    }
-
-    public static func validatedOutputFormat(_ value: String?) -> String? {
-        let trimmed = (value ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
-        guard !trimmed.isEmpty else { return nil }
-        guard trimmed.hasPrefix("mp3_") || trimmed.hasPrefix("pcm_") else { return nil }
-        return trimmed
-    }
-
-    public static func validatedLanguage(_ value: String?) -> String? {
-        let normalized = (value ?? "").trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-        guard normalized.count == 2, normalized.allSatisfy({ $0 >= "a" && $0 <= "z" }) else { return nil }
-        return normalized
-    }
-
-    public static func validatedNormalize(_ value: String?) -> String? {
-        let normalized = (value ?? "").trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-        guard ["auto", "on", "off"].contains(normalized) else { return nil }
-        return normalized
-    }
-
-    private static func buildPayload(_ request: ElevenLabsTTSRequest) -> [String: Any] {
-        var payload: [String: Any] = ["text": request.text]
-        if let modelId = request.modelId?.trimmingCharacters(in: .whitespacesAndNewlines), !modelId.isEmpty {
-            payload["model_id"] = modelId
-        }
-        if let outputFormat = request.outputFormat?.trimmingCharacters(in: .whitespacesAndNewlines), !outputFormat.isEmpty {
-            payload["output_format"] = outputFormat
-        }
-        if let seed = request.seed {
-            payload["seed"] = seed
-        }
-        if let normalize = request.normalize {
-            payload["apply_text_normalization"] = normalize
-        }
-        if let language = request.language {
-            payload["language_code"] = language
-        }
-
-        var voiceSettings: [String: Any] = [:]
-        if let speed = request.speed { voiceSettings["speed"] = speed }
-        if let stability = request.stability { voiceSettings["stability"] = stability }
-        if let similarity = request.similarity { voiceSettings["similarity_boost"] = similarity }
-        if let style = request.style { voiceSettings["style"] = style }
-        if let speakerBoost = request.speakerBoost { voiceSettings["use_speaker_boost"] = speakerBoost }
-        if !voiceSettings.isEmpty {
-            payload["voice_settings"] = voiceSettings
-        }
-        return payload
-    }
-
-    private static func truncatedErrorBody(_ data: Data) -> String {
-        let raw = String(data: data.prefix(4096), encoding: .utf8) ?? "unknown"
-        return raw.replacingOccurrences(of: "\n", with: " ").replacingOccurrences(of: "\r", with: " ")
-    }
-
-    private static func streamingURL(baseUrl: URL, voiceId: String, latencyTier: Int?) -> URL {
-        var url = baseUrl
-        url.appendPathComponent("v1")
-        url.appendPathComponent("text-to-speech")
-        url.appendPathComponent(voiceId)
-        url.appendPathComponent("stream")
-
-        guard let latencyTier else { return url }
-        let latencyItem = URLQueryItem(
-            name: "optimize_streaming_latency",
-            value: "\(latencyTier)")
-        guard var components = URLComponents(url: url, resolvingAgainstBaseURL: false) else {
-            return url
-        }
-        var items = components.queryItems ?? []
-        items.append(latencyItem)
-        components.queryItems = items
-        return components.url ?? url
-    }
-
-    private static func readErrorBody(bytes: URLSession.AsyncBytes) async throws -> String {
-        var data = Data()
-        for try await byte in bytes {
-            data.append(byte)
-            if data.count >= 4096 { break }
-        }
-        return truncatedErrorBody(data)
-    }
-}
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/PCMStreamingAudioPlayer.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/PCMStreamingAudioPlayer.swift
deleted file mode 100644
index 05d122974..000000000
--- a/apps/shared/ClawdisKit/Sources/ClawdisKit/PCMStreamingAudioPlayer.swift
+++ /dev/null
@@ -1,145 +0,0 @@
-import AVFoundation
-import Foundation
-import OSLog
-
-@MainActor
-public final class PCMStreamingAudioPlayer {
-    public static let shared = PCMStreamingAudioPlayer()
-
-    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.tts.pcm")
-    private var engine = AVAudioEngine()
-    private var player = AVAudioPlayerNode()
-    private var format: AVAudioFormat?
-    private var pendingBuffers: Int = 0
-    private var inputFinished = false
-    private var continuation: CheckedContinuation<StreamingPlaybackResult, Never>?
-
-    public init() {
-        self.engine.attach(self.player)
-    }
-
-    public func play(stream: AsyncThrowingStream<Data, Error>, sampleRate: Double) async -> StreamingPlaybackResult {
-        self.stopInternal()
-
-        let format = AVAudioFormat(
-            commonFormat: .pcmFormatInt16,
-            sampleRate: sampleRate,
-            channels: 1,
-            interleaved: true)
-
-        guard let format else {
-            return StreamingPlaybackResult(finished: false, interruptedAt: nil)
-        }
-        self.configure(format: format)
-
-        return await withCheckedContinuation { continuation in
-            self.continuation = continuation
-            self.pendingBuffers = 0
-            self.inputFinished = false
-
-            Task.detached { [weak self] in
-                guard let self else { return }
-                do {
-                    for try await chunk in stream {
-                        await self.enqueuePCM(chunk, format: format)
-                    }
-                    await self.finishInput()
-                } catch {
-                    await self.fail(error)
-                }
-            }
-        }
-    }
-
-    public func stop() -> Double? {
-        let interruptedAt = self.currentTimeSeconds()
-        self.stopInternal()
-        self.finish(StreamingPlaybackResult(finished: false, interruptedAt: interruptedAt))
-        return interruptedAt
-    }
-
-    private func configure(format: AVAudioFormat) {
-        if self.format?.sampleRate != format.sampleRate || self.format?.commonFormat != format.commonFormat {
-            self.engine.stop()
-            self.engine = AVAudioEngine()
-            self.player = AVAudioPlayerNode()
-            self.engine.attach(self.player)
-        }
-        self.format = format
-        if self.engine.attachedNodes.contains(self.player) {
-            self.engine.connect(self.player, to: self.engine.mainMixerNode, format: format)
-        }
-    }
-
-    private func enqueuePCM(_ data: Data, format: AVAudioFormat) async {
-        guard !data.isEmpty else { return }
-        let frameCount = data.count / MemoryLayout<Int16>.size
-        guard frameCount > 0 else { return }
-        guard let buffer = AVAudioPCMBuffer(pcmFormat: format, frameCapacity: AVAudioFrameCount(frameCount)) else {
-            return
-        }
-        buffer.frameLength = AVAudioFrameCount(frameCount)
-
-        data.withUnsafeBytes { raw in
-            guard let src = raw.baseAddress else { return }
-            let audioBuffer = buffer.audioBufferList.pointee.mBuffers
-            if let dst = audioBuffer.mData {
-                memcpy(dst, src, frameCount * MemoryLayout<Int16>.size)
-            }
-        }
-
-        self.pendingBuffers += 1
-        Task.detached { [weak self] in
-            guard let self else { return }
-            await self.player.scheduleBuffer(buffer)
-            await MainActor.run {
-                self.pendingBuffers = max(0, self.pendingBuffers - 1)
-                if self.inputFinished && self.pendingBuffers == 0 {
-                    self.finish(StreamingPlaybackResult(finished: true, interruptedAt: nil))
-                }
-            }
-        }
-
-        if !self.player.isPlaying {
-            do {
-                try self.engine.start()
-                self.player.play()
-            } catch {
-                self.logger.error("pcm engine start failed: \(error.localizedDescription, privacy: .public)")
-                self.fail(error)
-            }
-        }
-    }
-
-    private func finishInput() {
-        self.inputFinished = true
-        if self.pendingBuffers == 0 {
-            self.finish(StreamingPlaybackResult(finished: true, interruptedAt: nil))
-        }
-    }
-
-    private func fail(_ error: Error) {
-        self.logger.error("pcm stream failed: \(error.localizedDescription, privacy: .public)")
-        self.finish(StreamingPlaybackResult(finished: false, interruptedAt: nil))
-    }
-
-    private func stopInternal() {
-        self.player.stop()
-        self.engine.stop()
-        self.pendingBuffers = 0
-        self.inputFinished = false
-    }
-
-    private func finish(_ result: StreamingPlaybackResult) {
-        let continuation = self.continuation
-        self.continuation = nil
-        continuation?.resume(returning: result)
-    }
-
-    private func currentTimeSeconds() -> Double? {
-        guard let nodeTime = self.player.lastRenderTime,
-              let playerTime = self.player.playerTime(forNodeTime: nodeTime)
-        else { return nil }
-        return Double(playerTime.sampleTime) / playerTime.sampleRate
-    }
-}
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/StreamingAudioPlayer.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/StreamingAudioPlayer.swift
deleted file mode 100644
index c7d1d2f5c..000000000
--- a/apps/shared/ClawdisKit/Sources/ClawdisKit/StreamingAudioPlayer.swift
+++ /dev/null
@@ -1,429 +0,0 @@
-import AudioToolbox
-import Foundation
-import OSLog
-
-public struct StreamingPlaybackResult: Sendable {
-    public let finished: Bool
-    public let interruptedAt: Double?
-
-    public init(finished: Bool, interruptedAt: Double?) {
-        self.finished = finished
-        self.interruptedAt = interruptedAt
-    }
-}
-
-@MainActor
-public final class StreamingAudioPlayer: NSObject {
-    public static let shared = StreamingAudioPlayer()
-
-    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.tts.stream")
-    private var playback: Playback?
-
-    public func play(stream: AsyncThrowingStream<Data, Error>) async -> StreamingPlaybackResult {
-        self.stopInternal()
-
-        let playback = Playback(logger: self.logger)
-        self.playback = playback
-
-        return await withCheckedContinuation { continuation in
-            playback.setContinuation(continuation)
-            playback.start()
-
-            Task.detached {
-                do {
-                    for try await chunk in stream {
-                        playback.append(chunk)
-                    }
-                    playback.finishInput()
-                } catch {
-                    playback.fail(error)
-                }
-            }
-        }
-    }
-
-    public func stop() -> Double? {
-        guard let playback else { return nil }
-        let interruptedAt = playback.stop(immediate: true)
-        self.finish(playback: playback, result: StreamingPlaybackResult(finished: false, interruptedAt: interruptedAt))
-        return interruptedAt
-    }
-
-    private func stopInternal() {
-        guard let playback else { return }
-        let interruptedAt = playback.stop(immediate: true)
-        self.finish(playback: playback, result: StreamingPlaybackResult(finished: false, interruptedAt: interruptedAt))
-    }
-
-    private func finish(playback: Playback, result: StreamingPlaybackResult) {
-        playback.finish(result)
-        guard self.playback === playback else { return }
-        self.playback = nil
-    }
-}
-
-private final class Playback: @unchecked Sendable {
-    private static let bufferCount: Int = 3
-    private static let bufferSize: Int = 32 * 1024
-
-    private let logger: Logger
-    private let lock = NSLock()
-    private let parseQueue = DispatchQueue(label: "talk.stream.parse")
-    fileprivate let bufferLock = NSLock()
-    fileprivate let bufferSemaphore = DispatchSemaphore(value: bufferCount)
-
-    private var continuation: CheckedContinuation<StreamingPlaybackResult, Never>?
-    private var finished = false
-
-    private var audioFileStream: AudioFileStreamID?
-    private var audioQueue: AudioQueueRef?
-    fileprivate var audioFormat: AudioStreamBasicDescription?
-    fileprivate var maxPacketSize: UInt32 = 0
-
-    fileprivate var availableBuffers: [AudioQueueBufferRef] = []
-    private var currentBuffer: AudioQueueBufferRef?
-    private var currentBufferSize: Int = 0
-    private var currentPacketDescs: [AudioStreamPacketDescription] = []
-
-    private var isRunning = false
-    fileprivate var inputFinished = false
-    private var startRequested = false
-
-    private var sampleRate: Double = 0
-
-    init(logger: Logger) {
-        self.logger = logger
-    }
-
-    func setContinuation(_ continuation: CheckedContinuation<StreamingPlaybackResult, Never>) {
-        self.lock.lock()
-        self.continuation = continuation
-        self.lock.unlock()
-    }
-
-    func start() {
-        let selfPtr = Unmanaged.passUnretained(self).toOpaque()
-        let status = AudioFileStreamOpen(
-            selfPtr,
-            propertyListenerProc,
-            packetsProc,
-            kAudioFileMP3Type,
-            &self.audioFileStream)
-        if status != noErr {
-            self.logger.error("talk stream open failed: \(status)")
-            self.finish(StreamingPlaybackResult(finished: false, interruptedAt: nil))
-        }
-    }
-
-    func append(_ data: Data) {
-        guard !data.isEmpty else { return }
-        self.parseQueue.async { [weak self] in
-            guard let self else { return }
-            guard let audioFileStream = self.audioFileStream else { return }
-            let status = data.withUnsafeBytes { bytes in
-                AudioFileStreamParseBytes(
-                    audioFileStream,
-                    UInt32(bytes.count),
-                    bytes.baseAddress,
-                    [])
-            }
-            if status != noErr {
-                self.logger.error("talk stream parse failed: \(status)")
-                self.fail(NSError(domain: "StreamingAudio", code: Int(status)))
-            }
-        }
-    }
-
-    func finishInput() {
-        self.parseQueue.async { [weak self] in
-            guard let self else { return }
-            self.inputFinished = true
-            if self.audioQueue == nil {
-                self.finish(StreamingPlaybackResult(finished: false, interruptedAt: nil))
-                return
-            }
-            self.enqueueCurrentBuffer(flushOnly: true)
-            _ = self.stop(immediate: false)
-        }
-    }
-
-    func fail(_ error: Error) {
-        self.logger.error("talk stream failed: \(error.localizedDescription, privacy: .public)")
-        _ = self.stop(immediate: true)
-        self.finish(StreamingPlaybackResult(finished: false, interruptedAt: nil))
-    }
-
-    func stop(immediate: Bool) -> Double? {
-        guard let audioQueue else { return nil }
-        let interruptedAt = self.currentTimeSeconds()
-        AudioQueueStop(audioQueue, immediate)
-        return interruptedAt
-    }
-
-    fileprivate func finish(_ result: StreamingPlaybackResult) {
-        let continuation: CheckedContinuation<StreamingPlaybackResult, Never>?
-        self.lock.lock()
-        if self.finished {
-            continuation = nil
-        } else {
-            self.finished = true
-            continuation = self.continuation
-            self.continuation = nil
-        }
-        self.lock.unlock()
-
-        continuation?.resume(returning: result)
-        self.teardown()
-    }
-
-    private func teardown() {
-        if let audioQueue {
-            AudioQueueDispose(audioQueue, true)
-            self.audioQueue = nil
-        }
-        if let audioFileStream {
-            AudioFileStreamClose(audioFileStream)
-            self.audioFileStream = nil
-        }
-        self.bufferLock.lock()
-        self.availableBuffers.removeAll()
-        self.bufferLock.unlock()
-        self.currentBuffer = nil
-        self.currentPacketDescs.removeAll()
-    }
-
-    fileprivate func setupQueueIfNeeded(_ asbd: AudioStreamBasicDescription) {
-        guard self.audioQueue == nil else { return }
-
-        var format = asbd
-        self.audioFormat = format
-        self.sampleRate = format.mSampleRate
-
-        let selfPtr = Unmanaged.passUnretained(self).toOpaque()
-        let status = AudioQueueNewOutput(
-            &format,
-            outputCallbackProc,
-            selfPtr,
-            nil,
-            nil,
-            0,
-            &self.audioQueue)
-        if status != noErr {
-            self.logger.error("talk queue create failed: \(status)")
-            self.finish(StreamingPlaybackResult(finished: false, interruptedAt: nil))
-            return
-        }
-
-        if let audioQueue {
-            AudioQueueAddPropertyListener(audioQueue, kAudioQueueProperty_IsRunning, isRunningCallbackProc, selfPtr)
-        }
-
-        if let audioFileStream {
-            var cookieSize: UInt32 = 0
-            var writable: DarwinBoolean = false
-            let cookieStatus = AudioFileStreamGetPropertyInfo(
-                audioFileStream,
-                kAudioFileStreamProperty_MagicCookieData,
-                &cookieSize,
-                &writable)
-            if cookieStatus == noErr, cookieSize > 0, let audioQueue {
-                var cookie = [UInt8](repeating: 0, count: Int(cookieSize))
-                let readStatus = AudioFileStreamGetProperty(
-                    audioFileStream,
-                    kAudioFileStreamProperty_MagicCookieData,
-                    &cookieSize,
-                    &cookie)
-                if readStatus == noErr {
-                    AudioQueueSetProperty(audioQueue, kAudioQueueProperty_MagicCookie, cookie, cookieSize)
-                }
-            }
-        }
-
-        if let audioQueue {
-            for _ in 0..<Self.bufferCount {
-                var buffer: AudioQueueBufferRef?
-                let allocStatus = AudioQueueAllocateBuffer(audioQueue, UInt32(Self.bufferSize), &buffer)
-                if allocStatus == noErr, let buffer {
-                    self.bufferLock.lock()
-                    self.availableBuffers.append(buffer)
-                    self.bufferLock.unlock()
-                }
-            }
-        }
-    }
-
-    private func enqueueCurrentBuffer(flushOnly: Bool = false) {
-        guard let audioQueue, let buffer = self.currentBuffer else { return }
-        guard self.currentBufferSize > 0 else { return }
-
-        buffer.pointee.mAudioDataByteSize = UInt32(self.currentBufferSize)
-        let packetCount = UInt32(self.currentPacketDescs.count)
-
-        let status = self.currentPacketDescs.withUnsafeBufferPointer { descPtr in
-            AudioQueueEnqueueBuffer(audioQueue, buffer, packetCount, descPtr.baseAddress)
-        }
-        if status != noErr {
-            self.logger.error("talk queue enqueue failed: \(status)")
-        } else {
-            if !self.startRequested {
-                self.startRequested = true
-                let startStatus = AudioQueueStart(audioQueue, nil)
-                if startStatus != noErr {
-                    self.logger.error("talk queue start failed: \(startStatus)")
-                }
-            }
-        }
-
-        self.currentBuffer = nil
-        self.currentBufferSize = 0
-        self.currentPacketDescs.removeAll(keepingCapacity: true)
-        if !flushOnly {
-            self.bufferSemaphore.wait()
-            self.bufferLock.lock()
-            let next = self.availableBuffers.popLast()
-            self.bufferLock.unlock()
-            if let next { self.currentBuffer = next }
-        }
-    }
-
-    fileprivate func handlePackets(
-        numberBytes: UInt32,
-        numberPackets: UInt32,
-        inputData: UnsafeRawPointer,
-        packetDescriptions: UnsafeMutablePointer<AudioStreamPacketDescription>?)
-    {
-        if self.audioQueue == nil, let format = self.audioFormat {
-            self.setupQueueIfNeeded(format)
-        }
-
-        if self.audioQueue == nil {
-            return
-        }
-
-        if self.currentBuffer == nil {
-            self.bufferSemaphore.wait()
-            self.bufferLock.lock()
-            self.currentBuffer = self.availableBuffers.popLast()
-            self.bufferLock.unlock()
-            self.currentBufferSize = 0
-            self.currentPacketDescs.removeAll(keepingCapacity: true)
-        }
-
-        let bytes = inputData.assumingMemoryBound(to: UInt8.self)
-        let packetCount = Int(numberPackets)
-        for index in 0..<packetCount {
-            let packetOffset: Int
-            let packetSize: Int
-
-            if let packetDescriptions {
-                packetOffset = Int(packetDescriptions[index].mStartOffset)
-                packetSize = Int(packetDescriptions[index].mDataByteSize)
-            } else {
-                let size = Int(numberBytes) / packetCount
-                packetOffset = index * size
-                packetSize = size
-            }
-
-            if packetSize > Self.bufferSize {
-                continue
-            }
-
-            if self.currentBufferSize + packetSize > Self.bufferSize {
-                self.enqueueCurrentBuffer()
-            }
-
-            guard let buffer = self.currentBuffer else { continue }
-            let dest = buffer.pointee.mAudioData.advanced(by: self.currentBufferSize)
-            memcpy(dest, bytes.advanced(by: packetOffset), packetSize)
-
-            let desc = AudioStreamPacketDescription(
-                mStartOffset: Int64(self.currentBufferSize),
-                mVariableFramesInPacket: 0,
-                mDataByteSize: UInt32(packetSize))
-            self.currentPacketDescs.append(desc)
-            self.currentBufferSize += packetSize
-        }
-    }
-
-    private func currentTimeSeconds() -> Double? {
-        guard let audioQueue, sampleRate > 0 else { return nil }
-        var timeStamp = AudioTimeStamp()
-        let status = AudioQueueGetCurrentTime(audioQueue, nil, &timeStamp, nil)
-        if status != noErr { return nil }
-        if timeStamp.mSampleTime.isNaN { return nil }
-        return timeStamp.mSampleTime / sampleRate
-    }
-}
-
-private func propertyListenerProc(
-    inClientData: UnsafeMutableRawPointer,
-    inAudioFileStream: AudioFileStreamID,
-    inPropertyID: AudioFileStreamPropertyID,
-    ioFlags: UnsafeMutablePointer<AudioFileStreamPropertyFlags>)
-{
-    let playback = Unmanaged<Playback>.fromOpaque(inClientData).takeUnretainedValue()
-
-    if inPropertyID == kAudioFileStreamProperty_DataFormat {
-        var format = AudioStreamBasicDescription()
-        var size = UInt32(MemoryLayout<AudioStreamBasicDescription>.size)
-        let status = AudioFileStreamGetProperty(inAudioFileStream, inPropertyID, &size, &format)
-        if status == noErr {
-            playback.audioFormat = format
-            playback.setupQueueIfNeeded(format)
-        }
-    } else if inPropertyID == kAudioFileStreamProperty_PacketSizeUpperBound {
-        var maxPacketSize: UInt32 = 0
-        var size = UInt32(MemoryLayout<UInt32>.size)
-        let status = AudioFileStreamGetProperty(inAudioFileStream, inPropertyID, &size, &maxPacketSize)
-        if status == noErr {
-            playback.maxPacketSize = maxPacketSize
-        }
-    }
-}
-
-private func packetsProc(
-    inClientData: UnsafeMutableRawPointer,
-    inNumberBytes: UInt32,
-    inNumberPackets: UInt32,
-    inInputData: UnsafeRawPointer,
-    inPacketDescriptions: UnsafeMutablePointer<AudioStreamPacketDescription>?)
-{
-    let playback = Unmanaged<Playback>.fromOpaque(inClientData).takeUnretainedValue()
-    playback.handlePackets(
-        numberBytes: inNumberBytes,
-        numberPackets: inNumberPackets,
-        inputData: inInputData,
-        packetDescriptions: inPacketDescriptions)
-}
-
-private func outputCallbackProc(
-    inUserData: UnsafeMutableRawPointer?,
-    inAQ: AudioQueueRef,
-    inBuffer: AudioQueueBufferRef)
-{
-    guard let inUserData else { return }
-    let playback = Unmanaged<Playback>.fromOpaque(inUserData).takeUnretainedValue()
-    playback.bufferLock.lock()
-    playback.availableBuffers.append(inBuffer)
-    playback.bufferLock.unlock()
-    playback.bufferSemaphore.signal()
-}
-
-private func isRunningCallbackProc(
-    inUserData: UnsafeMutableRawPointer?,
-    inAQ: AudioQueueRef,
-    inID: AudioQueuePropertyID)
-{
-    guard let inUserData else { return }
-    guard inID == kAudioQueueProperty_IsRunning else { return }
-
-    let playback = Unmanaged<Playback>.fromOpaque(inUserData).takeUnretainedValue()
-    var running: UInt32 = 0
-    var size = UInt32(MemoryLayout<UInt32>.size)
-    let status = AudioQueueGetProperty(inAQ, kAudioQueueProperty_IsRunning, &running, &size)
-    if status != noErr { return }
-
-    if running == 0, playback.inputFinished {
-        playback.finish(StreamingPlaybackResult(finished: true, interruptedAt: nil))
-    }
-}
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkTTSValidation.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkTTSValidation.swift
deleted file mode 100644
index e010f9197..000000000
--- a/apps/shared/ClawdisKit/Sources/ClawdisKit/TalkTTSValidation.swift
+++ /dev/null
@@ -1,51 +0,0 @@
-public enum TalkTTSValidation: Sendable {
-    private static let v3StabilityValues: Set<Double> = [0.0, 0.5, 1.0]
-
-    public static func resolveSpeed(speed: Double?, rateWPM: Int?) -> Double? {
-        if let rateWPM, rateWPM > 0 {
-            let resolved = Double(rateWPM) / 175.0
-            if resolved <= 0.5 || resolved >= 2.0 { return nil }
-            return resolved
-        }
-        if let speed {
-            if speed <= 0.5 || speed >= 2.0 { return nil }
-            return speed
-        }
-        return nil
-    }
-
-    public static func validatedUnit(_ value: Double?) -> Double? {
-        guard let value else { return nil }
-        if value < 0 || value > 1 { return nil }
-        return value
-    }
-
-    public static func validatedStability(_ value: Double?, modelId: String?) -> Double? {
-        guard let value else { return nil }
-        let normalizedModel = (modelId ?? "").trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-        if normalizedModel == "eleven_v3" {
-            return v3StabilityValues.contains(value) ? value : nil
-        }
-        return validatedUnit(value)
-    }
-
-    public static func validatedSeed(_ value: Int?) -> UInt32? {
-        guard let value else { return nil }
-        if value < 0 || value > 4294967295 { return nil }
-        return UInt32(value)
-    }
-
-    public static func validatedLatencyTier(_ value: Int?) -> Int? {
-        guard let value else { return nil }
-        if value < 0 || value > 4 { return nil }
-        return value
-    }
-
-    public static func pcmSampleRate(from outputFormat: String?) -> Double? {
-        let trimmed = (outputFormat ?? "").trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-        guard trimmed.hasPrefix("pcm_") else { return nil }
-        let parts = trimmed.split(separator: "_", maxSplits: 1)
-        guard parts.count == 2, let rate = Double(parts[1]), rate > 0 else { return nil }
-        return rate
-    }
-}
diff --git a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/ElevenLabsTTSValidationTests.swift b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/ElevenLabsTTSValidationTests.swift
index 716c50508..507ca6e76 100644
--- a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/ElevenLabsTTSValidationTests.swift
+++ b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/ElevenLabsTTSValidationTests.swift
@@ -4,7 +4,7 @@ import XCTest
 final class ElevenLabsTTSValidationTests: XCTestCase {
     func testValidatedOutputFormatAllowsOnlyMp3Presets() {
         XCTAssertEqual(ElevenLabsTTSClient.validatedOutputFormat("mp3_44100_128"), "mp3_44100_128")
-        XCTAssertNil(ElevenLabsTTSClient.validatedOutputFormat("pcm_16000"))
+        XCTAssertEqual(ElevenLabsTTSClient.validatedOutputFormat("pcm_16000"), "pcm_16000")
     }
 
     func testValidatedLanguageAcceptsTwoLetterCodes() {
@@ -17,4 +17,3 @@ final class ElevenLabsTTSValidationTests: XCTestCase {
         XCTAssertNil(ElevenLabsTTSClient.validatedNormalize("maybe"))
     }
 }
-
diff --git a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/PCMStreamingAudioPlayerTests.swift b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/PCMStreamingAudioPlayerTests.swift
deleted file mode 100644
index c502bfdd2..000000000
--- a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/PCMStreamingAudioPlayerTests.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-import XCTest
-@testable import ClawdisKit
-
-final class PCMStreamingAudioPlayerTests: XCTestCase {
-    @MainActor
-    func testStopDuringPCMStreamReturnsInterruptedResult() async {
-        var continuation: AsyncThrowingStream<Data, Error>.Continuation?
-        let stream = AsyncThrowingStream<Data, Error> { cont in
-            continuation = cont
-            let samples = Data(repeating: 0, count: 44_100)
-            cont.yield(samples)
-        }
-
-        let task = Task { @MainActor in
-            await PCMStreamingAudioPlayer.shared.play(stream: stream, sampleRate: 44_100)
-        }
-
-        try? await Task.sleep(nanoseconds: 120_000_000)
-        let interruptedAt = PCMStreamingAudioPlayer.shared.stop()
-        continuation?.finish()
-
-        let result = await task.value
-        XCTAssertFalse(result.finished)
-        XCTAssertNotNil(interruptedAt)
-    }
-}
diff --git a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkTTSValidationTests.swift b/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkTTSValidationTests.swift
deleted file mode 100644
index d3426d768..000000000
--- a/apps/shared/ClawdisKit/Tests/ClawdisKitTests/TalkTTSValidationTests.swift
+++ /dev/null
@@ -1,45 +0,0 @@
-import XCTest
-@testable import ClawdisKit
-
-final class TalkTTSValidationTests: XCTestCase {
-    func testResolveSpeedUsesRateWPMWhenProvided() {
-        let resolved = TalkTTSValidation.resolveSpeed(speed: nil, rateWPM: 175)
-        XCTAssertNotNil(resolved)
-        XCTAssertEqual(resolved ?? 0, 1.0, accuracy: 0.0001)
-        XCTAssertNil(TalkTTSValidation.resolveSpeed(speed: nil, rateWPM: 400))
-    }
-
-    func testValidatedUnitBounds() {
-        XCTAssertEqual(TalkTTSValidation.validatedUnit(0), 0)
-        XCTAssertEqual(TalkTTSValidation.validatedUnit(1), 1)
-        XCTAssertNil(TalkTTSValidation.validatedUnit(-0.01))
-        XCTAssertNil(TalkTTSValidation.validatedUnit(1.01))
-    }
-
-    func testValidatedStability() {
-        XCTAssertEqual(TalkTTSValidation.validatedStability(0, modelId: "eleven_v3"), 0)
-        XCTAssertEqual(TalkTTSValidation.validatedStability(0.5, modelId: "eleven_v3"), 0.5)
-        XCTAssertEqual(TalkTTSValidation.validatedStability(1, modelId: "eleven_v3"), 1)
-        XCTAssertNil(TalkTTSValidation.validatedStability(0.7, modelId: "eleven_v3"))
-        XCTAssertEqual(TalkTTSValidation.validatedStability(0.7, modelId: "eleven_multilingual_v2"), 0.7)
-    }
-
-    func testValidatedSeedBounds() {
-        XCTAssertEqual(TalkTTSValidation.validatedSeed(0), 0)
-        XCTAssertEqual(TalkTTSValidation.validatedSeed(1234), 1234)
-        XCTAssertNil(TalkTTSValidation.validatedSeed(-1))
-    }
-
-    func testValidatedLatencyTier() {
-        XCTAssertEqual(TalkTTSValidation.validatedLatencyTier(0), 0)
-        XCTAssertEqual(TalkTTSValidation.validatedLatencyTier(4), 4)
-        XCTAssertNil(TalkTTSValidation.validatedLatencyTier(-1))
-        XCTAssertNil(TalkTTSValidation.validatedLatencyTier(5))
-    }
-
-    func testPcmSampleRateParse() {
-        XCTAssertEqual(TalkTTSValidation.pcmSampleRate(from: "pcm_44100"), 44100)
-        XCTAssertNil(TalkTTSValidation.pcmSampleRate(from: "mp3_44100_128"))
-        XCTAssertNil(TalkTTSValidation.pcmSampleRate(from: "pcm_bad"))
-    }
-}

From 3bf8b9ccf42a0e48c26bc92a89ca397ad0f5ad25 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 12:52:56 +0100
Subject: [PATCH 062/100] fix: default android talk pcm_24000

---
 .../clawdis/node/voice/TalkModeManager.kt     | 232 +++++++++++++++---
 docs/talk.md                                  |   3 +-
 2 files changed, 200 insertions(+), 35 deletions(-)

diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
index 42536d359..e3251601e 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/voice/TalkModeManager.kt
@@ -5,6 +5,9 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.media.AudioAttributes
+import android.media.AudioFormat
+import android.media.AudioManager
+import android.media.AudioTrack
 import android.media.MediaPlayer
 import android.os.Bundle
 import android.os.Handler
@@ -36,6 +39,7 @@ import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.buildJsonObject
+import kotlin.math.max
 
 class TalkModeManager(
   private val context: Context,
@@ -44,6 +48,7 @@ class TalkModeManager(
   companion object {
     private const val tag = "TalkMode"
     private const val defaultModelIdFallback = "eleven_v3"
+    private const val defaultOutputFormatFallback = "pcm_24000"
   }
 
   private val mainHandler = Handler(Looper.getMainLooper())
@@ -99,6 +104,8 @@ class TalkModeManager(
 
   private var player: MediaPlayer? = null
   private var streamingSource: StreamingMediaDataSource? = null
+  private var pcmTrack: AudioTrack? = null
+  @Volatile private var pcmStopRequested = false
   private var systemTts: TextToSpeech? = null
   private var systemTtsPending: CompletableDeferred<Unit>? = null
   private var systemTtsPendingId: String? = null
@@ -531,6 +538,22 @@ class TalkModeManager(
   private suspend fun streamAndPlay(voiceId: String, apiKey: String, request: ElevenLabsRequest) {
     stopSpeaking(resetInterrupt = false)
 
+    pcmStopRequested = false
+    val pcmSampleRate = TalkModeRuntime.parsePcmSampleRate(request.outputFormat)
+    if (pcmSampleRate != null) {
+      try {
+        streamAndPlayPcm(voiceId = voiceId, apiKey = apiKey, request = request, sampleRate = pcmSampleRate)
+        return
+      } catch (err: Throwable) {
+        if (pcmStopRequested) return
+        Log.w(tag, "pcm playback failed; falling back to mp3: ${err.message ?: err::class.simpleName}")
+      }
+    }
+
+    streamAndPlayMp3(voiceId = voiceId, apiKey = apiKey, request = request)
+  }
+
+  private suspend fun streamAndPlayMp3(voiceId: String, apiKey: String, request: ElevenLabsRequest) {
     val dataSource = StreamingMediaDataSource()
     streamingSource = dataSource
 
@@ -587,6 +610,54 @@ class TalkModeManager(
     Log.d(tag, "play done")
   }
 
+  private suspend fun streamAndPlayPcm(
+    voiceId: String,
+    apiKey: String,
+    request: ElevenLabsRequest,
+    sampleRate: Int,
+  ) {
+    val minBuffer =
+      AudioTrack.getMinBufferSize(
+        sampleRate,
+        AudioFormat.CHANNEL_OUT_MONO,
+        AudioFormat.ENCODING_PCM_16BIT,
+      )
+    if (minBuffer <= 0) {
+      throw IllegalStateException("AudioTrack buffer size invalid: $minBuffer")
+    }
+
+    val bufferSize = max(minBuffer * 2, 8 * 1024)
+    val track =
+      AudioTrack(
+        AudioAttributes.Builder()
+          .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+          .setUsage(AudioAttributes.USAGE_ASSISTANT)
+          .build(),
+        AudioFormat.Builder()
+          .setSampleRate(sampleRate)
+          .setChannelMask(AudioFormat.CHANNEL_OUT_MONO)
+          .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
+          .build(),
+        bufferSize,
+        AudioTrack.MODE_STREAM,
+        AudioManager.AUDIO_SESSION_ID_GENERATE,
+      )
+    if (track.state != AudioTrack.STATE_INITIALIZED) {
+      track.release()
+      throw IllegalStateException("AudioTrack init failed")
+    }
+    pcmTrack = track
+    track.play()
+
+    Log.d(tag, "pcm play start sampleRate=$sampleRate bufferSize=$bufferSize")
+    try {
+      streamPcm(voiceId = voiceId, apiKey = apiKey, request = request, track = track)
+    } finally {
+      cleanupPcmTrack()
+    }
+    Log.d(tag, "pcm play done")
+  }
+
   private suspend fun speakWithSystemTts(text: String) {
     val trimmed = text.trim()
     if (trimmed.isEmpty()) return
@@ -678,8 +749,10 @@ class TalkModeManager(
   }
 
   private fun stopSpeaking(resetInterrupt: Boolean = true) {
+    pcmStopRequested = true
     if (!_isSpeaking.value) {
       cleanupPlayer()
+      cleanupPcmTrack()
       systemTts?.stop()
       systemTtsPending?.cancel()
       systemTtsPending = null
@@ -691,6 +764,7 @@ class TalkModeManager(
       lastInterruptedAtSeconds = currentMs / 1000.0
     }
     cleanupPlayer()
+    cleanupPcmTrack()
     systemTts?.stop()
     systemTtsPending?.cancel()
     systemTtsPending = null
@@ -706,6 +780,20 @@ class TalkModeManager(
     streamingSource = null
   }
 
+  private fun cleanupPcmTrack() {
+    val track = pcmTrack ?: return
+    try {
+      track.pause()
+      track.flush()
+      track.stop()
+    } catch (_: Throwable) {
+      // ignore cleanup errors
+    } finally {
+      track.release()
+    }
+    pcmTrack = null
+  }
+
   private fun shouldInterrupt(transcript: String): Boolean {
     val trimmed = transcript.trim()
     if (trimmed.length < 3) return false
@@ -743,7 +831,7 @@ class TalkModeManager(
       if (!voiceOverrideActive) currentVoiceId = defaultVoiceId
       defaultModelId = model ?: defaultModelIdFallback
       if (!modelOverrideActive) currentModelId = defaultModelId
-      defaultOutputFormat = outputFormat
+      defaultOutputFormat = outputFormat ?: defaultOutputFormatFallback
       apiKey = key ?: envKey?.takeIf { it.isNotEmpty() }
       if (interrupt != null) interruptOnSpeech = interrupt
     } catch (_: Throwable) {
@@ -752,6 +840,7 @@ class TalkModeManager(
       if (!modelOverrideActive) currentModelId = defaultModelId
       apiKey = envKey?.takeIf { it.isNotEmpty() }
       voiceAliases = emptyMap()
+      defaultOutputFormat = defaultOutputFormatFallback
     }
   }
 
@@ -767,45 +856,110 @@ class TalkModeManager(
     sink: StreamingMediaDataSource,
   ) {
     withContext(Dispatchers.IO) {
-      val baseUrl = "https://api.elevenlabs.io/v1/text-to-speech/$voiceId/stream"
-      val latencyTier = request.latencyTier
-      val url =
-        if (latencyTier != null) {
-          URL("$baseUrl?optimize_streaming_latency=$latencyTier")
-        } else {
-          URL(baseUrl)
+      val conn = openTtsConnection(voiceId = voiceId, apiKey = apiKey, request = request)
+      try {
+        val payload = buildRequestPayload(request)
+        conn.outputStream.use { it.write(payload.toByteArray()) }
+
+        val code = conn.responseCode
+        if (code >= 400) {
+          val message = conn.errorStream?.readBytes()?.toString(Charsets.UTF_8) ?: ""
+          sink.fail()
+          throw IllegalStateException("ElevenLabs failed: $code $message")
         }
-      val conn = url.openConnection() as HttpURLConnection
-      conn.requestMethod = "POST"
-      conn.connectTimeout = 30_000
-      conn.readTimeout = 30_000
-      conn.setRequestProperty("Content-Type", "application/json")
-      conn.setRequestProperty("Accept", "audio/mpeg")
-      conn.setRequestProperty("xi-api-key", apiKey)
-      conn.doOutput = true
 
-      val payload = buildRequestPayload(request)
-      conn.outputStream.use { it.write(payload.toByteArray()) }
-
-      val code = conn.responseCode
-      if (code >= 400) {
-        val message = conn.errorStream?.readBytes()?.toString(Charsets.UTF_8) ?: ""
-        sink.fail()
-        throw IllegalStateException("ElevenLabs failed: $code $message")
-      }
-
-      val buffer = ByteArray(8 * 1024)
-      conn.inputStream.use { input ->
-        while (true) {
-          val read = input.read(buffer)
-          if (read <= 0) break
-          sink.append(buffer.copyOf(read))
+        val buffer = ByteArray(8 * 1024)
+        conn.inputStream.use { input ->
+          while (true) {
+            val read = input.read(buffer)
+            if (read <= 0) break
+            sink.append(buffer.copyOf(read))
+          }
         }
+        sink.finish()
+      } finally {
+        conn.disconnect()
       }
-      sink.finish()
     }
   }
 
+  private suspend fun streamPcm(
+    voiceId: String,
+    apiKey: String,
+    request: ElevenLabsRequest,
+    track: AudioTrack,
+  ) {
+    withContext(Dispatchers.IO) {
+      val conn = openTtsConnection(voiceId = voiceId, apiKey = apiKey, request = request)
+      try {
+        val payload = buildRequestPayload(request)
+        conn.outputStream.use { it.write(payload.toByteArray()) }
+
+        val code = conn.responseCode
+        if (code >= 400) {
+          val message = conn.errorStream?.readBytes()?.toString(Charsets.UTF_8) ?: ""
+          throw IllegalStateException("ElevenLabs failed: $code $message")
+        }
+
+        val buffer = ByteArray(8 * 1024)
+        conn.inputStream.use { input ->
+          while (true) {
+            if (pcmStopRequested) return@withContext
+            val read = input.read(buffer)
+            if (read <= 0) break
+            var offset = 0
+            while (offset < read) {
+              if (pcmStopRequested) return@withContext
+              val wrote =
+                try {
+                  track.write(buffer, offset, read - offset)
+                } catch (err: Throwable) {
+                  if (pcmStopRequested) return@withContext
+                  throw err
+                }
+              if (wrote <= 0) {
+                if (pcmStopRequested) return@withContext
+                throw IllegalStateException("AudioTrack write failed: $wrote")
+              }
+              offset += wrote
+            }
+          }
+        }
+      } finally {
+        conn.disconnect()
+      }
+    }
+  }
+
+  private fun openTtsConnection(
+    voiceId: String,
+    apiKey: String,
+    request: ElevenLabsRequest,
+  ): HttpURLConnection {
+    val baseUrl = "https://api.elevenlabs.io/v1/text-to-speech/$voiceId/stream"
+    val latencyTier = request.latencyTier
+    val url =
+      if (latencyTier != null) {
+        URL("$baseUrl?optimize_streaming_latency=$latencyTier")
+      } else {
+        URL(baseUrl)
+      }
+    val conn = url.openConnection() as HttpURLConnection
+    conn.requestMethod = "POST"
+    conn.connectTimeout = 30_000
+    conn.readTimeout = 30_000
+    conn.setRequestProperty("Content-Type", "application/json")
+    conn.setRequestProperty("Accept", resolveAcceptHeader(request.outputFormat))
+    conn.setRequestProperty("xi-api-key", apiKey)
+    conn.doOutput = true
+    return conn
+  }
+
+  private fun resolveAcceptHeader(outputFormat: String?): String {
+    val normalized = outputFormat?.trim()?.lowercase().orEmpty()
+    return if (normalized.startsWith("pcm_")) "audio/pcm" else "audio/mpeg"
+  }
+
   private fun buildRequestPayload(request: ElevenLabsRequest): String {
     val voiceSettingsEntries =
       buildJsonObject {
@@ -897,7 +1051,8 @@ class TalkModeManager(
     fun validatedOutputFormat(value: String?): String? {
       val trimmed = value?.trim()?.lowercase() ?: return null
       if (trimmed.isEmpty()) return null
-      return if (trimmed.startsWith("mp3_")) trimmed else null
+      if (trimmed.startsWith("mp3_")) return trimmed
+      return if (parsePcmSampleRate(trimmed) != null) trimmed else null
     }
 
     fun validatedLatencyTier(value: Int?): Int? {
@@ -906,6 +1061,15 @@ class TalkModeManager(
       return value
     }
 
+    fun parsePcmSampleRate(value: String?): Int? {
+      val trimmed = value?.trim()?.lowercase() ?: return null
+      if (!trimmed.startsWith("pcm_")) return null
+      val suffix = trimmed.removePrefix("pcm_")
+      val digits = suffix.takeWhile { it.isDigit() }
+      val rate = digits.toIntOrNull() ?: return null
+      return if (rate in setOf(16000, 22050, 24000, 44100)) rate else null
+    }
+
     fun isMessageTimestampAfter(timestamp: Double, sinceSeconds: Double): Boolean {
       val sinceMs = sinceSeconds * 1000
       return if (timestamp > 10_000_000_000) {
diff --git a/docs/talk.md b/docs/talk.md
index e271d0c68..36641edb2 100644
--- a/docs/talk.md
+++ b/docs/talk.md
@@ -58,7 +58,7 @@ Defaults:
 - `voiceId`: falls back to `ELEVENLABS_VOICE_ID` / `SAG_VOICE_ID` (or first ElevenLabs voice when API key is available)
 - `modelId`: defaults to `eleven_v3` when unset
 - `apiKey`: falls back to `ELEVENLABS_API_KEY` (or gateway shell profile if available)
-- `outputFormat`: defaults to `pcm_44100` on macOS/iOS for faster streaming playback (Android stays on MP3)
+- `outputFormat`: defaults to `pcm_44100` on macOS/iOS and `pcm_24000` on Android (set `mp3_*` to force MP3 streaming)
 
 ## macOS UI
 - Menu bar toggle: **Talk**
@@ -76,3 +76,4 @@ Defaults:
 - TTS uses ElevenLabs streaming API with `ELEVENLABS_API_KEY` and incremental playback on macOS/iOS/Android for lower latency.
 - `stability` for `eleven_v3` is validated to `0.0`, `0.5`, or `1.0`; other models accept `0..1`.
 - `latency_tier` is validated to `0..4` when set.
+- Android supports `pcm_16000`, `pcm_22050`, `pcm_24000`, and `pcm_44100` output formats for low-latency AudioTrack streaming.

From 73d595eeccb035e114e76fd7a3551f948322259a Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 12:53:17 +0100
Subject: [PATCH 063/100] chore: sync local changes

---
 .../Bridge/BridgeConnectionController.swift   |  26 ++--
 apps/ios/Sources/Voice/TalkModeManager.swift  |  10 +-
 .../BridgeConnectionControllerTests.swift     | 118 +++++++++++++++++-
 .../Clawdis/MenuSessionsInjector.swift        |  22 +++-
 apps/macos/Sources/Clawdis/NodesMenu.swift    |  74 ++++++++---
 5 files changed, 219 insertions(+), 31 deletions(-)

diff --git a/apps/ios/Sources/Bridge/BridgeConnectionController.swift b/apps/ios/Sources/Bridge/BridgeConnectionController.swift
index 256417319..8e1347058 100644
--- a/apps/ios/Sources/Bridge/BridgeConnectionController.swift
+++ b/apps/ios/Sources/Bridge/BridgeConnectionController.swift
@@ -25,7 +25,6 @@ final class BridgeConnectionController {
     private let discovery = BridgeDiscoveryModel()
     private weak var appModel: NodeAppModel?
     private var didAutoConnect = false
-    private var seenStableIDs = Set<String>()
 
     private let bridgeClientFactory: @Sendable () -> any BridgePairingClient
 
@@ -120,9 +119,15 @@ final class BridgeConnectionController {
             return
         }
 
-        let targetStableID = defaults.string(forKey: "bridge.lastDiscoveredStableID")?
+        let preferredStableID = defaults.string(forKey: "bridge.preferredStableID")?
             .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        guard !targetStableID.isEmpty else { return }
+        let lastDiscoveredStableID = defaults.string(forKey: "bridge.lastDiscoveredStableID")?
+            .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+
+        let candidates = [preferredStableID, lastDiscoveredStableID].filter { !$0.isEmpty }
+        guard let targetStableID = candidates.first(where: { id in
+            self.bridges.contains(where: { $0.stableID == id })
+        }) else { return }
 
         guard let target = self.bridges.first(where: { $0.stableID == targetStableID }) else { return }
 
@@ -131,11 +136,18 @@ final class BridgeConnectionController {
     }
 
     private func updateLastDiscoveredBridge(from bridges: [BridgeDiscoveryModel.DiscoveredBridge]) {
-        let newlyDiscovered = bridges.filter { self.seenStableIDs.insert($0.stableID).inserted }
-        guard let last = newlyDiscovered.last else { return }
+        let defaults = UserDefaults.standard
+        let preferred = defaults.string(forKey: "bridge.preferredStableID")?
+            .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        let existingLast = defaults.string(forKey: "bridge.lastDiscoveredStableID")?
+            .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
 
-        UserDefaults.standard.set(last.stableID, forKey: "bridge.lastDiscoveredStableID")
-        BridgeSettingsStore.saveLastDiscoveredBridgeStableID(last.stableID)
+        // Avoid overriding user intent (preferred/lastDiscovered are also set on manual Connect).
+        guard preferred.isEmpty, existingLast.isEmpty else { return }
+        guard let first = bridges.first else { return }
+
+        defaults.set(first.stableID, forKey: "bridge.lastDiscoveredStableID")
+        BridgeSettingsStore.saveLastDiscoveredBridgeStableID(first.stableID)
     }
 
     private func makeHello(token: String) -> BridgeHello {
diff --git a/apps/ios/Sources/Voice/TalkModeManager.swift b/apps/ios/Sources/Voice/TalkModeManager.swift
index e93bce006..a06154037 100644
--- a/apps/ios/Sources/Voice/TalkModeManager.swift
+++ b/apps/ios/Sources/Voice/TalkModeManager.swift
@@ -461,11 +461,13 @@ final class TalkModeManager: NSObject {
             let canUseElevenLabs = (voiceId?.isEmpty == false) && (apiKey?.isEmpty == false)
 
             if canUseElevenLabs, let voiceId, let apiKey {
-                let desiredOutputFormat = directive?.outputFormat ?? self.defaultOutputFormat ?? "pcm_44100"
-                let outputFormat = ElevenLabsTTSClient.validatedOutputFormat(desiredOutputFormat)
-                if outputFormat == nil, let desiredOutputFormat, !desiredOutputFormat.isEmpty {
+                let desiredOutputFormat = (directive?.outputFormat ?? self.defaultOutputFormat)?
+                    .trimmingCharacters(in: .whitespacesAndNewlines)
+                let requestedOutputFormat = (desiredOutputFormat?.isEmpty == false) ? desiredOutputFormat : nil
+                let outputFormat = ElevenLabsTTSClient.validatedOutputFormat(requestedOutputFormat ?? "pcm_44100")
+                if outputFormat == nil, let requestedOutputFormat {
                     self.logger.warning(
-                        "talk output_format unsupported for local playback: \(desiredOutputFormat, privacy: .public)")
+                        "talk output_format unsupported for local playback: \(requestedOutputFormat, privacy: .public)")
                 }
 
                 let modelId = directive?.modelId ?? self.currentModelId ?? self.defaultModelId
diff --git a/apps/ios/Tests/BridgeConnectionControllerTests.swift b/apps/ios/Tests/BridgeConnectionControllerTests.swift
index 51e22ec5d..e4eb6ccf2 100644
--- a/apps/ios/Tests/BridgeConnectionControllerTests.swift
+++ b/apps/ios/Tests/BridgeConnectionControllerTests.swift
@@ -60,6 +60,35 @@ private func withUserDefaults<T>(_ updates: [String: Any?], _ body: () throws ->
     return try body()
 }
 
+@MainActor
+private func withUserDefaults<T>(
+    _ updates: [String: Any?],
+    _ body: () async throws -> T) async rethrows -> T
+{
+    let defaults = UserDefaults.standard
+    var snapshot: [String: Any?] = [:]
+    for key in updates.keys {
+        snapshot[key] = defaults.object(forKey: key)
+    }
+    for (key, value) in updates {
+        if let value {
+            defaults.set(value, forKey: key)
+        } else {
+            defaults.removeObject(forKey: key)
+        }
+    }
+    defer {
+        for (key, value) in snapshot {
+            if let value {
+                defaults.set(value, forKey: key)
+            } else {
+                defaults.removeObject(forKey: key)
+            }
+        }
+    }
+    return try await body()
+}
+
 private func withKeychainValues<T>(_ updates: [KeychainEntry: String?], _ body: () throws -> T) rethrows -> T {
     var snapshot: [KeychainEntry: String?] = [:]
     for entry in updates.keys {
@@ -84,6 +113,34 @@ private func withKeychainValues<T>(_ updates: [KeychainEntry: String?], _ body:
     return try body()
 }
 
+@MainActor
+private func withKeychainValues<T>(
+    _ updates: [KeychainEntry: String?],
+    _ body: () async throws -> T) async rethrows -> T
+{
+    var snapshot: [KeychainEntry: String?] = [:]
+    for entry in updates.keys {
+        snapshot[entry] = KeychainStore.loadString(service: entry.service, account: entry.account)
+    }
+    for (entry, value) in updates {
+        if let value {
+            _ = KeychainStore.saveString(value, service: entry.service, account: entry.account)
+        } else {
+            _ = KeychainStore.delete(service: entry.service, account: entry.account)
+        }
+    }
+    defer {
+        for (entry, value) in snapshot {
+            if let value {
+                _ = KeychainStore.saveString(value, service: entry.service, account: entry.account)
+            } else {
+                _ = KeychainStore.delete(service: entry.service, account: entry.account)
+            }
+        }
+    }
+    return try await body()
+}
+
 @Suite(.serialized) struct BridgeConnectionControllerTests {
     @Test @MainActor func resolvedDisplayNameSetsDefaultWhenMissing() {
         let defaults = UserDefaults.standard
@@ -192,13 +249,13 @@ private func withKeychainValues<T>(_ updates: [KeychainEntry: String?], _ body:
         let mock = MockBridgePairingClient(resultToken: "new-token")
         let account = "bridge-token.ios-test"
 
-        withKeychainValues([
+        await withKeychainValues([
             instanceIdEntry: nil,
             preferredBridgeEntry: nil,
             lastBridgeEntry: nil,
             KeychainEntry(service: bridgeService, account: account): "old-token",
         ]) {
-            withUserDefaults([
+            await withUserDefaults([
                 "node.instanceId": "ios-test",
                 "bridge.lastDiscoveredStableID": "bridge-1",
                 "bridge.manual.enabled": false,
@@ -224,4 +281,61 @@ private func withKeychainValues<T>(_ updates: [KeychainEntry: String?], _ body:
             }
         }
     }
+
+    @Test @MainActor func autoConnectPrefersPreferredBridgeOverLastDiscovered() async {
+        let bridgeA = BridgeDiscoveryModel.DiscoveredBridge(
+            name: "Gateway A",
+            endpoint: .hostPort(host: NWEndpoint.Host("127.0.0.1"), port: 18790),
+            stableID: "bridge-1",
+            debugID: "bridge-a",
+            lanHost: "MacA.local",
+            tailnetDns: nil,
+            gatewayPort: 18789,
+            bridgePort: 18790,
+            canvasPort: 18793,
+            cliPath: nil)
+        let bridgeB = BridgeDiscoveryModel.DiscoveredBridge(
+            name: "Gateway B",
+            endpoint: .hostPort(host: NWEndpoint.Host("127.0.0.1"), port: 28790),
+            stableID: "bridge-2",
+            debugID: "bridge-b",
+            lanHost: "MacB.local",
+            tailnetDns: nil,
+            gatewayPort: 28789,
+            bridgePort: 28790,
+            canvasPort: 28793,
+            cliPath: nil)
+
+        let mock = MockBridgePairingClient(resultToken: "token-ok")
+        let account = "bridge-token.ios-test"
+
+        await withKeychainValues([
+            instanceIdEntry: nil,
+            preferredBridgeEntry: nil,
+            lastBridgeEntry: nil,
+            KeychainEntry(service: bridgeService, account: account): "old-token",
+        ]) {
+            await withUserDefaults([
+                "node.instanceId": "ios-test",
+                "bridge.preferredStableID": "bridge-2",
+                "bridge.lastDiscoveredStableID": "bridge-1",
+                "bridge.manual.enabled": false,
+            ]) {
+                let appModel = NodeAppModel()
+                let controller = BridgeConnectionController(
+                    appModel: appModel,
+                    startDiscovery: false,
+                    bridgeClientFactory: { mock })
+                controller._test_setBridges([bridgeA, bridgeB])
+                controller._test_triggerAutoConnect()
+
+                for _ in 0..<20 {
+                    if appModel.connectedBridgeID == bridgeB.stableID { break }
+                    try? await Task.sleep(nanoseconds: 50_000_000)
+                }
+
+                #expect(appModel.connectedBridgeID == bridgeB.stableID)
+            }
+        }
+    }
 }
diff --git a/apps/macos/Sources/Clawdis/MenuSessionsInjector.swift b/apps/macos/Sources/Clawdis/MenuSessionsInjector.swift
index f9a0c141f..7d8e899a9 100644
--- a/apps/macos/Sources/Clawdis/MenuSessionsInjector.swift
+++ b/apps/macos/Sources/Clawdis/MenuSessionsInjector.swift
@@ -229,7 +229,7 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
                 item.view = HighlightedMenuItemHostView(
                     rootView: AnyView(NodeMenuRowView(entry: entry, width: width)),
                     width: width)
-                item.submenu = self.buildNodeSubmenu(entry: entry)
+                item.submenu = self.buildNodeSubmenu(entry: entry, width: width)
                 menu.insertItem(item, at: cursor)
                 cursor += 1
             }
@@ -444,13 +444,13 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
             item.view = HighlightedMenuItemHostView(
                 rootView: AnyView(NodeMenuRowView(entry: entry, width: width)),
                 width: width)
-            item.submenu = self.buildNodeSubmenu(entry: entry)
+            item.submenu = self.buildNodeSubmenu(entry: entry, width: width)
             menu.addItem(item)
         }
         return menu
     }
 
-    private func buildNodeSubmenu(entry: NodeInfo) -> NSMenu {
+    private func buildNodeSubmenu(entry: NodeInfo, width: CGFloat) -> NSMenu {
         let menu = NSMenu()
         menu.autoenablesItems = false
 
@@ -484,7 +484,10 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
 
         if let commands = entry.commands?.filter({ !$0.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty }),
            !commands.isEmpty {
-            menu.addItem(self.makeNodeCopyItem(label: "Commands", value: commands.joined(separator: ", ")))
+            menu.addItem(self.makeNodeMultilineItem(
+                label: "Commands",
+                value: commands.joined(separator: ", "),
+                width: width))
         }
 
         return menu
@@ -503,6 +506,17 @@ final class MenuSessionsInjector: NSObject, NSMenuDelegate {
         return item
     }
 
+    private func makeNodeMultilineItem(label: String, value: String, width: CGFloat) -> NSMenuItem {
+        let item = NSMenuItem()
+        item.target = self
+        item.action = #selector(self.copyNodeValue(_:))
+        item.representedObject = value
+        item.view = HighlightedMenuItemHostView(
+            rootView: AnyView(NodeMenuMultilineView(label: label, value: value, width: width)),
+            width: width)
+        return item
+    }
+
     private func formatVersionLabel(_ version: String) -> String {
         let trimmed = version.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !trimmed.isEmpty else { return version }
diff --git a/apps/macos/Sources/Clawdis/NodesMenu.swift b/apps/macos/Sources/Clawdis/NodesMenu.swift
index 45e1b0c44..a19da2a65 100644
--- a/apps/macos/Sources/Clawdis/NodesMenu.swift
+++ b/apps/macos/Sources/Clawdis/NodesMenu.swift
@@ -39,12 +39,12 @@ struct NodeMenuEntryFormatter {
         return role
     }
 
-    static func detailRight(_ entry: NodeInfo) -> String? {
+    static func headlineRight(_ entry: NodeInfo) -> String? {
         var parts: [String] = []
         if let platform = self.platformText(entry) { parts.append(platform) }
         if let version = entry.version?.nonEmpty {
-            let short = self.compactVersion(version)
-            parts.append("v\(short)")
+            let short = self.shortVersionLabel(version)
+            parts.append(short)
         }
         if parts.isEmpty { return nil }
         return parts.joined(separator: " · ")
@@ -103,6 +103,16 @@ struct NodeMenuEntryFormatter {
         return trimmed
     }
 
+    private static func shortVersionLabel(_ raw: String) -> String {
+        let compact = self.compactVersion(raw)
+        if compact.isEmpty { return compact }
+        if compact.lowercased().hasPrefix("v") { return compact }
+        if let first = compact.unicodeScalars.first, CharacterSet.decimalDigits.contains(first) {
+            return "v\(compact)"
+        }
+        return compact
+    }
+
     static func leadingSymbol(_ entry: NodeInfo) -> String {
         if let family = entry.deviceFamily?.lowercased() {
             if family.contains("mac") {
@@ -151,28 +161,24 @@ struct NodeMenuRowView: View {
                 .frame(width: 22, height: 22, alignment: .center)
 
             VStack(alignment: .leading, spacing: 2) {
-                Text(NodeMenuEntryFormatter.primaryName(self.entry))
-                    .font(.callout.weight(NodeMenuEntryFormatter.isConnected(self.entry) ? .semibold : .regular))
-                    .foregroundStyle(self.primaryColor)
-                    .lineLimit(1)
-                    .truncationMode(.middle)
-
                 HStack(alignment: .firstTextBaseline, spacing: 8) {
-                    Text(NodeMenuEntryFormatter.detailLeft(self.entry))
-                        .font(.caption)
-                        .foregroundStyle(self.secondaryColor)
+                    Text(NodeMenuEntryFormatter.primaryName(self.entry))
+                        .font(.callout.weight(NodeMenuEntryFormatter.isConnected(self.entry) ? .semibold : .regular))
+                        .foregroundStyle(self.primaryColor)
                         .lineLimit(1)
                         .truncationMode(.middle)
+                        .layoutPriority(1)
 
-                    Spacer(minLength: 0)
+                    Spacer(minLength: 8)
 
                     HStack(alignment: .firstTextBaseline, spacing: 6) {
-                        if let right = NodeMenuEntryFormatter.detailRight(self.entry) {
+                        if let right = NodeMenuEntryFormatter.headlineRight(self.entry) {
                             Text(right)
                                 .font(.caption.monospacedDigit())
                                 .foregroundStyle(self.secondaryColor)
                                 .lineLimit(1)
                                 .truncationMode(.middle)
+                                .layoutPriority(2)
                         }
 
                         Image(systemName: "chevron.right")
@@ -181,6 +187,13 @@ struct NodeMenuRowView: View {
                             .padding(.leading, 2)
                     }
                 }
+
+                Text(NodeMenuEntryFormatter.detailLeft(self.entry))
+                    .font(.caption)
+                    .foregroundStyle(self.secondaryColor)
+                    .lineLimit(1)
+                    .truncationMode(.middle)
+                    .frame(maxWidth: .infinity, alignment: .leading)
             }
             .frame(maxWidth: .infinity, alignment: .leading)
 
@@ -220,3 +233,36 @@ struct AndroidMark: View {
         }
     }
 }
+
+struct NodeMenuMultilineView: View {
+    let label: String
+    let value: String
+    let width: CGFloat
+    @Environment(\.menuItemHighlighted) private var isHighlighted
+
+    private var primaryColor: Color {
+        self.isHighlighted ? Color(nsColor: .selectedMenuItemTextColor) : .primary
+    }
+
+    private var secondaryColor: Color {
+        self.isHighlighted ? Color(nsColor: .selectedMenuItemTextColor).opacity(0.85) : .secondary
+    }
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 4) {
+            Text("\(self.label):")
+                .font(.caption.weight(.semibold))
+                .foregroundStyle(self.secondaryColor)
+
+            Text(self.value)
+                .font(.caption)
+                .foregroundStyle(self.primaryColor)
+                .multilineTextAlignment(.leading)
+                .fixedSize(horizontal: false, vertical: true)
+        }
+        .padding(.vertical, 6)
+        .padding(.leading, 18)
+        .padding(.trailing, 12)
+        .frame(width: max(1, self.width), alignment: .leading)
+    }
+}

From fa85dd6527296765141d21d8d631691ca434264c Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 12:57:10 +0100
Subject: [PATCH 064/100] docs: note macOS menu layout

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5d05b5ee..de62c7073 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@
 - iOS/Android nodes: enable scrolling for loaded web pages in the Canvas WebView (default scaffold stays touch-first).
 - macOS menu: device list now uses `node.list` (devices only; no agent/tool presence entries).
 - macOS menu: device list now shows connected nodes only.
+- macOS menu: device rows now pack platform/version on the first line, and command lists wrap in submenus.
 - iOS node: fix ReplayKit screen recording crash caused by queue isolation assertions during capture.
 - iOS Talk Mode: avoid audio tap queue assertions when starting recognition.
 - iOS/Android nodes: bridge auto-connect refreshes stale tokens and settings now show richer bridge/device details.

From bc0a6fffd158adf34a23542dd9da3dd892b18fe2 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 13:31:11 +0100
Subject: [PATCH 065/100] fix: tighten macOS menu device rows

---
 CHANGELOG.md                               |  1 +
 apps/macos/Sources/Clawdis/NodesMenu.swift | 38 ++++++++++++++--------
 apps/shared/ClawdisKit/Package.swift       |  2 +-
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de62c7073..db00c82ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@
 - macOS menu: device list now uses `node.list` (devices only; no agent/tool presence entries).
 - macOS menu: device list now shows connected nodes only.
 - macOS menu: device rows now pack platform/version on the first line, and command lists wrap in submenus.
+- macOS menu: split device platform/version across first and second rows for better fit.
 - iOS node: fix ReplayKit screen recording crash caused by queue isolation assertions during capture.
 - iOS Talk Mode: avoid audio tap queue assertions when starting recognition.
 - iOS/Android nodes: bridge auto-connect refreshes stale tokens and settings now show richer bridge/device details.
diff --git a/apps/macos/Sources/Clawdis/NodesMenu.swift b/apps/macos/Sources/Clawdis/NodesMenu.swift
index a19da2a65..882b7ec3e 100644
--- a/apps/macos/Sources/Clawdis/NodesMenu.swift
+++ b/apps/macos/Sources/Clawdis/NodesMenu.swift
@@ -40,14 +40,12 @@ struct NodeMenuEntryFormatter {
     }
 
     static func headlineRight(_ entry: NodeInfo) -> String? {
-        var parts: [String] = []
-        if let platform = self.platformText(entry) { parts.append(platform) }
-        if let version = entry.version?.nonEmpty {
-            let short = self.shortVersionLabel(version)
-            parts.append(short)
-        }
-        if parts.isEmpty { return nil }
-        return parts.joined(separator: " · ")
+        self.platformText(entry)
+    }
+
+    static func detailRightVersion(_ entry: NodeInfo) -> String? {
+        guard let version = entry.version?.nonEmpty else { return nil }
+        return self.shortVersionLabel(version)
     }
 
     static func platformText(_ entry: NodeInfo) -> String? {
@@ -188,12 +186,24 @@ struct NodeMenuRowView: View {
                     }
                 }
 
-                Text(NodeMenuEntryFormatter.detailLeft(self.entry))
-                    .font(.caption)
-                    .foregroundStyle(self.secondaryColor)
-                    .lineLimit(1)
-                    .truncationMode(.middle)
-                    .frame(maxWidth: .infinity, alignment: .leading)
+                HStack(alignment: .firstTextBaseline, spacing: 8) {
+                    Text(NodeMenuEntryFormatter.detailLeft(self.entry))
+                        .font(.caption)
+                        .foregroundStyle(self.secondaryColor)
+                        .lineLimit(1)
+                        .truncationMode(.middle)
+
+                    Spacer(minLength: 0)
+
+                    if let version = NodeMenuEntryFormatter.detailRightVersion(self.entry) {
+                        Text(version)
+                            .font(.caption.monospacedDigit())
+                            .foregroundStyle(self.secondaryColor)
+                            .lineLimit(1)
+                            .truncationMode(.middle)
+                    }
+                }
+                .frame(maxWidth: .infinity, alignment: .leading)
             }
             .frame(maxWidth: .infinity, alignment: .leading)
 
diff --git a/apps/shared/ClawdisKit/Package.swift b/apps/shared/ClawdisKit/Package.swift
index c3054011a..d7642c233 100644
--- a/apps/shared/ClawdisKit/Package.swift
+++ b/apps/shared/ClawdisKit/Package.swift
@@ -13,7 +13,7 @@ let package = Package(
         .library(name: "ClawdisChatUI", targets: ["ClawdisChatUI"]),
     ],
     dependencies: [
-        .package(path: "../../../ElevenLabsKit"),
+        .package(path: "../../../../ElevenLabsKit"),
     ],
     targets: [
         .target(

From 9fb74399c8415e39f6ea1f344b7259594f85c2f4 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 13:46:14 +0100
Subject: [PATCH 066/100] refactor: inject audio players

---
 apps/ios/Sources/Voice/TalkModeManager.swift     | 14 ++++++++------
 apps/macos/Sources/Clawdis/TalkModeRuntime.swift | 14 ++++++++------
 .../ClawdisKit/AudioStreamingProtocols.swift     | 16 ++++++++++++++++
 3 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 apps/shared/ClawdisKit/Sources/ClawdisKit/AudioStreamingProtocols.swift

diff --git a/apps/ios/Sources/Voice/TalkModeManager.swift b/apps/ios/Sources/Voice/TalkModeManager.swift
index a06154037..fefefe68f 100644
--- a/apps/ios/Sources/Voice/TalkModeManager.swift
+++ b/apps/ios/Sources/Voice/TalkModeManager.swift
@@ -39,6 +39,8 @@ final class TalkModeManager: NSObject {
     private var mainSessionKey: String = "main"
     private var fallbackVoiceId: String?
     private var lastPlaybackWasPCM: Bool = false
+    var pcmPlayer: PCMStreamingAudioPlaying = PCMStreamingAudioPlayer.shared
+    var mp3Player: StreamingAudioPlaying = StreamingAudioPlayer.shared
 
     private var bridge: BridgeSession?
     private let silenceWindow: TimeInterval = 0.7
@@ -502,10 +504,10 @@ final class TalkModeManager: NSObject {
                 let result: StreamingPlaybackResult
                 if let sampleRate {
                     self.lastPlaybackWasPCM = true
-                    result = await PCMStreamingAudioPlayer.shared.play(stream: stream, sampleRate: sampleRate)
+                    result = await self.pcmPlayer.play(stream: stream, sampleRate: sampleRate)
                 } else {
                     self.lastPlaybackWasPCM = false
-                    result = await StreamingAudioPlayer.shared.play(stream: stream)
+                    result = await self.mp3Player.play(stream: stream)
                 }
                 self.logger
                     .info(
@@ -554,14 +556,14 @@ final class TalkModeManager: NSObject {
     private func stopSpeaking(storeInterruption: Bool = true) {
         guard self.isSpeaking else { return }
         let interruptedAt = self.lastPlaybackWasPCM
-            ? PCMStreamingAudioPlayer.shared.stop()
-            : StreamingAudioPlayer.shared.stop()
+            ? self.pcmPlayer.stop()
+            : self.mp3Player.stop()
         if storeInterruption {
             self.lastInterruptedAtSeconds = interruptedAt
         }
         _ = self.lastPlaybackWasPCM
-            ? StreamingAudioPlayer.shared.stop()
-            : PCMStreamingAudioPlayer.shared.stop()
+            ? self.mp3Player.stop()
+            : self.pcmPlayer.stop()
         TalkSystemSpeechSynthesizer.shared.stop()
         self.isSpeaking = false
     }
diff --git a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
index 73f76b1cf..124dbc76a 100644
--- a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
+++ b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
@@ -64,6 +64,8 @@ actor TalkModeRuntime {
     private var apiKey: String?
     private var fallbackVoiceId: String?
     private var lastPlaybackWasPCM: Bool = false
+    var pcmPlayer: PCMStreamingAudioPlaying = PCMStreamingAudioPlayer.shared
+    var mp3Player: StreamingAudioPlaying = StreamingAudioPlayer.shared
 
     private let silenceWindow: TimeInterval = 0.7
     private let minSpeechRMS: Double = 1e-3
@@ -538,10 +540,10 @@ actor TalkModeRuntime {
                 let result: StreamingPlaybackResult
                 if let sampleRate {
                     self.lastPlaybackWasPCM = true
-                    result = await PCMStreamingAudioPlayer.shared.play(stream: stream, sampleRate: sampleRate)
+                    result = await self.pcmPlayer.play(stream: stream, sampleRate: sampleRate)
                 } else {
                     self.lastPlaybackWasPCM = false
-                    result = await StreamingAudioPlayer.shared.play(stream: stream)
+                    result = await self.mp3Player.play(stream: stream)
                 }
                 self.ttsLogger
                     .info(
@@ -642,11 +644,11 @@ actor TalkModeRuntime {
         let usePCM = self.lastPlaybackWasPCM
         let interruptedAt = await MainActor.run {
             let primary = usePCM
-                ? PCMStreamingAudioPlayer.shared.stop()
-                : StreamingAudioPlayer.shared.stop()
+                ? self.pcmPlayer.stop()
+                : self.mp3Player.stop()
             _ = usePCM
-                ? StreamingAudioPlayer.shared.stop()
-                : PCMStreamingAudioPlayer.shared.stop()
+                ? self.mp3Player.stop()
+                : self.pcmPlayer.stop()
             return primary
         }
         await TalkSystemSpeechSynthesizer.shared.stop()
diff --git a/apps/shared/ClawdisKit/Sources/ClawdisKit/AudioStreamingProtocols.swift b/apps/shared/ClawdisKit/Sources/ClawdisKit/AudioStreamingProtocols.swift
new file mode 100644
index 000000000..a211a4b3a
--- /dev/null
+++ b/apps/shared/ClawdisKit/Sources/ClawdisKit/AudioStreamingProtocols.swift
@@ -0,0 +1,16 @@
+import Foundation
+
+@MainActor
+public protocol StreamingAudioPlaying {
+    func play(stream: AsyncThrowingStream<Data, Error>) async -> StreamingPlaybackResult
+    func stop() -> Double?
+}
+
+@MainActor
+public protocol PCMStreamingAudioPlaying {
+    func play(stream: AsyncThrowingStream<Data, Error>, sampleRate: Double) async -> StreamingPlaybackResult
+    func stop() -> Double?
+}
+
+extension StreamingAudioPlayer: StreamingAudioPlaying {}
+extension PCMStreamingAudioPlayer: PCMStreamingAudioPlaying {}

From 7d1ec51df56b6dd660793fc207b1606ac9871708 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 13:52:12 +0100
Subject: [PATCH 067/100] fix: modernize chat scroll position

---
 .../Sources/ClawdisChatUI/ChatView.swift      | 128 ++++++++++--------
 1 file changed, 70 insertions(+), 58 deletions(-)

diff --git a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatView.swift b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatView.swift
index 621b9fbc5..82f348817 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatView.swift
+++ b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatView.swift
@@ -9,6 +9,7 @@ public struct ClawdisChatView: View {
 
     @State private var viewModel: ClawdisChatViewModel
     @State private var scrollerBottomID = UUID()
+    @State private var scrollPosition: UUID?
     @State private var showSessions = false
     @State private var hasPerformedInitialScroll = false
     private let showsSessionSwitcher: Bool
@@ -59,6 +60,7 @@ public struct ClawdisChatView: View {
             .padding(.horizontal, Layout.outerPaddingHorizontal)
             .padding(.vertical, Layout.outerPaddingVertical)
             .frame(maxWidth: .infinity)
+            .frame(maxHeight: .infinity, alignment: .top)
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
         .onAppear { self.viewModel.load() }
@@ -72,68 +74,78 @@ public struct ClawdisChatView: View {
     }
 
     private var messageList: some View {
-        ScrollViewReader { proxy in
-            ZStack {
-                ScrollView {
-                    LazyVStack(spacing: Layout.messageSpacing) {
-                        ForEach(self.visibleMessages) { msg in
-                            ChatMessageBubble(message: msg, style: self.style, userAccent: self.userAccent)
-                                .frame(
-                                    maxWidth: .infinity,
-                                    alignment: msg.role.lowercased() == "user" ? .trailing : .leading)
-                        }
-
-                        if self.viewModel.pendingRunCount > 0 {
-                            HStack {
-                                ChatTypingIndicatorBubble(style: self.style)
-                                    .equatable()
-                                Spacer(minLength: 0)
-                            }
-                        }
-
-                        if !self.viewModel.pendingToolCalls.isEmpty {
-                            ChatPendingToolsBubble(toolCalls: self.viewModel.pendingToolCalls)
-                                .equatable()
-                                .frame(maxWidth: .infinity, alignment: .leading)
-                        }
-
-                        if let text = self.viewModel.streamingAssistantText, !text.isEmpty {
-                            ChatStreamingAssistantBubble(text: text)
-                                .frame(maxWidth: .infinity, alignment: .leading)
-                        }
-
-                        Color.clear
-                            .frame(height: Layout.messageListPaddingBottom + 1)
-                            .id(self.scrollerBottomID)
-                    }
-                    .padding(.top, Layout.messageListPaddingTop)
-                    .padding(.horizontal, Layout.messageListPaddingHorizontal)
-                }
-
-                if self.viewModel.isLoading {
-                    ProgressView()
-                        .controlSize(.large)
-                        .frame(maxWidth: .infinity, maxHeight: .infinity)
+        ZStack {
+            ScrollView {
+                LazyVStack(spacing: Layout.messageSpacing) {
+                    messageListRows
                 }
+                // Use scroll targets for stable auto-scroll without ScrollViewReader relayout glitches.
+                .scrollTargetLayout()
+                .padding(.top, Layout.messageListPaddingTop)
+                .padding(.horizontal, Layout.messageListPaddingHorizontal)
             }
-            .onChange(of: self.viewModel.isLoading) { _, isLoading in
-                guard !isLoading, !self.hasPerformedInitialScroll else { return }
-                proxy.scrollTo(self.scrollerBottomID, anchor: .bottom)
-                self.hasPerformedInitialScroll = true
-            }
-            .onChange(of: self.viewModel.messages.count) { _, _ in
-                guard self.hasPerformedInitialScroll else { return }
-                withAnimation(.snappy(duration: 0.22)) {
-                    proxy.scrollTo(self.scrollerBottomID, anchor: .bottom)
-                }
-            }
-            .onChange(of: self.viewModel.pendingRunCount) { _, _ in
-                guard self.hasPerformedInitialScroll else { return }
-                withAnimation(.snappy(duration: 0.22)) {
-                    proxy.scrollTo(self.scrollerBottomID, anchor: .bottom)
-                }
+            // Keep the scroll pinned to the bottom for new messages.
+            .scrollPosition(id: self.$scrollPosition, anchor: .bottom)
+
+            if self.viewModel.isLoading {
+                ProgressView()
+                    .controlSize(.large)
+                    .frame(maxWidth: .infinity, maxHeight: .infinity)
             }
         }
+        // Ensure the message list claims vertical space on the first layout pass.
+        .frame(maxHeight: .infinity, alignment: .top)
+        .layoutPriority(1)
+        .onChange(of: self.viewModel.isLoading) { _, isLoading in
+            guard !isLoading, !self.hasPerformedInitialScroll else { return }
+            self.scrollPosition = self.scrollerBottomID
+            self.hasPerformedInitialScroll = true
+        }
+        .onChange(of: self.viewModel.messages.count) { _, _ in
+            guard self.hasPerformedInitialScroll else { return }
+            withAnimation(.snappy(duration: 0.22)) {
+                self.scrollPosition = self.scrollerBottomID
+            }
+        }
+        .onChange(of: self.viewModel.pendingRunCount) { _, _ in
+            guard self.hasPerformedInitialScroll else { return }
+            withAnimation(.snappy(duration: 0.22)) {
+                self.scrollPosition = self.scrollerBottomID
+            }
+        }
+    }
+
+    @ViewBuilder
+    private var messageListRows: some View {
+        ForEach(self.visibleMessages) { msg in
+            ChatMessageBubble(message: msg, style: self.style, userAccent: self.userAccent)
+                .frame(
+                    maxWidth: .infinity,
+                    alignment: msg.role.lowercased() == "user" ? .trailing : .leading)
+        }
+
+        if self.viewModel.pendingRunCount > 0 {
+            HStack {
+                ChatTypingIndicatorBubble(style: self.style)
+                    .equatable()
+                Spacer(minLength: 0)
+            }
+        }
+
+        if !self.viewModel.pendingToolCalls.isEmpty {
+            ChatPendingToolsBubble(toolCalls: self.viewModel.pendingToolCalls)
+                .equatable()
+                .frame(maxWidth: .infinity, alignment: .leading)
+        }
+
+        if let text = self.viewModel.streamingAssistantText, !text.isEmpty {
+            ChatStreamingAssistantBubble(text: text)
+                .frame(maxWidth: .infinity, alignment: .leading)
+        }
+
+        Color.clear
+            .frame(height: Layout.messageListPaddingBottom + 1)
+            .id(self.scrollerBottomID)
     }
 
     private var visibleMessages: [ClawdisChatMessage] {

From 973bd3a42798d6dc1772d0898693c84eb559bf94 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 14:18:51 +0100
Subject: [PATCH 068/100] fix: improve talk overlay input + drag

---
 apps/macos/Sources/Clawdis/TalkOverlay.swift  |  25 +++-
 .../Sources/Clawdis/TalkOverlayView.swift     | 117 +++++++++++-------
 2 files changed, 94 insertions(+), 48 deletions(-)

diff --git a/apps/macos/Sources/Clawdis/TalkOverlay.swift b/apps/macos/Sources/Clawdis/TalkOverlay.swift
index 73fc144ac..d99f45dbe 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlay.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlay.swift
@@ -8,7 +8,9 @@ import SwiftUI
 final class TalkOverlayController {
     static let shared = TalkOverlayController()
     static let overlaySize: CGFloat = 440
-    static let windowInset: CGFloat = 88
+    static let orbSize: CGFloat = 96
+    static let orbPadding: CGFloat = 12
+    static let orbHitSlop: CGFloat = 10
 
     private let logger = Logger(subsystem: "com.steipete.clawdis", category: "talk.overlay")
 
@@ -22,7 +24,7 @@ final class TalkOverlayController {
     var model = Model()
     private var window: NSPanel?
     private var hostingView: NSHostingView<TalkOverlayView>?
-    private let padding: CGFloat = 8
+    private let screenInset: CGFloat = 0
 
     func present() {
         self.ensureWindow()
@@ -115,7 +117,7 @@ final class TalkOverlayController {
         panel.titleVisibility = .hidden
         panel.titlebarAppearsTransparent = true
 
-        let host = NSHostingView(rootView: TalkOverlayView(controller: self))
+        let host = TalkOverlayHostingView(rootView: TalkOverlayView(controller: self))
         host.translatesAutoresizingMaskIntoConstraints = false
         panel.contentView = host
         self.hostingView = host
@@ -127,8 +129,21 @@ final class TalkOverlayController {
         let size = NSSize(width: Self.overlaySize, height: Self.overlaySize)
         let visible = screen.visibleFrame
         let origin = CGPoint(
-            x: visible.maxX - size.width - self.padding + Self.windowInset,
-            y: visible.maxY - size.height - self.padding + Self.windowInset)
+            x: visible.maxX - size.width - self.screenInset,
+            y: visible.maxY - size.height - self.screenInset)
         return NSRect(origin: origin, size: size)
     }
 }
+
+private final class TalkOverlayHostingView: NSHostingView<TalkOverlayView> {
+    override func hitTest(_ point: NSPoint) -> NSView? {
+        let center = CGPoint(
+            x: self.bounds.maxX - TalkOverlayController.orbPadding - (TalkOverlayController.orbSize / 2),
+            y: self.bounds.maxY - TalkOverlayController.orbPadding - (TalkOverlayController.orbSize / 2))
+        let radius = (TalkOverlayController.orbSize / 2) + TalkOverlayController.orbHitSlop
+        let dx = point.x - center.x
+        let dy = point.y - center.y
+        guard dx * dx + dy * dy <= radius * radius else { return nil }
+        return super.hitTest(point)
+    }
+}
diff --git a/apps/macos/Sources/Clawdis/TalkOverlayView.swift b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
index 9600a4ebf..6d886a608 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlayView.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
@@ -1,12 +1,10 @@
+import AppKit
 import SwiftUI
 
 struct TalkOverlayView: View {
     var controller: TalkOverlayController
     @State private var appState = AppStateStore.shared
     @State private var hoveringWindow = false
-    @State private var dragStartOrigin: CGPoint?
-    @State private var didDrag: Bool = false
-    private static let orbCornerNudge: CGFloat = 12
 
     var body: some View {
         ZStack(alignment: .topTrailing) {
@@ -16,46 +14,16 @@ struct TalkOverlayView: View {
                 level: self.controller.model.level,
                 accent: self.seamColor,
                 isPaused: isPaused)
-                .frame(width: 96, height: 96)
-                .padding(.top, 6 + TalkOverlayController.windowInset - Self.orbCornerNudge)
-                .padding(.trailing, 6 + TalkOverlayController.windowInset - Self.orbCornerNudge)
+                .frame(width: TalkOverlayController.orbSize, height: TalkOverlayController.orbSize)
+                .padding(.top, TalkOverlayController.orbPadding)
+                .padding(.trailing, TalkOverlayController.orbPadding)
                 .contentShape(Circle())
                 .opacity(isPaused ? 0.55 : 1)
-                .highPriorityGesture(
-                    TapGesture(count: 2).onEnded {
-                        TalkModeController.shared.stopSpeaking(reason: .userTap)
-                    })
-                .highPriorityGesture(
-                    TapGesture().onEnded {
-                        if self.didDrag { return }
-                        TalkModeController.shared.togglePaused()
-                    })
-                .simultaneousGesture(
-                    DragGesture(minimumDistance: 1, coordinateSpace: .global)
-                        .onChanged { value in
-                            if self.dragStartOrigin == nil {
-                                self.dragStartOrigin = self.controller.currentWindowOrigin()
-                                self.didDrag = false
-                                TalkModeController.shared.setPaused(true)
-                            }
-
-                            if abs(value.translation.width) + abs(value.translation.height) > 2 {
-                                self.didDrag = true
-                            }
-
-                            guard let start = self.dragStartOrigin else { return }
-                            let origin = CGPoint(
-                                x: start.x + value.translation.width,
-                                y: start.y - value.translation.height)
-                            self.controller.setWindowOrigin(origin)
-                        }
-                        .onEnded { _ in
-                            self.dragStartOrigin = nil
-                            Task { @MainActor in
-                                try? await Task.sleep(nanoseconds: 80_000_000)
-                                self.didDrag = false
-                            }
-                        })
+                .background(
+                    TalkOrbInteractionView(
+                        onSingleClick: { TalkModeController.shared.togglePaused() },
+                        onDoubleClick: { TalkModeController.shared.stopSpeaking(reason: .userTap) },
+                        onDragStart: { TalkModeController.shared.setPaused(true) }))
                 .overlay(alignment: .topLeading) {
                     Button {
                         TalkModeController.shared.exitTalkMode()
@@ -74,10 +42,9 @@ struct TalkOverlayView: View {
                 .animation(.easeOut(duration: 0.12), value: self.hoveringWindow)
                 .allowsHitTesting(self.hoveringWindow)
             }
+            .onHover { self.hoveringWindow = $0 }
         }
         .frame(width: TalkOverlayController.overlaySize, height: TalkOverlayController.overlaySize, alignment: .center)
-        .contentShape(Rectangle())
-        .onHover { self.hoveringWindow = $0 }
     }
 
     private static let defaultSeamColor = Color(red: 79 / 255.0, green: 122 / 255.0, blue: 154 / 255.0)
@@ -98,6 +65,70 @@ struct TalkOverlayView: View {
     }
 }
 
+private struct TalkOrbInteractionView: NSViewRepresentable {
+    let onSingleClick: () -> Void
+    let onDoubleClick: () -> Void
+    let onDragStart: () -> Void
+
+    func makeNSView(context: Context) -> NSView {
+        let view = OrbInteractionNSView()
+        view.onSingleClick = self.onSingleClick
+        view.onDoubleClick = self.onDoubleClick
+        view.onDragStart = self.onDragStart
+        view.wantsLayer = true
+        view.layer?.backgroundColor = NSColor.clear.cgColor
+        return view
+    }
+
+    func updateNSView(_ nsView: NSView, context: Context) {
+        guard let view = nsView as? OrbInteractionNSView else { return }
+        view.onSingleClick = self.onSingleClick
+        view.onDoubleClick = self.onDoubleClick
+        view.onDragStart = self.onDragStart
+    }
+}
+
+private final class OrbInteractionNSView: NSView {
+    var onSingleClick: (() -> Void)?
+    var onDoubleClick: (() -> Void)?
+    var onDragStart: (() -> Void)?
+    private var mouseDownEvent: NSEvent?
+    private var didDrag = false
+    private var suppressSingleClick = false
+
+    override var acceptsFirstResponder: Bool { true }
+
+    override func mouseDown(with event: NSEvent) {
+        self.mouseDownEvent = event
+        self.didDrag = false
+        self.suppressSingleClick = event.clickCount > 1
+        if event.clickCount == 2 {
+            self.onDoubleClick?()
+        }
+    }
+
+    override func mouseDragged(with event: NSEvent) {
+        guard let startEvent = self.mouseDownEvent else { return }
+        if !self.didDrag {
+            let dx = event.locationInWindow.x - startEvent.locationInWindow.x
+            let dy = event.locationInWindow.y - startEvent.locationInWindow.y
+            if abs(dx) + abs(dy) < 2 { return }
+            self.didDrag = true
+            self.onDragStart?()
+            self.window?.performDrag(with: startEvent)
+        }
+    }
+
+    override func mouseUp(with event: NSEvent) {
+        if !self.didDrag && !self.suppressSingleClick {
+            self.onSingleClick?()
+        }
+        self.mouseDownEvent = nil
+        self.didDrag = false
+        self.suppressSingleClick = false
+    }
+}
+
 private struct TalkOrbView: View {
     let phase: TalkModePhase
     let level: Double

From 3d6cc435ef5b1899598fd45a99f96569b8d17a17 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 14:22:03 +0100
Subject: [PATCH 069/100] fix: hop audio to main actor

---
 .../Sources/Clawdis/TalkModeRuntime.swift     | 42 +++++++++++++------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
index 124dbc76a..d177aa586 100644
--- a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
+++ b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
@@ -64,8 +64,6 @@ actor TalkModeRuntime {
     private var apiKey: String?
     private var fallbackVoiceId: String?
     private var lastPlaybackWasPCM: Bool = false
-    var pcmPlayer: PCMStreamingAudioPlaying = PCMStreamingAudioPlayer.shared
-    var mp3Player: StreamingAudioPlaying = StreamingAudioPlayer.shared
 
     private let silenceWindow: TimeInterval = 0.7
     private let minSpeechRMS: Double = 1e-3
@@ -540,10 +538,10 @@ actor TalkModeRuntime {
                 let result: StreamingPlaybackResult
                 if let sampleRate {
                     self.lastPlaybackWasPCM = true
-                    result = await self.pcmPlayer.play(stream: stream, sampleRate: sampleRate)
+                    result = await self.playPCM(stream: stream, sampleRate: sampleRate)
                 } else {
                     self.lastPlaybackWasPCM = false
-                    result = await self.mp3Player.play(stream: stream)
+                    result = await self.playMP3(stream: stream)
                 }
                 self.ttsLogger
                     .info(
@@ -642,15 +640,8 @@ actor TalkModeRuntime {
 
     func stopSpeaking(reason: TalkStopReason) async {
         let usePCM = self.lastPlaybackWasPCM
-        let interruptedAt = await MainActor.run {
-            let primary = usePCM
-                ? self.pcmPlayer.stop()
-                : self.mp3Player.stop()
-            _ = usePCM
-                ? self.mp3Player.stop()
-                : self.pcmPlayer.stop()
-            return primary
-        }
+        let interruptedAt = usePCM ? await self.stopPCM() : await self.stopMP3()
+        _ = usePCM ? await self.stopMP3() : await self.stopPCM()
         await TalkSystemSpeechSynthesizer.shared.stop()
         guard self.phase == .speaking else { return }
         if reason == .speech, let interruptedAt {
@@ -667,6 +658,31 @@ actor TalkModeRuntime {
         await MainActor.run { TalkModeController.shared.updatePhase(.thinking) }
     }
 
+    // MARK: - Audio playback (MainActor helpers)
+
+    @MainActor
+    private func playPCM(
+        stream: AsyncThrowingStream<Data, Error>,
+        sampleRate: Double) async -> StreamingPlaybackResult
+    {
+        await PCMStreamingAudioPlayer.shared.play(stream: stream, sampleRate: sampleRate)
+    }
+
+    @MainActor
+    private func playMP3(stream: AsyncThrowingStream<Data, Error>) async -> StreamingPlaybackResult {
+        await StreamingAudioPlayer.shared.play(stream: stream)
+    }
+
+    @MainActor
+    private func stopPCM() -> Double? {
+        PCMStreamingAudioPlayer.shared.stop()
+    }
+
+    @MainActor
+    private func stopMP3() -> Double? {
+        StreamingAudioPlayer.shared.stop()
+    }
+
     // MARK: - Config
 
     private func reloadConfig() async {

From 3aefe375c1e2e61bfb5a9bb1163baea35dfadff3 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 14:30:46 +0100
Subject: [PATCH 070/100] chore: update deps and add control ui routing tests

---
 CHANGELOG.md                         |   1 +
 package.json                         |  12 +-
 pnpm-lock.yaml                       | 689 +++++++++++++++++++++------
 ui/package.json                      |  12 +-
 ui/src/ui/app-render.ts              |  30 +-
 ui/src/ui/app.ts                     |  60 ++-
 ui/src/ui/navigation.browser.test.ts |  93 ++++
 ui/src/ui/navigation.ts              |  58 +++
 ui/vitest.config.ts                  |  15 +
 9 files changed, 812 insertions(+), 158 deletions(-)
 create mode 100644 ui/src/ui/navigation.browser.test.ts
 create mode 100644 ui/vitest.config.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db00c82ff..aeb93d838 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 - Talk Mode: treat history timestamps as seconds or milliseconds to avoid stale assistant picks (macOS/iOS/Android).
 - Chat UI: clear streaming/tool bubbles when external runs finish, preventing duplicate assistant bubbles.
 - Chat UI: user bubbles use `ui.seamColor` (fallback to a calmer default blue).
+- Control UI: sync sidebar navigation with the URL for deep-linking, and auto-scroll chat to the latest message.
 - Talk Mode: wait for chat history to surface the assistant reply before starting TTS (macOS/iOS/Android).
 - iOS Talk Mode: fix chat completion wait to time out even if no events arrive (prevents “Thinking…” hangs).
 - iOS Talk Mode: keep recognition running during playback to support interrupt-on-speech.
diff --git a/package.json b/package.json
index 293e7e4b2..30a30a37d 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "@mariozechner/pi-agent-core": "^0.30.2",
     "@mariozechner/pi-ai": "^0.30.2",
     "@mariozechner/pi-coding-agent": "^0.30.2",
-    "@sinclair/typebox": "^0.34.41",
+    "@sinclair/typebox": "^0.34.45",
     "@whiskeysockets/baileys": "7.0.0-rc.9",
     "ajv": "^8.17.1",
     "body-parser": "^2.2.1",
@@ -87,7 +87,7 @@
     "discord.js": "^14.25.1",
     "dotenv": "^17.2.3",
     "express": "^5.2.1",
-    "file-type": "^21.1.1",
+    "file-type": "^21.2.0",
     "grammy": "^1.38.4",
     "json5": "^2.2.3",
     "long": "5.3.2",
@@ -101,7 +101,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^2.3.10",
-    "@lit-labs/signals": "^0.1.3",
+    "@lit-labs/signals": "^0.2.0",
     "@lit/context": "^1.1.6",
     "@mariozechner/mini-lit": "0.2.1",
     "@types/body-parser": "^1.19.6",
@@ -113,14 +113,14 @@
     "@vitest/coverage-v8": "^4.0.16",
     "docx-preview": "^0.3.7",
     "jszip": "^3.10.1",
-    "lit": "^3.3.1",
+    "lit": "^3.3.2",
     "lucide": "^0.562.0",
     "markdown-it": "^14.1.0",
     "ollama": "^0.6.3",
-    "oxlint": "^1.35.0",
+    "oxlint": "^1.36.0",
     "oxlint-tsgolint": "^0.10.0",
     "quicktype-core": "^23.2.6",
-    "rolldown": "1.0.0-beta.55",
+    "rolldown": "1.0.0-beta.57",
     "signal-utils": "^0.21.1",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 86f28ae6a..d524e4c4a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -29,8 +29,8 @@ importers:
         specifier: ^0.30.2
         version: 0.30.2(ws@8.18.3)(zod@4.2.1)
       '@sinclair/typebox':
-        specifier: ^0.34.41
-        version: 0.34.41
+        specifier: ^0.34.45
+        version: 0.34.45
       '@whiskeysockets/baileys':
         specifier: 7.0.0-rc.9
         version: 7.0.0-rc.9(audio-decode@2.2.3)(sharp@0.34.5)
@@ -68,8 +68,8 @@ importers:
         specifier: ^5.2.1
         version: 5.2.1
       file-type:
-        specifier: ^21.1.1
-        version: 21.1.1
+        specifier: ^21.2.0
+        version: 21.2.0
       grammy:
         specifier: ^1.38.4
         version: 1.38.4
@@ -105,14 +105,14 @@ importers:
         specifier: ^2.3.10
         version: 2.3.10
       '@lit-labs/signals':
-        specifier: ^0.1.3
-        version: 0.1.3
+        specifier: ^0.2.0
+        version: 0.2.0
       '@lit/context':
         specifier: ^1.1.6
         version: 1.1.6
       '@mariozechner/mini-lit':
         specifier: 0.2.1
-        version: 0.2.1(lit@3.3.1)(tailwindcss@4.1.17)
+        version: 0.2.1(lit@3.3.2)(tailwindcss@4.1.17)
       '@types/body-parser':
         specifier: ^1.19.6
         version: 1.19.6
@@ -133,7 +133,7 @@ importers:
         version: 8.18.1
       '@vitest/coverage-v8':
         specifier: ^4.0.16
-        version: 4.0.16(vitest@4.0.16(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))
+        version: 4.0.16(@vitest/browser@4.0.16(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.16))(vitest@4.0.16)
       docx-preview:
         specifier: ^0.3.7
         version: 0.3.7
@@ -141,8 +141,8 @@ importers:
         specifier: ^3.10.1
         version: 3.10.1
       lit:
-        specifier: ^3.3.1
-        version: 3.3.1
+        specifier: ^3.3.2
+        version: 3.3.2
       lucide:
         specifier: ^0.562.0
         version: 0.562.0
@@ -153,8 +153,8 @@ importers:
         specifier: ^0.6.3
         version: 0.6.3
       oxlint:
-        specifier: ^1.35.0
-        version: 1.35.0(oxlint-tsgolint@0.10.0)
+        specifier: ^1.36.0
+        version: 1.36.0(oxlint-tsgolint@0.10.0)
       oxlint-tsgolint:
         specifier: ^0.10.0
         version: 0.10.0
@@ -162,8 +162,8 @@ importers:
         specifier: ^23.2.6
         version: 23.2.6
       rolldown:
-        specifier: 1.0.0-beta.55
-        version: 1.0.0-beta.55
+        specifier: 1.0.0-beta.57
+        version: 1.0.0-beta.57
       signal-utils:
         specifier: ^0.21.1
         version: 0.21.1(signal-polyfill@0.2.2)
@@ -175,7 +175,7 @@ importers:
         version: 5.9.3
       vitest:
         specifier: ^4.0.16
-        version: 4.0.16(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+        version: 4.0.16(@types/node@25.0.3)(@vitest/browser-playwright@4.0.16)(@vitest/browser-preview@4.0.16)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
       wireit:
         specifier: ^0.14.12
         version: 0.14.12
@@ -183,15 +183,24 @@ importers:
   ui:
     dependencies:
       lit:
-        specifier: ^3.3.1
-        version: 3.3.1
+        specifier: ^3.3.2
+        version: 3.3.2
     devDependencies:
+      '@vitest/browser-playwright':
+        specifier: 4.0.16
+        version: 4.0.16(playwright@1.57.0)(vite@8.0.0-beta.3(@types/node@25.0.3)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.16)
+      playwright:
+        specifier: ^1.57.0
+        version: 1.57.0
       typescript:
         specifier: ^5.9.3
         version: 5.9.3
       vite:
         specifier: 8.0.0-beta.3
         version: 8.0.0-beta.3(@types/node@25.0.3)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.2)
+      vitest:
+        specifier: 4.0.16
+        version: 4.0.16(@types/node@25.0.3)(@vitest/browser-playwright@4.0.16)(@vitest/browser-preview@4.0.16)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
 
 packages:
 
@@ -204,6 +213,10 @@ packages:
       zod:
         optional: true
 
+  '@babel/code-frame@7.27.1':
+    resolution: {integrity: sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-string-parser@7.27.1':
     resolution: {integrity: sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==}
     engines: {node: '>=6.9.0'}
@@ -285,18 +298,18 @@ packages:
   '@borewit/text-codec@0.1.1':
     resolution: {integrity: sha512-5L/uBxmjaCIX5h8Z+uu+kA9BQLkc/Wl06UGR5ajNRxu+/XjonB5i8JpgFMrPj3LXTCPA0pv8yxUvbUi+QthGGA==}
 
-  '@borewit/text-codec@0.2.0':
-    resolution: {integrity: sha512-X999CKBxGwX8wW+4gFibsbiNdwqmdQEXmUejIWaIqdrHBgS5ARIOOeyiQbHjP9G58xVEPcuvP6VwwH3A0OFTOA==}
+  '@borewit/text-codec@0.2.1':
+    resolution: {integrity: sha512-k7vvKPbf7J2fZ5klGRD9AeKfUvojuZIQ3BT5u7Jfv+puwXkUBUT5PVyMDfJZpy30CBDXGMgw7fguK/lpOMBvgw==}
 
-  '@cacheable/memory@2.0.6':
-    resolution: {integrity: sha512-7e8SScMocHxcAb8YhtkbMhGG+EKLRIficb1F5sjvhSYsWTZGxvg4KIDp8kgxnV2PUJ3ddPe6J9QESjKvBWRDkg==}
+  '@cacheable/memory@2.0.7':
+    resolution: {integrity: sha512-RbxnxAMf89Tp1dLhXMS7ceft/PGsDl1Ip7T20z5nZ+pwIAsQ1p2izPjVG69oCLv/jfQ7HDPHTWK0c9rcAWXN3A==}
 
   '@cacheable/node-cache@1.7.6':
     resolution: {integrity: sha512-6Omk2SgNnjtxB5f/E6bTIWIt5xhdpx39fGNRQgU9lojvRxU68v+qY+SXXLsp3ZGukqoPjsK21wZ6XABFr/Ge3A==}
     engines: {node: '>=18'}
 
-  '@cacheable/utils@2.3.2':
-    resolution: {integrity: sha512-8kGE2P+HjfY8FglaOiW+y8qxcaQAfAhVML+i66XJR3YX5FtyDqn6Txctr3K2FrbxLKixRRYYBWMbuGciOhYNDg==}
+  '@cacheable/utils@2.3.3':
+    resolution: {integrity: sha512-JsXDL70gQ+1Vc2W/KUFfkAJzgb4puKwwKehNLuB+HrNKWf91O736kGfxn4KujXCCSuh6mRRL4XEB0PkAFjWS0A==}
 
   '@discordjs/builders@1.13.1':
     resolution: {integrity: sha512-cOU0UDHc3lp/5nKByDxkmRiNZBpdp0kx55aarbiAfakfKJHlxv/yFW1zmIqCAmwH5CRlrH9iMFKJMpvW4DPB+w==}
@@ -693,17 +706,17 @@ packages:
   '@keyv/serialize@1.1.1':
     resolution: {integrity: sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==}
 
-  '@lit-labs/signals@0.1.3':
-    resolution: {integrity: sha512-P0yWgH5blwVyEwBg+WFspLzeu1i0ypJP1QB0l1Omr9qZLIPsUu0p4Fy2jshOg7oQyha5n163K3GJGeUhQQ682Q==}
+  '@lit-labs/signals@0.2.0':
+    resolution: {integrity: sha512-68plyIbciumbwKaiilhLNyhz4Vg6/+nJwDufG2xxWA9r/fUw58jxLHCAlKs+q1CE5Lmh3cZ3ShyYKnOCebEpVA==}
 
-  '@lit-labs/ssr-dom-shim@1.4.0':
-    resolution: {integrity: sha512-ficsEARKnmmW5njugNYKipTm4SFnbik7CXtoencDZzmzo/dQ+2Q0bgkzJuoJP20Aj0F+izzJjOqsnkd6F/o1bw==}
+  '@lit-labs/ssr-dom-shim@1.5.0':
+    resolution: {integrity: sha512-HLomZXMmrCFHSRKESF5vklAKsDY7/fsT/ZhqCu3V0UoW/Qbv8wxmO4W9bx4KnCCF2Zak4yuk+AGraK/bPmI4kA==}
 
   '@lit/context@1.1.6':
     resolution: {integrity: sha512-M26qDE6UkQbZA2mQ3RjJ3Gzd8TxP+/0obMgE5HfkfLhEEyYE3Bui4A5XHiGPjy0MUGAyxB3QgVuw2ciS0kHn6A==}
 
-  '@lit/reactive-element@2.1.1':
-    resolution: {integrity: sha512-N+dm5PAYdQ8e6UlywyyrgI2t++wFGXfHx+dSJ1oBrg6FAxUj40jId++EaRm80MKX5JnlH1sBsyZ5h0bcZKemCg==}
+  '@lit/reactive-element@2.1.2':
+    resolution: {integrity: sha512-pbCDiVMnne1lYUIaYNN5wrwQXDtHaYtg7YEFPeW+hws6U47WeFvISGUWekPGKWOP1ygrs0ef0o1VJMk1exos5A==}
 
   '@mariozechner/mini-lit@0.2.1':
     resolution: {integrity: sha512-u300euLgCsDDlb8o2Wbz+55eSJga5X2vB58s9XBuFIr2Bi3iI+GMR7t/NYo/O6Vr6obXShXgYjR3SRUJVgo+kQ==}
@@ -731,8 +744,8 @@ packages:
   '@mistralai/mistralai@1.10.0':
     resolution: {integrity: sha512-tdIgWs4Le8vpvPiUEWne6tK0qbVc+jMenujnvTqOjogrJUsCSQhus0tHTU1avDDh5//Rq2dFgP9mWRAdIEoBqg==}
 
-  '@napi-rs/wasm-runtime@1.1.0':
-    resolution: {integrity: sha512-Fq6DJW+Bb5jaWE69/qOE0D1TUN9+6uWhCeZpdnSBk14pjLcCWR7Q8n49PTSPHazM37JqrsdpEthXy2xn6jWWiA==}
+  '@napi-rs/wasm-runtime@1.1.1':
+    resolution: {integrity: sha512-p64ah1M1ld8xjWv3qbvFwHiFVWrq1yFvV4f7w+mzaqiR4IlSgkqhcRdHwsGgomwzBH51sRY4NEowLxnaBjcW/A==}
 
   '@nodelib/fs.scandir@2.1.5':
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
@@ -783,43 +796,43 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@oxlint/darwin-arm64@1.35.0':
-    resolution: {integrity: sha512-ieiYVHkNZPo77Hgrxav595wGS4rRNKuDNrljf+4xhwpJsddrxMpM64IQUf2IvR3MhK4FxdGzhhB6OVmGVHY5/w==}
+  '@oxlint/darwin-arm64@1.36.0':
+    resolution: {integrity: sha512-MJkj82GH+nhvWKJhSIM6KlZ8tyGKdogSQXtNdpIyP02r/tTayFJQaAEWayG2Jhsn93kske+nimg5MYFhwO/rlg==}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxlint/darwin-x64@1.35.0':
-    resolution: {integrity: sha512-1jNHu3j66X5jKySvgtE+jGtjx4ye+xioAucVTi2IuROZO6keK2YG74pnD+9FT+DpWZAtWRZGoW0r0x6aN9sEEg==}
+  '@oxlint/darwin-x64@1.36.0':
+    resolution: {integrity: sha512-VvEhfkqj/99dCTqOcfkyFXOSbx4lIy5u2m2GHbK4WCMDySokOcMTNRHGw8fH/WgQ5cDrDMSTYIGQTmnBGi9tiQ==}
     cpu: [x64]
     os: [darwin]
 
-  '@oxlint/linux-arm64-gnu@1.35.0':
-    resolution: {integrity: sha512-T1lc0UaYbTxZyqVpLfC7eipbauNG8pBpkaZEW4JGz8Y68rxTH7d9s+CF0zxUxNr5RCtcmT669RLVjQT7VrKVLg==}
+  '@oxlint/linux-arm64-gnu@1.36.0':
+    resolution: {integrity: sha512-EMx92X5q+hHc3olTuj/kgkx9+yP0p/AVs4yvHbUfzZhBekXNpUWxWvg4hIKmQWn+Ee2j4o80/0ACGO0hDYJ9mg==}
     cpu: [arm64]
     os: [linux]
 
-  '@oxlint/linux-arm64-musl@1.35.0':
-    resolution: {integrity: sha512-7Wv5Pke9kwWKFycUziSHsmi3EM0389TLzraB0KE/MArrKxx30ycwfJ5PYoMj9ERoW+Ybs0txdaOF/xJy/XyYkg==}
+  '@oxlint/linux-arm64-musl@1.36.0':
+    resolution: {integrity: sha512-7YCxtrPIctVYLqWrWkk8pahdCxch6PtsaucfMLC7TOlDt4nODhnQd4yzEscKqJ8Gjrw1bF4g+Ngob1gB+Qr9Fw==}
     cpu: [arm64]
     os: [linux]
 
-  '@oxlint/linux-x64-gnu@1.35.0':
-    resolution: {integrity: sha512-HDMPOzyVVy+rQl3H7UOq8oGHt7m1yaiWCanlhAu4jciK8dvXeO9OG/OQd74lD/h05IcJh93pCLEJ3wWOG8hTiQ==}
+  '@oxlint/linux-x64-gnu@1.36.0':
+    resolution: {integrity: sha512-lnaJVlx5r3NWmoOMesfQXJSf78jHTn8Z+sdAf795Kgteo72+qGC1Uax2SToCJVN2J8PNG3oRV5bLriiCNR2i6Q==}
     cpu: [x64]
     os: [linux]
 
-  '@oxlint/linux-x64-musl@1.35.0':
-    resolution: {integrity: sha512-kAPBBsUOM3HQQ6n3nnZauvFR9EoXqCSoj4O3OSXXarzsRTiItNrHabVUwxeswZEc+xMzQNR0FHEWg/d4QAAWLw==}
+  '@oxlint/linux-x64-musl@1.36.0':
+    resolution: {integrity: sha512-AhuEU2Qdl66lSfTGu/Htirq8r/8q2YnZoG3yEXLMQWnPMn7efy8spD/N1NA7kH0Hll+cdfwgQkQqC2G4MS2lPQ==}
     cpu: [x64]
     os: [linux]
 
-  '@oxlint/win32-arm64@1.35.0':
-    resolution: {integrity: sha512-qrpBkkOASS0WT8ra9xmBRXOEliN6D/MV9JhI/68lFHrtLhfFuRwg4AjzjxrCWrQCnQ0WkvAVpJzu73F4ICLYZw==}
+  '@oxlint/win32-arm64@1.36.0':
+    resolution: {integrity: sha512-GlWCBjUJY2QgvBFuNRkiRJu7K/djLmM0UQKfZV8IN+UXbP/JbjZHWKRdd4LXlQmzoz7M5Hd6p+ElCej8/90FCg==}
     cpu: [arm64]
     os: [win32]
 
-  '@oxlint/win32-x64@1.35.0':
-    resolution: {integrity: sha512-yPFcj6umrhusnG/kMS5wh96vblsqZ0kArQJS+7kEOSJDrH+DsFWaDCsSRF8U6gmSmZJ26KVMU3C3TMpqDN4M1g==}
+  '@oxlint/win32-x64@1.36.0':
+    resolution: {integrity: sha512-J+Vc00Utcf8p77lZPruQgb0QnQXuKnFogN88kCnOqs2a83I+vTBB8ILr0+L9sTwVRvIDMSC0pLdeQH4svWGFZg==}
     cpu: [x64]
     os: [win32]
 
@@ -830,6 +843,9 @@ packages:
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
 
+  '@polka/url@1.0.0-next.29':
+    resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==}
+
   '@preact/signals-core@1.12.1':
     resolution: {integrity: sha512-BwbTXpj+9QutoZLQvbttRg5x3l5468qaV2kufh+51yha1c53ep5dY4kTuZR35+3pAZxpfQerGJiQqg34ZNZ6uA==}
 
@@ -869,80 +885,160 @@ packages:
     cpu: [arm64]
     os: [android]
 
+  '@rolldown/binding-android-arm64@1.0.0-beta.57':
+    resolution: {integrity: sha512-GoOVDy8bjw9z1K30Oo803nSzXJS/vWhFijFsW3kzvZCO8IZwFnNa6pGctmbbJstKl3Fv6UBwyjJQN6msejW0IQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [android]
+
   '@rolldown/binding-darwin-arm64@1.0.0-beta.55':
     resolution: {integrity: sha512-l0887CGU2SXZr0UJmeEcXSvtDCOhDTTYXuoWbhrEJ58YQhQk24EVhDhHMTyjJb1PBRniUgNc1G0T51eF8z+TWw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
+  '@rolldown/binding-darwin-arm64@1.0.0-beta.57':
+    resolution: {integrity: sha512-9c4FOhRGpl+PX7zBK5p17c5efpF9aSpTPgyigv57hXf5NjQUaJOOiejPLAtFiKNBIfm5Uu6yFkvLKzOafNvlTw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [darwin]
+
   '@rolldown/binding-darwin-x64@1.0.0-beta.55':
     resolution: {integrity: sha512-d7qP2AVYzN0tYIP4vJ7nmr26xvmlwdkLD/jWIc9Z9dqh5y0UGPigO3m5eHoHq9BNazmwdD9WzDHbQZyXFZjgtA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
+  '@rolldown/binding-darwin-x64@1.0.0-beta.57':
+    resolution: {integrity: sha512-6RsB8Qy4LnGqNGJJC/8uWeLWGOvbRL/KG5aJ8XXpSEupg/KQtlBEiFaYU/Ma5Usj1s+bt3ItkqZYAI50kSplBA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [darwin]
+
   '@rolldown/binding-freebsd-x64@1.0.0-beta.55':
     resolution: {integrity: sha512-j311E4NOB0VMmXHoDDZhrWidUf7L/Sa6bu/+i2cskvHKU40zcUNPSYeD2YiO2MX+hhDFa5bJwhliYfs+bTrSZw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
+  '@rolldown/binding-freebsd-x64@1.0.0-beta.57':
+    resolution: {integrity: sha512-uA9kG7+MYkHTbqwv67Tx+5GV5YcKd33HCJIi0311iYBd25yuwyIqvJfBdt1VVB8tdOlyTb9cPAgfCki8nhwTQg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [freebsd]
+
   '@rolldown/binding-linux-arm-gnueabihf@1.0.0-beta.55':
     resolution: {integrity: sha512-lAsaYWhfNTW2A/9O7zCpb5eIJBrFeNEatOS/DDOZ5V/95NHy50g4b/5ViCqchfyFqRb7MKUR18/+xWkIcDkeIw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
+  '@rolldown/binding-linux-arm-gnueabihf@1.0.0-beta.57':
+    resolution: {integrity: sha512-3KkS0cHsllT2T+Te+VZMKHNw6FPQihYsQh+8J4jkzwgvAQpbsbXmrqhkw3YU/QGRrD8qgcOvBr6z5y6Jid+rmw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
   '@rolldown/binding-linux-arm64-gnu@1.0.0-beta.55':
     resolution: {integrity: sha512-2x6ffiVLZrQv7Xii9+JdtyT1U3bQhKj59K3eRnYlrXsKyjkjfmiDUVx2n+zSyijisUqD62fcegmx2oLLfeTkCA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
 
+  '@rolldown/binding-linux-arm64-gnu@1.0.0-beta.57':
+    resolution: {integrity: sha512-A3/wu1RgsHhqP3rVH2+sM81bpk+Qd2XaHTl8LtX5/1LNR7QVBFBCpAoiXwjTdGnI5cMdBVi7Z1pi52euW760Fw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+
   '@rolldown/binding-linux-arm64-musl@1.0.0-beta.55':
     resolution: {integrity: sha512-QbNncvqAXziya5wleI+OJvmceEE15vE4yn4qfbI/hwT/+8ZcqxyfRZOOh62KjisXxp4D0h3JZspycXYejxAU3w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
 
+  '@rolldown/binding-linux-arm64-musl@1.0.0-beta.57':
+    resolution: {integrity: sha512-d0kIVezTQtazpyWjiJIn5to8JlwfKITDqwsFv0Xc6s31N16CD2PC/Pl2OtKgS7n8WLOJbfqgIp5ixYzTAxCqMg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+
   '@rolldown/binding-linux-x64-gnu@1.0.0-beta.55':
     resolution: {integrity: sha512-YZCTZZM+rujxwVc6A+QZaNMJXVtmabmFYLG2VGQTKaBfYGvBKUgtbMEttnp/oZ88BMi2DzadBVhOmfQV8SuHhw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
 
+  '@rolldown/binding-linux-x64-gnu@1.0.0-beta.57':
+    resolution: {integrity: sha512-E199LPijo98yrLjPCmETx8EF43sZf9t3guSrLee/ej1rCCc3zDVTR4xFfN9BRAapGVl7/8hYqbbiQPTkv73kUg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+
   '@rolldown/binding-linux-x64-musl@1.0.0-beta.55':
     resolution: {integrity: sha512-28q9OQ/DDpFh2keS4BVAlc3N65/wiqKbk5K1pgLdu/uWbKa8hgUJofhXxqO+a+Ya2HVTUuYHneWsI2u+eu3N5Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
 
+  '@rolldown/binding-linux-x64-musl@1.0.0-beta.57':
+    resolution: {integrity: sha512-++EQDpk/UJ33kY/BNsh7A7/P1sr/jbMuQ8cE554ZIy+tCUWCivo9zfyjDUoiMdnxqX6HLJEqqGnbGQOvzm2OMQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+
   '@rolldown/binding-openharmony-arm64@1.0.0-beta.55':
     resolution: {integrity: sha512-LiCA4BjCnm49B+j1lFzUtlC+4ZphBv0d0g5VqrEJua/uyv9Ey1v9tiaMql1C8c0TVSNDUmrkfHQ71vuQC7YfpQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
+  '@rolldown/binding-openharmony-arm64@1.0.0-beta.57':
+    resolution: {integrity: sha512-voDEBcNqxbUv/GeXKFtxXVWA+H45P/8Dec4Ii/SbyJyGvCqV1j+nNHfnFUIiRQ2Q40DwPe/djvgYBs9PpETiMA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [openharmony]
+
   '@rolldown/binding-wasm32-wasi@1.0.0-beta.55':
     resolution: {integrity: sha512-nZ76tY7T0Oe8vamz5Cv5CBJvrqeQxwj1WaJ2GxX8Msqs0zsQMMcvoyxOf0glnJlxxgKjtoBxAOxaAU8ERbW6Tg==}
     engines: {node: '>=14.0.0'}
     cpu: [wasm32]
 
+  '@rolldown/binding-wasm32-wasi@1.0.0-beta.57':
+    resolution: {integrity: sha512-bRhcF7NLlCnpkzLVlVhrDEd0KH22VbTPkPTbMjlYvqhSmarxNIq5vtlQS8qmV7LkPKHrNLWyJW/V/sOyFba26Q==}
+    engines: {node: '>=14.0.0'}
+    cpu: [wasm32]
+
   '@rolldown/binding-win32-arm64-msvc@1.0.0-beta.55':
     resolution: {integrity: sha512-TFVVfLfhL1G+pWspYAgPK/FSqjiBtRKYX9hixfs508QVEZPQlubYAepHPA7kEa6lZXYj5ntzF87KC6RNhxo+ew==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
+  '@rolldown/binding-win32-arm64-msvc@1.0.0-beta.57':
+    resolution: {integrity: sha512-rnDVGRks2FQ2hgJ2g15pHtfxqkGFGjJQUDWzYznEkE8Ra2+Vag9OffxdbJMZqBWXHVM0iS4dv8qSiEn7bO+n1Q==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [win32]
+
   '@rolldown/binding-win32-x64-msvc@1.0.0-beta.55':
     resolution: {integrity: sha512-j1WBlk0p+ISgLzMIgl0xHp1aBGXenoK2+qWYc/wil2Vse7kVOdFq9aeQ8ahK6/oxX2teQ5+eDvgjdywqTL+daA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
 
+  '@rolldown/binding-win32-x64-msvc@1.0.0-beta.57':
+    resolution: {integrity: sha512-OqIUyNid1M4xTj6VRXp/Lht/qIP8fo25QyAZlCP+p6D2ATCEhyW4ZIFLnC9zAGN/HMbXoCzvwfa8Jjg/8J4YEg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [win32]
+
   '@rolldown/pluginutils@1.0.0-beta.55':
     resolution: {integrity: sha512-vajw/B3qoi7aYnnD4BQ4VoCcXQWnF0roSwE2iynbNxgW4l9mFwtLmLmUhpDdcTBfKyZm1p/T0D13qG94XBLohA==}
 
+  '@rolldown/pluginutils@1.0.0-beta.57':
+    resolution: {integrity: sha512-aQNelgx14tGA+n2tNSa9x6/jeoCL9fkDeCei7nOKnHx0fEFRRMu5ReiITo+zZD5TzWDGGRjbSYCs93IfRIyTuQ==}
+
   '@rollup/rollup-android-arm-eabi@4.54.0':
     resolution: {integrity: sha512-OywsdRHrFvCdvsewAInDKCNyR3laPA2mc9bRYJ6LBp5IyvF3fvXbbNR0bSzHlZVFtn6E0xw2oZlyjg4rKCVcng==}
     cpu: [arm]
@@ -1065,18 +1161,28 @@ packages:
     resolution: {integrity: sha512-jjmJywLAFoWeBi1W7994zZyiNWPIiqRRNAmSERxyg93xRGzNYvGjlZ0gR6x0F4gPRi2+0O6S71kOZYyr3cxaIQ==}
     engines: {node: '>=v14.0.0', npm: '>=7.0.0'}
 
-  '@sinclair/typebox@0.34.41':
-    resolution: {integrity: sha512-6gS8pZzSXdyRHTIqoqSVknxolr1kzfy4/CeDnrzsVz8TTIWUbOBr6gnzOmTYJ3eXQNh4IYHIGi5aIL7sOZ2G/g==}
+  '@sinclair/typebox@0.34.45':
+    resolution: {integrity: sha512-qJcFVfCa5jxBFSuv7S5WYbA8XdeCPmhnaVVfX/2Y6L8WYg8sk3XY2+6W0zH+3mq1Cz+YC7Ki66HfqX6IHAwnkg==}
 
   '@standard-schema/spec@1.1.0':
     resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
 
-  '@thi.ng/bitstream@2.4.36':
-    resolution: {integrity: sha512-ACdNVjFEQSWKRj/BekNggXVBZgnUnLjmwg7nPL1DKdGZ3IlZl8lz48ETHi2c1bFJxFIbFqkoEFk4yNj2tPvuNA==}
+  '@testing-library/dom@10.4.1':
+    resolution: {integrity: sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==}
     engines: {node: '>=18'}
 
-  '@thi.ng/errors@2.5.50':
-    resolution: {integrity: sha512-81I9IHwrCAHpfzEVMaJQpRYaq87MvIXi7YQ/wccKSxtiaz4IpB8dz3zwds33Oy9g+v+6nQbahZ02+syhKFYSXQ==}
+  '@testing-library/user-event@14.6.1':
+    resolution: {integrity: sha512-vq7fv0rnt+QTXgPxr5Hjc210p6YKq2kmdziLgnsZGgLJ9e6VAShx1pACLuRjd/AS/sr7phAR58OIIpf0LlmQNw==}
+    engines: {node: '>=12', npm: '>=6'}
+    peerDependencies:
+      '@testing-library/dom': '>=7.21.4'
+
+  '@thi.ng/bitstream@2.4.37':
+    resolution: {integrity: sha512-ghVt+/73cChlhHDNQH9+DnxvoeVYYBu7AYsS0Gvwq25fpCa4LaqnEk5LAJfsY043HInwcV7/0KGO7P+XZCzumQ==}
+    engines: {node: '>=18'}
+
+  '@thi.ng/errors@2.6.0':
+    resolution: {integrity: sha512-wBfSWz81sqM1FWX2ucW9KGLSFzGvsBxwX5y5t6Oty0QWO9mY8JIZC+ZBPzX5E6ExZiuGIgM8NtkTboTnXXlfUQ==}
     engines: {node: '>=18'}
 
   '@tokenizer/inflate@0.4.1':
@@ -1089,6 +1195,9 @@ packages:
   '@tybys/wasm-util@0.10.1':
     resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==}
 
+  '@types/aria-query@5.0.4':
+    resolution: {integrity: sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==}
+
   '@types/body-parser@1.19.6':
     resolution: {integrity: sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==}
 
@@ -1155,6 +1264,22 @@ packages:
   '@types/ws@8.18.1':
     resolution: {integrity: sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==}
 
+  '@vitest/browser-playwright@4.0.16':
+    resolution: {integrity: sha512-I2Fy/ANdphi1yI46d15o0M1M4M0UJrUiVKkH5oKeRZZCdPg0fw/cfTKZzv9Ge9eobtJYp4BGblMzXdXH0vcl5g==}
+    peerDependencies:
+      playwright: '*'
+      vitest: 4.0.16
+
+  '@vitest/browser-preview@4.0.16':
+    resolution: {integrity: sha512-dfxJs4D5qSst4zY25txsklu0ZGPSQUhCq4VUuO2aOYtOO5+2EH7Dil37BTf1PG6DDdM8kF8NjAvnvZfsE2uzAQ==}
+    peerDependencies:
+      vitest: 4.0.16
+
+  '@vitest/browser@4.0.16':
+    resolution: {integrity: sha512-t4toy8X/YTnjYEPoY0pbDBg3EvDPg1elCDrfc+VupPHwoN/5/FNQ8Z+xBYIaEnOE2vVEyKwqYBzZ9h9rJtZVcg==}
+    peerDependencies:
+      vitest: 4.0.16
+
   '@vitest/coverage-v8@4.0.16':
     resolution: {integrity: sha512-2rNdjEIsPRzsdu6/9Eq0AYAzYdpP6Bx9cje9tL3FE5XzXRQF1fNU9pe/1yE8fCrS0HD+fBtt6gLPh6LI57tX7A==}
     peerDependencies:
@@ -1270,6 +1395,10 @@ packages:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
     engines: {node: '>=8'}
 
+  ansi-styles@5.2.0:
+    resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
+    engines: {node: '>=10'}
+
   ansi-styles@6.2.3:
     resolution: {integrity: sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==}
     engines: {node: '>=12'}
@@ -1284,12 +1413,15 @@ packages:
   argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
+  aria-query@5.3.0:
+    resolution: {integrity: sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==}
+
   assertion-error@2.0.1:
     resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==}
     engines: {node: '>=12'}
 
-  ast-v8-to-istanbul@0.3.9:
-    resolution: {integrity: sha512-dSC6tJeOJxbZrPzPbv5mMd6CMiQ1ugaVXXPRad2fXUSsy1kstFn9XQWemV9VW7Y7kpxgQ/4WMoZfwdH8XSU48w==}
+  ast-v8-to-istanbul@0.3.10:
+    resolution: {integrity: sha512-p4K7vMz2ZSk3wN8l5o3y2bJAoZXT3VuJI5OLTATY/01CYWumWvwkUw0SqDBnNq6IiTO3qDa1eSQDibAV8g7XOQ==}
 
   async-mutex@0.5.0:
     resolution: {integrity: sha512-1A94B18jkJ3DYq284ohPxoXbfTA5HsQ7/Mf4DEhcyLx3Bz27Rh59iScbB6EPiP+B+joue6YCxcMXSbFC1tZKwA==}
@@ -1370,8 +1502,8 @@ packages:
     resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==}
     engines: {node: '>= 0.4'}
 
-  chai@6.2.1:
-    resolution: {integrity: sha512-p4Z49OGG5W/WBCPSS/dH3jQ73kD6tiMmUM+bckNK6Jr5JHMG3k9bg/BvKR8lKmtVBKmOiuVaV2ws8s9oSbwysg==}
+  chai@6.2.2:
+    resolution: {integrity: sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==}
     engines: {node: '>=18'}
 
   chalk@4.1.2:
@@ -1481,6 +1613,10 @@ packages:
     resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
     engines: {node: '>= 0.8'}
 
+  dequal@2.0.3:
+    resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
+    engines: {node: '>=6'}
+
   detect-libc@2.1.2:
     resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
     engines: {node: '>=8'}
@@ -1502,6 +1638,9 @@ packages:
   docx-preview@0.3.7:
     resolution: {integrity: sha512-Lav69CTA/IYZPJTsKH7oYeoZjyg96N0wEJMNslGJnZJ+dMUZK85Lt5ASC79yUlD48ecWjuv+rkcmFt6EVPV0Xg==}
 
+  dom-accessibility-api@0.5.16:
+    resolution: {integrity: sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==}
+
   dotenv@17.2.3:
     resolution: {integrity: sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==}
     engines: {node: '>=12'}
@@ -1599,8 +1738,8 @@ packages:
   fast-uri@3.1.0:
     resolution: {integrity: sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==}
 
-  fastq@1.19.1:
-    resolution: {integrity: sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==}
+  fastq@1.20.1:
+    resolution: {integrity: sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==}
 
   fdir@6.5.0:
     resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
@@ -1615,8 +1754,8 @@ packages:
     resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==}
     engines: {node: ^12.20 || >= 14.13}
 
-  file-type@21.1.1:
-    resolution: {integrity: sha512-ifJXo8zUqbQ/bLbl9sFoqHNTNWbnPY1COImFfM6CCy7z+E+jC1eY9YfOKkx0fckIg+VljAy2/87T61fp0+eEkg==}
+  file-type@21.2.0:
+    resolution: {integrity: sha512-vCYBgFOrJQLoTzDyAXAL/RFfKnXXpUYt4+tipVy26nJJhT7ftgGETf2tAQF59EEL61i3MrorV/PG6tf7LJK7eg==}
     engines: {node: '>=20'}
 
   fill-range@7.1.1:
@@ -1643,6 +1782,11 @@ packages:
     resolution: {integrity: sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==}
     engines: {node: '>= 0.8'}
 
+  fsevents@2.3.2:
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
   fsevents@2.3.3:
     resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
@@ -1833,6 +1977,9 @@ packages:
   js-base64@3.7.8:
     resolution: {integrity: sha512-hNngCeKxIUQiEUN3GPJOkz4wF/YvdUdbNL9hsBcMQTkKzboD7T/q3OYOuuPZLUE6dBxSGpwhk5mwuDud7JVAow==}
 
+  js-tokens@4.0.0:
+    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
+
   js-tokens@9.0.1:
     resolution: {integrity: sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==}
 
@@ -1946,14 +2093,14 @@ packages:
   linkify-it@5.0.0:
     resolution: {integrity: sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==}
 
-  lit-element@4.2.1:
-    resolution: {integrity: sha512-WGAWRGzirAgyphK2urmYOV72tlvnxw7YfyLDgQ+OZnM9vQQBQnumQ7jUJe6unEzwGU3ahFOjuz1iz1jjrpCPuw==}
+  lit-element@4.2.2:
+    resolution: {integrity: sha512-aFKhNToWxoyhkNDmWZwEva2SlQia+jfG0fjIWV//YeTaWrVnOxD89dPKfigCUspXFmjzOEUQpOkejH5Ly6sG0w==}
 
-  lit-html@3.3.1:
-    resolution: {integrity: sha512-S9hbyDu/vs1qNrithiNyeyv64c9yqiW9l+DBgI18fL+MTvOtWoFR0FWiyq1TxaYef5wNlpEmzlXoBlZEO+WjoA==}
+  lit-html@3.3.2:
+    resolution: {integrity: sha512-Qy9hU88zcmaxBXcc10ZpdK7cOLXvXpRoBxERdtqV9QOrfpMZZ6pSYP91LhpPtap3sFMUiL7Tw2RImbe0Al2/kw==}
 
-  lit@3.3.1:
-    resolution: {integrity: sha512-Ksr/8L3PTapbdXJCk+EJVB78jDodUMaP54gD24W186zGRARvwrsPfS60wae/SSCTCNZVPd1chXqio1qHQmu4NA==}
+  lit@3.3.2:
+    resolution: {integrity: sha512-NF9zbsP79l4ao2SNrH3NkfmFgN/hBYSQo90saIVI1o5GpjAdCPVstVzO1MrLOakHoEhYkrtRjPK6Ob521aoYWQ==}
 
   lodash.snakecase@4.1.1:
     resolution: {integrity: sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==}
@@ -1980,6 +2127,10 @@ packages:
   lucide@0.562.0:
     resolution: {integrity: sha512-k1Fb8ZMnRQovWRlea7Jr0b9UKA29IM7/cu79+mJrhVohvA2YC/Ti3Sk+G+h/SIu3IlrKT4RAbWMHUBBQd1O6XA==}
 
+  lz-string@1.5.0:
+    resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==}
+    hasBin: true
+
   magic-bytes.js@1.12.1:
     resolution: {integrity: sha512-ThQLOhN86ZkJ7qemtVRGYM+gRgR8GEXNli9H/PMvpnZsE44Xfh3wx9kGJaldg314v85m+bFW6WBMaVHJc/c3zA==}
 
@@ -2056,6 +2207,10 @@ packages:
   mpg123-decoder@1.0.3:
     resolution: {integrity: sha512-+fjxnWigodWJm3+4pndi+KUg9TBojgn31DPk85zEsim7C6s0X5Ztc/hQYdytXkwuGXH+aB0/aEkG40Emukv6oQ==}
 
+  mrmime@2.0.1:
+    resolution: {integrity: sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==}
+    engines: {node: '>=10'}
+
   ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
@@ -2148,8 +2303,8 @@ packages:
     resolution: {integrity: sha512-LDDSIu5J/4D4gFUuQQIEQpAC6maNEbMg4nC8JL/+Pe0cUDR86dtVZ09E2x5MwCh8f9yfktoaxt5x6UIVyzrajg==}
     hasBin: true
 
-  oxlint@1.35.0:
-    resolution: {integrity: sha512-QDX1aUgaiqznkGfTM2qHwva2wtKqhVoqPSVXrnPz+yLUhlNadikD3QRuRtppHl7WGuy3wG6nKAuR8lash3aWSg==}
+  oxlint@1.36.0:
+    resolution: {integrity: sha512-IicUdXfXgI8OKrDPnoSjvBfeEF8PkKtm+CoLlg4LYe4ypc8U+T4r7730XYshdBGZdelg+JRw8GtCb2w/KaaZvw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
@@ -2230,19 +2385,36 @@ packages:
     resolution: {integrity: sha512-8OEwKp5juEvb/MjpIc4hjqfgCNysrS94RIOMXYvpYCdm/jglrKEiAYmiumbmGhCvs+IcInsphYDFwqrjr7398w==}
     hasBin: true
 
+  pixelmatch@7.1.0:
+    resolution: {integrity: sha512-1wrVzJ2STrpmONHKBy228LM1b84msXDUoAzVEl0R8Mz4Ce6EPr+IVtxm8+yvrqLYMHswREkjYFaMxnyGnaY3Ng==}
+    hasBin: true
+
   playwright-core@1.57.0:
     resolution: {integrity: sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==}
     engines: {node: '>=18'}
     hasBin: true
 
+  playwright@1.57.0:
+    resolution: {integrity: sha512-ilYQj1s8sr2ppEJ2YVadYBN0Mb3mdo9J0wQ+UuDhzYqURwSoW4n1Xs5vs7ORwgDGmyEh33tRMeS8KhdkMoLXQw==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   pluralize@8.0.0:
     resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}
     engines: {node: '>=4'}
 
+  pngjs@7.0.0:
+    resolution: {integrity: sha512-LKWqWJRhstyYo9pGvgor/ivk2w94eSjE3RGVuzLGlr3NmD8bf7RcYGze1mNdEHRP6TRP6rMuDHk5t44hnTRyow==}
+    engines: {node: '>=14.19.0'}
+
   postcss@8.5.6:
     resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==}
     engines: {node: ^10 || ^12 || >=14}
 
+  pretty-format@27.5.1:
+    resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+
   process-nextick-args@2.0.1:
     resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
 
@@ -2283,8 +2455,8 @@ packages:
     resolution: {integrity: sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==}
     hasBin: true
 
-  qs@6.14.0:
-    resolution: {integrity: sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==}
+  qs@6.14.1:
+    resolution: {integrity: sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==}
     engines: {node: '>=0.6'}
 
   queue-microtask@1.2.3:
@@ -2304,6 +2476,9 @@ packages:
     resolution: {integrity: sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==}
     engines: {node: '>= 0.10'}
 
+  react-is@17.0.2:
+    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
+
   readable-stream@2.3.8:
     resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
 
@@ -2351,6 +2526,11 @@ packages:
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
+  rolldown@1.0.0-beta.57:
+    resolution: {integrity: sha512-lMMxcNN71GMsSko8RyeTaFoATHkCh4IWU7pYF73ziMYjhHZWfVesC6GQ+iaJCvZmVjvgSks9Ks1aaqEkBd8udg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    hasBin: true
+
   rollup@4.54.0:
     resolution: {integrity: sha512-3nk8Y3a9Ea8szgKhinMlGMhGMw89mqule3KWczxhIzqudyHdCIOHw8WJlj/r329fACjKLEh13ZSk7oE22kyeIw==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
@@ -2444,6 +2624,10 @@ packages:
   simple-yenc@1.0.4:
     resolution: {integrity: sha512-5gvxpSd79e9a3V4QDYUqnqxeD4HGlhCakVpb6gMnDD7lexJggSBJRBO5h52y/iJrdXRilX9UCuDaIJhSWm5OWw==}
 
+  sirv@3.0.2:
+    resolution: {integrity: sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==}
+    engines: {node: '>=18'}
+
   sonic-boom@4.2.0:
     resolution: {integrity: sha512-INb7TM37/mAcsGmc9hyyI6+QR3rR1zVRu36B0NeGXKnOOLiZOfER5SA+N7X7k3yUYRzLWafduTDvJAfDswwEww==}
 
@@ -2562,6 +2746,10 @@ packages:
     resolution: {integrity: sha512-kh9LVIWH5CnL63Ipf0jhlBIy0UsrMj/NJDfpsy1SqOXlLKEVyXXYrnFxFT1yOOYVGBSApeVnjPw/sBz5BfEjAQ==}
     engines: {node: '>=14.16'}
 
+  totalist@3.0.1:
+    resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
+    engines: {node: '>=6'}
+
   tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
 
@@ -2818,8 +3006,8 @@ packages:
     resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==}
     engines: {node: '>=10'}
 
-  zod-to-json-schema@3.25.0:
-    resolution: {integrity: sha512-HvWtU2UG41LALjajJrML6uQejQhNJx+JBO9IflpSja4R03iNWfKXrj6W2h7ljuLyc1nKS+9yDyL/9tD1U/yBnQ==}
+  zod-to-json-schema@3.25.1:
+    resolution: {integrity: sha512-pM/SU9d3YAggzi6MtR4h7ruuQlqKtad8e9S0fmxcMi+ueAK5Korys/aWcV9LIIHTVbj01NdzxcnXSN+O74ZIVA==}
     peerDependencies:
       zod: ^3.25 || ^4
 
@@ -2837,6 +3025,13 @@ snapshots:
     optionalDependencies:
       zod: 4.2.1
 
+  '@babel/code-frame@7.27.1':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.28.5
+      js-tokens: 4.0.0
+      picocolors: 1.1.1
+    optional: true
+
   '@babel/helper-string-parser@7.27.1': {}
 
   '@babel/helper-validator-identifier@7.28.5': {}
@@ -2891,11 +3086,11 @@ snapshots:
 
   '@borewit/text-codec@0.1.1': {}
 
-  '@borewit/text-codec@0.2.0': {}
+  '@borewit/text-codec@0.2.1': {}
 
-  '@cacheable/memory@2.0.6':
+  '@cacheable/memory@2.0.7':
     dependencies:
-      '@cacheable/utils': 2.3.2
+      '@cacheable/utils': 2.3.3
       '@keyv/bigmap': 1.3.0(keyv@5.5.5)
       hookified: 1.14.0
       keyv: 5.5.5
@@ -2906,7 +3101,7 @@ snapshots:
       hookified: 1.14.0
       keyv: 5.5.5
 
-  '@cacheable/utils@2.3.2':
+  '@cacheable/utils@2.3.3':
     dependencies:
       hashery: 1.3.0
       keyv: 5.5.5
@@ -3218,22 +3413,22 @@ snapshots:
 
   '@keyv/serialize@1.1.1': {}
 
-  '@lit-labs/signals@0.1.3':
+  '@lit-labs/signals@0.2.0':
     dependencies:
-      lit: 3.3.1
+      lit: 3.3.2
       signal-polyfill: 0.2.2
 
-  '@lit-labs/ssr-dom-shim@1.4.0': {}
+  '@lit-labs/ssr-dom-shim@1.5.0': {}
 
   '@lit/context@1.1.6':
     dependencies:
-      '@lit/reactive-element': 2.1.1
+      '@lit/reactive-element': 2.1.2
 
-  '@lit/reactive-element@2.1.1':
+  '@lit/reactive-element@2.1.2':
     dependencies:
-      '@lit-labs/ssr-dom-shim': 1.4.0
+      '@lit-labs/ssr-dom-shim': 1.5.0
 
-  '@mariozechner/mini-lit@0.2.1(lit@3.3.1)(tailwindcss@4.1.17)':
+  '@mariozechner/mini-lit@0.2.1(lit@3.3.2)(tailwindcss@4.1.17)':
     dependencies:
       '@preact/signals-core': 1.12.1
       class-variance-authority: 0.7.1
@@ -3241,7 +3436,7 @@ snapshots:
       highlight.js: 11.11.1
       html-parse-string: 0.0.9
       katex: 0.16.27
-      lit: 3.3.1
+      lit: 3.3.2
       lucide: 0.544.0
       marked: 16.4.2
       tailwind-merge: 3.4.0
@@ -3267,13 +3462,13 @@ snapshots:
       '@anthropic-ai/sdk': 0.71.2(zod@4.2.1)
       '@google/genai': 1.34.0
       '@mistralai/mistralai': 1.10.0
-      '@sinclair/typebox': 0.34.41
+      '@sinclair/typebox': 0.34.45
       ajv: 8.17.1
       ajv-formats: 3.0.1(ajv@8.17.1)
       chalk: 5.6.2
       openai: 6.10.0(ws@8.18.3)(zod@4.2.1)
       partial-json: 0.1.7
-      zod-to-json-schema: 3.25.0(zod@4.2.1)
+      zod-to-json-schema: 3.25.1(zod@4.2.1)
     transitivePeerDependencies:
       - '@modelcontextprotocol/sdk'
       - bufferutil
@@ -3290,7 +3485,7 @@ snapshots:
       chalk: 5.6.2
       cli-highlight: 2.1.11
       diff: 8.0.2
-      file-type: 21.1.1
+      file-type: 21.2.0
       glob: 11.1.0
       jiti: 2.6.1
       marked: 15.0.12
@@ -3313,9 +3508,9 @@ snapshots:
   '@mistralai/mistralai@1.10.0':
     dependencies:
       zod: 3.25.76
-      zod-to-json-schema: 3.25.0(zod@3.25.76)
+      zod-to-json-schema: 3.25.1(zod@3.25.76)
 
-  '@napi-rs/wasm-runtime@1.1.0':
+  '@napi-rs/wasm-runtime@1.1.1':
     dependencies:
       '@emnapi/core': 1.7.1
       '@emnapi/runtime': 1.7.1
@@ -3332,7 +3527,7 @@ snapshots:
   '@nodelib/fs.walk@1.2.8':
     dependencies:
       '@nodelib/fs.scandir': 2.1.5
-      fastq: 1.19.1
+      fastq: 1.20.1
 
   '@oxc-project/runtime@0.103.0': {}
 
@@ -3356,28 +3551,28 @@ snapshots:
   '@oxlint-tsgolint/win32-x64@0.10.0':
     optional: true
 
-  '@oxlint/darwin-arm64@1.35.0':
+  '@oxlint/darwin-arm64@1.36.0':
     optional: true
 
-  '@oxlint/darwin-x64@1.35.0':
+  '@oxlint/darwin-x64@1.36.0':
     optional: true
 
-  '@oxlint/linux-arm64-gnu@1.35.0':
+  '@oxlint/linux-arm64-gnu@1.36.0':
     optional: true
 
-  '@oxlint/linux-arm64-musl@1.35.0':
+  '@oxlint/linux-arm64-musl@1.36.0':
     optional: true
 
-  '@oxlint/linux-x64-gnu@1.35.0':
+  '@oxlint/linux-x64-gnu@1.36.0':
     optional: true
 
-  '@oxlint/linux-x64-musl@1.35.0':
+  '@oxlint/linux-x64-musl@1.36.0':
     optional: true
 
-  '@oxlint/win32-arm64@1.35.0':
+  '@oxlint/win32-arm64@1.36.0':
     optional: true
 
-  '@oxlint/win32-x64@1.35.0':
+  '@oxlint/win32-x64@1.36.0':
     optional: true
 
   '@pinojs/redact@0.4.0': {}
@@ -3385,6 +3580,8 @@ snapshots:
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
+  '@polka/url@1.0.0-next.29': {}
+
   '@preact/signals-core@1.12.1': {}
 
   '@protobufjs/aspromise@1.1.2': {}
@@ -3413,46 +3610,89 @@ snapshots:
   '@rolldown/binding-android-arm64@1.0.0-beta.55':
     optional: true
 
+  '@rolldown/binding-android-arm64@1.0.0-beta.57':
+    optional: true
+
   '@rolldown/binding-darwin-arm64@1.0.0-beta.55':
     optional: true
 
+  '@rolldown/binding-darwin-arm64@1.0.0-beta.57':
+    optional: true
+
   '@rolldown/binding-darwin-x64@1.0.0-beta.55':
     optional: true
 
+  '@rolldown/binding-darwin-x64@1.0.0-beta.57':
+    optional: true
+
   '@rolldown/binding-freebsd-x64@1.0.0-beta.55':
     optional: true
 
+  '@rolldown/binding-freebsd-x64@1.0.0-beta.57':
+    optional: true
+
   '@rolldown/binding-linux-arm-gnueabihf@1.0.0-beta.55':
     optional: true
 
+  '@rolldown/binding-linux-arm-gnueabihf@1.0.0-beta.57':
+    optional: true
+
   '@rolldown/binding-linux-arm64-gnu@1.0.0-beta.55':
     optional: true
 
+  '@rolldown/binding-linux-arm64-gnu@1.0.0-beta.57':
+    optional: true
+
   '@rolldown/binding-linux-arm64-musl@1.0.0-beta.55':
     optional: true
 
+  '@rolldown/binding-linux-arm64-musl@1.0.0-beta.57':
+    optional: true
+
   '@rolldown/binding-linux-x64-gnu@1.0.0-beta.55':
     optional: true
 
+  '@rolldown/binding-linux-x64-gnu@1.0.0-beta.57':
+    optional: true
+
   '@rolldown/binding-linux-x64-musl@1.0.0-beta.55':
     optional: true
 
+  '@rolldown/binding-linux-x64-musl@1.0.0-beta.57':
+    optional: true
+
   '@rolldown/binding-openharmony-arm64@1.0.0-beta.55':
     optional: true
 
+  '@rolldown/binding-openharmony-arm64@1.0.0-beta.57':
+    optional: true
+
   '@rolldown/binding-wasm32-wasi@1.0.0-beta.55':
     dependencies:
-      '@napi-rs/wasm-runtime': 1.1.0
+      '@napi-rs/wasm-runtime': 1.1.1
+    optional: true
+
+  '@rolldown/binding-wasm32-wasi@1.0.0-beta.57':
+    dependencies:
+      '@napi-rs/wasm-runtime': 1.1.1
     optional: true
 
   '@rolldown/binding-win32-arm64-msvc@1.0.0-beta.55':
     optional: true
 
+  '@rolldown/binding-win32-arm64-msvc@1.0.0-beta.57':
+    optional: true
+
   '@rolldown/binding-win32-x64-msvc@1.0.0-beta.55':
     optional: true
 
+  '@rolldown/binding-win32-x64-msvc@1.0.0-beta.57':
+    optional: true
+
   '@rolldown/pluginutils@1.0.0-beta.55': {}
 
+  '@rolldown/pluginutils@1.0.0-beta.57': {}
+
   '@rollup/rollup-android-arm-eabi@4.54.0':
     optional: true
 
@@ -3528,16 +3768,33 @@ snapshots:
 
   '@sapphire/snowflake@3.5.3': {}
 
-  '@sinclair/typebox@0.34.41': {}
+  '@sinclair/typebox@0.34.45': {}
 
   '@standard-schema/spec@1.1.0': {}
 
-  '@thi.ng/bitstream@2.4.36':
+  '@testing-library/dom@10.4.1':
     dependencies:
-      '@thi.ng/errors': 2.5.50
+      '@babel/code-frame': 7.27.1
+      '@babel/runtime': 7.28.4
+      '@types/aria-query': 5.0.4
+      aria-query: 5.3.0
+      dom-accessibility-api: 0.5.16
+      lz-string: 1.5.0
+      picocolors: 1.1.1
+      pretty-format: 27.5.1
     optional: true
 
-  '@thi.ng/errors@2.5.50':
+  '@testing-library/user-event@14.6.1(@testing-library/dom@10.4.1)':
+    dependencies:
+      '@testing-library/dom': 10.4.1
+    optional: true
+
+  '@thi.ng/bitstream@2.4.37':
+    dependencies:
+      '@thi.ng/errors': 2.6.0
+    optional: true
+
+  '@thi.ng/errors@2.6.0':
     optional: true
 
   '@tokenizer/inflate@0.4.1':
@@ -3554,6 +3811,9 @@ snapshots:
       tslib: 2.8.1
     optional: true
 
+  '@types/aria-query@5.0.4':
+    optional: true
+
   '@types/body-parser@1.19.6':
     dependencies:
       '@types/connect': 3.4.38
@@ -3627,11 +3887,72 @@ snapshots:
     dependencies:
       '@types/node': 25.0.3
 
-  '@vitest/coverage-v8@4.0.16(vitest@4.0.16(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))':
+  '@vitest/browser-playwright@4.0.16(playwright@1.57.0)(vite@8.0.0-beta.3(@types/node@25.0.3)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.16)':
+    dependencies:
+      '@vitest/browser': 4.0.16(vite@8.0.0-beta.3(@types/node@25.0.3)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.16)
+      '@vitest/mocker': 4.0.16(vite@8.0.0-beta.3(@types/node@25.0.3)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.2))
+      playwright: 1.57.0
+      tinyrainbow: 3.0.3
+      vitest: 4.0.16(@types/node@25.0.3)(@vitest/browser-playwright@4.0.16)(@vitest/browser-preview@4.0.16)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+    transitivePeerDependencies:
+      - bufferutil
+      - msw
+      - utf-8-validate
+      - vite
+
+  '@vitest/browser-preview@4.0.16(vite@8.0.0-beta.3(@types/node@25.0.3)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.16)':
+    dependencies:
+      '@testing-library/dom': 10.4.1
+      '@testing-library/user-event': 14.6.1(@testing-library/dom@10.4.1)
+      '@vitest/browser': 4.0.16(vite@8.0.0-beta.3(@types/node@25.0.3)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.16)
+      vitest: 4.0.16(@types/node@25.0.3)(@vitest/browser-playwright@4.0.16)(@vitest/browser-preview@4.0.16)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+    transitivePeerDependencies:
+      - bufferutil
+      - msw
+      - utf-8-validate
+      - vite
+    optional: true
+
+  '@vitest/browser@4.0.16(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.16)':
+    dependencies:
+      '@vitest/mocker': 4.0.16(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))
+      '@vitest/utils': 4.0.16
+      magic-string: 0.30.21
+      pixelmatch: 7.1.0
+      pngjs: 7.0.0
+      sirv: 3.0.2
+      tinyrainbow: 3.0.3
+      vitest: 4.0.16(@types/node@25.0.3)(@vitest/browser-playwright@4.0.16)(@vitest/browser-preview@4.0.16)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+      ws: 8.18.3
+    transitivePeerDependencies:
+      - bufferutil
+      - msw
+      - utf-8-validate
+      - vite
+    optional: true
+
+  '@vitest/browser@4.0.16(vite@8.0.0-beta.3(@types/node@25.0.3)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.16)':
+    dependencies:
+      '@vitest/mocker': 4.0.16(vite@8.0.0-beta.3(@types/node@25.0.3)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.2))
+      '@vitest/utils': 4.0.16
+      magic-string: 0.30.21
+      pixelmatch: 7.1.0
+      pngjs: 7.0.0
+      sirv: 3.0.2
+      tinyrainbow: 3.0.3
+      vitest: 4.0.16(@types/node@25.0.3)(@vitest/browser-playwright@4.0.16)(@vitest/browser-preview@4.0.16)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+      ws: 8.18.3
+    transitivePeerDependencies:
+      - bufferutil
+      - msw
+      - utf-8-validate
+      - vite
+
+  '@vitest/coverage-v8@4.0.16(@vitest/browser@4.0.16(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.16))(vitest@4.0.16)':
     dependencies:
       '@bcoe/v8-coverage': 1.0.2
       '@vitest/utils': 4.0.16
-      ast-v8-to-istanbul: 0.3.9
+      ast-v8-to-istanbul: 0.3.10
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 5.0.6
@@ -3640,7 +3961,9 @@ snapshots:
       obug: 2.1.1
       std-env: 3.10.0
       tinyrainbow: 3.0.3
-      vitest: 4.0.16(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+      vitest: 4.0.16(@types/node@25.0.3)(@vitest/browser-playwright@4.0.16)(@vitest/browser-preview@4.0.16)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
+    optionalDependencies:
+      '@vitest/browser': 4.0.16(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.16)
     transitivePeerDependencies:
       - supports-color
 
@@ -3650,7 +3973,7 @@ snapshots:
       '@types/chai': 5.2.3
       '@vitest/spy': 4.0.16
       '@vitest/utils': 4.0.16
-      chai: 6.2.1
+      chai: 6.2.2
       tinyrainbow: 3.0.3
 
   '@vitest/mocker@4.0.16(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))':
@@ -3661,6 +3984,14 @@ snapshots:
     optionalDependencies:
       vite: 7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2)
 
+  '@vitest/mocker@4.0.16(vite@8.0.0-beta.3(@types/node@25.0.3)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.2))':
+    dependencies:
+      '@vitest/spy': 4.0.16
+      estree-walker: 3.0.3
+      magic-string: 0.30.21
+    optionalDependencies:
+      vite: 8.0.0-beta.3(@types/node@25.0.3)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.2)
+
   '@vitest/pretty-format@4.0.16':
     dependencies:
       tinyrainbow: 3.0.3
@@ -3769,6 +4100,9 @@ snapshots:
     dependencies:
       color-convert: 2.0.1
 
+  ansi-styles@5.2.0:
+    optional: true
+
   ansi-styles@6.2.3: {}
 
   any-promise@1.3.0: {}
@@ -3780,9 +4114,14 @@ snapshots:
 
   argparse@2.0.1: {}
 
+  aria-query@5.3.0:
+    dependencies:
+      dequal: 2.0.3
+    optional: true
+
   assertion-error@2.0.1: {}
 
-  ast-v8-to-istanbul@0.3.9:
+  ast-v8-to-istanbul@0.3.10:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
       estree-walker: 3.0.3
@@ -3830,7 +4169,7 @@ snapshots:
       http-errors: 2.0.1
       iconv-lite: 0.7.1
       on-finished: 2.4.1
-      qs: 6.14.0
+      qs: 6.14.1
       raw-body: 3.0.2
       type-is: 2.0.1
     transitivePeerDependencies:
@@ -3865,8 +4204,8 @@ snapshots:
 
   cacheable@2.3.1:
     dependencies:
-      '@cacheable/memory': 2.0.6
-      '@cacheable/utils': 2.3.2
+      '@cacheable/memory': 2.0.7
+      '@cacheable/utils': 2.3.3
       hookified: 1.14.0
       keyv: 5.5.5
       qified: 0.5.3
@@ -3881,7 +4220,7 @@ snapshots:
       call-bind-apply-helpers: 1.0.2
       get-intrinsic: 1.3.0
 
-  chai@6.2.1: {}
+  chai@6.2.2: {}
 
   chalk@4.1.2:
     dependencies:
@@ -3982,6 +4321,9 @@ snapshots:
 
   depd@2.0.0: {}
 
+  dequal@2.0.3:
+    optional: true
+
   detect-libc@2.1.2: {}
 
   devtools-protocol@0.0.1561482: {}
@@ -4013,6 +4355,9 @@ snapshots:
     dependencies:
       jszip: 3.10.1
 
+  dom-accessibility-api@0.5.16:
+    optional: true
+
   dotenv@17.2.3: {}
 
   dunder-proto@1.0.1:
@@ -4116,7 +4461,7 @@ snapshots:
       once: 1.4.0
       parseurl: 1.3.3
       proxy-addr: 2.0.7
-      qs: 6.14.0
+      qs: 6.14.1
       range-parser: 1.2.1
       router: 2.2.0
       send: 1.2.1
@@ -4141,7 +4486,7 @@ snapshots:
 
   fast-uri@3.1.0: {}
 
-  fastq@1.19.1:
+  fastq@1.20.1:
     dependencies:
       reusify: 1.1.0
 
@@ -4154,7 +4499,7 @@ snapshots:
       node-domexception: 1.0.0
       web-streams-polyfill: 3.3.3
 
-  file-type@21.1.1:
+  file-type@21.2.0:
     dependencies:
       '@tokenizer/inflate': 0.4.1
       strtok3: 10.3.4
@@ -4191,6 +4536,9 @@ snapshots:
 
   fresh@2.0.0: {}
 
+  fsevents@2.3.2:
+    optional: true
+
   fsevents@2.3.3:
     optional: true
 
@@ -4402,6 +4750,9 @@ snapshots:
 
   js-base64@3.7.8: {}
 
+  js-tokens@4.0.0:
+    optional: true
+
   js-tokens@9.0.1: {}
 
   json-bigint@1.0.0:
@@ -4502,21 +4853,21 @@ snapshots:
     dependencies:
       uc.micro: 2.1.0
 
-  lit-element@4.2.1:
+  lit-element@4.2.2:
     dependencies:
-      '@lit-labs/ssr-dom-shim': 1.4.0
-      '@lit/reactive-element': 2.1.1
-      lit-html: 3.3.1
+      '@lit-labs/ssr-dom-shim': 1.5.0
+      '@lit/reactive-element': 2.1.2
+      lit-html: 3.3.2
 
-  lit-html@3.3.1:
+  lit-html@3.3.2:
     dependencies:
       '@types/trusted-types': 2.0.7
 
-  lit@3.3.1:
+  lit@3.3.2:
     dependencies:
-      '@lit/reactive-element': 2.1.1
-      lit-element: 4.2.1
-      lit-html: 3.3.1
+      '@lit/reactive-element': 2.1.2
+      lit-element: 4.2.2
+      lit-html: 3.3.2
 
   lodash.snakecase@4.1.1: {}
 
@@ -4534,6 +4885,9 @@ snapshots:
 
   lucide@0.562.0: {}
 
+  lz-string@1.5.0:
+    optional: true
+
   magic-bytes.js@1.12.1: {}
 
   magic-string@0.30.21:
@@ -4601,15 +4955,17 @@ snapshots:
       '@wasm-audio-decoders/common': 9.0.7
     optional: true
 
+  mrmime@2.0.1: {}
+
   ms@2.1.3: {}
 
   music-metadata@11.10.3:
     dependencies:
-      '@borewit/text-codec': 0.2.0
+      '@borewit/text-codec': 0.2.1
       '@tokenizer/token': 0.3.0
       content-type: 1.0.5
       debug: 4.4.3
-      file-type: 21.1.1
+      file-type: 21.2.0
       media-typer: 1.1.0
       strtok3: 10.3.4
       token-types: 6.1.1
@@ -4691,16 +5047,16 @@ snapshots:
       '@oxlint-tsgolint/win32-arm64': 0.10.0
       '@oxlint-tsgolint/win32-x64': 0.10.0
 
-  oxlint@1.35.0(oxlint-tsgolint@0.10.0):
+  oxlint@1.36.0(oxlint-tsgolint@0.10.0):
     optionalDependencies:
-      '@oxlint/darwin-arm64': 1.35.0
-      '@oxlint/darwin-x64': 1.35.0
-      '@oxlint/linux-arm64-gnu': 1.35.0
-      '@oxlint/linux-arm64-musl': 1.35.0
-      '@oxlint/linux-x64-gnu': 1.35.0
-      '@oxlint/linux-x64-musl': 1.35.0
-      '@oxlint/win32-arm64': 1.35.0
-      '@oxlint/win32-x64': 1.35.0
+      '@oxlint/darwin-arm64': 1.36.0
+      '@oxlint/darwin-x64': 1.36.0
+      '@oxlint/linux-arm64-gnu': 1.36.0
+      '@oxlint/linux-arm64-musl': 1.36.0
+      '@oxlint/linux-x64-gnu': 1.36.0
+      '@oxlint/linux-x64-musl': 1.36.0
+      '@oxlint/win32-arm64': 1.36.0
+      '@oxlint/win32-x64': 1.36.0
       oxlint-tsgolint: 0.10.0
 
   p-queue@9.0.1:
@@ -4770,16 +5126,35 @@ snapshots:
       sonic-boom: 4.2.0
       thread-stream: 3.1.0
 
+  pixelmatch@7.1.0:
+    dependencies:
+      pngjs: 7.0.0
+
   playwright-core@1.57.0: {}
 
+  playwright@1.57.0:
+    dependencies:
+      playwright-core: 1.57.0
+    optionalDependencies:
+      fsevents: 2.3.2
+
   pluralize@8.0.0: {}
 
+  pngjs@7.0.0: {}
+
   postcss@8.5.6:
     dependencies:
       nanoid: 3.3.11
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
+  pretty-format@27.5.1:
+    dependencies:
+      ansi-regex: 5.0.1
+      ansi-styles: 5.2.0
+      react-is: 17.0.2
+    optional: true
+
   process-nextick-args@2.0.1: {}
 
   process-warning@5.0.0: {}
@@ -4836,12 +5211,12 @@ snapshots:
 
   qoa-format@1.0.1:
     dependencies:
-      '@thi.ng/bitstream': 2.4.36
+      '@thi.ng/bitstream': 2.4.37
     optional: true
 
   qrcode-terminal@0.12.0: {}
 
-  qs@6.14.0:
+  qs@6.14.1:
     dependencies:
       side-channel: 1.1.0
 
@@ -4877,6 +5252,9 @@ snapshots:
       iconv-lite: 0.7.1
       unpipe: 1.0.0
 
+  react-is@17.0.2:
+    optional: true
+
   readable-stream@2.3.8:
     dependencies:
       core-util-is: 1.0.3
@@ -4936,6 +5314,25 @@ snapshots:
       '@rolldown/binding-win32-arm64-msvc': 1.0.0-beta.55
       '@rolldown/binding-win32-x64-msvc': 1.0.0-beta.55
 
+  rolldown@1.0.0-beta.57:
+    dependencies:
+      '@oxc-project/types': 0.103.0
+      '@rolldown/pluginutils': 1.0.0-beta.57
+    optionalDependencies:
+      '@rolldown/binding-android-arm64': 1.0.0-beta.57
+      '@rolldown/binding-darwin-arm64': 1.0.0-beta.57
+      '@rolldown/binding-darwin-x64': 1.0.0-beta.57
+      '@rolldown/binding-freebsd-x64': 1.0.0-beta.57
+      '@rolldown/binding-linux-arm-gnueabihf': 1.0.0-beta.57
+      '@rolldown/binding-linux-arm64-gnu': 1.0.0-beta.57
+      '@rolldown/binding-linux-arm64-musl': 1.0.0-beta.57
+      '@rolldown/binding-linux-x64-gnu': 1.0.0-beta.57
+      '@rolldown/binding-linux-x64-musl': 1.0.0-beta.57
+      '@rolldown/binding-openharmony-arm64': 1.0.0-beta.57
+      '@rolldown/binding-wasm32-wasi': 1.0.0-beta.57
+      '@rolldown/binding-win32-arm64-msvc': 1.0.0-beta.57
+      '@rolldown/binding-win32-x64-msvc': 1.0.0-beta.57
+
   rollup@4.54.0:
     dependencies:
       '@types/estree': 1.0.8
@@ -5097,6 +5494,12 @@ snapshots:
   simple-yenc@1.0.4:
     optional: true
 
+  sirv@3.0.2:
+    dependencies:
+      '@polka/url': 1.0.0-next.29
+      mrmime: 2.0.1
+      totalist: 3.0.1
+
   sonic-boom@4.2.0:
     dependencies:
       atomic-sleep: 1.0.0
@@ -5206,6 +5609,8 @@ snapshots:
       '@tokenizer/token': 0.3.0
       ieee754: 1.2.1
 
+  totalist@3.0.1: {}
+
   tr46@0.0.3: {}
 
   ts-algebra@2.0.0: {}
@@ -5295,7 +5700,7 @@ snapshots:
       tsx: 4.21.0
       yaml: 2.8.2
 
-  vitest@4.0.16(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2):
+  vitest@4.0.16(@types/node@25.0.3)(@vitest/browser-playwright@4.0.16)(@vitest/browser-preview@4.0.16)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2):
     dependencies:
       '@vitest/expect': 4.0.16
       '@vitest/mocker': 4.0.16(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)(tsx@4.21.0)(yaml@2.8.2))
@@ -5319,6 +5724,8 @@ snapshots:
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/node': 25.0.3
+      '@vitest/browser-playwright': 4.0.16(playwright@1.57.0)(vite@8.0.0-beta.3(@types/node@25.0.3)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.16)
+      '@vitest/browser-preview': 4.0.16(vite@8.0.0-beta.3(@types/node@25.0.3)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.2))(vitest@4.0.16)
     transitivePeerDependencies:
       - jiti
       - less
@@ -5394,11 +5801,11 @@ snapshots:
       y18n: 5.0.8
       yargs-parser: 20.2.9
 
-  zod-to-json-schema@3.25.0(zod@3.25.76):
+  zod-to-json-schema@3.25.1(zod@3.25.76):
     dependencies:
       zod: 3.25.76
 
-  zod-to-json-schema@3.25.0(zod@4.2.1):
+  zod-to-json-schema@3.25.1(zod@4.2.1):
     dependencies:
       zod: 4.2.1
 
diff --git a/ui/package.json b/ui/package.json
index 9df8528b5..6c6e1ba95 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -5,13 +5,17 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "test": "vitest run --config vitest.config.ts"
   },
   "dependencies": {
-    "lit": "^3.3.1"
+    "lit": "^3.3.2"
   },
   "devDependencies": {
+    "@vitest/browser-playwright": "4.0.16",
+    "playwright": "^1.57.0",
     "typescript": "^5.9.3",
-    "vite": "8.0.0-beta.3"
+    "vite": "8.0.0-beta.3",
+    "vitest": "4.0.16"
   }
-}
\ No newline at end of file
+}
diff --git a/ui/src/ui/app-render.ts b/ui/src/ui/app-render.ts
index 6558a70e8..1130954dc 100644
--- a/ui/src/ui/app-render.ts
+++ b/ui/src/ui/app-render.ts
@@ -1,7 +1,13 @@
 import { html, nothing } from "lit";
 
 import type { GatewayBrowserClient, GatewayHelloOk } from "./gateway";
-import { TAB_GROUPS, subtitleForTab, titleForTab, type Tab } from "./navigation";
+import {
+  TAB_GROUPS,
+  pathForTab,
+  subtitleForTab,
+  titleForTab,
+  type Tab,
+} from "./navigation";
 import type {
   ConfigSnapshot,
   CronJob,
@@ -51,6 +57,7 @@ export type AppViewState = {
   settings: { gatewayUrl: string; token: string; sessionKey: string };
   password: string;
   tab: Tab;
+  basePath: string;
   connected: boolean;
   hello: GatewayHelloOk | null;
   lastError: string | null;
@@ -352,12 +359,27 @@ export function renderApp(state: AppViewState) {
 }
 
 function renderTab(state: AppViewState, tab: Tab) {
+  const href = pathForTab(tab, state.basePath);
   return html`
-    <button
+    <a
+      href=${href}
       class="nav-item ${state.tab === tab ? "active" : ""}"
-      @click=${() => state.setTab(tab)}
+      @click=${(event: MouseEvent) => {
+        if (
+          event.defaultPrevented ||
+          event.button !== 0 ||
+          event.metaKey ||
+          event.ctrlKey ||
+          event.shiftKey ||
+          event.altKey
+        ) {
+          return;
+        }
+        event.preventDefault();
+        state.setTab(tab);
+      }}
     >
       <span>${titleForTab(tab)}</span>
-    </button>
+    </a>
   `;
 }
diff --git a/ui/src/ui/app.ts b/ui/src/ui/app.ts
index 4eacbb840..c206d67c9 100644
--- a/ui/src/ui/app.ts
+++ b/ui/src/ui/app.ts
@@ -4,7 +4,7 @@ import { customElement, state } from "lit/decorators.js";
 import { GatewayBrowserClient, type GatewayEventFrame, type GatewayHelloOk } from "./gateway";
 import { loadSettings, saveSettings, type UiSettings } from "./storage";
 import { renderApp } from "./app-render";
-import type { Tab } from "./navigation";
+import { normalizePath, pathForTab, tabFromPath, type Tab } from "./navigation";
 import type {
   ConfigSnapshot,
   CronJob,
@@ -157,6 +157,8 @@ export class ClawdisApp extends LitElement {
 
   client: GatewayBrowserClient | null = null;
   private chatScrollFrame: number | null = null;
+  basePath = "";
+  private popStateHandler = () => this.onPopState();
 
   createRenderRoot() {
     return this;
@@ -164,9 +166,17 @@ export class ClawdisApp extends LitElement {
 
   connectedCallback() {
     super.connectedCallback();
+    this.basePath = this.inferBasePath();
+    this.syncTabWithLocation(true);
+    window.addEventListener("popstate", this.popStateHandler);
     this.connect();
   }
 
+  disconnectedCallback() {
+    window.removeEventListener("popstate", this.popStateHandler);
+    super.disconnectedCallback();
+  }
+
   protected updated(changed: Map<PropertyKey, unknown>) {
     if (
       this.tab === "chat" &&
@@ -264,8 +274,9 @@ export class ClawdisApp extends LitElement {
   }
 
   setTab(next: Tab) {
-    this.tab = next;
+    if (this.tab !== next) this.tab = next;
     void this.refreshActiveTab();
+    this.syncUrlWithTab(next, false);
   }
 
   private async refreshActiveTab() {
@@ -276,11 +287,54 @@ export class ClawdisApp extends LitElement {
     if (this.tab === "cron") await this.loadCron();
     if (this.tab === "skills") await loadSkills(this);
     if (this.tab === "nodes") await loadNodes(this);
-    if (this.tab === "chat") await loadChatHistory(this);
+    if (this.tab === "chat") {
+      await loadChatHistory(this);
+      this.scheduleChatScroll();
+    }
     if (this.tab === "config") await loadConfig(this);
     if (this.tab === "debug") await loadDebug(this);
   }
 
+  private inferBasePath() {
+    if (typeof window === "undefined") return "";
+    const path = window.location.pathname;
+    if (path === "/ui" || path.startsWith("/ui/")) return "/ui";
+    return "";
+  }
+
+  private syncTabWithLocation(replace: boolean) {
+    if (typeof window === "undefined") return;
+    const resolved = tabFromPath(window.location.pathname, this.basePath) ?? "chat";
+    this.setTabFromRoute(resolved);
+    this.syncUrlWithTab(resolved, replace);
+  }
+
+  private onPopState() {
+    if (typeof window === "undefined") return;
+    const resolved = tabFromPath(window.location.pathname, this.basePath);
+    if (!resolved) return;
+    this.setTabFromRoute(resolved);
+  }
+
+  private setTabFromRoute(next: Tab) {
+    if (this.tab !== next) this.tab = next;
+    if (this.connected) void this.refreshActiveTab();
+  }
+
+  private syncUrlWithTab(tab: Tab, replace: boolean) {
+    if (typeof window === "undefined") return;
+    const targetPath = normalizePath(pathForTab(tab, this.basePath));
+    const currentPath = normalizePath(window.location.pathname);
+    if (currentPath === targetPath) return;
+    const url = new URL(window.location.href);
+    url.pathname = targetPath;
+    if (replace) {
+      window.history.replaceState({}, "", url.toString());
+    } else {
+      window.history.pushState({}, "", url.toString());
+    }
+  }
+
   async loadOverview() {
     await Promise.all([
       loadProviders(this, false),
diff --git a/ui/src/ui/navigation.browser.test.ts b/ui/src/ui/navigation.browser.test.ts
new file mode 100644
index 000000000..de8dd84ec
--- /dev/null
+++ b/ui/src/ui/navigation.browser.test.ts
@@ -0,0 +1,93 @@
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+
+import { ClawdisApp } from "./app";
+
+const originalConnect = ClawdisApp.prototype.connect;
+
+function mountApp(pathname: string) {
+  window.history.replaceState({}, "", pathname);
+  const app = document.createElement("clawdis-app") as ClawdisApp;
+  document.body.append(app);
+  return app;
+}
+
+function nextFrame() {
+  return new Promise<void>((resolve) => {
+    requestAnimationFrame(() => resolve());
+  });
+}
+
+beforeEach(() => {
+  ClawdisApp.prototype.connect = () => {
+    // no-op: avoid real gateway WS connections in browser tests
+  };
+  document.body.innerHTML = "";
+});
+
+afterEach(() => {
+  ClawdisApp.prototype.connect = originalConnect;
+  document.body.innerHTML = "";
+});
+
+describe("control UI routing", () => {
+  it("hydrates the tab from the location", async () => {
+    const app = mountApp("/sessions");
+    await app.updateComplete;
+
+    expect(app.tab).toBe("sessions");
+    expect(window.location.pathname).toBe("/sessions");
+  });
+
+  it("respects /ui base paths", async () => {
+    const app = mountApp("/ui/cron");
+    await app.updateComplete;
+
+    expect(app.basePath).toBe("/ui");
+    expect(app.tab).toBe("cron");
+    expect(window.location.pathname).toBe("/ui/cron");
+  });
+
+  it("updates the URL when clicking nav items", async () => {
+    const app = mountApp("/chat");
+    await app.updateComplete;
+
+    const link = app.querySelector<HTMLAnchorElement>(
+      'a.nav-item[href="/connections"]',
+    );
+    expect(link).not.toBeNull();
+    link?.dispatchEvent(
+      new MouseEvent("click", { bubbles: true, cancelable: true, button: 0 }),
+    );
+
+    await app.updateComplete;
+    expect(app.tab).toBe("connections");
+    expect(window.location.pathname).toBe("/connections");
+  });
+
+  it("auto-scrolls chat history to the latest message", async () => {
+    const app = mountApp("/chat");
+    await app.updateComplete;
+
+    const initialContainer = app.querySelector(".messages") as HTMLElement | null;
+    expect(initialContainer).not.toBeNull();
+    if (!initialContainer) return;
+    initialContainer.style.maxHeight = "180px";
+    initialContainer.style.overflow = "auto";
+
+    app.chatMessages = Array.from({ length: 60 }, (_, index) => ({
+      role: "assistant",
+      content: `Line ${index} - ${"x".repeat(200)}`,
+      timestamp: Date.now() + index,
+    }));
+
+    await app.updateComplete;
+    await nextFrame();
+
+    const container = app.querySelector(".messages") as HTMLElement | null;
+    expect(container).not.toBeNull();
+    if (!container) return;
+    const maxScroll = container.scrollHeight - container.clientHeight;
+    expect(maxScroll).toBeGreaterThan(0);
+    expect(container.scrollTop).toBe(maxScroll);
+  });
+});
diff --git a/ui/src/ui/navigation.ts b/ui/src/ui/navigation.ts
index 6e74791d6..77ac49571 100644
--- a/ui/src/ui/navigation.ts
+++ b/ui/src/ui/navigation.ts
@@ -20,6 +20,64 @@ export type Tab =
   | "config"
   | "debug";
 
+const TAB_PATHS: Record<Tab, string> = {
+  overview: "/overview",
+  connections: "/connections",
+  instances: "/instances",
+  sessions: "/sessions",
+  cron: "/cron",
+  skills: "/skills",
+  nodes: "/nodes",
+  chat: "/chat",
+  config: "/config",
+  debug: "/debug",
+};
+
+const PATH_TO_TAB = new Map(
+  Object.entries(TAB_PATHS).map(([tab, path]) => [path, tab as Tab]),
+);
+
+function normalizeBasePath(basePath: string): string {
+  if (!basePath) return "";
+  let base = basePath.trim();
+  if (!base.startsWith("/")) base = `/${base}`;
+  if (base === "/") return "";
+  if (base.endsWith("/")) base = base.slice(0, -1);
+  return base;
+}
+
+export function normalizePath(path: string): string {
+  if (!path) return "/";
+  let normalized = path.trim();
+  if (!normalized.startsWith("/")) normalized = `/${normalized}`;
+  if (normalized.length > 1 && normalized.endsWith("/")) {
+    normalized = normalized.slice(0, -1);
+  }
+  return normalized;
+}
+
+export function pathForTab(tab: Tab, basePath = ""): string {
+  const base = normalizeBasePath(basePath);
+  const path = TAB_PATHS[tab];
+  return base ? `${base}${path}` : path;
+}
+
+export function tabFromPath(pathname: string, basePath = ""): Tab | null {
+  const base = normalizeBasePath(basePath);
+  let path = pathname || "/";
+  if (base) {
+    if (path === base) {
+      path = "/";
+    } else if (path.startsWith(`${base}/`)) {
+      path = path.slice(base.length);
+    }
+  }
+  let normalized = normalizePath(path).toLowerCase();
+  if (normalized.endsWith("/index.html")) normalized = "/";
+  if (normalized === "/") return "chat";
+  return PATH_TO_TAB.get(normalized) ?? null;
+}
+
 export function titleForTab(tab: Tab) {
   switch (tab) {
     case "overview":
diff --git a/ui/vitest.config.ts b/ui/vitest.config.ts
new file mode 100644
index 000000000..38d7342ff
--- /dev/null
+++ b/ui/vitest.config.ts
@@ -0,0 +1,15 @@
+import { playwright } from "@vitest/browser-playwright";
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    include: ["src/**/*.test.ts"],
+    browser: {
+      enabled: true,
+      provider: playwright(),
+      instances: [{ browser: "chromium", name: "chromium" }],
+      headless: true,
+      ui: false,
+    },
+  },
+});

From d7b267843e8e44b8ab74bedc37bb77407cf11fe0 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 14:32:47 +0100
Subject: [PATCH 071/100] fix: fallback mp3 when pcm blocked

---
 apps/ios/Sources/Voice/TalkModeManager.swift  | 42 ++++++++++++-------
 .../Sources/Clawdis/TalkModeRuntime.swift     | 39 +++++++++++------
 apps/macos/Sources/Clawdis/TalkOverlay.swift  |  5 +++
 .../Sources/Clawdis/TalkOverlayView.swift     |  1 +
 4 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/apps/ios/Sources/Voice/TalkModeManager.swift b/apps/ios/Sources/Voice/TalkModeManager.swift
index fefefe68f..355c67321 100644
--- a/apps/ios/Sources/Voice/TalkModeManager.swift
+++ b/apps/ios/Sources/Voice/TalkModeManager.swift
@@ -473,19 +473,23 @@ final class TalkModeManager: NSObject {
                 }
 
                 let modelId = directive?.modelId ?? self.currentModelId ?? self.defaultModelId
-                let request = ElevenLabsTTSRequest(
-                    text: cleaned,
-                    modelId: modelId,
-                    outputFormat: outputFormat,
-                    speed: TalkTTSValidation.resolveSpeed(speed: directive?.speed, rateWPM: directive?.rateWPM),
-                    stability: TalkTTSValidation.validatedStability(directive?.stability, modelId: modelId),
-                    similarity: TalkTTSValidation.validatedUnit(directive?.similarity),
-                    style: TalkTTSValidation.validatedUnit(directive?.style),
-                    speakerBoost: directive?.speakerBoost,
-                    seed: TalkTTSValidation.validatedSeed(directive?.seed),
-                    normalize: ElevenLabsTTSClient.validatedNormalize(directive?.normalize),
-                    language: language,
-                    latencyTier: TalkTTSValidation.validatedLatencyTier(directive?.latencyTier))
+                func makeRequest(outputFormat: String?) -> ElevenLabsTTSRequest {
+                    ElevenLabsTTSRequest(
+                        text: cleaned,
+                        modelId: modelId,
+                        outputFormat: outputFormat,
+                        speed: TalkTTSValidation.resolveSpeed(speed: directive?.speed, rateWPM: directive?.rateWPM),
+                        stability: TalkTTSValidation.validatedStability(directive?.stability, modelId: modelId),
+                        similarity: TalkTTSValidation.validatedUnit(directive?.similarity),
+                        style: TalkTTSValidation.validatedUnit(directive?.style),
+                        speakerBoost: directive?.speakerBoost,
+                        seed: TalkTTSValidation.validatedSeed(directive?.seed),
+                        normalize: ElevenLabsTTSClient.validatedNormalize(directive?.normalize),
+                        language: language,
+                        latencyTier: TalkTTSValidation.validatedLatencyTier(directive?.latencyTier))
+                }
+
+                let request = makeRequest(outputFormat: outputFormat)
 
                 let client = ElevenLabsTTSClient(apiKey: apiKey)
                 let stream = client.streamSynthesize(voiceId: voiceId, request: request)
@@ -504,7 +508,17 @@ final class TalkModeManager: NSObject {
                 let result: StreamingPlaybackResult
                 if let sampleRate {
                     self.lastPlaybackWasPCM = true
-                    result = await self.pcmPlayer.play(stream: stream, sampleRate: sampleRate)
+                    var playback = await self.pcmPlayer.play(stream: stream, sampleRate: sampleRate)
+                    if !playback.finished, playback.interruptedAt == nil {
+                        let mp3Format = ElevenLabsTTSClient.validatedOutputFormat("mp3_44100")
+                        self.logger.warning("pcm playback failed; retrying mp3")
+                        self.lastPlaybackWasPCM = false
+                        let mp3Stream = client.streamSynthesize(
+                            voiceId: voiceId,
+                            request: makeRequest(outputFormat: mp3Format))
+                        playback = await self.mp3Player.play(stream: mp3Stream)
+                    }
+                    result = playback
                 } else {
                     self.lastPlaybackWasPCM = false
                     result = await self.mp3Player.play(stream: stream)
diff --git a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
index d177aa586..04a732db0 100644
--- a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
+++ b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
@@ -507,19 +507,23 @@ actor TalkModeRuntime {
                 }
 
                 let modelId = directive?.modelId ?? self.currentModelId ?? self.defaultModelId
-                let request = ElevenLabsTTSRequest(
-                    text: cleaned,
-                    modelId: modelId,
-                    outputFormat: outputFormat,
-                    speed: TalkTTSValidation.resolveSpeed(speed: directive?.speed, rateWPM: directive?.rateWPM),
-                    stability: TalkTTSValidation.validatedStability(directive?.stability, modelId: modelId),
-                    similarity: TalkTTSValidation.validatedUnit(directive?.similarity),
-                    style: TalkTTSValidation.validatedUnit(directive?.style),
-                    speakerBoost: directive?.speakerBoost,
-                    seed: TalkTTSValidation.validatedSeed(directive?.seed),
-                    normalize: ElevenLabsTTSClient.validatedNormalize(directive?.normalize),
-                    language: language,
-                    latencyTier: TalkTTSValidation.validatedLatencyTier(directive?.latencyTier))
+                func makeRequest(outputFormat: String?) -> ElevenLabsTTSRequest {
+                    ElevenLabsTTSRequest(
+                        text: cleaned,
+                        modelId: modelId,
+                        outputFormat: outputFormat,
+                        speed: TalkTTSValidation.resolveSpeed(speed: directive?.speed, rateWPM: directive?.rateWPM),
+                        stability: TalkTTSValidation.validatedStability(directive?.stability, modelId: modelId),
+                        similarity: TalkTTSValidation.validatedUnit(directive?.similarity),
+                        style: TalkTTSValidation.validatedUnit(directive?.style),
+                        speakerBoost: directive?.speakerBoost,
+                        seed: TalkTTSValidation.validatedSeed(directive?.seed),
+                        normalize: ElevenLabsTTSClient.validatedNormalize(directive?.normalize),
+                        language: language,
+                        latencyTier: TalkTTSValidation.validatedLatencyTier(directive?.latencyTier))
+                }
+
+                let request = makeRequest(outputFormat: outputFormat)
 
                 self.ttsLogger.info("talk TTS synth timeout=\(synthTimeoutSeconds, privacy: .public)s")
                 let client = ElevenLabsTTSClient(apiKey: apiKey)
@@ -539,6 +543,15 @@ actor TalkModeRuntime {
                 if let sampleRate {
                     self.lastPlaybackWasPCM = true
                     result = await self.playPCM(stream: stream, sampleRate: sampleRate)
+                    if !result.finished, result.interruptedAt == nil {
+                        let mp3Format = ElevenLabsTTSClient.validatedOutputFormat("mp3_44100")
+                        self.ttsLogger.warning("talk pcm playback failed; retrying mp3")
+                        self.lastPlaybackWasPCM = false
+                        let mp3Stream = client.streamSynthesize(
+                            voiceId: voiceId,
+                            request: makeRequest(outputFormat: mp3Format))
+                        result = await self.playMP3(stream: mp3Stream)
+                    }
                 } else {
                     self.lastPlaybackWasPCM = false
                     result = await self.playMP3(stream: stream)
diff --git a/apps/macos/Sources/Clawdis/TalkOverlay.swift b/apps/macos/Sources/Clawdis/TalkOverlay.swift
index d99f45dbe..258ac2beb 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlay.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlay.swift
@@ -112,6 +112,7 @@ final class TalkOverlayController {
         panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .transient]
         panel.hidesOnDeactivate = false
         panel.isMovable = false
+        panel.acceptsMouseMovedEvents = true
         panel.isFloatingPanel = true
         panel.becomesKeyOnlyIfNeeded = true
         panel.titleVisibility = .hidden
@@ -136,6 +137,10 @@ final class TalkOverlayController {
 }
 
 private final class TalkOverlayHostingView: NSHostingView<TalkOverlayView> {
+    override func acceptsFirstMouse(for event: NSEvent?) -> Bool {
+        true
+    }
+
     override func hitTest(_ point: NSPoint) -> NSView? {
         let center = CGPoint(
             x: self.bounds.maxX - TalkOverlayController.orbPadding - (TalkOverlayController.orbSize / 2),
diff --git a/apps/macos/Sources/Clawdis/TalkOverlayView.swift b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
index 6d886a608..d6c9a3a73 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlayView.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
@@ -97,6 +97,7 @@ private final class OrbInteractionNSView: NSView {
     private var suppressSingleClick = false
 
     override var acceptsFirstResponder: Bool { true }
+    override func acceptsFirstMouse(for event: NSEvent?) -> Bool { true }
 
     override func mouseDown(with event: NSEvent) {
         self.mouseDownEvent = event

From 63067866457feb9f952c3ce190bd6203cab107db Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 14:35:53 +0100
Subject: [PATCH 072/100] fix: allow mp3 fallback result

---
 apps/macos/Sources/Clawdis/TalkModeRuntime.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
index 04a732db0..0289c7c0a 100644
--- a/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
+++ b/apps/macos/Sources/Clawdis/TalkModeRuntime.swift
@@ -539,7 +539,7 @@ actor TalkModeRuntime {
                 self.phase = .speaking
 
                 let sampleRate = TalkTTSValidation.pcmSampleRate(from: outputFormat)
-                let result: StreamingPlaybackResult
+                var result: StreamingPlaybackResult
                 if let sampleRate {
                     self.lastPlaybackWasPCM = true
                     result = await self.playPCM(stream: stream, sampleRate: sampleRate)

From cf903be4a76afd83c7b75467a43a53fba3fd9a3c Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 14:37:59 +0100
Subject: [PATCH 073/100] fix: avoid duplicate gateway reconnecting pill

---
 .../main/java/com/steipete/clawdis/node/ui/RootScreen.kt  | 8 +-------
 apps/ios/Sources/RootCanvas.swift                         | 4 +---
 apps/ios/Sources/RootTabs.swift                           | 4 +---
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
index a404f0490..b81a047f4 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/RootScreen.kt
@@ -118,13 +118,7 @@ fun RootScreen(viewModel: MainViewModel) {
           contentDescription = "Approval pending",
         )
       }
-      if (lowerStatus.contains("reconnecting") || lowerStatus.contains("connecting")) {
-        return@remember StatusActivity(
-          title = "Gateway reconnecting…",
-          icon = Icons.Default.Refresh,
-          contentDescription = "Gateway reconnecting",
-        )
-      }
+      // Avoid duplicating the primary bridge status ("Connecting…") in the activity slot.
 
       if (screenRecordActive) {
         return@remember StatusActivity(
diff --git a/apps/ios/Sources/RootCanvas.swift b/apps/ios/Sources/RootCanvas.swift
index 9a7360c33..bd3fefc52 100644
--- a/apps/ios/Sources/RootCanvas.swift
+++ b/apps/ios/Sources/RootCanvas.swift
@@ -216,9 +216,7 @@ private struct CanvasContent: View {
         if bridgeLower.contains("approval") || bridgeLower.contains("pairing") {
             return StatusPill.Activity(title: "Approval pending", systemImage: "person.crop.circle.badge.clock")
         }
-        if bridgeLower.contains("reconnecting") || bridgeLower.contains("connecting") {
-            return StatusPill.Activity(title: "Gateway reconnecting…", systemImage: "arrow.triangle.2.circlepath")
-        }
+        // Avoid duplicating the primary bridge status ("Connecting…") in the activity slot.
 
         if self.appModel.screenRecordActive {
             return StatusPill.Activity(title: "Recording screen…", systemImage: "record.circle.fill", tint: .red)
diff --git a/apps/ios/Sources/RootTabs.swift b/apps/ios/Sources/RootTabs.swift
index a480fc8ab..e76d357a0 100644
--- a/apps/ios/Sources/RootTabs.swift
+++ b/apps/ios/Sources/RootTabs.swift
@@ -98,9 +98,7 @@ struct RootTabs: View {
         if bridgeLower.contains("approval") || bridgeLower.contains("pairing") {
             return StatusPill.Activity(title: "Approval pending", systemImage: "person.crop.circle.badge.clock")
         }
-        if bridgeLower.contains("reconnecting") || bridgeLower.contains("connecting") {
-            return StatusPill.Activity(title: "Gateway reconnecting…", systemImage: "arrow.triangle.2.circlepath")
-        }
+        // Avoid duplicating the primary bridge status ("Connecting…") in the activity slot.
 
         if self.appModel.screenRecordActive {
             return StatusPill.Activity(title: "Recording screen…", systemImage: "record.circle.fill", tint: .red)

From 52303e8edaa0e46b50a9079a88e47703a32eb4a7 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 14:39:33 +0100
Subject: [PATCH 074/100] docs: update changelog for status pill

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aeb93d838..426a84fde 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@
 - iOS/Android nodes: status pill now surfaces camera activity instead of overlay toasts.
 - iOS/Android/macOS nodes: camera snaps recompress to keep base64 payloads under 5 MB.
 - iOS/Android nodes: status pill now surfaces pairing, screen recording, voice wake, and foreground-required states.
+- iOS/Android nodes: avoid duplicating “Gateway reconnecting…” when the bridge is already connecting.
 - iOS/Android nodes: Talk Mode now lives on a side bubble (with an iOS toggle to hide it), and Android settings no longer show the Talk Mode switch.
 - macOS menu: top status line now shows pending node pairing approvals (incl. repairs).
 - CLI: avoid spurious gateway close errors after successful request/response cycles.

From 42cbb11de824186028fc533b5f4e5b7e0fb1d507 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 14:43:34 +0100
Subject: [PATCH 075/100] build: update a2ui bundle

---
 src/canvas-host/a2ui/.bundle.hash   |    2 +-
 src/canvas-host/a2ui/a2ui.bundle.js | 1315 ++++++++++++++-------------
 2 files changed, 667 insertions(+), 650 deletions(-)

diff --git a/src/canvas-host/a2ui/.bundle.hash b/src/canvas-host/a2ui/.bundle.hash
index 23e15ecec..7181e84c4 100644
--- a/src/canvas-host/a2ui/.bundle.hash
+++ b/src/canvas-host/a2ui/.bundle.hash
@@ -1 +1 @@
-401ee2e7aa55e8abfd5e8ee94810a75629253b88371dc70f5b04c4830cdcce8d
+c611d556d551748bf0bdae1d8a3f7d6055c061d92ef24060d89a430bfeeff6f8
diff --git a/src/canvas-host/a2ui/a2ui.bundle.js b/src/canvas-host/a2ui/a2ui.bundle.js
index fe6a9b220..1f21e3702 100644
--- a/src/canvas-host/a2ui/a2ui.bundle.js
+++ b/src/canvas-host/a2ui/a2ui.bundle.js
@@ -1,5 +1,5 @@
 var __defProp$1 = Object.defineProperty;
-var __export = (all, symbols) => {
+var __exportAll = (all, symbols) => {
 	let target = {};
 	for (var name in all) {
 		__defProp$1(target, name, {
@@ -18,10 +18,10 @@ var __export = (all, symbols) => {
 * Copyright 2019 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
 */
-const t$6 = globalThis, e$13 = t$6.ShadowRoot && (void 0 === t$6.ShadyCSS || t$6.ShadyCSS.nativeShadow) && "adoptedStyleSheets" in Document.prototype && "replace" in CSSStyleSheet.prototype, s$8 = Symbol(), o$13 = new WeakMap();
-var n$10 = class {
-	constructor(t$7, e$14, o$14) {
-		if (this._$cssResult$ = !0, o$14 !== s$8) throw Error("CSSResult is not constructable. Use `unsafeCSS` or `css` instead.");
+const t$6 = globalThis, e$13 = t$6.ShadowRoot && (void 0 === t$6.ShadyCSS || t$6.ShadyCSS.nativeShadow) && "adoptedStyleSheets" in Document.prototype && "replace" in CSSStyleSheet.prototype, s$8 = Symbol(), o$14 = new WeakMap();
+var n$12 = class {
+	constructor(t$7, e$14, o$15) {
+		if (this._$cssResult$ = !0, o$15 !== s$8) throw Error("CSSResult is not constructable. Use `unsafeCSS` or `css` instead.");
 		this.cssText = t$7, this.t = e$14;
 	}
 	get styleSheet() {
@@ -29,7 +29,7 @@ var n$10 = class {
 		const s$9 = this.t;
 		if (e$13 && void 0 === t$7) {
 			const e$14 = void 0 !== s$9 && 1 === s$9.length;
-			e$14 && (t$7 = o$13.get(s$9)), void 0 === t$7 && ((this.o = t$7 = new CSSStyleSheet()).replaceSync(this.cssText), e$14 && o$13.set(s$9, t$7));
+			e$14 && (t$7 = o$14.get(s$9)), void 0 === t$7 && ((this.o = t$7 = new CSSStyleSheet()).replaceSync(this.cssText), e$14 && o$14.set(s$9, t$7));
 		}
 		return t$7;
 	}
@@ -37,30 +37,30 @@ var n$10 = class {
 		return this.cssText;
 	}
 };
-const r$10 = (t$7) => new n$10("string" == typeof t$7 ? t$7 : t$7 + "", void 0, s$8), i$9 = (t$7, ...e$14) => {
-	const o$14 = 1 === t$7.length ? t$7[0] : e$14.reduce(((e$15, s$9, o$15) => e$15 + ((t$8) => {
+const r$11 = (t$7) => new n$12("string" == typeof t$7 ? t$7 : t$7 + "", void 0, s$8), i$9 = (t$7, ...e$14) => {
+	const o$15 = 1 === t$7.length ? t$7[0] : e$14.reduce((e$15, s$9, o$16) => e$15 + ((t$8) => {
 		if (!0 === t$8._$cssResult$) return t$8.cssText;
 		if ("number" == typeof t$8) return t$8;
 		throw Error("Value passed to 'css' function must be a 'css' function result: " + t$8 + ". Use 'unsafeCSS' to pass non-literal values, but take care to ensure page security.");
-	})(s$9) + t$7[o$15 + 1]), t$7[0]);
-	return new n$10(o$14, t$7, s$8);
-}, S$1 = (s$9, o$14) => {
-	if (e$13) s$9.adoptedStyleSheets = o$14.map(((t$7) => t$7 instanceof CSSStyleSheet ? t$7 : t$7.styleSheet));
-	else for (const e$14 of o$14) {
-		const o$15 = document.createElement("style"), n$11 = t$6.litNonce;
-		void 0 !== n$11 && o$15.setAttribute("nonce", n$11), o$15.textContent = e$14.cssText, s$9.appendChild(o$15);
+	})(s$9) + t$7[o$16 + 1], t$7[0]);
+	return new n$12(o$15, t$7, s$8);
+}, S$1 = (s$9, o$15) => {
+	if (e$13) s$9.adoptedStyleSheets = o$15.map((t$7) => t$7 instanceof CSSStyleSheet ? t$7 : t$7.styleSheet);
+	else for (const e$14 of o$15) {
+		const o$16 = document.createElement("style"), n$13 = t$6.litNonce;
+		void 0 !== n$13 && o$16.setAttribute("nonce", n$13), o$16.textContent = e$14.cssText, s$9.appendChild(o$16);
 	}
 }, c$6 = e$13 ? (t$7) => t$7 : (t$7) => t$7 instanceof CSSStyleSheet ? ((t$8) => {
 	let e$14 = "";
 	for (const s$9 of t$8.cssRules) e$14 += s$9.cssText;
-	return r$10(e$14);
+	return r$11(e$14);
 })(t$7) : t$7;
 
 /**
 * @license
 * Copyright 2017 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
-*/ const { is: i$8, defineProperty: e$12, getOwnPropertyDescriptor: h$6, getOwnPropertyNames: r$9, getOwnPropertySymbols: o$12, getPrototypeOf: n$9 } = Object, a$1 = globalThis, c$5 = a$1.trustedTypes, l$4 = c$5 ? c$5.emptyScript : "", p$2 = a$1.reactiveElementPolyfillSupport, d$2 = (t$7, s$9) => t$7, u$3 = {
+*/ const { is: i$8, defineProperty: e$12, getOwnPropertyDescriptor: h$6, getOwnPropertyNames: r$10, getOwnPropertySymbols: o$13, getPrototypeOf: n$11 } = Object, a$1 = globalThis, c$5 = a$1.trustedTypes, l$4 = c$5 ? c$5.emptyScript : "", p$2 = a$1.reactiveElementPolyfillSupport, d$2 = (t$7, s$9) => t$7, u$3 = {
 	toAttribute(t$7, s$9) {
 		switch (s$9) {
 			case Boolean:
@@ -112,7 +112,7 @@ var y$1 = class extends HTMLElement {
 		}
 	}
 	static getPropertyDescriptor(t$7, s$9, i$10) {
-		const { get: e$14, set: r$11 } = h$6(this.prototype, t$7) ?? {
+		const { get: e$14, set: r$12 } = h$6(this.prototype, t$7) ?? {
 			get() {
 				return this[s$9];
 			},
@@ -124,7 +124,7 @@ var y$1 = class extends HTMLElement {
 			get: e$14,
 			set(s$10) {
 				const h$7 = e$14?.call(this);
-				r$11?.call(this, s$10), this.requestUpdate(t$7, h$7, i$10);
+				r$12?.call(this, s$10), this.requestUpdate(t$7, h$7, i$10);
 			},
 			configurable: !0,
 			enumerable: !0
@@ -135,13 +135,13 @@ var y$1 = class extends HTMLElement {
 	}
 	static _$Ei() {
 		if (this.hasOwnProperty(d$2("elementProperties"))) return;
-		const t$7 = n$9(this);
+		const t$7 = n$11(this);
 		t$7.finalize(), void 0 !== t$7.l && (this.l = [...t$7.l]), this.elementProperties = new Map(t$7.elementProperties);
 	}
 	static finalize() {
 		if (this.hasOwnProperty(d$2("finalized"))) return;
 		if (this.finalized = !0, this._$Ei(), this.hasOwnProperty(d$2("properties"))) {
-			const t$8 = this.properties, s$9 = [...r$9(t$8), ...o$12(t$8)];
+			const t$8 = this.properties, s$9 = [...r$10(t$8), ...o$13(t$8)];
 			for (const i$10 of s$9) this.createProperty(i$10, t$8[i$10]);
 		}
 		const t$7 = this[Symbol.metadata];
@@ -172,7 +172,7 @@ var y$1 = class extends HTMLElement {
 		super(), this._$Ep = void 0, this.isUpdatePending = !1, this.hasUpdated = !1, this._$Em = null, this._$Ev();
 	}
 	_$Ev() {
-		this._$ES = new Promise(((t$7) => this.enableUpdating = t$7)), this._$AL = new Map(), this._$E_(), this.requestUpdate(), this.constructor.l?.forEach(((t$7) => t$7(this)));
+		this._$ES = new Promise((t$7) => this.enableUpdating = t$7), this._$AL = new Map(), this._$E_(), this.requestUpdate(), this.constructor.l?.forEach((t$7) => t$7(this));
 	}
 	addController(t$7) {
 		(this._$EO ??= new Set()).add(t$7), void 0 !== this.renderRoot && this.isConnected && t$7.hostConnected?.();
@@ -190,11 +190,11 @@ var y$1 = class extends HTMLElement {
 		return S$1(t$7, this.constructor.elementStyles), t$7;
 	}
 	connectedCallback() {
-		this.renderRoot ??= this.createRenderRoot(), this.enableUpdating(!0), this._$EO?.forEach(((t$7) => t$7.hostConnected?.()));
+		this.renderRoot ??= this.createRenderRoot(), this.enableUpdating(!0), this._$EO?.forEach((t$7) => t$7.hostConnected?.());
 	}
 	enableUpdating(t$7) {}
 	disconnectedCallback() {
-		this._$EO?.forEach(((t$7) => t$7.hostDisconnected?.()));
+		this._$EO?.forEach((t$7) => t$7.hostDisconnected?.());
 	}
 	attributeChangedCallback(t$7, s$9, i$10) {
 		this._$AK(t$7, i$10);
@@ -211,20 +211,20 @@ var y$1 = class extends HTMLElement {
 		if (void 0 !== e$14 && this._$Em !== e$14) {
 			const t$8 = i$10.getPropertyOptions(e$14), h$7 = "function" == typeof t$8.converter ? { fromAttribute: t$8.converter } : void 0 !== t$8.converter?.fromAttribute ? t$8.converter : u$3;
 			this._$Em = e$14;
-			const r$11 = h$7.fromAttribute(s$9, t$8.type);
-			this[e$14] = r$11 ?? this._$Ej?.get(e$14) ?? r$11, this._$Em = null;
+			const r$12 = h$7.fromAttribute(s$9, t$8.type);
+			this[e$14] = r$12 ?? this._$Ej?.get(e$14) ?? r$12, this._$Em = null;
 		}
 	}
-	requestUpdate(t$7, s$9, i$10) {
+	requestUpdate(t$7, s$9, i$10, e$14 = !1, h$7) {
 		if (void 0 !== t$7) {
-			const e$14 = this.constructor, h$7 = this[t$7];
-			if (i$10 ??= e$14.getPropertyOptions(t$7), !((i$10.hasChanged ?? f$3)(h$7, s$9) || i$10.useDefault && i$10.reflect && h$7 === this._$Ej?.get(t$7) && !this.hasAttribute(e$14._$Eu(t$7, i$10)))) return;
+			const r$12 = this.constructor;
+			if (!1 === e$14 && (h$7 = this[t$7]), i$10 ??= r$12.getPropertyOptions(t$7), !((i$10.hasChanged ?? f$3)(h$7, s$9) || i$10.useDefault && i$10.reflect && h$7 === this._$Ej?.get(t$7) && !this.hasAttribute(r$12._$Eu(t$7, i$10)))) return;
 			this.C(t$7, s$9, i$10);
 		}
 		!1 === this.isUpdatePending && (this._$ES = this._$EP());
 	}
-	C(t$7, s$9, { useDefault: i$10, reflect: e$14, wrapped: h$7 }, r$11) {
-		i$10 && !(this._$Ej ??= new Map()).has(t$7) && (this._$Ej.set(t$7, r$11 ?? s$9 ?? this[t$7]), !0 !== h$7 || void 0 !== r$11) || (this._$AL.has(t$7) || (this.hasUpdated || i$10 || (s$9 = void 0), this._$AL.set(t$7, s$9)), !0 === e$14 && this._$Em !== t$7 && (this._$Eq ??= new Set()).add(t$7));
+	C(t$7, s$9, { useDefault: i$10, reflect: e$14, wrapped: h$7 }, r$12) {
+		i$10 && !(this._$Ej ??= new Map()).has(t$7) && (this._$Ej.set(t$7, r$12 ?? s$9 ?? this[t$7]), !0 !== h$7 || void 0 !== r$12) || (this._$AL.has(t$7) || (this.hasUpdated || i$10 || (s$9 = void 0), this._$AL.set(t$7, s$9)), !0 === e$14 && this._$Em !== t$7 && (this._$Eq ??= new Set()).add(t$7));
 	}
 	async _$EP() {
 		this.isUpdatePending = !0;
@@ -255,7 +255,7 @@ var y$1 = class extends HTMLElement {
 		let t$7 = !1;
 		const s$9 = this._$AL;
 		try {
-			t$7 = this.shouldUpdate(s$9), t$7 ? (this.willUpdate(s$9), this._$EO?.forEach(((t$8) => t$8.hostUpdate?.())), this.update(s$9)) : this._$EM();
+			t$7 = this.shouldUpdate(s$9), t$7 ? (this.willUpdate(s$9), this._$EO?.forEach((t$8) => t$8.hostUpdate?.()), this.update(s$9)) : this._$EM();
 		} catch (s$10) {
 			throw t$7 = !1, this._$EM(), s$10;
 		}
@@ -263,7 +263,7 @@ var y$1 = class extends HTMLElement {
 	}
 	willUpdate(t$7) {}
 	_$AE(t$7) {
-		this._$EO?.forEach(((t$8) => t$8.hostUpdated?.())), this.hasUpdated || (this.hasUpdated = !0, this.firstUpdated(t$7)), this.updated(t$7);
+		this._$EO?.forEach((t$8) => t$8.hostUpdated?.()), this.hasUpdated || (this.hasUpdated = !0, this.firstUpdated(t$7)), this.updated(t$7);
 	}
 	_$EM() {
 		this._$AL = new Map(), this.isUpdatePending = !1;
@@ -278,101 +278,101 @@ var y$1 = class extends HTMLElement {
 		return !0;
 	}
 	update(t$7) {
-		this._$Eq &&= this._$Eq.forEach(((t$8) => this._$ET(t$8, this[t$8]))), this._$EM();
+		this._$Eq &&= this._$Eq.forEach((t$8) => this._$ET(t$8, this[t$8])), this._$EM();
 	}
 	updated(t$7) {}
 	firstUpdated(t$7) {}
 };
-y$1.elementStyles = [], y$1.shadowRootOptions = { mode: "open" }, y$1[d$2("elementProperties")] = new Map(), y$1[d$2("finalized")] = new Map(), p$2?.({ ReactiveElement: y$1 }), (a$1.reactiveElementVersions ??= []).push("2.1.1");
+y$1.elementStyles = [], y$1.shadowRootOptions = { mode: "open" }, y$1[d$2("elementProperties")] = new Map(), y$1[d$2("finalized")] = new Map(), p$2?.({ ReactiveElement: y$1 }), (a$1.reactiveElementVersions ??= []).push("2.1.2");
 
 /**
 * @license
 * Copyright 2017 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
 */
-const t$5 = globalThis, i$7 = t$5.trustedTypes, s$7 = i$7 ? i$7.createPolicy("lit-html", { createHTML: (t$7) => t$7 }) : void 0, e$11 = "$lit$", h$5 = `lit$${Math.random().toFixed(9).slice(2)}$`, o$11 = "?" + h$5, n$8 = `<${o$11}>`, r$8 = document, l$3 = () => r$8.createComment(""), c$4 = (t$7) => null === t$7 || "object" != typeof t$7 && "function" != typeof t$7, a = Array.isArray, u$2 = (t$7) => a(t$7) || "function" == typeof t$7?.[Symbol.iterator], d$1 = "[ 	\n\f\r]", f$2 = /<(?:(!--|\/[^a-zA-Z])|(\/?[a-zA-Z][^>\s]*)|(\/?$))/g, v$1 = /-->/g, _ = />/g, m$2 = RegExp(`>|${d$1}(?:([^\\s"'>=/]+)(${d$1}*=${d$1}*(?:[^ \t\n\f\r"'\`<>=]|("|')|))|$)`, "g"), p$1 = /'/g, g = /"/g, $ = /^(?:script|style|textarea|title)$/i, y = (t$7) => (i$10, ...s$9) => ({
+const t$5 = globalThis, i$7 = (t$7) => t$7, s$7 = t$5.trustedTypes, e$11 = s$7 ? s$7.createPolicy("lit-html", { createHTML: (t$7) => t$7 }) : void 0, h$5 = "$lit$", o$12 = `lit$${Math.random().toFixed(9).slice(2)}$`, n$10 = "?" + o$12, r$9 = `<${n$10}>`, l$3 = document, c$4 = () => l$3.createComment(""), a = (t$7) => null === t$7 || "object" != typeof t$7 && "function" != typeof t$7, u$2 = Array.isArray, d$1 = (t$7) => u$2(t$7) || "function" == typeof t$7?.[Symbol.iterator], f$2 = "[ 	\n\f\r]", v$1 = /<(?:(!--|\/[^a-zA-Z])|(\/?[a-zA-Z][^>\s]*)|(\/?$))/g, _ = /-->/g, m$2 = />/g, p$1 = RegExp(`>|${f$2}(?:([^\\s"'>=/]+)(${f$2}*=${f$2}*(?:[^ \t\n\f\r"'\`<>=]|("|')|))|$)`, "g"), g = /'/g, $ = /"/g, y = /^(?:script|style|textarea|title)$/i, x = (t$7) => (i$10, ...s$9) => ({
 	_$litType$: t$7,
 	strings: i$10,
 	values: s$9
-}), x = y(1), b = y(2), w = y(3), T = Symbol.for("lit-noChange"), E = Symbol.for("lit-nothing"), A = new WeakMap(), C = r$8.createTreeWalker(r$8, 129);
-function P(t$7, i$10) {
-	if (!a(t$7) || !t$7.hasOwnProperty("raw")) throw Error("invalid template strings array");
-	return void 0 !== s$7 ? s$7.createHTML(i$10) : i$10;
+}), b = x(1), w = x(2), T = x(3), E = Symbol.for("lit-noChange"), A = Symbol.for("lit-nothing"), C = new WeakMap(), P = l$3.createTreeWalker(l$3, 129);
+function V(t$7, i$10) {
+	if (!u$2(t$7) || !t$7.hasOwnProperty("raw")) throw Error("invalid template strings array");
+	return void 0 !== e$11 ? e$11.createHTML(i$10) : i$10;
 }
-const V = (t$7, i$10) => {
-	const s$9 = t$7.length - 1, o$14 = [];
-	let r$11, l$5 = 2 === i$10 ? "<svg>" : 3 === i$10 ? "<math>" : "", c$7 = f$2;
+const N = (t$7, i$10) => {
+	const s$9 = t$7.length - 1, e$14 = [];
+	let n$13, l$5 = 2 === i$10 ? "<svg>" : 3 === i$10 ? "<math>" : "", c$7 = v$1;
 	for (let i$11 = 0; i$11 < s$9; i$11++) {
 		const s$10 = t$7[i$11];
-		let a$2, u$4, d$3 = -1, y$2 = 0;
-		for (; y$2 < s$10.length && (c$7.lastIndex = y$2, u$4 = c$7.exec(s$10), null !== u$4);) y$2 = c$7.lastIndex, c$7 === f$2 ? "!--" === u$4[1] ? c$7 = v$1 : void 0 !== u$4[1] ? c$7 = _ : void 0 !== u$4[2] ? ($.test(u$4[2]) && (r$11 = RegExp("</" + u$4[2], "g")), c$7 = m$2) : void 0 !== u$4[3] && (c$7 = m$2) : c$7 === m$2 ? ">" === u$4[0] ? (c$7 = r$11 ?? f$2, d$3 = -1) : void 0 === u$4[1] ? d$3 = -2 : (d$3 = c$7.lastIndex - u$4[2].length, a$2 = u$4[1], c$7 = void 0 === u$4[3] ? m$2 : "\"" === u$4[3] ? g : p$1) : c$7 === g || c$7 === p$1 ? c$7 = m$2 : c$7 === v$1 || c$7 === _ ? c$7 = f$2 : (c$7 = m$2, r$11 = void 0);
-		const x$1 = c$7 === m$2 && t$7[i$11 + 1].startsWith("/>") ? " " : "";
-		l$5 += c$7 === f$2 ? s$10 + n$8 : d$3 >= 0 ? (o$14.push(a$2), s$10.slice(0, d$3) + e$11 + s$10.slice(d$3) + h$5 + x$1) : s$10 + h$5 + (-2 === d$3 ? i$11 : x$1);
+		let a$2, u$4, d$3 = -1, f$4 = 0;
+		for (; f$4 < s$10.length && (c$7.lastIndex = f$4, u$4 = c$7.exec(s$10), null !== u$4);) f$4 = c$7.lastIndex, c$7 === v$1 ? "!--" === u$4[1] ? c$7 = _ : void 0 !== u$4[1] ? c$7 = m$2 : void 0 !== u$4[2] ? (y.test(u$4[2]) && (n$13 = RegExp("</" + u$4[2], "g")), c$7 = p$1) : void 0 !== u$4[3] && (c$7 = p$1) : c$7 === p$1 ? ">" === u$4[0] ? (c$7 = n$13 ?? v$1, d$3 = -1) : void 0 === u$4[1] ? d$3 = -2 : (d$3 = c$7.lastIndex - u$4[2].length, a$2 = u$4[1], c$7 = void 0 === u$4[3] ? p$1 : "\"" === u$4[3] ? $ : g) : c$7 === $ || c$7 === g ? c$7 = p$1 : c$7 === _ || c$7 === m$2 ? c$7 = v$1 : (c$7 = p$1, n$13 = void 0);
+		const x$1 = c$7 === p$1 && t$7[i$11 + 1].startsWith("/>") ? " " : "";
+		l$5 += c$7 === v$1 ? s$10 + r$9 : d$3 >= 0 ? (e$14.push(a$2), s$10.slice(0, d$3) + h$5 + s$10.slice(d$3) + o$12 + x$1) : s$10 + o$12 + (-2 === d$3 ? i$11 : x$1);
 	}
-	return [P(t$7, l$5 + (t$7[s$9] || "<?>") + (2 === i$10 ? "</svg>" : 3 === i$10 ? "</math>" : "")), o$14];
+	return [V(t$7, l$5 + (t$7[s$9] || "<?>") + (2 === i$10 ? "</svg>" : 3 === i$10 ? "</math>" : "")), e$14];
 };
-var N = class N {
-	constructor({ strings: t$7, _$litType$: s$9 }, n$11) {
-		let r$11;
+var S = class S {
+	constructor({ strings: t$7, _$litType$: i$10 }, e$14) {
+		let r$12;
 		this.parts = [];
-		let c$7 = 0, a$2 = 0;
-		const u$4 = t$7.length - 1, d$3 = this.parts, [f$4, v$2] = V(t$7, s$9);
-		if (this.el = N.createElement(f$4, n$11), C.currentNode = this.el.content, 2 === s$9 || 3 === s$9) {
+		let l$5 = 0, a$2 = 0;
+		const u$4 = t$7.length - 1, d$3 = this.parts, [f$4, v$2] = N(t$7, i$10);
+		if (this.el = S.createElement(f$4, e$14), P.currentNode = this.el.content, 2 === i$10 || 3 === i$10) {
 			const t$8 = this.el.content.firstChild;
 			t$8.replaceWith(...t$8.childNodes);
 		}
-		for (; null !== (r$11 = C.nextNode()) && d$3.length < u$4;) {
-			if (1 === r$11.nodeType) {
-				if (r$11.hasAttributes()) for (const t$8 of r$11.getAttributeNames()) if (t$8.endsWith(e$11)) {
-					const i$10 = v$2[a$2++], s$10 = r$11.getAttribute(t$8).split(h$5), e$14 = /([.?@])?(.*)/.exec(i$10);
+		for (; null !== (r$12 = P.nextNode()) && d$3.length < u$4;) {
+			if (1 === r$12.nodeType) {
+				if (r$12.hasAttributes()) for (const t$8 of r$12.getAttributeNames()) if (t$8.endsWith(h$5)) {
+					const i$11 = v$2[a$2++], s$9 = r$12.getAttribute(t$8).split(o$12), e$15 = /([.?@])?(.*)/.exec(i$11);
 					d$3.push({
 						type: 1,
-						index: c$7,
-						name: e$14[2],
-						strings: s$10,
-						ctor: "." === e$14[1] ? H : "?" === e$14[1] ? I : "@" === e$14[1] ? L : k
-					}), r$11.removeAttribute(t$8);
-				} else t$8.startsWith(h$5) && (d$3.push({
+						index: l$5,
+						name: e$15[2],
+						strings: s$9,
+						ctor: "." === e$15[1] ? I : "?" === e$15[1] ? L : "@" === e$15[1] ? z : H
+					}), r$12.removeAttribute(t$8);
+				} else t$8.startsWith(o$12) && (d$3.push({
 					type: 6,
-					index: c$7
-				}), r$11.removeAttribute(t$8));
-				if ($.test(r$11.tagName)) {
-					const t$8 = r$11.textContent.split(h$5), s$10 = t$8.length - 1;
-					if (s$10 > 0) {
-						r$11.textContent = i$7 ? i$7.emptyScript : "";
-						for (let i$10 = 0; i$10 < s$10; i$10++) r$11.append(t$8[i$10], l$3()), C.nextNode(), d$3.push({
+					index: l$5
+				}), r$12.removeAttribute(t$8));
+				if (y.test(r$12.tagName)) {
+					const t$8 = r$12.textContent.split(o$12), i$11 = t$8.length - 1;
+					if (i$11 > 0) {
+						r$12.textContent = s$7 ? s$7.emptyScript : "";
+						for (let s$9 = 0; s$9 < i$11; s$9++) r$12.append(t$8[s$9], c$4()), P.nextNode(), d$3.push({
 							type: 2,
-							index: ++c$7
+							index: ++l$5
 						});
-						r$11.append(t$8[s$10], l$3());
+						r$12.append(t$8[i$11], c$4());
 					}
 				}
-			} else if (8 === r$11.nodeType) if (r$11.data === o$11) d$3.push({
+			} else if (8 === r$12.nodeType) if (r$12.data === n$10) d$3.push({
 				type: 2,
-				index: c$7
+				index: l$5
 			});
 			else {
 				let t$8 = -1;
-				for (; -1 !== (t$8 = r$11.data.indexOf(h$5, t$8 + 1));) d$3.push({
+				for (; -1 !== (t$8 = r$12.data.indexOf(o$12, t$8 + 1));) d$3.push({
 					type: 7,
-					index: c$7
-				}), t$8 += h$5.length - 1;
+					index: l$5
+				}), t$8 += o$12.length - 1;
 			}
-			c$7++;
+			l$5++;
 		}
 	}
 	static createElement(t$7, i$10) {
-		const s$9 = r$8.createElement("template");
+		const s$9 = l$3.createElement("template");
 		return s$9.innerHTML = t$7, s$9;
 	}
 };
-function S(t$7, i$10, s$9 = t$7, e$14) {
-	if (i$10 === T) return i$10;
+function M$1(t$7, i$10, s$9 = t$7, e$14) {
+	if (i$10 === E) return i$10;
 	let h$7 = void 0 !== e$14 ? s$9._$Co?.[e$14] : s$9._$Cl;
-	const o$14 = c$4(i$10) ? void 0 : i$10._$litDirective$;
-	return h$7?.constructor !== o$14 && (h$7?._$AO?.(!1), void 0 === o$14 ? h$7 = void 0 : (h$7 = new o$14(t$7), h$7._$AT(t$7, s$9, e$14)), void 0 !== e$14 ? (s$9._$Co ??= [])[e$14] = h$7 : s$9._$Cl = h$7), void 0 !== h$7 && (i$10 = S(t$7, h$7._$AS(t$7, i$10.values), h$7, e$14)), i$10;
+	const o$15 = a(i$10) ? void 0 : i$10._$litDirective$;
+	return h$7?.constructor !== o$15 && (h$7?._$AO?.(!1), void 0 === o$15 ? h$7 = void 0 : (h$7 = new o$15(t$7), h$7._$AT(t$7, s$9, e$14)), void 0 !== e$14 ? (s$9._$Co ??= [])[e$14] = h$7 : s$9._$Cl = h$7), void 0 !== h$7 && (i$10 = M$1(t$7, h$7._$AS(t$7, i$10.values), h$7, e$14)), i$10;
 }
-var M$1 = class {
+var R = class {
 	constructor(t$7, i$10) {
 		this._$AV = [], this._$AN = void 0, this._$AD = t$7, this._$AM = i$10;
 	}
@@ -383,29 +383,29 @@ var M$1 = class {
 		return this._$AM._$AU;
 	}
 	u(t$7) {
-		const { el: { content: i$10 }, parts: s$9 } = this._$AD, e$14 = (t$7?.creationScope ?? r$8).importNode(i$10, !0);
-		C.currentNode = e$14;
-		let h$7 = C.nextNode(), o$14 = 0, n$11 = 0, l$5 = s$9[0];
-		for (; void 0 !== l$5;) {
-			if (o$14 === l$5.index) {
+		const { el: { content: i$10 }, parts: s$9 } = this._$AD, e$14 = (t$7?.creationScope ?? l$3).importNode(i$10, !0);
+		P.currentNode = e$14;
+		let h$7 = P.nextNode(), o$15 = 0, n$13 = 0, r$12 = s$9[0];
+		for (; void 0 !== r$12;) {
+			if (o$15 === r$12.index) {
 				let i$11;
-				2 === l$5.type ? i$11 = new R(h$7, h$7.nextSibling, this, t$7) : 1 === l$5.type ? i$11 = new l$5.ctor(h$7, l$5.name, l$5.strings, this, t$7) : 6 === l$5.type && (i$11 = new z(h$7, this, t$7)), this._$AV.push(i$11), l$5 = s$9[++n$11];
+				2 === r$12.type ? i$11 = new k(h$7, h$7.nextSibling, this, t$7) : 1 === r$12.type ? i$11 = new r$12.ctor(h$7, r$12.name, r$12.strings, this, t$7) : 6 === r$12.type && (i$11 = new Z(h$7, this, t$7)), this._$AV.push(i$11), r$12 = s$9[++n$13];
 			}
-			o$14 !== l$5?.index && (h$7 = C.nextNode(), o$14++);
+			o$15 !== r$12?.index && (h$7 = P.nextNode(), o$15++);
 		}
-		return C.currentNode = r$8, e$14;
+		return P.currentNode = l$3, e$14;
 	}
 	p(t$7) {
 		let i$10 = 0;
 		for (const s$9 of this._$AV) void 0 !== s$9 && (void 0 !== s$9.strings ? (s$9._$AI(t$7, s$9, i$10), i$10 += s$9.strings.length - 2) : s$9._$AI(t$7[i$10])), i$10++;
 	}
 };
-var R = class R {
+var k = class k {
 	get _$AU() {
 		return this._$AM?._$AU ?? this._$Cv;
 	}
 	constructor(t$7, i$10, s$9, e$14) {
-		this.type = 2, this._$AH = E, this._$AN = void 0, this._$AA = t$7, this._$AB = i$10, this._$AM = s$9, this.options = e$14, this._$Cv = e$14?.isConnected ?? !0;
+		this.type = 2, this._$AH = A, this._$AN = void 0, this._$AA = t$7, this._$AB = i$10, this._$AM = s$9, this.options = e$14, this._$Cv = e$14?.isConnected ?? !0;
 	}
 	get parentNode() {
 		let t$7 = this._$AA.parentNode;
@@ -419,7 +419,7 @@ var R = class R {
 		return this._$AB;
 	}
 	_$AI(t$7, i$10 = this) {
-		t$7 = S(this, t$7, i$10), c$4(t$7) ? t$7 === E || null == t$7 || "" === t$7 ? (this._$AH !== E && this._$AR(), this._$AH = E) : t$7 !== this._$AH && t$7 !== T && this._(t$7) : void 0 !== t$7._$litType$ ? this.$(t$7) : void 0 !== t$7.nodeType ? this.T(t$7) : u$2(t$7) ? this.k(t$7) : this._(t$7);
+		t$7 = M$1(this, t$7, i$10), a(t$7) ? t$7 === A || null == t$7 || "" === t$7 ? (this._$AH !== A && this._$AR(), this._$AH = A) : t$7 !== this._$AH && t$7 !== E && this._(t$7) : void 0 !== t$7._$litType$ ? this.$(t$7) : void 0 !== t$7.nodeType ? this.T(t$7) : d$1(t$7) ? this.k(t$7) : this._(t$7);
 	}
 	O(t$7) {
 		return this._$AA.parentNode.insertBefore(t$7, this._$AB);
@@ -428,38 +428,38 @@ var R = class R {
 		this._$AH !== t$7 && (this._$AR(), this._$AH = this.O(t$7));
 	}
 	_(t$7) {
-		this._$AH !== E && c$4(this._$AH) ? this._$AA.nextSibling.data = t$7 : this.T(r$8.createTextNode(t$7)), this._$AH = t$7;
+		this._$AH !== A && a(this._$AH) ? this._$AA.nextSibling.data = t$7 : this.T(l$3.createTextNode(t$7)), this._$AH = t$7;
 	}
 	$(t$7) {
-		const { values: i$10, _$litType$: s$9 } = t$7, e$14 = "number" == typeof s$9 ? this._$AC(t$7) : (void 0 === s$9.el && (s$9.el = N.createElement(P(s$9.h, s$9.h[0]), this.options)), s$9);
+		const { values: i$10, _$litType$: s$9 } = t$7, e$14 = "number" == typeof s$9 ? this._$AC(t$7) : (void 0 === s$9.el && (s$9.el = S.createElement(V(s$9.h, s$9.h[0]), this.options)), s$9);
 		if (this._$AH?._$AD === e$14) this._$AH.p(i$10);
 		else {
-			const t$8 = new M$1(e$14, this), s$10 = t$8.u(this.options);
+			const t$8 = new R(e$14, this), s$10 = t$8.u(this.options);
 			t$8.p(i$10), this.T(s$10), this._$AH = t$8;
 		}
 	}
 	_$AC(t$7) {
-		let i$10 = A.get(t$7.strings);
-		return void 0 === i$10 && A.set(t$7.strings, i$10 = new N(t$7)), i$10;
+		let i$10 = C.get(t$7.strings);
+		return void 0 === i$10 && C.set(t$7.strings, i$10 = new S(t$7)), i$10;
 	}
 	k(t$7) {
-		a(this._$AH) || (this._$AH = [], this._$AR());
+		u$2(this._$AH) || (this._$AH = [], this._$AR());
 		const i$10 = this._$AH;
 		let s$9, e$14 = 0;
-		for (const h$7 of t$7) e$14 === i$10.length ? i$10.push(s$9 = new R(this.O(l$3()), this.O(l$3()), this, this.options)) : s$9 = i$10[e$14], s$9._$AI(h$7), e$14++;
+		for (const h$7 of t$7) e$14 === i$10.length ? i$10.push(s$9 = new k(this.O(c$4()), this.O(c$4()), this, this.options)) : s$9 = i$10[e$14], s$9._$AI(h$7), e$14++;
 		e$14 < i$10.length && (this._$AR(s$9 && s$9._$AB.nextSibling, e$14), i$10.length = e$14);
 	}
-	_$AR(t$7 = this._$AA.nextSibling, i$10) {
-		for (this._$AP?.(!1, !0, i$10); t$7 !== this._$AB;) {
-			const i$11 = t$7.nextSibling;
-			t$7.remove(), t$7 = i$11;
+	_$AR(t$7 = this._$AA.nextSibling, s$9) {
+		for (this._$AP?.(!1, !0, s$9); t$7 !== this._$AB;) {
+			const s$10 = i$7(t$7).nextSibling;
+			i$7(t$7).remove(), t$7 = s$10;
 		}
 	}
 	setConnected(t$7) {
 		void 0 === this._$AM && (this._$Cv = t$7, this._$AP?.(t$7));
 	}
 };
-var k = class {
+var H = class {
 	get tagName() {
 		return this.element.tagName;
 	}
@@ -467,53 +467,53 @@ var k = class {
 		return this._$AM._$AU;
 	}
 	constructor(t$7, i$10, s$9, e$14, h$7) {
-		this.type = 1, this._$AH = E, this._$AN = void 0, this.element = t$7, this.name = i$10, this._$AM = e$14, this.options = h$7, s$9.length > 2 || "" !== s$9[0] || "" !== s$9[1] ? (this._$AH = Array(s$9.length - 1).fill(new String()), this.strings = s$9) : this._$AH = E;
+		this.type = 1, this._$AH = A, this._$AN = void 0, this.element = t$7, this.name = i$10, this._$AM = e$14, this.options = h$7, s$9.length > 2 || "" !== s$9[0] || "" !== s$9[1] ? (this._$AH = Array(s$9.length - 1).fill(new String()), this.strings = s$9) : this._$AH = A;
 	}
 	_$AI(t$7, i$10 = this, s$9, e$14) {
 		const h$7 = this.strings;
-		let o$14 = !1;
-		if (void 0 === h$7) t$7 = S(this, t$7, i$10, 0), o$14 = !c$4(t$7) || t$7 !== this._$AH && t$7 !== T, o$14 && (this._$AH = t$7);
+		let o$15 = !1;
+		if (void 0 === h$7) t$7 = M$1(this, t$7, i$10, 0), o$15 = !a(t$7) || t$7 !== this._$AH && t$7 !== E, o$15 && (this._$AH = t$7);
 		else {
 			const e$15 = t$7;
-			let n$11, r$11;
-			for (t$7 = h$7[0], n$11 = 0; n$11 < h$7.length - 1; n$11++) r$11 = S(this, e$15[s$9 + n$11], i$10, n$11), r$11 === T && (r$11 = this._$AH[n$11]), o$14 ||= !c$4(r$11) || r$11 !== this._$AH[n$11], r$11 === E ? t$7 = E : t$7 !== E && (t$7 += (r$11 ?? "") + h$7[n$11 + 1]), this._$AH[n$11] = r$11;
+			let n$13, r$12;
+			for (t$7 = h$7[0], n$13 = 0; n$13 < h$7.length - 1; n$13++) r$12 = M$1(this, e$15[s$9 + n$13], i$10, n$13), r$12 === E && (r$12 = this._$AH[n$13]), o$15 ||= !a(r$12) || r$12 !== this._$AH[n$13], r$12 === A ? t$7 = A : t$7 !== A && (t$7 += (r$12 ?? "") + h$7[n$13 + 1]), this._$AH[n$13] = r$12;
 		}
-		o$14 && !e$14 && this.j(t$7);
+		o$15 && !e$14 && this.j(t$7);
 	}
 	j(t$7) {
-		t$7 === E ? this.element.removeAttribute(this.name) : this.element.setAttribute(this.name, t$7 ?? "");
+		t$7 === A ? this.element.removeAttribute(this.name) : this.element.setAttribute(this.name, t$7 ?? "");
 	}
 };
-var H = class extends k {
+var I = class extends H {
 	constructor() {
 		super(...arguments), this.type = 3;
 	}
 	j(t$7) {
-		this.element[this.name] = t$7 === E ? void 0 : t$7;
+		this.element[this.name] = t$7 === A ? void 0 : t$7;
 	}
 };
-var I = class extends k {
+var L = class extends H {
 	constructor() {
 		super(...arguments), this.type = 4;
 	}
 	j(t$7) {
-		this.element.toggleAttribute(this.name, !!t$7 && t$7 !== E);
+		this.element.toggleAttribute(this.name, !!t$7 && t$7 !== A);
 	}
 };
-var L = class extends k {
+var z = class extends H {
 	constructor(t$7, i$10, s$9, e$14, h$7) {
 		super(t$7, i$10, s$9, e$14, h$7), this.type = 5;
 	}
 	_$AI(t$7, i$10 = this) {
-		if ((t$7 = S(this, t$7, i$10, 0) ?? E) === T) return;
-		const s$9 = this._$AH, e$14 = t$7 === E && s$9 !== E || t$7.capture !== s$9.capture || t$7.once !== s$9.once || t$7.passive !== s$9.passive, h$7 = t$7 !== E && (s$9 === E || e$14);
+		if ((t$7 = M$1(this, t$7, i$10, 0) ?? A) === E) return;
+		const s$9 = this._$AH, e$14 = t$7 === A && s$9 !== A || t$7.capture !== s$9.capture || t$7.once !== s$9.once || t$7.passive !== s$9.passive, h$7 = t$7 !== A && (s$9 === A || e$14);
 		e$14 && this.element.removeEventListener(this.name, this, s$9), h$7 && this.element.addEventListener(this.name, this, t$7), this._$AH = t$7;
 	}
 	handleEvent(t$7) {
 		"function" == typeof this._$AH ? this._$AH.call(this.options?.host ?? this.element, t$7) : this._$AH.handleEvent(t$7);
 	}
 };
-var z = class {
+var Z = class {
 	constructor(t$7, i$10, s$9) {
 		this.element = t$7, this.type = 6, this._$AN = void 0, this._$AM = i$10, this.options = s$9;
 	}
@@ -521,32 +521,32 @@ var z = class {
 		return this._$AM._$AU;
 	}
 	_$AI(t$7) {
-		S(this, t$7);
+		M$1(this, t$7);
 	}
 };
-const Z = {
-	M: e$11,
-	P: h$5,
-	A: o$11,
+const j$1 = {
+	M: h$5,
+	P: o$12,
+	A: n$10,
 	C: 1,
-	L: V,
-	R: M$1,
-	D: u$2,
-	V: S,
-	I: R,
-	H: k,
-	N: I,
-	U: L,
-	B: H,
-	F: z
-}, j = t$5.litHtmlPolyfillSupport;
-j?.(N, R), (t$5.litHtmlVersions ??= []).push("3.3.1");
-const B = (t$7, i$10, s$9) => {
+	L: N,
+	R,
+	D: d$1,
+	V: M$1,
+	I: k,
+	H,
+	N: L,
+	U: z,
+	B: I,
+	F: Z
+}, B = t$5.litHtmlPolyfillSupport;
+B?.(S, k), (t$5.litHtmlVersions ??= []).push("3.3.2");
+const D = (t$7, i$10, s$9) => {
 	const e$14 = s$9?.renderBefore ?? i$10;
 	let h$7 = e$14._$litPart$;
 	if (void 0 === h$7) {
 		const t$8 = s$9?.renderBefore ?? null;
-		e$14._$litPart$ = h$7 = new R(i$10.insertBefore(l$3(), t$8), t$8, void 0, s$9 ?? {});
+		e$14._$litPart$ = h$7 = new k(i$10.insertBefore(c$4(), t$8), t$8, void 0, s$9 ?? {});
 	}
 	return h$7._$AI(t$7), h$7;
 };
@@ -565,8 +565,8 @@ var i$6 = class extends y$1 {
 		return this.renderOptions.renderBefore ??= t$7.firstChild, t$7;
 	}
 	update(t$7) {
-		const r$11 = this.render();
-		this.hasUpdated || (this.renderOptions.isConnected = this.isConnected), super.update(t$7), this._$Do = B(r$11, this.renderRoot, this.renderOptions);
+		const r$12 = this.render();
+		this.hasUpdated || (this.renderOptions.isConnected = this.isConnected), super.update(t$7), this._$Do = D(r$12, this.renderRoot, this.renderOptions);
 	}
 	connectedCallback() {
 		super.connectedCallback(), this._$Do?.setConnected(!0);
@@ -575,26 +575,26 @@ var i$6 = class extends y$1 {
 		super.disconnectedCallback(), this._$Do?.setConnected(!1);
 	}
 	render() {
-		return T;
+		return E;
 	}
 };
 i$6._$litElement$ = !0, i$6["finalized"] = !0, s$6.litElementHydrateSupport?.({ LitElement: i$6 });
-const o$10 = s$6.litElementPolyfillSupport;
-o$10?.({ LitElement: i$6 });
-const n$7 = {
-	_$AK: (t$7, e$14, r$11) => {
-		t$7._$AK(e$14, r$11);
+const o$11 = s$6.litElementPolyfillSupport;
+o$11?.({ LitElement: i$6 });
+const n$9 = {
+	_$AK: (t$7, e$14, r$12) => {
+		t$7._$AK(e$14, r$12);
 	},
 	_$AL: (t$7) => t$7._$AL
 };
-(s$6.litElementVersions ??= []).push("4.2.1");
+(s$6.litElementVersions ??= []).push("4.2.2");
 
 /**
 * @license
 * Copyright 2022 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
 */
-const o$9 = !1;
+const o$10 = !1;
 
 /**
 * @license
@@ -632,34 +632,34 @@ var i$5 = class {
 * @license
 * Copyright 2020 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
-*/ const { I: t$3 } = Z, i$4 = (o$14) => null === o$14 || "object" != typeof o$14 && "function" != typeof o$14, n$6 = {
+*/ const { I: t$3 } = j$1, i$4 = (o$15) => o$15, n$8 = (o$15) => null === o$15 || "object" != typeof o$15 && "function" != typeof o$15, e$9 = {
 	HTML: 1,
 	SVG: 2,
 	MATHML: 3
-}, e$9 = (o$14, t$7) => void 0 === t$7 ? void 0 !== o$14?._$litType$ : o$14?._$litType$ === t$7, l$2 = (o$14) => null != o$14?._$litType$?.h, d = (o$14) => void 0 !== o$14?._$litDirective$, c$3 = (o$14) => o$14?._$litDirective$, f$1 = (o$14) => void 0 === o$14.strings, r$7 = () => document.createComment(""), s$5 = (o$14, i$10, n$11) => {
-	const e$14 = o$14._$AA.parentNode, l$5 = void 0 === i$10 ? o$14._$AB : i$10._$AA;
-	if (void 0 === n$11) {
-		const i$11 = e$14.insertBefore(r$7(), l$5), d$3 = e$14.insertBefore(r$7(), l$5);
-		n$11 = new t$3(i$11, d$3, o$14, o$14.options);
+}, l$2 = (o$15, t$7) => void 0 === t$7 ? void 0 !== o$15?._$litType$ : o$15?._$litType$ === t$7, d = (o$15) => null != o$15?._$litType$?.h, c$3 = (o$15) => void 0 !== o$15?._$litDirective$, f$1 = (o$15) => o$15?._$litDirective$, r$8 = (o$15) => void 0 === o$15.strings, s$5 = () => document.createComment(""), v = (o$15, n$13, e$14) => {
+	const l$5 = o$15._$AA.parentNode, d$3 = void 0 === n$13 ? o$15._$AB : n$13._$AA;
+	if (void 0 === e$14) {
+		const i$10 = l$5.insertBefore(s$5(), d$3), n$14 = l$5.insertBefore(s$5(), d$3);
+		e$14 = new t$3(i$10, n$14, o$15, o$15.options);
 	} else {
-		const t$7 = n$11._$AB.nextSibling, i$11 = n$11._$AM, d$3 = i$11 !== o$14;
-		if (d$3) {
+		const t$7 = e$14._$AB.nextSibling, n$14 = e$14._$AM, c$7 = n$14 !== o$15;
+		if (c$7) {
 			let t$8;
-			n$11._$AQ?.(o$14), n$11._$AM = o$14, void 0 !== n$11._$AP && (t$8 = o$14._$AU) !== i$11._$AU && n$11._$AP(t$8);
+			e$14._$AQ?.(o$15), e$14._$AM = o$15, void 0 !== e$14._$AP && (t$8 = o$15._$AU) !== n$14._$AU && e$14._$AP(t$8);
 		}
-		if (t$7 !== l$5 || d$3) {
-			let o$15 = n$11._$AA;
-			for (; o$15 !== t$7;) {
-				const t$8 = o$15.nextSibling;
-				e$14.insertBefore(o$15, l$5), o$15 = t$8;
+		if (t$7 !== d$3 || c$7) {
+			let o$16 = e$14._$AA;
+			for (; o$16 !== t$7;) {
+				const t$8 = i$4(o$16).nextSibling;
+				i$4(l$5).insertBefore(o$16, d$3), o$16 = t$8;
 			}
 		}
 	}
-	return n$11;
-}, v = (o$14, t$7, i$10 = o$14) => (o$14._$AI(t$7, i$10), o$14), u$1 = {}, m$1 = (o$14, t$7 = u$1) => o$14._$AH = t$7, p = (o$14) => o$14._$AH, M = (o$14) => {
-	o$14._$AR(), o$14._$AA.remove();
-}, h$4 = (o$14) => {
-	o$14._$AR();
+	return e$14;
+}, u$1 = (o$15, t$7, i$10 = o$15) => (o$15._$AI(t$7, i$10), o$15), m$1 = {}, p = (o$15, t$7 = m$1) => o$15._$AH = t$7, M = (o$15) => o$15._$AH, h$4 = (o$15) => {
+	o$15._$AR(), o$15._$AA.remove();
+}, j = (o$15) => {
+	o$15._$AR();
 };
 
 /**
@@ -668,56 +668,56 @@ var i$5 = class {
 * SPDX-License-Identifier: BSD-3-Clause
 */
 const u = (e$14, s$9, t$7) => {
-	const r$11 = new Map();
-	for (let l$5 = s$9; l$5 <= t$7; l$5++) r$11.set(e$14[l$5], l$5);
-	return r$11;
+	const r$12 = new Map();
+	for (let l$5 = s$9; l$5 <= t$7; l$5++) r$12.set(e$14[l$5], l$5);
+	return r$12;
 }, c$2 = e$10(class extends i$5 {
 	constructor(e$14) {
 		if (super(e$14), e$14.type !== t$4.CHILD) throw Error("repeat() can only be used in text expressions");
 	}
 	dt(e$14, s$9, t$7) {
-		let r$11;
-		void 0 === t$7 ? t$7 = s$9 : void 0 !== s$9 && (r$11 = s$9);
-		const l$5 = [], o$14 = [];
+		let r$12;
+		void 0 === t$7 ? t$7 = s$9 : void 0 !== s$9 && (r$12 = s$9);
+		const l$5 = [], o$15 = [];
 		let i$10 = 0;
-		for (const s$10 of e$14) l$5[i$10] = r$11 ? r$11(s$10, i$10) : i$10, o$14[i$10] = t$7(s$10, i$10), i$10++;
+		for (const s$10 of e$14) l$5[i$10] = r$12 ? r$12(s$10, i$10) : i$10, o$15[i$10] = t$7(s$10, i$10), i$10++;
 		return {
-			values: o$14,
+			values: o$15,
 			keys: l$5
 		};
 	}
 	render(e$14, s$9, t$7) {
 		return this.dt(e$14, s$9, t$7).values;
 	}
-	update(s$9, [t$7, r$11, c$7]) {
-		const d$3 = p(s$9), { values: p$3, keys: a$2 } = this.dt(t$7, r$11, c$7);
+	update(s$9, [t$7, r$12, c$7]) {
+		const d$3 = M(s$9), { values: p$3, keys: a$2 } = this.dt(t$7, r$12, c$7);
 		if (!Array.isArray(d$3)) return this.ut = a$2, p$3;
 		const h$7 = this.ut ??= [], v$2 = [];
-		let m$3, y$2, x$1 = 0, j$1 = d$3.length - 1, k$1 = 0, w$1 = p$3.length - 1;
-		for (; x$1 <= j$1 && k$1 <= w$1;) if (null === d$3[x$1]) x$1++;
-		else if (null === d$3[j$1]) j$1--;
-		else if (h$7[x$1] === a$2[k$1]) v$2[k$1] = v(d$3[x$1], p$3[k$1]), x$1++, k$1++;
-		else if (h$7[j$1] === a$2[w$1]) v$2[w$1] = v(d$3[j$1], p$3[w$1]), j$1--, w$1--;
-		else if (h$7[x$1] === a$2[w$1]) v$2[w$1] = v(d$3[x$1], p$3[w$1]), s$5(s$9, v$2[w$1 + 1], d$3[x$1]), x$1++, w$1--;
-		else if (h$7[j$1] === a$2[k$1]) v$2[k$1] = v(d$3[j$1], p$3[k$1]), s$5(s$9, d$3[x$1], d$3[j$1]), j$1--, k$1++;
-		else if (void 0 === m$3 && (m$3 = u(a$2, k$1, w$1), y$2 = u(h$7, x$1, j$1)), m$3.has(h$7[x$1])) if (m$3.has(h$7[j$1])) {
+		let m$3, y$2, x$1 = 0, j$2 = d$3.length - 1, k$1 = 0, w$1 = p$3.length - 1;
+		for (; x$1 <= j$2 && k$1 <= w$1;) if (null === d$3[x$1]) x$1++;
+		else if (null === d$3[j$2]) j$2--;
+		else if (h$7[x$1] === a$2[k$1]) v$2[k$1] = u$1(d$3[x$1], p$3[k$1]), x$1++, k$1++;
+		else if (h$7[j$2] === a$2[w$1]) v$2[w$1] = u$1(d$3[j$2], p$3[w$1]), j$2--, w$1--;
+		else if (h$7[x$1] === a$2[w$1]) v$2[w$1] = u$1(d$3[x$1], p$3[w$1]), v(s$9, v$2[w$1 + 1], d$3[x$1]), x$1++, w$1--;
+		else if (h$7[j$2] === a$2[k$1]) v$2[k$1] = u$1(d$3[j$2], p$3[k$1]), v(s$9, d$3[x$1], d$3[j$2]), j$2--, k$1++;
+		else if (void 0 === m$3 && (m$3 = u(a$2, k$1, w$1), y$2 = u(h$7, x$1, j$2)), m$3.has(h$7[x$1])) if (m$3.has(h$7[j$2])) {
 			const e$14 = y$2.get(a$2[k$1]), t$8 = void 0 !== e$14 ? d$3[e$14] : null;
 			if (null === t$8) {
-				const e$15 = s$5(s$9, d$3[x$1]);
-				v(e$15, p$3[k$1]), v$2[k$1] = e$15;
-			} else v$2[k$1] = v(t$8, p$3[k$1]), s$5(s$9, d$3[x$1], t$8), d$3[e$14] = null;
+				const e$15 = v(s$9, d$3[x$1]);
+				u$1(e$15, p$3[k$1]), v$2[k$1] = e$15;
+			} else v$2[k$1] = u$1(t$8, p$3[k$1]), v(s$9, d$3[x$1], t$8), d$3[e$14] = null;
 			k$1++;
-		} else M(d$3[j$1]), j$1--;
-		else M(d$3[x$1]), x$1++;
+		} else h$4(d$3[j$2]), j$2--;
+		else h$4(d$3[x$1]), x$1++;
 		for (; k$1 <= w$1;) {
-			const e$14 = s$5(s$9, v$2[w$1 + 1]);
-			v(e$14, p$3[k$1]), v$2[k$1++] = e$14;
+			const e$14 = v(s$9, v$2[w$1 + 1]);
+			u$1(e$14, p$3[k$1]), v$2[k$1++] = e$14;
 		}
-		for (; x$1 <= j$1;) {
+		for (; x$1 <= j$2;) {
 			const e$14 = d$3[x$1++];
-			null !== e$14 && M(e$14);
+			null !== e$14 && h$4(e$14);
 		}
-		return this.ut = a$2, m$1(s$9, v$2), T;
+		return this.ut = a$2, p(s$9, v$2), E;
 	}
 });
 
@@ -727,11 +727,11 @@ const u = (e$14, s$9, t$7) => {
 * SPDX-License-Identifier: BSD-3-Clause
 */
 var s$4 = class extends Event {
-	constructor(s$9, t$7, e$14, o$14) {
+	constructor(s$9, t$7, e$14, o$15) {
 		super("context-request", {
 			bubbles: !0,
 			composed: !0
-		}), this.context = s$9, this.contextTarget = t$7, this.callback = e$14, this.subscribe = o$14 ?? !1;
+		}), this.context = s$9, this.contextTarget = t$7, this.callback = e$14, this.subscribe = o$15 ?? !1;
 	}
 };
 
@@ -740,8 +740,8 @@ var s$4 = class extends Event {
 * Copyright 2021 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
 */
-function n$5(n$11) {
-	return n$11;
+function n$7(n$13) {
+	return n$13;
 }
 
 /**
@@ -850,21 +850,21 @@ var i$3 = class extends s$2 {
 			const s$9 = this.pendingContextRequests.get(t$7.context);
 			if (void 0 === s$9) return;
 			this.pendingContextRequests.delete(t$7.context);
-			const { requests: o$14 } = s$9;
-			for (const { elementRef: s$10, callbackRef: n$11 } of o$14) {
-				const o$15 = s$10.deref(), c$7 = n$11.deref();
-				void 0 === o$15 || void 0 === c$7 || o$15.dispatchEvent(new s$4(t$7.context, o$15, c$7, !0));
+			const { requests: o$15 } = s$9;
+			for (const { elementRef: s$10, callbackRef: n$13 } of o$15) {
+				const o$16 = s$10.deref(), c$7 = n$13.deref();
+				void 0 === o$16 || void 0 === c$7 || o$16.dispatchEvent(new s$4(t$7.context, o$16, c$7, !0));
 			}
 		}, this.onContextRequest = (e$14) => {
 			if (!0 !== e$14.subscribe) return;
 			const t$7 = e$14.contextTarget ?? e$14.composedPath()[0], s$9 = e$14.callback;
-			let o$14 = this.pendingContextRequests.get(e$14.context);
-			void 0 === o$14 && this.pendingContextRequests.set(e$14.context, o$14 = {
+			let o$15 = this.pendingContextRequests.get(e$14.context);
+			void 0 === o$15 && this.pendingContextRequests.set(e$14.context, o$15 = {
 				callbacks: new WeakMap(),
 				requests: []
 			});
-			let n$11 = o$14.callbacks.get(t$7);
-			void 0 === n$11 && o$14.callbacks.set(t$7, n$11 = new WeakSet()), n$11.has(s$9) || (n$11.add(s$9), o$14.requests.push({
+			let n$13 = o$15.callbacks.get(t$7);
+			void 0 === n$13 && o$15.callbacks.set(t$7, n$13 = new WeakSet()), n$13.has(s$9) || (n$13.add(s$9), o$15.requests.push({
 				elementRef: new WeakRef(t$7),
 				callbackRef: new WeakRef(s$9)
 			}));
@@ -883,50 +883,50 @@ var i$3 = class extends s$2 {
 * Copyright 2017 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
 */ function e$7({ context: e$14 }) {
-	return (n$11, i$10) => {
-		const r$11 = new WeakMap();
+	return (n$13, i$10) => {
+		const r$12 = new WeakMap();
 		if ("object" == typeof i$10) return {
 			get() {
-				return n$11.get.call(this);
+				return n$13.get.call(this);
 			},
 			set(t$7) {
-				return r$11.get(this).setValue(t$7), n$11.set.call(this, t$7);
+				return r$12.get(this).setValue(t$7), n$13.set.call(this, t$7);
 			},
-			init(n$12) {
-				return r$11.set(this, new i$3(this, {
+			init(n$14) {
+				return r$12.set(this, new i$3(this, {
 					context: e$14,
-					initialValue: n$12
-				})), n$12;
+					initialValue: n$14
+				})), n$14;
 			}
 		};
 		{
-			n$11.constructor.addInitializer(((n$12) => {
-				r$11.set(n$12, new i$3(n$12, { context: e$14 }));
+			n$13.constructor.addInitializer(((n$14) => {
+				r$12.set(n$14, new i$3(n$14, { context: e$14 }));
 			}));
-			const o$14 = Object.getOwnPropertyDescriptor(n$11, i$10);
+			const o$15 = Object.getOwnPropertyDescriptor(n$13, i$10);
 			let s$9;
-			if (void 0 === o$14) {
+			if (void 0 === o$15) {
 				const t$7 = new WeakMap();
 				s$9 = {
 					get() {
 						return t$7.get(this);
 					},
 					set(e$15) {
-						r$11.get(this).setValue(e$15), t$7.set(this, e$15);
+						r$12.get(this).setValue(e$15), t$7.set(this, e$15);
 					},
 					configurable: !0,
 					enumerable: !0
 				};
 			} else {
-				const t$7 = o$14.set;
+				const t$7 = o$15.set;
 				s$9 = {
-					...o$14,
+					...o$15,
 					set(e$15) {
-						r$11.get(this).setValue(e$15), t$7?.call(this, e$15);
+						r$12.get(this).setValue(e$15), t$7?.call(this, e$15);
 					}
 				};
 			}
-			return void Object.defineProperty(n$11, i$10, s$9);
+			return void Object.defineProperty(n$13, i$10, s$9);
 		}
 	};
 }
@@ -936,20 +936,20 @@ var i$3 = class extends s$2 {
 * Copyright 2022 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
 */ function c$1({ context: c$7, subscribe: e$14 }) {
-	return (o$14, n$11) => {
-		"object" == typeof n$11 ? n$11.addInitializer((function() {
+	return (o$15, n$13) => {
+		"object" == typeof n$13 ? n$13.addInitializer((function() {
 			new s$3(this, {
 				context: c$7,
 				callback: (t$7) => {
-					o$14.set.call(this, t$7);
+					o$15.set.call(this, t$7);
 				},
 				subscribe: e$14
 			});
-		})) : o$14.constructor.addInitializer(((o$15) => {
-			new s$3(o$15, {
+		})) : o$15.constructor.addInitializer(((o$16) => {
+			new s$3(o$16, {
 				context: c$7,
 				callback: (t$7) => {
-					o$15[n$11] = t$7;
+					o$16[n$13] = t$7;
 				},
 				subscribe: e$14
 			});
@@ -1120,9 +1120,9 @@ const color = (src) => `
     ${src.map((key) => {
 	const inverseKey = getInverseKey(key);
 	const vals = [`.color-bgc-${key} { background-color: light-dark(var(${toProp(key)}), var(${toProp(inverseKey)})); }`, `.color-bbgc-${key}::backdrop { background-color: light-dark(var(${toProp(key)}), var(${toProp(inverseKey)})); }`];
-	for (let o$14 = .1; o$14 < 1; o$14 += .1) {
-		vals.push(`.color-bbgc-${key}_${(o$14 * 100).toFixed(0)}::backdrop {
-            background-color: light-dark(oklch(from var(${toProp(key)}) l c h / calc(alpha * ${o$14.toFixed(1)})), oklch(from var(${toProp(inverseKey)}) l c h / calc(alpha * ${o$14.toFixed(1)})) );
+	for (let o$15 = .1; o$15 < 1; o$15 += .1) {
+		vals.push(`.color-bbgc-${key}_${(o$15 * 100).toFixed(0)}::backdrop {
+            background-color: light-dark(oklch(from var(${toProp(key)}) l c h / calc(alpha * ${o$15.toFixed(1)})), oklch(from var(${toProp(inverseKey)}) l c h / calc(alpha * ${o$15.toFixed(1)})) );
           }
         `);
 	}
@@ -1553,7 +1553,7 @@ const structuralStyles$1 = [
 	type$1
 ].flat(Infinity).join("\n");
 
-var guards_exports = /* @__PURE__ */ __export({
+var guards_exports = /* @__PURE__ */ __exportAll({
 	isComponentArrayReference: () => isComponentArrayReference,
 	isObject: () => isObject$1,
 	isPath: () => isPath,
@@ -2643,7 +2643,7 @@ var Signal;
 			if (!(0, Signal2.isComputed)(sink) && !(0, Signal2.isWatcher)(sink)) {
 				throw new TypeError("Called introspectSources without a Computed or Watcher argument");
 			}
-			return ((_a3 = sink[NODE].producerNode) == null ? void 0 : _a3.map((n$11) => n$11.wrapper)) ?? [];
+			return ((_a3 = sink[NODE].producerNode) == null ? void 0 : _a3.map((n$13) => n$13.wrapper)) ?? [];
 		}
 		subtle2.introspectSources = introspectSources;
 		function introspectSinks(signal) {
@@ -2651,7 +2651,7 @@ var Signal;
 			if (!(0, Signal2.isComputed)(signal) && !(0, Signal2.isState)(signal)) {
 				throw new TypeError("Called introspectSinks without a Signal argument");
 			}
-			return ((_a3 = signal[NODE].liveConsumerNode) == null ? void 0 : _a3.map((n$11) => n$11.wrapper)) ?? [];
+			return ((_a3 = signal[NODE].liveConsumerNode) == null ? void 0 : _a3.map((n$13) => n$13.wrapper)) ?? [];
 		}
 		subtle2.introspectSinks = introspectSinks;
 		function hasSinks(signal) {
@@ -2728,7 +2728,7 @@ var Signal;
 					throw new TypeError("Called getPending without Watcher receiver");
 				}
 				const node = this[NODE];
-				return node.producerNode.filter((n$11) => n$11.dirty).map((n$11) => n$11.wrapper);
+				return node.producerNode.filter((n$13) => n$13.dirty).map((n$13) => n$13.wrapper);
 			}
 		}
 		_a2 = NODE;
@@ -3893,60 +3893,60 @@ const Schemas = { A2UIClientEventMessage: server_to_client_with_standard_catalog
 * Copyright 2017 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
 */
-const t$1 = (t$7) => (e$14, o$14) => {
-	void 0 !== o$14 ? o$14.addInitializer((() => {
+const t$1 = (t$7) => (e$14, o$15) => {
+	void 0 !== o$15 ? o$15.addInitializer(() => {
 		customElements.define(t$7, e$14);
-	})) : customElements.define(t$7, e$14);
+	}) : customElements.define(t$7, e$14);
 };
 
 /**
 * @license
 * Copyright 2017 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
-*/ const o$8 = {
+*/ const o$9 = {
 	attribute: !0,
 	type: String,
 	converter: u$3,
 	reflect: !1,
 	hasChanged: f$3
-}, r$6 = (t$7 = o$8, e$14, r$11) => {
-	const { kind: n$11, metadata: i$10 } = r$11;
+}, r$7 = (t$7 = o$9, e$14, r$12) => {
+	const { kind: n$13, metadata: i$10 } = r$12;
 	let s$9 = globalThis.litPropertyMetadata.get(i$10);
-	if (void 0 === s$9 && globalThis.litPropertyMetadata.set(i$10, s$9 = new Map()), "setter" === n$11 && ((t$7 = Object.create(t$7)).wrapped = !0), s$9.set(r$11.name, t$7), "accessor" === n$11) {
-		const { name: o$14 } = r$11;
+	if (void 0 === s$9 && globalThis.litPropertyMetadata.set(i$10, s$9 = new Map()), "setter" === n$13 && ((t$7 = Object.create(t$7)).wrapped = !0), s$9.set(r$12.name, t$7), "accessor" === n$13) {
+		const { name: o$15 } = r$12;
 		return {
-			set(r$12) {
-				const n$12 = e$14.get.call(this);
-				e$14.set.call(this, r$12), this.requestUpdate(o$14, n$12, t$7);
+			set(r$13) {
+				const n$14 = e$14.get.call(this);
+				e$14.set.call(this, r$13), this.requestUpdate(o$15, n$14, t$7, !0, r$13);
 			},
 			init(e$15) {
-				return void 0 !== e$15 && this.C(o$14, void 0, t$7, e$15), e$15;
+				return void 0 !== e$15 && this.C(o$15, void 0, t$7, e$15), e$15;
 			}
 		};
 	}
-	if ("setter" === n$11) {
-		const { name: o$14 } = r$11;
-		return function(r$12) {
-			const n$12 = this[o$14];
-			e$14.call(this, r$12), this.requestUpdate(o$14, n$12, t$7);
+	if ("setter" === n$13) {
+		const { name: o$15 } = r$12;
+		return function(r$13) {
+			const n$14 = this[o$15];
+			e$14.call(this, r$13), this.requestUpdate(o$15, n$14, t$7, !0, r$13);
 		};
 	}
-	throw Error("Unsupported decorator location: " + n$11);
+	throw Error("Unsupported decorator location: " + n$13);
 };
-function n$4(t$7) {
-	return (e$14, o$14) => "object" == typeof o$14 ? r$6(t$7, e$14, o$14) : ((t$8, e$15, o$15) => {
-		const r$11 = e$15.hasOwnProperty(o$15);
-		return e$15.constructor.createProperty(o$15, t$8), r$11 ? Object.getOwnPropertyDescriptor(e$15, o$15) : void 0;
-	})(t$7, e$14, o$14);
+function n$6(t$7) {
+	return (e$14, o$15) => "object" == typeof o$15 ? r$7(t$7, e$14, o$15) : ((t$8, e$15, o$16) => {
+		const r$12 = e$15.hasOwnProperty(o$16);
+		return e$15.constructor.createProperty(o$16, t$8), r$12 ? Object.getOwnPropertyDescriptor(e$15, o$16) : void 0;
+	})(t$7, e$14, o$15);
 }
 
 /**
 * @license
 * Copyright 2017 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
-*/ function r$5(r$11) {
-	return n$4({
-		...r$11,
+*/ function r$6(r$12) {
+	return n$6({
+		...r$12,
 		state: !0,
 		attribute: !1
 	});
@@ -3958,8 +3958,8 @@ function n$4(t$7) {
 * SPDX-License-Identifier: BSD-3-Clause
 */
 function t(t$7) {
-	return (n$11, o$14) => {
-		const c$7 = "function" == typeof n$11 ? n$11 : n$11[o$14];
+	return (n$13, o$15) => {
+		const c$7 = "function" == typeof n$13 ? n$13 : n$13[o$15];
 		Object.assign(c$7, t$7);
 	};
 }
@@ -3975,11 +3975,11 @@ const e$6 = (e$14, t$7, c$7) => (c$7.configurable = !0, c$7.enumerable = !0, Ref
 * @license
 * Copyright 2017 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
-*/ function e$5(e$14, r$11) {
-	return (n$11, s$9, i$10) => {
-		const o$14 = (t$7) => t$7.renderRoot?.querySelector(e$14) ?? null;
-		if (r$11) {
-			const { get: e$15, set: r$12 } = "object" == typeof s$9 ? n$11 : i$10 ?? (() => {
+*/ function e$5(e$14, r$12) {
+	return (n$13, s$9, i$10) => {
+		const o$15 = (t$7) => t$7.renderRoot?.querySelector(e$14) ?? null;
+		if (r$12) {
+			const { get: e$15, set: r$13 } = "object" == typeof s$9 ? n$13 : i$10 ?? (() => {
 				const t$7 = Symbol();
 				return {
 					get() {
@@ -3990,13 +3990,13 @@ const e$6 = (e$14, t$7, c$7) => (c$7.configurable = !0, c$7.enumerable = !0, Ref
 					}
 				};
 			})();
-			return e$6(n$11, s$9, { get() {
+			return e$6(n$13, s$9, { get() {
 				let t$7 = e$15.call(this);
-				return void 0 === t$7 && (t$7 = o$14(this), (null !== t$7 || this.hasUpdated) && r$12.call(this, t$7)), t$7;
+				return void 0 === t$7 && (t$7 = o$15(this), (null !== t$7 || this.hasUpdated) && r$13.call(this, t$7)), t$7;
 			} });
 		}
-		return e$6(n$11, s$9, { get() {
-			return o$14(this);
+		return e$6(n$13, s$9, { get() {
+			return o$15(this);
 		} });
 	};
 }
@@ -4007,9 +4007,9 @@ const e$6 = (e$14, t$7, c$7) => (c$7.configurable = !0, c$7.enumerable = !0, Ref
 * SPDX-License-Identifier: BSD-3-Clause
 */
 let e$4;
-function r$4(r$11) {
-	return (n$11, o$14) => e$6(n$11, o$14, { get() {
-		return (this.renderRoot ?? (e$4 ??= document.createDocumentFragment())).querySelectorAll(r$11);
+function r$5(r$12) {
+	return (n$13, o$15) => e$6(n$13, o$15, { get() {
+		return (this.renderRoot ?? (e$4 ??= document.createDocumentFragment())).querySelectorAll(r$12);
 	} });
 }
 
@@ -4018,9 +4018,9 @@ function r$4(r$11) {
 * Copyright 2017 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
 */
-function r$3(r$11) {
-	return (n$11, e$14) => e$6(n$11, e$14, { async get() {
-		return await this.updateComplete, this.renderRoot?.querySelector(r$11) ?? null;
+function r$4(r$12) {
+	return (n$13, e$14) => e$6(n$13, e$14, { async get() {
+		return await this.updateComplete, this.renderRoot?.querySelector(r$12) ?? null;
 	} });
 }
 
@@ -4028,12 +4028,12 @@ function r$3(r$11) {
 * @license
 * Copyright 2021 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
-*/ function o$7(o$14) {
-	return (e$14, n$11) => {
-		const { slot: r$11, selector: s$9 } = o$14 ?? {}, c$7 = "slot" + (r$11 ? `[name=${r$11}]` : ":not([name])");
-		return e$6(e$14, n$11, { get() {
-			const t$7 = this.renderRoot?.querySelector(c$7), e$15 = t$7?.assignedElements(o$14) ?? [];
-			return void 0 === s$9 ? e$15 : e$15.filter(((t$8) => t$8.matches(s$9)));
+*/ function o$8(o$15) {
+	return (e$14, n$13) => {
+		const { slot: r$12, selector: s$9 } = o$15 ?? {}, c$7 = "slot" + (r$12 ? `[name=${r$12}]` : ":not([name])");
+		return e$6(e$14, n$13, { get() {
+			const t$7 = this.renderRoot?.querySelector(c$7), e$15 = t$7?.assignedElements(o$15) ?? [];
+			return void 0 === s$9 ? e$15 : e$15.filter((t$8) => t$8.matches(s$9));
 		} });
 	};
 }
@@ -4042,12 +4042,12 @@ function r$3(r$11) {
 * @license
 * Copyright 2017 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
-*/ function n$3(n$11) {
-	return (o$14, r$11) => {
-		const { slot: e$14 } = n$11 ?? {}, s$9 = "slot" + (e$14 ? `[name=${e$14}]` : ":not([name])");
-		return e$6(o$14, r$11, { get() {
+*/ function n$5(n$13) {
+	return (o$15, r$12) => {
+		const { slot: e$14 } = n$13 ?? {}, s$9 = "slot" + (e$14 ? `[name=${e$14}]` : ":not([name])");
+		return e$6(o$15, r$12, { get() {
 			const t$7 = this.renderRoot?.querySelector(s$9);
-			return t$7?.assignedNodes(n$11) ?? [];
+			return t$7?.assignedNodes(n$13) ?? [];
 		} });
 	};
 }
@@ -4056,59 +4056,75 @@ function r$3(r$11) {
 * @license
 * Copyright 2023 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
-*/ const i$2 = Symbol("SignalWatcherBrand"), s$1 = new FinalizationRegistry((({ watcher: t$7, signal: i$10 }) => {
-	t$7.unwatch(i$10);
-})), h$3 = new WeakMap();
-function e$3(e$14) {
-	return !0 === e$14[i$2] ? (console.warn("SignalWatcher should not be applied to the same class more than once."), e$14) : class extends e$14 {
+*/ let i$2 = !1;
+const s$1 = new Signal.subtle.Watcher(() => {
+	i$2 || (i$2 = !0, queueMicrotask(() => {
+		i$2 = !1;
+		for (const t$7 of s$1.getPending()) t$7.get();
+		s$1.watch();
+	}));
+}), h$3 = Symbol("SignalWatcherBrand"), e$3 = new FinalizationRegistry((i$10) => {
+	i$10.unwatch(...Signal.subtle.introspectSources(i$10));
+}), n$4 = new WeakMap();
+function o$7(i$10) {
+	return !0 === i$10[h$3] ? (console.warn("SignalWatcher should not be applied to the same class more than once."), i$10) : class extends i$10 {
 		constructor() {
-			super(...arguments), this._$St = new Signal.State(0), this._$Si = !1, this._$So = !0, this._$Sh = new Set();
+			super(...arguments), this._$St = new Map(), this._$So = new Signal.State(0), this._$Si = !1;
 		}
 		_$Sl() {
-			if (void 0 !== this._$Su) return;
-			this._$Sv = new Signal.Computed((() => {
-				this._$St.get(), super.performUpdate();
-			}));
-			const i$10 = this._$Su = new Signal.subtle.Watcher((function() {
-				const t$7 = h$3.get(this);
-				void 0 !== t$7 && (!1 === t$7._$Si && t$7.requestUpdate(), this.watch());
-			}));
-			h$3.set(i$10, this), s$1.register(this, {
-				watcher: i$10,
-				signal: this._$Sv
-			}), i$10.watch(this._$Sv);
+			var t$7, i$11;
+			const s$9 = [], h$7 = [];
+			this._$St.forEach((t$8, i$12) => {
+				((null == t$8 ? void 0 : t$8.beforeUpdate) ? s$9 : h$7).push(i$12);
+			});
+			const e$14 = null === (t$7 = this.h) || void 0 === t$7 ? void 0 : t$7.getPending().filter((t$8) => t$8 !== this._$Su && !this._$St.has(t$8));
+			s$9.forEach((t$8) => t$8.get()), null === (i$11 = this._$Su) || void 0 === i$11 || i$11.get(), e$14.forEach((t$8) => t$8.get()), h$7.forEach((t$8) => t$8.get());
+		}
+		_$Sv() {
+			this.isUpdatePending || queueMicrotask(() => {
+				this.isUpdatePending || this._$Sl();
+			});
+		}
+		_$S_() {
+			if (void 0 !== this.h) return;
+			this._$Su = new Signal.Computed(() => {
+				this._$So.get(), super.performUpdate();
+			});
+			const i$11 = this.h = new Signal.subtle.Watcher(function() {
+				const t$7 = n$4.get(this);
+				void 0 !== t$7 && (!1 === t$7._$Si && (new Set(this.getPending()).has(t$7._$Su) ? t$7.requestUpdate() : t$7._$Sv()), this.watch());
+			});
+			n$4.set(i$11, this), e$3.register(this, i$11), i$11.watch(this._$Su), i$11.watch(...Array.from(this._$St).map(([t$7]) => t$7));
 		}
 		_$Sp() {
-			void 0 !== this._$Su && (this._$Su.unwatch(this._$Sv), this._$Sv = void 0, this._$Su = void 0);
+			if (void 0 === this.h) return;
+			let i$11 = !1;
+			this.h.unwatch(...Signal.subtle.introspectSources(this.h).filter((t$7) => {
+				var s$9;
+				const h$7 = !0 !== (null === (s$9 = this._$St.get(t$7)) || void 0 === s$9 ? void 0 : s$9.manualDispose);
+				return h$7 && this._$St.delete(t$7), i$11 || (i$11 = !h$7), h$7;
+			})), i$11 || (this._$Su = void 0, this.h = void 0, this._$St.clear());
+		}
+		updateEffect(i$11, s$9) {
+			var h$7;
+			this._$S_();
+			const e$14 = new Signal.Computed(() => {
+				i$11();
+			});
+			return this.h.watch(e$14), this._$St.set(e$14, s$9), null !== (h$7 = null == s$9 ? void 0 : s$9.beforeUpdate) && void 0 !== h$7 && h$7 ? Signal.subtle.untrack(() => e$14.get()) : this.updateComplete.then(() => Signal.subtle.untrack(() => e$14.get())), () => {
+				this._$St.delete(e$14), this.h.unwatch(e$14), !1 === this.isConnected && this._$Sp();
+			};
 		}
 		performUpdate() {
-			this.isUpdatePending && (this._$Sl(), this._$Si = !0, this._$St.set(this._$St.get() + 1), this._$Si = !1, this._$Sv.get());
-		}
-		update(t$7) {
-			try {
-				this._$So ? (this._$So = !1, super.update(t$7)) : this._$Sh.forEach(((t$8) => t$8.commit()));
-			} finally {
-				this.isUpdatePending = !1, this._$Sh.clear();
-			}
-		}
-		requestUpdate(t$7, i$10, s$9) {
-			this._$So = !0, super.requestUpdate(t$7, i$10, s$9);
+			this.isUpdatePending && (this._$S_(), this._$Si = !0, this._$So.set(this._$So.get() + 1), this._$Si = !1, this._$Sl());
 		}
 		connectedCallback() {
 			super.connectedCallback(), this.requestUpdate();
 		}
 		disconnectedCallback() {
-			super.disconnectedCallback(), queueMicrotask((() => {
+			super.disconnectedCallback(), queueMicrotask(() => {
 				!1 === this.isConnected && this._$Sp();
-			}));
-		}
-		_(t$7) {
-			this._$Sh.add(t$7);
-			const i$10 = this._$So;
-			this.requestUpdate(), this._$So = i$10;
-		}
-		m(t$7) {
-			this._$Sh.delete(t$7);
+			});
 		}
 	};
 }
@@ -4128,7 +4144,7 @@ function e$3(e$14) {
 		if (void 0 === (t$7 = i$10._$AM)) break;
 		e$14 = t$7._$AN, e$14.delete(i$10), i$10 = t$7;
 	} while (0 === e$14?.size);
-}, r$2 = (i$10) => {
+}, r$3 = (i$10) => {
 	for (let t$7; t$7 = i$10._$AM; i$10 = t$7) {
 		let e$14 = t$7._$AN;
 		if (void 0 === e$14) t$7._$AN = e$14 = new Set();
@@ -4137,29 +4153,29 @@ function e$3(e$14) {
 	}
 };
 function h$2(i$10) {
-	void 0 !== this._$AN ? (o$6(this), this._$AM = i$10, r$2(this)) : this._$AM = i$10;
+	void 0 !== this._$AN ? (o$6(this), this._$AM = i$10, r$3(this)) : this._$AM = i$10;
 }
-function n$2(i$10, t$7 = !1, e$14 = 0) {
-	const r$11 = this._$AH, h$7 = this._$AN;
-	if (void 0 !== h$7 && 0 !== h$7.size) if (t$7) if (Array.isArray(r$11)) for (let i$11 = e$14; i$11 < r$11.length; i$11++) s(r$11[i$11], !1), o$6(r$11[i$11]);
-	else null != r$11 && (s(r$11, !1), o$6(r$11));
+function n$3(i$10, t$7 = !1, e$14 = 0) {
+	const r$12 = this._$AH, h$7 = this._$AN;
+	if (void 0 !== h$7 && 0 !== h$7.size) if (t$7) if (Array.isArray(r$12)) for (let i$11 = e$14; i$11 < r$12.length; i$11++) s(r$12[i$11], !1), o$6(r$12[i$11]);
+	else null != r$12 && (s(r$12, !1), o$6(r$12));
 	else s(this, i$10);
 }
 const c = (i$10) => {
-	i$10.type == t$4.CHILD && (i$10._$AP ??= n$2, i$10._$AQ ??= h$2);
+	i$10.type == t$4.CHILD && (i$10._$AP ??= n$3, i$10._$AQ ??= h$2);
 };
 var f = class extends i$5 {
 	constructor() {
 		super(...arguments), this._$AN = void 0;
 	}
 	_$AT(i$10, t$7, e$14) {
-		super._$AT(i$10, t$7, e$14), r$2(this), this.isConnected = i$10._$AU;
+		super._$AT(i$10, t$7, e$14), r$3(this), this.isConnected = i$10._$AU;
 	}
 	_$AO(i$10, t$7 = !0) {
 		i$10 !== this.isConnected && (this.isConnected = i$10, i$10 ? this.reconnected?.() : this.disconnected?.()), t$7 && (s(this, i$10), o$6(this));
 	}
 	setValue(t$7) {
-		if (f$1(this._$Ct)) this._$Ct._$AI(t$7, this);
+		if (r$8(this._$Ct)) this._$Ct._$AI(t$7, this);
 		else {
 			const i$10 = [...this._$Ct._$AH];
 			i$10[this._$Ci] = t$7, this._$Ct._$AI(i$10, this, 0);
@@ -4173,66 +4189,67 @@ var f = class extends i$5 {
 * @license
 * Copyright 2023 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
-*/ var h$1 = class extends f {
-	_$Sl() {
-		if (void 0 !== this._$Su) return;
-		this._$SW = new Signal.Computed((() => {
+*/
+let o$5 = !1;
+const n$2 = new Signal.subtle.Watcher(async () => {
+	o$5 || (o$5 = !0, queueMicrotask(() => {
+		o$5 = !1;
+		for (const i$10 of n$2.getPending()) i$10.get();
+		n$2.watch();
+	}));
+});
+var r$2 = class extends f {
+	_$S_() {
+		var i$10, t$7;
+		void 0 === this._$Sm && (this._$Sj = new Signal.Computed(() => {
+			var i$11;
+			const t$8 = null === (i$11 = this._$SW) || void 0 === i$11 ? void 0 : i$11.get();
+			return this.setValue(t$8), t$8;
+		}), this._$Sm = null !== (t$7 = null === (i$10 = this._$Sk) || void 0 === i$10 ? void 0 : i$10.h) && void 0 !== t$7 ? t$7 : n$2, this._$Sm.watch(this._$Sj), Signal.subtle.untrack(() => {
 			var i$11;
 			return null === (i$11 = this._$Sj) || void 0 === i$11 ? void 0 : i$11.get();
 		}));
-		const i$10 = this._$Su = new Signal.subtle.Watcher((() => {
-			var t$7;
-			null === (t$7 = this._$SO) || void 0 === t$7 || t$7._(this), i$10.watch();
-		}));
-		i$10.watch(this._$SW);
 	}
 	_$Sp() {
-		var i$10;
-		void 0 !== this._$Su && (this._$Su.unwatch(this._$SW), this._$SW = void 0, this._$Su = void 0, null === (i$10 = this._$SO) || void 0 === i$10 || i$10.m(this));
-	}
-	commit() {
-		this.setValue(Signal.subtle.untrack((() => {
-			var i$10;
-			return null === (i$10 = this._$SW) || void 0 === i$10 ? void 0 : i$10.get();
-		})));
+		void 0 !== this._$Sm && (this._$Sm.unwatch(this._$SW), this._$Sm = void 0);
 	}
 	render(i$10) {
-		return Signal.subtle.untrack((() => i$10.get()));
+		return Signal.subtle.untrack(() => i$10.get());
 	}
 	update(i$10, [t$7]) {
-		var h$7, o$14;
-		return null !== (h$7 = this._$SO) && void 0 !== h$7 || (this._$SO = null === (o$14 = i$10.options) || void 0 === o$14 ? void 0 : o$14.host), t$7 !== this._$Sj && void 0 !== this._$Sj && this._$Sp(), this._$Sj = t$7, this._$Sl(), Signal.subtle.untrack((() => this._$SW.get()));
+		var o$15, n$13;
+		return null !== (o$15 = this._$Sk) && void 0 !== o$15 || (this._$Sk = null === (n$13 = i$10.options) || void 0 === n$13 ? void 0 : n$13.host), t$7 !== this._$SW && void 0 !== this._$SW && this._$Sp(), this._$SW = t$7, this._$S_(), Signal.subtle.untrack(() => this._$SW.get());
 	}
 	disconnected() {
 		this._$Sp();
 	}
 	reconnected() {
-		this._$Sl();
+		this._$S_();
 	}
 };
-const o$5 = e$10(h$1);
+const h$1 = e$10(r$2);
 
 /**
 * @license
 * Copyright 2023 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
-*/ const m = (o$14) => (t$7, ...m$3) => o$14(t$7, ...m$3.map(((o$15) => o$15 instanceof Signal.State || o$15 instanceof Signal.Computed ? o$5(o$15) : o$15))), l$1 = m(x), r$1 = m(b);
+*/ const m = (o$15) => (t$7, ...m$3) => o$15(t$7, ...m$3.map((o$16) => o$16 instanceof Signal.State || o$16 instanceof Signal.Computed ? h$1(o$16) : o$16)), l$1 = m(b), r$1 = m(w);
 
 /**
 * @license
 * Copyright 2023 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
-*/ const l = Signal.State, o$4 = Signal.Computed, r = (l$5, o$14) => new Signal.State(l$5, o$14), i$1 = (l$5, o$14) => new Signal.Computed(l$5, o$14);
+*/ const l = Signal.State, o$4 = Signal.Computed, r = (l$5, o$15) => new Signal.State(l$5, o$15), i$1 = (l$5, o$15) => new Signal.Computed(l$5, o$15);
 
 /**
 * @license
 * Copyright 2021 Google LLC
 * SPDX-License-Identifier: BSD-3-Clause
 */
-function* o$3(o$14, f$4) {
-	if (void 0 !== o$14) {
+function* o$3(o$15, f$4) {
+	if (void 0 !== o$15) {
 		let i$10 = 0;
-		for (const t$7 of o$14) yield f$4(t$7, i$10++);
+		for (const t$7 of o$15) yield f$4(t$7, i$10++);
 	}
 }
 
@@ -4265,9 +4282,9 @@ function effect(cb) {
 	};
 }
 
-const themeContext = n$5("A2UITheme");
+const themeContext = n$7("A2UITheme");
 
-const structuralStyles = r$10(structuralStyles$1);
+const structuralStyles = r$11(structuralStyles$1);
 
 var ComponentRegistry = class {
 	constructor() {
@@ -4343,7 +4360,7 @@ let Root = (() => {
 	let _classDescriptor;
 	let _classExtraInitializers = [];
 	let _classThis;
-	let _classSuper = e$3(i$6);
+	let _classSuper = o$7(i$6);
 	let _instanceExtraInitializers = [];
 	let _surfaceId_decorators;
 	let _surfaceId_initializers = [];
@@ -4373,14 +4390,14 @@ let Root = (() => {
 		}
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-			_surfaceId_decorators = [n$4()];
-			_component_decorators = [n$4()];
+			_surfaceId_decorators = [n$6()];
+			_component_decorators = [n$6()];
 			_theme_decorators = [c$1({ context: themeContext })];
-			_childComponents_decorators = [n$4({ attribute: false })];
-			_processor_decorators = [n$4({ attribute: false })];
-			_dataContextPath_decorators = [n$4()];
-			_enableCustomElements_decorators = [n$4()];
-			_set_weight_decorators = [n$4()];
+			_childComponents_decorators = [n$6({ attribute: false })];
+			_processor_decorators = [n$6({ attribute: false })];
+			_dataContextPath_decorators = [n$6()];
+			_enableCustomElements_decorators = [n$6()];
+			_set_weight_decorators = [n$6()];
 			__esDecorate$19(this, null, _surfaceId_decorators, {
 				kind: "accessor",
 				name: "surfaceId",
@@ -4585,7 +4602,7 @@ let Root = (() => {
 				this.#lightDomEffectDisposer = effect(() => {
 					const allChildren = this.childComponents ?? null;
 					const lightDomTemplate = this.renderComponentTree(allChildren);
-					B(lightDomTemplate, this, { host: this });
+					D(lightDomTemplate, this, { host: this });
 				});
 			}
 		}
@@ -4603,12 +4620,12 @@ let Root = (() => {
 		*/
 		renderComponentTree(components) {
 			if (!components) {
-				return E;
+				return A;
 			}
 			if (!Array.isArray(components)) {
-				return E;
+				return A;
 			}
-			return x` ${o$3(components, (component) => {
+			return b` ${o$3(components, (component) => {
 				if (this.enableCustomElements) {
 					const registeredCtor = componentRegistry.get(component.type);
 					const elCtor = registeredCtor || customElements.get(component.type);
@@ -4627,16 +4644,16 @@ let Root = (() => {
 						for (const [prop, val] of Object.entries(component.properties)) {
 							el[prop] = val;
 						}
-						return x`${el}`;
+						return b`${el}`;
 					}
 				}
 				switch (component.type) {
 					case "List": {
 						const node = component;
 						const childComponents = node.properties.children;
-						return x`<a2ui-list
+						return b`<a2ui-list
             id=${node.id}
-            slot=${node.slotName ? node.slotName : E}
+            slot=${node.slotName ? node.slotName : A}
             .component=${node}
             .weight=${node.weight ?? "initial"}
             .direction=${node.properties.direction ?? "vertical"}
@@ -4652,9 +4669,9 @@ let Root = (() => {
 						if (!childComponents && node.properties.child) {
 							childComponents = [node.properties.child];
 						}
-						return x`<a2ui-card
+						return b`<a2ui-card
             id=${node.id}
-            slot=${node.slotName ? node.slotName : E}
+            slot=${node.slotName ? node.slotName : A}
             .component=${node}
             .weight=${node.weight ?? "initial"}
             .processor=${this.processor}
@@ -4666,9 +4683,9 @@ let Root = (() => {
 					}
 					case "Column": {
 						const node = component;
-						return x`<a2ui-column
+						return b`<a2ui-column
             id=${node.id}
-            slot=${node.slotName ? node.slotName : E}
+            slot=${node.slotName ? node.slotName : A}
             .component=${node}
             .weight=${node.weight ?? "initial"}
             .processor=${this.processor}
@@ -4682,9 +4699,9 @@ let Root = (() => {
 					}
 					case "Row": {
 						const node = component;
-						return x`<a2ui-row
+						return b`<a2ui-row
             id=${node.id}
-            slot=${node.slotName ? node.slotName : E}
+            slot=${node.slotName ? node.slotName : A}
             .component=${node}
             .weight=${node.weight ?? "initial"}
             .processor=${this.processor}
@@ -4698,9 +4715,9 @@ let Root = (() => {
 					}
 					case "Image": {
 						const node = component;
-						return x`<a2ui-image
+						return b`<a2ui-image
             id=${node.id}
-            slot=${node.slotName ? node.slotName : E}
+            slot=${node.slotName ? node.slotName : A}
             .component=${node}
             .weight=${node.weight ?? "initial"}
             .processor=${this.processor}
@@ -4714,9 +4731,9 @@ let Root = (() => {
 					}
 					case "Icon": {
 						const node = component;
-						return x`<a2ui-icon
+						return b`<a2ui-icon
             id=${node.id}
-            slot=${node.slotName ? node.slotName : E}
+            slot=${node.slotName ? node.slotName : A}
             .component=${node}
             .weight=${node.weight ?? "initial"}
             .processor=${this.processor}
@@ -4728,9 +4745,9 @@ let Root = (() => {
 					}
 					case "AudioPlayer": {
 						const node = component;
-						return x`<a2ui-audioplayer
+						return b`<a2ui-audioplayer
             id=${node.id}
-            slot=${node.slotName ? node.slotName : E}
+            slot=${node.slotName ? node.slotName : A}
             .component=${node}
             .weight=${node.weight ?? "initial"}
             .processor=${this.processor}
@@ -4742,9 +4759,9 @@ let Root = (() => {
 					}
 					case "Button": {
 						const node = component;
-						return x`<a2ui-button
+						return b`<a2ui-button
             id=${node.id}
-            slot=${node.slotName ? node.slotName : E}
+            slot=${node.slotName ? node.slotName : A}
             .component=${node}
             .weight=${node.weight ?? "initial"}
             .processor=${this.processor}
@@ -4757,9 +4774,9 @@ let Root = (() => {
 					}
 					case "Text": {
 						const node = component;
-						return x`<a2ui-text
+						return b`<a2ui-text
             id=${node.id}
-            slot=${node.slotName ? node.slotName : E}
+            slot=${node.slotName ? node.slotName : A}
             .component=${node}
             .weight=${node.weight ?? "initial"}
             .model=${this.processor}
@@ -4773,9 +4790,9 @@ let Root = (() => {
 					}
 					case "CheckBox": {
 						const node = component;
-						return x`<a2ui-checkbox
+						return b`<a2ui-checkbox
             id=${node.id}
-            slot=${node.slotName ? node.slotName : E}
+            slot=${node.slotName ? node.slotName : A}
             .component=${node}
             .weight=${node.weight ?? "initial"}
             .processor=${this.processor}
@@ -4788,9 +4805,9 @@ let Root = (() => {
 					}
 					case "DateTimeInput": {
 						const node = component;
-						return x`<a2ui-datetimeinput
+						return b`<a2ui-datetimeinput
             id=${node.id}
-            slot=${node.slotName ? node.slotName : E}
+            slot=${node.slotName ? node.slotName : A}
             .component=${node}
             .weight=${node.weight ?? "initial"}
             .processor=${this.processor}
@@ -4805,9 +4822,9 @@ let Root = (() => {
 					}
 					case "Divider": {
 						const node = component;
-						return x`<a2ui-divider
+						return b`<a2ui-divider
             id=${node.id}
-            slot=${node.slotName ? node.slotName : E}
+            slot=${node.slotName ? node.slotName : A}
             .component=${node}
             .weight=${node.weight ?? "initial"}
             .processor=${this.processor}
@@ -4821,9 +4838,9 @@ let Root = (() => {
 					}
 					case "MultipleChoice": {
 						const node = component;
-						return x`<a2ui-multiplechoice
+						return b`<a2ui-multiplechoice
             id=${node.id}
-            slot=${node.slotName ? node.slotName : E}
+            slot=${node.slotName ? node.slotName : A}
             .component=${node}
             .weight=${node.weight ?? "initial"}
             .processor=${this.processor}
@@ -4837,9 +4854,9 @@ let Root = (() => {
 					}
 					case "Slider": {
 						const node = component;
-						return x`<a2ui-slider
+						return b`<a2ui-slider
             id=${node.id}
-            slot=${node.slotName ? node.slotName : E}
+            slot=${node.slotName ? node.slotName : A}
             .component=${node}
             .weight=${node.weight ?? "initial"}
             .processor=${this.processor}
@@ -4853,9 +4870,9 @@ let Root = (() => {
 					}
 					case "TextField": {
 						const node = component;
-						return x`<a2ui-textfield
+						return b`<a2ui-textfield
             id=${node.id}
-            slot=${node.slotName ? node.slotName : E}
+            slot=${node.slotName ? node.slotName : A}
             .component=${node}
             .weight=${node.weight ?? "initial"}
             .processor=${this.processor}
@@ -4870,9 +4887,9 @@ let Root = (() => {
 					}
 					case "Video": {
 						const node = component;
-						return x`<a2ui-video
+						return b`<a2ui-video
             id=${node.id}
-            slot=${node.slotName ? node.slotName : E}
+            slot=${node.slotName ? node.slotName : A}
             .component=${node}
             .weight=${node.weight ?? "initial"}
             .processor=${this.processor}
@@ -4892,9 +4909,9 @@ let Root = (() => {
 								childComponents.push(item.child);
 							}
 						}
-						return x`<a2ui-tabs
+						return b`<a2ui-tabs
             id=${node.id}
-            slot=${node.slotName ? node.slotName : E}
+            slot=${node.slotName ? node.slotName : A}
             .component=${node}
             .weight=${node.weight ?? "initial"}
             .processor=${this.processor}
@@ -4909,9 +4926,9 @@ let Root = (() => {
 						const node = component;
 						const childComponents = [node.properties.entryPointChild, node.properties.contentChild];
 						node.properties.entryPointChild.slotName = "entry";
-						return x`<a2ui-modal
+						return b`<a2ui-modal
             id=${node.id}
-            slot=${node.slotName ? node.slotName : E}
+            slot=${node.slotName ? node.slotName : A}
             .component=${node}
             .weight=${node.weight ?? "initial"}
             .processor=${this.processor}
@@ -4935,7 +4952,7 @@ let Root = (() => {
 			const registeredCtor = componentRegistry.get(component.type);
 			const elCtor = registeredCtor || customElements.get(component.type);
 			if (!elCtor) {
-				return x`Unknown element ${component.type}`;
+				return b`Unknown element ${component.type}`;
 			}
 			const el = new elCtor();
 			el.id = node.id;
@@ -4950,10 +4967,10 @@ let Root = (() => {
 			for (const [prop, val] of Object.entries(component.properties)) {
 				el[prop] = val;
 			}
-			return x`${el}`;
+			return b`${el}`;
 		}
 		render() {
-			return x`<slot></slot>`;
+			return b`<slot></slot>`;
 		}
 		static {
 			__runInitializers$19(_classThis, _classExtraInitializers);
@@ -4971,21 +4988,21 @@ let Root = (() => {
 		if (super(t$7), t$7.type !== t$4.ATTRIBUTE || "class" !== t$7.name || t$7.strings?.length > 2) throw Error("`classMap()` can only be used in the `class` attribute and must be the only part in the attribute.");
 	}
 	render(t$7) {
-		return " " + Object.keys(t$7).filter(((s$9) => t$7[s$9])).join(" ") + " ";
+		return " " + Object.keys(t$7).filter((s$9) => t$7[s$9]).join(" ") + " ";
 	}
 	update(s$9, [i$10]) {
 		if (void 0 === this.st) {
-			this.st = new Set(), void 0 !== s$9.strings && (this.nt = new Set(s$9.strings.join(" ").split(/\s/).filter(((t$7) => "" !== t$7))));
+			this.st = new Set(), void 0 !== s$9.strings && (this.nt = new Set(s$9.strings.join(" ").split(/\s/).filter((t$7) => "" !== t$7)));
 			for (const t$7 in i$10) i$10[t$7] && !this.nt?.has(t$7) && this.st.add(t$7);
 			return this.render(i$10);
 		}
-		const r$11 = s$9.element.classList;
-		for (const t$7 of this.st) t$7 in i$10 || (r$11.remove(t$7), this.st.delete(t$7));
+		const r$12 = s$9.element.classList;
+		for (const t$7 of this.st) t$7 in i$10 || (r$12.remove(t$7), this.st.delete(t$7));
 		for (const t$7 in i$10) {
 			const s$10 = !!i$10[t$7];
-			s$10 === this.st.has(t$7) || this.nt?.has(t$7) || (s$10 ? (r$11.add(t$7), this.st.add(t$7)) : (r$11.remove(t$7), this.st.delete(t$7)));
+			s$10 === this.st.has(t$7) || this.nt?.has(t$7) || (s$10 ? (r$12.add(t$7), this.st.add(t$7)) : (r$12.remove(t$7), this.st.delete(t$7)));
 		}
-		return T;
+		return E;
 	}
 });
 
@@ -4998,24 +5015,24 @@ let Root = (() => {
 		if (super(t$7), t$7.type !== t$4.ATTRIBUTE || "style" !== t$7.name || t$7.strings?.length > 2) throw Error("The `styleMap` directive must be used in the `style` attribute and must be the only part in the attribute.");
 	}
 	render(t$7) {
-		return Object.keys(t$7).reduce(((e$14, r$11) => {
-			const s$9 = t$7[r$11];
-			return null == s$9 ? e$14 : e$14 + `${r$11 = r$11.includes("-") ? r$11 : r$11.replace(/(?:^(webkit|moz|ms|o)|)(?=[A-Z])/g, "-$&").toLowerCase()}:${s$9};`;
-		}), "");
+		return Object.keys(t$7).reduce((e$14, r$12) => {
+			const s$9 = t$7[r$12];
+			return null == s$9 ? e$14 : e$14 + `${r$12 = r$12.includes("-") ? r$12 : r$12.replace(/(?:^(webkit|moz|ms|o)|)(?=[A-Z])/g, "-$&").toLowerCase()}:${s$9};`;
+		}, "");
 	}
-	update(e$14, [r$11]) {
+	update(e$14, [r$12]) {
 		const { style: s$9 } = e$14.element;
-		if (void 0 === this.ft) return this.ft = new Set(Object.keys(r$11)), this.render(r$11);
-		for (const t$7 of this.ft) null == r$11[t$7] && (this.ft.delete(t$7), t$7.includes("-") ? s$9.removeProperty(t$7) : s$9[t$7] = null);
-		for (const t$7 in r$11) {
-			const e$15 = r$11[t$7];
+		if (void 0 === this.ft) return this.ft = new Set(Object.keys(r$12)), this.render(r$12);
+		for (const t$7 of this.ft) null == r$12[t$7] && (this.ft.delete(t$7), t$7.includes("-") ? s$9.removeProperty(t$7) : s$9[t$7] = null);
+		for (const t$7 in r$12) {
+			const e$15 = r$12[t$7];
 			if (null != e$15) {
 				this.ft.add(t$7);
-				const r$12 = "string" == typeof e$15 && e$15.endsWith(i);
-				t$7.includes("-") || r$12 ? s$9.setProperty(t$7, r$12 ? e$15.slice(0, -11) : e$15, r$12 ? n$1 : "") : s$9[t$7] = e$15;
+				const r$13 = "string" == typeof e$15 && e$15.endsWith(i);
+				t$7.includes("-") || r$13 ? s$9.setProperty(t$7, r$13 ? e$15.slice(0, -11) : e$15, r$13 ? n$1 : "") : s$9[t$7] = e$15;
 			}
 		}
-		return T;
+		return E;
 	}
 });
 
@@ -5076,7 +5093,7 @@ let Audio = (() => {
 		}
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-			_url_decorators = [n$4()];
+			_url_decorators = [n$6()];
 			__esDecorate$18(this, null, _url_decorators, {
 				kind: "accessor",
 				name: "url",
@@ -5132,33 +5149,33 @@ let Audio = (() => {
 		}
 		#renderAudio() {
 			if (!this.url) {
-				return E;
+				return A;
 			}
 			if (this.url && typeof this.url === "object") {
 				if ("literalString" in this.url) {
-					return x`<audio controls src=${this.url.literalString} />`;
+					return b`<audio controls src=${this.url.literalString} />`;
 				} else if ("literal" in this.url) {
-					return x`<audio controls src=${this.url.literal} />`;
+					return b`<audio controls src=${this.url.literal} />`;
 				} else if (this.url && "path" in this.url && this.url.path) {
 					if (!this.processor || !this.component) {
-						return x`(no processor)`;
+						return b`(no processor)`;
 					}
 					const audioUrl = this.processor.getData(this.component, this.url.path, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
 					if (!audioUrl) {
-						return x`Invalid audio URL`;
+						return b`Invalid audio URL`;
 					}
 					if (typeof audioUrl !== "string") {
-						return x`Invalid audio URL`;
+						return b`Invalid audio URL`;
 					}
-					return x`<audio controls src=${audioUrl} />`;
+					return b`<audio controls src=${audioUrl} />`;
 				}
 			}
-			return x`(empty)`;
+			return b`(empty)`;
 		}
 		render() {
-			return x`<section
+			return b`<section
       class=${e$2(this.theme.components.AudioPlayer)}
-      style=${this.theme.additionalStyles?.AudioPlayer ? o$2(this.theme.additionalStyles?.AudioPlayer) : E}
+      style=${this.theme.additionalStyles?.AudioPlayer ? o$2(this.theme.additionalStyles?.AudioPlayer) : A}
     >
       ${this.#renderAudio()}
     </section>`;
@@ -5231,7 +5248,7 @@ let Button = (() => {
 		}
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-			_action_decorators = [n$4()];
+			_action_decorators = [n$6()];
 			__esDecorate$17(this, null, _action_decorators, {
 				kind: "accessor",
 				name: "action",
@@ -5276,9 +5293,9 @@ let Button = (() => {
     `];
 		}
 		render() {
-			return x`<button
+			return b`<button
       class=${e$2(this.theme.components.Button)}
-      style=${this.theme.additionalStyles?.Button ? o$2(this.theme.additionalStyles?.Button) : E}
+      style=${this.theme.additionalStyles?.Button ? o$2(this.theme.additionalStyles?.Button) : A}
       @click=${() => {
 				if (!this.action) {
 					return;
@@ -5401,9 +5418,9 @@ let Card = (() => {
     `];
 		}
 		render() {
-			return x` <section
+			return b` <section
       class=${e$2(this.theme.components.Card)}
-      style=${this.theme.additionalStyles?.Card ? o$2(this.theme.additionalStyles?.Card) : E}
+      style=${this.theme.additionalStyles?.Card ? o$2(this.theme.additionalStyles?.Card) : A}
     >
       <slot></slot>
     </section>`;
@@ -5475,8 +5492,8 @@ let Checkbox = (() => {
 		}
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-			_value_decorators = [n$4()];
-			_label_decorators = [n$4()];
+			_value_decorators = [n$6()];
+			_label_decorators = [n$6()];
 			__esDecorate$15(this, null, _value_decorators, {
 				kind: "accessor",
 				name: "value",
@@ -5569,9 +5586,9 @@ let Checkbox = (() => {
 			this.processor.setData(this.component, this.value.path, value, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
 		}
 		#renderField(value) {
-			return x` <section
+			return b` <section
       class=${e$2(this.theme.components.CheckBox.container)}
-      style=${this.theme.additionalStyles?.CheckBox ? o$2(this.theme.additionalStyles?.CheckBox) : E}
+      style=${this.theme.additionalStyles?.CheckBox ? o$2(this.theme.additionalStyles?.CheckBox) : A}
     >
       <input
         class=${e$2(this.theme.components.CheckBox.element)}
@@ -5599,19 +5616,19 @@ let Checkbox = (() => {
 					return this.#renderField(this.value.literal);
 				} else if (this.value && "path" in this.value && this.value.path) {
 					if (!this.processor || !this.component) {
-						return x`(no model)`;
+						return b`(no model)`;
 					}
 					const textValue = this.processor.getData(this.component, this.value.path, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
 					if (textValue === null) {
-						return x`Invalid label`;
+						return b`Invalid label`;
 					}
 					if (typeof textValue !== "boolean") {
-						return x`Invalid label`;
+						return b`Invalid label`;
 					}
 					return this.#renderField(textValue);
 				}
 			}
-			return E;
+			return A;
 		}
 		constructor() {
 			super(...arguments);
@@ -5684,11 +5701,11 @@ let Column = (() => {
 		}
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-			_alignment_decorators = [n$4({
+			_alignment_decorators = [n$6({
 				reflect: true,
 				type: String
 			})];
-			_distribution_decorators = [n$4({
+			_distribution_decorators = [n$6({
 				reflect: true,
 				type: String
 			})];
@@ -5807,9 +5824,9 @@ let Column = (() => {
     `];
 		}
 		render() {
-			return x`<section
+			return b`<section
       class=${e$2(this.theme.components.Column)}
-      style=${this.theme.additionalStyles?.Column ? o$2(this.theme.additionalStyles?.Column) : E}
+      style=${this.theme.additionalStyles?.Column ? o$2(this.theme.additionalStyles?.Column) : A}
     >
       <slot></slot>
     </section>`;
@@ -5891,13 +5908,13 @@ let DateTimeInput = (() => {
 		}
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-			_value_decorators = [n$4()];
-			_label_decorators = [n$4()];
-			_enableDate_decorators = [n$4({
+			_value_decorators = [n$6()];
+			_label_decorators = [n$6()];
+			_enableDate_decorators = [n$6({
 				reflect: false,
 				type: Boolean
 			})];
-			_enableTime_decorators = [n$4({
+			_enableTime_decorators = [n$6({
 				reflect: false,
 				type: Boolean
 			})];
@@ -6033,7 +6050,7 @@ let DateTimeInput = (() => {
 			this.processor.setData(this.component, this.value.path, value, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
 		}
 		#renderField(value) {
-			return x`<section
+			return b`<section
       class=${e$2(this.theme.components.DateTimeInput.container)}
     >
       <label
@@ -6044,7 +6061,7 @@ let DateTimeInput = (() => {
       <input
         autocomplete="off"
         class=${e$2(this.theme.components.DateTimeInput.element)}
-        style=${this.theme.additionalStyles?.DateTimeInput ? o$2(this.theme.additionalStyles?.DateTimeInput) : E}
+        style=${this.theme.additionalStyles?.DateTimeInput ? o$2(this.theme.additionalStyles?.DateTimeInput) : A}
         @input=${(evt) => {
 				if (!(evt.target instanceof HTMLInputElement)) {
 					return;
@@ -6107,16 +6124,16 @@ let DateTimeInput = (() => {
 					return this.#renderField(this.value.literal);
 				} else if (this.value && "path" in this.value && this.value.path) {
 					if (!this.processor || !this.component) {
-						return x`(no model)`;
+						return b`(no model)`;
 					}
 					const textValue = this.processor.getData(this.component, this.value.path, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
 					if (typeof textValue !== "string") {
-						return x`(invalid)`;
+						return b`(invalid)`;
 					}
 					return this.#renderField(textValue);
 				}
 			}
-			return E;
+			return A;
 		}
 		constructor() {
 			super(...arguments);
@@ -6212,9 +6229,9 @@ let Divider = (() => {
     `];
 		}
 		render() {
-			return x`<hr
+			return b`<hr
       class=${e$2(this.theme.components.Divider)}
-      style=${this.theme.additionalStyles?.Divider ? o$2(this.theme.additionalStyles?.Divider) : E}
+      style=${this.theme.additionalStyles?.Divider ? o$2(this.theme.additionalStyles?.Divider) : A}
     />`;
 		}
 		static {
@@ -6281,7 +6298,7 @@ let Icon = (() => {
 		}
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-			_name_decorators = [n$4()];
+			_name_decorators = [n$6()];
 			__esDecorate$11(this, null, _name_decorators, {
 				kind: "accessor",
 				name: "name",
@@ -6332,11 +6349,11 @@ let Icon = (() => {
 		}
 		#renderIcon() {
 			if (!this.name) {
-				return E;
+				return A;
 			}
 			const render = (url) => {
 				url = url.replace(/([A-Z])/gm, "_$1").toLocaleLowerCase();
-				return x`<span class="g-icon">${url}</span>`;
+				return b`<span class="g-icon">${url}</span>`;
 			};
 			if (this.name && typeof this.name === "object") {
 				if ("literalString" in this.name) {
@@ -6347,24 +6364,24 @@ let Icon = (() => {
 					return render(iconName);
 				} else if (this.name && "path" in this.name && this.name.path) {
 					if (!this.processor || !this.component) {
-						return x`(no model)`;
+						return b`(no model)`;
 					}
 					const iconName = this.processor.getData(this.component, this.name.path, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
 					if (!iconName) {
-						return x`Invalid icon name`;
+						return b`Invalid icon name`;
 					}
 					if (typeof iconName !== "string") {
-						return x`Invalid icon name`;
+						return b`Invalid icon name`;
 					}
 					return render(iconName);
 				}
 			}
-			return x`(empty)`;
+			return b`(empty)`;
 		}
 		render() {
-			return x`<section
+			return b`<section
       class=${e$2(this.theme.components.Icon)}
-      style=${this.theme.additionalStyles?.Icon ? o$2(this.theme.additionalStyles?.Icon) : E}
+      style=${this.theme.additionalStyles?.Icon ? o$2(this.theme.additionalStyles?.Icon) : A}
     >
       ${this.#renderIcon()}
     </section>`;
@@ -6443,9 +6460,9 @@ let Image = (() => {
 		}
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-			_url_decorators = [n$4()];
-			_usageHint_decorators = [n$4()];
-			_fit_decorators = [n$4()];
+			_url_decorators = [n$6()];
+			_usageHint_decorators = [n$6()];
+			_fit_decorators = [n$6()];
 			__esDecorate$10(this, null, _url_decorators, {
 				kind: "accessor",
 				name: "url",
@@ -6545,10 +6562,10 @@ let Image = (() => {
 		}
 		#renderImage() {
 			if (!this.url) {
-				return E;
+				return A;
 			}
 			const render = (url) => {
-				return x`<img src=${url} />`;
+				return b`<img src=${url} />`;
 			};
 			if (this.url && typeof this.url === "object") {
 				if ("literalString" in this.url) {
@@ -6559,23 +6576,23 @@ let Image = (() => {
 					return render(imageUrl);
 				} else if (this.url && "path" in this.url && this.url.path) {
 					if (!this.processor || !this.component) {
-						return x`(no model)`;
+						return b`(no model)`;
 					}
 					const imageUrl = this.processor.getData(this.component, this.url.path, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
 					if (!imageUrl) {
-						return x`Invalid image URL`;
+						return b`Invalid image URL`;
 					}
 					if (typeof imageUrl !== "string") {
-						return x`Invalid image URL`;
+						return b`Invalid image URL`;
 					}
 					return render(imageUrl);
 				}
 			}
-			return x`(empty)`;
+			return b`(empty)`;
 		}
 		render() {
 			const classes = merge(this.theme.components.Image.all, this.usageHint ? this.theme.components.Image[this.usageHint] : {});
-			return x`<section
+			return b`<section
       class=${e$2(classes)}
       style=${o$2({
 				...this.theme.additionalStyles?.Image ?? {},
@@ -6653,7 +6670,7 @@ let List = (() => {
 		}
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-			_direction_decorators = [n$4({
+			_direction_decorators = [n$6({
 				reflect: true,
 				type: String
 			})];
@@ -6723,9 +6740,9 @@ let List = (() => {
     `];
 		}
 		render() {
-			return x`<section
+			return b`<section
       class=${e$2(this.theme.components.List)}
-      style=${this.theme.additionalStyles?.List ? o$2(this.theme.additionalStyles?.List) : E}
+      style=${this.theme.additionalStyles?.List ? o$2(this.theme.additionalStyles?.List) : A}
     >
       <slot></slot>
     </section>`;
@@ -6849,9 +6866,9 @@ let MultipleChoice = (() => {
 		}
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-			_description_decorators = [n$4()];
-			_options_decorators = [n$4()];
-			_selections_decorators = [n$4()];
+			_description_decorators = [n$6()];
+			_options_decorators = [n$6()];
+			_selections_decorators = [n$6()];
 			__esDecorate$8(this, null, _description_decorators, {
 				kind: "accessor",
 				name: "description",
@@ -6978,13 +6995,13 @@ let MultipleChoice = (() => {
 			this.#setBoundValue(selectionValue);
 		}
 		render() {
-			return x`<section class=${e$2(this.theme.components.MultipleChoice.container)}>
+			return b`<section class=${e$2(this.theme.components.MultipleChoice.container)}>
       <label class=${e$2(this.theme.components.MultipleChoice.label)} for="data">${this.description ?? "Select an item"}</div>
       <select
         name="data"
         id="data"
         class=${e$2(this.theme.components.MultipleChoice.element)}
-        style=${this.theme.additionalStyles?.MultipleChoice ? o$2(this.theme.additionalStyles?.MultipleChoice) : E}
+        style=${this.theme.additionalStyles?.MultipleChoice ? o$2(this.theme.additionalStyles?.MultipleChoice) : A}
         @change=${(evt) => {
 				if (!(evt.target instanceof HTMLSelectElement)) {
 					return;
@@ -6994,7 +7011,7 @@ let MultipleChoice = (() => {
       >
         ${this.options.map((option) => {
 				const label = extractStringValue(option.label, this.component, this.processor, this.surfaceId);
-				return x`<option ${option.value}>${label}</option>`;
+				return b`<option ${option.value}>${label}</option>`;
 			})}
       </select>
     </section>`;
@@ -7018,11 +7035,11 @@ let MultipleChoice = (() => {
 var h = class {};
 const o$1 = new WeakMap(), n = e$10(class extends f {
 	render(i$10) {
-		return E;
+		return A;
 	}
 	update(i$10, [s$9]) {
 		const e$14 = s$9 !== this.G;
-		return e$14 && void 0 !== this.G && this.rt(void 0), (e$14 || this.lt !== this.ct) && (this.G = s$9, this.ht = i$10.options?.host, this.rt(this.ct = i$10.element)), E;
+		return e$14 && void 0 !== this.G && this.rt(void 0), (e$14 || this.lt !== this.ct) && (this.G = s$9, this.ht = i$10.options?.host, this.rt(this.ct = i$10.element)), A;
 	}
 	rt(t$7) {
 		if (this.isConnected || (t$7 = void 0), "function" == typeof this.G) {
@@ -7111,7 +7128,7 @@ let Modal = (() => {
 		}
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-			_private_showModal_decorators = [r$5()];
+			_private_showModal_decorators = [r$6()];
 			_private_modalRef_decorators = [e$5("dialog")];
 			__esDecorate$7(this, _private_showModal_descriptor = {
 				get: __setFunctionName(function() {
@@ -7224,7 +7241,7 @@ let Modal = (() => {
 		}
 		render() {
 			if (!this.#showModal) {
-				return x`<section
+				return b`<section
         @click=${() => {
 					this.#showModal = true;
 				}}
@@ -7232,7 +7249,7 @@ let Modal = (() => {
         <slot name="entry"></slot>
       </section>`;
 			}
-			return x`<dialog
+			return b`<dialog
       class=${e$2(this.theme.components.Modal.backdrop)}
       @click=${(evt) => {
 				const [top] = evt.composedPath();
@@ -7254,7 +7271,7 @@ let Modal = (() => {
     >
       <section
         class=${e$2(this.theme.components.Modal.element)}
-        style=${this.theme.additionalStyles?.Modal ? o$2(this.theme.additionalStyles?.Modal) : E}
+        style=${this.theme.additionalStyles?.Modal ? o$2(this.theme.additionalStyles?.Modal) : A}
       >
         <div id="controls">
           <button
@@ -7340,11 +7357,11 @@ let Row = (() => {
 		}
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-			_alignment_decorators = [n$4({
+			_alignment_decorators = [n$6({
 				reflect: true,
 				type: String
 			})];
-			_distribution_decorators = [n$4({
+			_distribution_decorators = [n$6({
 				reflect: true,
 				type: String
 			})];
@@ -7463,9 +7480,9 @@ let Row = (() => {
     `];
 		}
 		render() {
-			return x`<section
+			return b`<section
       class=${e$2(this.theme.components.Row)}
-      style=${this.theme.additionalStyles?.Row ? o$2(this.theme.additionalStyles?.Row) : E}
+      style=${this.theme.additionalStyles?.Row ? o$2(this.theme.additionalStyles?.Row) : A}
     >
       <slot></slot>
     </section>`;
@@ -7550,11 +7567,11 @@ let Slider = (() => {
 		}
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-			_value_decorators = [n$4()];
-			_minValue_decorators = [n$4()];
-			_maxValue_decorators = [n$4()];
-			_label_decorators = [n$4()];
-			_inputType_decorators = [n$4()];
+			_value_decorators = [n$6()];
+			_minValue_decorators = [n$6()];
+			_maxValue_decorators = [n$6()];
+			_label_decorators = [n$6()];
+			_inputType_decorators = [n$6()];
 			__esDecorate$5(this, null, _value_decorators, {
 				kind: "accessor",
 				name: "value",
@@ -7706,7 +7723,7 @@ let Slider = (() => {
 			this.processor.setData(this.component, this.value.path, value, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
 		}
 		#renderField(value) {
-			return x`<section
+			return b`<section
       class=${e$2(this.theme.components.Slider.container)}
     >
       <label class=${e$2(this.theme.components.Slider.label)} for="data">
@@ -7715,7 +7732,7 @@ let Slider = (() => {
       <input
         autocomplete="off"
         class=${e$2(this.theme.components.Slider.element)}
-        style=${this.theme.additionalStyles?.Slider ? o$2(this.theme.additionalStyles?.Slider) : E}
+        style=${this.theme.additionalStyles?.Slider ? o$2(this.theme.additionalStyles?.Slider) : A}
         @input=${(evt) => {
 				if (!(evt.target instanceof HTMLInputElement)) {
 					return;
@@ -7742,19 +7759,19 @@ let Slider = (() => {
 					return this.#renderField(this.value.literal);
 				} else if (this.value && "path" in this.value && this.value.path) {
 					if (!this.processor || !this.component) {
-						return x`(no processor)`;
+						return b`(no processor)`;
 					}
 					const textValue = this.processor.getData(this.component, this.value.path, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
 					if (textValue === null) {
-						return x`Invalid value`;
+						return b`Invalid value`;
 					}
 					if (typeof textValue !== "string" && typeof textValue !== "number") {
-						return x`Invalid value`;
+						return b`Invalid value`;
 					}
 					return this.#renderField(textValue);
 				}
 			}
-			return E;
+			return A;
 		}
 		constructor() {
 			super(...arguments);
@@ -7830,9 +7847,9 @@ let Surface = (() => {
 		}
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-			_surfaceId_decorators = [n$4()];
-			_surface_decorators = [n$4()];
-			_processor_decorators = [n$4()];
+			_surfaceId_decorators = [n$6()];
+			_surface_decorators = [n$6()];
+			_processor_decorators = [n$6()];
 			__esDecorate$4(this, null, _surfaceId_decorators, {
 				kind: "accessor",
 				name: "surfaceId",
@@ -7936,9 +7953,9 @@ let Surface = (() => {
 		}
 		#renderLogo() {
 			if (!this.surface?.styles.logoUrl) {
-				return E;
+				return A;
 			}
-			return x`<div id="surface-logo">
+			return b`<div id="surface-logo">
       <img src=${this.surface.styles.logoUrl} />
     </div>`;
 		}
@@ -7976,7 +7993,7 @@ let Surface = (() => {
 					}
 				}
 			}
-			return x`<a2ui-root
+			return b`<a2ui-root
       style=${o$2(styles)}
       .surfaceId=${this.surfaceId}
       .processor=${this.processor}
@@ -7985,9 +8002,9 @@ let Surface = (() => {
 		}
 		render() {
 			if (!this.surface) {
-				return E;
+				return A;
 			}
-			return x`${[this.#renderLogo(), this.#renderSurface()]}`;
+			return b`${[this.#renderLogo(), this.#renderSurface()]}`;
 		}
 		constructor() {
 			super(...arguments);
@@ -8060,8 +8077,8 @@ let Tabs = (() => {
 		}
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-			_titles_decorators = [n$4()];
-			_selected_decorators = [n$4()];
+			_titles_decorators = [n$6()];
+			_selected_decorators = [n$6()];
 			__esDecorate$3(this, null, _titles_decorators, {
 				kind: "accessor",
 				name: "titles",
@@ -8140,9 +8157,9 @@ let Tabs = (() => {
 		}
 		#renderTabs() {
 			if (!this.titles) {
-				return E;
+				return A;
 			}
-			return x`<div
+			return b`<div
       id="buttons"
       class=${e$2(this.theme.components.Tabs.element)}
     >
@@ -8154,11 +8171,11 @@ let Tabs = (() => {
 					titleString = title$1.literal;
 				} else if (title$1 && "path" in title$1 && title$1.path) {
 					if (!this.processor || !this.component) {
-						return x`(no model)`;
+						return b`(no model)`;
 					}
 					const textValue = this.processor.getData(this.component, title$1.path, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
 					if (typeof textValue !== "string") {
-						return x`(invalid)`;
+						return b`(invalid)`;
 					}
 					titleString = textValue;
 				}
@@ -8168,7 +8185,7 @@ let Tabs = (() => {
 				} else {
 					classes = { ...this.theme.components.Tabs.controls.all };
 				}
-				return x`<button
+				return b`<button
           ?disabled=${this.selected === idx}
           class=${e$2(classes)}
           @click=${() => {
@@ -8181,12 +8198,12 @@ let Tabs = (() => {
     </div>`;
 		}
 		#renderSlot() {
-			return x`<slot name="current"></slot>`;
+			return b`<slot name="current"></slot>`;
 		}
 		render() {
-			return x`<section
+			return b`<section
       class=${e$2(this.theme.components.Tabs.container)}
-      style=${this.theme.additionalStyles?.Tabs ? o$2(this.theme.additionalStyles?.Tabs) : E}
+      style=${this.theme.additionalStyles?.Tabs ? o$2(this.theme.additionalStyles?.Tabs) : A}
     >
       ${[this.#renderTabs(), this.#renderSlot()]}
     </section>`;
@@ -8265,9 +8282,9 @@ let TextField = (() => {
 		}
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-			_text_decorators = [n$4()];
-			_label_decorators = [n$4()];
-			_inputType_decorators = [n$4()];
+			_text_decorators = [n$6()];
+			_label_decorators = [n$6()];
+			_inputType_decorators = [n$6()];
 			__esDecorate$2(this, null, _text_decorators, {
 				kind: "accessor",
 				name: "text",
@@ -8379,18 +8396,18 @@ let TextField = (() => {
 			this.processor.setData(this.component, this.text.path, value, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
 		}
 		#renderField(value, label) {
-			return x` <section
+			return b` <section
       class=${e$2(this.theme.components.TextField.container)}
     >
-      ${label && label !== "" ? x`<label
+      ${label && label !== "" ? b`<label
             class=${e$2(this.theme.components.TextField.label)}
             for="data"
             >${label}</label
-          >` : E}
+          >` : A}
       <input
         autocomplete="off"
         class=${e$2(this.theme.components.TextField.element)}
-        style=${this.theme.additionalStyles?.TextField ? o$2(this.theme.additionalStyles?.TextField) : E}
+        style=${this.theme.additionalStyles?.TextField ? o$2(this.theme.additionalStyles?.TextField) : A}
         @input=${(evt) => {
 				if (!(evt.target instanceof HTMLInputElement)) {
 					return;
@@ -8427,15 +8444,15 @@ let TextField = (() => {
 * SPDX-License-Identifier: BSD-3-Clause
 */ var e = class extends i$5 {
 	constructor(i$10) {
-		if (super(i$10), this.it = E, i$10.type !== t$4.CHILD) throw Error(this.constructor.directiveName + "() can only be used in child bindings");
+		if (super(i$10), this.it = A, i$10.type !== t$4.CHILD) throw Error(this.constructor.directiveName + "() can only be used in child bindings");
 	}
-	render(r$11) {
-		if (r$11 === E || null == r$11) return this._t = void 0, this.it = r$11;
-		if (r$11 === T) return r$11;
-		if ("string" != typeof r$11) throw Error(this.constructor.directiveName + "() called with a non-string value");
-		if (r$11 === this.it) return this._t;
-		this.it = r$11;
-		const s$9 = [r$11];
+	render(r$12) {
+		if (r$12 === A || null == r$12) return this._t = void 0, this.it = r$12;
+		if (r$12 === E) return r$12;
+		if ("string" != typeof r$12) throw Error(this.constructor.directiveName + "() called with a non-string value");
+		if (r$12 === this.it) return this._t;
+		this.it = r$12;
+		const s$9 = [r$12];
 		return s$9.raw = s$9, this._t = {
 			_$litType$: this.constructor.resultType,
 			strings: s$9,
@@ -8752,11 +8769,11 @@ Url.prototype.parse = function(url, slashesDenoteHost) {
 				}
 				if (!part.match(hostnamePartPattern)) {
 					let newpart = "";
-					for (let j$1 = 0, k$1 = part.length; j$1 < k$1; j$1++) {
-						if (part.charCodeAt(j$1) > 127) {
+					for (let j$2 = 0, k$1 = part.length; j$2 < k$1; j$2++) {
+						if (part.charCodeAt(j$2) > 127) {
 							newpart += "x";
 						} else {
-							newpart += part[j$1];
+							newpart += part[j$2];
 						}
 					}
 					if (!newpart.match(hostnamePartPattern)) {
@@ -8816,7 +8833,7 @@ Url.prototype.parseHost = function(host) {
 };
 var parse_default = urlParse;
 
-var mdurl_exports = /* @__PURE__ */ __export({
+var mdurl_exports = /* @__PURE__ */ __exportAll({
 	decode: () => decode_default,
 	encode: () => encode_default,
 	format: () => format,
@@ -8835,7 +8852,7 @@ var regex_default$1 = /[\$\+<->\^`\|~\xA2-\xA6\xA8\xA9\xAC\xAE-\xB1\xB4\xB8\xD7\
 
 var regex_default = /[ \xA0\u1680\u2000-\u200A\u2028\u2029\u202F\u205F\u3000]/;
 
-var uc_exports = /* @__PURE__ */ __export({
+var uc_exports = /* @__PURE__ */ __exportAll({
 	Any: () => regex_default$5,
 	Cc: () => regex_default$4,
 	Cf: () => regex_default$3,
@@ -11298,7 +11315,7 @@ function encode$1(data, options = EntityLevel.XML) {
 	return encodeXML(data);
 }
 
-var utils_exports = /* @__PURE__ */ __export({
+var utils_exports = /* @__PURE__ */ __exportAll({
 	arrayReplaceAt: () => arrayReplaceAt,
 	assign: () => assign$1,
 	escapeHtml: () => escapeHtml,
@@ -11669,7 +11686,7 @@ function parseLinkTitle(str, start, max, prev_state) {
 	return state;
 }
 
-var helpers_exports = /* @__PURE__ */ __export({
+var helpers_exports = /* @__PURE__ */ __exportAll({
 	parseLinkDestination: () => parseLinkDestination,
 	parseLinkLabel: () => parseLinkLabel,
 	parseLinkTitle: () => parseLinkTitle
@@ -12441,11 +12458,11 @@ function linkify$1(state) {
 	if (!state.md.options.linkify) {
 		return;
 	}
-	for (let j$1 = 0, l$5 = blockTokens.length; j$1 < l$5; j$1++) {
-		if (blockTokens[j$1].type !== "inline" || !state.md.linkify.pretest(blockTokens[j$1].content)) {
+	for (let j$2 = 0, l$5 = blockTokens.length; j$2 < l$5; j$2++) {
+		if (blockTokens[j$2].type !== "inline" || !state.md.linkify.pretest(blockTokens[j$2].content)) {
 			continue;
 		}
-		let tokens = blockTokens[j$1].children;
+		let tokens = blockTokens[j$2].children;
 		let htmlLinkLevel = 0;
 		for (let i$10 = tokens.length - 1; i$10 >= 0; i$10--) {
 			const currentToken = tokens[i$10];
@@ -12520,7 +12537,7 @@ function linkify$1(state) {
 					token.level = level;
 					nodes.push(token);
 				}
-				blockTokens[j$1].children = tokens = arrayReplaceAt(tokens, i$10, nodes);
+				blockTokens[j$2].children = tokens = arrayReplaceAt(tokens, i$10, nodes);
 			}
 		}
 	}
@@ -12594,17 +12611,17 @@ function replaceAt(str, index, ch) {
 	return str.slice(0, index) + ch + str.slice(index + 1);
 }
 function process_inlines(tokens, state) {
-	let j$1;
+	let j$2;
 	const stack = [];
 	for (let i$10 = 0; i$10 < tokens.length; i$10++) {
 		const token = tokens[i$10];
 		const thisLevel = tokens[i$10].level;
-		for (j$1 = stack.length - 1; j$1 >= 0; j$1--) {
-			if (stack[j$1].level <= thisLevel) {
+		for (j$2 = stack.length - 1; j$2 >= 0; j$2--) {
+			if (stack[j$2].level <= thisLevel) {
 				break;
 			}
 		}
-		stack.length = j$1 + 1;
+		stack.length = j$2 + 1;
 		if (token.type !== "text") {
 			continue;
 		}
@@ -12625,10 +12642,10 @@ function process_inlines(tokens, state) {
 			if (t$7.index - 1 >= 0) {
 				lastChar = text$1.charCodeAt(t$7.index - 1);
 			} else {
-				for (j$1 = i$10 - 1; j$1 >= 0; j$1--) {
-					if (tokens[j$1].type === "softbreak" || tokens[j$1].type === "hardbreak") break;
-					if (!tokens[j$1].content) continue;
-					lastChar = tokens[j$1].content.charCodeAt(tokens[j$1].content.length - 1);
+				for (j$2 = i$10 - 1; j$2 >= 0; j$2--) {
+					if (tokens[j$2].type === "softbreak" || tokens[j$2].type === "hardbreak") break;
+					if (!tokens[j$2].content) continue;
+					lastChar = tokens[j$2].content.charCodeAt(tokens[j$2].content.length - 1);
 					break;
 				}
 			}
@@ -12636,10 +12653,10 @@ function process_inlines(tokens, state) {
 			if (pos < max) {
 				nextChar = text$1.charCodeAt(pos);
 			} else {
-				for (j$1 = i$10 + 1; j$1 < tokens.length; j$1++) {
-					if (tokens[j$1].type === "softbreak" || tokens[j$1].type === "hardbreak") break;
-					if (!tokens[j$1].content) continue;
-					nextChar = tokens[j$1].content.charCodeAt(0);
+				for (j$2 = i$10 + 1; j$2 < tokens.length; j$2++) {
+					if (tokens[j$2].type === "softbreak" || tokens[j$2].type === "hardbreak") break;
+					if (!tokens[j$2].content) continue;
+					nextChar = tokens[j$2].content.charCodeAt(0);
 					break;
 				}
 			}
@@ -12677,13 +12694,13 @@ function process_inlines(tokens, state) {
 				continue;
 			}
 			if (canClose) {
-				for (j$1 = stack.length - 1; j$1 >= 0; j$1--) {
-					let item = stack[j$1];
-					if (stack[j$1].level < thisLevel) {
+				for (j$2 = stack.length - 1; j$2 >= 0; j$2--) {
+					let item = stack[j$2];
+					if (stack[j$2].level < thisLevel) {
 						break;
 					}
-					if (item.single === isSingle && stack[j$1].level === thisLevel) {
-						item = stack[j$1];
+					if (item.single === isSingle && stack[j$2].level === thisLevel) {
+						item = stack[j$2];
 						let openQuote;
 						let closeQuote;
 						if (isSingle) {
@@ -12701,7 +12718,7 @@ function process_inlines(tokens, state) {
 						}
 						text$1 = token.content;
 						max = text$1.length;
-						stack.length = j$1;
+						stack.length = j$2;
 						continue OUTER;
 					}
 				}
@@ -12735,9 +12752,9 @@ function text_join(state) {
 	let curr, last;
 	const blockTokens = state.tokens;
 	const l$5 = blockTokens.length;
-	for (let j$1 = 0; j$1 < l$5; j$1++) {
-		if (blockTokens[j$1].type !== "inline") continue;
-		const tokens = blockTokens[j$1].children;
+	for (let j$2 = 0; j$2 < l$5; j$2++) {
+		if (blockTokens[j$2].type !== "inline") continue;
+		const tokens = blockTokens[j$2].children;
 		const max = tokens.length;
 		for (curr = 0; curr < max; curr++) {
 			if (tokens[curr].type === "text_special") {
@@ -14589,14 +14606,14 @@ function postProcess$1(state, delimiters) {
 	}
 	while (loneMarkers.length) {
 		const i$10 = loneMarkers.pop();
-		let j$1 = i$10 + 1;
-		while (j$1 < state.tokens.length && state.tokens[j$1].type === "s_close") {
-			j$1++;
+		let j$2 = i$10 + 1;
+		while (j$2 < state.tokens.length && state.tokens[j$2].type === "s_close") {
+			j$2++;
 		}
-		j$1--;
-		if (i$10 !== j$1) {
-			token = state.tokens[j$1];
-			state.tokens[j$1] = state.tokens[i$10];
+		j$2--;
+		if (i$10 !== j$2) {
+			token = state.tokens[j$2];
+			state.tokens[j$2] = state.tokens[i$10];
 			state.tokens[i$10] = token;
 		}
 	}
@@ -15960,17 +15977,17 @@ const decode = function(input) {
 	const output = [];
 	const inputLength = input.length;
 	let i$10 = 0;
-	let n$11 = initialN;
+	let n$13 = initialN;
 	let bias = initialBias;
 	let basic = input.lastIndexOf(delimiter);
 	if (basic < 0) {
 		basic = 0;
 	}
-	for (let j$1 = 0; j$1 < basic; ++j$1) {
-		if (input.charCodeAt(j$1) >= 128) {
+	for (let j$2 = 0; j$2 < basic; ++j$2) {
+		if (input.charCodeAt(j$2) >= 128) {
 			error("not-basic");
 		}
-		output.push(input.charCodeAt(j$1));
+		output.push(input.charCodeAt(j$2));
 	}
 	for (let index = basic > 0 ? basic + 1 : 0; index < inputLength;) {
 		const oldi = i$10;
@@ -15998,12 +16015,12 @@ const decode = function(input) {
 		}
 		const out = output.length + 1;
 		bias = adapt(i$10 - oldi, out, oldi == 0);
-		if (floor(i$10 / out) > maxInt - n$11) {
+		if (floor(i$10 / out) > maxInt - n$13) {
 			error("overflow");
 		}
-		n$11 += floor(i$10 / out);
+		n$13 += floor(i$10 / out);
 		i$10 %= out;
-		output.splice(i$10++, 0, n$11);
+		output.splice(i$10++, 0, n$13);
 	}
 	return String.fromCodePoint(...output);
 };
@@ -16018,7 +16035,7 @@ const encode = function(input) {
 	const output = [];
 	input = ucs2decode(input);
 	const inputLength = input.length;
-	let n$11 = initialN;
+	let n$13 = initialN;
 	let delta = 0;
 	let bias = initialBias;
 	for (const currentValue of input) {
@@ -16034,21 +16051,21 @@ const encode = function(input) {
 	while (handledCPCount < inputLength) {
 		let m$3 = maxInt;
 		for (const currentValue of input) {
-			if (currentValue >= n$11 && currentValue < m$3) {
+			if (currentValue >= n$13 && currentValue < m$3) {
 				m$3 = currentValue;
 			}
 		}
 		const handledCPCountPlusOne = handledCPCount + 1;
-		if (m$3 - n$11 > floor((maxInt - delta) / handledCPCountPlusOne)) {
+		if (m$3 - n$13 > floor((maxInt - delta) / handledCPCountPlusOne)) {
 			error("overflow");
 		}
-		delta += (m$3 - n$11) * handledCPCountPlusOne;
-		n$11 = m$3;
+		delta += (m$3 - n$13) * handledCPCountPlusOne;
+		n$13 = m$3;
 		for (const currentValue of input) {
-			if (currentValue < n$11 && ++delta > maxInt) {
+			if (currentValue < n$13 && ++delta > maxInt) {
 				error("overflow");
 			}
-			if (currentValue === n$11) {
+			if (currentValue === n$13) {
 				let q = delta;
 				for (let k$1 = base;; k$1 += base) {
 					const t$7 = k$1 <= bias ? tMin : k$1 >= bias + tMax ? tMax : k$1 - bias;
@@ -16067,7 +16084,7 @@ const encode = function(input) {
 			}
 		}
 		++delta;
-		++n$11;
+		++n$13;
 	}
 	return output.join("");
 };
@@ -16721,7 +16738,7 @@ var lib_default = MarkdownIt;
 */
 function escapeNodeText(str) {
 	const frag = document.createElement("div");
-	B(x`${str}`, frag);
+	D(b`${str}`, frag);
 	return frag.innerHTML.replaceAll(/<!--([^-]*)-->/gim, "");
 }
 function unescapeNodeText(str) {
@@ -16750,7 +16767,7 @@ var MarkdownDirective = class extends i$5 {
 	#lastTagClassMap = null;
 	update(_part, [value, tagClassMap]) {
 		if (this.#lastValue === value && JSON.stringify(tagClassMap) === this.#lastTagClassMap) {
-			return T;
+			return E;
 		}
 		this.#lastValue = value;
 		this.#lastTagClassMap = JSON.stringify(tagClassMap);
@@ -16893,8 +16910,8 @@ let Text = (() => {
 		}
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-			_text_decorators = [n$4()];
-			_usageHint_decorators = [n$4({
+			_text_decorators = [n$6()];
+			_usageHint_decorators = [n$6({
 				reflect: true,
 				attribute: "usage-hint"
 			})];
@@ -16979,7 +16996,7 @@ let Text = (() => {
 					textValue = this.text.literal;
 				} else if (this.text && "path" in this.text && this.text.path) {
 					if (!this.processor || !this.component) {
-						return x`(no model)`;
+						return b`(no model)`;
 					}
 					const value = this.processor.getData(this.component, this.text.path, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
 					if (value !== null && value !== undefined) {
@@ -16988,7 +17005,7 @@ let Text = (() => {
 				}
 			}
 			if (textValue === null || textValue === undefined) {
-				return x`(empty)`;
+				return b`(empty)`;
 			}
 			let markdownText = textValue;
 			switch (this.usageHint) {
@@ -17012,7 +17029,7 @@ let Text = (() => {
 					break;
 				default: break;
 			}
-			return x`${markdown(markdownText, appendToAll(this.theme.markdown, [
+			return b`${markdown(markdownText, appendToAll(this.theme.markdown, [
 				"ol",
 				"ul",
 				"li"
@@ -17048,9 +17065,9 @@ let Text = (() => {
 		}
 		render() {
 			const classes = merge(this.theme.components.Text.all, this.usageHint ? this.theme.components.Text[this.usageHint] : {});
-			return x`<section
+			return b`<section
       class=${e$2(classes)}
-      style=${this.theme.additionalStyles?.Text ? o$2(this.#getAdditionalStyles()) : E}
+      style=${this.theme.additionalStyles?.Text ? o$2(this.#getAdditionalStyles()) : A}
     >
       ${this.#renderText()}
     </section>`;
@@ -17123,7 +17140,7 @@ let Video = (() => {
 		}
 		static {
 			const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-			_url_decorators = [n$4()];
+			_url_decorators = [n$6()];
 			__esDecorate(this, null, _url_decorators, {
 				kind: "accessor",
 				name: "url",
@@ -17179,33 +17196,33 @@ let Video = (() => {
 		}
 		#renderVideo() {
 			if (!this.url) {
-				return E;
+				return A;
 			}
 			if (this.url && typeof this.url === "object") {
 				if ("literalString" in this.url) {
-					return x`<video controls src=${this.url.literalString} />`;
+					return b`<video controls src=${this.url.literalString} />`;
 				} else if ("literal" in this.url) {
-					return x`<video controls src=${this.url.literal} />`;
+					return b`<video controls src=${this.url.literal} />`;
 				} else if (this.url && "path" in this.url && this.url.path) {
 					if (!this.processor || !this.component) {
-						return x`(no processor)`;
+						return b`(no processor)`;
 					}
 					const videoUrl = this.processor.getData(this.component, this.url.path, this.surfaceId ?? A2uiMessageProcessor.DEFAULT_SURFACE_ID);
 					if (!videoUrl) {
-						return x`Invalid video URL`;
+						return b`Invalid video URL`;
 					}
 					if (typeof videoUrl !== "string") {
-						return x`Invalid video URL`;
+						return b`Invalid video URL`;
 					}
-					return x`<video controls src=${videoUrl} />`;
+					return b`<video controls src=${videoUrl} />`;
 				}
 			}
-			return x`(empty)`;
+			return b`(empty)`;
 		}
 		render() {
-			return x`<section
+			return b`<section
       class=${e$2(this.theme.components.Video)}
-      style=${this.theme.additionalStyles?.Video ? o$2(this.theme.additionalStyles?.Video) : E}
+      style=${this.theme.additionalStyles?.Video ? o$2(this.theme.additionalStyles?.Video) : A}
     >
       ${this.#renderVideo()}
     </section>`;
@@ -17485,9 +17502,9 @@ var ClawdisA2UIHost = class extends i$6 {
       color: rgba(255, 255, 255, 0.92);
       font: 13px/1.2 system-ui, -apple-system, BlinkMacSystemFont, "Roboto", sans-serif;
       pointer-events: none;
-      backdrop-filter: blur(${r$10(statusBlur)});
-      -webkit-backdrop-filter: blur(${r$10(statusBlur)});
-      box-shadow: ${r$10(statusShadow)};
+      backdrop-filter: blur(${r$11(statusBlur)});
+      -webkit-backdrop-filter: blur(${r$11(statusBlur)});
+      box-shadow: ${r$11(statusShadow)};
       z-index: 5;
     }
 
@@ -17506,9 +17523,9 @@ var ClawdisA2UIHost = class extends i$6 {
       color: rgba(255, 255, 255, 0.92);
       font: 13px/1.2 system-ui, -apple-system, BlinkMacSystemFont, "Roboto", sans-serif;
       pointer-events: none;
-      backdrop-filter: blur(${r$10(statusBlur)});
-      -webkit-backdrop-filter: blur(${r$10(statusBlur)});
-      box-shadow: ${r$10(statusShadow)};
+      backdrop-filter: blur(${r$11(statusBlur)});
+      -webkit-backdrop-filter: blur(${r$11(statusBlur)});
+      box-shadow: ${r$11(statusShadow)};
       z-index: 5;
     }
 
@@ -17730,17 +17747,17 @@ var ClawdisA2UIHost = class extends i$6 {
 	}
 	render() {
 		if (this.surfaces.length === 0) {
-			return x`<div class="empty">
+			return b`<div class="empty">
         <div class="empty-title">Canvas (A2UI)</div>
         <div>Waiting for A2UI messages…</div>
       </div>`;
 		}
 		const statusText = this.pendingAction?.phase === "sent" ? `Working: ${this.pendingAction.name}` : this.pendingAction?.phase === "sending" ? `Sending: ${this.pendingAction.name}` : this.pendingAction?.phase === "error" ? `Failed: ${this.pendingAction.name}` : "";
-		return x`
-      ${this.pendingAction && this.pendingAction.phase !== "error" ? x`<div class="status"><div class="spinner"></div><div>${statusText}</div></div>` : ""}
-      ${this.toast ? x`<div class="toast ${this.toast.kind === "error" ? "error" : ""}">${this.toast.text}</div>` : ""}
+		return b`
+      ${this.pendingAction && this.pendingAction.phase !== "error" ? b`<div class="status"><div class="spinner"></div><div>${statusText}</div></div>` : ""}
+      ${this.toast ? b`<div class="toast ${this.toast.kind === "error" ? "error" : ""}">${this.toast.text}</div>` : ""}
       <section id="surfaces">
-      ${c$2(this.surfaces, ([surfaceId]) => surfaceId, ([surfaceId, surface]) => x`<a2ui-surface
+      ${c$2(this.surfaces, ([surfaceId]) => surfaceId, ([surfaceId, surface]) => b`<a2ui-surface
           .surfaceId=${surfaceId}
           .surface=${surface}
           .processor=${this.#processor}

From cc86bbf27dd0cbefc995b7b4c22efceb253798f6 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 15:43:13 +0100
Subject: [PATCH 076/100] feat: add food-order skill

---
 skills/food-order/SKILL.md | 41 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 skills/food-order/SKILL.md

diff --git a/skills/food-order/SKILL.md b/skills/food-order/SKILL.md
new file mode 100644
index 000000000..697ee4e52
--- /dev/null
+++ b/skills/food-order/SKILL.md
@@ -0,0 +1,41 @@
+---
+name: food-order
+description: Reorder Foodora orders + track ETA/status with ordercli. Never confirm without explicit user approval. Triggers: order food, reorder, track ETA.
+homepage: https://ordercli.sh
+metadata: {"clawdis":{"emoji":"🥡","requires":{"bins":["ordercli"]},"install":[{"id":"go","kind":"go","module":"github.com/steipete/ordercli/cmd/ordercli@latest","bins":["ordercli"],"label":"Install ordercli (go)"}]}}
+---
+
+# Food order (Foodora via ordercli)
+
+Goal: reorder a previous Foodora order safely (preview first; confirm only on explicit user “yes/confirm/place the order”).
+
+Hard safety rules
+- Never run `ordercli foodora reorder ... --confirm` unless user explicitly confirms placing the order.
+- Prefer preview-only steps first; show what will happen; ask for confirmation.
+- If user is unsure: stop at preview and ask questions.
+
+Setup (once)
+- Country: `ordercli foodora countries` → `ordercli foodora config set --country AT`
+- Login (password): `ordercli foodora login --email you@example.com --password-stdin`
+- Login (no password, preferred): `ordercli foodora session chrome --url https://www.foodora.at/ --profile "Default"`
+
+Find what to reorder
+- Recent list: `ordercli foodora history --limit 10`
+- Details: `ordercli foodora history show <orderCode>`
+- If needed (machine-readable): `ordercli foodora history show <orderCode> --json`
+
+Preview reorder (no cart changes)
+- `ordercli foodora reorder <orderCode>`
+
+Place reorder (cart change; explicit confirmation required)
+- Confirm first, then run: `ordercli foodora reorder <orderCode> --confirm`
+- Multiple addresses? Ask user for the right `--address-id` (take from their Foodora account / prior order data) and run:
+  - `ordercli foodora reorder <orderCode> --confirm --address-id <id>`
+
+Track the order
+- ETA/status (active list): `ordercli foodora orders`
+- Live updates: `ordercli foodora orders --watch`
+- Single order detail: `ordercli foodora order <orderCode>`
+
+Debug / safe testing
+- Use a throwaway config: `ordercli --config /tmp/ordercli.json ...`

From 01b8a71ee6399a2633acf742c3eaade267053eae Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 19:22:38 +0000
Subject: [PATCH 077/100] docs: clarify browser wait guidance

---
 CHANGELOG.md                | 1 +
 docs/browser.md             | 1 +
 docs/tools.md               | 1 +
 src/agents/clawdis-tools.ts | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 426a84fde..f9d14f694 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - UI: add optional `ui.seamColor` accent to tint the Talk Mode side bubble (macOS/iOS/Android).
 
 ### Fixes
+- Docs/agent tools: clarify that browser `wait` should be avoided by default and used only in exceptional cases.
 - macOS: Voice Wake now fully tears down the Speech pipeline when disabled (cancel pending restarts, drop stale callbacks) to avoid high CPU in the background.
 - macOS menu: add a Talk Mode action alongside the Open Dashboard/Chat/Canvas entries.
 - macOS Debug: hide “Restart Gateway” when the app won’t start a local gateway (remote mode / attach-only).
diff --git a/docs/browser.md b/docs/browser.md
index 8ac4f935d..dd7d17239 100644
--- a/docs/browser.md
+++ b/docs/browser.md
@@ -193,6 +193,7 @@ Notes:
 - The arm default timeout is **2 minutes** (clamped to max 2 minutes); pass `timeoutMs` if you need shorter.
 - `snapshot` defaults to `ai`; `aria` returns an accessibility tree for debugging.
 - `click`/`type` require `ref` from `snapshot --format ai`; use `evaluate` for rare CSS selector one-offs.
+- Avoid `wait` by default; use it only in exceptional cases when there is no reliable UI state to wait on.
 
 ## Security & privacy notes
 
diff --git a/docs/tools.md b/docs/tools.md
index 048c0ba27..083827c8f 100644
--- a/docs/tools.md
+++ b/docs/tools.md
@@ -51,6 +51,7 @@ Notes:
 - Uses `browser.controlUrl` unless `controlUrl` is passed explicitly.
 - `snapshot` defaults to `ai`; use `aria` for the accessibility tree.
 - `act` requires `ref` from `snapshot --format ai`; use `evaluate` for rare CSS selector needs.
+- Avoid `act` → `wait` by default; use it only in exceptional cases (no reliable UI state to wait on).
 
 ### `clawdis_canvas`
 Drive the node Canvas (present, eval, snapshot, A2UI).
diff --git a/src/agents/clawdis-tools.ts b/src/agents/clawdis-tools.ts
index 6f4711eb7..6192226fe 100644
--- a/src/agents/clawdis-tools.ts
+++ b/src/agents/clawdis-tools.ts
@@ -506,7 +506,7 @@ function createBrowserTool(): AnyAgentTool {
     label: "Clawdis Browser",
     name: "clawdis_browser",
     description:
-      "Control clawd's dedicated browser (status/start/stop/tabs/open/snapshot/screenshot/actions). Use snapshot+act for UI automation.",
+      "Control clawd's dedicated browser (status/start/stop/tabs/open/snapshot/screenshot/actions). Use snapshot+act for UI automation. Avoid act:wait by default; use only in exceptional cases when no reliable UI state exists.",
     parameters: BrowserToolSchema,
     execute: async (_toolCallId, args) => {
       const params = args as Record<string, unknown>;

From ed76cd7574536fb899ce7e2626eb1f48c986dc0b Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 20:25:52 +0100
Subject: [PATCH 078/100] fix: restore talk orb hit testing

---
 apps/macos/Sources/Clawdis/TalkOverlay.swift     | 16 ++++------------
 apps/macos/Sources/Clawdis/TalkOverlayView.swift |  7 +++++--
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/apps/macos/Sources/Clawdis/TalkOverlay.swift b/apps/macos/Sources/Clawdis/TalkOverlay.swift
index 258ac2beb..57dd56c80 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlay.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlay.swift
@@ -126,7 +126,10 @@ final class TalkOverlayController {
     }
 
     private func targetFrame() -> NSRect {
-        guard let screen = NSScreen.main else { return .zero }
+        let screen = self.window?.screen
+            ?? NSScreen.main
+            ?? NSScreen.screens.first
+        guard let screen else { return .zero }
         let size = NSSize(width: Self.overlaySize, height: Self.overlaySize)
         let visible = screen.visibleFrame
         let origin = CGPoint(
@@ -140,15 +143,4 @@ private final class TalkOverlayHostingView: NSHostingView<TalkOverlayView> {
     override func acceptsFirstMouse(for event: NSEvent?) -> Bool {
         true
     }
-
-    override func hitTest(_ point: NSPoint) -> NSView? {
-        let center = CGPoint(
-            x: self.bounds.maxX - TalkOverlayController.orbPadding - (TalkOverlayController.orbSize / 2),
-            y: self.bounds.maxY - TalkOverlayController.orbPadding - (TalkOverlayController.orbSize / 2))
-        let radius = (TalkOverlayController.orbSize / 2) + TalkOverlayController.orbHitSlop
-        let dx = point.x - center.x
-        let dy = point.y - center.y
-        guard dx * dx + dy * dy <= radius * radius else { return nil }
-        return super.hitTest(point)
-    }
 }
diff --git a/apps/macos/Sources/Clawdis/TalkOverlayView.swift b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
index d6c9a3a73..154a948a7 100644
--- a/apps/macos/Sources/Clawdis/TalkOverlayView.swift
+++ b/apps/macos/Sources/Clawdis/TalkOverlayView.swift
@@ -9,6 +9,7 @@ struct TalkOverlayView: View {
     var body: some View {
         ZStack(alignment: .topTrailing) {
             let isPaused = self.controller.model.isPaused
+            Color.clear
             TalkOrbView(
                 phase: self.controller.model.phase,
                 level: self.controller.model.level,
@@ -40,11 +41,13 @@ struct TalkOverlayView: View {
                 .offset(x: -2, y: -2)
                 .opacity(self.hoveringWindow ? 1 : 0)
                 .animation(.easeOut(duration: 0.12), value: self.hoveringWindow)
-                .allowsHitTesting(self.hoveringWindow)
             }
             .onHover { self.hoveringWindow = $0 }
         }
-        .frame(width: TalkOverlayController.overlaySize, height: TalkOverlayController.overlaySize, alignment: .center)
+        .frame(
+            width: TalkOverlayController.overlaySize,
+            height: TalkOverlayController.overlaySize,
+            alignment: .topTrailing)
     }
 
     private static let defaultSeamColor = Color(red: 79 / 255.0, green: 122 / 255.0, blue: 154 / 255.0)

From b3cf07d6cbfed3ecf04b10f1655ee5b78166d75c Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 20:25:58 +0100
Subject: [PATCH 079/100] feat: add ui theme toggle

---
 ui/src/styles/base.css        |  81 ++++++++++++++++++++++++--
 ui/src/styles/components.css  |  70 +++++++++++++++++++++-
 ui/src/styles/layout.css      |   5 +-
 ui/src/ui/app-render.ts       |  97 ++++++++++++++++++++++++++++++-
 ui/src/ui/app.ts              |  73 +++++++++++++++++++++++
 ui/src/ui/storage.ts          |  10 ++++
 ui/src/ui/theme-transition.ts | 106 ++++++++++++++++++++++++++++++++++
 ui/src/ui/theme.ts            |  16 +++++
 8 files changed, 447 insertions(+), 11 deletions(-)
 create mode 100644 ui/src/ui/theme-transition.ts
 create mode 100644 ui/src/ui/theme.ts

diff --git a/ui/src/styles/base.css b/ui/src/styles/base.css
index dd85475db..ead5d2893 100644
--- a/ui/src/styles/base.css
+++ b/ui/src/styles/base.css
@@ -3,8 +3,14 @@
 :root {
   --bg: #0a0e14;
   --bg-accent: #101826;
+  --bg-grad-1: #1a2740;
+  --bg-grad-2: #241626;
+  --bg-overlay: rgba(255, 255, 255, 0.03);
+  --bg-glow: rgba(54, 207, 201, 0.08);
   --panel: rgba(18, 24, 36, 0.92);
   --panel-strong: rgba(24, 32, 46, 0.95);
+  --chrome: rgba(10, 14, 20, 0.75);
+  --chrome-strong: rgba(10, 14, 20, 0.82);
   --text: rgba(246, 248, 252, 0.95);
   --muted: rgba(210, 218, 230, 0.62);
   --border: rgba(255, 255, 255, 0.08);
@@ -13,6 +19,8 @@
   --ok: #1bd98a;
   --warn: #f2c94c;
   --danger: #ff5c5c;
+  --theme-switch-x: 50%;
+  --theme-switch-y: 50%;
   --mono: "JetBrains Mono", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
     "Liberation Mono", "Courier New", monospace;
   --font-body: "Space Grotesk", system-ui, sans-serif;
@@ -20,6 +28,28 @@
   color-scheme: dark;
 }
 
+:root[data-theme="light"] {
+  --bg: #f5f7fb;
+  --bg-accent: #ffffff;
+  --bg-grad-1: #e3edf9;
+  --bg-grad-2: #f7e6f0;
+  --bg-overlay: rgba(28, 32, 46, 0.04);
+  --bg-glow: rgba(54, 207, 201, 0.12);
+  --panel: rgba(255, 255, 255, 0.9);
+  --panel-strong: rgba(255, 255, 255, 0.98);
+  --chrome: rgba(255, 255, 255, 0.72);
+  --chrome-strong: rgba(255, 255, 255, 0.82);
+  --text: rgba(20, 24, 36, 0.96);
+  --muted: rgba(50, 58, 76, 0.6);
+  --border: rgba(16, 24, 40, 0.12);
+  --accent: #ff7a3d;
+  --accent-2: #1bb9b1;
+  --ok: #15b97a;
+  --warn: #c58a1a;
+  --danger: #e84343;
+  color-scheme: light;
+}
+
 * {
   box-sizing: border-box;
 }
@@ -32,9 +62,14 @@ body {
 body {
   margin: 0;
   font: 15px/1.4 var(--font-body);
-  background: radial-gradient(1200px 900px at 20% 0%, #1a2740 0%, var(--bg) 55%)
+  background: radial-gradient(
+        1200px 900px at 20% 0%,
+        var(--bg-grad-1) 0%,
+        var(--bg) 55%
+      )
+      fixed,
+    radial-gradient(900px 700px at 90% 10%, var(--bg-grad-2) 0%, transparent 55%)
       fixed,
-    radial-gradient(900px 700px at 90% 10%, #241626 0%, transparent 55%) fixed,
     var(--bg);
   color: var(--text);
 }
@@ -45,18 +80,55 @@ body::before {
   inset: 0;
   background: linear-gradient(
       135deg,
-      rgba(255, 255, 255, 0.03) 0%,
+      var(--bg-overlay) 0%,
       rgba(255, 255, 255, 0) 35%
     ),
     radial-gradient(
       600px 400px at 80% 80%,
-      rgba(54, 207, 201, 0.08),
+      var(--bg-glow),
       transparent 60%
     );
   pointer-events: none;
   z-index: 0;
 }
 
+@keyframes theme-circle-transition {
+  0% {
+    clip-path: circle(
+      0% at var(--theme-switch-x, 50%) var(--theme-switch-y, 50%)
+    );
+  }
+
+  100% {
+    clip-path: circle(
+      150% at var(--theme-switch-x, 50%) var(--theme-switch-y, 50%)
+    );
+  }
+}
+
+html.theme-transition {
+  view-transition-name: theme;
+}
+
+html.theme-transition::view-transition-old(theme) {
+  mix-blend-mode: normal;
+  animation: none;
+  z-index: 1;
+}
+
+html.theme-transition::view-transition-new(theme) {
+  mix-blend-mode: normal;
+  z-index: 2;
+  animation: theme-circle-transition 0.45s ease-out forwards;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  html.theme-transition::view-transition-old(theme),
+  html.theme-transition::view-transition-new(theme) {
+    animation: none !important;
+  }
+}
+
 clawdis-app {
   display: block;
   position: relative;
@@ -86,4 +158,3 @@ select {
     transform: translateY(0);
   }
 }
-
diff --git a/ui/src/styles/components.css b/ui/src/styles/components.css
index 3a5a09999..4b6ccc8dc 100644
--- a/ui/src/styles/components.css
+++ b/ui/src/styles/components.css
@@ -84,7 +84,75 @@
   border: 1px solid var(--border);
   padding: 6px 10px;
   border-radius: 999px;
-  background: rgba(0, 0, 0, 0.3);
+  background: var(--panel);
+}
+
+.theme-toggle {
+  --theme-item: 28px;
+  --theme-gap: 6px;
+  --theme-pad: 6px;
+  position: relative;
+}
+
+.theme-toggle__track {
+  position: relative;
+  display: grid;
+  grid-template-columns: repeat(3, var(--theme-item));
+  gap: var(--theme-gap);
+  padding: var(--theme-pad);
+  border-radius: 999px;
+  border: 1px solid var(--border);
+  background: rgba(255, 255, 255, 0.02);
+}
+
+.theme-toggle__indicator {
+  position: absolute;
+  top: 50%;
+  left: var(--theme-pad);
+  width: var(--theme-item);
+  height: var(--theme-item);
+  border-radius: 999px;
+  transform: translateY(-50%)
+    translateX(calc(var(--theme-index, 0) * (var(--theme-item) + var(--theme-gap))));
+  background: var(--panel-strong);
+  border: 1px solid var(--border);
+  box-shadow: 0 8px 18px rgba(0, 0, 0, 0.25);
+  transition: transform 180ms ease-out, background 180ms ease-out;
+  z-index: 0;
+}
+
+.theme-toggle__button {
+  height: var(--theme-item);
+  width: var(--theme-item);
+  display: grid;
+  place-items: center;
+  border: 0;
+  border-radius: 999px;
+  background: transparent;
+  color: var(--muted);
+  cursor: pointer;
+  position: relative;
+  z-index: 1;
+  transition: color 150ms ease-out, background 150ms ease-out;
+}
+
+.theme-toggle__button:hover {
+  color: var(--text);
+  background: rgba(255, 255, 255, 0.08);
+}
+
+.theme-toggle__button.active {
+  color: var(--text);
+}
+
+.theme-icon {
+  width: 16px;
+  height: 16px;
+  stroke: currentColor;
+  fill: none;
+  stroke-width: 1.75px;
+  stroke-linecap: round;
+  stroke-linejoin: round;
 }
 
 .pill.danger {
diff --git a/ui/src/styles/layout.css b/ui/src/styles/layout.css
index 0277730e4..1a81fa776 100644
--- a/ui/src/styles/layout.css
+++ b/ui/src/styles/layout.css
@@ -15,7 +15,7 @@
   align-items: center;
   padding: 18px 24px;
   border-bottom: 1px solid var(--border);
-  background: rgba(10, 14, 20, 0.75);
+  background: var(--chrome);
   backdrop-filter: blur(16px);
 }
 
@@ -40,7 +40,7 @@
   grid-area: nav;
   padding: 18px 16px;
   border-right: 1px solid var(--border);
-  background: rgba(10, 14, 20, 0.8);
+  background: var(--chrome-strong);
 }
 
 .nav-group {
@@ -197,4 +197,3 @@
     grid-template-columns: 1fr;
   }
 }
-
diff --git a/ui/src/ui/app-render.ts b/ui/src/ui/app-render.ts
index 1130954dc..c82894b95 100644
--- a/ui/src/ui/app-render.ts
+++ b/ui/src/ui/app-render.ts
@@ -8,6 +8,9 @@ import {
   titleForTab,
   type Tab,
 } from "./navigation";
+import type { UiSettings } from "./storage";
+import type { ThemeMode } from "./theme";
+import type { ThemeTransitionContext } from "./theme-transition";
 import type {
   ConfigSnapshot,
   CronJob,
@@ -54,11 +57,13 @@ export type EventLogEntry = {
 };
 
 export type AppViewState = {
-  settings: { gatewayUrl: string; token: string; sessionKey: string };
+  settings: UiSettings;
   password: string;
   tab: Tab;
   basePath: string;
   connected: boolean;
+  theme: ThemeMode;
+  themeResolved: "light" | "dark";
   hello: GatewayHelloOk | null;
   lastError: string | null;
   eventLog: EventLogEntry[];
@@ -127,7 +132,8 @@ export type AppViewState = {
   client: GatewayBrowserClient | null;
   connect: () => void;
   setTab: (tab: Tab) => void;
-  applySettings: (next: AppViewState["settings"]) => void;
+  setTheme: (theme: ThemeMode, context?: ThemeTransitionContext) => void;
+  applySettings: (next: UiSettings) => void;
   loadOverview: () => Promise<void>;
   loadCron: () => Promise<void>;
   handleWhatsAppStart: (force: boolean) => Promise<void>;
@@ -155,6 +161,7 @@ export function renderApp(state: AppViewState) {
             <span>Health</span>
             <span class="mono">${state.connected ? "OK" : "Offline"}</span>
           </div>
+          ${renderThemeToggle(state)}
         </div>
       </header>
       <aside class="nav">
@@ -383,3 +390,89 @@ function renderTab(state: AppViewState, tab: Tab) {
     </a>
   `;
 }
+
+const THEME_ORDER: ThemeMode[] = ["system", "light", "dark"];
+
+function renderThemeToggle(state: AppViewState) {
+  const index = Math.max(0, THEME_ORDER.indexOf(state.theme));
+  const applyTheme = (next: ThemeMode) => (event: MouseEvent) => {
+    const element = event.currentTarget as HTMLElement;
+    const context: ThemeTransitionContext = { element };
+    if (event.clientX || event.clientY) {
+      context.pointerClientX = event.clientX;
+      context.pointerClientY = event.clientY;
+    }
+    state.setTheme(next, context);
+  };
+
+  return html`
+    <div class="theme-toggle" style="--theme-index: ${index};">
+      <div class="theme-toggle__track" role="group" aria-label="Theme">
+        <span class="theme-toggle__indicator"></span>
+        <button
+          class="theme-toggle__button ${state.theme === "system" ? "active" : ""}"
+          @click=${applyTheme("system")}
+          aria-pressed=${state.theme === "system"}
+          aria-label="System theme"
+          title="System"
+        >
+          ${renderMonitorIcon()}
+        </button>
+        <button
+          class="theme-toggle__button ${state.theme === "light" ? "active" : ""}"
+          @click=${applyTheme("light")}
+          aria-pressed=${state.theme === "light"}
+          aria-label="Light theme"
+          title="Light"
+        >
+          ${renderSunIcon()}
+        </button>
+        <button
+          class="theme-toggle__button ${state.theme === "dark" ? "active" : ""}"
+          @click=${applyTheme("dark")}
+          aria-pressed=${state.theme === "dark"}
+          aria-label="Dark theme"
+          title="Dark"
+        >
+          ${renderMoonIcon()}
+        </button>
+      </div>
+    </div>
+  `;
+}
+
+function renderSunIcon() {
+  return html`
+    <svg class="theme-icon" viewBox="0 0 24 24" aria-hidden="true">
+      <circle cx="12" cy="12" r="4"></circle>
+      <path d="M12 2v2"></path>
+      <path d="M12 20v2"></path>
+      <path d="m4.93 4.93 1.41 1.41"></path>
+      <path d="m17.66 17.66 1.41 1.41"></path>
+      <path d="M2 12h2"></path>
+      <path d="M20 12h2"></path>
+      <path d="m6.34 17.66-1.41 1.41"></path>
+      <path d="m19.07 4.93-1.41 1.41"></path>
+    </svg>
+  `;
+}
+
+function renderMoonIcon() {
+  return html`
+    <svg class="theme-icon" viewBox="0 0 24 24" aria-hidden="true">
+      <path
+        d="M20.985 12.486a9 9 0 1 1-9.473-9.472c.405-.022.617.46.402.803a6 6 0 0 0 8.268 8.268c.344-.215.825-.004.803.401"
+      ></path>
+    </svg>
+  `;
+}
+
+function renderMonitorIcon() {
+  return html`
+    <svg class="theme-icon" viewBox="0 0 24 24" aria-hidden="true">
+      <rect width="20" height="14" x="2" y="3" rx="2"></rect>
+      <line x1="8" x2="16" y1="21" y2="21"></line>
+      <line x1="12" x2="12" y1="17" y2="21"></line>
+    </svg>
+  `;
+}
diff --git a/ui/src/ui/app.ts b/ui/src/ui/app.ts
index c206d67c9..2c3e7ba3d 100644
--- a/ui/src/ui/app.ts
+++ b/ui/src/ui/app.ts
@@ -5,6 +5,15 @@ import { GatewayBrowserClient, type GatewayEventFrame, type GatewayHelloOk } fro
 import { loadSettings, saveSettings, type UiSettings } from "./storage";
 import { renderApp } from "./app-render";
 import { normalizePath, pathForTab, tabFromPath, type Tab } from "./navigation";
+import {
+  resolveTheme,
+  type ResolvedTheme,
+  type ThemeMode,
+} from "./theme";
+import {
+  startThemeTransition,
+  type ThemeTransitionContext,
+} from "./theme-transition";
 import type {
   ConfigSnapshot,
   CronJob,
@@ -72,6 +81,8 @@ export class ClawdisApp extends LitElement {
   @state() password = "";
   @state() tab: Tab = "chat";
   @state() connected = false;
+  @state() theme: ThemeMode = this.settings.theme ?? "system";
+  @state() themeResolved: ResolvedTheme = "dark";
   @state() hello: GatewayHelloOk | null = null;
   @state() lastError: string | null = null;
   @state() eventLog: EventLogEntry[] = [];
@@ -159,6 +170,8 @@ export class ClawdisApp extends LitElement {
   private chatScrollFrame: number | null = null;
   basePath = "";
   private popStateHandler = () => this.onPopState();
+  private themeMedia: MediaQueryList | null = null;
+  private themeMediaHandler: ((event: MediaQueryListEvent) => void) | null = null;
 
   createRenderRoot() {
     return this;
@@ -168,12 +181,15 @@ export class ClawdisApp extends LitElement {
     super.connectedCallback();
     this.basePath = this.inferBasePath();
     this.syncTabWithLocation(true);
+    this.syncThemeWithSettings();
+    this.attachThemeListener();
     window.addEventListener("popstate", this.popStateHandler);
     this.connect();
   }
 
   disconnectedCallback() {
     window.removeEventListener("popstate", this.popStateHandler);
+    this.detachThemeListener();
     super.disconnectedCallback();
   }
 
@@ -271,6 +287,10 @@ export class ClawdisApp extends LitElement {
   applySettings(next: UiSettings) {
     this.settings = next;
     saveSettings(next);
+    if (next.theme !== this.theme) {
+      this.theme = next.theme;
+      this.applyResolvedTheme(resolveTheme(next.theme));
+    }
   }
 
   setTab(next: Tab) {
@@ -279,6 +299,20 @@ export class ClawdisApp extends LitElement {
     this.syncUrlWithTab(next, false);
   }
 
+  setTheme(next: ThemeMode, context?: ThemeTransitionContext) {
+    const applyTheme = () => {
+      this.theme = next;
+      this.applySettings({ ...this.settings, theme: next });
+      this.applyResolvedTheme(resolveTheme(next));
+    };
+    startThemeTransition({
+      nextTheme: next,
+      applyTheme,
+      context,
+      currentTheme: this.theme,
+    });
+  }
+
   private async refreshActiveTab() {
     if (this.tab === "overview") await this.loadOverview();
     if (this.tab === "connections") await this.loadConnections();
@@ -302,6 +336,45 @@ export class ClawdisApp extends LitElement {
     return "";
   }
 
+  private syncThemeWithSettings() {
+    this.theme = this.settings.theme ?? "system";
+    this.applyResolvedTheme(resolveTheme(this.theme));
+  }
+
+  private applyResolvedTheme(resolved: ResolvedTheme) {
+    this.themeResolved = resolved;
+    if (typeof document === "undefined") return;
+    const root = document.documentElement;
+    root.dataset.theme = resolved;
+    root.style.colorScheme = resolved;
+  }
+
+  private attachThemeListener() {
+    if (typeof window === "undefined" || typeof window.matchMedia !== "function")
+      return;
+    this.themeMedia = window.matchMedia("(prefers-color-scheme: dark)");
+    this.themeMediaHandler = (event) => {
+      if (this.theme !== "system") return;
+      this.applyResolvedTheme(event.matches ? "dark" : "light");
+    };
+    if ("addEventListener" in this.themeMedia) {
+      this.themeMedia.addEventListener("change", this.themeMediaHandler);
+    } else {
+      this.themeMedia.addListener(this.themeMediaHandler);
+    }
+  }
+
+  private detachThemeListener() {
+    if (!this.themeMedia || !this.themeMediaHandler) return;
+    if ("removeEventListener" in this.themeMedia) {
+      this.themeMedia.removeEventListener("change", this.themeMediaHandler);
+    } else {
+      this.themeMedia.removeListener(this.themeMediaHandler);
+    }
+    this.themeMedia = null;
+    this.themeMediaHandler = null;
+  }
+
   private syncTabWithLocation(replace: boolean) {
     if (typeof window === "undefined") return;
     const resolved = tabFromPath(window.location.pathname, this.basePath) ?? "chat";
diff --git a/ui/src/ui/storage.ts b/ui/src/ui/storage.ts
index 304988e6a..b6bbddf6f 100644
--- a/ui/src/ui/storage.ts
+++ b/ui/src/ui/storage.ts
@@ -1,9 +1,12 @@
 const KEY = "clawdis.control.settings.v1";
 
+import type { ThemeMode } from "./theme";
+
 export type UiSettings = {
   gatewayUrl: string;
   token: string;
   sessionKey: string;
+  theme: ThemeMode;
 };
 
 export function loadSettings(): UiSettings {
@@ -16,6 +19,7 @@ export function loadSettings(): UiSettings {
     gatewayUrl: defaultUrl,
     token: "",
     sessionKey: "main",
+    theme: "system",
   };
 
   try {
@@ -32,6 +36,12 @@ export function loadSettings(): UiSettings {
         typeof parsed.sessionKey === "string" && parsed.sessionKey.trim()
           ? parsed.sessionKey.trim()
           : defaults.sessionKey,
+      theme:
+        parsed.theme === "light" ||
+        parsed.theme === "dark" ||
+        parsed.theme === "system"
+          ? parsed.theme
+          : defaults.theme,
     };
   } catch {
     return defaults;
diff --git a/ui/src/ui/theme-transition.ts b/ui/src/ui/theme-transition.ts
new file mode 100644
index 000000000..b039c667b
--- /dev/null
+++ b/ui/src/ui/theme-transition.ts
@@ -0,0 +1,106 @@
+import type { ThemeMode } from "./theme";
+
+export type ThemeTransitionContext = {
+  element?: HTMLElement | null;
+  pointerClientX?: number;
+  pointerClientY?: number;
+};
+
+export type ThemeTransitionOptions = {
+  nextTheme: ThemeMode;
+  applyTheme: () => void;
+  context?: ThemeTransitionContext;
+  currentTheme?: ThemeMode | null;
+};
+
+type DocumentWithViewTransition = Document & {
+  startViewTransition?: (callback: () => void) => { finished: Promise<void> };
+};
+
+const clamp01 = (value: number) => {
+  if (Number.isNaN(value)) return 0.5;
+  if (value <= 0) return 0;
+  if (value >= 1) return 1;
+  return value;
+};
+
+const hasReducedMotionPreference = () => {
+  if (typeof window === "undefined" || typeof window.matchMedia !== "function") {
+    return false;
+  }
+  return window.matchMedia("(prefers-reduced-motion: reduce)").matches ?? false;
+};
+
+const cleanupThemeTransition = (root: HTMLElement) => {
+  root.classList.remove("theme-transition");
+  root.style.removeProperty("--theme-switch-x");
+  root.style.removeProperty("--theme-switch-y");
+};
+
+export const startThemeTransition = ({
+  nextTheme,
+  applyTheme,
+  context,
+  currentTheme,
+}: ThemeTransitionOptions) => {
+  if (currentTheme === nextTheme) return;
+
+  const documentReference = globalThis.document ?? null;
+  if (!documentReference) {
+    applyTheme();
+    return;
+  }
+
+  const root = documentReference.documentElement;
+  const document_ = documentReference as DocumentWithViewTransition;
+  const prefersReducedMotion = hasReducedMotionPreference();
+
+  const canUseViewTransition =
+    Boolean(document_.startViewTransition) && !prefersReducedMotion;
+
+  if (canUseViewTransition) {
+    let xPercent = 0.5;
+    let yPercent = 0.5;
+
+    if (
+      context?.pointerClientX !== undefined &&
+      context?.pointerClientY !== undefined &&
+      typeof window !== "undefined"
+    ) {
+      xPercent = clamp01(context.pointerClientX / window.innerWidth);
+      yPercent = clamp01(context.pointerClientY / window.innerHeight);
+    } else if (context?.element) {
+      const rect = context.element.getBoundingClientRect();
+      if (
+        rect.width > 0 &&
+        rect.height > 0 &&
+        typeof window !== "undefined"
+      ) {
+        xPercent = clamp01((rect.left + rect.width / 2) / window.innerWidth);
+        yPercent = clamp01((rect.top + rect.height / 2) / window.innerHeight);
+      }
+    }
+
+    root.style.setProperty("--theme-switch-x", `${xPercent * 100}%`);
+    root.style.setProperty("--theme-switch-y", `${yPercent * 100}%`);
+    root.classList.add("theme-transition");
+
+    try {
+      const transition = document_.startViewTransition?.(() => {
+        applyTheme();
+      });
+      if (transition?.finished) {
+        void transition.finished.finally(() => cleanupThemeTransition(root));
+      } else {
+        cleanupThemeTransition(root);
+      }
+    } catch {
+      cleanupThemeTransition(root);
+      applyTheme();
+    }
+    return;
+  }
+
+  applyTheme();
+  cleanupThemeTransition(root);
+};
diff --git a/ui/src/ui/theme.ts b/ui/src/ui/theme.ts
new file mode 100644
index 000000000..47bd5670b
--- /dev/null
+++ b/ui/src/ui/theme.ts
@@ -0,0 +1,16 @@
+export type ThemeMode = "system" | "light" | "dark";
+export type ResolvedTheme = "light" | "dark";
+
+export function getSystemTheme(): ResolvedTheme {
+  if (typeof window === "undefined" || typeof window.matchMedia !== "function") {
+    return "dark";
+  }
+  return window.matchMedia("(prefers-color-scheme: dark)").matches
+    ? "dark"
+    : "light";
+}
+
+export function resolveTheme(mode: ThemeMode): ResolvedTheme {
+  if (mode === "system") return getSystemTheme();
+  return mode;
+}

From a2a26b26fb1458a1e868cffadada0bf50b2eee27 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 20:41:12 +0100
Subject: [PATCH 080/100] fix: satisfy swiftformat in chat view

---
 apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatView.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatView.swift b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatView.swift
index 82f348817..899150d94 100644
--- a/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatView.swift
+++ b/apps/shared/ClawdisKit/Sources/ClawdisChatUI/ChatView.swift
@@ -77,7 +77,7 @@ public struct ClawdisChatView: View {
         ZStack {
             ScrollView {
                 LazyVStack(spacing: Layout.messageSpacing) {
-                    messageListRows
+                    self.messageListRows
                 }
                 // Use scroll targets for stable auto-scroll without ScrollViewReader relayout glitches.
                 .scrollTargetLayout()

From 7e40147aa35d0ee39a097643f87b9f25a89926c9 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 30 Dec 2025 22:05:17 +0100
Subject: [PATCH 081/100] fix: gate web chat/talk on mobile nodes

---
 .gitignore                           |   1 +
 CHANGELOG.md                         |   1 +
 src/gateway/server.ts                |  43 ++++++
 ui/src/styles/components.css         | 198 +++++++++++++++++++++------
 ui/src/ui/app-render.ts              |  12 ++
 ui/src/ui/app.ts                     |  32 ++++-
 ui/src/ui/controllers/nodes.ts       |  11 +-
 ui/src/ui/navigation.browser.test.ts |   4 +-
 ui/src/ui/views/chat.ts              |  86 ++++++++----
 9 files changed, 314 insertions(+), 74 deletions(-)

diff --git a/.gitignore b/.gitignore
index 972264bcc..cc1a82e2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ coverage
 .worktrees/
 .DS_Store
 **/.DS_Store
+ui/src/ui/__screenshots__/
 
 # Bun build artifacts
 *.bun-build
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9d14f694..d017ef798 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
 - Chat UI: clear streaming/tool bubbles when external runs finish, preventing duplicate assistant bubbles.
 - Chat UI: user bubbles use `ui.seamColor` (fallback to a calmer default blue).
 - Control UI: sync sidebar navigation with the URL for deep-linking, and auto-scroll chat to the latest message.
+- Control UI: disable Web Chat + Talk when no iOS/Android node is connected; refreshed Web Chat styling and keyboard send.
 - Talk Mode: wait for chat history to surface the assistant reply before starting TTS (macOS/iOS/Android).
 - iOS Talk Mode: fix chat completion wait to time out even if no events arrive (prevents “Thinking…” hangs).
 - iOS Talk Mode: keep recognition running during playback to support interrupt-on-speech.
diff --git a/src/gateway/server.ts b/src/gateway/server.ts
index c6f259b96..18960a226 100644
--- a/src/gateway/server.ts
+++ b/src/gateway/server.ts
@@ -1648,6 +1648,19 @@ export async function startGatewayServer(
   let bridge: Awaited<ReturnType<typeof startNodeBridgeServer>> | null = null;
   const bridgeNodeSubscriptions = new Map<string, Set<string>>();
   const bridgeSessionSubscribers = new Map<string, Set<string>>();
+
+  const isMobilePlatform = (platform: unknown): boolean => {
+    const p = typeof platform === "string" ? platform.trim().toLowerCase() : "";
+    if (!p) return false;
+    return (
+      p.startsWith("ios") || p.startsWith("ipados") || p.startsWith("android")
+    );
+  };
+
+  const hasConnectedMobileNode = (): boolean => {
+    const connected = bridge?.listConnected?.() ?? [];
+    return connected.some((n) => isMobilePlatform(n.platform));
+  };
   try {
     await new Promise<void>((resolve, reject) => {
       const onError = (err: NodeJS.ErrnoException) => {
@@ -4094,6 +4107,21 @@ export async function startGatewayServer(
               break;
             }
             case "chat.send": {
+              if (
+                client &&
+                isWebchatConnect(client.connect) &&
+                !hasConnectedMobileNode()
+              ) {
+                respond(
+                  false,
+                  undefined,
+                  errorShape(
+                    ErrorCodes.UNAVAILABLE,
+                    "web chat disabled: no connected iOS/Android nodes",
+                  ),
+                );
+                break;
+              }
               const params = (req.params ?? {}) as Record<string, unknown>;
               if (!validateChatSendParams(params)) {
                 respond(
@@ -4645,6 +4673,21 @@ export async function startGatewayServer(
               break;
             }
             case "talk.mode": {
+              if (
+                client &&
+                isWebchatConnect(client.connect) &&
+                !hasConnectedMobileNode()
+              ) {
+                respond(
+                  false,
+                  undefined,
+                  errorShape(
+                    ErrorCodes.UNAVAILABLE,
+                    "talk disabled: no connected iOS/Android nodes",
+                  ),
+                );
+                break;
+              }
               const params = (req.params ?? {}) as Record<string, unknown>;
               if (!validateTalkModeParams(params)) {
                 respond(
diff --git a/ui/src/styles/components.css b/ui/src/styles/components.css
index 4b6ccc8dc..a44e9a824 100644
--- a/ui/src/styles/components.css
+++ b/ui/src/styles/components.css
@@ -361,64 +361,166 @@
   background: rgba(0, 0, 0, 0.2);
 }
 
-.messages {
-  display: grid;
-  gap: 10px;
-  max-height: 60vh;
-  overflow: auto;
-  padding: 8px;
-  min-width: 0;
-  border-radius: 12px;
-  background: rgba(0, 0, 0, 0.2);
-}
-
-.chat-messages {
-  margin-top: 8px;
-  padding: 6px;
-}
-
-.msg {
-  border: 1px solid var(--border);
-  background: rgba(0, 0, 0, 0.2);
-  border-radius: 14px;
-  padding: 10px 12px;
-  min-width: 0;
-}
-
-.msg .meta {
-  font-size: 12px;
-  color: var(--muted);
+.chat-header {
   display: flex;
   justify-content: space-between;
+  align-items: flex-end;
+  gap: 12px;
+  flex-wrap: wrap;
+}
+
+.chat-header__left {
+  display: flex;
+  align-items: flex-end;
+  gap: 12px;
+  flex-wrap: wrap;
+  min-width: 0;
+}
+
+.chat-header__right {
+  display: flex;
+  align-items: center;
   gap: 10px;
-  margin-bottom: 6px;
 }
 
-.msg.user {
-  border-color: rgba(255, 255, 255, 0.14);
+.chat-session {
+  min-width: 240px;
 }
 
-.msg.assistant {
-  border-color: rgba(255, 122, 61, 0.25);
-  background: rgba(255, 122, 61, 0.08);
+.chat-thread {
+  margin-top: 12px;
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  max-height: 60vh;
+  overflow: auto;
+  padding: 14px 12px;
+  min-width: 0;
+  border-radius: 16px;
+  border: 1px solid rgba(255, 255, 255, 0.08);
+  background: linear-gradient(
+    180deg,
+    rgba(0, 0, 0, 0.18) 0%,
+    rgba(0, 0, 0, 0.26) 100%
+  );
 }
 
-.msgContent {
+:root[data-theme="light"] .chat-thread {
+  border-color: rgba(16, 24, 40, 0.12);
+  background: linear-gradient(
+    180deg,
+    rgba(16, 24, 40, 0.03) 0%,
+    rgba(16, 24, 40, 0.06) 100%
+  );
+}
+
+.chat-line {
+  display: flex;
+}
+
+.chat-line.user {
+  justify-content: flex-end;
+}
+
+.chat-line.assistant,
+.chat-line.other {
+  justify-content: flex-start;
+}
+
+.chat-msg {
+  display: grid;
+  gap: 6px;
+  max-width: min(720px, 82%);
+}
+
+.chat-line.user .chat-msg {
+  justify-items: end;
+}
+
+.chat-bubble {
+  border: 1px solid var(--border);
+  background: rgba(0, 0, 0, 0.24);
+  border-radius: 18px;
+  padding: 10px 12px;
+  min-width: 0;
+  box-shadow: 0 12px 26px rgba(0, 0, 0, 0.22);
+}
+
+:root[data-theme="light"] .chat-bubble {
+  background: rgba(255, 255, 255, 0.85);
+  box-shadow: 0 12px 26px rgba(16, 24, 40, 0.08);
+}
+
+.chat-line.user .chat-bubble {
+  border-color: rgba(255, 122, 61, 0.35);
+  background: linear-gradient(
+    135deg,
+    rgba(255, 122, 61, 0.24) 0%,
+    rgba(255, 122, 61, 0.12) 100%
+  );
+}
+
+.chat-line.assistant .chat-bubble {
+  border-color: rgba(54, 207, 201, 0.16);
+  background: linear-gradient(
+    135deg,
+    rgba(54, 207, 201, 0.08) 0%,
+    rgba(0, 0, 0, 0.22) 100%
+  );
+}
+
+:root[data-theme="light"] .chat-line.assistant .chat-bubble {
+  background: linear-gradient(
+    135deg,
+    rgba(27, 185, 177, 0.12) 0%,
+    rgba(255, 255, 255, 0.85) 100%
+  );
+}
+
+@keyframes chatStreamPulse {
+  0% {
+    box-shadow: 0 12px 26px rgba(0, 0, 0, 0.22), 0 0 0 0 rgba(54, 207, 201, 0);
+  }
+  60% {
+    box-shadow: 0 12px 26px rgba(0, 0, 0, 0.22), 0 0 0 6px rgba(54, 207, 201, 0.06);
+  }
+  100% {
+    box-shadow: 0 12px 26px rgba(0, 0, 0, 0.22), 0 0 0 0 rgba(54, 207, 201, 0);
+  }
+}
+
+.chat-bubble.streaming {
+  border-color: rgba(54, 207, 201, 0.32);
+  animation: chatStreamPulse 1.6s ease-in-out infinite;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .chat-bubble.streaming {
+    animation: none;
+  }
+}
+
+.chat-text {
   white-space: pre-wrap;
   overflow-wrap: anywhere;
   word-break: break-word;
 }
 
-.compose {
-  display: grid;
-  gap: 10px;
+.chat-stamp {
+  font-size: 11px;
+  color: var(--muted);
+}
+
+.chat-line.user .chat-stamp {
+  text-align: right;
 }
 
 .chat-compose {
-  margin-top: 8px;
+  margin-top: 12px;
+  display: grid;
   grid-template-columns: minmax(0, 1fr) auto;
   align-items: end;
-  gap: 8px;
+  gap: 10px;
 }
 
 .chat-compose__field {
@@ -426,8 +528,18 @@
 }
 
 .chat-compose__field textarea {
-  min-height: 120px;
-  padding: 8px 10px;
+  min-height: 72px;
+  padding: 10px 12px;
+  border-radius: 14px;
+  resize: vertical;
+  white-space: pre-wrap;
+  font-family: var(--font-body);
+  line-height: 1.45;
+}
+
+.chat-compose__field textarea:disabled {
+  opacity: 0.7;
+  cursor: not-allowed;
 }
 
 .chat-compose__actions {
@@ -436,6 +548,10 @@
 }
 
 @media (max-width: 900px) {
+  .chat-session {
+    min-width: 200px;
+  }
+
   .chat-compose {
     grid-template-columns: 1fr;
   }
diff --git a/ui/src/ui/app-render.ts b/ui/src/ui/app-render.ts
index c82894b95..61949c540 100644
--- a/ui/src/ui/app-render.ts
+++ b/ui/src/ui/app-render.ts
@@ -147,6 +147,16 @@ export function renderApp(state: AppViewState) {
   const presenceCount = state.presenceEntries.length;
   const sessionsCount = state.sessionsResult?.count ?? null;
   const cronNext = state.cronStatus?.nextWakeAtMs ?? null;
+  const hasConnectedMobileNode = state.nodes.some((n) => {
+    if (!Boolean(n.connected)) return false;
+    const p = typeof n.platform === "string" ? n.platform.trim().toLowerCase() : "";
+    return p.startsWith("ios") || p.startsWith("ipados") || p.startsWith("android");
+  });
+  const chatDisabledReason = !state.connected
+    ? "Disconnected from gateway."
+    : hasConnectedMobileNode
+      ? null
+      : "No connected iOS/Android node — Web Chat + Talk are disabled.";
 
   return html`
     <div class="shell">
@@ -322,6 +332,8 @@ export function renderApp(state: AppViewState) {
               stream: state.chatStream,
               draft: state.chatMessage,
               connected: state.connected,
+              canSend: state.connected && hasConnectedMobileNode,
+              disabledReason: chatDisabledReason,
               onRefresh: () => loadChatHistory(state),
               onDraftChange: (next) => (state.chatMessage = next),
               onSend: () => state.handleSendChat(),
diff --git a/ui/src/ui/app.ts b/ui/src/ui/app.ts
index 2c3e7ba3d..42fb93741 100644
--- a/ui/src/ui/app.ts
+++ b/ui/src/ui/app.ts
@@ -168,6 +168,7 @@ export class ClawdisApp extends LitElement {
 
   client: GatewayBrowserClient | null = null;
   private chatScrollFrame: number | null = null;
+  private nodesPollInterval: number | null = null;
   basePath = "";
   private popStateHandler = () => this.onPopState();
   private themeMedia: MediaQueryList | null = null;
@@ -185,10 +186,12 @@ export class ClawdisApp extends LitElement {
     this.attachThemeListener();
     window.addEventListener("popstate", this.popStateHandler);
     this.connect();
+    this.startNodesPolling();
   }
 
   disconnectedCallback() {
     window.removeEventListener("popstate", this.popStateHandler);
+    this.stopNodesPolling();
     this.detachThemeListener();
     super.disconnectedCallback();
   }
@@ -221,6 +224,7 @@ export class ClawdisApp extends LitElement {
         this.connected = true;
         this.hello = hello;
         this.applySnapshot(hello);
+        void loadNodes(this, { quiet: true });
         void this.refreshActiveTab();
       },
       onClose: ({ code, reason }) => {
@@ -239,12 +243,37 @@ export class ClawdisApp extends LitElement {
     if (this.chatScrollFrame) cancelAnimationFrame(this.chatScrollFrame);
     this.chatScrollFrame = requestAnimationFrame(() => {
       this.chatScrollFrame = null;
-      const container = this.querySelector(".messages") as HTMLElement | null;
+      const container = this.querySelector(".chat-thread") as HTMLElement | null;
       if (!container) return;
       container.scrollTop = container.scrollHeight;
     });
   }
 
+  private startNodesPolling() {
+    if (this.nodesPollInterval != null) return;
+    this.nodesPollInterval = window.setInterval(
+      () => void loadNodes(this, { quiet: true }),
+      5000,
+    );
+  }
+
+  private stopNodesPolling() {
+    if (this.nodesPollInterval == null) return;
+    clearInterval(this.nodesPollInterval);
+    this.nodesPollInterval = null;
+  }
+
+  private hasConnectedMobileNode() {
+    return this.nodes.some((n) => {
+      if (!Boolean(n.connected)) return false;
+      const p =
+        typeof n.platform === "string" ? n.platform.trim().toLowerCase() : "";
+      return (
+        p.startsWith("ios") || p.startsWith("ipados") || p.startsWith("android")
+      );
+    });
+  }
+
   private onEvent(evt: GatewayEventFrame) {
     this.eventLog = [
       { ts: Date.now(), event: evt.event, payload: evt.payload },
@@ -427,6 +456,7 @@ export class ClawdisApp extends LitElement {
   }
 
   async handleSendChat() {
+    if (!this.connected || !this.hasConnectedMobileNode()) return;
     await sendChat(this);
     void loadChatHistory(this);
   }
diff --git a/ui/src/ui/controllers/nodes.ts b/ui/src/ui/controllers/nodes.ts
index 3fa39afd6..2a6a8219d 100644
--- a/ui/src/ui/controllers/nodes.ts
+++ b/ui/src/ui/controllers/nodes.ts
@@ -8,19 +8,22 @@ export type NodesState = {
   lastError: string | null;
 };
 
-export async function loadNodes(state: NodesState) {
+export async function loadNodes(
+  state: NodesState,
+  opts?: { quiet?: boolean },
+) {
   if (!state.client || !state.connected) return;
+  if (state.nodesLoading) return;
   state.nodesLoading = true;
-  state.lastError = null;
+  if (!opts?.quiet) state.lastError = null;
   try {
     const res = (await state.client.request("node.list", {})) as {
       nodes?: Array<Record<string, unknown>>;
     };
     state.nodes = Array.isArray(res.nodes) ? res.nodes : [];
   } catch (err) {
-    state.lastError = String(err);
+    if (!opts?.quiet) state.lastError = String(err);
   } finally {
     state.nodesLoading = false;
   }
 }
-
diff --git a/ui/src/ui/navigation.browser.test.ts b/ui/src/ui/navigation.browser.test.ts
index de8dd84ec..da9d34b38 100644
--- a/ui/src/ui/navigation.browser.test.ts
+++ b/ui/src/ui/navigation.browser.test.ts
@@ -68,7 +68,7 @@ describe("control UI routing", () => {
     const app = mountApp("/chat");
     await app.updateComplete;
 
-    const initialContainer = app.querySelector(".messages") as HTMLElement | null;
+    const initialContainer = app.querySelector(".chat-thread") as HTMLElement | null;
     expect(initialContainer).not.toBeNull();
     if (!initialContainer) return;
     initialContainer.style.maxHeight = "180px";
@@ -83,7 +83,7 @@ describe("control UI routing", () => {
     await app.updateComplete;
     await nextFrame();
 
-    const container = app.querySelector(".messages") as HTMLElement | null;
+    const container = app.querySelector(".chat-thread") as HTMLElement | null;
     expect(container).not.toBeNull();
     if (!container) return;
     const maxScroll = container.scrollHeight - container.clientHeight;
diff --git a/ui/src/ui/views/chat.ts b/ui/src/ui/views/chat.ts
index 6e952d8f6..4ed1a279b 100644
--- a/ui/src/ui/views/chat.ts
+++ b/ui/src/ui/views/chat.ts
@@ -10,58 +10,90 @@ export type ChatProps = {
   stream: string | null;
   draft: string;
   connected: boolean;
+  canSend: boolean;
+  disabledReason: string | null;
   onRefresh: () => void;
   onDraftChange: (next: string) => void;
   onSend: () => void;
 };
 
 export function renderChat(props: ChatProps) {
+  const canInteract = props.connected;
+  const canCompose = props.canSend && !props.sending;
+  const composePlaceholder = (() => {
+    if (!props.connected) return "Connect to the gateway to start chatting…";
+    if (!props.canSend) return "Connect an iOS/Android node to enable Web Chat + Talk…";
+    return "Message (⌘↩ to send)";
+  })();
+
   return html`
-    <section class="card">
-      <div class="row" style="justify-content: space-between;">
-        <div class="row">
-          <label class="field" style="min-width: 220px;">
+    <section class="card chat">
+      <div class="chat-header">
+        <div class="chat-header__left">
+          <label class="field chat-session">
             <span>Session Key</span>
             <input
               .value=${props.sessionKey}
+              ?disabled=${!canInteract}
               @input=${(e: Event) =>
                 props.onSessionKeyChange((e.target as HTMLInputElement).value)}
             />
           </label>
-          <button class="btn" ?disabled=${props.loading} @click=${props.onRefresh}>
+          <button
+            class="btn"
+            ?disabled=${props.loading || !canInteract}
+            @click=${props.onRefresh}
+          >
             ${props.loading ? "Loading…" : "Refresh"}
           </button>
         </div>
-        <div class="muted">
-          Thinking: ${props.thinkingLevel ?? "inherit"}
+        <div class="chat-header__right">
+          <div class="muted">Thinking: ${props.thinkingLevel ?? "inherit"}</div>
         </div>
       </div>
 
-      <div class="messages chat-messages">
+      ${props.disabledReason
+        ? html`<div class="callout" style="margin-top: 12px;">
+            ${props.disabledReason}
+          </div>`
+        : nothing}
+
+      <div class="chat-thread" role="log" aria-live="polite">
         ${props.loading ? html`<div class="muted">Loading chat…</div>` : nothing}
         ${props.messages.map((m) => renderMessage(m))}
         ${props.stream
-          ? html`${renderMessage({
-              role: "assistant",
-              content: [{ type: "text", text: props.stream }],
-            })}`
+          ? renderMessage(
+              {
+                role: "assistant",
+                content: [{ type: "text", text: props.stream }],
+                timestamp: Date.now(),
+              },
+              { streaming: true },
+            )
           : nothing}
       </div>
 
-      <div class="compose chat-compose">
+      <div class="chat-compose">
         <label class="field chat-compose__field">
           <span>Message</span>
           <textarea
             .value=${props.draft}
+            ?disabled=${!props.canSend}
+            @keydown=${(e: KeyboardEvent) => {
+              if (e.key !== "Enter") return;
+              if (!e.metaKey && !e.ctrlKey) return;
+              e.preventDefault();
+              if (canCompose) props.onSend();
+            }}
             @input=${(e: Event) =>
               props.onDraftChange((e.target as HTMLTextAreaElement).value)}
-            placeholder="Ask the model…"
+            placeholder=${composePlaceholder}
           ></textarea>
         </label>
         <div class="row chat-compose__actions">
           <button
             class="btn primary"
-            ?disabled=${props.sending || !props.connected}
+            ?disabled=${!props.canSend || props.sending}
             @click=${props.onSend}
           >
             ${props.sending ? "Sending…" : "Send"}
@@ -72,7 +104,7 @@ export function renderChat(props: ChatProps) {
   `;
 }
 
-function renderMessage(message: unknown) {
+function renderMessage(message: unknown, opts?: { streaming?: boolean }) {
   const m = message as Record<string, unknown>;
   const role = typeof m.role === "string" ? m.role : "unknown";
   const text =
@@ -81,18 +113,20 @@ function renderMessage(message: unknown) {
       ? m.content
       : JSON.stringify(message, null, 2));
 
-  const ts =
-    typeof m.timestamp === "number"
-      ? new Date(m.timestamp).toLocaleTimeString()
-      : "";
-  const klass = role === "assistant" ? "assistant" : role === "user" ? "user" : "";
+  const timestamp =
+    typeof m.timestamp === "number" ? new Date(m.timestamp).toLocaleTimeString() : "";
+  const klass = role === "assistant" ? "assistant" : role === "user" ? "user" : "other";
+  const who = role === "assistant" ? "Assistant" : role === "user" ? "You" : role;
   return html`
-    <div class="msg ${klass}">
-      <div class="meta">
-        <span class="mono">${role}</span>
-        <span class="mono">${ts}</span>
+    <div class="chat-line ${klass}">
+      <div class="chat-msg">
+        <div class="chat-bubble ${opts?.streaming ? "streaming" : ""}">
+          <div class="chat-text">${text}</div>
+        </div>
+        <div class="chat-stamp mono">
+          ${who}${timestamp ? html` · ${timestamp}` : nothing}
+        </div>
       </div>
-      <div class="msgContent">${text}</div>
     </div>
   `;
 }

From 3213e5df2d26d2337e71d33242009d331159c336 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 31 Dec 2025 04:52:37 +0100
Subject: [PATCH 082/100] feat: add gifgrep skill

---
 skills/gifgrep/SKILL.md | 47 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 skills/gifgrep/SKILL.md

diff --git a/skills/gifgrep/SKILL.md b/skills/gifgrep/SKILL.md
new file mode 100644
index 000000000..e1204e32a
--- /dev/null
+++ b/skills/gifgrep/SKILL.md
@@ -0,0 +1,47 @@
+---
+name: gifgrep
+description: Search GIF providers with CLI/TUI, download results, and extract stills/sheets.
+homepage: https://gifgrep.com
+metadata: {"clawdis":{"emoji":"🧲","requires":{"bins":["gifgrep"]},"install":[{"id":"brew","kind":"brew","formula":"steipete/tap/gifgrep","bins":["gifgrep"],"label":"Install gifgrep (brew)"},{"id":"go","kind":"go","module":"github.com/steipete/gifgrep/cmd/gifgrep@latest","bins":["gifgrep"],"label":"Install gifgrep (go)"}]}}
+---
+
+# gifgrep
+
+Use `gifgrep` to search GIF providers (Tenor/Giphy), browse in a TUI, download results, and extract stills or sheets.
+
+GIF-Grab (gifgrep workflow)
+- Search → preview → download → extract (still/sheet) for fast review and sharing.
+
+Quick start
+- `gifgrep cats --max 5`
+- `gifgrep cats --format url | head -n 5`
+- `gifgrep search --json cats | jq '.[0].url'`
+- `gifgrep tui "office handshake"`
+- `gifgrep cats --download --max 1 --format url`
+
+TUI + previews
+- TUI: `gifgrep tui "query"`
+- CLI still previews: `--thumbs` (Kitty/Ghostty only; still frame)
+
+Download + reveal
+- `--download` saves to `~/Downloads`
+- `--reveal` shows the last download in Finder
+
+Stills + sheets
+- `gifgrep still ./clip.gif --at 1.5s -o still.png`
+- `gifgrep sheet ./clip.gif --frames 9 --cols 3 -o sheet.png`
+- Sheets = single PNG grid of sampled frames (great for quick review, docs, PRs, chat).
+- Tune: `--frames` (count), `--cols` (grid width), `--padding` (spacing).
+
+Providers
+- `--source auto|tenor|giphy`
+- `GIPHY_API_KEY` required for `--source giphy`
+- `TENOR_API_KEY` optional (Tenor demo key used if unset)
+
+Output
+- `--json` prints an array of results (`id`, `title`, `url`, `preview_url`, `tags`, `width`, `height`)
+- `--format` for pipe-friendly fields (e.g., `url`)
+
+Environment tweaks
+- `GIFGREP_SOFTWARE_ANIM=1` to force software animation
+- `GIFGREP_CELL_ASPECT=0.5` to tweak preview geometry

From 2f55abace227e6bb53fb82987b8d9bbd575dd55b Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 31 Dec 2025 04:52:40 +0100
Subject: [PATCH 083/100] fix: add brew installer for ordercli skill

---
 skills/ordercli/SKILL.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skills/ordercli/SKILL.md b/skills/ordercli/SKILL.md
index 3fbc06808..3e27f6a26 100644
--- a/skills/ordercli/SKILL.md
+++ b/skills/ordercli/SKILL.md
@@ -2,7 +2,7 @@
 name: ordercli
 description: Foodora-only CLI for checking past orders and active order status (Deliveroo WIP).
 homepage: https://ordercli.sh
-metadata: {"clawdis":{"emoji":"🛵","requires":{"bins":["ordercli"]},"install":[{"id":"go","kind":"go","module":"github.com/steipete/ordercli/cmd/ordercli@latest","bins":["ordercli"],"label":"Install ordercli (go)"}]}}
+metadata: {"clawdis":{"emoji":"🛵","requires":{"bins":["ordercli"]},"install":[{"id":"brew","kind":"brew","formula":"steipete/tap/ordercli","bins":["ordercli"],"label":"Install ordercli (brew)"},{"id":"go","kind":"go","module":"github.com/steipete/ordercli/cmd/ordercli@latest","bins":["ordercli"],"label":"Install ordercli (go)"}]}}
 ---
 
 # ordercli

From 4bdc25d0722b659ad90247c53b54255b65c221fd Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 31 Dec 2025 11:35:42 +0100
Subject: [PATCH 084/100] docs: link Anthropic OAuth setup

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 2cff9633b..fca93400e 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,8 @@ It answers you on the surfaces you already use (WhatsApp, Telegram, Discord, Web
 
 If you want a private, single-user assistant that feels local, fast, and always-on, this is it.
 
+Using Claude Pro/Max subscription? See `docs/onboarding.md` for the Anthropic OAuth setup.
+
 ```
 Your surfaces
    │

From 21237dae98da31078aaaefb0d4d6c0cedbb565d5 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 31 Dec 2025 11:36:57 +0100
Subject: [PATCH 085/100] feat: add Z.AI env support and live test

---
 CHANGELOG.md                |  2 ++
 docs/configuration.md       |  2 ++
 src/agents/zai.live.test.ts | 31 +++++++++++++++++++++++++++++++
 src/index.ts                |  2 ++
 src/infra/env.test.ts       | 37 +++++++++++++++++++++++++++++++++++++
 src/infra/env.ts            |  9 +++++++++
 6 files changed, 83 insertions(+)
 create mode 100644 src/agents/zai.live.test.ts
 create mode 100644 src/infra/env.test.ts
 create mode 100644 src/infra/env.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d017ef798..7a4141152 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
 ### Features
 - Talk mode: continuous speech conversations (macOS/iOS/Android) with ElevenLabs TTS, reply directives, and optional interrupt-on-speech.
 - UI: add optional `ui.seamColor` accent to tint the Talk Mode side bubble (macOS/iOS/Android).
+- Agent runtime: accept legacy `Z_AI_API_KEY` for Z.AI provider auth (maps to `ZAI_API_KEY`).
+- Tests: add a Z.AI live test gate for smoke validation when keys are present.
 
 ### Fixes
 - Docs/agent tools: clarify that browser `wait` should be avoided by default and used only in exceptional cases.
diff --git a/docs/configuration.md b/docs/configuration.md
index 91f1baddf..cd7801fba 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -259,6 +259,8 @@ Controls the embedded agent runtime (model/thinking/verbose/timeouts).
 If `modelAliases` is configured, you may also use the alias key (e.g. `Opus`).
 If you omit the provider, CLAWDIS currently assumes `anthropic` as a temporary
 deprecation fallback.
+Z.AI models are available as `zai/<model>` (e.g. `zai/glm-4.7`) and require
+`ZAI_API_KEY` (or legacy `Z_AI_API_KEY`) in the environment.
 
 `agent.heartbeat` configures periodic heartbeat runs:
 - `every`: duration string (`ms`, `s`, `m`, `h`); default unit minutes. Omit or set
diff --git a/src/agents/zai.live.test.ts b/src/agents/zai.live.test.ts
new file mode 100644
index 000000000..d5f2424bd
--- /dev/null
+++ b/src/agents/zai.live.test.ts
@@ -0,0 +1,31 @@
+import { completeSimple, getModel } from "@mariozechner/pi-ai";
+import { describe, expect, it } from "vitest";
+
+const ZAI_KEY = process.env.ZAI_API_KEY ?? process.env.Z_AI_API_KEY ?? "";
+const LIVE = process.env.ZAI_LIVE_TEST === "1" || process.env.LIVE === "1";
+
+const describeLive = LIVE && ZAI_KEY ? describe : describe.skip;
+
+describeLive("zai live", () => {
+  it("returns assistant text", async () => {
+    const model = getModel("zai", "glm-4.7");
+    const res = await completeSimple(
+      model,
+      {
+        messages: [
+          {
+            role: "user",
+            content: "Reply with the word ok.",
+            timestamp: Date.now(),
+          },
+        ],
+      },
+      { apiKey: ZAI_KEY, maxTokens: 64 },
+    );
+    const text = res.content
+      .filter((block) => block.type === "text")
+      .map((block) => block.text.trim())
+      .join(" ");
+    expect(text.length).toBeGreaterThan(0);
+  });
+});
diff --git a/src/index.ts b/src/index.ts
index 2c7a38762..b3bfd7c30 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -17,6 +17,7 @@ import {
   saveSessionStore,
 } from "./config/sessions.js";
 import { ensureBinary } from "./infra/binaries.js";
+import { normalizeEnv } from "./infra/env.js";
 import { isMainModule } from "./infra/is-main.js";
 import { ensureClawdisCliOnPath } from "./infra/path-env.js";
 import {
@@ -32,6 +33,7 @@ import { monitorWebProvider } from "./provider-web.js";
 import { assertProvider, normalizeE164, toWhatsappJid } from "./utils.js";
 
 dotenv.config({ quiet: true });
+normalizeEnv();
 ensureClawdisCliOnPath();
 
 // Capture all console output into structured logs while keeping stdout/stderr behavior.
diff --git a/src/infra/env.test.ts b/src/infra/env.test.ts
new file mode 100644
index 000000000..30c97d3e8
--- /dev/null
+++ b/src/infra/env.test.ts
@@ -0,0 +1,37 @@
+import { describe, expect, it } from "vitest";
+
+import { normalizeZaiEnv } from "./env.js";
+
+describe("normalizeZaiEnv", () => {
+  it("copies Z_AI_API_KEY to ZAI_API_KEY when missing", () => {
+    const prevZai = process.env.ZAI_API_KEY;
+    const prevZAi = process.env.Z_AI_API_KEY;
+    process.env.ZAI_API_KEY = "";
+    process.env.Z_AI_API_KEY = "zai-legacy";
+
+    normalizeZaiEnv();
+
+    expect(process.env.ZAI_API_KEY).toBe("zai-legacy");
+
+    if (prevZai === undefined) delete process.env.ZAI_API_KEY;
+    else process.env.ZAI_API_KEY = prevZai;
+    if (prevZAi === undefined) delete process.env.Z_AI_API_KEY;
+    else process.env.Z_AI_API_KEY = prevZAi;
+  });
+
+  it("does not override existing ZAI_API_KEY", () => {
+    const prevZai = process.env.ZAI_API_KEY;
+    const prevZAi = process.env.Z_AI_API_KEY;
+    process.env.ZAI_API_KEY = "zai-current";
+    process.env.Z_AI_API_KEY = "zai-legacy";
+
+    normalizeZaiEnv();
+
+    expect(process.env.ZAI_API_KEY).toBe("zai-current");
+
+    if (prevZai === undefined) delete process.env.ZAI_API_KEY;
+    else process.env.ZAI_API_KEY = prevZai;
+    if (prevZAi === undefined) delete process.env.Z_AI_API_KEY;
+    else process.env.Z_AI_API_KEY = prevZAi;
+  });
+});
diff --git a/src/infra/env.ts b/src/infra/env.ts
new file mode 100644
index 000000000..8e51c5a9f
--- /dev/null
+++ b/src/infra/env.ts
@@ -0,0 +1,9 @@
+export function normalizeZaiEnv(): void {
+  if (!process.env.ZAI_API_KEY?.trim() && process.env.Z_AI_API_KEY?.trim()) {
+    process.env.ZAI_API_KEY = process.env.Z_AI_API_KEY;
+  }
+}
+
+export function normalizeEnv(): void {
+  normalizeZaiEnv();
+}

From 12084fc4f9130603e020bc9a9b3afd1d969e52d1 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 31 Dec 2025 12:43:34 +0100
Subject: [PATCH 086/100] test: extend Z.AI live test timeout

---
 src/agents/zai.live.test.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/agents/zai.live.test.ts b/src/agents/zai.live.test.ts
index d5f2424bd..df5cb1dec 100644
--- a/src/agents/zai.live.test.ts
+++ b/src/agents/zai.live.test.ts
@@ -7,7 +7,9 @@ const LIVE = process.env.ZAI_LIVE_TEST === "1" || process.env.LIVE === "1";
 const describeLive = LIVE && ZAI_KEY ? describe : describe.skip;
 
 describeLive("zai live", () => {
-  it("returns assistant text", async () => {
+  it(
+    "returns assistant text",
+    async () => {
     const model = getModel("zai", "glm-4.7");
     const res = await completeSimple(
       model,
@@ -27,5 +29,7 @@ describeLive("zai live", () => {
       .map((block) => block.text.trim())
       .join(" ");
     expect(text.length).toBeGreaterThan(0);
-  });
+    },
+    20000,
+  );
 });

From f831ccfc631c35d5550b7252cae49d120427bac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Jim=C3=A9nez=20Torres?= <syhids@gmail.com>
Date: Tue, 30 Dec 2025 11:42:55 +0100
Subject: [PATCH 087/100] fix(android): wrong text color in user chat bubbles

---
 .../clawdis/node/ui/chat/ChatMarkdown.kt      |  5 +++--
 .../clawdis/node/ui/chat/ChatMessageViews.kt  | 20 +++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/chat/ChatMarkdown.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/chat/ChatMarkdown.kt
index a11237a93..75dd3b10c 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/chat/ChatMarkdown.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/chat/ChatMarkdown.kt
@@ -17,6 +17,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.AnnotatedString
@@ -31,7 +32,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
 @Composable
-fun ChatMarkdown(text: String) {
+fun ChatMarkdown(text: String, textColor: Color) {
   val blocks = remember(text) { splitMarkdown(text) }
   val inlineCodeBg = MaterialTheme.colorScheme.surfaceContainerLow
 
@@ -44,7 +45,7 @@ fun ChatMarkdown(text: String) {
           Text(
             text = parseInlineMarkdown(trimmed, inlineCodeBg = inlineCodeBg),
             style = MaterialTheme.typography.bodyMedium,
-            color = MaterialTheme.colorScheme.onSurface,
+            color = textColor,
           )
         }
         is ChatMarkdownBlock.Code -> {
diff --git a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/chat/ChatMessageViews.kt b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/chat/ChatMessageViews.kt
index d7a99e8e2..435bacbdc 100644
--- a/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/chat/ChatMessageViews.kt
+++ b/apps/android/app/src/main/java/com/steipete/clawdis/node/ui/chat/ChatMessageViews.kt
@@ -7,11 +7,9 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.MaterialTheme
@@ -60,20 +58,21 @@ fun ChatMessageBubble(message: ChatMessage) {
             .background(bubbleBackground(isUser))
             .padding(horizontal = 12.dp, vertical = 10.dp),
       ) {
-        ChatMessageBody(content = message.content)
+        val textColor = textColorOverBubble(isUser)
+        ChatMessageBody(content = message.content, textColor = textColor)
       }
     }
   }
 }
 
 @Composable
-private fun ChatMessageBody(content: List<ChatMessageContent>) {
+private fun ChatMessageBody(content: List<ChatMessageContent>, textColor: Color) {
   Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
     for (part in content) {
       when (part.type) {
         "text" -> {
           val text = part.text ?: continue
-          ChatMarkdown(text = text)
+          ChatMarkdown(text = text, textColor = textColor)
         }
         else -> {
           val b64 = part.base64 ?: continue
@@ -131,7 +130,7 @@ fun ChatStreamingAssistantBubble(text: String) {
       color = MaterialTheme.colorScheme.surfaceContainer,
     ) {
       Box(modifier = Modifier.padding(horizontal = 12.dp, vertical = 10.dp)) {
-        ChatMarkdown(text = text)
+        ChatMarkdown(text = text, textColor = MaterialTheme.colorScheme.onSurface)
       }
     }
   }
@@ -150,6 +149,15 @@ private fun bubbleBackground(isUser: Boolean): Brush {
   }
 }
 
+@Composable
+private fun textColorOverBubble(isUser: Boolean): Color {
+  return if (isUser) {
+    MaterialTheme.colorScheme.onPrimary
+  } else {
+    MaterialTheme.colorScheme.onSurface
+  }
+}
+
 @Composable
 private fun ChatBase64Image(base64: String, mimeType: String?) {
   var image by remember(base64) { mutableStateOf<androidx.compose.ui.graphics.ImageBitmap?>(null) }

From fa91b5fd037ffb8f0736c883c2ee035305b7017f Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 31 Dec 2025 12:50:34 +0100
Subject: [PATCH 088/100] docs: update changelog for Android chat bubble

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a4141152..aa9a6e735 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 - Talk Mode: treat history timestamps as seconds or milliseconds to avoid stale assistant picks (macOS/iOS/Android).
 - Chat UI: clear streaming/tool bubbles when external runs finish, preventing duplicate assistant bubbles.
 - Chat UI: user bubbles use `ui.seamColor` (fallback to a calmer default blue).
+- Android Chat UI: use `onPrimary` for user bubble text to preserve contrast (thanks @Syhids).
 - Control UI: sync sidebar navigation with the URL for deep-linking, and auto-scroll chat to the latest message.
 - Control UI: disable Web Chat + Talk when no iOS/Android node is connected; refreshed Web Chat styling and keyboard send.
 - Talk Mode: wait for chat history to surface the assistant reply before starting TTS (macOS/iOS/Android).

From 6517b05abe8e37a0a869150a288e0e856e515c24 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 31 Dec 2025 16:03:18 +0100
Subject: [PATCH 089/100] feat: add swift-log app logging controls

---
 CHANGELOG.md                                  |   1 +
 apps/macos/Package.swift                      |   2 +
 apps/macos/Sources/Clawdis/CanvasWindow.swift |   1 -
 apps/macos/Sources/Clawdis/Constants.swift    |   1 +
 .../Sources/Clawdis/ControlChannel.swift      |   1 -
 .../macos/Sources/Clawdis/DebugSettings.swift |  17 +-
 .../Sources/Clawdis/DockIconManager.swift     |   1 -
 apps/macos/Sources/Clawdis/HealthStore.swift  |   1 -
 .../Clawdis/Logging/ClawdisLogging.swift      | 229 ++++++++++++++++++
 apps/macos/Sources/Clawdis/MenuBar.swift      |   2 +-
 .../Sources/Clawdis/MenuContentView.swift     |  16 ++
 .../Sources/Clawdis/PermissionManager.swift   |   1 -
 .../Sources/Clawdis/TalkModeController.swift  |   1 -
 .../Clawdis/VoiceSessionCoordinator.swift     |   1 -
 .../Sources/Clawdis/VoiceWakeOverlay.swift    |   1 -
 .../Sources/Clawdis/VoiceWakeTester.swift     |   1 -
 docs/mac/logging.md                           |   7 +-
 17 files changed, 268 insertions(+), 16 deletions(-)
 create mode 100644 apps/macos/Sources/Clawdis/Logging/ClawdisLogging.swift

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa9a6e735..ae274ccc3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - UI: add optional `ui.seamColor` accent to tint the Talk Mode side bubble (macOS/iOS/Android).
 - Agent runtime: accept legacy `Z_AI_API_KEY` for Z.AI provider auth (maps to `ZAI_API_KEY`).
 - Tests: add a Z.AI live test gate for smoke validation when keys are present.
+- macOS Debug: add app log verbosity and rolling file log toggle for swift-log-backed app logs.
 
 ### Fixes
 - Docs/agent tools: clarify that browser `wait` should be avoided by default and used only in exceptional cases.
diff --git a/apps/macos/Package.swift b/apps/macos/Package.swift
index 02aaf2ecd..be8946514 100644
--- a/apps/macos/Package.swift
+++ b/apps/macos/Package.swift
@@ -15,6 +15,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/orchetect/MenuBarExtraAccess", exact: "1.2.2"),
         .package(url: "https://github.com/swiftlang/swift-subprocess.git", from: "0.1.0"),
+        .package(url: "https://github.com/apple/swift-log.git", from: "1.8.0"),
         .package(url: "https://github.com/sparkle-project/Sparkle", from: "2.8.1"),
         .package(path: "../shared/ClawdisKit"),
         .package(path: "../../Swabble"),
@@ -45,6 +46,7 @@ let package = Package(
                 .product(name: "SwabbleKit", package: "swabble"),
                 .product(name: "MenuBarExtraAccess", package: "MenuBarExtraAccess"),
                 .product(name: "Subprocess", package: "swift-subprocess"),
+                .product(name: "Logging", package: "swift-log"),
                 .product(name: "Sparkle", package: "Sparkle"),
                 .product(name: "PeekabooBridge", package: "PeekabooCore"),
                 .product(name: "PeekabooAutomationKit", package: "PeekabooAutomationKit"),
diff --git a/apps/macos/Sources/Clawdis/CanvasWindow.swift b/apps/macos/Sources/Clawdis/CanvasWindow.swift
index 30b0c8c41..e03ba2c42 100644
--- a/apps/macos/Sources/Clawdis/CanvasWindow.swift
+++ b/apps/macos/Sources/Clawdis/CanvasWindow.swift
@@ -1,5 +1,4 @@
 import AppKit
-import OSLog
 
 let canvasWindowLogger = Logger(subsystem: "com.steipete.clawdis", category: "Canvas")
 
diff --git a/apps/macos/Sources/Clawdis/Constants.swift b/apps/macos/Sources/Clawdis/Constants.swift
index 589091261..639d12afc 100644
--- a/apps/macos/Sources/Clawdis/Constants.swift
+++ b/apps/macos/Sources/Clawdis/Constants.swift
@@ -32,5 +32,6 @@ let modelCatalogReloadKey = "clawdis.modelCatalogReload"
 let attachExistingGatewayOnlyKey = "clawdis.gateway.attachExistingOnly"
 let heartbeatsEnabledKey = "clawdis.heartbeatsEnabled"
 let debugFileLogEnabledKey = "clawdis.debug.fileLogEnabled"
+let appLogLevelKey = "clawdis.debug.appLogLevel"
 let voiceWakeSupported: Bool = ProcessInfo.processInfo.operatingSystemVersion.majorVersion >= 26
 let cliHelperSearchPaths = ["/usr/local/bin", "/opt/homebrew/bin"]
diff --git a/apps/macos/Sources/Clawdis/ControlChannel.swift b/apps/macos/Sources/Clawdis/ControlChannel.swift
index 5312fa641..51c97a6c3 100644
--- a/apps/macos/Sources/Clawdis/ControlChannel.swift
+++ b/apps/macos/Sources/Clawdis/ControlChannel.swift
@@ -1,7 +1,6 @@
 import ClawdisProtocol
 import Foundation
 import Observation
-import OSLog
 import SwiftUI
 
 struct ControlHeartbeatEvent: Codable {
diff --git a/apps/macos/Sources/Clawdis/DebugSettings.swift b/apps/macos/Sources/Clawdis/DebugSettings.swift
index a30cf917a..037a17855 100644
--- a/apps/macos/Sources/Clawdis/DebugSettings.swift
+++ b/apps/macos/Sources/Clawdis/DebugSettings.swift
@@ -30,6 +30,7 @@ struct DebugSettings: View {
     @State private var pendingKill: DebugActions.PortListener?
     @AppStorage(attachExistingGatewayOnlyKey) private var attachExistingGatewayOnly: Bool = false
     @AppStorage(debugFileLogEnabledKey) private var diagnosticsFileLogEnabled: Bool = false
+    @AppStorage(appLogLevelKey) private var appLogLevelRaw: String = AppLogLevel.default.rawValue
 
     @State private var canvasSessionKey: String = "main"
     @State private var canvasStatus: String?
@@ -232,13 +233,23 @@ struct DebugSettings: View {
                 }
 
                 GridRow {
-                    self.gridLabel("Diagnostics")
-                    VStack(alignment: .leading, spacing: 6) {
+                    self.gridLabel("App logging")
+                    VStack(alignment: .leading, spacing: 8) {
+                        Picker("Verbosity", selection: self.$appLogLevelRaw) {
+                            ForEach(AppLogLevel.allCases) { level in
+                                Text(level.title).tag(level.rawValue)
+                            }
+                        }
+                        .pickerStyle(.menu)
+                        .labelsHidden()
+                        .help("Controls the macOS app log verbosity.")
+
                         Toggle("Write rolling diagnostics log (JSONL)", isOn: self.$diagnosticsFileLogEnabled)
                             .toggleStyle(.checkbox)
                             .help(
-                                "Writes a rotating, local-only diagnostics log under ~/Library/Logs/Clawdis/. " +
+                                "Writes a rotating, local-only log under ~/Library/Logs/Clawdis/. " +
                                     "Enable only while actively debugging.")
+
                         HStack(spacing: 8) {
                             Button("Open folder") {
                                 NSWorkspace.shared.open(DiagnosticsFileLog.logDirectoryURL())
diff --git a/apps/macos/Sources/Clawdis/DockIconManager.swift b/apps/macos/Sources/Clawdis/DockIconManager.swift
index 1e3a98f43..d0bee9543 100644
--- a/apps/macos/Sources/Clawdis/DockIconManager.swift
+++ b/apps/macos/Sources/Clawdis/DockIconManager.swift
@@ -1,5 +1,4 @@
 import AppKit
-import OSLog
 
 /// Central manager for Dock icon visibility.
 /// Shows the Dock icon while any windows are visible, regardless of user preference.
diff --git a/apps/macos/Sources/Clawdis/HealthStore.swift b/apps/macos/Sources/Clawdis/HealthStore.swift
index 262291824..721e8afd3 100644
--- a/apps/macos/Sources/Clawdis/HealthStore.swift
+++ b/apps/macos/Sources/Clawdis/HealthStore.swift
@@ -1,7 +1,6 @@
 import Foundation
 import Network
 import Observation
-import OSLog
 import SwiftUI
 
 struct HealthSnapshot: Codable, Sendable {
diff --git a/apps/macos/Sources/Clawdis/Logging/ClawdisLogging.swift b/apps/macos/Sources/Clawdis/Logging/ClawdisLogging.swift
new file mode 100644
index 000000000..b759828c1
--- /dev/null
+++ b/apps/macos/Sources/Clawdis/Logging/ClawdisLogging.swift
@@ -0,0 +1,229 @@
+@_exported import Logging
+import Foundation
+import OSLog
+
+typealias Logger = Logging.Logger
+
+enum AppLogSettings {
+    static let logLevelKey = appLogLevelKey
+
+    static func logLevel() -> Logger.Level {
+        if let raw = UserDefaults.standard.string(forKey: self.logLevelKey),
+           let level = Logger.Level(rawValue: raw)
+        {
+            return level
+        }
+        return .info
+    }
+
+    static func setLogLevel(_ level: Logger.Level) {
+        UserDefaults.standard.set(level.rawValue, forKey: self.logLevelKey)
+    }
+
+    static func fileLoggingEnabled() -> Bool {
+        UserDefaults.standard.bool(forKey: debugFileLogEnabledKey)
+    }
+}
+
+enum AppLogLevel: String, CaseIterable, Identifiable {
+    case trace
+    case debug
+    case info
+    case notice
+    case warning
+    case error
+    case critical
+
+    static let `default`: AppLogLevel = .info
+
+    var id: String { self.rawValue }
+
+    var title: String {
+        switch self {
+        case .trace: "Trace"
+        case .debug: "Debug"
+        case .info: "Info"
+        case .notice: "Notice"
+        case .warning: "Warning"
+        case .error: "Error"
+        case .critical: "Critical"
+        }
+    }
+}
+
+enum ClawdisLogging {
+    private static let labelSeparator = "::"
+
+    private static let didBootstrap: Void = {
+        LoggingSystem.bootstrap { label in
+            let (subsystem, category) = Self.parseLabel(label)
+            let osHandler = ClawdisOSLogHandler(subsystem: subsystem, category: category)
+            let fileHandler = ClawdisFileLogHandler(label: label)
+            return MultiplexLogHandler([osHandler, fileHandler])
+        }
+    }()
+
+    static func bootstrapIfNeeded() {
+        _ = Self.didBootstrap
+    }
+
+    static func makeLabel(subsystem: String, category: String) -> String {
+        "\(subsystem)\(Self.labelSeparator)\(category)"
+    }
+
+    static func parseLabel(_ label: String) -> (String, String) {
+        guard let range = label.range(of: Self.labelSeparator) else {
+            return ("com.steipete.clawdis", label)
+        }
+        let subsystem = String(label[..<range.lowerBound])
+        let category = String(label[range.upperBound...])
+        return (subsystem, category)
+    }
+}
+
+extension Logging.Logger {
+    init(subsystem: String, category: String) {
+        ClawdisLogging.bootstrapIfNeeded()
+        let label = ClawdisLogging.makeLabel(subsystem: subsystem, category: category)
+        self.init(label: label)
+    }
+}
+
+extension Logger.Message.StringInterpolation {
+    mutating func appendInterpolation<T>(_ value: T, privacy: OSLogPrivacy) {
+        self.appendInterpolation(String(describing: value))
+    }
+}
+
+struct ClawdisOSLogHandler: LogHandler {
+    private let osLogger: OSLog.Logger
+    var metadata: Logger.Metadata = [:]
+
+    var logLevel: Logger.Level {
+        get { AppLogSettings.logLevel() }
+        set { AppLogSettings.setLogLevel(newValue) }
+    }
+
+    init(subsystem: String, category: String) {
+        self.osLogger = OSLog.Logger(subsystem: subsystem, category: category)
+    }
+
+    subscript(metadataKey key: String) -> Logger.Metadata.Value? {
+        get { self.metadata[key] }
+        set { self.metadata[key] = newValue }
+    }
+
+    func log(
+        level: Logger.Level,
+        message: Logger.Message,
+        metadata: Logger.Metadata?,
+        source: String,
+        file: String,
+        function: String,
+        line: UInt)
+    {
+        let merged = Self.mergeMetadata(self.metadata, metadata)
+        let rendered = Self.renderMessage(message, metadata: merged)
+        self.osLogger.log(level: Self.osLogType(for: level), "\(rendered, privacy: .public)")
+    }
+
+    private static func osLogType(for level: Logger.Level) -> OSLogType {
+        switch level {
+        case .trace, .debug:
+            return .debug
+        case .info, .notice:
+            return .info
+        case .warning:
+            return .default
+        case .error:
+            return .error
+        case .critical:
+            return .fault
+        }
+    }
+
+    private static func mergeMetadata(
+        _ base: Logger.Metadata,
+        _ extra: Logger.Metadata?) -> Logger.Metadata
+    {
+        guard let extra else { return base }
+        return base.merging(extra, uniquingKeysWith: { _, new in new })
+    }
+
+    private static func renderMessage(_ message: Logger.Message, metadata: Logger.Metadata) -> String {
+        guard !metadata.isEmpty else { return message.description }
+        let meta = metadata
+            .sorted(by: { $0.key < $1.key })
+            .map { "\($0.key)=\(stringify($0.value))" }
+            .joined(separator: " ")
+        return "\(message.description) [\(meta)]"
+    }
+
+    private static func stringify(_ value: Logger.Metadata.Value) -> String {
+        switch value {
+        case let .string(text):
+            text
+        case let .stringConvertible(value):
+            String(describing: value)
+        case let .array(values):
+            "[" + values.map { stringify($0) }.joined(separator: ",") + "]"
+        case let .dictionary(entries):
+            "{" + entries.map { "\($0.key)=\(stringify($0.value))" }.joined(separator: ",") + "}"
+        }
+    }
+}
+
+struct ClawdisFileLogHandler: LogHandler {
+    let label: String
+    var metadata: Logger.Metadata = [:]
+
+    var logLevel: Logger.Level {
+        get { AppLogSettings.logLevel() }
+        set { AppLogSettings.setLogLevel(newValue) }
+    }
+
+    subscript(metadataKey key: String) -> Logger.Metadata.Value? {
+        get { self.metadata[key] }
+        set { self.metadata[key] = newValue }
+    }
+
+    func log(
+        level: Logger.Level,
+        message: Logger.Message,
+        metadata: Logger.Metadata?,
+        source: String,
+        file: String,
+        function: String,
+        line: UInt)
+    {
+        guard AppLogSettings.fileLoggingEnabled() else { return }
+        let (subsystem, category) = ClawdisLogging.parseLabel(self.label)
+        var fields: [String: String] = [
+            "subsystem": subsystem,
+            "category": category,
+            "level": level.rawValue,
+            "source": source,
+            "file": file,
+            "function": function,
+            "line": "\(line)",
+        ]
+        let merged = self.metadata.merging(metadata ?? [:], uniquingKeysWith: { _, new in new })
+        for (key, value) in merged {
+            fields["meta.\(key)"] = Self.stringify(value)
+        }
+        DiagnosticsFileLog.shared.log(category: category, event: message.description, fields: fields)
+    }
+
+    private static func stringify(_ value: Logger.Metadata.Value) -> String {
+        switch value {
+        case let .string(text):
+            text
+        case let .stringConvertible(value):
+            String(describing: value)
+        case let .array(values):
+            "[" + values.map { stringify($0) }.joined(separator: ",") + "]"
+        case let .dictionary(entries):
+            "{" + entries.map { "\($0.key)=\(stringify($0.value))" }.joined(separator: ",") + "}"
+        }
+    }
+}
diff --git a/apps/macos/Sources/Clawdis/MenuBar.swift b/apps/macos/Sources/Clawdis/MenuBar.swift
index c998cafea..770982311 100644
--- a/apps/macos/Sources/Clawdis/MenuBar.swift
+++ b/apps/macos/Sources/Clawdis/MenuBar.swift
@@ -3,7 +3,6 @@ import Darwin
 import Foundation
 import MenuBarExtraAccess
 import Observation
-import OSLog
 import Security
 import SwiftUI
 
@@ -30,6 +29,7 @@ struct ClawdisApp: App {
     }
 
     init() {
+        ClawdisLogging.bootstrapIfNeeded()
         _state = State(initialValue: AppStateStore.shared)
     }
 
diff --git a/apps/macos/Sources/Clawdis/MenuContentView.swift b/apps/macos/Sources/Clawdis/MenuContentView.swift
index 7cb1d420b..d18aa6dbf 100644
--- a/apps/macos/Sources/Clawdis/MenuContentView.swift
+++ b/apps/macos/Sources/Clawdis/MenuContentView.swift
@@ -20,6 +20,8 @@ struct MenuContent: View {
     @State private var loadingMics = false
     @State private var browserControlEnabled = true
     @AppStorage(cameraEnabledKey) private var cameraEnabled: Bool = false
+    @AppStorage(appLogLevelKey) private var appLogLevelRaw: String = AppLogLevel.default.rawValue
+    @AppStorage(debugFileLogEnabledKey) private var appFileLoggingEnabled: Bool = false
 
     init(state: AppState, updater: UpdaterProviding?) {
         self._state = Bindable(wrappedValue: state)
@@ -182,6 +184,20 @@ struct MenuContent: View {
                             : "Verbose Logging (Main): Off",
                         systemImage: "text.alignleft")
                 }
+                Menu("App Logging") {
+                    Picker("Verbosity", selection: self.$appLogLevelRaw) {
+                        ForEach(AppLogLevel.allCases) { level in
+                            Text(level.title).tag(level.rawValue)
+                        }
+                    }
+                    Toggle(isOn: self.$appFileLoggingEnabled) {
+                        Label(
+                            self.appFileLoggingEnabled
+                                ? "File Logging: On"
+                                : "File Logging: Off",
+                            systemImage: "doc.text.magnifyingglass")
+                    }
+                }
                 Button {
                     DebugActions.openSessionStore()
                 } label: {
diff --git a/apps/macos/Sources/Clawdis/PermissionManager.swift b/apps/macos/Sources/Clawdis/PermissionManager.swift
index d7d1ab4e0..e6de4e58f 100644
--- a/apps/macos/Sources/Clawdis/PermissionManager.swift
+++ b/apps/macos/Sources/Clawdis/PermissionManager.swift
@@ -5,7 +5,6 @@ import ClawdisIPC
 import CoreGraphics
 import Foundation
 import Observation
-import OSLog
 import Speech
 import UserNotifications
 
diff --git a/apps/macos/Sources/Clawdis/TalkModeController.swift b/apps/macos/Sources/Clawdis/TalkModeController.swift
index 85e3405ec..c87dd92da 100644
--- a/apps/macos/Sources/Clawdis/TalkModeController.swift
+++ b/apps/macos/Sources/Clawdis/TalkModeController.swift
@@ -1,5 +1,4 @@
 import Observation
-import OSLog
 
 @MainActor
 @Observable
diff --git a/apps/macos/Sources/Clawdis/VoiceSessionCoordinator.swift b/apps/macos/Sources/Clawdis/VoiceSessionCoordinator.swift
index 070a066d4..5cd2f79f5 100644
--- a/apps/macos/Sources/Clawdis/VoiceSessionCoordinator.swift
+++ b/apps/macos/Sources/Clawdis/VoiceSessionCoordinator.swift
@@ -1,7 +1,6 @@
 import AppKit
 import Foundation
 import Observation
-import OSLog
 
 @MainActor
 @Observable
diff --git a/apps/macos/Sources/Clawdis/VoiceWakeOverlay.swift b/apps/macos/Sources/Clawdis/VoiceWakeOverlay.swift
index f77ec4031..f2b818898 100644
--- a/apps/macos/Sources/Clawdis/VoiceWakeOverlay.swift
+++ b/apps/macos/Sources/Clawdis/VoiceWakeOverlay.swift
@@ -1,6 +1,5 @@
 import AppKit
 import Observation
-import OSLog
 import SwiftUI
 
 /// Lightweight, borderless panel that shows the current voice wake transcript near the menu bar.
diff --git a/apps/macos/Sources/Clawdis/VoiceWakeTester.swift b/apps/macos/Sources/Clawdis/VoiceWakeTester.swift
index 3c6a81283..5d6d77852 100644
--- a/apps/macos/Sources/Clawdis/VoiceWakeTester.swift
+++ b/apps/macos/Sources/Clawdis/VoiceWakeTester.swift
@@ -1,6 +1,5 @@
 import AVFoundation
 import Foundation
-import OSLog
 import Speech
 import SwabbleKit
 
diff --git a/docs/mac/logging.md b/docs/mac/logging.md
index e0a5926b0..368da20e6 100644
--- a/docs/mac/logging.md
+++ b/docs/mac/logging.md
@@ -7,11 +7,12 @@ read_when:
 # Logging (macOS)
 
 ## Rolling diagnostics file log (Debug pane)
-Clawdis can write a local, rotating diagnostics log to disk (useful when macOS unified logging is impractical during iterative repros).
+Clawdis routes macOS app logs through swift-log (unified logging by default) and can write a local, rotating file log to disk when you need a durable capture.
 
-- Enable: **Debug pane → Diagnostics log → “Write rolling diagnostics log (JSONL)”**
+- Verbosity: **Debug pane → Logs → App logging → Verbosity**
+- Enable: **Debug pane → Logs → App logging → “Write rolling diagnostics log (JSONL)”**
 - Location: `~/Library/Logs/Clawdis/diagnostics.jsonl` (rotates automatically; old files are suffixed with `.1`, `.2`, …)
-- Clear: **Debug pane → Diagnostics log → “Clear”**
+- Clear: **Debug pane → Logs → App logging → “Clear”**
 
 Notes:
 - This is **off by default**. Enable only while actively debugging.

From 0babf089269153ceade13ff21c81afc8fc14ebed Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 31 Dec 2025 16:28:51 +0100
Subject: [PATCH 090/100] chore: add mac app logging coverage

---
 .../Sources/Clawdis/ClawdisConfigFile.swift   | 22 ++++++++++++++++---
 .../Clawdis/GatewayLaunchAgentManager.swift   | 12 +++++++++-
 .../Clawdis/GatewayProcessManager.swift       | 16 ++++++++++++++
 .../Sources/Clawdis/ModelCatalogLoader.swift  | 11 ++++++++--
 .../Sources/Clawdis/NotificationManager.swift | 17 ++++++++++++--
 5 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/apps/macos/Sources/Clawdis/ClawdisConfigFile.swift b/apps/macos/Sources/Clawdis/ClawdisConfigFile.swift
index 4675badfa..abd420237 100644
--- a/apps/macos/Sources/Clawdis/ClawdisConfigFile.swift
+++ b/apps/macos/Sources/Clawdis/ClawdisConfigFile.swift
@@ -1,6 +1,8 @@
 import Foundation
 
 enum ClawdisConfigFile {
+    private static let logger = Logger(subsystem: "com.steipete.clawdis", category: "config")
+
     static func url() -> URL {
         FileManager.default.homeDirectoryForCurrentUser
             .appendingPathComponent(".clawdis")
@@ -15,8 +17,18 @@ enum ClawdisConfigFile {
 
     static func loadDict() -> [String: Any] {
         let url = self.url()
-        guard let data = try? Data(contentsOf: url) else { return [:] }
-        return (try? JSONSerialization.jsonObject(with: data) as? [String: Any]) ?? [:]
+        guard FileManager.default.fileExists(atPath: url.path) else { return [:] }
+        do {
+            let data = try Data(contentsOf: url)
+            guard let root = try JSONSerialization.jsonObject(with: data) as? [String: Any] else {
+                self.logger.warning("config JSON root invalid")
+                return [:]
+            }
+            return root
+        } catch {
+            self.logger.warning("config read failed: \(error.localizedDescription)")
+            return [:]
+        }
     }
 
     static func saveDict(_ dict: [String: Any]) {
@@ -27,7 +39,9 @@ enum ClawdisConfigFile {
                 at: url.deletingLastPathComponent(),
                 withIntermediateDirectories: true)
             try data.write(to: url, options: [.atomic])
-        } catch {}
+        } catch {
+            self.logger.error("config save failed: \(error.localizedDescription)")
+        }
     }
 
     static func loadGatewayDict() -> [String: Any] {
@@ -59,6 +73,7 @@ enum ClawdisConfigFile {
         browser["enabled"] = enabled
         root["browser"] = browser
         self.saveDict(root)
+        self.logger.debug("browser control updated enabled=\(enabled)")
     }
 
     static func agentWorkspace() -> String? {
@@ -78,5 +93,6 @@ enum ClawdisConfigFile {
         }
         root["agent"] = agent
         self.saveDict(root)
+        self.logger.debug("agent workspace updated set=\(!trimmed.isEmpty)")
     }
 }
diff --git a/apps/macos/Sources/Clawdis/GatewayLaunchAgentManager.swift b/apps/macos/Sources/Clawdis/GatewayLaunchAgentManager.swift
index 60b4afb0f..70de79ecd 100644
--- a/apps/macos/Sources/Clawdis/GatewayLaunchAgentManager.swift
+++ b/apps/macos/Sources/Clawdis/GatewayLaunchAgentManager.swift
@@ -1,6 +1,7 @@
 import Foundation
 
 enum GatewayLaunchAgentManager {
+    private static let logger = Logger(subsystem: "com.steipete.clawdis", category: "gateway.launchd")
     private static let supportedBindModes: Set<String> = ["loopback", "tailnet", "lan", "auto"]
 
     private static var plistURL: URL {
@@ -26,12 +27,16 @@ enum GatewayLaunchAgentManager {
         if enabled {
             let gatewayBin = self.gatewayExecutablePath(bundlePath: bundlePath)
             guard FileManager.default.isExecutableFile(atPath: gatewayBin) else {
+                self.logger.error("launchd enable failed: gateway missing at \(gatewayBin)")
                 return "Embedded gateway missing in bundle; rebuild via scripts/package-mac-app.sh"
             }
+            self.logger.info("launchd enable requested port=\(port)")
             self.writePlist(bundlePath: bundlePath, port: port)
             _ = await self.runLaunchctl(["bootout", "gui/\(getuid())/\(gatewayLaunchdLabel)"])
             let bootstrap = await self.runLaunchctl(["bootstrap", "gui/\(getuid())", self.plistURL.path])
             if bootstrap.status != 0 {
+                let msg = bootstrap.output.trimmingCharacters(in: .whitespacesAndNewlines)
+                self.logger.error("launchd bootstrap failed: \(msg)")
                 return bootstrap.output.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
                     ? "Failed to bootstrap gateway launchd job"
                     : bootstrap.output.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -42,6 +47,7 @@ enum GatewayLaunchAgentManager {
             return nil
         }
 
+        self.logger.info("launchd disable requested")
         _ = await self.runLaunchctl(["bootout", "gui/\(getuid())/\(gatewayLaunchdLabel)"])
         try? FileManager.default.removeItem(at: self.plistURL)
         return nil
@@ -103,7 +109,11 @@ enum GatewayLaunchAgentManager {
         </dict>
         </plist>
         """
-        try? plist.write(to: self.plistURL, atomically: true, encoding: .utf8)
+        do {
+            try plist.write(to: self.plistURL, atomically: true, encoding: .utf8)
+        } catch {
+            self.logger.error("launchd plist write failed: \(error.localizedDescription)")
+        }
     }
 
     private static func preferredGatewayBind() -> String? {
diff --git a/apps/macos/Sources/Clawdis/GatewayProcessManager.swift b/apps/macos/Sources/Clawdis/GatewayProcessManager.swift
index 0b4a87c9f..cca6cf79b 100644
--- a/apps/macos/Sources/Clawdis/GatewayProcessManager.swift
+++ b/apps/macos/Sources/Clawdis/GatewayProcessManager.swift
@@ -42,6 +42,7 @@ final class GatewayProcessManager {
     private var environmentRefreshTask: Task<Void, Never>?
     private var lastEnvironmentRefresh: Date?
     private var logRefreshTask: Task<Void, Never>?
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "gateway.process")
 
     private let logLimit = 20000 // characters to keep in-memory
     private let environmentRefreshMinInterval: TimeInterval = 30
@@ -53,8 +54,10 @@ final class GatewayProcessManager {
             self.stop()
             self.status = .stopped
             self.appendLog("[gateway] remote mode active; skipping local gateway\n")
+            self.logger.info("gateway process skipped: remote mode active")
             return
         }
+        self.logger.debug("gateway active requested active=\(active)")
         self.desiredActive = active
         self.refreshEnvironmentStatus()
         if active {
@@ -86,6 +89,7 @@ final class GatewayProcessManager {
             return
         }
         self.status = .starting
+        self.logger.debug("gateway start requested")
 
         // First try to latch onto an already-running gateway to avoid spawning a duplicate.
         Task { [weak self] in
@@ -98,6 +102,7 @@ final class GatewayProcessManager {
                 await MainActor.run {
                     self.status = .failed("Attach-only enabled; no gateway to attach")
                     self.appendLog("[gateway] attach-only enabled; not spawning local gateway\n")
+                    self.logger.warning("gateway attach-only enabled; not spawning")
                 }
                 return
             }
@@ -110,6 +115,7 @@ final class GatewayProcessManager {
         self.existingGatewayDetails = nil
         self.lastFailureReason = nil
         self.status = .stopped
+        self.logger.info("gateway stop requested")
         let bundlePath = Bundle.main.bundleURL.path
         Task {
             _ = await GatewayLaunchAgentManager.set(
@@ -182,6 +188,7 @@ final class GatewayProcessManager {
                 self.existingGatewayDetails = details
                 self.status = .attachedExisting(details: details)
                 self.appendLog("[gateway] using existing instance: \(details)\n")
+                self.logger.info("gateway using existing instance details=\(details)")
                 self.refreshControlChannelIfNeeded(reason: "attach existing")
                 self.refreshLog()
                 return true
@@ -197,6 +204,7 @@ final class GatewayProcessManager {
                     self.status = .failed(reason)
                     self.lastFailureReason = reason
                     self.appendLog("[gateway] existing listener on port \(port) but attach failed: \(reason)\n")
+                    self.logger.warning("gateway attach failed reason=\(reason)")
                     return true
                 }
 
@@ -268,16 +276,19 @@ final class GatewayProcessManager {
             await MainActor.run {
                 self.status = .failed(resolution.status.message)
             }
+            self.logger.error("gateway command resolve failed: \(resolution.status.message)")
             return
         }
 
         let bundlePath = Bundle.main.bundleURL.path
         let port = GatewayEnvironment.gatewayPort()
         self.appendLog("[gateway] enabling launchd job (\(gatewayLaunchdLabel)) on port \(port)\n")
+        self.logger.info("gateway enabling launchd port=\(port)")
         let err = await GatewayLaunchAgentManager.set(enabled: true, bundlePath: bundlePath, port: port)
         if let err {
             self.status = .failed(err)
             self.lastFailureReason = err
+            self.logger.error("gateway launchd enable failed: \(err)")
             return
         }
 
@@ -290,6 +301,7 @@ final class GatewayProcessManager {
                 let instance = await PortGuardian.shared.describe(port: port)
                 let details = instance.map { "pid \($0.pid)" }
                 self.status = .running(details: details)
+                self.logger.info("gateway started details=\(details ?? "ok")")
                 self.refreshControlChannelIfNeeded(reason: "gateway started")
                 self.refreshLog()
                 return
@@ -300,6 +312,7 @@ final class GatewayProcessManager {
 
         self.status = .failed("Gateway did not start in time")
         self.lastFailureReason = "launchd start timeout"
+        self.logger.warning("gateway start timed out")
     }
 
     private func appendLog(_ chunk: String) {
@@ -317,6 +330,7 @@ final class GatewayProcessManager {
             break
         }
         self.appendLog("[gateway] refreshing control channel (\(reason))\n")
+        self.logger.debug("gateway control channel refresh reason=\(reason)")
         Task { await ControlChannel.shared.configure() }
     }
 
@@ -332,12 +346,14 @@ final class GatewayProcessManager {
             }
         }
         self.appendLog("[gateway] readiness wait timed out\n")
+        self.logger.warning("gateway readiness wait timed out")
         return false
     }
 
     func clearLog() {
         self.log = ""
         try? FileManager.default.removeItem(atPath: LogLocator.launchdGatewayLogPath)
+        self.logger.debug("gateway log cleared")
     }
 
     func setProjectRoot(path: String) {
diff --git a/apps/macos/Sources/Clawdis/ModelCatalogLoader.swift b/apps/macos/Sources/Clawdis/ModelCatalogLoader.swift
index ebd5c6e97..61c234996 100644
--- a/apps/macos/Sources/Clawdis/ModelCatalogLoader.swift
+++ b/apps/macos/Sources/Clawdis/ModelCatalogLoader.swift
@@ -4,18 +4,23 @@ import JavaScriptCore
 enum ModelCatalogLoader {
     static let defaultPath: String = FileManager.default.homeDirectoryForCurrentUser
         .appendingPathComponent("Projects/pi-mono/packages/ai/src/models.generated.ts").path
+    private static let logger = Logger(subsystem: "com.steipete.clawdis", category: "models")
 
     static func load(from path: String) async throws -> [ModelChoice] {
         let expanded = (path as NSString).expandingTildeInPath
+        self.logger.debug("model catalog load start file=\(URL(fileURLWithPath: expanded).lastPathComponent)")
         let source = try String(contentsOfFile: expanded, encoding: .utf8)
         let sanitized = self.sanitize(source: source)
 
         let ctx = JSContext()
         ctx?.exceptionHandler = { _, exception in
-            if let exception { print("JS exception: \(exception)") }
+            if let exception {
+                self.logger.warning("model catalog JS exception: \(exception)")
+            }
         }
         ctx?.evaluateScript(sanitized)
         guard let rawModels = ctx?.objectForKeyedSubscript("MODELS")?.toDictionary() as? [String: Any] else {
+            self.logger.error("model catalog parse failed: MODELS missing")
             throw NSError(
                 domain: "ModelCatalogLoader",
                 code: 1,
@@ -33,12 +38,14 @@ enum ModelCatalogLoader {
             }
         }
 
-        return choices.sorted { lhs, rhs in
+        let sorted = choices.sorted { lhs, rhs in
             if lhs.provider == rhs.provider {
                 return lhs.name.localizedCaseInsensitiveCompare(rhs.name) == .orderedAscending
             }
             return lhs.provider.localizedCaseInsensitiveCompare(rhs.provider) == .orderedAscending
         }
+        self.logger.debug("model catalog loaded providers=\(rawModels.count) models=\(sorted.count)")
+        return sorted
     }
 
     private static func sanitize(source: String) -> String {
diff --git a/apps/macos/Sources/Clawdis/NotificationManager.swift b/apps/macos/Sources/Clawdis/NotificationManager.swift
index 4650d3afe..e4095ab2e 100644
--- a/apps/macos/Sources/Clawdis/NotificationManager.swift
+++ b/apps/macos/Sources/Clawdis/NotificationManager.swift
@@ -5,6 +5,8 @@ import UserNotifications
 
 @MainActor
 struct NotificationManager {
+    private let logger = Logger(subsystem: "com.steipete.clawdis", category: "notifications")
+
     private static let hasTimeSensitiveEntitlement: Bool = {
         guard let task = SecTaskCreateFromSelf(nil) else { return false }
         let key = "com.apple.developer.usernotifications.time-sensitive" as CFString
@@ -17,8 +19,12 @@ struct NotificationManager {
         let status = await center.notificationSettings()
         if status.authorizationStatus == .notDetermined {
             let granted = try? await center.requestAuthorization(options: [.alert, .sound, .badge])
-            if granted != true { return false }
+            if granted != true {
+                self.logger.warning("notification permission denied (request)")
+                return false
+            }
         } else if status.authorizationStatus != .authorized {
+            self.logger.warning("notification permission denied status=\(status.authorizationStatus.rawValue)")
             return false
         }
 
@@ -37,15 +43,22 @@ struct NotificationManager {
             case .active:
                 content.interruptionLevel = .active
             case .timeSensitive:
-                content.interruptionLevel = Self.hasTimeSensitiveEntitlement ? .timeSensitive : .active
+                if Self.hasTimeSensitiveEntitlement {
+                    content.interruptionLevel = .timeSensitive
+                } else {
+                    self.logger.debug("time-sensitive notification requested without entitlement; falling back to active")
+                    content.interruptionLevel = .active
+                }
             }
         }
 
         let req = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: nil)
         do {
             try await center.add(req)
+            self.logger.debug("notification queued")
             return true
         } catch {
+            self.logger.error("notification send failed: \(error.localizedDescription)")
             return false
         }
     }

From f03605d8ae7c174a7d715403fa384f1946794298 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 31 Dec 2025 16:31:23 +0100
Subject: [PATCH 091/100] test: add minimax live test

---
 src/agents/minimax.live.test.ts | 49 +++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 src/agents/minimax.live.test.ts

diff --git a/src/agents/minimax.live.test.ts b/src/agents/minimax.live.test.ts
new file mode 100644
index 000000000..59167ef1b
--- /dev/null
+++ b/src/agents/minimax.live.test.ts
@@ -0,0 +1,49 @@
+import { completeSimple, type Model } from "@mariozechner/pi-ai";
+import { describe, expect, it } from "vitest";
+
+const MINIMAX_KEY = process.env.MINIMAX_API_KEY ?? "";
+const MINIMAX_BASE_URL =
+  process.env.MINIMAX_BASE_URL?.trim() || "https://api.minimax.io/v1";
+const MINIMAX_MODEL = process.env.MINIMAX_MODEL?.trim() || "minimax-m2.1";
+const LIVE = process.env.MINIMAX_LIVE_TEST === "1" || process.env.LIVE === "1";
+
+const describeLive = LIVE && MINIMAX_KEY ? describe : describe.skip;
+
+describeLive("minimax live", () => {
+  it(
+    "returns assistant text",
+    async () => {
+      const model: Model<"openai-completions"> = {
+        id: MINIMAX_MODEL,
+        name: `MiniMax ${MINIMAX_MODEL}`,
+        api: "openai-completions",
+        provider: "minimax",
+        baseUrl: MINIMAX_BASE_URL,
+        reasoning: false,
+        input: ["text"],
+        cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+        contextWindow: 200000,
+        maxTokens: 8192,
+      };
+      const res = await completeSimple(
+        model,
+        {
+          messages: [
+            {
+              role: "user",
+              content: "Reply with the word ok.",
+              timestamp: Date.now(),
+            },
+          ],
+        },
+        { apiKey: MINIMAX_KEY, maxTokens: 64 },
+      );
+      const text = res.content
+        .filter((block) => block.type === "text")
+        .map((block) => block.text.trim())
+        .join(" ");
+      expect(text.length).toBeGreaterThan(0);
+    },
+    20000,
+  );
+});

From ea248f6743e6182e5e8b7036490ee396897c2528 Mon Sep 17 00:00:00 2001
From: Mariano Belinky <mbelinky@gmail.com>
Date: Wed, 31 Dec 2025 16:45:35 +0100
Subject: [PATCH 092/100] Fix device model resources for Instances

---
 .../Sources/Clawdis/DeviceModelCatalog.swift  | 49 +++++++++++++++++--
 scripts/package-mac-app.sh                    |  4 ++
 2 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/apps/macos/Sources/Clawdis/DeviceModelCatalog.swift b/apps/macos/Sources/Clawdis/DeviceModelCatalog.swift
index 2e37088d3..d98895a51 100644
--- a/apps/macos/Sources/Clawdis/DeviceModelCatalog.swift
+++ b/apps/macos/Sources/Clawdis/DeviceModelCatalog.swift
@@ -7,6 +7,8 @@ struct DevicePresentation: Sendable {
 
 enum DeviceModelCatalog {
     private static let modelIdentifierToName: [String: String] = loadModelIdentifierToName()
+    private static let resourceBundle: Bundle? = locateResourceBundle()
+    private static let resourceSubdirectory = "DeviceModels"
 
     static func presentation(deviceFamily: String?, modelIdentifier: String?) -> DevicePresentation? {
         let family = (deviceFamily ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
@@ -104,13 +106,11 @@ enum DeviceModelCatalog {
     }
 
     private static func loadMapping(resourceName: String) -> [String: String] {
-        guard let url = Bundle.module.url(
+        guard let url = self.resourceBundle?.url(
             forResource: resourceName,
             withExtension: "json",
-            subdirectory: "DeviceModels")
-        else {
-            return [:]
-        }
+            subdirectory: self.resourceSubdirectory)
+        else { return [:] }
 
         do {
             let data = try Data(contentsOf: url)
@@ -121,6 +121,45 @@ enum DeviceModelCatalog {
         }
     }
 
+    private static func locateResourceBundle() -> Bundle? {
+        if let bundle = self.bundleIfContainsDeviceModels(Bundle.main) {
+            return bundle
+        }
+
+        if let resourceURL = Bundle.main.resourceURL {
+            if let enumerator = FileManager.default.enumerator(
+                at: resourceURL,
+                includingPropertiesForKeys: [.isDirectoryKey],
+                options: [.skipsHiddenFiles]) {
+                for case let url as URL in enumerator {
+                    guard url.pathExtension == "bundle" else { continue }
+                    if let bundle = Bundle(url: url),
+                       self.bundleIfContainsDeviceModels(bundle) != nil {
+                        return bundle
+                    }
+                }
+            }
+        }
+
+        return nil
+    }
+
+    private static func bundleIfContainsDeviceModels(_ bundle: Bundle) -> Bundle? {
+        if bundle.url(
+            forResource: "ios-device-identifiers",
+            withExtension: "json",
+            subdirectory: self.resourceSubdirectory) != nil {
+            return bundle
+        }
+        if bundle.url(
+            forResource: "mac-device-identifiers",
+            withExtension: "json",
+            subdirectory: self.resourceSubdirectory) != nil {
+            return bundle
+        }
+        return nil
+    }
+
     private enum NameValue: Decodable {
         case string(String)
         case stringArray([String])
diff --git a/scripts/package-mac-app.sh b/scripts/package-mac-app.sh
index a7df9c293..408d3f408 100755
--- a/scripts/package-mac-app.sh
+++ b/scripts/package-mac-app.sh
@@ -140,6 +140,10 @@ fi
 echo "🖼  Copying app icon"
 cp "$ROOT_DIR/apps/macos/Sources/Clawdis/Resources/Clawdis.icns" "$APP_ROOT/Contents/Resources/Clawdis.icns"
 
+echo "📦 Copying device model resources"
+rm -rf "$APP_ROOT/Contents/Resources/DeviceModels"
+cp -R "$ROOT_DIR/apps/macos/Sources/Clawdis/Resources/DeviceModels" "$APP_ROOT/Contents/Resources/DeviceModels"
+
 RELAY_DIR="$APP_ROOT/Contents/Resources/Relay"
 
 if [[ "${SKIP_GATEWAY_PACKAGE:-0}" != "1" ]]; then

From 7baaca4a7622385dc306cffeea1fd181aee1bd1c Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 31 Dec 2025 22:39:42 +0100
Subject: [PATCH 093/100] docs: add model latency bench notes

---
 docs/test.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/test.md b/docs/test.md
index 02c4a27a1..bb0fc2da4 100644
--- a/docs/test.md
+++ b/docs/test.md
@@ -7,3 +7,16 @@ read_when:
 
 - `pnpm test:force`: Kills any lingering gateway process holding the default control port, then runs the full Vitest suite with an isolated gateway port so server tests don’t collide with a running instance. Use this when a prior gateway run left port 18789 occupied.
 - `pnpm test:coverage`: Runs Vitest with V8 coverage. Global thresholds are 70% lines/branches/functions/statements. Coverage excludes integration-heavy entrypoints (CLI wiring, gateway/telegram bridges, webchat static server) to keep the target focused on unit-testable logic.
+
+## Model latency bench (local keys)
+
+Script: `scripts/bench-model.ts`
+
+Usage:
+- `source ~/.profile && pnpm tsx scripts/bench-model.ts --runs 10`
+- Optional env: `MINIMAX_API_KEY`, `MINIMAX_BASE_URL`, `MINIMAX_MODEL`, `ANTHROPIC_API_KEY`
+- Default prompt: “Reply with a single word: ok. No punctuation or extra text.”
+
+Last run (2025-12-31, 20 runs):
+- minimax median 1279ms (min 1114, max 2431)
+- opus median 2454ms (min 1224, max 3170)

From c4de0b8255cd9dc166be288b149cbdc692124f1b Mon Sep 17 00:00:00 2001
From: Mariano Belinky <mbelinky@gmail.com>
Date: Wed, 31 Dec 2025 16:53:19 +0100
Subject: [PATCH 094/100] Use user home for pnpm path

---
 apps/macos/Sources/Clawdis/CommandResolver.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/macos/Sources/Clawdis/CommandResolver.swift b/apps/macos/Sources/Clawdis/CommandResolver.swift
index 2e8b5c6ce..0729024bc 100644
--- a/apps/macos/Sources/Clawdis/CommandResolver.swift
+++ b/apps/macos/Sources/Clawdis/CommandResolver.swift
@@ -274,7 +274,7 @@ enum CommandResolver {
             "/bin",
             "/usr/sbin",
             "/sbin",
-            "/Users/steipete/Library/pnpm",
+            "$HOME/Library/pnpm",
             "$PATH",
         ].joined(separator: ":")
         let quotedArgs = ([subcommand] + extraArgs).map(self.shellQuote).joined(separator: " ")

From 24e95ab38efa77a413449742b6039deebc740c86 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 1 Jan 2026 08:37:49 +0100
Subject: [PATCH 095/100] docs: update changelog for PR #66

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae274ccc3..e155c5d42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@
 - macOS menu: split device platform/version across first and second rows for better fit.
 - iOS node: fix ReplayKit screen recording crash caused by queue isolation assertions during capture.
 - iOS Talk Mode: avoid audio tap queue assertions when starting recognition.
+- macOS: use $HOME/Library/pnpm for SSH PATH exports (thanks @mbelinky).
 - iOS/Android nodes: bridge auto-connect refreshes stale tokens and settings now show richer bridge/device details.
 - iOS/Android nodes: status pill now surfaces camera activity instead of overlay toasts.
 - iOS/Android/macOS nodes: camera snaps recompress to keep base64 payloads under 5 MB.

From 941ad275510d344889662bd4290d80e4ad7be4c4 Mon Sep 17 00:00:00 2001
From: Mariano Belinky <mbelinky@gmail.com>
Date: Wed, 31 Dec 2025 16:51:39 +0100
Subject: [PATCH 096/100] Bundle Control UI in Mac app

---
 scripts/package-mac-app.sh | 11 +++++++++++
 src/gateway/control-ui.ts  | 11 ++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/scripts/package-mac-app.sh b/scripts/package-mac-app.sh
index a7df9c293..2ec2f6444 100755
--- a/scripts/package-mac-app.sh
+++ b/scripts/package-mac-app.sh
@@ -33,6 +33,13 @@ else
   echo "📦 Skipping TS build (SKIP_TSC=1)"
 fi
 
+if [[ "${SKIP_UI_BUILD:-0}" != "1" ]]; then
+  echo "🖥  Building Control UI (pnpm ui:build)"
+  (cd "$ROOT_DIR" && pnpm ui:build)
+else
+  echo "🖥  Skipping Control UI build (SKIP_UI_BUILD=1)"
+fi
+
 cd "$ROOT_DIR/apps/macos"
 
 echo "🔨 Building $PRODUCT ($BUILD_CONFIG)"
@@ -163,6 +170,10 @@ if [[ "${SKIP_GATEWAY_PACKAGE:-0}" != "1" ]]; then
   rm -rf "$RELAY_DIR/a2ui"
   cp -R "$ROOT_DIR/src/canvas-host/a2ui" "$RELAY_DIR/a2ui"
 
+  echo "🎛  Copying Control UI assets"
+  rm -rf "$RELAY_DIR/control-ui"
+  cp -R "$ROOT_DIR/dist/control-ui" "$RELAY_DIR/control-ui"
+
   echo "🧠 Copying bundled skills"
   rm -rf "$RELAY_DIR/skills"
   cp -R "$ROOT_DIR/skills" "$RELAY_DIR/skills"
diff --git a/src/gateway/control-ui.ts b/src/gateway/control-ui.ts
index 3ac0449f4..32bab8818 100644
--- a/src/gateway/control-ui.ts
+++ b/src/gateway/control-ui.ts
@@ -8,14 +8,23 @@ const ROOT_PREFIX = "/";
 
 function resolveControlUiRoot(): string | null {
   const here = path.dirname(fileURLToPath(import.meta.url));
+  const execDir = (() => {
+    try {
+      return path.dirname(fs.realpathSync(process.execPath));
+    } catch {
+      return null;
+    }
+  })();
   const candidates = [
+    // Packaged relay: Resources/Relay/control-ui
+    execDir ? path.resolve(execDir, "control-ui") : null,
     // Running from dist: dist/gateway/control-ui.js -> dist/control-ui
     path.resolve(here, "../control-ui"),
     // Running from source: src/gateway/control-ui.ts -> dist/control-ui
     path.resolve(here, "../../dist/control-ui"),
     // Fallback to cwd (dev)
     path.resolve(process.cwd(), "dist", "control-ui"),
-  ];
+  ].filter((dir): dir is string => Boolean(dir));
   for (const dir of candidates) {
     if (fs.existsSync(path.join(dir, "index.html"))) return dir;
   }

From dececccd8e4719a7dd66008712fb803a73005682 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 1 Jan 2026 08:55:51 +0100
Subject: [PATCH 097/100] docs: thank contributor for PR #65

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e155c5d42..1e1de743f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
 - Android Chat UI: use `onPrimary` for user bubble text to preserve contrast (thanks @Syhids).
 - Control UI: sync sidebar navigation with the URL for deep-linking, and auto-scroll chat to the latest message.
 - Control UI: disable Web Chat + Talk when no iOS/Android node is connected; refreshed Web Chat styling and keyboard send.
+- macOS: bundle Control UI assets into the app relay so the packaged app can serve them (thanks @mbelinky).
 - Talk Mode: wait for chat history to surface the assistant reply before starting TTS (macOS/iOS/Android).
 - iOS Talk Mode: fix chat completion wait to time out even if no events arrive (prevents “Thinking…” hangs).
 - iOS Talk Mode: keep recognition running during playback to support interrupt-on-speech.

From 2d5c401d11fe0505c80250efaf388f145e3f57ae Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 1 Jan 2026 08:58:54 +0100
Subject: [PATCH 098/100] fix: prefer module bundle for device models

---
 apps/macos/Sources/Clawdis/DeviceModelCatalog.swift | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/macos/Sources/Clawdis/DeviceModelCatalog.swift b/apps/macos/Sources/Clawdis/DeviceModelCatalog.swift
index d98895a51..487a0fca2 100644
--- a/apps/macos/Sources/Clawdis/DeviceModelCatalog.swift
+++ b/apps/macos/Sources/Clawdis/DeviceModelCatalog.swift
@@ -122,6 +122,10 @@ enum DeviceModelCatalog {
     }
 
     private static func locateResourceBundle() -> Bundle? {
+        if let bundle = self.bundleIfContainsDeviceModels(Bundle.module) {
+            return bundle
+        }
+
         if let bundle = self.bundleIfContainsDeviceModels(Bundle.main) {
             return bundle
         }

From 43cf526b5f2ff7914e67a2581b9e548288073ca1 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 1 Jan 2026 08:59:24 +0100
Subject: [PATCH 099/100] docs: thank contributor for PR #64

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e1de743f..194f68b4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@
 - iOS Talk Mode: avoid audio tap queue assertions when starting recognition.
 - macOS: use $HOME/Library/pnpm for SSH PATH exports (thanks @mbelinky).
 - iOS/Android nodes: bridge auto-connect refreshes stale tokens and settings now show richer bridge/device details.
+- macOS: bundle device model resources to prevent Instances crashes (thanks @mbelinky).
 - iOS/Android nodes: status pill now surfaces camera activity instead of overlay toasts.
 - iOS/Android/macOS nodes: camera snaps recompress to keep base64 payloads under 5 MB.
 - iOS/Android nodes: status pill now surfaces pairing, screen recording, voice wake, and foreground-required states.

From 14e90775848e605a2e605ddbd3befc5c37adeaba Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 1 Jan 2026 08:59:31 +0100
Subject: [PATCH 100/100] chore: add bench-model script

---
 scripts/bench-model.ts | 144 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 scripts/bench-model.ts

diff --git a/scripts/bench-model.ts b/scripts/bench-model.ts
new file mode 100644
index 000000000..32ed20ad0
--- /dev/null
+++ b/scripts/bench-model.ts
@@ -0,0 +1,144 @@
+import { completeSimple, getModel, type Model } from "@mariozechner/pi-ai";
+
+type Usage = {
+  input?: number;
+  output?: number;
+  cacheRead?: number;
+  cacheWrite?: number;
+  totalTokens?: number;
+};
+
+type RunResult = {
+  durationMs: number;
+  usage?: Usage;
+};
+
+const DEFAULT_PROMPT =
+  "Reply with a single word: ok. No punctuation or extra text.";
+const DEFAULT_RUNS = 10;
+
+function parseArg(flag: string): string | undefined {
+  const idx = process.argv.indexOf(flag);
+  if (idx === -1) return undefined;
+  return process.argv[idx + 1];
+}
+
+function parseRuns(raw: string | undefined): number {
+  if (!raw) return DEFAULT_RUNS;
+  const parsed = Number(raw);
+  if (!Number.isFinite(parsed) || parsed <= 0) return DEFAULT_RUNS;
+  return Math.floor(parsed);
+}
+
+function median(values: number[]): number {
+  if (values.length === 0) return 0;
+  const sorted = [...values].sort((a, b) => a - b);
+  const mid = Math.floor(sorted.length / 2);
+  if (sorted.length % 2 === 0) {
+    return Math.round((sorted[mid - 1] + sorted[mid]) / 2);
+  }
+  return sorted[mid];
+}
+
+async function runModel(opts: {
+  label: string;
+  model: Model<any>;
+  apiKey: string;
+  runs: number;
+  prompt: string;
+}): Promise<RunResult[]> {
+  const results: RunResult[] = [];
+  for (let i = 0; i < opts.runs; i += 1) {
+    const started = Date.now();
+    const res = await completeSimple(
+      opts.model,
+      {
+        messages: [
+          {
+            role: "user",
+            content: opts.prompt,
+            timestamp: Date.now(),
+          },
+        ],
+      },
+      { apiKey: opts.apiKey, maxTokens: 64 },
+    );
+    const durationMs = Date.now() - started;
+    results.push({ durationMs, usage: res.usage });
+    console.log(
+      `${opts.label} run ${i + 1}/${opts.runs}: ${durationMs}ms`,
+    );
+  }
+  return results;
+}
+
+async function main(): Promise<void> {
+  const runs = parseRuns(parseArg("--runs"));
+  const prompt = parseArg("--prompt") ?? DEFAULT_PROMPT;
+
+  const anthropicKey = process.env.ANTHROPIC_API_KEY?.trim();
+  const minimaxKey = process.env.MINIMAX_API_KEY?.trim();
+  if (!anthropicKey) {
+    throw new Error("Missing ANTHROPIC_API_KEY in environment.");
+  }
+  if (!minimaxKey) {
+    throw new Error("Missing MINIMAX_API_KEY in environment.");
+  }
+
+  const minimaxBaseUrl =
+    process.env.MINIMAX_BASE_URL?.trim() || "https://api.minimax.io/v1";
+  const minimaxModelId =
+    process.env.MINIMAX_MODEL?.trim() || "minimax-m2.1";
+
+  const minimaxModel: Model<"openai-completions"> = {
+    id: minimaxModelId,
+    name: `MiniMax ${minimaxModelId}`,
+    api: "openai-completions",
+    provider: "minimax",
+    baseUrl: minimaxBaseUrl,
+    reasoning: false,
+    input: ["text"],
+    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+    contextWindow: 200000,
+    maxTokens: 8192,
+  };
+  const opusModel = getModel("anthropic", "claude-opus-4-5");
+
+  console.log(`Prompt: ${prompt}`);
+  console.log(`Runs: ${runs}`);
+  console.log("");
+
+  const minimaxResults = await runModel({
+    label: "minimax",
+    model: minimaxModel,
+    apiKey: minimaxKey,
+    runs,
+    prompt,
+  });
+  const opusResults = await runModel({
+    label: "opus",
+    model: opusModel,
+    apiKey: anthropicKey,
+    runs,
+    prompt,
+  });
+
+  const summarize = (label: string, results: RunResult[]) => {
+    const durations = results.map((r) => r.durationMs);
+    const med = median(durations);
+    const min = Math.min(...durations);
+    const max = Math.max(...durations);
+    return { label, med, min, max };
+  };
+
+  const summary = [summarize("minimax", minimaxResults), summarize("opus", opusResults)];
+  console.log("");
+  console.log("Summary (ms):");
+  for (const row of summary) {
+    console.log(
+      `${row.label.padEnd(7)} median=${row.med} min=${row.min} max=${row.max}`,
+    );
+  }
+}
+
+await main();