@agentdeck/bridge 1.0.18 → 1.0.20

package/dist/index.js

@@ -14,7 +14,6 @@ import { readLastTurn as readClaudeTranscriptLastTurn } from './apme/claude-tran
 import { claudeHookToSpans } from './apme/adapters/claude-hook.js';
 import { codexHookToSpans } from './apme/adapters/codex-hook.js';
 import { CodexTurnManager } from './apme/adapters/codex-turn-manager.js';
-import { claudePtyParserEventToSpans, claudePtyResponseToSpan } from './apme/adapters/claude-pty.js';
 import { timelineEntryToSpans } from './apme/adapters/timeline.js';
 import { classifyAndEnqueueTurn } from './apme/classify-turn.js';
 import { VoiceManager } from './voice.js';
@@ -23,6 +22,8 @@ import { enableDebugLog, log, debug, setPtyMode } from './logger.js';
 import { EventJournal } from './event-journal.js';
 import { PtyRingBuffer } from './pty-ringbuffer.js';
 import { isSubagentOnlyHook, SubagentTimelineTracker } from './subagent-timeline.js';
+import { ClaudeTurnWatchdog } from './claude-turn-watchdog.js';
+import { CodexHookSilenceWarning } from './codex-hook-silence.js';
 import { createDiagDump } from './diag-analyzer.js';
 import { createAdapter, ClaudeCodeAdapter, CodexCliAdapter, OpenCodeAdapter } from './adapters/index.js';
 import { MonitorAdapter } from './adapters/monitor.js';
