cli-jaw 2.0.1 → 2.0.2

package/dist/src/agent/events.js

@@ -1,10 +1,14 @@
 // ─── Event Extraction (NDJSON parser) ────────────────
 import { broadcast } from '../core/bus.js';
+import { stripUndefined } from '../core/strip-undefined.js';
+import { asCliEventArray, asCliEventRecord, fieldNumber, fieldString, isCliEventRecord, } from '../types/cli-events.js';
 import { appendLiveRunText, replaceLiveRunTools, appendLiveRunTool } from './live-run-state.js';
+import { stampTraceToolEntries } from '../trace/store.js';
 function liveScopeOf(ctx) {
     return ctx.liveScope ?? null;
 }
 function syncLiveTools(ctx) {
+    stampTraceToolEntries(ctx);
     const scope = liveScopeOf(ctx);
     if (scope)
         replaceLiveRunTools(scope, ctx.toolLog);
@@ -17,6 +21,9 @@ function syncLiveTools(ctx) {
         ctx._parentSyncedCount = total;
     }
 }
+function emitAgentTool(ctx, agentLabel, tool, empTag) {
+    broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag }, ctx.traceAudience === 'internal' ? 'internal' : 'public');
+}
 /** Flush Claude-specific stream buffers (thinking + input_json).
  *  Call on stream close to avoid data loss if content_block_stop never arrives. */
 export function flushClaudeBuffers(ctx, agentLabel, empTag = {}) {
@@ -31,7 +38,7 @@ export function flushClaudeBuffers(ctx, agentLabel, empTag = {}) {
             };
             ctx.toolLog.push(tool);
             syncLiveTools(ctx);
-            broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag });
+            emitAgentTool(ctx, agentLabel, tool, empTag);
             pushTrace(ctx, `[${agentLabel || 'agent'}] 💭 ${merged.slice(0, 200)}`);
         }
         ctx.claudeThinkingBuf = '';
@@ -46,7 +53,7 @@ export function flushClaudeBuffers(ctx, agentLabel, empTag = {}) {
                 if (existing) {
                     existing.detail = detail;
                     syncLiveTools(ctx);
-                    broadcast('agent_tool', { agentId: agentLabel, ...existing, ...empTag });
+                    emitAgentTool(ctx, agentLabel, existing, empTag);
                 }
             }
         }
@@ -133,18 +140,19 @@ function emitGeminiThought(ctx, agentLabel, empTag, text) {
     };
     ctx.toolLog.push(tool);
     syncLiveTools(ctx);
