@xcanwin/manyoyo 5.11.15 → 6.0.1

package/lib/web/server.js

@@ -34,6 +34,8 @@ 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;
+// 支持按 Web Agent 保存的引擎会话 ID 原生续接，避免历史文本被截断。
+const NATIVE_SESSION_RESUME_PROGRAMS = new Set(['claude', 'codex', 'opencode']);
 const WEB_FILE_PREVIEW_MAX_BYTES = 512 * 1024;
 const WEB_FILE_EDIT_MAX_BYTES = 2 * 1024 * 1024;
 const WEB_AUTH_COOKIE_NAME = 'manyoyo_web_auth';
@@ -171,7 +173,8 @@ function createEmptyWebAgentSession(agentId, agentName) {
         messages: [],
         lastResumeAt: null,
         lastResumeOk: null,
-        lastResumeError: ''
+        lastResumeError: '',
+        engineSessionId: ''
     };
 }
 
@@ -188,7 +191,8 @@ function normalizeWebAgentSessionRecord(agentId, rawAgent) {
         messages: Array.isArray(source.messages) ? source.messages : [],
         lastResumeAt: typeof source.lastResumeAt === 'string' ? source.lastResumeAt : null,
         lastResumeOk: typeof source.lastResumeOk === 'boolean' ? source.lastResumeOk : null,
-        lastResumeError: typeof source.lastResumeError === 'string' ? source.lastResumeError : ''
+        lastResumeError: typeof source.lastResumeError === 'string' ? source.lastResumeError : '',
+        engineSessionId: typeof source.engineSessionId === 'string' ? source.engineSessionId : ''
     };
 }
 
@@ -683,8 +687,9 @@ function renderAgentPromptCommand(template, prompt) {
     return templateText.replace(/\{prompt\}/g, safePrompt);
 }
 
