@agentdeck/bridge 1.0.2 → 1.0.4

package/dist/cli.js

@@ -8,6 +8,7 @@ import { fileURLToPath } from 'url';
 import { createRequire } from 'module';
 import { request } from 'http';
 import { BRIDGE_WS_PORT } from './types.js';
+import { ensureBleRuntime, getBleRuntimeStatus } from './python-ble-runtime.js';
 import { TASK_NAME, installWindowsTask, taskExists, runWindowsTask, endWindowsTask, deleteWindowsTask, } from './windows-service.js';
 const require = createRequire(import.meta.url);
 const packageJson = require('../package.json');
@@ -135,19 +136,30 @@ async function isDaemonPort(port) {
         return false;
     }
 }
-function resolveTimeboxSyncPaths() {
-    const distPath = dirname(fileURLToPath(import.meta.url));
-    const projectRoot = join(distPath, '..', '..');
-    const timeboxDir = join(projectRoot, 'bridge', 'src', 'timebox');
-    return {
-        python: join(projectRoot, '.venv', 'bin', 'python'),
-        bleScript: join(timeboxDir, 'sync_ble.py'),
-        scanScript: join(timeboxDir, 'scan_ble.py'),
-    };
-}
 function projectRootPath() {
     return join(dirname(fileURLToPath(import.meta.url)), '..', '..');
 }
+async function runBlePython(python, args, captureStdout = false) {
+    return new Promise((resolve, reject) => {
+        const child = spawn(python, args, captureStdout ? { stdio: ['ignore', 'pipe', 'inherit'] } : { stdio: 'inherit' });
+        let stdout = '';
+        child.stdout?.on('data', (data) => {
+            stdout += data.toString();
+        });
+        child.once('error', reject);
+        child.once('close', (code) => resolve({ code, stdout }));
+    });
+}
+function prepareBleRuntime() {
+    try {
+        return ensureBleRuntime({ log });
+    }
+    catch (err) {
+        log(`BLE support unavailable: ${err instanceof Error ? err.message : String(err)}`);
+        process.exitCode = 1;
+        return null;
+    }
+}
 const ESP32_OTA_BOARDS = [
     { board: 'inkdeck', env: 'inkdeck', aliases: [] },
     { board: 'ulanzi_tc001', env: 'led8x32', aliases: ['led8x32'] },
@@ -156,6 +168,8 @@ const ESP32_OTA_BOARDS = [
     { board: 'ips_35', env: 'ips35', aliases: ['ips35'] },
     { board: '86box', env: 'box_86', aliases: ['box_86', 'box_40'] },
     { board: 'ips_10', env: 'ips10', aliases: ['ips10', 'ips_101'] },
+    { board: 't_embed', env: 't_embed', aliases: ['tembed', 'knob'] },
+    { board: 't_display_pro', env: 't_display_pro', aliases: ['tdisplaypro', 'ticker', 's3pro'] },
 ];
 // alias/board/env-key → { env, board }. Built from the SSOT above.
 export const ESP32_OTA_BY_TARGET = {};
@@ -712,6 +726,45 @@ program
     }
 });
 // ===== Device commands =====