-    broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag });
+    emitAgentTool(ctx, agentLabel, tool, empTag);
 }
 function extractGeminiThoughtText(content) {
     if (typeof content === 'string')
         return content;
     if (Array.isArray(content)) {
         return content
-            .filter((p) => p?.type === 'thought' || p?.type === 'thinking')
+            .filter(isCliEventRecord)
+            .filter((p) => p.type === 'thought' || p.type === 'thinking')
             .map((p) => String(p.thought || p.text || p.content || ''))
             .join('');
     }
-    if (content && typeof content === 'object') {
+    if (isCliEventRecord(content)) {
         return String(content.thought || content.text || content.content || '');
     }
     return '';
@@ -157,7 +165,7 @@ function toIndentedPreview(text, max = 200) {
     return clipped.replace(/\n/g, '\n  ');
 }
 function isOpencodeToolFailure(part) {
-    const exitCode = part?.state?.metadata?.exit;
+    const exitCode = part?.state?.metadata?.["exit"];
     if (exitCode != null && exitCode !== 0)
         return true;
     const status = String(part?.state?.status || '').toLowerCase();
@@ -177,10 +185,11 @@ function formatOpenCodeTaskDetail(part) {
     const state = part?.state || {};
     const input = state.input || {};
     const meta = state.metadata || {};
+    const modelInfo = asCliEventRecord(meta.model);
     const model = meta.model
-        ? [meta.model.providerID, meta.model.modelID].filter(Boolean).join('/')
+        ? [modelInfo["providerID"], modelInfo["modelID"]].filter(Boolean).join('/')
         : '';
-    return appendDetail(input.prompt ? `prompt: ${clipText(String(input.prompt), 300)}` : '', model ? `model: ${model}` : '', meta.sessionId ? `child_session: ${meta.sessionId}` : '', cleanOpencodeTaskResult(state.output) ? `result: ${cleanOpencodeTaskResult(state.output)}` : '');
+    return appendDetail(input.prompt ? `prompt: ${clipText(String(input.prompt), 300)}` : '', model ? `model: ${model}` : '', meta["sessionId"] ? `child_session: ${meta["sessionId"]}` : '', cleanOpencodeTaskResult(state.output) ? `result: ${cleanOpencodeTaskResult(state.output)}` : '');
 }
 function finalizeOpencodePendingTools(ctx, agentLabel, empTag) {
     const pendingRefs = ctx.opencodePendingToolRefs || [];
@@ -194,15 +203,15 @@ function finalizeOpencodePendingTools(ctx, agentLabel, empTag) {
         existing.status = failed ? 'error' : 'done';
         existing.icon = failed ? '❌' : '✅';
         syncLiveTools(ctx);
-        broadcast('agent_tool', { agentId: agentLabel, ...existing, ...empTag });
+        emitAgentTool(ctx, agentLabel, existing, empTag);
     }
 }
 export function extractSessionId(cli, event) {
     switch (cli) {
-        case 'claude': return event.type === 'system' ? event.session_id : null;
-        case 'codex': return event.type === 'thread.started' ? event.thread_id : null;
-        case 'gemini': return event.type === 'init' ? event.session_id : null;
-        case 'opencode': return event.sessionID || null;
+        case 'claude': return event.type === 'system' ? event.session_id ?? null : null;
+        case 'codex': return event.type === 'thread.started' ? event.thread_id ?? null : null;
+        case 'gemini': return event.type === 'init' ? event.session_id ?? null : null;
+        case 'opencode': return event.sessionID ?? null;
         default: return null;
     }
 }
@@ -219,8 +228,8 @@ export function extractOutputChunk(cli, event, ctx) {
         if (event.type === 'message' && event.role === 'assistant' && event.content) {
             // Skip message events with thought content parts (ACP path)
             if (Array.isArray(event.content)) {
-                const textParts = event.content.filter((p) => p?.type === 'text');
-                return textParts.map((p) => String(p?.text || '')).join('');
+                const textParts = asCliEventArray(event.content).filter((p) => p.type === 'text');
+                return textParts.map((p) => String(p.text || '')).join('');
             }
             return String(event.content);
         }
@@ -256,11 +265,11 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
         if (!ctx.metadata)
             ctx.metadata = {};
         if (event.tools)
-            ctx.metadata.tools = event.tools;
+            ctx.metadata["tools"] = event.tools;
         if (event.mcp_servers)
-            ctx.metadata.mcp_servers = event.mcp_servers;
+            ctx.metadata["mcp_servers"] = event.mcp_servers;
         if (event.version)
-            ctx.metadata.version = event.version;
+            ctx.metadata["version"] = event.version;
     }
     // ── Claude stream buffer: thinking_delta + input_json_delta ──
     if (cli === 'claude' && event.type === 'stream_event') {
@@ -278,7 +287,7 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
         if (inner?.type === 'message_start' && inner.message?.usage) {
             if (!ctx.tokens)
                 ctx.tokens = { input_tokens: 0, output_tokens: 0 };
-            ctx.tokens.input_tokens = inner.message.usage.input_tokens ?? ctx.tokens.input_tokens;
+            ctx.tokens["input_tokens"] = inner.message.usage.input_tokens ?? ctx.tokens["input_tokens"] ?? 0;
         }
         // Buffer thinking deltas
         if (inner?.type === 'content_block_delta' && inner.delta?.type === 'thinking_delta') {
@@ -310,7 +319,7 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
             if (inner.usage.output_tokens != null) {
                 if (!ctx.tokens)
                     ctx.tokens = { input_tokens: 0, output_tokens: 0 };
-                ctx.tokens.output_tokens = inner.usage.output_tokens;
+                ctx.tokens["output_tokens"] = inner.usage.output_tokens;
             }
         }
         // content_block_stop → flush both buffers
@@ -327,7 +336,7 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
                     };
                     ctx.toolLog.push(tool);
                     syncLiveTools(ctx);
-                    broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag });
+                    emitAgentTool(ctx, agentLabel, tool, empTag);
                 }
                 ctx.claudeThinkingBuf = '';
             }
@@ -346,7 +355,7 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
                 };
                 ctx.toolLog.push(tool);
                 syncLiveTools(ctx);
-                broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag });
+                emitAgentTool(ctx, agentLabel, tool, empTag);
                 pushTrace(ctx, `[${agentLabel || 'agent'}] 🔒 encrypted thinking (sig ${sigLen}B)`);
             }
             if (ctx.claudeThinkingBlockOpen) {
@@ -367,7 +376,7 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
                             existing.detail = detail;
                             syncLiveTools(ctx);
                             // Re-broadcast with detail
-                            broadcast('agent_tool', { agentId: agentLabel, ...existing, ...empTag });
+                            emitAgentTool(ctx, agentLabel, existing, empTag);
                         }
                     }
                 }