-function buildCodexAgentExecCommand(template, prompt) {
+function buildCodexAgentExecCommand(template, prompt, options = {}) {
     const templateText = normalizeAgentPromptCommandTemplate(template, 'agentPromptCommand');
+    const sessionId = options && typeof options.sessionId === 'string' ? options.sessionId.trim() : '';
     const execMatch = templateText.match(
         /^((?:(?:[A-Za-z_][A-Za-z0-9_]*=)(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|[^\s]+)\s+)*)codex\s+exec\b/
     );
@@ -694,7 +699,13 @@ function buildCodexAgentExecCommand(template, prompt) {
         const suffix = templateText.slice(execMatch[0].length);
         const hasJson = /(?:^|\s)--json(?:\s|$)/.test(suffix);
         const injectedFlags = hasJson ? '' : ' --json';
-        codexTemplate = `${prefix}codex exec${injectedFlags}${suffix}`;
+        if (sessionId) {
+            const promptIndex = suffix.indexOf('{prompt}');
+            const resumeSuffix = `${suffix.slice(0, promptIndex)}${quoteBashSingleValue(sessionId)} ${suffix.slice(promptIndex)}`;
+            codexTemplate = `${prefix}codex exec resume${injectedFlags}${resumeSuffix}`;
+        } else {
+            codexTemplate = `${prefix}codex exec${injectedFlags}${suffix}`;
+        }
     }
     return codexTemplate === templateText
         ? renderAgentPromptCommand(templateText, prompt)
@@ -718,15 +729,20 @@ function prependAgentFlags(commandText, matchPattern, flagSpecs) {
     return `${prefix}${suffix}`;
 }
 
-function buildClaudeAgentExecCommand(template, prompt) {
+function buildClaudeAgentExecCommand(template, prompt, options = {}) {
     const templateText = normalizeAgentPromptCommandTemplate(template, 'agentPromptCommand');
+    const flagSpecs = [
+        { flag: '--verbose', pattern: /(?:^|\s)--verbose(?:\s|$)/ },
+        { flag: '--output-format stream-json', pattern: /(?:^|\s)--output-format(?:\s|$)/ }
+    ];
+    const sessionId = options && typeof options.sessionId === 'string' ? options.sessionId.trim() : '';
+    if (sessionId) {
+        flagSpecs.push({ flag: `-r ${sessionId}`, pattern: /(?:^|\s)-r(?:\s|$)/ });
+    }
     const claudeTemplate = prependAgentFlags(
         templateText,
         /^(((?:(?:[A-Za-z_][A-Za-z0-9_]*=)(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|[^\s]+)\s+)*)claude\b)(.*)$/,
-        [
-            { flag: '--verbose', pattern: /(?:^|\s)--verbose(?:\s|$)/ },
-            { flag: '--output-format stream-json', pattern: /(?:^|\s)--output-format(?:\s|$)/ }
-        ]
+        flagSpecs
     );
     return claudeTemplate === templateText
         ? renderAgentPromptCommand(templateText, prompt)
@@ -747,30 +763,38 @@ function buildGeminiAgentExecCommand(template, prompt) {
         : renderAgentPromptCommand(geminiTemplate, prompt);
 }
 
-function buildOpenCodeAgentExecCommand(template, prompt) {
+function buildOpenCodeAgentExecCommand(template, prompt, options = {}) {
     const templateText = normalizeAgentPromptCommandTemplate(template, 'agentPromptCommand');
+    const sessionId = options && typeof options.sessionId === 'string' ? options.sessionId.trim() : '';
+    const flagSpecs = [
+        { flag: '--format json', pattern: /(?:^|\s)--format(?:\s|$)/ }
+    ];
+    if (sessionId) {
+        flagSpecs.push({
+            flag: `--session ${quoteBashSingleValue(sessionId)}`,
+            pattern: /(?:^|\s)(?:--session|-s)(?:\s|$)/
+        });
+    }
     const opencodeTemplate = prependAgentFlags(
         templateText,
-        /^(((?:(?:[A-Za-z_][A-Za-z0-9_]*=)(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|[^\s]+)\s+)*)opencode\s+run\b)(.*)$/,
-        [
-            { flag: '--format json', pattern: /(?:^|\s)--format(?:\s|$)/ }
-        ]
+        /^(((?:(?:[A-Za-z_][A-Za-z0-9_]*=)(?:"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|[^\s]+)\s+)*)opencode\b.*?\s+run\b)(.*)$/,
+        flagSpecs
     );
     return opencodeTemplate === templateText
         ? renderAgentPromptCommand(templateText, prompt)
         : renderAgentPromptCommand(opencodeTemplate, prompt);
 }
 
-function buildWebAgentExecCommand(template, prompt, agentProgram) {
+function buildWebAgentExecCommand(template, prompt, agentProgram, options = {}) {
     switch (agentProgram) {
     case 'claude':
-        return buildClaudeAgentExecCommand(template, prompt);
+        return buildClaudeAgentExecCommand(template, prompt, options);
     case 'gemini':
         return buildGeminiAgentExecCommand(template, prompt);
     case 'codex':
-        return buildCodexAgentExecCommand(template, prompt);
+        return buildCodexAgentExecCommand(template, prompt, options);
     case 'opencode':
-        return buildOpenCodeAgentExecCommand(template, prompt);
+        return buildOpenCodeAgentExecCommand(template, prompt, options);
     default:
         break;
     }
@@ -874,7 +898,7 @@ function extractOpenCodeAgentMessage(text) {
         if (role && role !== 'assistant') {
             continue;
         }
-        const content = collectStructuredText(message.content || payload.content || payload.text || payload);
+        const content = collectStructuredText(message.content || payload.content || payload.text || payload.part || payload);
         if (!content) {
             continue;
         }
@@ -905,6 +929,50 @@ function extractAgentMessageFromStructuredOutput(agentProgram, text) {
     return '';
 }
 
+function extractCodexThreadId(text) {
+    for (const rawLine of String(text || '').split('\n')) {
+        const payload = parseJsonObjectLine(rawLine);
+        if (payload && payload.type === 'thread.started' && typeof payload.thread_id === 'string') {
+            return payload.thread_id.trim();
+        }
+    }
+    return '';
+}
+
+function extractClaudeSessionId(text) {
+    for (const rawLine of String(text || '').split('\n')) {
+        const payload = parseJsonObjectLine(rawLine);
+        if (payload && payload.type === 'system' && payload.subtype === 'init' && typeof payload.session_id === 'string') {
+            return payload.session_id.trim();
+        }
+    }
+    return '';
+}
+
+function extractOpenCodeSessionId(text) {
+    for (const rawLine of String(text || '').split('\n')) {
+        const payload = parseJsonObjectLine(rawLine);
+        const sessionId = payload && pickFirstString(payload.sessionID, payload.session_id);
+        if (sessionId) {
+            return sessionId;
+        }
+    }
+    return '';
+}
+
+function extractEngineSessionId(agentProgram, text) {
+    if (agentProgram === 'codex') {
+        return extractCodexThreadId(text);
+    }
+    if (agentProgram === 'claude') {
+        return extractClaudeSessionId(text);
+    }
+    if (agentProgram === 'opencode') {
+        return extractOpenCodeSessionId(text);
+    }
+    return '';
+}
+
 function getAgentRuntimeMeta(template) {
     const normalizedTemplate = normalizeAgentPromptCommandTemplate(template, 'agentPromptCommand');
     const agentProgram = resolveAgentProgram(normalizedTemplate);
@@ -1603,11 +1671,19 @@ async function prepareWebAgentExecution(ctx, state, sessionRef, prompt) {
     await ensureWebContainer(ctx, state, sessionRef.containerName, sessionRef);
     const agentMeta = getAgentRuntimeMeta(effectiveTemplate);
     const hasPriorConversation = hasAgentConversationHistory(agentSession);
+    const useNativeSessionResume = NATIVE_SESSION_RESUME_PROGRAMS.has(agentMeta.agentProgram);
     let resumeAttempted = false;
     let resumeSucceeded = false;
     let resumeError = '';
+    let sessionIdForRun = '';
 
-    if (hasPriorConversation && agentMeta.resumeSupported && agentMeta.resumeCommand) {
+    if (useNativeSessionResume && hasPriorConversation && agentSession.engineSessionId) {
+        // 已有引擎会话 ID 时直接续接；旧 Web 会话缺少 ID 时注入一次历史来建立新会话，
+        // 会话 ID 由引擎自己生成，执行结束后从输出中提取（见 finalizeWebAgentExecution）。
+        sessionIdForRun = agentSession.engineSessionId;
+        resumeAttempted = true;
+        resumeSucceeded = true;
+    } else if (!useNativeSessionResume && hasPriorConversation && agentMeta.resumeSupported && agentMeta.resumeCommand) {
         resumeAttempted = true;
         const resumeResult = await execCommandInWebContainer(ctx, sessionRef.containerName, agentMeta.resumeCommand);
         if (resumeResult.exitCode === 0) {
@@ -1620,7 +1696,9 @@ async function prepareWebAgentExecution(ctx, state, sessionRef, prompt) {
     const effectivePrompt = resumeSucceeded
         ? prompt
         : buildAgentPromptWithHistory(agentSession, prompt);
-    const command = buildWebAgentExecCommand(effectiveTemplate, effectivePrompt, agentMeta.agentProgram);
+    const command = buildWebAgentExecCommand(effectiveTemplate, effectivePrompt, agentMeta.agentProgram, {
+        sessionId: sessionIdForRun
+    });
     const contextMode = resumeSucceeded ? 'resume' : (hasPriorConversation ? 'history-injected' : 'first-turn');
 
     return {
@@ -1631,7 +1709,8 @@ async function prepareWebAgentExecution(ctx, state, sessionRef, prompt) {
         contextMode,
         resumeAttempted,
         resumeSucceeded,
-        resumeError
+        resumeError,
+        engineSessionId: sessionIdForRun
     };
 }
 
@@ -1644,11 +1723,16 @@ function finalizeWebAgentExecution(state, sessionRef, agentSession, agentMeta, m
         resumeSucceeded: meta.resumeSucceeded,
         interrupted: result.interrupted === true
     });
-    patchWebAgentSessionState(state.webHistoryDir, sessionRef, {
+    const patch = {
         lastResumeAt: meta.resumeAttempted ? new Date().toISOString() : (agentSession.lastResumeAt || null),
         lastResumeOk: meta.resumeAttempted ? meta.resumeSucceeded : agentSession.lastResumeOk,
         lastResumeError: meta.resumeAttempted ? (meta.resumeSucceeded ? '' : meta.resumeError) : (agentSession.lastResumeError || '')
-    });
+    };
+    const engineSessionId = meta.engineSessionId || extractEngineSessionId(agentMeta.agentProgram, result.stdout);
+    if (engineSessionId) {
+        patch.engineSessionId = engineSessionId;
+    }
+    patchWebAgentSessionState(state.webHistoryDir, sessionRef, patch);
 }
 
 function appendWebAgentTraceMessage(webHistoryDir, sessionRefOrContainerName, content, extra = {}) {
@@ -3044,6 +3128,7 @@ async function execAgentInWebContainerStream(ctx, state, sessionRefOrContainerNa
             resolve({
                 exitCode,
                 output,
+                stdout: clippedStdout,
                 interrupted: exitCode !== 0 && runState.stopping === true
             });
         });
@@ -4056,7 +4141,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     return;
                 }
 
-                const { agentSession, agentMeta, command, contextMode, resumeAttempted, resumeSucceeded, resumeError } = prepared;
+                const { agentSession, agentMeta, command, contextMode, resumeAttempted, resumeSucceeded, resumeError, engineSessionId } = prepared;
                 appendWebSessionMessage(state.webHistoryDir, sessionRef, 'user', prompt, {
                     mode: 'agent',
                     contextMode
@@ -4068,7 +4153,8 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     contextMode,
                     resumeAttempted,
                     resumeSucceeded,
-                    resumeError
+                    resumeError,
+                    engineSessionId
                 }, result);
                 sendJson(res, 200, {
                     exitCode: result.exitCode,
@@ -4124,7 +4210,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     return;
                 }
 
-                const { agentSession, agentMeta, command, contextMode, resumeAttempted, resumeSucceeded, resumeError } = prepared;
+                const { agentSession, agentMeta, command, contextMode, resumeAttempted, resumeSucceeded, resumeError, engineSessionId } = prepared;
                 const traceLines = ['[执行过程]'];
                 const traceEvents = [];
                 let streamingReplyMessageId = '';
@@ -4226,7 +4312,8 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                         contextMode,
                         resumeAttempted,
                         resumeSucceeded,
-                        resumeError
+                        resumeError,
+                        engineSessionId
                     }, result);
                     sendNdjson(res, {
                         type: 'result',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "5.11.15",
+    "version": "6.0.1",
     "imageVersion": "1.9.1-common",
     "playwrightCliVersion": "0.1.14",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",