+// Bench test for the playback half of the voice loop. The production path only
+// speaks after a dictation arms a board and its session finishes a turn, which
+// is no way to check whether a freshly flashed amplifier works.
+program
+    .command('speak <board> <text>')
+    .description('Speak text on a board\'s speaker (voice playback bench test)')
+    .option('-p, --port <port>', 'Bridge server port')
+    .option('-l, --locale <bcp47>', 'TTS locale, e.g. ko-KR (default: settings voice.locale)')
+    .option('-f, --force', 'Stream even if the board does not advertise audio_out')
+    .action(async (board, text, opts) => {
+    const { readDaemonInfo, findDaemonPort } = await import('./session-registry.js');
+    const info = readDaemonInfo();
+    const port = opts.port != null
+        ? parseInt(opts.port, 10)
+        : (info?.httpPort ?? info?.port ?? findDaemonPort() ?? BRIDGE_WS_PORT);
+    try {
+        const res = await fetch(`http://127.0.0.1:${port}/voice/speak`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ board, text, force: opts.force === true, locale: opts.locale }),
+            // Synthesis plus paced playback: a 700-char reply runs well past a
+            // minute at speech rate, and the daemon answers only once it is done.
+            signal: AbortSignal.timeout(180_000),
+        });
+        const data = await res.json();
+        if (data.error) {
+            log(`✗ ${data.error}`);
+            process.exitCode = 1;
+            return;
+        }
+        log(data.spoke ? `✓ spoke on ${board} — ${data.detail}` : `✗ ${data.detail}`);
+        if (!data.spoke)
+            process.exitCode = 1;
+    }
+    catch (err) {
+        log(`✗ daemon not reachable on port ${port}: ${String(err)}`);
+        process.exitCode = 1;
+    }
+});
 program
     .command('devices')
     .description('Show connected devices (WebSocket, ESP32, Pixoo, Timebox, ADB)')
@@ -780,6 +833,26 @@ program
                     total += devices.length;
                 }
             }
+            else if (d.type === 'card-feed') {
+                // Pull-sync (M6) clients. A battery board is asleep almost always, so
+                // "last pull + observed interval" is its liveness — not a socket. The
+                // interval vs. the advertised cadence is the timer-wake evidence.
+                const clients = (d.clients ?? []);
+                if (clients.length) {
+                    lines.push(`  Card feed    ${clients.length} pull client${clients.length !== 1 ? 's' : ''}`);
+                    for (const c of clients) {
+                        const who = c.board ? `${c.board} @ ${c.client}` : c.client;
+                        const ago = `${Math.round((Date.now() - c.lastPullAt) / 1000)}s ago`;
+                        const cadence = c.lastIntervalSec !== undefined
+                            ? `, last gap ${c.lastIntervalSec}s vs ${c.lastNextPullSec}s asked`
+                            : '';
+                        const honoured = c.pulls > 1
+                            ? ` [${c.cadenceHonouredCount}/${c.pulls - 1} on cadence]`
+                            : '';
+                        lines.push(`                 ${who} — ${c.pulls} pull${c.pulls !== 1 ? 's' : ''}, last ${ago}${cadence}${honoured}`);
+                    }
+                }
+            }
             else if (d.type === 'pixoo') {
                 // Node daemon: { details: [...] }, Swift daemon: { deviceIps: [...] }
                 if (d.details) {
@@ -958,6 +1031,38 @@ program
         // qrcode not available
     }
 });
+program
+    .command('inject-test')
+    .description('Test observed-answer injection into a terminal or app (tuning aid)')
+    .option('--tty <tty>', 'Controlling terminal, e.g. ttys007')
+    .option('--app <name>', 'Hosting app for GUI sessions, e.g. Claude / ChatGPT')
+    .option('--label <label>', 'Option label — app hosts press the matching button first')
+    .option('-i, --index <n>', 'Zero-based option index (Down presses)', '0')
+    .option('--text <text>', 'Type this text and submit it, instead of picking an option')
+    .action(async (opts) => {
+    if (!opts.tty && !opts.app) {
+        console.error('Give --tty <ttysNNN> or --app <Name>. Find a session\'s tty with:');
+        console.error("  ps -eo pid=,tty=,command= | grep -E ' claude| codex'");
+        process.exit(1);
+    }
+    const { injectObservedSelection, injectObservedText } = await import('./observed-inject.js');
+    const index = parseInt(opts.index, 10) || 0;
+    // --text exercises the dictation path (voice → prompt), which submits a
+    // whole line; without it only the option-picking path was testable, and
+    // "the text arrived but nothing was submitted" had no repro.
+    const result = opts.text
+        ? await injectObservedText({ tty: opts.tty, appName: opts.app }, opts.text)
+        : await injectObservedSelection({ tty: opts.tty, appName: opts.app, label: opts.label }, index);
+    if (result.ok) {
+        console.log(opts.text
+            ? `Delivered via ${result.via} (text).`
+            : `Delivered via ${result.via} (index ${index}).`);
+    }
+    else {
+        console.error(`Not delivered: ${result.reason}`);
+        process.exit(2);
+    }
+});
 program
     .command('diag')
     .description('Generate diagnostic dump')