@@ -388,7 +397,7 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
                 };
                 ctx.toolLog.push(tool);
                 syncLiveTools(ctx);
-                broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag });
+                emitAgentTool(ctx, agentLabel, tool, empTag);
             }
             ctx.claudeThinkingBuf = '';
         }
@@ -415,7 +424,7 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
                     ctx.opencodePendingToolRefs = ctx.opencodePendingToolRefs.filter(ref => ref !== toolLabel.stepRef);
                 }
                 syncLiveTools(ctx);
-                broadcast('agent_tool', { agentId: agentLabel, ...toolLabel, ...empTag });
+                emitAgentTool(ctx, agentLabel, toolLabel, empTag);
                 continue;
             }
         }
@@ -427,7 +436,7 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
                 ctx.opencodePendingToolRefs.push(toolLabel.stepRef);
         }
         syncLiveTools(ctx);
-        broadcast('agent_tool', { agentId: agentLabel, ...toolLabel, ...empTag });
+        emitAgentTool(ctx, agentLabel, toolLabel, empTag);
     }
     switch (cli) {
         case 'claude':
@@ -442,16 +451,16 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
                 }
             }
             else if (event.type === 'result') {
-                ctx.cost = event.total_cost_usd;
-                ctx.turns = event.num_turns;
-                ctx.duration = event.duration_ms;
+                ctx.cost = event.total_cost_usd ?? null;
+                ctx.turns = event.num_turns ?? null;
+                ctx.duration = event.duration_ms ?? null;
                 if (event.session_id)
                     ctx.sessionId = event.session_id;
                 // [P1-2.3] Store modelUsage for per-model token/cache breakdown
                 if (event.usage) {
                     ctx.tokens = {
                         input_tokens: event.usage.input_tokens ?? 0,
-                        output_tokens: event.usage.output_tokens ?? ctx.tokens?.output_tokens ?? 0,
+                        output_tokens: event.usage.output_tokens ?? ctx.tokens?.["output_tokens"] ?? 0,
                         cache_read: event.usage.cache_read_input_tokens ?? 0,
                         cache_creation: event.usage.cache_creation_input_tokens ?? 0,
                     };
@@ -463,7 +472,7 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
                 const tool = { icon: '⚠️', label: buildPreview(msg, 60), toolType: 'tool', status: 'warning' };
                 ctx.toolLog.push(tool);
                 syncLiveTools(ctx);
-                broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag });
+                emitAgentTool(ctx, agentLabel, tool, empTag);
                 // [P0-1.2] Parse user/tool_result feedback (stdout/stderr/is_error)
             }
             else if (event.type === 'user' && event.message?.content) {
@@ -471,13 +480,13 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
                     if (block.type === 'tool_result' && block.tool_use_id) {
                         const existing = [...ctx.toolLog].reverse().find((t) => t.stepRef === `claude:tooluse:${block.tool_use_id}`);
                         if (existing) {
-                            existing.status = block.is_error ? 'error' : 'done';
-                            existing.icon = block.is_error ? '❌' : '✅';
+                            existing.status = block["is_error"] ? 'error' : 'done';
+                            existing.icon = block["is_error"] ? '❌' : '✅';
                             const resultText = extractText(block.content);
                             if (resultText)
                                 existing.detail = (existing.detail || '') + '\n' + resultText;
                             syncLiveTools(ctx);
-                            broadcast('agent_tool', { agentId: agentLabel, ...existing, ...empTag });
+                            emitAgentTool(ctx, agentLabel, existing, empTag);
                         }
                     }
                 }
@@ -500,21 +509,21 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
                     // least one toolLog step. Dedup is handled by seenToolKeys via stepRef.
                     if (segment.trim()) {
                         const itemId = event.item.id || '';
-                        const tool = {
+                        const tool = stripUndefined({
                             icon: '💬',
                             label: buildPreview(segment, 80) || 'message',
                             toolType: 'tool',
                             detail: segment,
                             stepRef: itemId ? `codex:item:${itemId}` : undefined,
                             status: 'done',
-                        };
+                        });
                         const key = tool.stepRef || `codex:msg:${ctx.toolLog.length}:${segment.slice(0, 30)}`;
                         if (!ctx.seenToolKeys || !ctx.seenToolKeys.has(key)) {
                             if (ctx.seenToolKeys)
                                 ctx.seenToolKeys.add(key);
                             ctx.toolLog.push(tool);
                             syncLiveTools(ctx);
-                            broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag });
+                            emitAgentTool(ctx, agentLabel, tool, empTag);
                         }
                     }
                 }
@@ -535,7 +544,7 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
                         ctx.seenToolKeys?.add(doneKey);
                         ctx.toolLog.push(doneTool);
                         syncLiveTools(ctx);