@@ -106,6 +107,14 @@ export async function startSession(opts) {
             process.exit(1);
         for (const w of deps.warnings)
             log(`WARNING: ${w}`);
+        if (agentType === 'codex-cli' && deps.agentVersion) {
+            const { satisfiesRange, getCompatibleCodexRange } = await import('./version-check.js');
+            const codexRange = getCompatibleCodexRange() ?? '>=0.141.0';
+            if (!satisfiesRange(deps.agentVersion, codexRange)) {
+                log(`WARNING: Codex ${deps.agentVersion} predates the lifecycle-hook baseline (${codexRange}). ` +
+                    'The terminal can start, but AgentDeck lifecycle monitoring requires a newer Codex CLI.');
+            }
+        }
         // Version compatibility check (Claude Code only — uses npm registry + compatibleClaudeCode range)
         if (agentType === 'claude-code' && !opts.noUpdateCheck) {
             const { checkVersionCompatibility } = await import('./version-check.js');
@@ -157,6 +166,15 @@ export async function startSession(opts) {
     if (adapter instanceof ClaudeCodeAdapter) {
         adapter.seedProjectName(projectName);
     }
+    // Codex fires codex_session_start within seconds of the PTY spawning —
+    // before the main wiring below registers its listeners — so capture the
+    // fact early or the hook-silence warning would misread a healthy install
+    // as lifecycle-blind.
+    let codexHookSeenEarly = false;
+    adapter.on('event', (evt) => {
+        if (evt.source === 'hook' && evt.event.startsWith('codex_'))
+            codexHookSeenEarly = true;
+    });
     // ===== Start adapter (creates HTTP server, spawns process) =====
     try {
         await adapter.start({ port, command: opts.command, gatewayUrl: opts.gatewayUrl });
@@ -443,20 +461,60 @@ export async function startSession(opts) {
     });
     // Claude Code hook events → timeline entries
     if (agentType === 'claude-code') {
-        wireClaudeCodeTimeline(adapter, core, journal, ptyRingBuffer);
+        wireClaudeCodeTimeline(adapter, core);
+        // Missed-Stop recovery: when the hook channel goes quiet mid-turn, the
+        // transcript JSONL tail (the Stop branch's own authority) is probed and a
+        // proven-finished turn is closed by injecting a synthetic Stop through
+        // this same event pipe — state machine, timeline, and APME all close via
+        // their existing Stop paths, and a late real Stop dedups downstream.
+        const turnWatchdog = new ClaudeTurnWatchdog({
+            onMissedStop: ({ transcript_path }) => {
+                adapter.emit('event', {
+                    source: 'hook',
+                    event: 'Stop',
+                    data: { transcript_path, synthetic_stop: true },
+                });
+            },
+        });
+        adapter.on('event', (evt) => {
+            if (evt.source === 'hook')
+                turnWatchdog.noteHookEvent(evt.event, evt.data ?? {});
+        });
+        core.onShutdown(() => turnWatchdog.stop());
+    }
+    // Codex lifecycle-channel dead-on-arrival warning: hooks and notify share
+    // the same curl/port mechanism, so when both are silent the session is
+    // lifecycle-blind with no signal at all. Warn once if the PTY is clearly in
+    // use but no codex_* event ever arrived. `--no-codex-hooks` opted out.
+    if (agentType === 'codex-cli' && opts.codexHooksExpected !== false) {
+        const hookSilence = new CodexHookSilenceWarning({
+            onSilent: () => {
+                log('WARNING: no Codex lifecycle event has reached this bridge — state/timeline/eval are blind for this session.');
+                log('Repair: rerun `agentdeck codex` (reinstalls hooks) or `agentdeck daemon install`, and check [hooks]/notify in ~/.codex/config.toml.');
+                core.bridgeTimeline.addEntry({
+                    ts: Date.now(),
+                    type: 'error',
+                    raw: 'Codex lifecycle hooks silent — session is lifecycle-blind',
+                    detail: 'The terminal is active but no codex_* hook or notify event arrived. Hooks and the notify fallback share one curl/port path in ~/.codex/config.toml, so a stale port or config-layer conflict kills both. Rerun `agentdeck codex` or `agentdeck daemon install` to repair.',
+                    agentType: 'codex-cli',
+                });
+            },
+        });
+        if (codexHookSeenEarly)
+            hookSilence.noteHookEvent();
+        adapter.on('event', (evt) => {
+            if (evt.source === 'hook' && evt.event.startsWith('codex_'))
+                hookSilence.noteHookEvent();
+            else if (evt.source === 'activity')
+                hookSilence.noteActivity();
+        });
+        core.onShutdown(() => hookSilence.stop());
     }
     // APME wiring for non-Claude-Code agents (OpenCode, Codex, OpenClaw)
     if (apme && agentType !== 'claude-code' && agentType !== 'monitor') {
-        wireAgentApme(adapter, agentType, apme, core, ptyRingBuffer);
+        wireAgentApme(adapter, agentType, apme, core);
     }
     // ===== 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':
@@ -479,28 +537,6 @@ export async function startSession(opts) {
                         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
                 // APME-off fallback: task rows from boundary hooks alone.
                 if (fallbackTasks)
                     fallbackTasks.ingestHook(core.sessionId, evt.event, evt.data ?? {});
@@ -511,67 +547,14 @@ export async function startSession(opts) {
                 core.stateMachine.handleHookEvent(evt.event, evt.data);
                 break;
             case 'parser':
-                journal.write('parser_emit', 'pty', { event: evt.event, ...evt.data });
+                // Structured adapters (OpenCode SSE / OpenClaw Gateway) normalize
+                // their native event streams into the legacy state vocabulary.
+                journal.write('adapter_signal', agentType, { event: 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 'terminal_ui':
+                journal.write('terminal_ui', 'pty', { event: evt.event, ...evt.data });
+                core.stateMachine.handleTerminalUiEvent(evt.event, evt.data);
                 break;
             case 'metadata':
                 switch (evt.event) {
@@ -587,11 +570,6 @@ export async function startSession(opts) {
                         const text = evt.data?.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': {
@@ -1266,14 +1244,12 @@ export async function startSession(opts) {
 // ===== 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) {
+function wireAgentApme(adapter, agentType, apme, core) {
     const sid = core.sessionId;
-    // Codex turn boundaries (hook-primary, PTY-fallback) live in their own
-    // module. The class encapsulates the seven-state-variable PTY-only
-    // machine plus the hook-fresh shortcut so non-codex sessions allocate
-    // nothing here.
+    // Codex turn boundaries and rollout response capture live in their own
+    // hook-owned module so non-Codex sessions allocate nothing here.
     const codexManager = agentType === 'codex-cli'
-        ? new CodexTurnManager(core, apme, ptyRingBuffer, sid, agentType)
+        ? new CodexTurnManager(core, apme, sid, agentType)
         : null;
     adapter.on('event', (evt) => {
         if (evt.source === 'hook' && isSubagentOnlyHook(evt.event, evt.data ?? {})) {
@@ -1309,12 +1285,10 @@ function wireAgentApme(adapter, agentType, apme, core, ptyRingBuffer) {
                 void classifyAndEnqueueTurn(apme, sid);
             }
         }
-        // ── Codex: hook (primary) + PTY-parser fallback ──
+        // ── Codex: lifecycle hooks + notify turn-complete fallback ──
         if (codexManager) {
             if (evt.source === 'hook')
                 codexManager.onHookEvent(evt);
-            else if (evt.source === 'parser')
-                codexManager.onParserEvent(evt);
         }
     });
     if (codexManager) {
@@ -1338,14 +1312,12 @@ function isClaudeTaskNotificationPrompt(text) {
     return text.trim().toLowerCase().startsWith('<task-notification>');
 }
 // ===== Claude Code timeline wiring =====
-function wireClaudeCodeTimeline(adapter, core, journal, ptyRingBuffer) {
+function wireClaudeCodeTimeline(adapter, core) {
     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;
+    let ccPendingCompletion = false;
     const emitChatStart = (text) => {
         if (ccPendingChatStartTimer) {
             clearTimeout(ccPendingChatStartTimer);
@@ -1376,33 +1348,8 @@ function wireClaudeCodeTimeline(adapter, core, journal, ptyRingBuffer) {
             startedAt: ccChatStart ?? Date.now(),
         });
     };
-    /** 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 a single Claude turn-close row (shared by Stop hook and PTY fallback):
+     * Emit a single Claude turn-close row from the authoritative Stop hook:
      * a `chat_response` when there is meaningful response text, otherwise a
      * `chat_end`. The two are mutually exclusive so a turn never produces both —
      * the paired dimmed `chat_end` used to fragment every turn into three rows on
@@ -1501,48 +1448,6 @@ function wireClaudeCodeTimeline(adapter, core, journal, ptyRingBuffer) {
             }
         }
     });
-    // 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;
@@ -1554,7 +1459,7 @@ function wireClaudeCodeTimeline(adapter, core, journal, ptyRingBuffer) {
                 ccChatStart = now;
                 core.usageTracker.resetToolCounts();
                 ccPendingChatStart = true;
-                ccPendingCompletion = true; // Change 2: arm PTY fallback
+                ccPendingCompletion = true;
                 // Claude Code v2.1+ sends { message: { content: "..." } }, not { prompt: "..." }
                 const msg = evt.data?.message;
                 const hookText = evt.data?.prompt
@@ -1569,7 +1474,6 @@ function wireClaudeCodeTimeline(adapter, core, journal, ptyRingBuffer) {
                 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({
@@ -1586,18 +1490,10 @@ function wireClaudeCodeTimeline(adapter, core, journal, ptyRingBuffer) {
                 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;
-                }
+                ccPendingCompletion = false;
                 if (!wasPending) {
-                    debug('timeline', 'CC Stop hook arrived after PTY fallback emit — skipping duplicate');
+                    debug('timeline', 'duplicate Claude Stop hook ignored');
                     break;
                 }
                 if (ccPendingChatStart)
@@ -1612,8 +1508,6 @@ function wireClaudeCodeTimeline(adapter, core, journal, ptyRingBuffer) {
                 //      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) {