@agentdeck/bridge 0.1.0 → 0.2.0

package/dist/index.js

@@ -1,30 +1,48 @@
-#!/usr/bin/env node
-import { Command } from 'commander';
-import { UsageTracker } from './usage-tracker.js';
-import { StateMachine } from './state-machine.js';
-import { WsServer } from './ws-server.js';
+/**
+ * AgentDeck Bridge — session entry point.
+ *
+ * Exports `startSession()` called by cli.ts.
+ * Uses BridgeCore for shared infrastructure.
+ */
+import { BridgeCore } from './bridge-core.js';
+import { initApme } from './apme/index.js';
+import { readLastTurn as readClaudeTranscriptLastTurn } from './apme/claude-transcript-reader.js';
+import { claudeHookToSpans } from './apme/adapters/claude-hook.js';
+import { claudePtyParserEventToSpans, claudePtyResponseToSpan } from './apme/adapters/claude-pty.js';
+import { timelineEntryToSpans } from './apme/adapters/timeline.js';
+import { spanNameForKind } from '@agentdeck/shared';
+import { randomUUID } from 'crypto';
 import { VoiceManager } from './voice.js';
 import { checkDependencies } from './check-deps.js';
-import { enableDebugLog, debug } from './logger.js';
+import { enableDebugLog, log, debug, setPtyMode } from './logger.js';
 import { EventJournal } from './event-journal.js';
 import { PtyRingBuffer } from './pty-ringbuffer.js';
 import { createDiagDump } from './diag-analyzer.js';
-import { createAdapter } from './adapters/index.js';
-import { ClaudeCodeAdapter } from './adapters/claude-code.js';
-import { BRIDGE_WS_PORT, State, } from './types.js';
-import { execSync } from 'child_process';
-import { readFileSync, writeFileSync, existsSync } from 'fs';
-import { resolve, dirname, join } from 'path';
+import { createAdapter, ClaudeCodeAdapter, CodexCliAdapter, OpenCodeAdapter } from './adapters/index.js';
+import { MonitorAdapter } from './adapters/monitor.js';
+import { UtilityProxy } from './utility-proxy.js';
+import { BridgeLogStream } from './log-stream.js';
+import { extractTopicHint, summarizeResponse } from './timeline-summarizer.js';
+import { cleanDetailText, cleanRawText } from '@agentdeck/shared';
+import { VoiceAssistantManager } from './voice-assistant.js';
+import { TerminalStatus } from './terminal-status.js';
+import { readFileSync } from 'fs';
+import { resolve, dirname } from 'path';
 import { fileURLToPath } from 'url';