-                        broadcast('agent_tool', { agentId: agentLabel, ...doneTool, ...empTag });
+                        emitAgentTool(ctx, agentLabel, doneTool, empTag);
                     }
                 }
                 if (event.item?.type === 'collab_tool_call'
@@ -547,19 +556,19 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
                 if (event.item?.type === 'command_execution') {
                     const cmd = (event.item.command || '').slice(0, 120);
                     const itemId = event.item.id || '';
-                    const tool = {
+                    const tool = stripUndefined({
                         icon: '⚡',
                         label: buildPreview(cmd, 80) || 'command',
                         toolType: 'tool',
                         detail: cmd,
                         stepRef: itemId ? `codex:cmd:${itemId}` : undefined,
-                    };
+                    });
                     const key = `${tool.icon}:${tool.label}:${tool.stepRef || ''}:`;
                     if (!ctx.seenToolKeys?.has(key)) {
                         ctx.seenToolKeys?.add(key);
                         ctx.toolLog.push(tool);
                         syncLiveTools(ctx);
-                        broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag });
+                        emitAgentTool(ctx, agentLabel, tool, empTag);
                     }
                 }
                 if (event.item?.type === 'collab_tool_call'
@@ -594,7 +603,7 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
                 };
                 ctx.toolLog.push(tool);
                 syncLiveTools(ctx);
-                broadcast('agent_tool', { agentId: agentLabel, ...tool, ...empTag });
+                emitAgentTool(ctx, agentLabel, tool, empTag);
                 pushTrace(ctx, `[${agentLabel}] codex ${event.type}: ${msg.slice(0, 200)}`);
             }
             break;
@@ -624,8 +633,9 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
                         emitGeminiThought(ctx, agentLabel, empTag, extractGeminiThoughtText(event.content));
                     }
                     const textOnly = event.content
-                        .filter((p) => p?.type === 'text')
-                        .map((p) => String(p?.text || ''))
+                        .filter(isCliEventRecord)
+                        .filter((p) => p.type === 'text')
+                        .map((p) => String(p.text || ''))
                         .join('');
                     if (textOnly) {
                         const segment = appendGeminiAssistantTextSegment(ctx, textOnly, !!event.delta);
@@ -644,8 +654,8 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
             else if (event.type === 'result') {
                 ctx.geminiDeltaActive = false;
                 ctx.geminiResultSeen = true;
-                ctx.duration = event.stats?.duration_ms;
-                ctx.turns = event.stats?.tool_calls;
+                ctx.duration = event.stats?.duration_ms ?? null;
+                ctx.turns = event.stats?.tool_calls ?? null;
                 // [P0-1.6] Store Gemini token stats
                 if (event.stats) {
                     ctx.tokens = {
@@ -693,7 +703,7 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
                     };
                     ctx.toolLog.push(thinkingTool);
                     syncLiveTools(ctx);
-                    broadcast('agent_tool', { agentId: agentLabel, ...thinkingTool, ...empTag });
+                    emitAgentTool(ctx, agentLabel, thinkingTool, empTag);
                     ctx.opencodeStepThinkingToolEmitted = true;
                     pushTrace(ctx, `[${agentLabel}] opencode reasoning (${text.length} chars)`);
                 }
@@ -708,28 +718,28 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
             }
             else if (event.type === 'tool_use') {
                 ctx.opencodeSawToolInStep = true;
-                if (isOpencodeToolFailure(event.part))
+                if (isOpencodeToolFailure(asCliEventRecord(event.part)))
                     ctx.opencodeHadToolErrorInStep = true;
             }
             else if (event.type === 'step_finish' && event.part) {
-                ctx.sessionId = event.sessionID;
+                ctx.sessionId = event.sessionID ?? null;
                 // [P0-1.7] Accumulate tokens across steps (not overwrite)
                 if (event.part.tokens) {
                     if (!ctx.tokens)
                         ctx.tokens = { input_tokens: 0, output_tokens: 0, cached_read: 0, cached_write: 0 };
-                    ctx.tokens.input_tokens += event.part.tokens.input ?? 0;
-                    ctx.tokens.output_tokens += event.part.tokens.output ?? 0;
+                    ctx.tokens["input_tokens"] = (ctx.tokens["input_tokens"] ?? 0) + (event.part.tokens.input ?? 0);
+                    ctx.tokens["output_tokens"] = (ctx.tokens["output_tokens"] ?? 0) + (event.part.tokens.output ?? 0);
                     // [P0-1.8] Cache token accumulation
                     if (event.part.tokens.cache) {
-                        ctx.tokens.cached_read += event.part.tokens.cache.read ?? 0;
-                        ctx.tokens.cached_write += event.part.tokens.cache.write ?? 0;
+                        ctx.tokens["cached_read"] = (ctx.tokens["cached_read"] ?? 0) + (event.part.tokens.cache.read ?? 0);
+                        ctx.tokens["cached_write"] = (ctx.tokens["cached_write"] ?? 0) + (event.part.tokens.cache.write ?? 0);
                     }
                     // [P2-3.13] Accumulate total tokens across steps
                     if (event.part.tokens.total != null) {
-                        ctx.tokens.total_tokens = (ctx.tokens.total_tokens ?? 0) + event.part.tokens.total;
+                        ctx.tokens["total_tokens"] = (ctx.tokens["total_tokens"] ?? 0) + event.part.tokens.total;
                     }
                     if (event.part.tokens.reasoning != null) {
-                        ctx.tokens.reasoning_tokens = (ctx.tokens.reasoning_tokens ?? 0) + event.part.tokens.reasoning;
+                        ctx.tokens["reasoning_tokens"] = (ctx.tokens["reasoning_tokens"] ?? 0) + event.part.tokens.reasoning;
                     }
                 }
                 // Accumulate cost across steps
@@ -759,7 +769,7 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
                     };
                     ctx.toolLog.push(thinkingTool);
                     syncLiveTools(ctx);
-                    broadcast('agent_tool', { agentId: agentLabel, ...thinkingTool, ...empTag });
+                    emitAgentTool(ctx, agentLabel, thinkingTool, empTag);
                     ctx.opencodeStepThinkingToolEmitted = true;
                     pushTrace(ctx, `[${agentLabel}] opencode pre-tool intermediate text (${suppressedText.length} chars)`);
                 }