@@ -1056,35 +1161,51 @@ task
     .action(async (opts) => {
     await postTaskClose({ signal: 'manual', outcome: 'abandoned', sessionId: opts.session });
 });
+// ===== Optional Python BLE runtime =====
+const ble = program.command('ble').description('Prepare optional Python support for BLE display devices');
+ble
+    .command('setup')
+    .description('Create the private BLE environment and install its Python dependencies')
+    .action(() => {
+    const runtime = prepareBleRuntime();
+    if (runtime)
+        log(`BLE support ready (${runtime.python}).`);
+});
+ble
+    .command('status')
+    .description('Show whether optional BLE support is ready')
+    .action(() => {
+    const status = getBleRuntimeStatus();
+    if (status.ready) {
+        log(`BLE support ready (${status.python}).`);
+        return;
+    }
+    log(`BLE support is not ready: ${status.reason}. Run \`agentdeck ble setup\`.`);
+    process.exitCode = 1;
+});
 // ===== iDotMatrix commands =====
 const idotmatrix = program.command('idotmatrix').description('Manage iDotMatrix BLE pixel display devices');
 idotmatrix
     .command('scan')
     .description('Discover iDotMatrix devices via BLE')
     .action(async () => {
-    const { dirname } = await import('path');
-    const { fileURLToPath } = await import('url');
-    const { spawn } = await import('child_process');
-    const distPath = dirname(fileURLToPath(import.meta.url));
-    const projectRoot = join(distPath, '..', '..');
-    const venvPython = join(projectRoot, '.venv', 'bin', 'python');
-    const scanScript = join(projectRoot, 'bridge', 'src', 'idotmatrix', 'scan.py');
+    const runtime = prepareBleRuntime();
+    if (!runtime)
+        return;
     log('Scanning for BLE devices (5 seconds)...');
-    const py = spawn(venvPython, [scanScript]);
-    let stdoutData = '';
-    py.stdout.on('data', (data) => {
-        stdoutData += data.toString();
-    });
-    py.on('close', (code) => {
+    try {
+        const { code, stdout } = await runBlePython(runtime.python, [runtime.paths.scripts.idotmatrixScan], true);
         if (code !== 0) {
             log('Failed to run scan script.');
-            process.exit(1);
+            process.exitCode = 1;
+            return;
         }
         try {
-            const devices = JSON.parse(stdoutData.trim());
+            const devices = JSON.parse(stdout.trim());
             if (devices.error) {
                 log(`Scan error: ${devices.error}`);
-                process.exit(1);
+                process.exitCode = 1;
+                return;
             }
             if (!Array.isArray(devices) || devices.length === 0) {
                 log('No BLE devices found.');
@@ -1096,10 +1217,15 @@ idotmatrix
                 log(`${prefix}${d.name} (${d.address})`);
             }
         }
-        catch (e) {
-            log(`Failed to parse scan output: ${stdoutData}`);
+        catch {
+            log(`Failed to parse scan output: ${stdout}`);
+            process.exitCode = 1;
         }
-    });
+    }
+    catch (err) {
+        log(`Failed to start BLE scan: ${err instanceof Error ? err.message : String(err)}`);
+        process.exitCode = 1;
+    }
 });
 idotmatrix
     .command('add <address>')
@@ -1150,9 +1276,6 @@ idotmatrix
     .option('-a, --address <address>', 'BLE Address (defaults to first configured device)')
     .action(async (valueStr, opts) => {
     const { loadIDotMatrixDevices } = await import('./idotmatrix/idotmatrix-settings.js');
-    const { dirname } = await import('path');
-    const { fileURLToPath } = await import('url');
-    const { spawn } = await import('child_process');
     const value = parseInt(valueStr, 10);
     if (isNaN(value) || value < 5 || value > 100) {
         log('Brightness value must be between 5 and 100.');
@@ -1167,22 +1290,30 @@ idotmatrix
         }
         targetAddress = devices[0].address;
     }
-    const distPath = dirname(fileURLToPath(import.meta.url));
-    const projectRoot = join(distPath, '..', '..');
-    const venvPython = join(projectRoot, '.venv', 'bin', 'python');
-    const brightnessScript = join(projectRoot, 'bridge', 'src', 'idotmatrix', 'brightness.py');
+    const runtime = prepareBleRuntime();
+    if (!runtime)
+        return;
     log(`Setting brightness of ${targetAddress} to ${value}%...`);
-    const py = spawn(venvPython, [brightnessScript, '-a', targetAddress, '-b', String(value)], {
-        stdio: 'inherit'
-    });
-    py.on('close', (code) => {
+    try {
+        const { code } = await runBlePython(runtime.python, [
+            runtime.paths.scripts.idotmatrixBrightness,
+            '-a',
+            targetAddress,
+            '-b',
+            String(value),
+        ]);
         if (code === 0) {
             log('Brightness updated successfully.');
         }
         else {
             log(`Failed to update brightness, process exited with code ${code}`);
+            process.exitCode = code ?? 1;
         }
-    });
+    }
+    catch (err) {
+        log(`Failed to start brightness command: ${err instanceof Error ? err.message : String(err)}`);
+        process.exitCode = 1;
+    }
 });
 idotmatrix
     .command('sync [address]')
