shennian 0.2.58 → 0.2.61

package/dist/src/agents/pi.js

@@ -471,12 +471,12 @@ export class PiAdapter extends AgentAdapter {
                 return;
             this.terminalState = 'error';
             const message = err instanceof Error ? err.message : String(err);
-            if (message.includes('429') || message.includes('daily_quota_exceeded')) {
+            if (message.includes('429') || message.includes('daily_quota_exceeded') || message.includes('nian_quota_exceeded')) {
                 this.emit('agentEvent', {
                     state: 'error',
                     runId,
                     seq: ++this.seq,
-                    message: '今日免费额度已用完，可在 ~/.shennian/config.json 中配置 apiKey 字段（兼容 OpenAI 格式）继续使用。',
+                    message: 'Nian 今日额度已用完，次日自动恢复。',
                 });
             }
             else {

package/dist/src/manager/registry.js

@@ -257,7 +257,7 @@ export class ManagerRegistry {
 function readableText(message) {
     if (!message || isToolPayload(message.payload))
         return null;
-    const text = extractPayloadText(message.payload).replace(/\s+/g, ' ').trim();
+    const text = extractPayloadText(message.payload).replace(/\r\n/g, '\n').trim();
     return text || null;
 }
 function clip(text, max) {

package/dist/src/manager/runtime.js

@@ -29,6 +29,16 @@ function runIdFromMessageId(id) {
     const match = /^agent-(.+)-\d+$/.exec(id);
     return match?.[1] ?? null;
 }
+function seqFromMessageId(id) {
+    const match = /^agent-.+-(\d+)$/.exec(id);
+    if (!match)
+        return null;
+    const seq = Number(match[1]);
+    return Number.isInteger(seq) && seq >= 0 ? seq : null;
+}
+function normalizeMarkdownForWorkerSummary(text) {
+    return text.replace(/\r\n/g, '\n').trim();
+}
 function toolSummary(payload) {
     try {
         const parsed = JSON.parse(payload);
@@ -62,6 +72,7 @@ function compactWorkerTranscript(rawMessages, limit) {
     const compacted = [];
     let buffer = null;
     let bufferRunId = null;
+    let bufferSeq = null;
     let bufferText = '';
     const flush = () => {
         if (!buffer)
@@ -76,6 +87,7 @@ function compactWorkerTranscript(rawMessages, limit) {
         }
         buffer = null;
         bufferRunId = null;
+        bufferSeq = null;
         bufferText = '';
     };
     for (const message of chronological) {
@@ -96,14 +108,17 @@ function compactWorkerTranscript(rawMessages, limit) {
         if (!text.trim())
             continue;
         const runId = runIdFromMessageId(message.id);
-        if (buffer && buffer.role === message.role && bufferRunId === runId) {
+        const seq = seqFromMessageId(message.id);
+        if (buffer && buffer.role === message.role && bufferRunId === runId && runId && seq !== null && bufferSeq !== null && seq === bufferSeq + 1) {
             bufferText += text;
             buffer.ts = message.ts;
+            bufferSeq = seq;
         }
         else {
             flush();
             buffer = message;
             bufferRunId = runId;
+            bufferSeq = seq;
             bufferText = text;
         }
     }
@@ -261,14 +276,14 @@ export class ManagerRuntimeService {
         if (event.state === 'delta' && event.text && !event.thinking) {
             const nextText = (this.workerTextAcc.get(textKey) ?? '') + event.text;
             this.workerTextAcc.set(textKey, nextText);
-            const normalized = nextText.replace(/\s+/g, ' ').trim();
+            const normalized = normalizeMarkdownForWorkerSummary(nextText);
             if (normalized) {
                 patch.summary = normalized.length > 160 ? `${normalized.slice(0, 160)}...` : normalized;
             }
         }
         if (event.state === 'final' || event.state === 'error' || event.state === 'aborted') {
             patch.status = event.state;
-            const accumulated = this.workerTextAcc.get(textKey)?.replace(/\s+/g, ' ').trim();
+            const accumulated = normalizeMarkdownForWorkerSummary(this.workerTextAcc.get(textKey) ?? '');
             if (accumulated) {
                 patch.summary = accumulated.length > 240 ? `${accumulated.slice(0, 240)}...` : accumulated;
             }

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

@@ -350,6 +350,111 @@ 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');
+        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;
+    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 +595,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));
@@ -803,12 +918,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 +946,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) {
+                    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.58",
+  "version": "0.2.61",
   "description": "Shennian — AI Agent Control Plane CLI",
   "type": "module",
   "bin": {