-import { homedir } from 'os';
-import { randomUUID } from 'crypto';
-import { register as registerSession, deregister as deregisterSession, listActive as listActiveSessions, findAvailablePort, detectTmuxSession, } from './session-registry.js';
-import { fetchUsageFromApi } from './usage-api.js';
-import { advertiseBridge } from './mdns.js';
-import { getOrCreateToken, getWsUrl } from './auth.js';
+import { execSync } from 'child_process';
+import { listActive as listActiveSessions, findAvailablePort, detectTmuxSession, findDaemonPortAsync, } from './session-registry.js';
+import { resolveProjectName } from './utils/project-name.js';
+import { DaemonWsClient } from './daemon-ws-client.js';
+import { getLanIp } from '@agentdeck/shared';
+import { initModules, stopModules, createDefaultModules, } from './modules/index.js';
+import { onESP32Message, sendWifiProvisionToAll, } from './esp32-serial.js';
+import { loadWifiConfig } from './wifi-config.js';
+import { getAdbDeviceCount } from './adb-reverse.js';
+import { esp32ConnectionCount, getESP32Ports } from './esp32-serial.js';
+import { getPixooDeviceDetails, getLastFrame, renderPreviewFrame } from './pixoo/pixoo-bridge.js';
+import { BRIDGE_WS_PORT, State, } from './types.js';
 function loadTemplates() {
     try {
-        // Try multiple locations: relative to bridge, project root, etc.
         const candidates = [
             resolve(dirname(fileURLToPath(import.meta.url)), '../../config/prompt-templates.json'),
             resolve(process.cwd(), 'config/prompt-templates.json'),
@@ -33,181 +51,76 @@ function loadTemplates() {
             try {
                 const data = JSON.parse(readFileSync(p, 'utf-8'));
                 if (Array.isArray(data?.templates)) {
-                    debug('sdc', `Loaded ${data.templates.length} templates from ${p}`);
+                    debug('agentdeck', `Loaded ${data.templates.length} templates from ${p}`);
                     return data.templates;
                 }
             }
-            catch {
-                // try next
-            }
+            catch { /* try next */ }
         }
     }
-    catch {
-        // ignore
-    }
+    catch { /* ignore */ }
     return [];
 }
 const promptTemplates = loadTemplates();
-// All bridge logging goes to stderr so it doesn't interfere with PTY stdout
-function log(msg) {
-    process.stderr.write(msg + '\n');
-}
-const program = new Command();
-program
-    .name('sdc')
-    .description('AgentDeck bridge server')
-    .version('0.1.0');
-// Default command: start bridge + spawn claude + attach terminal
-program
-    .command('start', { isDefault: true })
-    .description('Start bridge server and spawn agent CLI')
-    .option('-p, --port <port>', 'Bridge server port', String(BRIDGE_WS_PORT))
-    .option('-c, --command <cmd>', 'Command to spawn', 'claude')
-    .option('-a, --agent <type>', 'Agent type (claude-code|openclaw)', 'claude-code')
-    .option('-g, --gateway <url>', 'OpenClaw gateway WebSocket URL')
-    .option('-d, --debug', 'Enable debug logging to /tmp/sdc-debug.log')
-    .action(async (opts) => {
-    if (opts.debug) {
-        enableDebugLog();
-        log('[sdc] Debug logging enabled → /tmp/sdc-debug.log');
-    }
-    const port = parseInt(opts.port, 10);
-    const agentType = opts.agent;
-    await startBridge(port, opts.command, agentType, opts.gateway);
-});
-program
-    .command('attach')
-    .description('Attach to an existing bridge session')
-    .option('-p, --port <port>', 'Bridge server port', String(BRIDGE_WS_PORT))
-    .action(async (opts) => {
-    const port = parseInt(opts.port, 10);
-    log(`Attaching to bridge on port ${port}...`);
-    log('Attach mode not yet implemented');
-    process.exit(1);
-});
-program
-    .command('status')
-    .description('Show bridge and session status')
-    .option('-p, --port <port>', 'Bridge server port', String(BRIDGE_WS_PORT))
-    .action(async (opts) => {
-    const port = parseInt(opts.port, 10);
-    try {
-        const res = await fetch(`http://127.0.0.1:${port}/health`);
-        const data = await res.json();
-        log(`Bridge status: ${JSON.stringify(data, null, 2)}`);
-    }
-    catch {
-        log('Bridge is not running');
-        process.exit(1);
-    }
-});
-program
-    .command('stop')
-    .description('Stop the bridge and session')
-    .option('-p, --port <port>', 'Bridge server port', String(BRIDGE_WS_PORT))
-    .action(async (opts) => {
-    const port = parseInt(opts.port, 10);
-    try {
-        await fetch(`http://127.0.0.1:${port}/hooks/shutdown`, { method: 'POST' });
-        log('Shutdown signal sent');
-    }
-    catch {
-        log('Bridge is not running');
-    }
-});
-program
-    .command('qr')
-    .description('Show pairing URL and QR code for remote clients')
-    .option('-p, --port <port>', 'Bridge server port (auto-detects from running sessions)')
-    .action(async (opts) => {
-    const { getOrCreateToken, getWsUrl } = await import('./auth.js');
-    const { listActive } = await import('./session-registry.js');
-    // Determine port: explicit flag > running session > default
-    let port;
-    if (opts.port) {
-        port = parseInt(opts.port, 10);
+// log(), logError(), debug() imported from logger.ts
+// log() is suppressed after setPtyMode(true) — startup messages still shown
+/** Extract tool input for timeline display */
+function formatToolInputForTimeline(toolName, input) {
+    if (!input)
+        return null;
+    const keyMap = {
+        Bash: 'command', Read: 'file_path', Write: 'file_path', Edit: 'file_path',
+        Glob: 'pattern', Grep: 'pattern', WebFetch: 'url', WebSearch: 'query', Task: 'prompt',
+    };
+    const key = keyMap[toolName];
+    if (key && typeof input[key] === 'string') {
+        const line = input[key].split('\n')[0];
+        return line.length > 120 ? line.slice(0, 119) + '\u2026' : line;
     }
-    else {
-        const sessions = listActive();
-        if (sessions.length > 0) {
-            port = sessions[0].port;
-            if (sessions.length > 1) {
-                log(`Multiple sessions running. Using port ${port} (${sessions[0].projectName}).`);
-                log(`Specify --port to target a different session.`);
-            }
-        }
-        else {
-            port = BRIDGE_WS_PORT;
+    for (const v of Object.values(input)) {
+        if (typeof v === 'string' && v.length > 0 && v.length < 200) {
+            const line = v.split('\n')[0];
+            return line.length > 120 ? line.slice(0, 119) + '\u2026' : line;
         }
     }
-    getOrCreateToken();
-    const url = getWsUrl(port);
-    log(`\nPairing URL:\n  ${url}\n`);
-    // Generate text QR in terminal using qrcode lib (if available)
-    try {
-        const { default: QRCode } = await import('qrcode');
-        const text = await QRCode.toString(url, { type: 'terminal', small: true });
-        log(text);
-    }
-    catch {
-        // qrcode not available in bridge — URL is sufficient
+    return null;
+}
+// ===== startSession =====
+export async function startSession(opts) {
+    const agentType = opts.agentType;
+    if (opts.debug) {
+        enableDebugLog();
+        log('Debug logging enabled');
     }
-});
-program
-    .command('diag')
-    .description('Generate diagnostic dump and optionally run AI analysis')
-    .option('-p, --port <port>', 'Bridge server port', String(BRIDGE_WS_PORT))
-    .option('-a, --analyze', 'Run AI analysis on the dump')
-    .option('-t, --tail <lines>', 'Number of journal entries to include', '200')
-    .action(async (opts) => {
-    const port = parseInt(opts.port, 10);
-    const tail = parseInt(opts.tail, 10);
-    try {
-        const res = await fetch(`http://127.0.0.1:${port}/diag?tail=${tail}`);
-        if (!res.ok) {
-            log(`Diag endpoint error: ${res.status} ${res.statusText}`);
+    // Dependency check (skip for monitor — no PTY needed)
+    if (agentType !== 'monitor') {
+        const deps = checkDependencies(agentType);
+        if (!deps.ok)
             process.exit(1);
-        }
-        const dump = await res.json();
-        // Save dump to disk
-        const { saveDiagDump, analyzeDump } = await import('./diag-analyzer.js');
-        const dumpPath = saveDiagDump(dump);
-        log(`Diagnostic dump saved: ${dumpPath}`);
-        if (opts.analyze) {
-            log('Running AI analysis...');
-            const analysis = await analyzeDump(dumpPath);
-            if (analysis) {
-                log('\n--- AI Analysis ---\n');
-                log(analysis);
-            }
-            else {
-                log('AI analysis failed (is `claude` CLI available?)');
+        for (const w of deps.warnings)
+            log(`WARNING: ${w}`);
+        // Version compatibility check (Claude Code only — uses npm registry + compatibleClaudeCode range)
+        if (agentType === 'claude-code' && !opts.noUpdateCheck) {
+            const { checkVersionCompatibility } = await import('./version-check.js');
+            const versionResult = await checkVersionCompatibility({
+                skipCheck: false,
+                claudeCodeVersion: deps.agentVersion,
+            });
+            for (const w of versionResult.warnings)
+                log(`WARNING: ${w}`);
+            if (versionResult.restartNeeded) {
+                log('AgentDeck updated. Please restart.');
+                process.exit(0);
             }
         }
     }
-    catch {
-        log('Bridge is not running. Cannot generate live diagnostic dump.');
-        process.exit(1);
-    }
-});
-program.parse();
-async function startBridge(port, command, agentType, gatewayUrl) {
-    const deps = checkDependencies();
-    if (!deps.ok) {
-        process.exit(1);
-    }
-    for (const w of deps.warnings) {
-        log(`[sdc] WARNING: ${w}`);
+    // Multi-session port allocation — session bridges reserve 9120 for the daemon
+    const requestedPort = opts.port ?? BRIDGE_WS_PORT;
+    let port = requestedPort === BRIDGE_WS_PORT ? await findAvailablePort({ reserveDaemon: true }) : requestedPort;
+    // Auto-migrate hooks (Claude Code mode only)
+    if (agentType === 'claude-code') {
+        migrateHooksIfNeeded();
     }
-    // Multi-session: find available port if default is taken
-    const actualPort = port === BRIDGE_WS_PORT ? await findAvailablePort() : port;
-    if (actualPort !== port) {
-        log(`[sdc] Port ${port} in use, using ${actualPort}`);
-    }
-    port = actualPort;
-    // Auto-migrate old-format hooks (hardcoded port → env var)
-    migrateHooksIfNeeded();
-    const sessionId = randomUUID();
     const tmuxSession = detectTmuxSession();
     const parentTty = (() => {
         try {
@@ -217,580 +130,1410 @@ async function startBridge(port, command, agentType, gatewayUrl) {
             return undefined;
         }
     })();
-    const projectName = process.cwd().split('/').pop() || 'unknown';
-    // Warn if same project is already running in another session
+    const projectName = resolveProjectName();
+    // Warn if same project already has a non-daemon session running
     const existingSessions = listActiveSessions();
-    const sameProject = existingSessions.filter((s) => s.projectName === projectName);
+    const sameProject = existingSessions.filter((s) => s.projectName === projectName && s.agentType !== 'daemon');
     if (sameProject.length > 0) {
         const ports = sameProject.map((s) => s.port).join(', ');
-        log(`[sdc] ⚠ Session "${projectName}" already running on port ${ports}. Starting new session on port ${port}.`);
+        log(`\u26A0 Session "${projectName}" already running on port ${ports}. Starting new session on port ${port}.`);
+    }
+    log(`Starting AgentDeck bridge on port ${port} (agent: ${agentType})...`);
+    // ===== Create adapter =====
+    const adapter = createAdapter(agentType, opts.gatewayUrl);
+    // ===== Start adapter (creates HTTP server, spawns process) =====
+    try {
+        await adapter.start({ port, command: opts.command, gatewayUrl: opts.gatewayUrl });
+        log(`Adapter started: ${adapter.capabilities.displayName}`);
+    }
+    catch (err) {
+        log(`Failed to start adapter: ${err}`);
+        process.exit(1);
+    }
+    // Suppress stderr logging once PTY is active (PTY adapters share terminal)
+    // Non-PTY adapters (Monitor, OpenClaw) keep logs visible
+    if (adapter.capabilities.hasTerminal) {
+        setPtyMode(true);
+    }
+    // ===== BridgeCore =====
+    const core = new BridgeCore({
+        port,
+        projectName,
+        httpServer: adapter.getHttpServer(),
+    });
+    // ===== APME (Agent Performance Monitoring & Evaluation) =====
+    // Optional: degrades to no-op if better-sqlite3 isn't installed.
+    const apme = await initApme();
+    if (apme) {
+        core.setApme(apme, process.cwd());
+        log('APME enabled — runs will be logged to ~/.agentdeck/apme.sqlite');
+        // Wire APME eval results → timeline entries (session bridge mode).
+        // Daemon has its own richer wiring; this covers standalone session bridges.
+        apme.runner.onResult(({ runId, turnId }) => {
+            if (turnId) {
+                // Turn-level eval completed
+                const run = apme.store.getRun(runId);
+                if (!run)
+                    return;
+                const turnEvals = apme.store.listEvalsForTurn(turnId);
+                const overall = turnEvals.find(e => e.metric === 'overall');
+                if (!overall)
+                    return;
+                const pct = Math.round(overall.score * 100);
+                const axes = turnEvals.filter(e => e.metric !== 'overall');
+                const axisStr = axes.map(e => `${e.metric}=${Math.round(e.score * 100)}%`).join(' ');
+                core.bridgeTimeline.addEntry({
+                    ts: Date.now(), type: 'eval_result',
+                    raw: `★ turn ${pct}% [${run.taskCategory ?? '?'}]`,
+                    detail: axisStr || `Turn eval · ${run.taskPrompt?.slice(0, 80) ?? ''}`,
+                    agentType: run.agentType,
+                });
+            }
+        });
     }
-    log(`[sdc] Starting AgentDeck bridge on port ${port} (agent: ${agentType})...`);
-    // API usage data (fetched from Anthropic, not from PTY)
-    let cachedApiUsage = null;
-    let lastApiFetchTime = 0;
-    // Model catalog (OpenClaw: from CLI)
-    let cachedModelCatalog = null;
-    // 1. Initialize components
-    const adapter = createAdapter(agentType, gatewayUrl);
-    const usageTracker = new UsageTracker();
-    const stateMachine = new StateMachine(usageTracker);
+    // ===== Session-specific components =====
     const voiceManager = new VoiceManager();
+    const utilityProxy = new UtilityProxy();
     const journal = new EventJournal();
     const ptyRingBuffer = new PtyRingBuffer();
-    // 1b. Connect to singleton whisper-server (non-blocking — don't delay bridge startup)
+    let cachedSlotMap = null;
+    let previousBridgeState = State.IDLE;
+    // Timeline log stream (OpenClaw/Claude Code)
+    const bridgeLogStream = agentType === 'openclaw' ? new BridgeLogStream() : null;
+    // Voice server (non-blocking)
     voiceManager.connectToServer().catch((err) => {
-        debug('sdc', `whisper-server connection failed (will use whisper-cli): ${err}`);
+        debug('agentdeck', `whisper-server connection failed: ${err}`);
     });
-    // 2. Start adapter (creates HTTP server, spawns agent process)
-    try {
-        await adapter.start({ port, command, gatewayUrl });
-        log(`[sdc] Adapter started: ${adapter.capabilities.displayName}`);
-    }
-    catch (err) {
-        log(`[sdc] Failed to start adapter: ${err}`);
-        process.exit(1);
+    // Voice assistant (wake word → STT → LLM → TTS)
+    let voiceAssistant = null;
+    if (opts.wakeWord) {
+        voiceAssistant = new VoiceAssistantManager({
+            sendPrompt: (text) => {
+                if (adapter.handleCommand({ type: 'send_prompt', text })) {
+                    core.stateMachine.handleUserAction('send_prompt');
+                }
+                else {
+                    // Fallback for PTY-based adapters
+                    adapter.writeInput(text);
+                    setTimeout(() => adapter.writeInput('\r'), 50);
+                    core.stateMachine.handleUserAction('send_prompt');
+                }
+            },
+            transcribeFile: (filePath) => voiceManager.transcribeFile(filePath),
+            isPttRecording: () => voiceManager.isRecording(),
+        });
+        // Wire state broadcasts
+        voiceAssistant.on('state_change', (info) => {
+            // Broadcast dedicated event (for plugin FORWARDED_EVENTS)
+            core.broadcast({
+                type: 'voice_assistant_state',
+                state: info.state,
+                deviceId: 'mac-builtin',
+                text: info.text,
+                responseText: info.responseText,
+            });
+            // Piggyback on state_update so all clients get it automatically
+            core.updateVoiceAssistantState(info.state, info.text, info.responseText);
+        });
+        voiceAssistant.on('wake_word_detected', (info) => {
+            core.broadcast({
+                type: 'wake_word_detected',
+                deviceId: info.deviceId,
+                timestamp: info.timestamp,
+            });
+        });
+        // Start (non-blocking)
+        voiceAssistant.start().then((ok) => {
+            if (ok)
+                log('Wake word voice assistant active ("오픈클로")');
+            else
+                log('Wake word not available (missing model or access key)');
+        }).catch((err) => {
+            log(`Wake word start failed: ${err}`);
+        });
     }
-    // 2b. mDNS service advertising (LAN discovery for Android/browser clients)
-    const mdnsCleanup = advertiseBridge(port, projectName, agentType);
-    // 2c. Auth token initialization + QR URL for pairing
-    getOrCreateToken(); // Ensure token exists on disk
-    const wsUrl = getWsUrl(port);
-    log(`[sdc] Auth token ready. Pairing URL: ${wsUrl}`);
-    // 2d. SSE broadcasting helper (only for ClaudeCode adapter which has HookServer)
+    // SSE broadcast (ClaudeCodeAdapter / MonitorAdapter have HookServer)
     let hookServer = null;
     if (adapter instanceof ClaudeCodeAdapter) {
-        hookServer = adapter.hookServer;
+        hookServer = adapter.getClaudeHookServer();
+        hookServer.setMeta({ agentType, projectName });
+        hookServer.setVoiceManager(voiceManager);
+        hookServer.onApiUsage(() => ({ usage: core.cachedApiUsage, fetchedAt: core.lastApiFetchTime }));
+        hookServer.pairingToken = core.authToken;
+    }
+    else if (adapter instanceof CodexCliAdapter) {
+        hookServer = adapter.getCodexHookServer();
+        hookServer.setMeta({ agentType, projectName });
+        hookServer.setVoiceManager(voiceManager);
+        hookServer.pairingToken = core.authToken;
+    }
+    else if (adapter instanceof OpenCodeAdapter) {
+        hookServer = adapter.getHookServer();
         hookServer.setMeta({ agentType, projectName });
+        hookServer.setVoiceManager(voiceManager);
+        hookServer.pairingToken = core.authToken;
+    }
+    else if (adapter instanceof MonitorAdapter) {
+        hookServer = adapter.getHookServer();
+        hookServer.setMeta({ agentType, projectName });
+        hookServer.setVoiceManager(voiceManager);
+        hookServer.onApiUsage(() => ({ usage: core.cachedApiUsage, fetchedAt: core.lastApiFetchTime }));
+        hookServer.pairingToken = core.authToken;
     }
     const broadcastSse = (event) => hookServer?.broadcastSse(event);
-    // 3. Attach WebSocket server to adapter's HTTP server
-    const wsServer = new WsServer(adapter.getHttpServer());
-    log(`[sdc] WebSocket server ready on port ${port}`);
-    // 3b. Register diag handler
-    adapter.onDiag((tail) => createDiagDump(stateMachine, wsServer, journal, ptyRingBuffer, tail));
-    // 3c. Register raw agent data handler for diagnostics
+    core.setSseBroadcast(broadcastSse);
+    // ===== Display monitor =====
+    core.wireDisplayMonitor();
+    // ===== Terminal status (tab title + user vars) =====
+    const postit = opts.postit !== false && adapter.capabilities.hasTerminal
+        ? new TerminalStatus(process.stdout)
+        : null;
+    // Register process handlers early (before module init) so uncaughtException
+    // handler is active before mDNS module starts — suppresses "already in use" errors
+    core.registerProcessHandlers('agentdeck');
+    // Override unhandledRejection to not shutdown (index.ts original behavior)
+    process.removeAllListeners('unhandledRejection');
+    process.on('unhandledRejection', (reason) => {
+        debug('Bridge', `Unhandled rejection: ${reason}`);
+        debug('Bridge', `Unhandled rejection stack: ${reason instanceof Error ? reason.stack : reason}`);
+        // Don't shutdown — non-fatal
+    });
+    // ===== Device modules =====
+    const moduleConfigs = opts.modules ?? {
+        mdns: false, // daemon-only — session bridges never advertise mDNS
+        adb: 'auto',
+        serial: false, // daemon-only — session bridges never talk to ESP32
+        pixoo: false, // daemon-only — session bridges never talk to Pixoo
+    };
+    const deviceModules = createDefaultModules(agentType);
+    // Set up ESP32 state provider before module init
+    let lastStateEvent = null;
+    const serialModule = deviceModules.find(m => m.name === 'serial');
+    if (serialModule) {
+        serialModule.setStateProvider(() => lastStateEvent);
+        serialModule.setUsageProvider(() => core.buildUsage());
+        serialModule.setInitialStateProvider(() => {
+            const events = [];
+            if (lastStateEvent)
+                events.push(lastStateEvent);
+            events.push(core.buildUsage());
+            events.push({ type: 'display_state', displayOn: core.displayMonitor.isDisplayOn() });
+            core.broadcastSessionsList().catch(() => { });
+            return events;
+        });
+        // Include ESP32 serial connections in client count for polling guards
+        core.setExternalClientCountProvider(() => esp32ConnectionCount());
+    }
+    const startedModules = await initModules(deviceModules, moduleConfigs, {
+        port,
+        authToken: core.authToken,
+        projectName,
+        wsServer: core.wsServer,
+        broadcastSse,
+    });
+    // WiFi auto-provisioning for ESP32
+    const wifiConfig = loadWifiConfig();
+    if (wifiConfig?.autoProvision) {
+        const lanIp = getLanIp();
+        onESP32Message((portPath, msg) => {
+            if (msg.type === 'device_info' && !msg.wifiConnected) {
+                sendWifiProvisionToAll({
+                    type: 'wifi_provision',
+                    ssid: wifiConfig.ssid,
+                    password: wifiConfig.password,
+                    bridgeIp: lanIp,
+                    bridgePort: port,
+                    authToken: core.authToken,
+                });
+                log(`WiFi provision sent to ESP32 on ${portPath}`);
+            }
+            else if (msg.type === 'wifi_provision_ack') {
+                log(msg.success ? `ESP32 WiFi connected: ${msg.ip} \u2713` : `ESP32 WiFi failed: ${msg.error || 'unknown'}`);
+            }
+        });
+    }
+    log(`WebSocket server ready on port ${port}`);
+    log(`Auth token ready. Pairing URL: ${core.wsUrl}`);
+    // Device info getter for GET /devices
+    hookServer?.setDeviceInfoGetter(() => ({
+        devices: [
+            { type: 'websocket', count: core.wsServer.getClientCount() },
+            { type: 'esp32', count: esp32ConnectionCount(), ports: getESP32Ports() },
+            { type: 'pixoo', details: getPixooDeviceDetails() },
+            { type: 'adb', count: getAdbDeviceCount() },
+        ],
+    }));
+    // Pixoo live preview frame getter for GET /pixoo/frame
+    hookServer?.setPixooFrameGetter(() => getLastFrame() ?? renderPreviewFrame());
+    // ===== Diagnostics =====
+    adapter.onDiag((tail) => createDiagDump(core.stateMachine, core.wsServer, journal, ptyRingBuffer, tail));
     adapter.onRawData((data) => {
         ptyRingBuffer.push(data);
         const preview = data.replace(/[\x00-\x1f\x1b]/g, '').slice(0, 200);
         journal.write('pty_chunk', 'pty', { size: data.length, preview });
     });
-    // 3d. Handle VoiceManager errors (prevent uncaught exception crash)
+    // Voice errors
     voiceManager.on('error', (err) => {
-        debug('sdc', `Voice error: ${err.message}`);
-        wsServer.broadcast({ type: 'voice_state', state: 'error', error: err.message });
+        debug('agentdeck', `Voice error: ${err.message}`);
+        core.wsServer.broadcast({ type: 'voice_state', state: 'error', error: err.message });
     });
-    // 4. Wire adapter events → StateMachine + journal
+    // ===== Timeline wiring =====
+    core.wireTimeline(bridgeLogStream ?? undefined);
+    // Claude Code hook events → timeline entries
+    if (agentType === 'claude-code') {
+        wireClaudeCodeTimeline(adapter, core, journal, ptyRingBuffer);
+    }
+    // APME wiring for non-Claude-Code agents (OpenCode, Codex, OpenClaw)
+    if (apme && agentType !== 'claude-code' && agentType !== 'monitor') {
+        wireAgentApme(adapter, agentType, apme, core, ptyRingBuffer);
+    }
+    // ===== Wire adapter events → StateMachine + journal =====
+    // APME: PTY response fallback — captures response from terminal output when
+    // the Stop hook doesn't fire (unreliable in Claude Code v2.1+).
+    // Three capture paths handle the hook/PTY race condition:
+    //   Path A: idle fires, turn exists → apply directly
+    //   Path B: idle fires before hook (fast responses) → buffer, apply on hook arrival
+    //   Path C: UserPromptSubmit closes prev turn → apply PTY text to closed turn
+    let pendingPtyResponse = null;
     adapter.on('event', (evt) => {
         switch (evt.source) {
             case 'hook':
                 journal.write('hook', 'hook', { event: evt.event, data: evt.data });
+                // APME ingestion via the shared TelemetrySpan envelope. The Claude
+                // hook adapter handles `/clear` (emits a `task_boundary` span) so
+                // there's no separate splitRun branch here. Path B/C below preserve
+                // the existing PTY-vs-hook race coordination — that's about timing,
+                // not ingestion semantics, so it stays in this file.
+                if (apme) {
+                    const ctx = makeApmeAdapterCtx(apme, core.sessionId, agentType);
+                    for (const span of claudeHookToSpans(ctx, evt.event, evt.data ?? {})) {
+                        apme.collector.ingestSpan(core.sessionId, span);
+                    }
+                }
+                if (evt.event === 'UserPromptSubmit' && apme) {
+                    // Path B: apply buffered response to the NEW turn (idle fired before hook)
+                    if (pendingPtyResponse) {
+                        debug('APME', `hook:UPS Path B: applying pending (${pendingPtyResponse.length} chars)`);
+                        const ctx = makeApmeAdapterCtx(apme, core.sessionId, agentType);
+                        const span = claudePtyResponseToSpan(ctx, pendingPtyResponse);
+                        if (span)
+                            apme.collector.ingestSpan(core.sessionId, span);
+                        pendingPtyResponse = null;
+                    }
+                    // Path C: prev turn was just closed by ingestHook — apply pending response
+                    if (pendingPtyResponse) {
+                        debug('APME', `hook:UPS Path C: applying pending to closed turn (${pendingPtyResponse.length} chars)`);
+                        const ctx = makeApmeAdapterCtx(apme, core.sessionId, agentType);
+                        const span = claudePtyResponseToSpan(ctx, pendingPtyResponse, { fallbackToLastClosed: true });
+                        if (span)
+                            apme.collector.ingestSpan(core.sessionId, span);
+                        pendingPtyResponse = null;
+                    }
+                }
+                if (evt.event === 'Stop')
+                    pendingPtyResponse = null; // Stop has cleaner response
                 if (evt.event === 'shutdown') {
                     shutdown();
                     return;
                 }
-                stateMachine.handleHookEvent(evt.event, evt.data);
+                core.stateMachine.handleHookEvent(evt.event, evt.data);
                 break;
             case 'parser':
                 journal.write('parser_emit', 'pty', { event: evt.event, ...evt.data });
-                stateMachine.handleParserEvent(evt.event, evt.data);
+                core.stateMachine.handleParserEvent(evt.event, evt.data);
+                // APME ingestion fallback: PTY parser sees tool use + state changes
+                // even when Claude Code hooks are flaky (memory: feedback_apme_stop_hook).
+                if (apme && evt.event) {
+                    const ctx = makeApmeAdapterCtx(apme, core.sessionId, agentType);
+                    for (const span of claudePtyParserEventToSpans(ctx, evt.event, evt.data ?? {})) {
+                        apme.collector.ingestSpan(core.sessionId, span);
+                    }
+                }
+                // APME: Path A — spinner_stop fires when Claude finishes responding.
+                // Delay 500ms to let response render in PTY, then extract text after ⏺ marker.
+                if (apme && evt.event === 'spinner_stop') {
+                    const sid = core.sessionId;
+                    setTimeout(async () => {
+                        if (!apme)
+                            return;
+                        const tail = ptyRingBuffer.getTail(5000);
+                        // Claude's response starts with ⏺ — extract content after last ⏺ marker.
+                        // Take only meaningful lines (stop at spinner chars ✢✻⏸, prompt ❯, or separator ──).
+                        const marker = tail.lastIndexOf('⏺');
+                        let response = '';
+                        if (marker >= 0) {
+                            const afterMarker = tail.slice(marker + 1).trim();
+                            const lines = afterMarker.split('\n');
+                            const clean = [];
+                            for (const line of lines) {
+                                const trimmed = line.trim();
+                                if (!trimmed)
+                                    continue;
+                                // Stop at UI artifacts: spinner chars (✢✳✶✻✽), plan mode (⏸), prompt (❯), separator (─)
+                                if (/^[✢✳✶✻✽⏸⏵❯─>]/.test(trimmed))
+                                    break;
+                                if (/planmode|plan\s*mode|shift\+tab|accept\s*edits/i.test(trimmed))
+                                    break;
+                                // Status text: "Whirring…", "Finagling…", token count, shortcuts hint
+                                if (/^\S+…(\s|$)/.test(trimmed) && /tokens|shortcuts|\d+[ms]\s/i.test(trimmed))
+                                    break;
+                                if (/\?\s*for\s*shortcuts/.test(trimmed))
+                                    break;
+                                clean.push(trimmed);
+                            }
+                            response = clean.join('\n').trim();
+                        }
+                        debug('APME', `spinner_stop+500ms: tailLen=${tail.length} marker=${marker} respLen=${response.length}`);
+                        if (response.length > 2) {
+                            const turnId = apme.collector.getActiveTurnId(sid);
+                            if (turnId) {
+                                const ctx = makeApmeAdapterCtx(apme, sid, agentType);
+                                const span = claudePtyResponseToSpan(ctx, response);
+                                if (span)
+                                    apme.collector.ingestSpan(sid, span);
+                                pendingPtyResponse = null;
+                                await classifyAndEnqueueTurn(apme, sid);
+                            }
+                            else {
+                                pendingPtyResponse = response;
+                            }
+                        }
+                    }, 500);
+                }
                 break;
             case 'metadata':
                 switch (evt.event) {
-                    case 'cursor_update': {
-                        const idx = evt.data?.cursorIndex ?? 0;
-                        stateMachine.updateCursorIndex(idx, 'pty');
+                    case 'cursor_update':
+                        core.stateMachine.updateCursorIndex(evt.data?.cursorIndex ?? 0, 'pty');
                         break;
-                    }
                     case 'usage_info':
-                        usageTracker.setUsageInfo(evt.data);
-                        // Immediately broadcast updated usage
-                        wsServer.broadcast(buildUsageEvent(stateMachine.getSnapshot(), cachedApiUsage));
+                        core.usageTracker.setUsageInfo(evt.data);
+                        core.broadcastUsage();
+                        apme?.collector.updateUsage(core.sessionId, core.usageTracker.getSnapshot());
                         break;
                     case 'user_prompt': {
                         const text = evt.data?.text;
-                        if (text) {
-                            wsServer.broadcast({ type: 'user_prompt', text });
+                        if (text)
+                            core.broadcast({ type: 'user_prompt', text });
+                        // APME: user_prompt is the PTY-detected prompt — use it to open a turn
+                        // and capture the prompt text (fallback for when hooks don't fire).
+                        if (apme && text) {
+                            apme.collector.ingestHook(core.sessionId, 'UserPromptSubmit', { message: { content: text } });
                         }
                         break;
                     }
                     case 'model_catalog': {
                         const models = evt.data?.models;
                         if (models) {
-                            cachedModelCatalog = models;
-                            debug('sdc', `Model catalog updated: ${models.length} models`);
-                            // Broadcast updated state with model catalog
-                            const snap = stateMachine.getSnapshot();
-                            const stateEvt = {
-                                type: 'state_update',
-                                state: snap.state,
-                                permissionMode: snap.permissionMode,
+                            core.cachedModelCatalog = models;
+                            debug('agentdeck', `Model catalog updated: ${models.length} models`);
+                            const snap = core.stateMachine.getSnapshot();
+                            const stateEvent = core.buildStateEvent({
                                 agentType: adapter.capabilities.type,
-                                modelCatalog: cachedModelCatalog ?? undefined,
-                            };
-                            wsServer.broadcast(stateEvt);
+                                snapshot: snap,
+                            });
+                            core.broadcast(stateEvent);
+                            lastStateEvent = stateEvent;
+                            core.broadcastUsage();
                         }
                         break;
                     }
                 }
                 break;
             case 'activity':
-                stateMachine.onPtyActivity();
+                core.stateMachine.onPtyActivity();
                 break;
             case 'connection': {
                 const connEvt = { type: 'connection', status: evt.status };
-                wsServer.broadcast(connEvt);
-                broadcastSse(connEvt);
+                core.broadcast(connEvt);
+                if (evt.status === 'connected' && bridgeLogStream)
+                    bridgeLogStream.start();
+                else if (evt.status === 'disconnected' && bridgeLogStream)
+                    bridgeLogStream.stop();
+                break;
+            }
+            case 'timeline': {
+                if (evt.upsert) {
+                    core.bridgeTimeline.upsertEntry(evt.entry);
+                }
+                else {
+                    core.bridgeTimeline.addEntry(evt.entry);
+                }
+                if (evt.entry.type === 'tool_request' && bridgeLogStream) {
+                    bridgeLogStream.trackToolRequest(evt.entry.raw);
+                }
                 break;
             }
         }
     });
-    // 4b. Handle adapter exit (agent process died)
-    adapter.on('exit', (_code, _signal) => {
+    // Adapter exit — always shutdown (shutdownInProgress guard prevents double-shutdown)
+    adapter.on('exit', (code, signal) => {
+        log(`Agent process exited (code=${code}, signal=${signal})`);
         shutdown();
     });
-    // 5. Wire StateMachine state changes → WsServer broadcast
-    stateMachine.on('state_changed', (snapshot) => {
+    // Default idle button config
+    const DEFAULT_IDLE_BUTTONS = [
+        { label: 'GO ON', action: 'continue' },
+        { label: 'REVIEW', action: '/review' },
+        { label: 'COMMIT', action: '/commit' },
+        { label: 'CLEAR', action: '/clear' },
+    ];
+    // ===== Internal WS: push state to daemon =====
+    // Port-drift resilient: portProvider is re-invoked on every (re)connect,
+    // so the client follows daemon restarts onto fallback ports and the case
+    // where the session bridge starts before the daemon is up.
+    //
+    // Async provider: on cold start the registry may still be empty (session
+    // bridge raced the daemon) or the active daemon may be writing its
+    // daemon.json into an unreadable dir (App Store group container vs CLI
+    // `~/.agentdeck` split). `findDaemonPortAsync` probes 9120-9139 /health
+    // as a last resort so the session still attaches instead of staying
+    // orphaned.
+    const daemonPortProvider = async () => {
+        const resolved = await findDaemonPortAsync();
+        if (!resolved)
+            return null;
+        return resolved.port !== core.port ? resolved.port : null;
+    };
+    const daemonWsClient = new DaemonWsClient(core.sessionId, core.port, agentType, core.projectName, daemonPortProvider);
+    daemonWsClient.connect(null);
+    core.onShutdown(() => { daemonWsClient.close(); });
+    // ===== State changed → broadcast =====
+    core.stateMachine.on('state_changed', (snapshot) => {
+        postit?.update(snapshot);
+        // Voice assistant: reset timeout on any activity during processing
+        if (snapshot.state === State.PROCESSING && voiceAssistant?.getState() === 'processing') {
+            voiceAssistant.resetResponseTimeout();
+        }
+        // PROCESSING→IDLE: fetch fresh usage + voice assistant TTS
+        const wasActive = previousBridgeState === State.PROCESSING;
+        previousBridgeState = snapshot.state;
+        if (wasActive && snapshot.state === State.IDLE) {
+            if (core.wsServer.getClientCount() > 0 && Date.now() - core.lastApiFetchTime > 10_000) {
+                core.fetchAndUpdateUsage().catch(() => { });
+            }
+            // Voice assistant: if processing a wake-word prompt, speak the response
+            if (voiceAssistant?.getState() === 'processing') {
+                const lastEntry = core.bridgeTimeline.getLastEntry('chat_end');
+                const responseText = lastEntry?.detail;
+                if (responseText) {
+                    voiceAssistant.handleResponse(responseText).catch((err) => {
+                        debug('agentdeck', `Voice assistant TTS error: ${err}`);
+                    });
+                }
+                else {
+                    // No response text available, return to idle
+                    voiceAssistant.handleResponse('완료했습니다.').catch(() => { });
+                }
+            }
+        }
+        hookServer?.setMeta({
+            state: snapshot.state,
+            modelName: snapshot.modelName ?? undefined,
+            effortLevel: snapshot.effortLevel ?? undefined,
+        });
+        apme?.collector.updateModel(core.sessionId, snapshot.modelName ?? null);
         journal.write('state_change', 'internal', { state: snapshot.state, permissionMode: snapshot.permissionMode, suggestedPrompt: snapshot.suggestedPrompt });
-        // Compute promptType if options are present
-        let promptType;
+        const stateEvent = core.buildStateEvent({
+            agentType: adapter.capabilities.type,
+            snapshot,
+        });
+        core.broadcast(stateEvent);
+        lastStateEvent = stateEvent;
+        core.maybeBroadcastSessionsList();
+        // Backward-compat prompt_options
         if (snapshot.options.length > 0) {
-            promptType = 'multi_select';
+            let promptType = 'multi_select';
             if (snapshot.state === State.AWAITING_PERMISSION) {
                 promptType = snapshot.options.length > 2 ? 'yes_no_always' : 'yes_no';
             }
             else if (snapshot.state === State.AWAITING_DIFF) {
                 promptType = 'diff_review';
             }
-        }
-        // Include options atomically in state_update to avoid race conditions
-        // Note: agentCapabilities sent only on client connect (static), not on every broadcast
-        const stateEvent = {
-            type: 'state_update',
-            state: snapshot.state,
-            permissionMode: snapshot.permissionMode,
-            agentType: adapter.capabilities.type,
-            currentTool: snapshot.currentTool ?? undefined,
-            toolInput: snapshot.toolInput ?? undefined,
-            toolProgress: snapshot.toolProgress ?? undefined,
-            projectName: snapshot.projectName ?? undefined,
-            modelName: snapshot.modelName ?? undefined,
-            billingType: snapshot.billingType,
-            options: snapshot.options.length > 0 ? snapshot.options : undefined,
-            promptType,
-            question: snapshot.question ?? undefined,
-            navigable: snapshot.navigable || undefined,
-            cursorIndex: (snapshot.state === State.AWAITING_OPTION ||
-                snapshot.state === State.AWAITING_PERMISSION ||
-                snapshot.state === State.AWAITING_DIFF)
-                ? snapshot.cursorIndex : undefined,
-            suggestedPrompt: snapshot.suggestedPrompt ?? undefined,
-            modelCatalog: cachedModelCatalog ?? undefined,
-            remoteUrl: snapshot.remoteUrl ?? undefined,
-            pairingUrl: wsUrl,
-        };
-        wsServer.broadcast(stateEvent);
-        broadcastSse(stateEvent);
-        // Also send separate prompt_options for backward compatibility
-        if (snapshot.options.length > 0) {
-            const promptEvent = {
+            core.broadcast({
                 type: 'prompt_options',
-                promptType: promptType,
+                promptType,
                 question: snapshot.question ?? undefined,
                 options: snapshot.options,
-            };
-            wsServer.broadcast(promptEvent);
+            });
         }
-        const usageEvt = buildUsageEvent(snapshot, cachedApiUsage);
-        wsServer.broadcast(usageEvt);
-        broadcastSse(usageEvt);
+        core.broadcastUsage();
+        // Push state to daemon via internal WS
+        daemonWsClient.pushState(snapshot.state, snapshot.modelName ?? undefined, snapshot.effortLevel ?? undefined);
+        // Encoder + button state
+        const encEvt = computeEncoderState();
+        core.broadcast(encEvt);
+        const btnEvt = computeButtonState();
+        core.broadcast(btnEvt);
     });
-    // 6. Handle PluginCommands from WsServer
-    wsServer.onCommand((cmd) => {
-        debug('sdc', `pluginCmd: ${cmd.type}`);
-        // Let adapter handle commands it owns.
-        // ClaudeCode: switch_mode, interrupt, escape, respond
-        // OpenClaw: also select_option, navigate_option, send_prompt (via RPC)
+    // ===== Commands from WS clients =====
+    core.wsServer.onCommand((cmd) => {
+        debug('agentdeck', `pluginCmd: ${cmd.type}`);
+        // Adapter-owned commands
         if (adapter.handleCommand(cmd)) {
-            // Adapter handled the transport side; update StateMachine as needed
             switch (cmd.type) {
                 case 'respond':
-                    stateMachine.handleUserAction('respond');
+                    core.stateMachine.handleUserAction('respond');
                     break;
                 case 'interrupt':
-                    stateMachine.handleUserAction('interrupt');
+                    core.stateMachine.handleUserAction('interrupt');
                     break;
                 case 'escape':
-                    stateMachine.handleUserAction('interrupt');
+                    core.stateMachine.handleUserAction('interrupt');
                     break;
                 case 'select_option':
-                    stateMachine.handleUserAction('select_option');
+                    core.stateMachine.handleUserAction('select_option');
                     break;
                 case 'send_prompt':
-                    stateMachine.handleUserAction('send_prompt');
+                    core.stateMachine.handleUserAction('send_prompt');
                     break;
             }
             return;
         }
-        // Commands that need bridge coordination
+        // Bridge-coordinated commands
         switch (cmd.type) {
             case 'select_option': {
-                const snapshot = stateMachine.getSnapshot();
-                debug('sdc', `select_option: idx=${cmd.index} navigable=${snapshot.navigable} cursor=${snapshot.cursorIndex}`);
+                const snapshot = core.stateMachine.getSnapshot();
                 if (snapshot.navigable) {
-                    // Arrow-key mode: navigate to desired option then press Enter
                     const delta = cmd.index - snapshot.cursorIndex;
                     if (delta !== 0) {
                         const arrow = delta > 0 ? '\x1b[B' : '\x1b[A';
-                        const steps = Math.abs(delta);
-                        debug('sdc', `select_option: navigating ${steps} steps ${delta > 0 ? 'down' : 'up'}`);
-                        adapter.writeInput(arrow.repeat(steps));
+                        adapter.writeInput(arrow.repeat(Math.abs(delta)));
                     }
-                    // Proportional delay for PTY to process arrow keys, then confirm with Enter
-                    const delay = 50 + Math.abs(delta) * 20;
-                    setTimeout(() => {
-                        adapter.writeInput('\r');
-                    }, delay);
+                    setTimeout(() => adapter.writeInput('\r'), 50 + Math.abs(delta) * 20);
                 }
                 else {
-                    // Number input mode: type the 1-based index
                     adapter.writeInput(String(cmd.index + 1) + '\r');
                 }
-                stateMachine.handleUserAction('select_option');
+                core.stateMachine.handleUserAction('select_option');
                 break;
             }
             case 'navigate_option': {
-                const total = stateMachine.getOptionsCount();
-                const cur = stateMachine.getCursorIndex();
+                const total = core.stateMachine.getOptionsCount();
+                const cur = core.stateMachine.getCursorIndex();
                 const newIdx = total > 0
-                    ? (cmd.direction === 'up'
-                        ? Math.max(cur - 1, 0)
-                        : Math.min(cur + 1, total - 1))
+                    ? (cmd.direction === 'up' ? Math.max(cur - 1, 0) : Math.min(cur + 1, total - 1))
                     : cur;
-                stateMachine.updateCursorIndex(newIdx, 'optimistic');
-                debug('sdc', `navigate_option: ${cmd.direction} cursor=${cur}->${newIdx}`);
+                core.stateMachine.updateCursorIndex(newIdx, 'optimistic');
                 adapter.prepareForNavigation?.();
                 adapter.writeInput(cmd.direction === 'up' ? '\x1b[A' : '\x1b[B');
-                // Don't call handleUserAction — cursor movement is not a selection
                 break;
             }
             case 'send_prompt': {
                 let text = cmd.text;
-                // Expand template references
                 const templateMatch = text.match(/^__template:(\d+)$/);
                 if (templateMatch) {
                     const idx = parseInt(templateMatch[1], 10);
                     if (idx >= 0 && idx < promptTemplates.length) {
                         text = promptTemplates[idx].prompt;
-                        debug('sdc', `Template ${idx} → "${text.slice(0, 50)}"`);
                     }
-                    else {
-                        debug('sdc', `Template ${idx} out of range (${promptTemplates.length} available)`);
+                    else
                         break;
-                    }
                 }
                 if (text) {
                     adapter.writeInput(text);
                     setTimeout(() => adapter.writeInput('\r'), 50);
-                    stateMachine.handleUserAction('send_prompt');
+                    core.stateMachine.handleUserAction('send_prompt');
                 }
                 break;
             }
+            case 'utility':
+                utilityProxy.handleCommand(cmd);
+                core.broadcast(computeEncoderState());
+                break;
             case 'voice':
-                handleVoiceCommand(cmd.action, voiceManager, wsServer);
+                handleVoiceCommand(cmd.action, voiceManager, core);
                 break;
-            case 'query_usage': {
-                // Fetch fresh usage from Anthropic API (no PTY echo)
-                debug('sdc', 'Fetching usage from API (on demand)');
-                fetchUsageFromApi().then((apiUsage) => {
-                    if (apiUsage) {
-                        cachedApiUsage = apiUsage;
-                        lastApiFetchTime = Date.now();
-                        if (apiUsage.inferredBillingType) {
-                            stateMachine.inferBillingType(apiUsage.inferredBillingType);
-                        }
-                    }
-                    const snapshot = stateMachine.getSnapshot();
-                    wsServer.broadcast(buildUsageEvent(snapshot, cachedApiUsage));
-                });
+            case 'query_usage':
+                core.fetchAndUpdateUsage().catch(() => { });
                 break;
-            }
         }
     });
-    // 6b. Wire WS connect/disconnect to journal + update SSE metadata
-    wsServer.onClientDisconnect(() => {
-        journal.write('ws_event', 'ws', { action: 'disconnect', clients: wsServer.getClientCount() });
-        hookServer?.setMeta({ clientCount: wsServer.getClientCount() });
+    // Deck slot map relay
+    core.wsServer.onRawMessage((msg, sender) => {
+        if (msg.type === 'deck_slot_map') {
+            cachedSlotMap = msg;
+            core.wsServer.broadcastExcept(cachedSlotMap, sender);
+            broadcastSse(cachedSlotMap);
+            core.broadcast(computeButtonState());
+            return true;
+        }
+        return false;
     });
-    // Kick initial state: synthetic SessionStart in adapter.start() was emitted before
-    // the event listener was wired, so fire it explicitly now.
+    // WS connect/disconnect journal
+    core.wsServer.onClientDisconnect(() => {
+        journal.write('ws_event', 'ws', { action: 'disconnect', clients: core.wsServer.getClientCount() });
+        hookServer?.setMeta({ clientCount: core.wsServer.getClientCount() });
+    });
+    // Kick initial state
     if (adapter.isAlive()) {
-        stateMachine.handleHookEvent('SessionStart', {});
+        core.stateMachine.handleHookEvent('SessionStart', {});
     }
-    // Register with session registry for multi-session support
-    registerSession({
-        id: sessionId,
-        port,
-        pid: process.pid,
-        projectName: adapter.getProjectName() || projectName,
+    // Register session
+    core.registerSession(agentType, {
         tmuxSession,
         parentTty,
         tty: adapter.getTtyPath(),
-        startedAt: new Date().toISOString(),
     });
-    // 7. Send current state to newly connected WebSocket clients
-    wsServer.onClientConnect((ws) => {
-        journal.write('ws_event', 'ws', { action: 'connect', clients: wsServer.getClientCount() });
-        hookServer?.setMeta({ clientCount: wsServer.getClientCount() });
-        const snapshot = stateMachine.getSnapshot();
-        // Compute promptType for initial state
-        let initPromptType;
+    // ===== Client connect =====
+    core.wsServer.onClientConnect((ws) => {
+        journal.write('ws_event', 'ws', { action: 'connect', clients: core.wsServer.getClientCount() });
+        hookServer?.setMeta({ clientCount: core.wsServer.getClientCount() });
+        const snapshot = core.stateMachine.getSnapshot();
+        // Restore suggested prompt on reconnect
+        let reconnectSuggestion = snapshot.suggestedPrompt;
+        if (!reconnectSuggestion && snapshot.state === State.IDLE) {
+            reconnectSuggestion = core.stateMachine.getLastValidSuggestedPrompt();
+        }
+        // Build state event with capabilities for initial connect
+        const stateEvent = core.buildStateEvent({
+            agentType: adapter.capabilities.type,
+            agentCapabilities: adapter.capabilities,
+            snapshot,
+        });
+        // Override suggestedPrompt with reconnect value
+        if (reconnectSuggestion) {
+            stateEvent.suggestedPrompt = reconnectSuggestion;
+        }
+        // Extra events for initial state
+        const extraEvents = [];
+        // Backward-compat prompt_options
         if (snapshot.options.length > 0) {
-            initPromptType = 'multi_select';
+            let initPromptType = 'multi_select';
             if (snapshot.state === State.AWAITING_PERMISSION) {
                 initPromptType = snapshot.options.length > 2 ? 'yes_no_always' : 'yes_no';
             }
             else if (snapshot.state === State.AWAITING_DIFF) {
                 initPromptType = 'diff_review';
             }
-        }
-        // Restore last valid suggestion on reconnect when IDLE (current suggestedPrompt may already be null)
-        let reconnectSuggestion = snapshot.suggestedPrompt;
-        if (!reconnectSuggestion && snapshot.state === State.IDLE) {
-            reconnectSuggestion = stateMachine.getLastValidSuggestedPrompt();
-            if (reconnectSuggestion) {
-                debug('sdc', `Restoring lastValidSuggestedPrompt on reconnect: "${reconnectSuggestion.slice(0, 40)}"`);
-            }
-        }
-        const stateEvent = {
-            type: 'state_update',
-            state: snapshot.state,
-            permissionMode: snapshot.permissionMode,
-            agentType: adapter.capabilities.type,
-            agentCapabilities: adapter.capabilities,
-            currentTool: snapshot.currentTool ?? undefined,
-            toolInput: snapshot.toolInput ?? undefined,
-            toolProgress: snapshot.toolProgress ?? undefined,
-            projectName: snapshot.projectName ?? undefined,
-            modelName: snapshot.modelName ?? undefined,
-            billingType: snapshot.billingType,
-            options: snapshot.options.length > 0 ? snapshot.options : undefined,
-            promptType: initPromptType,
-            question: snapshot.question ?? undefined,
-            navigable: snapshot.navigable || undefined,
-            cursorIndex: (snapshot.state === State.AWAITING_OPTION ||
-                snapshot.state === State.AWAITING_PERMISSION ||
-                snapshot.state === State.AWAITING_DIFF)
-                ? snapshot.cursorIndex : undefined,
-            suggestedPrompt: reconnectSuggestion ?? undefined,
-            modelCatalog: cachedModelCatalog ?? undefined,
-            pairingUrl: wsUrl,
-        };
-        wsServer.sendTo(ws, stateEvent);
-        // Also send separate prompt_options for backward compatibility
-        if (snapshot.options.length > 0) {
-            wsServer.sendTo(ws, {
+            extraEvents.push({
                 type: 'prompt_options',
                 promptType: initPromptType,
                 question: snapshot.question ?? undefined,
                 options: snapshot.options,
             });
         }
-        wsServer.sendTo(ws, buildUsageEvent(snapshot, cachedApiUsage));
-        const connectEvt = {
-            type: 'connection',
-            status: adapter.isAlive() ? 'connected' : 'disconnected',
-        };
-        wsServer.sendTo(ws, connectEvt);
-        // Fetch API usage on client connect:
-        // - Always fetch if no cache yet
-        // - Re-fetch if cache is stale (>5 min, e.g. after sleep/wake)
-        const cacheAge = Date.now() - lastApiFetchTime;
-        const cacheStale = lastApiFetchTime > 0 && cacheAge > 5 * 60 * 1000;
-        if (!cachedApiUsage || cacheStale) {
-            fetchUsageFromApi().then((apiUsage) => {
-                if (apiUsage) {
-                    cachedApiUsage = apiUsage;
-                    lastApiFetchTime = Date.now();
-                    if (apiUsage.inferredBillingType) {
-                        stateMachine.inferBillingType(apiUsage.inferredBillingType);
-                    }
-                    const snap2 = stateMachine.getSnapshot();
-                    wsServer.broadcast(buildUsageEvent(snap2, cachedApiUsage));
-                }
-            });
-        }
+        // Encoder + button state
+        extraEvents.push(computeEncoderState());
+        extraEvents.push(computeButtonState());
+        // Slot map
+        if (cachedSlotMap)
+            extraEvents.push(cachedSlotMap);
+        core.sendInitialState(ws, {
+            agentType: adapter.capabilities.type,
+            agentCapabilities: adapter.capabilities,
+            isAlive: adapter.isAlive(),
+            extraEvents,
+        });
     });
-    // 8. Attach user's terminal to adapter (PTY agents proxy stdin/stdout)
+    // ===== Terminal attachment =====
     if (adapter.capabilities.hasTerminal) {
-        if (process.stdin.isTTY) {
+        if (process.stdin.isTTY)
             process.stdin.setRawMode(true);
-        }
         process.stdin.resume();
         adapter.attachTerminal(process.stdin, process.stdout);
     }
-    // 9. Periodic usage update (so session timer ticks on Stream Deck)
-    const usageInterval = setInterval(() => {
-        if (wsServer.getClientCount() > 0) {
-            const snapshot = stateMachine.getSnapshot();
-            wsServer.broadcast(buildUsageEvent(snapshot, cachedApiUsage));
-        }
-    }, 5000);
-    // 9b. Periodic API usage refresh (silent — no PTY echo)
-    const apiUsageInterval = setInterval(() => {
-        if (wsServer.getClientCount() > 0) {
-            fetchUsageFromApi().then((apiUsage) => {
-                if (apiUsage) {
-                    cachedApiUsage = apiUsage;
-                    lastApiFetchTime = Date.now();
-                    if (apiUsage.inferredBillingType) {
-                        stateMachine.inferBillingType(apiUsage.inferredBillingType);
+    // ===== Polling =====
+    core.startUsageTick();
+    core.startApiUsagePolling(90_000);
+    core.startOllamaProbe();
+    core.startMlxProbe();
+    core.startAntigravityProbe();
+    core.startGatewayProbe(800);
+    core.startGatewayHealthCheck();
+    core.startSessionsListPolling();
+    // Inject virtual OpenClaw session when Gateway is detected (same as daemon-server.ts)
+    core.setSessionsEnricher((sessions) => {
+        if (!core.cachedGatewayAvailable)
+            return sessions;
+        if (sessions.some(s => s.agentType === 'openclaw'))
+            return sessions;
+        return [...sessions, {
+                id: 'openclaw-gateway',
+                port: 18789,
+                projectName: 'OpenClaw',
+                agentType: 'openclaw',
+                alive: true,
+            }];
+    });
+    // ===== Encoder state computation =====
+    function computeEncoderState() {
+        const snapshot = core.stateMachine.getSnapshot();
+        const isInteractive = snapshot.state === State.AWAITING_OPTION ||
+            snapshot.state === State.AWAITING_PERMISSION ||
+            snapshot.state === State.AWAITING_DIFF;
+        const utilState = utilityProxy.getState();
+        const e1 = {
+            slot: 0, encoderType: 'utility',
+            header: utilState.mode.toUpperCase(),
+            value: utilState.value, icon: utilState.icon,
+            accentColor: '#3b82f6', progress: utilState.level,
+        };
+        const e2 = {
+            slot: 1, encoderType: 'action',
+            header: 'ACTION', accentColor: '#f59e0b',
+        };
+        if (isInteractive && snapshot.options.length > 0) {
+            const opt = snapshot.options[snapshot.cursorIndex];
+            e2.header = 'OPTION';
+            e2.value = opt?.label ?? '';
+            e2.counter = `${snapshot.cursorIndex + 1}/${snapshot.options.length}`;
+            e2.detail = opt?.label;
+        }
+        else if (snapshot.suggestedPrompt) {
+            e2.header = 'PROMPT';
+            e2.value = snapshot.suggestedPrompt;
+        }
+        const pct5 = core.cachedApiUsage?.fiveHourPercent ?? null;
+        const pct7 = core.cachedApiUsage?.sevenDayPercent ?? null;
+        const worstPct = Math.max(pct5 ?? 0, pct7 ?? 0);
+        const usageColor = worstPct > 80 ? '#ef4444' : worstPct > 50 ? '#eab308' : '#22c55e';
+        const e3 = {
+            slot: 2, encoderType: 'usage',
+            header: 'USAGE',
+            value: pct5 != null ? `${Math.round(pct5)}% / ${Math.round(pct7 ?? 0)}%` : '\u2014',
+            accentColor: usageColor,
+            progress: worstPct / 100,
+        };
+        const isRec = voiceManager.isRecording();
+        const e4 = {
+            slot: 3, encoderType: 'voice',
+            header: 'VOICE', value: isRec ? 'Recording...' : 'Ready',
+            icon: isRec ? '\uD83D\uDD34' : '\uD83C\uDFA4',
+            accentColor: isRec ? '#ef4444' : '#8b5cf6',
+            voiceState: isRec ? 'recording' : 'idle',
+        };
+        return {
+            type: 'encoder_state',
+            encoders: [e1, e2, e3, e4],
+            takeoverActive: isInteractive && snapshot.options.length > 0,
+        };
+    }
+    // ===== Button state computation =====
+    function computeButtonState() {
+        const snapshot = core.stateMachine.getSnapshot();
+        const st = snapshot.state;
+        const mode = snapshot.permissionMode;
+        const options = snapshot.options;
+        const isInteractive = st === State.AWAITING_OPTION ||
+            st === State.AWAITING_PERMISSION ||
+            st === State.AWAITING_DIFF;
+        const DIM = {
+            slot: 0, title: '', bgColor: '#1a1a1a', textColor: '#444444',
+            enabled: false, dim: true,
+        };
+        function getIdleButtons() {
+            if (!cachedSlotMap)
+                return DEFAULT_IDLE_BUTTONS;
+            const responseSlots = cachedSlotMap.buttons
+                .filter(s => s.actionType === 'response-button')
+                .sort((a, b) => a.slot - b.slot);
+            if (responseSlots.length === 0)
+                return DEFAULT_IDLE_BUTTONS;
+            return responseSlots.map((s, i) => ({
+                label: s.settings?.label ?? DEFAULT_IDLE_BUTTONS[i]?.label ?? '',
+                action: s.settings?.action ?? DEFAULT_IDLE_BUTTONS[i]?.action ?? '',
+            }));
+        }
+        function colorForOption(opt) {
+            const shortcut = (opt.shortcut ?? '').toLowerCase();
+            const lower = opt.label.toLowerCase();
+            if (lower.startsWith('always'))
+                return { bg: '#1e40af', text: '#ffffff' };
+            if (/don[''\u2019]t\s+ask\s+again/i.test(lower))
+                return { bg: '#1e40af', text: '#ffffff' };
+            if (/allow\s+all\s+sessions/i.test(lower))
+                return { bg: '#1e40af', text: '#ffffff' };
+            if (shortcut === 'n' || shortcut === 'd' || lower.startsWith('no') || lower.startsWith('deny'))
+                return { bg: '#991b1b', text: '#ffffff' };
+            if (shortcut === 'y' || shortcut === 'a')
+                return { bg: '#166534', text: '#ffffff' };
+            if (opt.recommended)
+                return { bg: '#1e4d2b', text: '#86efac' };
+            return { bg: '#1e3a5f', text: '#93c5fd' };
+        }
+        function uppercaseShort(label) {
+            return label.length <= 12 ? label.toUpperCase() : label;
+        }
+        const buttons = [];
+        // Slot 0: Mode
+        const modeColors = {
+            default: '#2a2a2a', plan: '#7c3aed', acceptEdits: '#2563eb',
+            dontAsk: '#0e7490', bypassPermissions: '#991b1b',
+        };
+        const modeLabels = {
+            default: 'DEFAULT', plan: 'PLAN', acceptEdits: 'ACCEPT',
+            dontAsk: "DON'T ASK", bypassPermissions: 'BYPASS',
+        };
+        const modeEnabled = st === State.IDLE;
+        buttons.push({
+            slot: 0,
+            title: modeLabels[mode] ?? 'DEFAULT',
+            subtitle: 'Mode',
+            bgColor: modeEnabled ? (modeColors[mode] ?? '#2a2a2a') : '#1a1a1a',
+            textColor: modeEnabled ? '#ffffff' : '#444444',
+            enabled: modeEnabled,
+            action: modeEnabled ? 'switch_mode' : undefined,
+            dim: !modeEnabled,
+        });
+        // Slot 1: Session/Status
+        if (st === State.IDLE) {
+            // Skip model-agnostic neutral levels — "medium" (legacy default) and "default"
+            // (Claude Code 2.1+ name for the per-model default). Show everything else
+            // including max/xhigh/high/low/fast as an informational suffix.
+            const effortSuffix = snapshot.effortLevel
+                && snapshot.effortLevel !== 'medium'
+                && snapshot.effortLevel !== 'default'
+                ? snapshot.effortLevel : null;
+            const sessionSubtitle = effortSuffix && snapshot.modelName
+                ? `${snapshot.modelName} \u00B7 ${effortSuffix}` : snapshot.modelName ?? undefined;
+            buttons.push({
+                slot: 1, title: snapshot.projectName ?? '\u2014',
+                subtitle: sessionSubtitle, bgColor: '#1e293b', textColor: '#ffffff', enabled: false,
+            });
+        }
+        else if (st === State.PROCESSING) {
+            buttons.push({
+                slot: 1, title: snapshot.currentTool ?? '...',
+                subtitle: snapshot.toolProgress ?? undefined,
+                bgColor: '#1e3a5f', textColor: '#93c5fd', enabled: false,
+            });
+        }
+        else if (st === State.AWAITING_PERMISSION || st === State.AWAITING_DIFF) {
+            buttons.push({ slot: 1, title: 'PERMIT?', bgColor: '#b45309', textColor: '#ffffff', enabled: false });
+        }
+        else if (st === State.AWAITING_OPTION) {
+            buttons.push({ slot: 1, title: 'SELECT', bgColor: '#b45309', textColor: '#ffffff', enabled: false });
+        }
+        else {
+            buttons.push({ ...DIM, slot: 1 });
+        }
+        // Slot 2: Usage
+        const pct = core.cachedApiUsage?.fiveHourPercent ?? null;
+        const usageText = pct != null ? `${Math.round(pct)}%` : '\u2014';
+        const usageBg = pct == null ? '#1e293b' : pct >= 90 ? '#991b1b' : pct >= 70 ? '#92400e' : '#166534';
+        buttons.push({ slot: 2, title: usageText, subtitle: '5h', bgColor: usageBg, textColor: '#ffffff', enabled: false });
+        // Slots 3-6: Response buttons
+        if (st === State.IDLE) {
+            const idleBtns = getIdleButtons();
+            for (let i = 0; i < 4; i++) {
+                const btn = idleBtns[i];
+                if (btn) {
+                    const isGoOn = btn.action === 'continue' || btn.label.toLowerCase() === 'go on';
+                    buttons.push({
+                        slot: 3 + i, title: btn.label,
+                        bgColor: isGoOn ? '#1e3a2f' : '#1e293b',
+                        textColor: isGoOn ? '#22c55e' : '#ffffff',
+                        enabled: true, action: `command:${btn.action === 'continue' ? 'go on' : btn.action}`,
+                    });
+                }
+                else {
+                    buttons.push({ ...DIM, slot: 3 + i });
+                }
+            }
+        }
+        else if (st === State.PROCESSING) {
+            for (let i = 0; i < 4; i++)
+                buttons.push({ ...DIM, slot: 3 + i });
+        }
+        else if (isInteractive) {
+            if (options.length === 0 && st === State.AWAITING_PERMISSION) {
+                buttons.push({ slot: 3, title: 'YES', bgColor: '#166534', textColor: '#ffffff', enabled: true, action: 'respond:y' });
+                buttons.push({ slot: 4, title: 'NO', bgColor: '#991b1b', textColor: '#ffffff', enabled: true, action: 'respond:n' });
+                buttons.push({ slot: 5, title: 'ALWAYS', bgColor: '#1e40af', textColor: '#ffffff', enabled: true, action: 'respond:a' });
+                buttons.push({ ...DIM, slot: 6 });
+            }
+            else if (options.length === 0 && st === State.AWAITING_DIFF) {
+                buttons.push({ slot: 3, title: 'APPLY', bgColor: '#166534', textColor: '#ffffff', enabled: true, action: 'respond:a' });
+                buttons.push({ slot: 4, title: 'DENY', bgColor: '#991b1b', textColor: '#ffffff', enabled: true, action: 'respond:d' });
+                buttons.push({ slot: 5, title: 'VIEW', bgColor: '#1e3a5f', textColor: '#93c5fd', enabled: true, action: 'respond:v' });
+                buttons.push({ ...DIM, slot: 6 });
+            }
+            else if (options.length <= 4) {
+                for (let i = 0; i < 4; i++) {
+                    if (i < options.length) {
+                        const opt = options[i];
+                        const colors = (st === State.AWAITING_PERMISSION || st === State.AWAITING_DIFF)
+                            ? colorForOption(opt) : opt.recommended ? { bg: '#1e4d2b', text: '#86efac' } : { bg: '#1e3a5f', text: '#93c5fd' };
+                        const action = snapshot.navigable
+                            ? `select_option:${opt.index}` : `respond:${opt.shortcut || opt.label.charAt(0).toLowerCase()}`;
+                        buttons.push({
+                            slot: 3 + i, title: uppercaseShort(opt.label),
+                            bgColor: colors.bg, textColor: colors.text,
+                            enabled: true, badge: opt.recommended ? '\u2605' : opt.selected ? '\u2713' : undefined,
+                            action,
+                        });
+                    }
+                    else {
+                        buttons.push({ ...DIM, slot: 3 + i });
                     }
-                    // Broadcast updated usage so clients see fresh rate-limit data
-                    const snapshot = stateMachine.getSnapshot();
-                    wsServer.broadcast(buildUsageEvent(snapshot, cachedApiUsage));
                 }
-            });
+            }
+            else {
+                for (let i = 0; i < 3; i++) {
+                    const opt = options[i];
+                    const colors = (st === State.AWAITING_PERMISSION || st === State.AWAITING_DIFF)
+                        ? colorForOption(opt) : opt.recommended ? { bg: '#1e4d2b', text: '#86efac' } : { bg: '#1e3a5f', text: '#93c5fd' };
+                    const action = snapshot.navigable
+                        ? `select_option:${opt.index}` : `respond:${opt.shortcut || opt.label.charAt(0).toLowerCase()}`;
+                    buttons.push({
+                        slot: 3 + i, title: uppercaseShort(opt.label),
+                        bgColor: colors.bg, textColor: colors.text, enabled: true, action,
+                    });
+                }
+                buttons.push({ slot: 6, title: 'MORE \u25BC', bgColor: '#334155', textColor: '#94a3b8', enabled: true, action: 'expand_options' });
+            }
+        }
+        else {
+            for (let i = 0; i < 4; i++)
+                buttons.push({ ...DIM, slot: 3 + i });
         }
-    }, 60_000);
-    // 10. Graceful shutdown
+        // Slot 7: Stop/ESC
+        if (st === State.PROCESSING) {
+            buttons.push({ slot: 7, title: 'STOP', bgColor: '#cc0000', textColor: '#ffffff', enabled: true, action: 'interrupt' });
+        }
+        else if (isInteractive) {
+            buttons.push({ slot: 7, title: 'ESC', bgColor: '#b45309', textColor: '#ffffff', enabled: true, action: 'escape' });
+        }
+        else if (st === State.IDLE) {
+            buttons.push({ slot: 7, title: 'ESC', bgColor: '#3d2607', textColor: '#ffb347', enabled: true, action: 'escape', dim: false });
+        }
+        else {
+            buttons.push({ ...DIM, slot: 7 });
+        }
+        return { type: 'button_state', buttons };
+    }
+    // ===== Shutdown =====
     let shutdownInProgress = false;
     function shutdown() {
         if (shutdownInProgress)
             return;
         shutdownInProgress = true;
-        log('[sdc] Shutting down...');
-        clearInterval(usageInterval);
-        clearInterval(apiUsageInterval);
-        deregisterSession(sessionId);
-        if (process.stdin.isTTY) {
+        // Hard failsafe — exit no matter what after 3s
+        setTimeout(() => process.exit(0), 3000).unref();
+        log('Shutting down...');
+        if (process.stdin.isTTY)
             process.stdin.setRawMode(false);
-        }
-        mdnsCleanup();
+        process.stdin.pause();
+        process.stdin.removeAllListeners();
+        postit?.cleanup();
+        utilityProxy.cleanup();
+        voiceAssistant?.stop();
         voiceManager.disconnectFromServer();
+        bridgeLogStream?.stop();
         journal.close();
-        wsServer.close();
-        // Adapter handles killing the agent process and closing its HTTP server
-        adapter.shutdown().then(() => {
+        core.onShutdown(async () => {
+            await Promise.all([
+                adapter.shutdown(),
+                stopModules(startedModules).catch(() => { }),
+            ]);
             process.exit(0);
         });
-        // Force exit if adapter shutdown hangs
-        setTimeout(() => {
-            process.exit(1);
-        }, 3000);
+        core.shutdown();
     }
-    process.on('SIGINT', shutdown);
-    process.on('SIGTERM', shutdown);
-    process.on('uncaughtException', (err) => {
-        log(`[sdc] Uncaught exception: ${err}`);
-        shutdown();
-    });
-    process.on('unhandledRejection', (reason) => {
-        log(`[sdc] Unhandled rejection: ${reason}`);
-        shutdown();
+}
+// Mid-session classify + turn-level eval enqueue.
+// Shared between Claude spinner_stop, OpenClaw/OpenCode chat_response, and Codex spinner_stop
+// so all agents get the same turns.task_category stamping and non-code turn_judge evals.
+async function classifyAndEnqueueTurn(apme, sid) {
+    const turnId = apme.collector.getActiveTurnId(sid);
+    const runId = apme.collector.getRunId(sid);
+    if (!turnId || !runId)
+        return;
+    const run = apme.store.getRun(runId);
+    if (!run)
+        return;
+    let category = run.taskCategory ?? null;
+    if (!category) {
+        try {
+            const { classifyRun } = await import('./apme/classifier.js');
+            const { category: c, signals } = classifyRun(apme.store, run.id);
+            if (c && c !== 'unknown') {
+                category = c;
+                apme.store.updateRun(run.id, {
+                    taskCategory: c,
+                    taskSignals: JSON.stringify(signals),
+                    taskCategorySource: 'rule',
+                });
+            }
+        }
+        catch (err) {
+            debug('APME', `mid-session classify failed: ${String(err)}`);
+        }
+    }
+    if (category) {
+        try {
+            apme.store.updateTurn(turnId, { taskCategory: category });
+        }
+        catch { /* ignore */ }
+    }
+    const NON_CODE = new Set(['conversation', 'planning', 'research', 'review']);
+    if (category && NON_CODE.has(category)) {
+        apme.runner.enqueueTurn({ runId: run.id, turnId, category });
+    }
+}
+// ===== Non-Claude agent APME wiring =====
+// For OpenCode, Codex, OpenClaw: intercepts adapter timeline events to create
+// APME turns with prompts and responses. Claude Code uses hooks instead.
+function wireAgentApme(adapter, agentType, apme, core, ptyRingBuffer) {
+    const sid = core.sessionId;
+    adapter.on('event', (evt) => {
+        // ── Timeline events (OpenCode / OpenClaw) ──
+        // Both adapters emit { source: 'timeline', entry: TimelineEntry }.
+        // The timeline adapter normalizes them to AgentDeck telemetry spans.
+        if (evt.source === 'timeline' && evt.entry) {
+            const entry = evt.entry;
+            const ctx = makeApmeAdapterCtx(apme, sid, agentType);
+            for (const span of timelineEntryToSpans(ctx, entry)) {
+                apme.collector.ingestSpan(sid, span);
+            }
+            // Mid-session classification still runs once we've captured a response.
+            if (entry.type === 'chat_response') {
+                void classifyAndEnqueueTurn(apme, sid);
+            }
+        }
+        // ── Codex: PTY parser fallback ──
+        if (evt.source === 'parser' && agentType === 'codex-cli') {
+            const ctx = makeApmeAdapterCtx(apme, sid, agentType);
+            if (evt.event === 'user_prompt') {
+                const text = evt.data?.text;
+                if (text) {
+                    // PTY-derived prompt = synthetic turn_start span. We construct it
+                    // inline rather than reusing claudeHookToSpans because the source
+                    // is a parser event, not a hook payload.
+                    const span = {
+                        traceId: ctx.traceId,
+                        spanId: randomUUID(),
+                        parentSpanId: ctx.activeTurnId,
+                        name: spanNameForKind('turn_start'),
+                        kind: 'turn_start',
+                        ts: Date.now(),
+                        attributes: {
+                            'agentdeck.agent_type': ctx.agentType,
+                            'agentdeck.prompt_text': text,
+                            ...(ctx.cwd ? { 'agentdeck.cwd': ctx.cwd } : {}),
+                        },
+                    };
+                    apme.collector.ingestSpan(sid, span);
+                }
+            }
+            if (evt.event === 'spinner_stop') {
+                setTimeout(() => {
+                    const tail = ptyRingBuffer.getTail(5000);
+                    const lines = tail.split('\n').map(l => l.trim()).filter(Boolean);
+                    // Filter out spinner/UI artifacts from tail (Codex PTY output)
+                    const clean = lines.filter(l => !/^[✢✳✶✻✽⏸⏵❯─>]/.test(l) &&
+                        !/planmode|plan\s*mode|shift\+tab|accept\s*edits/i.test(l) &&
+                        !/\?\s*for\s*shortcuts/.test(l));
+                    const response = clean.slice(-5).join('\n');
+                    if (response.length > 2) {
+                        const span = claudePtyResponseToSpan(ctx, response);
+                        if (span)
+                            apme.collector.ingestSpan(sid, span);
+                        void classifyAndEnqueueTurn(apme, sid);
+                    }
+                }, 500);
+            }
+        }
     });
 }
-function buildUsageEvent(snapshot, apiUsage) {
+/** Build the AdapterContext used by every APME ingestion adapter. The
+ *  trace id mirrors the active run id so future OTLP exports tie spans
+ *  emitted in the same session together. `cwd` falls back to `process.cwd()`
+ *  because the bridge is started from the project directory. */
+function makeApmeAdapterCtx(apme, sid, agentType) {
     return {
-        type: 'usage_update',
-        sessionDurationSec: snapshot.sessionDurationSec,
-        inputTokens: snapshot.inputTokens,
-        outputTokens: snapshot.outputTokens,
-        toolCalls: snapshot.toolCalls,
-        estimatedCostUsd: snapshot.estimatedCostUsd ?? undefined,
-        sessionPercent: snapshot.sessionPercent ?? undefined,
-        costSpent: snapshot.costSpent ?? undefined,
-        costLimit: snapshot.costLimit ?? undefined,
-        resetTime: snapshot.resetTime ?? undefined,
-        resetDate: snapshot.resetDate ?? undefined,
-        fiveHourPercent: apiUsage?.fiveHourPercent ?? undefined,
-        fiveHourResetsAt: apiUsage?.fiveHourResetsAt ?? undefined,
-        sevenDayPercent: apiUsage?.sevenDayPercent ?? undefined,
-        sevenDayResetsAt: apiUsage?.sevenDayResetsAt ?? undefined,
-        extraUsageEnabled: apiUsage?.extraUsageEnabled ?? undefined,
-        extraUsageMonthlyLimit: apiUsage?.extraUsageMonthlyLimit ?? undefined,
-        extraUsageUsedCredits: apiUsage?.extraUsageUsedCredits ?? undefined,
-        extraUsageUtilization: apiUsage?.extraUsageUtilization ?? undefined,
+        sessionId: sid,
+        agentType,
+        traceId: apme.collector.getRunId(sid) ?? sid,
+        cwd: process.cwd(),
+        activeTurnId: apme.collector.getActiveTurnId(sid) ?? undefined,
     };
 }
-function handleVoiceCommand(action, voiceManager, wsServer) {
+// ===== Claude Code timeline wiring =====
+function wireClaudeCodeTimeline(adapter, core, journal, ptyRingBuffer) {
+    let ccChatStart = null;
+    let ccPendingChatStart = false;
+    let ccPendingChatStartTimer = null;
+    let ccLastPromptText = null;
+    let ccLastHookToolTs = 0; // Change 1: track last hook-based tool_request
+    let ccPendingCompletion = false; // Change 2: track pending chat_end for PTY fallback
+    let ccPendingCompletionTimer = null;
+    const emitChatStart = (text) => {
+        if (ccPendingChatStartTimer) {
+            clearTimeout(ccPendingChatStartTimer);
+            ccPendingChatStartTimer = null;
+        }
+        ccPendingChatStart = false;
+        ccLastPromptText = text || null;
+        const snippet = text.length > 500 ? text.slice(0, 497) + '...' : text;
+        const detail = text.length > 100 ? (text.length > 1000 ? text.slice(0, 1000) + '...' : text) : undefined;
+        // Change 4: better fallback text — include project name
+        const fallbackRaw = (() => {
+            const proj = core.stateMachine.getSnapshot().projectName;
+            return proj ? `Prompt \u00B7 ${proj}` : 'Prompt sent';
+        })();
+        core.bridgeTimeline.addEntry({
+            ts: ccChatStart ?? Date.now(), type: 'chat_start',
+            raw: snippet || fallbackRaw,
+            ...(detail ? { detail } : {}),
+            agentType: 'claude-code',
+        });
+    };
+    /** Extract response text from PTY ringbuffer after ⏺ marker (same pattern as APME) */
+    const extractPtyResponse = () => {
+        const tail = ptyRingBuffer.getTail(5000);
+        const marker = tail.lastIndexOf('⏺');
+        if (marker < 0)
+            return '';
+        const afterMarker = tail.slice(marker + 1).trim();
+        const lines = afterMarker.split('\n');
+        const clean = [];
+        for (const line of lines) {
+            const trimmed = line.trim();
+            if (!trimmed)
+                continue;
+            if (/^[✢✳✶✻✽⏸⏵❯─>]/.test(trimmed))
+                break;
+            if (/planmode|plan\s*mode|shift\+tab|accept\s*edits/i.test(trimmed))
+                break;
+            if (/^\S+…(\s|$)/.test(trimmed) && /tokens|shortcuts|\d+[ms]\s/i.test(trimmed))
+                break;
+            if (/\?\s*for\s*shortcuts/.test(trimmed))
+                break;
+            clean.push(trimmed);
+        }
+        return clean.join('\n').trim();
+    };
+    /** Emit chat_response + chat_end from response text (shared by Stop hook and PTY fallback) */
+    const emitCompletion = (responseText, duration, toolSummary) => {
+        const now = Date.now();
+        // Change 5: emit chat_response if meaningful response text exists
+        if (responseText.length > 20) {
+            const respRaw = responseText.length > 200 ? responseText.slice(0, 197) + '...' : responseText;
+            core.bridgeTimeline.addEntry({
+                ts: now - 1, type: 'chat_response',
+                raw: cleanRawText(respRaw),
+                detail: cleanDetailText(responseText.slice(0, 3000)) || undefined,
+                agentType: 'claude-code',
+            });
+        }
+        const topicHint = responseText ? extractTopicHint(responseText) : null;
+        const promptTopic = ccLastPromptText ? extractTopicHint(ccLastPromptText) : null;
+        const completedLabel = topicHint || promptTopic || 'Completed';
+        let summary = duration != null ? `${completedLabel} \u00B7 ${duration}s` : completedLabel;
+        if (toolSummary)
+            summary += ` \u00B7 ${toolSummary}`;
+        const chatEndDetail = responseText
+            ? (() => { const c = cleanDetailText(responseText); return c ? (c.length > 1000 ? c.slice(0, 1000) + '...' : c) : undefined; })()
+            : ccLastPromptText
+                ? `Prompt: ${ccLastPromptText.length > 200 ? ccLastPromptText.slice(0, 200) + '...' : ccLastPromptText}`
+                : undefined;
+        const chatEndTs = now;
+        ccChatStart = null;
+        ccLastPromptText = null;
+        core.bridgeTimeline.addEntry({
+            ts: chatEndTs, type: 'chat_end', raw: summary,
+            ...(chatEndDetail ? { detail: chatEndDetail } : {}),
+            agentType: 'claude-code',
+        });
+        // Async LLM summarization — fire-and-forget, upsert chat_end when ready
+        if (responseText && responseText.length > 30) {
+            const savedDuration = duration;
+            const savedToolSummary = toolSummary;
+            const savedDetail = chatEndDetail;
+            summarizeResponse(responseText).then((llmSummary) => {
+                if (llmSummary) {
+                    const enrichedParts = [llmSummary];
+                    if (savedDuration != null)
+                        enrichedParts.push(`${savedDuration}s`);
+                    if (savedToolSummary)
+                        enrichedParts.push(savedToolSummary);
+                    debug('timeline', `CC LLM summary: ${llmSummary}`);
+                    core.bridgeTimeline.upsertEntry({
+                        ts: chatEndTs, type: 'chat_end',
+                        raw: enrichedParts.join(' \u00B7 '),
+                        ...(savedDetail ? { detail: savedDetail } : {}),
+                        agentType: 'claude-code',
+                    });
+                }
+            }).catch(() => { });
+        }
+    };
+    // Change 4: late upsert — user_prompt metadata arriving after 500ms timer
+    adapter.on('event', (evt) => {
+        if (evt.source === 'metadata' && evt.event === 'user_prompt') {
+            const text = evt.data?.text || '';
+            if (ccPendingChatStart) {
+                emitChatStart(text);
+            }
+            else if (ccChatStart && Date.now() - ccChatStart < 5000 && text) {
+                // Late arrival — upsert chat_start with actual prompt text
+                const snippet = text.length > 500 ? text.slice(0, 497) + '...' : text;
+                core.bridgeTimeline.upsertEntry({
+                    ts: ccChatStart, type: 'chat_start',
+                    raw: snippet, agentType: 'claude-code',
+                });
+                ccLastPromptText = text;
+            }
+        }
+    });
+    // Change 1: PTY tool_action → tool_exec timeline entry (fills gap when hooks don't fire)
+    adapter.on('event', (evt) => {
+        if (evt.source !== 'parser' || evt.event !== 'tool_action')
+            return;
+        const now = Date.now();
+        // Skip if hook already emitted tool_request within 2s (avoid duplicates)
+        if (now - ccLastHookToolTs < 2000)
+            return;
+        const toolName = evt.data?.toolName || 'tool';
+        const toolArgs = evt.data?.toolArgs || '';
+        const raw = toolArgs ? `${toolName} ${toolArgs}` : toolName;
+        core.bridgeTimeline.addEntry({
+            ts: now, type: 'tool_exec',
+            raw: raw.length > 500 ? raw.slice(0, 497) + '...' : raw,
+            agentType: 'claude-code',
+        });
+    });
+    // Change 2: PTY fallback chat_end from spinner_stop/idle (when Stop hook doesn't fire)
+    adapter.on('event', (evt) => {
+        if (evt.source !== 'parser')
+            return;
+        if ((evt.event === 'spinner_stop' || evt.event === 'idle') && ccPendingCompletion) {
+            // Wait 1.5s — Stop hook may still arrive
+            if (ccPendingCompletionTimer)
+                clearTimeout(ccPendingCompletionTimer);
+            ccPendingCompletionTimer = setTimeout(() => {
+                ccPendingCompletionTimer = null;
+                if (!ccPendingCompletion)
+                    return; // Stop hook already handled it
+                ccPendingCompletion = false;
+                if (ccPendingChatStart)
+                    emitChatStart('');
+                const now = Date.now();
+                const duration = ccChatStart ? Math.round((now - ccChatStart) / 1000) : null;
+                const toolSummary = core.usageTracker.getToolSummary();
+                // Extract response from PTY ringbuffer
+                const responseText = extractPtyResponse();
+                debug('timeline', `CC PTY fallback chat_end: respLen=${responseText.length} duration=${duration}`);
+                emitCompletion(responseText, duration, toolSummary);
+            }, 1500);
+        }
+    });
+    adapter.on('event', (evt) => {
+        if (evt.source !== 'hook')
+            return;
+        const now = Date.now();
+        switch (evt.event) {
+            case 'UserPromptSubmit': {
+                ccChatStart = now;
+                core.usageTracker.resetToolCounts();
+                ccPendingChatStart = true;
+                ccPendingCompletion = true; // Change 2: arm PTY fallback
+                // Claude Code v2.1+ sends { message: { content: "..." } }, not { prompt: "..." }
+                const msg = evt.data?.message;
+                const hookText = evt.data?.prompt
+                    || evt.data?.text
+                    || (typeof msg === 'object' && msg !== null ? msg.content : undefined)
+                    || (typeof msg === 'string' ? msg : '')
+                    || '';
+                ccPendingChatStartTimer = setTimeout(() => {
+                    if (ccPendingChatStart)
+                        emitChatStart(hookText);
+                }, 500);
+                break;
+            }
+            case 'PreToolUse': {
+                ccLastHookToolTs = now; // Change 1: mark hook tool time for dedup
+                const toolName = evt.data?.tool_name || 'tool';
+                const formatted = formatToolInputForTimeline(toolName, evt.data?.tool_input);
+                core.bridgeTimeline.addEntry({
+                    ts: now, type: 'tool_request',
+                    raw: formatted ? `${toolName} ${formatted}` : toolName,
+                    agentType: 'claude-code',
+                });
+                break;
+            }
+            case 'PostToolUse': {
+                // Change 3: include tool name instead of generic "Approved"
+                const resolvedTool = evt.data?.tool_name || 'tool';
+                core.bridgeTimeline.addEntry({ ts: now, type: 'tool_resolved', raw: `${resolvedTool} approved`, agentType: 'claude-code' });
+                break;
+            }
+            case 'Stop': {
+                // Race guard: if ccPendingCompletion is already false, the PTY fallback
+                // timer fired first (Stop hook arrived >1.5s after spinner_stop) and
+                // already emitted chat_response/chat_end. Skipping here prevents the
+                // duplicate-line bug visible on the dashboard timeline.
+                const wasPending = ccPendingCompletion;
+                ccPendingCompletion = false; // Change 2: disarm PTY fallback — hook handled it
+                if (ccPendingCompletionTimer) {
+                    clearTimeout(ccPendingCompletionTimer);
+                    ccPendingCompletionTimer = null;
+                }
+                if (!wasPending) {
+                    debug('timeline', 'CC Stop hook arrived after PTY fallback emit — skipping duplicate');
+                    break;
+                }
+                if (ccPendingChatStart)
+                    emitChatStart('');
+                const duration = ccChatStart ? Math.round((now - ccChatStart) / 1000) : null;
+                const toolSummary = core.usageTracker.getToolSummary();
+                // Response capture priority (CLI bridge only — the App Store Swift
+                // daemon is sandboxed off the projects/ path and relies on
+                // Task 2's response_kind heuristic instead):
+                //   1. transcript_path JSONL — authoritative; Claude Code writes
+                //      every user/assistant/tool block here, and the Stop hook
+                //      payload points at it.
+                //   2. last_assistant_message — ~18% reliable field on the hook
+                //      payload; honoured when the transcript isn't reachable.
+                //   3. PTY ringbuffer — last-resort fallback already handled by
+                //      the existing spinner_stop pathway.
+                const transcriptPath = evt.data?.transcript_path || '';
+                let lastAssistantMsg = evt.data?.last_assistant_message || '';
+                if (transcriptPath) {
+                    try {
+                        const excerpt = readClaudeTranscriptLastTurn(transcriptPath);
+                        if (excerpt?.hasAssistantText) {
+                            lastAssistantMsg = excerpt.assistantText;
+                        }
+                    }
+                    catch (err) {
+                        debug('agentdeck', `transcript read skipped: ${String(err)}`);
+                    }
+                }
+                // APME: store Claude's response on the current turn
+                const apmeRef = core.getApme();
+                if (apmeRef && lastAssistantMsg) {
+                    apmeRef.collector.setTurnResponse(core.sessionId, lastAssistantMsg);
+                }
+                emitCompletion(lastAssistantMsg, duration, toolSummary);
+                break;
+            }
+        }
+    });
+}
+// ===== Voice command handler =====
+function handleVoiceCommand(action, voiceManager, core) {
     switch (action) {
         case 'start':
             voiceManager.startRecording();
-            wsServer.broadcast({ type: 'voice_state', state: 'recording' });
+            core.wsServer.broadcast({ type: 'voice_state', state: 'recording' });
             break;
         case 'stop':
-            wsServer.broadcast({ type: 'voice_state', state: 'transcribing' });
+            core.wsServer.broadcast({ type: 'voice_state', state: 'transcribing' });
             voiceManager.stopRecording().then((text) => {
-                debug('sdc', `Voice result: "${text?.slice(0, 60) || '(empty)'}"`);
-                // Don't auto-send — plugin shows review UI; user confirms via send_prompt
-                wsServer.broadcast({ type: 'voice_state', state: 'idle', text: text || '' });
+                core.wsServer.broadcast({ type: 'voice_state', state: 'idle', text: text || '' });
             }).catch((err) => {
-                debug('sdc', `Voice transcription error: ${err}`);
-                wsServer.broadcast({ type: 'voice_state', state: 'error', error: String(err) });
+                core.wsServer.broadcast({ type: 'voice_state', state: 'error', error: String(err) });
             });
             break;
         case 'cancel':
             voiceManager.cancel();
-            wsServer.broadcast({ type: 'voice_state', state: 'idle' });
+            core.wsServer.broadcast({ type: 'voice_state', state: 'idle' });
             break;
     }
 }
-/**
- * Auto-migrate hooks:
- * 1. Hardcoded localhost:9120 → $AGENTDECK_PORT env var
- * 2. Old flat format → new matcher-group format (Claude Code v2.1+)
- *    Old: { type: "command", command: "curl ..." }
- *    New: { matcher: "", hooks: [{ type: "command", command: "curl ..." }] }
- */
-function migrateHooksIfNeeded() {
-    const settingsPath = join(homedir(), '.claude', 'settings.local.json');
-    try {
-        if (!existsSync(settingsPath))
-            return;
-        const raw = readFileSync(settingsPath, 'utf-8');
-        if (!raw.includes('AGENTDECK_PORT') && !raw.includes('localhost:9120'))
-            return;
-        const settings = JSON.parse(raw);
-        if (!settings.hooks)
-            return;
-        let migrated = false;
-        for (const event of Object.keys(settings.hooks)) {
-            const hooks = settings.hooks[event];
-            if (!Array.isArray(hooks))
-                continue;
-            for (let i = 0; i < hooks.length; i++) {
-                const hook = hooks[i];
-                // Migration 1: hardcoded port → env var
-                if (hook.command?.includes('localhost:9120') && !hook.command?.includes('AGENTDECK_PORT')) {
-                    hook.command = hook.command.replace(/localhost:9120/g, 'localhost:${AGENTDECK_PORT:-9120}');
-                    migrated = true;
-                }
-                // Migration 2: flat format → matcher-group format
-                // Detect flat format: has "type" + "command" at top level, no "hooks" array
-                if (hook.type === 'command' && hook.command?.includes('AGENTDECK_PORT') && !hook.hooks) {
-                    const handler = { type: hook.type, command: hook.command };
-                    hooks[i] = { matcher: '', hooks: [handler] };
-                    migrated = true;
-                }
-                // Also migrate matcher-group entries with hardcoded port inside
-                if (Array.isArray(hook.hooks)) {
-                    for (const inner of hook.hooks) {
-                        if (inner.command?.includes('localhost:9120') && !inner.command?.includes('AGENTDECK_PORT')) {
-                            inner.command = inner.command.replace(/localhost:9120/g, 'localhost:${AGENTDECK_PORT:-9120}');
-                            migrated = true;
-                        }
-                    }
-                }
-            }
-        }
-        if (migrated) {
-            writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n');
-            log('[sdc] Auto-migrated hooks to v2.1 matcher-group format');
-        }
-    }
-    catch (err) {
-        debug('sdc', `Hook migration check failed: ${err}`);
-    }
-}
+// ===== Hook migration =====
+import { migrateHooksIfNeeded } from '@agentdeck/hooks';
 //# sourceMappingURL=index.js.map