@@ -1193,9 +1324,6 @@ idotmatrix
     .action(async (addressOpt, opts) => {
     const { loadIDotMatrixDevices } = await import('./idotmatrix/idotmatrix-settings.js');
     const { readDaemonInfo, findDaemonPort } = await import('./session-registry.js');
-    const { dirname } = await import('path');
-    const { fileURLToPath } = await import('url');
-    const { spawn } = await import('child_process');
     let targetAddress = addressOpt;
     let defaultBrightness = 100;
     const devices = loadIDotMatrixDevices();
@@ -1221,17 +1349,30 @@ idotmatrix
         ? parseInt(opts.port, 10)
         : (info?.httpPort ?? info?.port ?? findDaemonPort() ?? BRIDGE_WS_PORT);
     const url = `http://127.0.0.1:${port}`;
-    const distPath = dirname(fileURLToPath(import.meta.url));
-    const projectRoot = join(distPath, '..', '..');
-    const venvPython = join(projectRoot, '.venv', 'bin', 'python');
-    const syncScript = join(projectRoot, 'bridge', 'src', 'idotmatrix', 'sync.py');
+    const runtime = prepareBleRuntime();
+    if (!runtime)
+        return;
     log(`Starting BLE sync client linking to bridge at ${url} (brightness ${brightness}%, boost ${boost}x)...`);
-    const py = spawn(venvPython, [syncScript, '-a', targetAddress, '-u', url, '-b', String(brightness), '--boost', String(boost)], {
-        stdio: 'inherit'
-    });
-    py.on('close', (code) => {
+    try {
+        const { code } = await runBlePython(runtime.python, [
+            runtime.paths.scripts.idotmatrixSync,
+            '-a',
+            targetAddress,
+            '-u',
+            url,
+            '-b',
+            String(brightness),
+            '--boost',
+            String(boost),
+        ]);
         log(`Sync process exited with code ${code}`);
-    });
+        if (code !== 0)
+            process.exitCode = code ?? 1;
+    }
+    catch (err) {
+        log(`Failed to start BLE sync: ${err instanceof Error ? err.message : String(err)}`);
+        process.exitCode = 1;
+    }
 });
 // ===== Divoom Timebox Mini Light commands =====
 const timebox = program.command('timebox').description('Manage Divoom Timebox Mini devices (Bluetooth LE)');
