@agentdeck/bridge 1.0.4 → 1.0.5

package/dist/windows-service.js

@@ -111,7 +111,7 @@ export function installWindowsTask() {
     writeFileSync(tmpFile, '' + xml, 'utf16le');
     try {
         // /F overwrites an existing task (idempotent; mirrors macOS unload-before-load).
-        execSync(`schtasks /Create /TN "${TASK_NAME}" /XML "${tmpFile}" /F`, { stdio: 'pipe' });
+        execSync(`schtasks /Create /TN "${TASK_NAME}" /XML "${tmpFile}" /F`, { stdio: 'pipe', windowsHide: true });
     }
     finally {
         try {
@@ -123,7 +123,7 @@ export function installWindowsTask() {
 /** True if the AgentDeckDaemon scheduled task is registered. */
 export function taskExists() {
     try {
-        execSync(`schtasks /Query /TN "${TASK_NAME}"`, { stdio: 'pipe' });
+        execSync(`schtasks /Query /TN "${TASK_NAME}"`, { stdio: 'pipe', windowsHide: true });
         return true;
     }
     catch {
@@ -132,14 +132,14 @@ export function taskExists() {
 }
 /** Start the registered task immediately (so no logout is required). */
 export function runWindowsTask() {
-    execSync(`schtasks /Run /TN "${TASK_NAME}"`, { stdio: 'pipe' });
+    execSync(`schtasks /Run /TN "${TASK_NAME}"`, { stdio: 'pipe', windowsHide: true });
 }
 /** Stop a running task instance (best-effort; ignores "not running"). */
 export function endWindowsTask() {
-    execSync(`schtasks /End /TN "${TASK_NAME}"`, { stdio: 'pipe' });
+    execSync(`schtasks /End /TN "${TASK_NAME}"`, { stdio: 'pipe', windowsHide: true });
 }
 /** Delete the registered task (/F suppresses the confirm prompt). */
 export function deleteWindowsTask() {
-    execSync(`schtasks /Delete /TN "${TASK_NAME}" /F`, { stdio: 'pipe' });
+    execSync(`schtasks /Delete /TN "${TASK_NAME}" /F`, { stdio: 'pipe', windowsHide: true });
 }
 //# sourceMappingURL=windows-service.js.map

package/dist/windows-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"windows-service.js","sourceRoot":"","sources":["../src/windows-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,CAAC,MAAM,SAAS,GAAG,iBAAiB,CAAC;AAE3C,MAAM,UAAU,SAAS,CAAC,CAAS;IACjC,OAAO,CAAC;SACL,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;SACtB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;SACrB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;SACrB,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAC7B,CAAC;AAED,+EAA+E;AAC/E,+EAA+E;AAC/E,8EAA8E;AAC9E,yDAAyD;AACzD,MAAM,UAAU,mBAAmB;IACjC,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxD,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,kBAAkB;IAChC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;IACtC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,QAAQ,EAAE,CAAC,QAAQ,CAAC;IACzD,OAAO,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,IAAuD;IAC3F,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,mBAAmB,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC;IAC9D,MAAM,IAAI,GAAG,IAAI,EAAE,IAAI,IAAI,kBAAkB,EAAE,CAAC;IAChD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,YAAY,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAChC,6EAA6E;IAC7E,6EAA6E;IAC7E,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,KAAK,6BAA6B,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAChC,+EAA+E;IAC/E,2EAA2E;IAC3E,0DAA0D;IAC1D,OAAO;;;;aAII,SAAS;;;;;gBAKN,OAAO;;;;;gBAKP,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA6BN,OAAO;mBACL,IAAI;0BACG,SAAS,CAAC,UAAU,CAAC;;;QAGvC,CAAC;AACT,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,kBAAkB;IAChC,MAAM,GAAG,GAAG,qBAAqB,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,kBAAkB,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAClF,yEAAyE;IACzE,aAAa,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,EAAE,SAAS,CAAC,CAAC;IAC7C,IAAI,CAAC;QACH,iFAAiF;QACjF,QAAQ,CAAC,yBAAyB,SAAS,WAAW,OAAO,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAC1F,CAAC;YAAS,CAAC;QACT,IAAI,CAAC;YAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,8BAA8B,CAAC,CAAC;IACvE,CAAC;AACH,CAAC;AAED,gEAAgE;AAChE,MAAM,UAAU,UAAU;IACxB,IAAI,CAAC;QACH,QAAQ,CAAC,wBAAwB,SAAS,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAClE,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,wEAAwE;AACxE,MAAM,UAAU,cAAc;IAC5B,QAAQ,CAAC,sBAAsB,SAAS,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;AAClE,CAAC;AAED,yEAAyE;AACzE,MAAM,UAAU,cAAc;IAC5B,QAAQ,CAAC,sBAAsB,SAAS,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;AAClE,CAAC;AAED,qEAAqE;AACrE,MAAM,UAAU,iBAAiB;IAC/B,QAAQ,CAAC,yBAAyB,SAAS,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;AACxE,CAAC"}
+{"version":3,"file":"windows-service.js","sourceRoot":"","sources":["../src/windows-service.ts"],"names":[],"mappings":"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"}

package/fm-helper/AgentDeckFMHelper.swift

@@ -19,6 +19,8 @@ struct HelperRequest: Decodable {
     let text: String?
     let voice: String?
     let rate: Double?
+    /// `record`: hard cap on capture length; the reply arrives at stop or here.
+    let maxMs: Int?
 }
 
 @main
@@ -60,6 +62,20 @@ struct AgentDeckFMHelper {
             return
         }
 
+        if request.type == "record" {
+            // Recording spans an unknown PTT hold, and the stop arrives as a
+            // later stdin line — so this must not block the read loop.
+            Task.detached { await handleRecord(request) }
+            return
+        }
+
+        if request.type == "record_stop" || request.type == "record_cancel" {
+            let stopped = activeRecording.finish(
+                cancelled: request.type == "record_cancel", reason: "stopped")
+            write(["id": request.id, "stopped": stopped])
+            return
+        }
+
         guard let prompt = request.prompt, !prompt.isEmpty else {
             write(["id": request.id, "error": "bad_request", "reason": "missing prompt"])
             return
@@ -165,6 +181,111 @@ struct AgentDeckFMHelper {
         }
     }
 
+    // MARK: - Microphone capture
+
+    private static let activeRecording = RecordingBox()
+
+    /// Capture the host microphone into a 16 kHz mono PCM16 WAV. This is the
+    /// piece that retired the old Stream Deck Voice dial: capture used to mean
+    /// borrowing iTerm2's mic grant via AppleScript plus Homebrew `sox`. Here
+    /// the daemon's own bundled helper records, so the TCC grant belongs to
+    /// this process tree and there is nothing to install.
+    ///
+    /// The reply is deferred: it is written when `record_stop`/`record_cancel`
+    /// arrives on stdin or `maxMs` elapses, whichever comes first.
+    private static func handleRecord(_ request: HelperRequest) async {
+        guard let outPath = request.wav, !outPath.isEmpty else {
+            write(["id": request.id, "error": "bad_request", "reason": "missing wav output path"])
+            return
+        }
+        let granted = await ensureMicAuthorization()
+        guard granted else {
+            write([
+                "id": request.id,
+                "error": "unauthorized",
+                "reason": "microphone access not granted — grant it in System Settings › Privacy & Security › Microphone",
+            ])
+            return
+        }
+        let sampleRate = 16000.0
+        guard let outFormat = AVAudioFormat(commonFormat: .pcmFormatInt16,
+                                            sampleRate: sampleRate,
+                                            channels: 1,
+                                            interleaved: true) else {
+            write(["id": request.id, "error": "record_failed", "reason": "output format unavailable"])
+            return
+        }
+
+        let engine = AVAudioEngine()
+        let input = engine.inputNode
+        let inFormat = input.outputFormat(forBus: 0)
+        guard inFormat.sampleRate > 0, inFormat.channelCount > 0 else {
+            write(["id": request.id, "error": "record_failed", "reason": "no audio input device"])
+            return
+        }
+        let sink = PCMSink()
+        guard activeRecording.begin(requestId: request.id, engine: engine, sink: sink) else {
+            write(["id": request.id, "error": "busy", "reason": "a recording is already in progress"])
+            return
+        }
+        input.installTap(onBus: 0, bufferSize: 4096, format: inFormat) { buffer, _ in
+            sink.append(buffer, to: outFormat)
+        }
+        do {
+            try engine.start()
+        } catch {
+            activeRecording.clear()
+            input.removeTap(onBus: 0)
+            write(["id": request.id, "error": "record_failed", "reason": String(describing: error)])
+            return
+        }
+
+        let maxMs = max(1000, min(request.maxMs ?? 30_000, 120_000))
+        let outcome = await activeRecording.wait(maxMs: maxMs)
+        engine.stop()
+        input.removeTap(onBus: 0)
+
+        if outcome.cancelled {
+            write(["id": request.id, "cancelled": true])
+            return
+        }
+        if let failure = sink.failure {
+            write(["id": request.id, "error": "record_failed", "reason": failure])
+            return
+        }
+        let pcm = sink.pcm
+        guard pcm.count >= 2 else {
+            write(["id": request.id, "error": "record_failed", "reason": "no audio captured"])
+            return
+        }
+        do {
+            try wavData(pcm: pcm, sampleRate: Int(sampleRate)).write(to: URL(fileURLWithPath: outPath))
+        } catch {
+            write(["id": request.id, "error": "record_failed", "reason": String(describing: error)])
+            return
+        }
+        write([
+            "id": request.id,
+            "wav": outPath,
+            "sampleRate": Int(sampleRate),
+            "samples": pcm.count / 2,
+            "durationMs": Int(Double(pcm.count / 2) / sampleRate * 1000.0),
+            "stopReason": outcome.reason,
+        ])
+    }
+
+    private static func ensureMicAuthorization() async -> Bool {
+        switch AVCaptureDevice.authorizationStatus(for: .audio) {
+        case .authorized: return true
+        case .notDetermined:
+            return await withCheckedContinuation { continuation in
+                let box = ResumeOnce(continuation)
+                AVCaptureDevice.requestAccess(for: .audio) { box.resume($0) }
+            }
+        default: return false
+        }
+    }
+
     // MARK: - Text to speech
 
     /// Speak a reply through the host's audio output. Kept in the same helper
@@ -312,13 +433,92 @@ struct AgentDeckFMHelper {
 #endif
     }
 
+    /// stdout is shared by the serial request loop and the detached record
+    /// task; the lock keeps two replies from interleaving inside one line.
+    private static let writeLock = NSLock()
+
     private static func write(_ object: [String: Any]) {
         guard JSONSerialization.isValidJSONObject(object),
               let data = try? JSONSerialization.data(withJSONObject: object),
               let text = String(data: data, encoding: .utf8) else {
             return
         }
+        writeLock.lock()
         FileHandle.standardOutput.write(Data((text + "\n").utf8))
+        writeLock.unlock()
+    }
+}
+
+/// State for the single in-flight microphone capture. One at a time by design:
+/// the daemon models push-to-talk, and two overlapping engine taps on the same
+/// input device produce garbage anyway.
+private final class RecordingBox: @unchecked Sendable {
+    struct Outcome { let cancelled: Bool; let reason: String }
+
+    private let lock = NSLock()
+    private var requestId: Int?
+    private var engine: AVAudioEngine?
+    private var sink: PCMSink?
+    private var continuation: ResumeOnce<Outcome>?
+    /// Bumped per recording so a stale max-duration timer from a finished
+    /// capture cannot terminate the one that started after it.
+    private var generation = 0
+
+    func begin(requestId: Int, engine: AVAudioEngine, sink: PCMSink) -> Bool {
+        lock.lock(); defer { lock.unlock() }
+        guard self.requestId == nil else { return false }
+        self.requestId = requestId
+        self.engine = engine
+        self.sink = sink
+        generation += 1
+        return true
+    }
+
+    func wait(maxMs: Int) async -> Outcome {
+        let gen = currentGeneration()
+        let outcome: Outcome = await withCheckedContinuation { cont in
+            arm(ResumeOnce(cont))
+            DispatchQueue.global().asyncAfter(deadline: .now() + .milliseconds(maxMs)) { [weak self] in
+                guard let self, self.isLive(generation: gen) else { return }
+                _ = self.finish(cancelled: false, reason: "max_duration")
+            }
+        }
+        return outcome
+    }
+
+    private func currentGeneration() -> Int {
+        lock.lock(); defer { lock.unlock() }
+        return generation
+    }
+
+    private func arm(_ box: ResumeOnce<Outcome>) {
+        lock.lock(); defer { lock.unlock() }
+        continuation = box
+    }
+
+    private func isLive(generation gen: Int) -> Bool {
+        lock.lock(); defer { lock.unlock() }
+        return generation == gen && requestId != nil
+    }
+
+    /// Returns false when no recording is active — the stop raced a max-length
+    /// finish or arrived with nothing running.
+    func finish(cancelled: Bool, reason: String) -> Bool {
+        lock.lock()
+        let cont = continuation
+        let active = requestId != nil
+        continuation = nil
+        requestId = nil
+        engine = nil
+        sink = nil
+        lock.unlock()
+        guard active, let cont else { return false }
+        cont.resume(Outcome(cancelled: cancelled, reason: cancelled ? "cancelled" : reason))
+        return true
+    }
+
+    func clear() {
+        _ = finish(cancelled: true, reason: "cleared")
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentdeck/bridge",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -24,16 +24,26 @@
   "bin": {
     "agentdeck": "./dist/cli.js"
   },
+  "scripts": {
+    "build": "tsc",
+    "build:fm-helper": "node scripts/build-fm-helper.mjs",
+    "prepack": "node scripts/build-fm-helper.mjs",
+    "dev": "tsc --watch",
+    "clean": "rm -rf dist",
+    "typecheck": "tsc --noEmit",
+    "start": "node dist/cli.js claude"
+  },
   "dependencies": {
+    "@agentdeck/hooks": "workspace:*",
+    "@agentdeck/shared": "workspace:*",
     "@anthropic-ai/sdk": "^0.111.0",
     "bonjour-service": "^1.3.0",
     "commander": "^14.0.3",
     "express": "^5.2.1",
     "qrcode": "^1.5.4",
+    "sharp": "^0.34.5",
     "strip-ansi": "^7.2.0",
-    "ws": "^8.20.0",
-    "@agentdeck/hooks": "1.0.4",
-    "@agentdeck/shared": "1.0.4"
+    "ws": "^8.20.0"
   },
   "optionalDependencies": {
     "@picovoice/porcupine-node": "^4.0.2",
@@ -49,13 +59,5 @@
     "@types/qrcode": "^1.5.6",
     "@types/ws": "^8.18.1",
     "typescript": "^6.0.3"
-  },
-  "scripts": {
-    "build": "tsc",
-    "build:fm-helper": "node scripts/build-fm-helper.mjs",
-    "dev": "tsc --watch",
-    "clean": "rm -rf dist",
-    "typecheck": "tsc --noEmit",
-    "start": "node dist/cli.js claude"
   }
-}
+}

package/src/idotmatrix/identity_generated.py

@@ -0,0 +1,50 @@
+# GENERATED FILE — DO NOT EDIT.
+# Source of truth: shared/src/idotmatrix-identity.ts
+# Regenerate: pnpm generate-idotmatrix-identity (drift gated by shared/src/__tests__/idotmatrix-identity.test.ts)
+"""Brand-independent identity of an iDotMatrix-protocol BLE panel.
+
+The same hardware advertises as 'IDM-...' (iDotMatrix) or 'iPixel-...', so a
+scan filters on the advertised service first and only falls back to the name
+families.
+"""
+
+IDOTMATRIX_SERVICE_UUID = "000000fa-0000-1000-8000-00805f9b34fb"
+IDOTMATRIX_WRITE_CHARACTERISTIC_UUID = "0000fa02-0000-1000-8000-00805f9b34fb"
+IDOTMATRIX_NAME_PREFIXES = ["IDM-", "IPIXEL"]
+
+_HEX = set("0123456789abcdef")
+
+
+def normalize_uuid(value):
+    """Expand a 16-bit ('fa02') or 32-bit ('000000fa') UUID to Bluetooth-base form.
+
+    Short forms are left-padded first: 'fa' and '00fa' are the same service.
+    """
+    s = (value or "").strip().lower()
+    if not s or not set(s) <= _HEX:
+        return s
+    if len(s) <= 4:
+        return "0000" + s.rjust(4, "0") + "-0000-1000-8000-00805f9b34fb"
+    if len(s) <= 8:
+        return s.rjust(8, "0") + "-0000-1000-8000-00805f9b34fb"
+    return s
+
+
+def matches_name(name, extra_prefixes=()):
+    """Whether an advertised local name belongs to a known panel family."""
+    n = (name or "").strip().upper()
+    if not n:
+        return False
+    for prefix in list(IDOTMATRIX_NAME_PREFIXES) + list(extra_prefixes or ()):
+        p = (prefix or "").strip().upper()
+        if p and n.startswith(p):
+            return True
+    return False
+
+
+def matches_advertisement(name, service_uuids, extra_prefixes=()):
+    """The discovery predicate: service UUID first, name families second."""
+    for uuid in service_uuids or ():
+        if normalize_uuid(uuid) == IDOTMATRIX_SERVICE_UUID:
+            return True
+    return matches_name(name, extra_prefixes)

package/src/idotmatrix/scan.py

@@ -1,35 +1,55 @@
+"""BLE scan for iDotMatrix-protocol panels (terminal-managed daemon + CLI).
+
+Reports every peripheral it sees, flagging the ones that speak the iDotMatrix
+protocol. Identification is brand-independent — advertised service UUID first,
+known name families second — because the same hardware ships as 'IDM-...'
+(iDotMatrix) and 'iPixel-...'. The rule lives in identity_generated.py, mirrored
+from shared/src/idotmatrix-identity.ts; the Swift CoreBluetooth scanner in the
+App Store daemon applies the identical predicate.
+
+Extra name prefixes may be passed as argv (the daemon forwards
+`idotmatrixNamePrefixes` from settings.json) so a further rebrand is a config
+change rather than a release.
+"""
+
 import asyncio
 import json
 import sys
 from bleak import BleakScanner
 
-async def scan():
-    # Scan for 5 seconds
-    devices = await BleakScanner.discover(timeout=5.0)
-    
+from identity_generated import matches_advertisement
+
+
+async def scan(extra_prefixes):
+    # Scan for 5 seconds. return_adv gives the advertisement payload, which is
+    # where the service UUIDs live — peripheral.name alone cannot identify a
+    # panel that advertises under an unknown brand name.
+    discovered = await BleakScanner.discover(timeout=5.0, return_adv=True)
+
     results = []
-    for d in devices:
-        name = d.name if d.name else "Unknown"
-        # Gather all devices, but flag IDM devices
-        is_idm = name.startswith("IDM-")
+    for device, adv in discovered.values():
+        name = adv.local_name or device.name or "Unknown"
+        service_uuids = list(adv.service_uuids or ())
         results.append({
             "name": name,
-            "address": d.address,
-            "is_idotmatrix": is_idm
+            "address": device.address,
+            "is_idotmatrix": matches_advertisement(name, service_uuids, extra_prefixes),
         })
-        
+
     # Sort so that iDotMatrix devices are on top
     results.sort(key=lambda x: x["is_idotmatrix"], reverse=True)
-    
+
     # Print as JSON so the calling Node.js CLI can easily parse it
     print(json.dumps(results))
 
+
 def main():
     try:
-        asyncio.run(scan())
+        asyncio.run(scan(sys.argv[1:]))
     except Exception as e:
         print(json.dumps({"error": str(e)}))
         sys.exit(1)
 
+
 if __name__ == "__main__":
     main()