@@ -778,7 +788,7 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
                     };
                     ctx.toolLog.push(thinkingTool);
                     syncLiveTools(ctx);
-                    broadcast('agent_tool', { agentId: agentLabel, ...thinkingTool, ...empTag });
+                    emitAgentTool(ctx, agentLabel, thinkingTool, empTag);
                     ctx.opencodeStepThinkingToolEmitted = true;
                     pushTrace(ctx, `[${agentLabel}] opencode reasoning token fallback (${reasoningTokens} tokens)`);
                 }
@@ -790,10 +800,10 @@ export function extractFromEvent(cli, event, ctx, agentLabel, empTag = {}) {
                 ctx.opencodePendingToolRefs = [];
                 ctx.opencodeStepThinkingToolEmitted = false;
                 // [P2-3.12] Store step timing
-                if (event.part.time) {
+                if (event.part["time"]) {
                     if (!ctx.metadata)
                         ctx.metadata = {};
-                    ctx.metadata.lastStepTime = event.part.time;
+                    ctx.metadata["lastStepTime"] = event.part["time"];
                 }
             }
             break;
@@ -905,7 +915,7 @@ function makeClaudeToolKey(event, label) {
     if (label.stepRef)
         return `claude:ref:${label.stepRef}:${label.icon}:${label.label}`;
     const msgId = event.message?.id || '';
-    const idx = event.event?.index;
+    const idx = event.event?.["index"];
     if (msgId && idx !== undefined && idx !== null)
         return `claude:msg:${msgId}:${idx}:${label.icon}:${label.label}`;
     if (idx !== undefined && idx !== null)
@@ -978,7 +988,7 @@ function extractToolLabels(cli, event, ctx = null) {
             const ref = `codex:collab:${item.id || tool}`;
             const isStarted = event.type === 'item.started' || item.status === 'in_progress';
             const receiverIds = Array.isArray(item.receiver_thread_ids) ? item.receiver_thread_ids.join(', ') : '';
-            const detail = appendDetail(item.sender_thread_id ? `sender: ${item.sender_thread_id}` : '', receiverIds ? `receivers: ${receiverIds}` : '', formatJsonDetail('agents', item.agents_states), item.prompt ? `prompt: ${clipText(String(item.prompt), 300)}` : '');
+            const detail = appendDetail(item["sender_thread_id"] ? `sender: ${item["sender_thread_id"]}` : '', receiverIds ? `receivers: ${receiverIds}` : '', formatJsonDetail('agents', item.agents_states), item.prompt ? `prompt: ${clipText(String(item.prompt), 300)}` : '');
             labels.push({
                 icon: isStarted ? '🤖' : '✅',
                 label: isStarted ? `${tool}...` : `${tool} done`,
@@ -1022,7 +1032,7 @@ function extractToolLabels(cli, event, ctx = null) {
                 const usage = event.usage || {};
                 const usageDetail = [
                     usage.total_tokens != null ? `${usage.total_tokens} tok` : '',
-                    usage.tool_uses != null ? `${usage.tool_uses} tools` : '',
+                    usage["tool_uses"] != null ? `${usage["tool_uses"]} tools` : '',
                     usage.duration_ms != null ? `${(Number(usage.duration_ms) / 1000).toFixed(1)}s` : '',
                 ].filter(Boolean).join(' · ');
                 const detail = appendDetail(event.summary ? `summary: ${event.summary}` : '', event.output_file ? `output_file: ${event.output_file}` : '', usageDetail);
@@ -1050,12 +1060,12 @@ function extractToolLabels(cli, event, ctx = null) {
             const cb = event.event.content_block;
             if (cb?.type === 'tool_use') {
                 const isAgent = cb.name === 'Agent';
-                pushToolLabel(labels, {
+                pushToolLabel(labels, stripUndefined({
                     icon: isAgent ? '🤖' : '🔧',
                     label: isAgent ? 'subagent' : (cb.name || 'tool'),
                     toolType: isAgent ? 'subagent' : 'tool',
                     stepRef: cb.id ? `claude:tooluse:${cb.id}` : undefined,
-                }, cli, event, ctx);
+                }), cli, event, ctx);
             }
             // thinking: don't emit placeholder — buffer in extractFromEvent will emit with real content
         }
@@ -1063,14 +1073,14 @@ function extractToolLabels(cli, event, ctx = null) {
             for (const block of event.message.content) {
                 if (block.type === 'tool_use') {
                     const isAgent = block.name === 'Agent';
-                    const description = block.input?.description || block.input?.subagent_type || 'subagent';
-                    pushToolLabel(labels, {
+                    const description = block.input?.description || block.input?.["subagent_type"] || 'subagent';
+                    pushToolLabel(labels, stripUndefined({
                         icon: isAgent ? '🤖' : '🔧',
                         label: isAgent ? `subagent: ${buildPreview(description, 60)}` : (block.name || 'tool'),
                         toolType: isAgent ? 'subagent' : 'tool',
                         stepRef: block.id ? `claude:tooluse:${block.id}` : undefined,
                         ...(isAgent && block.input?.prompt ? { detail: `prompt: ${clipText(String(block.input.prompt), 300)}` } : {}),
-                    }, cli, event, ctx);
+                    }), cli, event, ctx);
                 }
                 if (block.type === 'thinking') {
                     const text = (block.thinking || '').trim();
@@ -1110,7 +1120,7 @@ function extractToolLabels(cli, event, ctx = null) {
             && event.part?.callID
             && ctx?.opencodeTaskCallIds?.has(event.part.callID);
         if (isTaskToolUse || isTaskToolResult) {
-            const part = event.part;
+            const part = asCliEventRecord(event.part);
             const callID = part.callID || part.id || 'task';
             if (isTaskToolResult && !part.state)
                 return labels;
@@ -1123,7 +1133,7 @@ function extractToolLabels(cli, event, ctx = null) {
             const input = state.input || {};
             const status = String(state.status || (event.type === 'tool_result' ? 'completed' : 'completed'));
             const failed = isOpencodeToolFailure(part) || ['error', 'failed', 'cancelled', 'canceled'].includes(status);
-            const subagentType = input.subagent_type || 'general';
+            const subagentType = input["subagent_type"] || 'general';
             const description = input.description || state.title || part.tool || 'task';
             const resultText = event.type === 'tool_result'
                 ? extractText(part.content || part.output || state.output)
@@ -1146,10 +1156,10 @@ function extractToolLabels(cli, event, ctx = null) {
             const detail = summarizeToolInput(event.part.tool || '', event.part.state?.input || {}, 0)
                 || String(event.part.state?.output || '').trim();
             const isDone = event.part.state?.status === 'completed';
-            const exitCode = event.part.state?.metadata?.exit;
+            const exitCode = fieldNumber(event.part.state?.metadata?.["exit"]);
             const isFailed = isOpencodeToolFailure(event.part);
-            const displayLabel = event.part.state?.title || event.part.tool || 'tool';
-            labels.push({
+            const displayLabel = fieldString(event.part.state?.title || event.part.tool, 'tool');
+            labels.push(stripUndefined({
                 icon: isFailed ? '❌' : (isDone ? '✅' : '🔧'),
                 label: displayLabel,
                 toolType: 'tool',
@@ -1157,13 +1167,13 @@ function extractToolLabels(cli, event, ctx = null) {
                 detail,
                 status: isFailed ? 'error' : (isDone ? 'done' : undefined),
                 ...(exitCode != null ? { exitCode } : {}),
-            });
+            }));
         }
         if (event.type === 'tool_result' && event.part) {
             const ref = event.part.callID
                 ? `opencode:call:${event.part.callID}`
                 : `opencode:tool:${event.part.tool || 'tool'}`;
-            labels.push({ icon: '✅', label: event.part.tool || 'done', toolType: 'tool', stepRef: ref, status: 'done' });
+            labels.push({ icon: '✅', label: fieldString(event.part.tool, 'done'), toolType: 'tool', stepRef: ref, status: 'done' });
         }
     }
     return labels;
@@ -1187,23 +1197,24 @@ export function summarizeToolInput(toolName, input, max = 0) {
         return '';
     if (typeof input !== 'object')
         return max ? clipText(String(input), max) : String(input);
+    const data = asCliEventRecord(input);
     const s = (v) => (typeof v === 'string' ? v : v != null ? String(v) : '');
     const name = (toolName || '').toLowerCase();
     let result = '';
     if (name.includes('bash') || name.includes('terminal') || name === 'execute_command')
-        result = s(input.command || input.cmd);
+        result = s(data.command || data.cmd);
     else if (name.includes('read') || name === 'read_file' || name === 'view') {
-        const fullPath = s(input.path || input.file_path || input.filename);
+        const fullPath = s(data["path"] || data["file_path"] || data["filename"]);
         result = max ? (fullPath.split('/').pop() || fullPath) : fullPath;
     }
     else if (name.includes('write') || name.includes('edit') || name === 'create_file') {
-        const fullPath = s(input.path || input.file_path);
+        const fullPath = s(data["path"] || data["file_path"]);
         result = max ? (fullPath.split('/').pop() || fullPath) : fullPath;
     }
     else if (name.includes('search') || name.includes('grep') || name === 'codebase_search')
-        result = s(input.query || input.pattern || input.search_query);
+        result = s(data.query || data["pattern"] || data["search_query"]);
     else if (name.includes('web') || name === 'web_search')
-        result = s(input.query);
+        result = s(data.query);
     // Fallback: show first meaningful key-value if specific extraction yielded nothing
     if (!result) {
         try {
@@ -1216,10 +1227,22 @@ export function summarizeToolInput(toolName, input, max = 0) {
 // Backward-compat: return first label or null
 export function extractToolLabel(cli, event) {
     const labels = extractToolLabels(cli, event);
-    return labels.length ? labels[0] : null;
+    return labels[0] ?? null;
 }
 // Test-only helpers (keep parser logic private for runtime flow)
-export function extractToolLabelsForTest(cli, event, ctx = {}) {
+export function extractToolLabelsForTest(cli, event, ctx = {
+    fullText: '',
+    traceLog: [],
+    toolLog: [],
+    seenToolKeys: new Set(),
+    hasClaudeStreamEvents: false,
+    sessionId: null,
+    cost: null,
+    turns: null,
+    duration: null,
+    tokens: null,
+    stderrBuf: '',
+}) {
     return extractToolLabels(cli, event, ctx);
 }
 export function makeClaudeToolKeyForTest(event, label) {
@@ -1233,19 +1256,21 @@ function extractText(content) {
         return content;
     if (Array.isArray(content)) {
         return content
+            .filter(isCliEventRecord)
             .filter(c => c.type === 'text')
             .map(c => c.text || '')
             .join('');
     }
     // Single content object: {type: 'text', text: '...'}
-    if (content && typeof content === 'object' && content.type === 'text') {
+    if (isCliEventRecord(content) && content.type === 'text') {
         return content.text || '';
     }
     return '';
 }
 export function extractFromAcpUpdate(params, ctx = null) {
-    const update = params?.update;
-    if (!update)
+    const envelope = asCliEventRecord(params);
+    const update = asCliEventRecord(envelope["update"]);
+    if (!isCliEventRecord(envelope["update"]))
         return null;
     const type = update.sessionUpdate;
     switch (type) {
@@ -1261,9 +1286,9 @@ export function extractFromAcpUpdate(params, ctx = null) {
             };
         }
         case 'tool_call': {
-            const toolName = update.name || 'tool';
-            const rawInput = update.rawInput || update.input || {};
-            const isSubagentTask = rawInput?.agent_type === 'task' || rawInput?.agentType === 'task';
+            const toolName = fieldString(update.name, 'tool');
+            const rawInput = asCliEventRecord(update.rawInput || update.input);
+            const isSubagentTask = rawInput?.["agent_type"] === 'task' || rawInput?.["agentType"] === 'task';
             const displayLabel = isSubagentTask
                 ? `subagent: ${update.title || rawInput.description || rawInput.name || toolName}`
                 : update.title || toolName;
@@ -1273,7 +1298,7 @@ export function extractFromAcpUpdate(params, ctx = null) {
                 if (!ctx.acpSubagentLabels)
                     ctx.acpSubagentLabels = new Map();
                 ctx.acpSubagentToolCallIds.add(update.toolCallId);
-                ctx.acpSubagentLabels.set(update.toolCallId, displayLabel);
+                ctx.acpSubagentLabels.set(update.toolCallId, fieldString(displayLabel));
             }
             const fullInput = update.input != null
                 ? (typeof update.input === 'object' ? JSON.stringify(update.input, null, 2) : String(update.input))
@@ -1281,12 +1306,12 @@ export function extractFromAcpUpdate(params, ctx = null) {
                     ? (typeof update.rawInput === 'object' ? JSON.stringify(update.rawInput, null, 2) : String(update.rawInput))
                     : '';
             // [P1-2.10] Semantic icon from tool kind/title
-            const kindIcon = toolKindIcon(update.kind);
+            const kindIcon = toolKindIcon(fieldString(update["kind"]) || undefined);
             // [P0-1.11] Use toolCallId for unique stepRef
             return {
                 tool: {
                     icon: isSubagentTask ? '🤖' : (kindIcon || '🔧'),
-                    label: displayLabel,
+                    label: fieldString(displayLabel),
                     toolType: isSubagentTask ? 'subagent' : 'tool',
                     detail: fullInput,
                     stepRef: `acp:callid:${update.toolCallId || update.id || toolName}`,
@@ -1303,8 +1328,9 @@ export function extractFromAcpUpdate(params, ctx = null) {
                 completed: { icon: '✅', status: 'done' },
                 failed: { icon: '❌', status: 'error' },
             };
-            const mapped = statusMap[update.status] || { icon: '❔', status: update.status || 'unknown' };
-            const toolCallId = update.toolCallId || update.id || update.name || 'done';
+            const statusKey = fieldString(update.status);
+            const mapped = statusMap[statusKey] || { icon: '❔', status: statusKey || 'unknown' };
+            const toolCallId = fieldString(update.toolCallId || update.id || update.name, 'done');
             const isSubagentTask = !!(toolCallId && ctx?.acpSubagentToolCallIds?.has(toolCallId));
             const subagentLabel = toolCallId ? ctx?.acpSubagentLabels?.get(toolCallId) : '';
             // [P1-2.9] Extract content from tool result
@@ -1312,7 +1338,7 @@ export function extractFromAcpUpdate(params, ctx = null) {
             return {
                 tool: {
                     icon: mapped.icon,
-                    label: isSubagentTask ? (subagentLabel || `subagent: ${update.name || update.title || 'task'}`) : update.name || update.id || 'done',
+                    label: isSubagentTask ? (subagentLabel || `subagent: ${update.name || update.title || 'task'}`) : fieldString(update.name || update.id, 'done'),
                     toolType: isSubagentTask ? 'subagent' : 'tool',
                     stepRef: `acp:callid:${toolCallId}`,
                     status: mapped.status,
@@ -1358,19 +1384,20 @@ export function extractFromAcpUpdate(params, ctx = null) {
             };
         }
         default:
-            if (process.env.DEBUG) {
+            if (process.env["DEBUG"]) {
                 console.log(`[acp] unknown sessionUpdate: ${type}`, JSON.stringify(update).slice(0, 100));
             }
             return null;
     }
 }
 export function extractFromAcpSubagent(event) {
-    if (!event?.type || !String(event.type).startsWith('subagent.'))
+    const record = asCliEventRecord(event);
+    if (!record.type || !String(record.type).startsWith('subagent.'))
         return null;
-    const data = event.data || {};
-    const display = data.agentDisplayName || data.agentName || 'subagent';
-    const agentName = data.agentName || display;
-    switch (event.type) {
+    const data = asCliEventRecord(record["data"]);
+    const display = fieldString(data.agentDisplayName || data.agentName, 'subagent');
+    const agentName = fieldString(data.agentName, display);
+    switch (record.type) {
         case 'subagent.selected':
             return {
                 tool: {
@@ -1392,7 +1419,8 @@ export function extractFromAcpSubagent(event) {
                     status: 'done',
                 },
             };
-        case 'subagent.started':
+        case 'subagent.started': {
+            const agentDescription = fieldString(data["agentDescription"]);
             return {
                 tool: {
                     icon: '🤖',
@@ -1400,9 +1428,10 @@ export function extractFromAcpSubagent(event) {
                     toolType: 'subagent',
                     stepRef: `acp:subagent:${data.toolCallId || agentName}`,
                     status: 'running',
-                    ...(data.agentDescription ? { detail: data.agentDescription } : {}),
+                    ...(agentDescription ? { detail: agentDescription } : {}),
                 },
             };
+        }
         case 'subagent.completed':
             return {
                 tool: {