@murphai/murph 1.3.0 → 1.3.1

package/node_modules/@murphai/assistant-engine/dist/assistant-codex-events.js

@@ -3,8 +3,8 @@
  * assistant-codex.ts can stay focused on process execution and config loading.
  */
 import { homedir } from 'node:os';
-import { normalizeNullableString } from '@murphai/operator-config/text/shared';
 import { createAssistantProviderToolProgressEvent, } from './assistant/provider-progress.js';
+import { readCodexFiniteNumber, readCodexNonEmptyString, readCodexRecord, readCodexServerNotification, readCodexString, } from './assistant-codex/app-server-protocol.js';
 export const CODEX_CONTEXT_COMPACTION_PROGRESS_TEXTS = [
     'Hang on, refreshing my memory real quick.',
     'One moment while I catch up on our conversation.',
@@ -108,169 +108,147 @@ export const CODEX_CONTEXT_COMPACTION_PROGRESS_TEXTS = [
     'Reading the thread again so I stay grounded in what we said.',
 ];
 export function normalizeCodexEvent(event) {
-    const record = asRecord(event);
-    if (!record) {
+    const notification = readCodexServerNotification(event);
+    if (!notification) {
         return {
             kind: 'unknown',
-            eventType: null,
+            eventType: readCodexString(readCodexRecord(event)?.method),
             rawEvent: event,
         };
     }
-    const eventType = normalizeIdentifier(typeof record.type === 'string'
-        ? record.type
-        : typeof record.method === 'string'
-            ? record.method
-            : typeof record.event === 'string'
-                ? record.event
-                : null);
-    const errorText = extractCodexErrorMessage(event);
-    const normalizedErrorText = normalizeStatusText(errorText);
-    if (normalizedErrorText) {
+    const eventType = notification.method;
+    const params = notification.params;
+    const errorText = normalizeStatusText(extractCodexErrorMessage(notification));
+    if (errorText) {
         return {
             kind: 'error',
-            message: normalizedErrorText,
-            rawEvent: event,
-        };
-    }
-    if (!eventType) {
-        return {
-            kind: 'unknown',
-            eventType: null,
+            message: errorText,
             rawEvent: event,
         };
     }
-    if (eventType === 'model.rerouted') {
-        const model = normalizeStatusText(findDeepStringByKeys(record, ['model', 'target_model', 'targetModel']) ??
-            null);
-        if (!model) {
-            return {
-                kind: 'unknown',
-                eventType,
+    if (eventType === 'model/rerouted') {
+        const model = normalizeStatusText(readCodexString(params.toModel));
+        return model
+            ? {
+                kind: 'model_rerouted',
+                model,
                 rawEvent: event,
-            };
-        }
-        return {
-            kind: 'model_rerouted',
-            model,
-            rawEvent: event,
-        };
-    }
-    const item = extractCodexEventItem(record);
-    const itemType = extractCodexEventItemType(record, item);
-    const itemState = eventType === 'item.started'
-        ? 'running'
-        : eventType === 'item.completed'
-            ? 'completed'
-            : null;
-    const itemId = extractCodexItemId(record, item);
-    if (eventType.includes('agent.message.delta') ||
-        eventType.includes('assistant.message.delta')) {
-        const deltaText = extractEventTextDelta(record);
-        if (!deltaText) {
-            return {
+            }
+            : {
                 kind: 'unknown',
                 eventType,
                 rawEvent: event,
             };
-        }
-        return {
+    }
+    if (eventType === 'item/agentMessage/delta') {
+        return normalizeCodexTextDeltaEvent({
+            event,
+            eventType,
             kind: 'assistant_delta',
-            deltaText,
-            itemId,
-            rawEvent: event,
-        };
+            params,
+        });
     }
-    if (eventType.includes('reasoning.summary.text.delta') ||
-        eventType.includes('reasoning.text.delta')) {
-        const deltaText = extractEventTextDelta(record);
-        if (!deltaText) {
-            return {
-                kind: 'unknown',
-                eventType,
-                rawEvent: event,
-            };
-        }
-        return {
+    if (eventType === 'item/reasoning/summaryTextDelta' ||
+        eventType === 'item/reasoning/textDelta') {
+        return normalizeCodexTextDeltaEvent({
+            event,
+            eventType,
             kind: 'reasoning_delta',
-            deltaText,
-            itemId,
-            rawEvent: event,
-        };
+            params,
+        });
     }
-    if (eventType.endsWith('plan.updated')) {
-        const text = extractCodexEventPlanText(record);
-        if (!text) {
-            return {
+    if (eventType === 'item/plan/delta') {
+        const text = normalizeStreamingText(readCodexString(params.delta));
+        return text
+            ? {
+                kind: 'plan_update',
+                itemId: readCodexNonEmptyString(params.itemId),
+                rawEvent: event,
+                text,
+            }
+            : {
                 kind: 'unknown',
                 eventType,
                 rawEvent: event,
             };
-        }
-        return {
-            kind: 'plan_update',
-            itemId,
-            rawEvent: event,
-            text,
-        };
     }
-    if (itemType === 'agent.message' || itemType === 'assistant.message') {
-        if (!itemState) {
-            return {
-                kind: 'unknown',
-                eventType,
+    if (eventType === 'turn/plan/updated') {
+        const text = extractCodexTurnPlanText(params);
+        return text
+            ? {
+                kind: 'plan_update',
+                itemId: null,
                 rawEvent: event,
-            };
-        }
-        const text = extractAssistantTextFromItem(item);
-        if (!text) {
-            return {
+                text,
+            }
+            : {
                 kind: 'unknown',
                 eventType,
                 rawEvent: event,
             };
-        }
+    }
+    const itemState = eventType === 'item/started'
+        ? 'running'
+        : eventType === 'item/completed'
+            ? 'completed'
+            : null;
+    if (!itemState) {
         return {
-            kind: 'assistant_message',
-            itemId,
-            itemState,
-            messagePhase: extractAssistantMessagePhase(record, item),
+            kind: 'unknown',
+            eventType,
             rawEvent: event,
-            text,
         };
     }
-    if (!itemType || !itemState) {
+    const item = readCodexRecord(params.item);
+    const itemType = readCodexNonEmptyString(item?.type);
+    const itemId = readCodexNonEmptyString(item?.id);
+    if (!item || !itemType) {
         return {
             kind: 'unknown',
             eventType,
             rawEvent: event,
         };
     }
-    if (itemType === 'web.search') {
+    if (itemType === 'agentMessage') {
+        const text = extractAssistantTextFromItem(item);
+        return text
+            ? {
+                kind: 'assistant_message',
+                itemId,
+                itemState,
+                messagePhase: extractAssistantMessagePhase(item),
+                rawEvent: event,
+                text,
+            }
+            : {
+                kind: 'unknown',
+                eventType,
+                rawEvent: event,
+            };
+    }
+    if (itemType === 'webSearch') {
         return {
             kind: 'web_search',
             itemId,
             itemState,
-            query: normalizeStatusText(findDeepStringByKeys(item, ['query', 'search_query', 'searchQuery']) ??
-                null),
+            query: normalizeStatusText(readCodexString(item.query)),
             rawEvent: event,
         };
     }
-    if (itemType === 'mcp.tool.call' || itemType === 'tool.call') {
+    if (itemType === 'mcpToolCall' || itemType === 'dynamicToolCall') {
         return {
             kind: 'tool_call',
             itemId,
             itemState,
             rawEvent: event,
-            toolName: normalizeStatusText(findDeepStringByKeys(item, ['tool', 'tool_name', 'toolName', 'name']) ??
-                null),
-            toolServer: normalizeStatusText(findDeepStringByKeys(item, ['server', 'server_name', 'serverName']) ??
-                null),
+            toolName: normalizeStatusText(readCodexString(item.tool)),
+            toolServer: normalizeStatusText(readCodexString(itemType === 'mcpToolCall' ? item.server : item.namespace)),
         };
     }
     return {
         kind: 'status_item',
         commandLabel: extractCommandLikeLabel(item),
-        exitCode: extractNumericField(item, ['exit_code', 'exitCode']),
+        exitCode: extractNumericField(item, 'exitCode'),
         filePaths: collectFilePaths(item),
         itemId,
         itemState,
@@ -280,6 +258,36 @@ export function normalizeCodexEvent(event) {
         rawEvent: event,
     };
 }
+function normalizeCodexTextDeltaEvent(input) {
+    const deltaText = normalizeStreamingText(readCodexString(input.params.delta));
+    if (!deltaText) {
+        return {
+            kind: 'unknown',
+            eventType: input.eventType,
+            rawEvent: input.event,
+        };
+    }
+    return {
+        kind: input.kind,
+        deltaText,
+        itemId: readCodexNonEmptyString(input.params.itemId),
+        rawEvent: input.event,
+    };
+}
+function extractCodexTurnPlanText(params) {
+    const explanation = normalizeStreamingText(readCodexString(params.explanation));
+    if (explanation) {
+        return explanation;
+    }
+    if (!Array.isArray(params.plan)) {
+        return null;
+    }
+    const steps = params.plan.flatMap((step) => {
+        const text = readCodexNonEmptyString(readCodexRecord(step)?.step);
+        return text ? [text] : [];
+    });
+    return steps.length > 0 ? steps.join('\n') : null;
+}
 export function extractCodexProgressEventFromNormalized(normalized) {
     if (normalized.kind === 'error') {
         return {
@@ -304,18 +312,18 @@ export function extractCodexProgressEventFromNormalized(normalized) {
         if (!text) {
             return null;
         }
-        const safeLabel = normalized.itemType === 'command.execution'
+        const safeLabel = normalized.itemType === 'commandExecution'
             ? summarizeCodexCommandProgressLabel(normalized.commandLabel)
             : null;
         return {
             id: normalized.itemId,
             kind: statusItemProgressKind(normalized),
-            label: normalized.itemType === 'command.execution'
+            label: normalized.itemType === 'commandExecution'
                 ? normalized.commandLabel
                 : null,
             rawEvent: normalized.rawEvent,
             safeLabel,
-            safeText: normalized.itemType === 'command.execution'
+            safeText: normalized.itemType === 'commandExecution'
                 ? commandProgressSafeText(normalized.itemState, safeLabel)
                 : null,
             state: normalized.itemState,
@@ -368,7 +376,7 @@ export function isCodexCompletedFinalAgentMessageItemFromNormalized(normalized)
 export function isCodexCompletedUserMessageItemFromNormalized(normalized) {
     return (normalized.kind === 'status_item' &&
         normalized.itemState === 'completed' &&
-        normalized.itemType === 'user.message');
+        normalized.itemType === 'userMessage');
 }
 export function selectCodexContextCompactionProgressText() {
     const index = Math.floor(Math.random() * CODEX_CONTEXT_COMPACTION_PROGRESS_TEXTS.length);
@@ -498,7 +506,7 @@ export function extractCodexTraceUpdatesFromNormalized(normalized) {
             {
                 kind: 'status',
                 mode: 'replace',
-                streamKey: buildTraceStreamKey('status', normalized.itemId ?? 'tool.call'),
+                streamKey: buildTraceStreamKey('status', normalized.itemId ?? 'toolCall'),
                 text,
             },
         ];
@@ -512,7 +520,7 @@ export function extractCodexTraceUpdatesFromNormalized(normalized) {
             {
                 kind: 'status',
                 mode: 'replace',
-                streamKey: buildTraceStreamKey('status', normalized.itemId ?? 'web.search'),
+                streamKey: buildTraceStreamKey('status', normalized.itemId ?? 'webSearch'),
                 text,
             },
         ];
@@ -523,10 +531,10 @@ function statusItemProgressKind(event) {
     if (event.itemType === 'reasoning') {
         return 'reasoning';
     }
-    if (event.itemType === 'command.execution') {
+    if (event.itemType === 'commandExecution') {
         return 'command';
     }
-    if (event.itemType === 'file.change') {
+    if (event.itemType === 'fileChange') {
         return 'file';
     }
     if (event.itemType === 'plan') {
@@ -541,13 +549,13 @@ function statusItemProgressText(event) {
                 ? 'Thinking…'
                 : 'Thought through the next step.'));
     }
-    if (event.itemType === 'command.execution') {
+    if (event.itemType === 'commandExecution') {
         if (!event.commandLabel) {
             return null;
         }
         return `$ ${event.commandLabel}`;
     }
-    if (event.itemType === 'file.change') {
+    if (event.itemType === 'fileChange') {
         return event.filePaths.length === 0
             ? 'Updated files.'
             : event.filePaths.length === 1
@@ -562,7 +570,7 @@ function statusItemProgressText(event) {
     return null;
 }
 function statusItemTraceText(event) {
-    if (event.itemType === 'command.execution') {
+    if (event.itemType === 'commandExecution') {
         const isRunning = event.itemState === 'running';
         if (isRunning) {
             return event.commandLabel
@@ -585,7 +593,7 @@ function statusItemTraceText(event) {
     if (event.itemType === 'reasoning') {
         return event.reasoningText ?? null;
     }
-    if (event.itemType === 'file.change' && event.itemState === 'completed') {
+    if (event.itemType === 'fileChange' && event.itemState === 'completed') {
         if (event.filePaths.length === 0) {
             return 'Updated files.';
         }
@@ -597,7 +605,7 @@ function statusItemTraceText(event) {
     return null;
 }
 function contextCompactionStartedText(event) {
-    if (event.itemType !== 'context.compaction' ||
+    if (event.itemType !== 'contextCompaction' ||
         event.itemState !== 'running') {
         return null;
     }
@@ -648,187 +656,43 @@ function commandProgressSafeText(state, safeLabel) {
 function statusItemTraceStreamId(event) {
     return event.itemId ?? event.itemType;
 }
-function extractCodexEventItem(event) {
-    const directItem = asRecord(event.item);
-    if (directItem) {
-        return directItem;
-    }
-    const data = asRecord(event.data);
-    const nestedItem = asRecord(data?.item);
-    if (nestedItem) {
-        return nestedItem;
-    }
-    const params = asRecord(event.params);
-    const paramsItem = asRecord(params?.item);
-    if (paramsItem) {
-        return paramsItem;
-    }
-    return null;
-}
-function extractCodexEventItemType(event, item) {
-    const params = asRecord(event.params);
-    const candidate = typeof item?.type === 'string'
-        ? item.type
-        : typeof event.item_type === 'string'
-            ? event.item_type
-            : typeof event.itemType === 'string'
-                ? event.itemType
-                : typeof params?.item_type === 'string'
-                    ? params.item_type
-                    : typeof params?.itemType === 'string'
-                        ? params.itemType
-                        : null;
-    return normalizeIdentifier(candidate);
-}
-function extractCodexItemId(event, item) {
-    const params = asRecord(event.params);
-    const candidate = typeof item?.id === 'string'
-        ? item.id
-        : typeof event.item_id === 'string'
-            ? event.item_id
-            : typeof event.itemId === 'string'
-                ? event.itemId
-                : typeof params?.item_id === 'string'
-                    ? params.item_id
-                    : typeof params?.itemId === 'string'
-                        ? params.itemId
-                        : null;
-    return normalizeNullableString(candidate) ?? null;
-}
-function extractCodexEventPlanText(event) {
-    return normalizeStreamingText(findDeepStringByKeys(event, ['explanation', 'summary', 'plan']) ?? null);
-}
 function extractCodexItemPlanText(item) {
-    return normalizeStreamingText(findDeepStringByKeys(item, ['explanation', 'summary', 'message', 'text']) ?? null);
+    return item.type === 'plan'
+        ? normalizeStreamingText(readCodexString(item.text))
+        : null;
 }
 function extractAssistantTextFromItem(item) {
-    if (!item) {
-        return null;
-    }
-    return normalizeStreamingText(typeof item.text === 'string'
-        ? item.text
-        : typeof item.message === 'string'
-            ? item.message
-            : collectTextParts(item.content) ?? collectTextParts(item.parts));
+    return normalizeStreamingText(readCodexString(item.text));
 }
-function extractAssistantMessagePhase(event, item) {
-    const params = asRecord(event.params);
-    const candidate = typeof item?.phase === 'string'
+function extractAssistantMessagePhase(item) {
+    return item.phase === 'commentary' || item.phase === 'final_answer'
         ? item.phase
-        : typeof event.phase === 'string'
-            ? event.phase
-            : typeof params?.phase === 'string'
-                ? params.phase
-                : null;
-    switch (normalizeIdentifier(candidate)) {
-        case 'commentary':
-            return 'commentary';
-        case 'final.answer':
-            return 'final_answer';
-        default:
-            return null;
-    }
+        : null;
 }
 function extractReasoningTextFromItem(item) {
-    if (!item) {
-        return null;
-    }
-    return normalizeStreamingText(collectReasoningSummaryParts(item.summary) ??
-        collectReasoningSummaryParts(item.summary_parts) ??
-        collectTextParts(item.content) ??
-        collectTextParts(item.parts) ??
-        (typeof item.text === 'string' ? item.text : null));
-}
-function collectReasoningSummaryParts(value) {
-    if (!Array.isArray(value)) {
-        return null;
-    }
-    const parts = value
-        .map((part) => {
-        if (typeof part === 'string') {
-            return part;
-        }
-        const record = asRecord(part);
-        if (!record) {
-            return null;
-        }
-        return collectTextParts(record.text) ?? collectTextParts(record.content);
-    })
-        .filter((part) => typeof part === 'string' && part.length > 0);
-    if (parts.length === 0) {
+    if (item.type !== 'reasoning') {
         return null;
     }
-    return parts.join('\n\n');
-}
-function collectTextParts(value) {
-    if (typeof value === 'string') {
-        return value;
-    }
-    if (!Array.isArray(value)) {
-        const record = asRecord(value);
-        if (!record) {
-            return null;
-        }
-        return ((typeof record.text === 'string' ? record.text : null) ??
-            (typeof record.value === 'string' ? record.value : null) ??
-            collectTextParts(record.content));
-    }
-    const parts = [];
-    for (const entry of value) {
-        if (typeof entry === 'string') {
-            parts.push(entry);
-            continue;
-        }
-        const record = asRecord(entry);
-        if (!record) {
-            continue;
-        }
-        const nestedText = (typeof record.text === 'string' ? record.text : null) ??
-            (typeof record.value === 'string' ? record.value : null) ??
-            collectTextParts(record.content);
-        if (nestedText) {
-            parts.push(nestedText);
-        }
-    }
-    if (parts.length === 0) {
-        return null;
+    const summary = collectCodexStringArray(item.summary);
+    if (summary) {
+        return normalizeStreamingText(summary.join('\n\n'));
     }
-    return parts.join('');
+    const content = collectCodexStringArray(item.content);
+    return content
+        ? normalizeStreamingText(content.join('\n\n'))
+        : null;
 }
-function extractEventTextDelta(record) {
-    const params = asRecord(record.params);
-    const directDelta = (typeof record.delta === 'string' ? record.delta : null) ??
-        (typeof record.text_delta === 'string' ? record.text_delta : null) ??
-        (typeof record.textDelta === 'string' ? record.textDelta : null) ??
-        (typeof record.text === 'string' ? record.text : null) ??
-        (typeof record.value === 'string' ? record.value : null) ??
-        (typeof params?.delta === 'string' ? params.delta : null) ??
-        (typeof params?.text_delta === 'string' ? params.text_delta : null) ??
-        (typeof params?.textDelta === 'string' ? params.textDelta : null) ??
-        (typeof params?.text === 'string' ? params.text : null) ??
-        (typeof params?.value === 'string' ? params.value : null);
-    if (directDelta) {
-        return normalizeStreamingText(directDelta);
-    }
-    const delta = asRecord(record.delta) ?? asRecord(params?.delta);
-    if (!delta) {
+function collectCodexStringArray(value) {
+    if (!Array.isArray(value) || value.some((part) => typeof part !== 'string')) {
         return null;
     }
-    return normalizeStreamingText((typeof delta.text === 'string' ? delta.text : null) ??
-        (typeof delta.value === 'string' ? delta.value : null) ??
-        (typeof delta.content === 'string' ? delta.content : null) ??
-        null);
+    const parts = value.filter((part) => part.length > 0);
+    return parts.length > 0 ? parts : null;
 }
 function extractCommandLikeLabel(item) {
-    return normalizeStatusText(findDeepStringByKeys(item, [
-        'command',
-        'command_line',
-        'commandLine',
-        'cmd',
-        'label',
-        'description',
-        'query',
-    ]) ?? null);
+    return item.type === 'commandExecution'
+        ? normalizeStatusText(readCodexString(item.command))
+        : null;
 }
 function summarizeCodexCommandProgressLabel(value) {
     const normalized = normalizeStatusText(value);
@@ -873,6 +737,9 @@ function splitCodexCommandLabel(value) {
     return value.match(/"[^"]*"|'[^']*'|\S+/gu) ?? [];
 }
 function simplifyCodexCommandToken(token) {
+    if (!token) {
+        return null;
+    }
     const trimmed = token.trim();
     if (trimmed.length === 0) {
         return null;
@@ -887,75 +754,23 @@ function simplifyCodexCommandToken(token) {
     }
     const slashParts = compact.split(/[\\/]/u);
     const tail = slashParts[slashParts.length - 1] ?? compact;
-    if (tail.length === 0) {
-        return null;
-    }
     return normalizeStatusText(tail) ?? normalizeStatusText(compact);
 }
 function collectFilePaths(item) {
-    const collected = new Set();
-    collectDeepStringsByKeys(item, ['path', 'file_path', 'filePath', 'relative_path', 'relativePath'], collected);
-    return [...collected];
-}
-function collectDeepStringsByKeys(value, keys, output, visited = new Set()) {
-    if (!value || typeof value !== 'object') {
-        return;
-    }
-    if (visited.has(value)) {
-        return;
+    if (item.type !== 'fileChange' || !Array.isArray(item.changes)) {
+        return [];
     }
-    visited.add(value);
-    if (Array.isArray(value)) {
-        for (const entry of value) {
-            collectDeepStringsByKeys(entry, keys, output, visited);
-        }
-        return;
-    }
-    const record = value;
-    for (const key of keys) {
-        const candidate = record[key];
-        if (typeof candidate === 'string') {
-            const normalizedCandidate = redactCodexStatusText(candidate.trim());
-            if (normalizedCandidate.length > 0) {
-                output.add(normalizedCandidate);
-            }
+    const paths = new Set();
+    for (const change of item.changes) {
+        const path = readCodexNonEmptyString(readCodexRecord(change)?.path);
+        if (path) {
+            paths.add(redactCodexStatusText(path));
         }
     }
-    for (const nested of Object.values(record)) {
-        collectDeepStringsByKeys(nested, keys, output, visited);
-    }
+    return [...paths];
 }
-function extractNumericField(value, keys, visited = new Set()) {
-    if (!value || typeof value !== 'object') {
-        return null;
-    }
-    if (visited.has(value)) {
-        return null;
-    }
-    visited.add(value);
-    if (Array.isArray(value)) {
-        for (const entry of value) {
-            const nested = extractNumericField(entry, keys, visited);
-            if (nested !== null) {
-                return nested;
-            }
-        }
-        return null;
-    }
-    const record = value;
-    for (const key of keys) {
-        const candidate = record[key];
-        if (typeof candidate === 'number' && Number.isFinite(candidate)) {
-            return candidate;
-        }
-    }
-    for (const nested of Object.values(record)) {
-        const result = extractNumericField(nested, keys, visited);
-        if (result !== null) {
-            return result;
-        }
-    }
-    return null;
+function extractNumericField(value, key) {
+    return readCodexFiniteNumber(value[key]);
 }
 export function extractAssistantMessageFallback(input) {
     for (let index = input.assistantStreamOrder.length - 1; index >= 0; index -= 1) {
@@ -973,21 +788,6 @@ export function extractAssistantMessageFallback(input) {
 function buildTraceStreamKey(kind, itemId) {
     return `${kind}:${itemId ?? 'main'}`;
 }
-function normalizeIdentifier(value) {
-    if (typeof value !== 'string') {
-        return null;
-    }
-    const trimmed = value.trim();
-    if (trimmed.length === 0) {
-        return null;
-    }
-    return trimmed
-        .replace(/([a-z0-9])([A-Z])/gu, '$1.$2')
-        .replace(/[^A-Za-z0-9]+/gu, '.')
-        .replace(/\.+/gu, '.')
-        .replace(/^\.|\.$/gu, '')
-        .toLowerCase();
-}
 export function normalizeStreamingText(value) {
     if (typeof value !== 'string') {
         return null;
@@ -1010,63 +810,39 @@ function redactCodexStatusText(value) {
     return value.replaceAll(homeRoot, '~');
 }
 export function extractCodexSessionId(event) {
-    const record = asRecord(event);
-    const eventType = normalizeIdentifier(typeof record?.type === 'string'
-        ? record.type
-        : typeof record?.method === 'string'
-            ? record.method
-            : null);
-    if (eventType && eventType.startsWith('thread.')) {
-        return (findDeepStringByKeys(record, ['thread_id', 'threadId']) ??
-            findDeepStringByKeys(record, ['conversation_id', 'conversationId']) ??
-            findDeepStringByKeys(record, ['id']));
-    }
-    return (findDeepStringByKeys(record, ['thread_id', 'threadId']) ??
-        findDeepStringByKeys(record, ['conversation_id', 'conversationId']));
-}
-export function extractCodexErrorMessage(event) {
-    const record = asRecord(event);
-    if (!record) {
+    const notification = readCodexServerNotification(event);
+    if (!notification) {
         return null;
     }
-    const eventType = normalizeIdentifier(typeof record.type === 'string'
-        ? record.type
-        : typeof record.method === 'string'
-            ? record.method
-            : null);
-    if (eventType !== 'error' &&
-        eventType !== 'turn.failed' &&
-        eventType !== 'turn.error') {
-        return null;
+    const directThreadId = readCodexNonEmptyString(notification.params.threadId);
+    if (directThreadId) {
+        return directThreadId;
     }
-    return (findDeepStringByKeys(record, ['message']) ??
-        findDeepStringByKeys(record, ['error_message', 'errorMessage']) ??
-        null);
+    return readCodexNonEmptyString(readCodexRecord(notification.params.thread)?.id);
+}
+export function extractCodexErrorMessage(event) {
+    const error = readCodexTurnError(event);
+    return normalizeStreamingText(readCodexString(error?.message));
 }
 export function extractCodexErrorInfo(event) {
-    const record = asRecord(event);
-    if (!record) {
+    return normalizeCodexErrorInfoValue(readCodexTurnError(event)?.codexErrorInfo);
+}
+function readCodexTurnError(event) {
+    const notification = readCodexServerNotification(event);
+    if (!notification) {
         return null;
     }
-    const eventType = normalizeIdentifier(typeof record.type === 'string'
-        ? record.type
-        : typeof record.method === 'string'
-            ? record.method
-            : null);
-    // turn.completed is included because a failed turn embeds its TurnError
-    // (with codexErrorInfo) at params.turn.error; successful turns carry
-    // error: null, so the deep search finds nothing there.
-    if (eventType !== 'error' &&
-        eventType !== 'turn.completed' &&
-        eventType !== 'turn.failed' &&
-        eventType !== 'turn.error') {
+    if (notification.method === 'error') {
+        return readCodexRecord(notification.params.error);
+    }
+    if (notification.method !== 'turn/completed') {
         return null;
     }
-    return normalizeCodexErrorInfoValue(findDeepValueByKeys(record, ['codexErrorInfo', 'codex_error_info']));
+    return readCodexRecord(readCodexRecord(notification.params.turn)?.error);
 }
 function normalizeCodexErrorInfoValue(value) {
     if (typeof value === 'string') {
-        const kind = normalizeNullableString(value);
+        const kind = readCodexNonEmptyString(value);
         return kind
             ? {
                 httpStatusCode: null,
@@ -1074,7 +850,7 @@ function normalizeCodexErrorInfoValue(value) {
             }
             : null;
     }
-    const record = asRecord(value);
+    const record = readCodexRecord(value);
     if (!record) {
         return null;
     }
@@ -1083,83 +859,16 @@ function normalizeCodexErrorInfoValue(value) {
         return null;
     }
     const [kind, payload] = entries[0];
-    const normalizedKind = normalizeNullableString(kind);
+    const normalizedKind = readCodexNonEmptyString(kind);
     if (!normalizedKind) {
         return null;
     }
-    const payloadRecord = asRecord(payload);
-    const httpStatusCode = payloadRecord?.httpStatusCode;
+    const httpStatusCode = readCodexFiniteNumber(readCodexRecord(payload)?.httpStatusCode);
     return {
-        httpStatusCode: typeof httpStatusCode === 'number' && Number.isFinite(httpStatusCode)
-            ? httpStatusCode
-            : null,
+        httpStatusCode,
         kind: normalizedKind,
     };
 }
-function findDeepValueByKeys(value, keys, visited = new Set()) {
-    if (!value || typeof value !== 'object') {
-        return null;
-    }
-    if (visited.has(value)) {
-        return null;
-    }
-    visited.add(value);
-    if (Array.isArray(value)) {
-        for (const item of value) {
-            const found = findDeepValueByKeys(item, keys, visited);
-            if (found !== null) {
-                return found;
-            }
-        }
-        return null;
-    }
-    const record = value;
-    for (const key of keys) {
-        const candidate = record[key];
-        if (candidate !== undefined && candidate !== null) {
-            return candidate;
-        }
-    }
-    for (const nested of Object.values(record)) {
-        const found = findDeepValueByKeys(nested, keys, visited);
-        if (found !== null) {
-            return found;
-        }
-    }
-    return null;
-}
-function findDeepStringByKeys(value, keys, visited = new Set()) {
-    if (!value || typeof value !== 'object') {
-        return null;
-    }
-    if (visited.has(value)) {
-        return null;
-    }
-    visited.add(value);
-    if (Array.isArray(value)) {
-        for (const item of value) {
-            const found = findDeepStringByKeys(item, keys, visited);
-            if (found) {
-                return found;
-            }
-        }
-        return null;
-    }
-    const record = value;
-    for (const key of keys) {
-        const candidate = record[key];
-        if (typeof candidate === 'string' && candidate.trim().length > 0) {
-            return candidate.trim();
-        }
-    }
-    for (const nested of Object.values(record)) {
-        const found = findDeepStringByKeys(nested, keys, visited);
-        if (found) {
-            return found;
-        }
-    }
-    return null;
-}
 function isRetryableConnectionStatus(message) {
     const normalized = message.toLowerCase();
     return (normalized.includes('reconnect') ||
@@ -1198,10 +907,4 @@ function isCodexMcpBootstrapFailureText(normalizedMessage) {
         normalizedMessage.includes('handshaking with mcp server failed') ||
         normalizedMessage.includes('initialize response'));
 }
-function asRecord(value) {
-    if (!value || typeof value !== 'object' || Array.isArray(value)) {
-        return null;
-    }
-    return value;
-}
 //# sourceMappingURL=assistant-codex-events.js.map