shennian 0.2.60 → 0.2.62

package/dist/src/native-fusion/parsers.js

@@ -4,7 +4,7 @@ import { createHash } from 'node:crypto';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-import { buildUserMessagePayload, isToolPayload } from '@shennian/wire';
+import { buildUserMessagePayload, isSystemEnvironmentContextPayload, isToolPayload } from '@shennian/wire';
 import { resolveBuiltinCommand, spawnResolvedCommandSync } from '../agents/command-spec.js';
 const MAX_JSONL_LINE_BYTES = 64 * 1024 * 1024;
 const DEFAULT_NATIVE_SCAN_IGNORED_PATHS = [
@@ -342,6 +342,8 @@ function parseCodexUserMessage(payload) {
         : [];
     if (!text && attachments.length === 0)
         return null;
+    if (isSystemEnvironmentContextPayload(text) && attachments.length === 0)
+        return null;
     if (attachments.length > 0) {
         return {
             payload: buildUserMessagePayload(text, attachments),
@@ -350,6 +352,115 @@ function parseCodexUserMessage(payload) {
     }
     return { payload: text, titleText: text };
 }
+function isCodexTerminalEventType(eventType) {
+    return eventType === 'turn_completed' || eventType === 'turn_complete' || eventType === 'task_complete';
+}
+function codexMessageContentText(content, textType) {
+    if (!Array.isArray(content))
+        return '';
+    return normalizeText(content
+        .map((part) => {
+        if (typeof part === 'string')
+            return part;
+        if (typeof part !== 'object' || part === null)
+            return '';
+        const record = part;
+        if (record.type !== textType)
+            return '';
+        return typeof record.text === 'string' ? record.text : '';
+    })
+        .filter(Boolean)
+        .join('\n\n'));
+}
+function codexMessageInputImageAttachments(content) {
+    if (!Array.isArray(content))
+        return [];
+    const attachments = [];
+    for (const part of content) {
+        if (typeof part !== 'object' || part === null)
+            continue;
+        const record = part;
+        if (record.type !== 'input_image')
+            continue;
+        const imagePath = typeof record.path === 'string' ? record.path
+            : typeof record.file_path === 'string' ? record.file_path
+                : typeof record.saved_path === 'string' ? record.saved_path
+                    : typeof record.image_path === 'string' ? record.image_path
+                        : '';
+        if (!imagePath.trim())
+            continue;
+        attachments.push({
+            path: imagePath,
+            name: path.basename(imagePath) || 'image.png',
+            mimeType: inferMimeType(imagePath),
+            kind: 'image',
+        });
+    }
+    return attachments;
+}
+function parseCodexResponseMessage(payload) {
+    if (payload.type !== 'message')
+        return null;
+    const role = payload.role === 'assistant' ? 'agent' : payload.role === 'user' ? 'user' : null;
+    if (!role)
+        return null;
+    if (role === 'agent') {
+        const text = codexMessageContentText(payload.content, 'output_text');
+        if (isSystemEnvironmentContextPayload(text))
+            return null;
+        return text ? { role, payload: text, titleText: text } : null;
+    }
+    const text = codexMessageContentText(payload.content, 'input_text');
+    const attachments = codexMessageInputImageAttachments(payload.content);
+    if (!text && attachments.length === 0)
+        return null;
+    if (isSystemEnvironmentContextPayload(text) && attachments.length === 0)
+        return null;
+    return {
+        role,
+        payload: attachments.length > 0 ? buildUserMessagePayload(text, attachments) : text,
+        titleText: text,
+    };
+}
+function codexDedupeText(payload) {
+    if (!payload)
+        return '';
+    try {
+        const parsed = JSON.parse(payload);
+        if (typeof parsed === 'object' && parsed !== null) {
+            const record = parsed;
+            if (record.type === 'user' && typeof record.content === 'string')
+                return normalizeText(record.content);
+        }
+    }
+    catch {
+        /* plain text payload */
+    }
+    return normalizeText(payload);
+}
+function isDuplicateCodexChatEvent(event, role, payload, ts) {
+    if (event.agentType !== 'codex')
+        return false;
+    if (event.role !== role)
+        return false;
+    if (isToolPayload(event.payload))
+        return false;
+    if (Math.abs(event.ts - ts) > 5 * 60 * 1000)
+        return false;
+    return codexDedupeText(event.payload) === codexDedupeText(payload);
+}
+function findDuplicateCodexChatEventIndex(events, role, payload, ts) {
+    for (let i = events.length - 1; i >= 0; i -= 1) {
+        const event = events[i];
+        if (!event)
+            continue;
+        if (isDuplicateCodexChatEvent(event, role, payload, ts))
+            return i;
+        if (event.agentType === 'codex' && Math.abs(event.ts - ts) > 5 * 60 * 1000)
+            break;
+    }
+    return -1;
+}
 function pushCodexEvent(events, filePath, lineOffset, kind, sourceSessionKey, ts, payload, title, modelId, workDir, role = 'agent', terminal = false) {
     if (!payload)
         return;
@@ -490,6 +601,16 @@ function parseCodexResponseItem(events, filePath, lineOffset, payload, sourceSes
     const itemType = typeof payload.type === 'string' ? payload.type : '';
     if (!itemType)
         return;
+    if (itemType === 'message') {
+        const parsedMessage = parseCodexResponseMessage(payload);
+        if (!parsedMessage)
+            return;
+        const duplicateIndex = findDuplicateCodexChatEventIndex(events, parsedMessage.role, parsedMessage.payload, ts);
+        if (duplicateIndex >= 0)
+            return;
+        pushCodexEvent(events, filePath, lineOffset, `${itemType}:${parsedMessage.role}`, sourceSessionKey, ts, parsedMessage.payload, title, modelId, workDir, parsedMessage.role);
+        return;
+    }
     if (itemType === 'function_call') {
         const name = typeof payload.name === 'string' ? payload.name : 'function_call';
         pushCodexToolEvent(events, filePath, lineOffset, itemType, sourceSessionKey, ts, name, title, modelId, workDir, parseStructuredString(payload.arguments));
@@ -532,7 +653,7 @@ function parseCodexEventMessage(events, filePath, lineOffset, payload, sourceSes
     }
     if (eventType === 'agent_message') {
         const text = typeof payload.message === 'string' ? normalizeText(payload.message) : '';
-        if (!text)
+        if (!text || isSystemEnvironmentContextPayload(text))
             return;
         pushCodexEvent(events, filePath, lineOffset, eventType, sourceSessionKey, ts, text, title, modelId, workDir);
         return;
@@ -803,12 +924,16 @@ export function parseCodexRolloutChunk(filePath, startOffset) {
         if (!sourceSessionKey)
             return;
         if (type === 'response_item') {
+            const parsedMessage = parseCodexResponseMessage(payload);
+            if (parsedMessage?.role === 'user' && parsedMessage.titleText && !title) {
+                title = parsedMessage.titleText.slice(0, 80);
+            }
             parseCodexResponseItem(events, filePath, lineOffset, payload, sourceSessionKey, ts, title, modelId, workDir);
             return;
         }
         if (type === 'event_msg') {
             const eventType = typeof payload.type === 'string' ? payload.type : '';
-            if (eventType === 'turn_completed') {
+            if (isCodexTerminalEventType(eventType)) {
                 for (let i = events.length - 1; i >= 0; i -= 1) {
                     const event = events[i];
                     if (event?.agentType !== 'codex')
@@ -827,6 +952,19 @@ export function parseCodexRolloutChunk(filePath, startOffset) {
                 const parsedUser = parseCodexUserMessage(payload);
                 if (parsedUser?.titleText && !title)
                     title = parsedUser.titleText.slice(0, 80);
+                if (parsedUser) {
+                    const duplicateIndex = findDuplicateCodexChatEventIndex(events, 'user', parsedUser.payload, ts);
+                    if (duplicateIndex >= 0)
+                        events.splice(duplicateIndex, 1);
+                }
+            }
+            else if (eventType === 'agent_message') {
+                const text = typeof payload.message === 'string' ? normalizeText(payload.message) : '';
+                if (text && !isSystemEnvironmentContextPayload(text)) {
+                    const duplicateIndex = findDuplicateCodexChatEventIndex(events, 'agent', text, ts);
+                    if (duplicateIndex >= 0)
+                        events.splice(duplicateIndex, 1);
+                }
             }
             const beforeCount = events.length;
             parseCodexEventMessage(events, filePath, lineOffset, payload, sourceSessionKey, ts, title, modelId, workDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shennian",
-  "version": "0.2.60",
+  "version": "0.2.62",
   "description": "Shennian — AI Agent Control Plane CLI",
   "type": "module",
   "bin": {