@@ -1239,22 +1380,22 @@ timebox
     .command('scan')
     .description('Discover BLE TimeBox-mini-light peripherals')
     .action(async () => {
-    const paths = resolveTimeboxSyncPaths();
+    const runtime = prepareBleRuntime();
+    if (!runtime)
+        return;
     log('Scanning for BLE devices (5 seconds)...');
-    const py = spawn(paths.python, [paths.scanScript]);
-    let stdoutData = '';
-    py.stdout.on('data', (data) => {
-        stdoutData += data.toString();
-    });
-    py.on('close', (code) => {
+    try {
+        const { code, stdout } = await runBlePython(runtime.python, [runtime.paths.scripts.timeboxScan], true);
         if (code !== 0) {
-            log('BLE scan failed (is bleak installed in .venv?).');
+            log('BLE scan failed.');
+            process.exitCode = 1;
             return;
         }
         try {
-            const devices = JSON.parse(stdoutData.trim());
+            const devices = JSON.parse(stdout.trim());
             if (devices.error) {
                 log(`BLE scan error: ${devices.error}`);
+                process.exitCode = 1;
                 return;
             }
             if (!Array.isArray(devices) || devices.length === 0) {
@@ -1270,9 +1411,14 @@ timebox
             log('\nAdd the starred BLE device with: agentdeck timebox add <address>');
         }
         catch {
-            log(`Failed to parse BLE scan output: ${stdoutData}`);
+            log(`Failed to parse BLE scan output: ${stdout}`);
+            process.exitCode = 1;
         }
-    });
+    }
+    catch (err) {
+        log(`Failed to start BLE scan: ${err instanceof Error ? err.message : String(err)}`);
+        process.exitCode = 1;
+    }
 });
 timebox
     .command('add <address>')
@@ -1349,11 +1495,22 @@ async function runTimeboxSync(targetOpt, opts, once) {
         ? parseInt(opts.bridgePort, 10)
         : (info?.httpPort ?? info?.port ?? findDaemonPort() ?? BRIDGE_WS_PORT);
     const url = `http://127.0.0.1:${bridgePort}`;
-    const paths = resolveTimeboxSyncPaths();
-    const args = [paths.bleScript, '--address', id, '--url', url, '--brightness', String(brightness), ...(once ? ['--once'] : [])];
+    const runtime = prepareBleRuntime();
+    if (!runtime)
+        return;
+    const args = [
+        runtime.paths.scripts.timeboxSync,
+        '--address',
+        id,
+        '--url',
+        url,
+        '--brightness',
+        String(brightness),
+        ...(once ? ['--once'] : []),
+    ];
     log(`${once ? 'Sending one Timebox frame' : 'Starting Timebox sync'} via BLE ${id} from ${url} (brightness ${brightness}%)...`);
-    const py = spawn(paths.python, args, { stdio: 'inherit' });
-    py.on('close', (code) => {
+    try {
+        const { code } = await runBlePython(runtime.python, args);
         if (once) {
             if (code === 0) {
                 log('Timebox test frame sent.');
@@ -1365,8 +1522,14 @@ async function runTimeboxSync(targetOpt, opts, once) {
         }
         else {
             log(`Timebox sync process exited with code ${code}`);
+            if (code !== 0)
+                process.exitCode = code ?? 1;
         }
-    });
+    }
+    catch (err) {
+        log(`Failed to start Timebox BLE command: ${err instanceof Error ? err.message : String(err)}`);
+        process.exitCode = 1;
+    }
 }
 timebox
     .command('test [target]')