@xcanwin/manyoyo 5.6.7 → 5.6.8

package/lib/codex-output.js

@@ -0,0 +1,25 @@
+'use strict';
+
+function extractAgentMessageFromCodexJsonl(text) {
+    let lastMessage = '';
+    for (const rawLine of String(text || '').split('\n')) {
+        const line = rawLine.trim();
+        if (!line) {
+            continue;
+        }
+        let payload;
+        try {
+            payload = JSON.parse(line);
+        } catch (error) {
+            continue;
+        }
+        if (payload && payload.type === 'item.completed' && payload.item && payload.item.type === 'agent_message') {
+            lastMessage = String(payload.item.text || '');
+        }
+    }
+    return lastMessage.trim();
+}
+
+module.exports = {
+    extractAgentMessageFromCodexJsonl
+};

package/lib/dev-release.js

@@ -1,3 +1,5 @@
+const { extractAgentMessageFromCodexJsonl } = require('./codex-output');
+
 function parseReleaseVersion(version) {
     const match = String(version || '').trim().match(/^(\d+)\.(\d+)\.(\d+)$/);
     if (!match) {
@@ -123,26 +125,6 @@ function normalizeCommitMessage(text) {
     return lines.slice(start, end).join('\n').trim();
 }
 
-function extractAgentMessageFromCodexJsonl(text) {
-    let lastMessage = '';
-    for (const rawLine of String(text || '').split('\n')) {
-        const line = rawLine.trim();
-        if (!line) {
-            continue;
-        }
-        let payload;
-        try {
-            payload = JSON.parse(line);
-        } catch (error) {
-            continue;
-        }
-        if (payload && payload.type === 'item.completed' && payload.item && payload.item.type === 'agent_message') {
-            lastMessage = String(payload.item.text || '');
-        }
-    }
-    return lastMessage.trim();
-}
-
 module.exports = {
     parseReleaseVersion,
     compareReleaseVersions,

package/lib/web/server.js

@@ -9,6 +9,7 @@ const http = require('http');
 const WebSocket = require('ws');
 const JSON5 = require('json5');
 const { buildContainerRunArgs } = require('../container-run');
+const { extractAgentMessageFromCodexJsonl } = require('../codex-output');
 const {
     resolveAgentProgram,
     resolveAgentPromptCommandTemplate,
@@ -26,8 +27,6 @@ const WEB_TERMINAL_MIN_ROWS = 12;
 const WEB_AGENT_CONTEXT_MAX_MESSAGES = 24;
 const WEB_AGENT_CONTEXT_MAX_CHARS = 6000;
 const WEB_AGENT_CONTEXT_PER_MESSAGE_MAX_CHARS = 600;
-const WEB_AGENT_LAST_MESSAGE_BEGIN_MARKER = '__MANYOYO_LAST_MESSAGE_BEGIN__';
-const WEB_AGENT_LAST_MESSAGE_END_MARKER = '__MANYOYO_LAST_MESSAGE_END__';
 const WEB_AUTH_COOKIE_NAME = 'manyoyo_web_auth';
 const WEB_AUTH_TTL_SECONDS = 12 * 60 * 60;
 const FRONTEND_DIR = path.join(__dirname, 'frontend');
@@ -282,23 +281,20 @@ function renderAgentPromptCommand(template, prompt) {
 
 function buildCodexAgentExecCommand(template, prompt) {
     const templateText = normalizeAgentPromptCommandTemplate(template, 'agentPromptCommand');
-    const outputFile = `/tmp/manyoyo-web-agent-last-${Date.now()}-${crypto.randomBytes(6).toString('hex')}.txt`;
-    const quotedOutputFile = quoteBashSingleValue(outputFile);
-    const codexTemplate = templateText.replace(
-        /^((?:(?:[A-Za-z_][A-Za-z0-9_]*=)(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|[^\s]+)\s+)*)codex\s+exec\b/,
-        `$1codex exec --output-last-message ${quotedOutputFile}`
+    const execMatch = templateText.match(
+        /^((?:(?:[A-Za-z_][A-Za-z0-9_]*=)(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|[^\s]+)\s+)*)codex\s+exec\b/
     );
-    const command = codexTemplate === templateText
+    let codexTemplate = templateText;
+    if (execMatch) {
+        const prefix = execMatch[1] || '';
+        const suffix = templateText.slice(execMatch[0].length);
+        const hasJson = /(?:^|\s)--json(?:\s|$)/.test(suffix);
+        const injectedFlags = hasJson ? '' : ' --json';
+        codexTemplate = `${prefix}codex exec${injectedFlags}${suffix}`;
+    }
+    return codexTemplate === templateText
         ? renderAgentPromptCommand(templateText, prompt)
         : renderAgentPromptCommand(codexTemplate, prompt);
-    return [
-        `rm -f ${quotedOutputFile}`,
-        command,
-        '__manyoyo_agent_exit=$?',
-        `if [ -f ${quotedOutputFile} ]; then printf '\\n${WEB_AGENT_LAST_MESSAGE_BEGIN_MARKER}\\n'; cat ${quotedOutputFile}; printf '\\n${WEB_AGENT_LAST_MESSAGE_END_MARKER}\\n'; fi`,
-        `rm -f ${quotedOutputFile}`,
-        'exit $__manyoyo_agent_exit'
-    ].join('; ');
 }
 
 function buildWebAgentExecCommand(template, prompt, agentProgram) {
@@ -308,21 +304,6 @@ function buildWebAgentExecCommand(template, prompt, agentProgram) {
     return renderAgentPromptCommand(template, prompt);
 }
 
-function extractLastMessageOutput(text) {
-    const raw = String(text || '');
-    const pattern = new RegExp(
-        `(?:^|\\r?\\n)${WEB_AGENT_LAST_MESSAGE_BEGIN_MARKER}\\r?\\n([\\s\\S]*?)(?:\\r?\\n)${WEB_AGENT_LAST_MESSAGE_END_MARKER}(?:\\r?\\n|$)`,
-        'g'
-    );
-    let lastMatch = null;
-    let matched = pattern.exec(raw);
-    while (matched) {
-        lastMatch = matched[1];
-        matched = pattern.exec(raw);
-    }
-    return String(lastMatch || '').trim();
-}
-
 function getAgentRuntimeMeta(history) {
     const sessionHistory = history && typeof history === 'object' ? history : {};
     const template = normalizeAgentPromptCommandTemplate(sessionHistory.agentPromptCommand, 'agentPromptCommand');
@@ -1188,8 +1169,8 @@ async function execCommandInWebContainer(ctx, containerName, command) {
             const clippedStdout = stdoutTruncated ? `${stdoutOutput}\n...[stdout-truncated]` : stdoutOutput;
             const clippedStderr = stderrTruncated ? `${stderrOutput}\n...[stderr-truncated]` : stderrOutput;
             const clippedRaw = `${clippedStdout}${clippedStdout && clippedStderr ? '\n' : ''}${clippedStderr}`;
-            const extractedLastMessage = extractLastMessageOutput(clippedStdout);
-            const cleanOutputSource = extractedLastMessage || clippedRaw;
+            const extractedJsonAgentMessage = extractAgentMessageFromCodexJsonl(clippedStdout);
+            const cleanOutputSource = extractedJsonAgentMessage || clippedRaw;
             const output = clipText(stripAnsi(cleanOutputSource).trim() || '(无输出)');
             resolve({ exitCode, output });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "5.6.7",
+    "version": "5.6.8",
     "imageVersion": "1.9.0-common",
     "playwrightCliVersion": "0.1.1",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",