npm - @xcanwin/manyoyo - Versions diffs - 5.2.0 → 5.2.8 - Mend

@xcanwin/manyoyo 5.2.0 → 5.2.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/bin/manyoyo.js +1 -1
package/lib/web/frontend/app.css +33 -12
package/lib/web/frontend/app.html +5 -2
package/lib/web/frontend/app.js +58 -9
package/lib/web/frontend/markdown-renderer.js +143 -0
package/lib/web/frontend/markdown.css +76 -0
package/lib/web/server.js +211 -13
package/package.json +2 -1

package/bin/manyoyo.js CHANGED Viewed

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-const { execSync, spawnSync } = require('child_process');
+const { spawnSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');

package/lib/web/frontend/app.css CHANGED Viewed

@@ -437,20 +437,24 @@ textarea:focus-visible {
     box-shadow: inset 3px 0 0 var(--accent), 0 0 0 2px rgba(196, 85, 31, 0.14);
 }
-.session-item.history-only {
-    color: #b3ab9f;
-}
-.session-item.history-only .session-name,
-.session-item.history-only .session-count,
-.session-item.history-only .session-time {
-    color: #b3ab9f;
+.session-item.status-history:not(.active),
+.session-item.status-stopped:not(.active),
+.session-item.status-unknown:not(.active) {
+    border-color: rgba(181, 146, 99, 0.22);
+    background: rgba(255, 252, 247, 0.72);
+    box-shadow: none;
 }
-.session-item.history-only .session-status {
-    background: #f7f3ed;
-    border-color: #e3dbd1;
-    color: #b3ab9f;
+.session-item.status-history:not(.active) .session-name,
+.session-item.status-history:not(.active) .session-meta,
+.session-item.status-history:not(.active) .session-time,
+.session-item.status-stopped:not(.active) .session-name,
+.session-item.status-stopped:not(.active) .session-meta,
+.session-item.status-stopped:not(.active) .session-time,
+.session-item.status-unknown:not(.active) .session-name,
+.session-item.status-unknown:not(.active) .session-meta,
+.session-item.status-unknown:not(.active) .session-time {
+    opacity: 0.25;
 }
 .session-name {
@@ -847,6 +851,23 @@ body.terminal-mode .composer {
     opacity: 0.78;
 }
+body.agent-mode .msg.origin-command .bubble,
+body.agent-mode .msg.origin-command .msg-meta,
+body.agent-mode .msg.origin-command .msg-exit {
+    opacity: 0.25;
+}
+body.command-mode .msg.origin-agent .bubble,
+body.command-mode .msg.origin-agent .msg-meta,
+body.command-mode .msg.origin-agent .msg-exit {
+    opacity: 0.25;
+}
+body.agent-mode .msg.origin-command .bubble,
+body.command-mode .msg.origin-agent .bubble {
+    box-shadow: none;
+}
 .bubble pre {
     margin: 0;
     white-space: pre-wrap;

package/lib/web/frontend/app.html CHANGED Viewed

@@ -8,6 +8,7 @@
     />
     <title>MANYOYO Web</title>
     <link rel="stylesheet" href="/app/frontend/app.css" />
+    <link rel="stylesheet" href="/app/frontend/markdown.css" />
     <link rel="stylesheet" href="/app/vendor/xterm.css" />
 </head>
 <body>
@@ -65,8 +66,8 @@
             </header>
             <section class="mode-switch" id="modeSwitch">
                 <div class="mode-switch-left">
-                    <button type="button" id="modeCommandBtn" class="secondary is-active">命令模式</button>
-                    <button type="button" id="modeAgentBtn" class="secondary">AGENT 模式</button>
+                    <button type="button" id="modeAgentBtn" class="secondary is-active">AGENT 模式</button>
+                    <button type="button" id="modeCommandBtn" class="secondary">命令模式</button>
                     <button type="button" id="modeTerminalBtn" class="secondary">交互终端</button>
                 </div>
                 <div class="mode-terminal-controls">
@@ -164,6 +165,8 @@
     <script src="/app/vendor/xterm.js"></script>
     <script src="/app/vendor/xterm-addon-fit.js"></script>
+    <script src="/app/vendor/marked.min.js"></script>
+    <script src="/app/frontend/markdown-renderer.js"></script>
     <script src="/app/frontend/app.js"></script>
 </body>
 </html>

package/lib/web/frontend/app.js CHANGED Viewed

@@ -40,7 +40,7 @@
         active: '',
         messages: [],
         messageRenderKeys: [],
-        mode: 'command',
+        mode: 'agent',
         sending: false,
         loadingSessions: false,
         loadingMessages: false,
@@ -155,9 +155,20 @@
         codex: 'codex exec {prompt}',
         opencode: 'opencode run {prompt}'
     };
+    const markdownRenderer = window.ManyoyoMarkdown
+        && typeof window.ManyoyoMarkdown.shouldRenderMessage === 'function'
+        && typeof window.ManyoyoMarkdown.render === 'function'
+        ? window.ManyoyoMarkdown
+        : null;
+    function appendPlainMessageContent(bubble, content) {
+        const pre = document.createElement('pre');
+        pre.textContent = content == null ? '' : String(content);
+        bubble.appendChild(pre);
+    }
     function roleName(role, message) {
-        if (role === 'user') return '你';
+        if (role === 'user') return '我';
         if (role === 'assistant') {
             if (message && message.mode === 'agent') {
                 return 'AGENT 回复';
@@ -934,7 +945,7 @@
         removeBtn.disabled = !state.active || busy;
         removeAllBtn.disabled = !state.active || busy;
         sendBtn.disabled = !composerMode || !state.active || busy || (agentMode && !agentEnabled);
-        commandInput.disabled = !composerMode || !state.active || state.sending || (agentMode && !agentEnabled);
+        commandInput.disabled = !composerMode || !state.active || (agentMode && !agentEnabled);
         if (commandInput) {
             commandInput.placeholder = agentMode
                 ? '输入提示词，例如：请帮我分析当前项目结构并给出重构建议'
@@ -1003,7 +1014,7 @@
     async function api(url, options) {
         const requestOptions = Object.assign(
-            { headers: { 'Content-Type': 'application/json' } },
+            { headers: { 'Content-Type': 'application/json', 'X-Requested-With': 'XMLHttpRequest' } },
             options || {}
         );
         const response = await fetch(url, requestOptions);
@@ -1146,6 +1157,10 @@
         row.style.setProperty('--item-index', String(index));
         row.classList.toggle('active', state.active === session.name);
         row.classList.toggle('history-only', status.tone === 'history');
+        row.classList.toggle('status-running', status.tone === 'running');
+        row.classList.toggle('status-stopped', status.tone === 'stopped');
+        row.classList.toggle('status-history', status.tone === 'history');
+        row.classList.toggle('status-unknown', status.tone === 'unknown');
         if (row.__sessionNameNode) {
             row.__sessionNameNode.textContent = session.name;
         }
@@ -1329,16 +1344,33 @@
             return `id:${msg.id}`;
         }
         const role = msg && msg.role ? String(msg.role) : '';
+        const mode = msg && msg.mode ? String(msg.mode) : '';
         const timestamp = msg && msg.timestamp ? String(msg.timestamp) : '';
         const exitCode = msg && typeof msg.exitCode === 'number' ? String(msg.exitCode) : '';
         const pending = msg && msg.pending ? '1' : '0';
         const content = msg && msg.content ? String(msg.content) : '';
-        return `idx:${index}|${role}|${timestamp}|${exitCode}|${pending}|${content}`;
+        return `idx:${index}|${role}|${mode}|${timestamp}|${exitCode}|${pending}|${content}`;
+    }
+    function resolveMessageOrigin(msg) {
+        const role = msg && msg.role ? String(msg.role) : '';
+        if (!(role === 'user' || role === 'assistant')) {
+            return '';
+        }
+        const mode = msg && msg.mode ? String(msg.mode) : '';
+        if (mode === 'agent') {
+            return 'agent';
+        }
+        return 'command';
     }
     function createMessageRow(msg, index) {
         const row = document.createElement('article');
         row.className = 'msg ' + (msg.role || 'system') + (msg.pending ? ' pending' : '');
+        const origin = resolveMessageOrigin(msg);
+        if (origin) {
+            row.classList.add('origin-' + origin);
+        }
         row.style.setProperty('--msg-index', String(index));
         const meta = document.createElement('div');
@@ -1354,9 +1386,25 @@
         const bubble = document.createElement('div');
         bubble.className = 'bubble';
-        const pre = document.createElement('pre');
-        pre.textContent = msg.content || '';
-        bubble.appendChild(pre);
+        const shouldRenderMarkdown = Boolean(markdownRenderer && markdownRenderer.shouldRenderMessage(msg));
+        if (shouldRenderMarkdown) {
+            const markdownNode = document.createElement('div');
+            markdownNode.className = 'md-content';
+            let renderedMarkdown = '';
+            try {
+                renderedMarkdown = String(markdownRenderer.render(msg.content) || '');
+            } catch (e) {
+                renderedMarkdown = '';
+            }
+            if (renderedMarkdown) {
+                markdownNode.innerHTML = renderedMarkdown;
+                bubble.appendChild(markdownNode);
+            } else {
+                appendPlainMessageContent(bubble, msg.content);
+            }
+        } else {
+            appendPlainMessageContent(bubble, msg.content);
+        }
         row.appendChild(meta);
         row.appendChild(bubble);
@@ -1703,6 +1751,7 @@
                     })
                 });
                 closeCreateModal();
+                state.mode = 'agent';
                 await loadSessions(data.name);
                 if (isMobileLayout()) {
                     closeMobileSessionPanel();
@@ -1993,7 +2042,7 @@
     renderSessions();
     renderMessages(state.messages);
     setMobileSessionPanel(false);
-    document.body.classList.add('command-mode');
+    document.body.classList.add('agent-mode');
     syncUi();
     loadSessions().catch(function (e) {
         alert(e.message);

package/lib/web/frontend/markdown-renderer.js ADDED Viewed

@@ -0,0 +1,143 @@
+(function () {
+    const MARKDOWN_URL_PROTOCOL_PATTERN = /^(https?:|mailto:|tel:)/i;
+    const runtime = {
+        configured: false,
+        available: false
+    };
+    function escapeHtml(value) {
+        return String(value == null ? '' : value)
+            .replace(/&/g, '&amp;')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;')
+            .replace(/"/g, '&quot;')
+            .replace(/'/g, '&#39;');
+    }
+    function sanitizeMarkdownUrl(value) {
+        const raw = String(value == null ? '' : value).trim();
+        if (!raw) {
+            return '';
+        }
+        if (raw[0] === '#') {
+            return raw;
+        }
+        if (raw[0] === '/') {
+            return raw.startsWith('//') ? '' : raw;
+        }
+        if (raw.startsWith('./') || raw.startsWith('../')) {
+            return raw;
+        }
+        if (MARKDOWN_URL_PROTOCOL_PATTERN.test(raw)) {
+            return raw;
+        }
+        return '';
+    }
+    function getMarkedApi() {
+        const api = window.marked;
+        if (!api || typeof api.parse !== 'function') {
+            return null;
+        }
+        return api;
+    }
+    function ensureRendererConfigured() {
+        if (runtime.configured) {
+            return runtime.available;
+        }
+        const markedApi = getMarkedApi();
+        if (!markedApi || typeof markedApi.Renderer !== 'function' || typeof markedApi.use !== 'function') {
+            runtime.configured = true;
+            runtime.available = false;
+            return false;
+        }
+        try {
+            const renderer = new markedApi.Renderer();
+            renderer.html = function (html) {
+                return escapeHtml(html);
+            };
+            renderer.link = function (href, title, text) {
+                const safeHref = sanitizeMarkdownUrl(href);
+                if (!safeHref) {
+                    return escapeHtml(text || '');
+                }
+                // [P1-02] 移除 marked 已渲染链接文本中的 on* 事件属性，防止内联 HTML 注入 XSS
+                const safeText = String(text || '').replace(/\s+on\w+\s*=\s*(?:"[^"]*"|'[^']*'|[^\s>]*)/gi, '');
+                let output = '<a href="' + escapeHtml(safeHref) + '" target="_blank" rel="noopener noreferrer"';
+                if (title) {
+                    output += ' title="' + escapeHtml(title) + '"';
+                }
+                output += '>' + safeText + '</a>';
+                return output;
+            };
+            // [P1-01] 重写 image 渲染器：
+            //   - 外部 http/https 图片转为可点击链接，避免浏览器自动发起外部请求（追踪像素风险）
+            //   - 相对路径图片正常渲染为 <img>
+            //   - 危险协议（javascript:/data: 等）降级为纯文本
+            renderer.image = function (href, title, text) {
+                const safeHref = sanitizeMarkdownUrl(href);
+                if (!safeHref) {
+                    return escapeHtml(text || '');
+                }
+                // 外部绝对 URL：转为链接，用户主动决定是否访问
+                if (/^https?:/i.test(safeHref)) {
+                    const safeText = String(text || '').replace(/\s+on\w+\s*=\s*(?:"[^"]*"|'[^']*'|[^\s>]*)/gi, '')
+                        || escapeHtml(safeHref);
+                    let output = '<a href="' + escapeHtml(safeHref) + '" target="_blank" rel="noopener noreferrer"';
+                    if (title) {
+                        output += ' title="' + escapeHtml(title) + '"';
+                    }
+                    return output + '>[\uD83D\uDDBC\uFE0F点击查看图片:' + safeText + ']</a>';
+                }
+                // 相对路径：正常渲染为图片
+                let output = '<img src="' + escapeHtml(safeHref) + '" alt="' + escapeHtml(text || '') + '"';
+                if (title) {
+                    output += ' title="' + escapeHtml(title) + '"';
+                }
+                return output + '>';
+            };
+            markedApi.use({
+                gfm: true,
+                breaks: true,
+                renderer
+            });
+            runtime.available = true;
+        } catch (e) {
+            runtime.available = false;
+        }
+        runtime.configured = true;
+        return runtime.available;
+    }
+    function shouldRenderMessage(msg) {
+        return Boolean(msg && msg.mode === 'agent' && msg.role === 'assistant');
+    }
+    function render(content) {
+        const source = String(content == null ? '' : content);
+        if (!source) {
+            return '';
+        }
+        if (!ensureRendererConfigured()) {
+            return '';
+        }
+        const markedApi = getMarkedApi();
+        if (!markedApi) {
+            return '';
+        }
+        try {
+            return String(markedApi.parse(source) || '');
+        } catch (e) {
+            return '';
+        }
+    }
+    window.ManyoyoMarkdown = {
+        shouldRenderMessage,
+        render
+    };
+}());

package/lib/web/frontend/markdown.css ADDED Viewed

@@ -0,0 +1,76 @@
+.bubble .md-content {
+    color: var(--text);
+    font-size: 13px;
+    line-height: 1.6;
+    word-break: break-word;
+}
+.bubble .md-content > :first-child {
+    margin-top: 0;
+}
+.bubble .md-content > :last-child {
+    margin-bottom: 0;
+}
+.bubble .md-content p,
+.bubble .md-content ul,
+.bubble .md-content ol,
+.bubble .md-content blockquote,
+.bubble .md-content pre,
+.bubble .md-content table {
+    margin: 0.6em 0;
+}
+.bubble .md-content ul,
+.bubble .md-content ol {
+    padding-left: 1.4em;
+}
+.bubble .md-content code {
+    font-family: var(--font-mono);
+    font-size: 12px;
+    padding: 1px 5px;
+    border-radius: 6px;
+    background: rgba(194, 149, 79, 0.16);
+}
+.bubble .md-content pre {
+    border-radius: 8px;
+    padding: 9px 10px;
+    border: 1px solid #e6d2b7;
+    background: rgba(255, 244, 224, 0.72);
+    overflow-x: auto;
+}
+.bubble .md-content pre code {
+    background: transparent;
+    border-radius: 0;
+    padding: 0;
+    font-size: 12px;
+    line-height: 1.5;
+}
+.bubble .md-content blockquote {
+    margin-left: 0;
+    padding-left: 10px;
+    border-left: 3px solid #dcb788;
+    color: #66492d;
+}
+.bubble .md-content table {
+    border-collapse: collapse;
+    width: 100%;
+}
+.bubble .md-content th,
+.bubble .md-content td {
+    border: 1px solid #e6d2b7;
+    padding: 4px 6px;
+    text-align: left;
+}
+.bubble .md-content a {
+    color: #8a4f17;
+    text-decoration-color: rgba(138, 79, 23, 0.45);
+}

package/lib/web/server.js CHANGED Viewed

@@ -9,7 +9,11 @@ const http = require('http');
 const WebSocket = require('ws');
 const JSON5 = require('json5');
 const { buildContainerRunArgs } = require('../container-run');
-const { resolveAgentPromptCommandTemplate } = require('../agent-resume');
+const {
+    resolveAgentProgram,
+    resolveAgentPromptCommandTemplate,
+    buildAgentResumeCommand
+} = require('../agent-resume');
 const WEB_HISTORY_MAX_MESSAGES = 500;
 const WEB_OUTPUT_MAX_CHARS = 16000;
@@ -19,6 +23,9 @@ const WEB_TERMINAL_DEFAULT_COLS = 120;
 const WEB_TERMINAL_DEFAULT_ROWS = 36;
 const WEB_TERMINAL_MIN_COLS = 40;
 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_AUTH_COOKIE_NAME = 'manyoyo_web_auth';
 const WEB_AUTH_TTL_SECONDS = 12 * 60 * 60;
 const FRONTEND_DIR = path.join(__dirname, 'frontend');
@@ -61,6 +68,7 @@ const DEFAULT_WEB_CONFIG_TEMPLATE = `{
 let XTERM_JS_FILE = null;
 let XTERM_CSS_FILE = null;
 let XTERM_ADDON_FIT_JS_FILE = null;
+let MARKED_MIN_JS_FILE = null;
 try {
     const xtermPackageDir = path.dirname(require.resolve('@xterm/xterm/package.json'));
     XTERM_JS_FILE = path.join(xtermPackageDir, 'lib', 'xterm.js');
@@ -75,6 +83,11 @@ try {
 } catch (e) {
     XTERM_ADDON_FIT_JS_FILE = null;
 }
+try {
+    MARKED_MIN_JS_FILE = require.resolve('marked/marked.min.js');
+} catch (e) {
+    MARKED_MIN_JS_FILE = null;
+}
 const MIME_TYPES = {
     '.css': 'text/css; charset=utf-8',
@@ -106,7 +119,12 @@ function loadWebSessionHistory(webHistoryDir, containerName) {
             containerName,
             updatedAt: null,
             messages: [],
-            agentPromptCommand: ''
+            agentPromptCommand: '',
+            agentProgram: '',
+            resumeSupported: false,
+            lastResumeAt: null,
+            lastResumeOk: null,
+            lastResumeError: ''
         };
     }
@@ -118,14 +136,24 @@ function loadWebSessionHistory(webHistoryDir, containerName) {
             messages: Array.isArray(data.messages) ? data.messages : [],
             agentPromptCommand: typeof data.agentPromptCommand === 'string'
                 ? data.agentPromptCommand
-                : ''
+                : '',
+            agentProgram: typeof data.agentProgram === 'string' ? data.agentProgram : '',
+            resumeSupported: data.resumeSupported === true,
+            lastResumeAt: typeof data.lastResumeAt === 'string' ? data.lastResumeAt : null,
+            lastResumeOk: typeof data.lastResumeOk === 'boolean' ? data.lastResumeOk : null,
+            lastResumeError: typeof data.lastResumeError === 'string' ? data.lastResumeError : ''
         };
     } catch (e) {
         return {
             containerName,
             updatedAt: null,
             messages: [],
-            agentPromptCommand: ''
+            agentPromptCommand: '',
+            agentProgram: '',
+            resumeSupported: false,
+            lastResumeAt: null,
+            lastResumeOk: null,
+            lastResumeError: ''
         };
     }
 }
@@ -174,9 +202,30 @@ function appendWebSessionMessage(webHistoryDir, containerName, role, content, ex
 function setWebSessionAgentPromptCommand(webHistoryDir, containerName, agentPromptCommand) {
     const history = loadWebSessionHistory(webHistoryDir, containerName);
     history.agentPromptCommand = normalizeAgentPromptCommandTemplate(agentPromptCommand, 'agentPromptCommand');
+    const agentProgram = resolveAgentProgram(history.agentPromptCommand);
+    const resumeCommand = buildAgentResumeCommand(agentProgram);
+    history.agentProgram = agentProgram || '';
+    history.resumeSupported = Boolean(resumeCommand);
+    if (!history.resumeSupported) {
+        history.lastResumeAt = null;
+        history.lastResumeOk = null;
+        history.lastResumeError = '';
+    }
     saveWebSessionHistory(webHistoryDir, containerName, history);
 }
+function patchWebSessionAgentState(webHistoryDir, containerName, patch) {
+    const history = loadWebSessionHistory(webHistoryDir, containerName);
+    if (!patch || typeof patch !== 'object') {
+        return history;
+    }
+    Object.keys(patch).forEach(key => {
+        history[key] = patch[key];
+    });
+    saveWebSessionHistory(webHistoryDir, containerName, history);
+    return history;
+}
 function stripAnsi(text) {
     if (typeof text !== 'string') return '';
     return text.replace(/\x1b\[[0-9;]*m/g, '');
@@ -220,6 +269,72 @@ function renderAgentPromptCommand(template, prompt) {
     return templateText.replace(/\{prompt\}/g, safePrompt);
 }
+function getAgentRuntimeMeta(history) {
+    const sessionHistory = history && typeof history === 'object' ? history : {};
+    const template = normalizeAgentPromptCommandTemplate(sessionHistory.agentPromptCommand, 'agentPromptCommand');
+    const agentProgram = resolveAgentProgram(template);
+    const resumeCommand = buildAgentResumeCommand(agentProgram);
+    return {
+        agentProgram: agentProgram || '',
+        resumeCommand: resumeCommand || '',
+        resumeSupported: Boolean(resumeCommand)
+    };
+}
+function hasAgentConversationHistory(history) {
+    const messages = history && Array.isArray(history.messages) ? history.messages : [];
+    for (const message of messages) {
+        if (!message || typeof message !== 'object') continue;
+        if (message.mode !== 'agent') continue;
+        if (message.role === 'user' || message.role === 'assistant') {
+            return true;
+        }
+    }
+    return false;
+}
+function clipAgentContextMessageText(text) {
+    const raw = clipText(stripAnsi(String(text || '')), WEB_AGENT_CONTEXT_PER_MESSAGE_MAX_CHARS);
+    return raw
+        .replace(/\r/g, '')
+        .replace(/\n{3,}/g, '\n\n')
+        .trim();
+}
+function buildAgentPromptWithHistory(history, prompt) {
+    const sessionHistory = history && Array.isArray(history.messages) ? history.messages : [];
+    const relevantMessages = sessionHistory
+        .filter(message => message && message.mode === 'agent' && (message.role === 'user' || message.role === 'assistant'))
+        .slice(-WEB_AGENT_CONTEXT_MAX_MESSAGES);
+    if (!relevantMessages.length) {
+        return String(prompt || '');
+    }
+    const lines = [];
+    for (const message of relevantMessages) {
+        const roleName = message.role === 'user' ? '用户' : '助手';
+        const content = clipAgentContextMessageText(message.content);
+        if (!content) continue;
+        lines.push(`${roleName}: ${content}`);
+    }
+    if (!lines.length) {
+        return String(prompt || '');
+    }
+    let historyText = lines.join('\n\n');
+    if (historyText.length > WEB_AGENT_CONTEXT_MAX_CHARS) {
+        historyText = historyText.slice(historyText.length - WEB_AGENT_CONTEXT_MAX_CHARS);
+    }
+    return [
+        '以下是当前会话最近对话历史（按时间顺序）：',
+        historyText,
+        '---',
+        '请基于以上历史回答当前问题。',
+        `当前问题: ${String(prompt || '').trim()}`
+    ].join('\n');
+}
 function secureStringEqual(a, b) {
     const aStr = String(a || '');
     const bStr = String(b || '');
@@ -299,11 +414,11 @@ function clearWebAuthSession(state, req) {
 }
 function getWebAuthCookie(sessionId) {
-    return `${WEB_AUTH_COOKIE_NAME}=${encodeURIComponent(sessionId)}; Path=/; HttpOnly; SameSite=Lax; Max-Age=${WEB_AUTH_TTL_SECONDS}`;
+    return `${WEB_AUTH_COOKIE_NAME}=${encodeURIComponent(sessionId)}; Path=/; HttpOnly; SameSite=Strict; Max-Age=${WEB_AUTH_TTL_SECONDS}`;
 }
 function getWebAuthClearCookie() {
-    return `${WEB_AUTH_COOKIE_NAME}=; Path=/; HttpOnly; SameSite=Lax; Max-Age=0`;
+    return `${WEB_AUTH_COOKIE_NAME}=; Path=/; HttpOnly; SameSite=Strict; Max-Age=0`;
 }
 function getDefaultWebConfigPath() {
@@ -745,6 +860,8 @@ function buildCreateRuntime(ctx, state, payload) {
         'agentPromptCommand'
     );
     const agentPromptCommand = configuredAgentPromptCommand || inferredAgentPromptCommand;
+    const agentProgram = resolveAgentProgram(agentPromptCommand);
+    const resumeSupported = Boolean(buildAgentResumeCommand(agentProgram));
     let containerEnvs = Array.isArray(ctx.containerEnvs) ? ctx.containerEnvs.slice() : [];
     if (hasRequestEnv || hasRequestEnvFile || hasConfigEnv || hasConfigEnvFile) {
@@ -813,6 +930,8 @@ function buildCreateRuntime(ctx, state, payload) {
             shell: shell || '',
             shellSuffix: shellSuffix || '',
             agentEnabled: isAgentPromptCommandEnabled(agentPromptCommand),
+            agentProgram: agentProgram || '',
+            resumeSupported,
             yolo: yolo || '',
             envCount: Math.floor(containerEnvs.length / 2),
             volumeCount: Math.floor(containerVolumes.length / 2),
@@ -995,6 +1114,7 @@ function getValidSessionName(ctx, res, encodedName) {
 function buildSessionSummary(ctx, state, containerMap, name) {
     const history = loadWebSessionHistory(state.webHistoryDir, name);
+    const agentMeta = getAgentRuntimeMeta(history);
     const latestMessage = history.messages.length ? history.messages[history.messages.length - 1] : null;
     const containerInfo = containerMap[name] || {};
     const updatedAt = history.updatedAt || (latestMessage && latestMessage.timestamp) || null;
@@ -1004,7 +1124,9 @@ function buildSessionSummary(ctx, state, containerMap, name) {
         image: containerInfo.image || '',
         updatedAt,
         messageCount: history.messages.length,
-        agentEnabled: isAgentPromptCommandEnabled(history.agentPromptCommand)
+        agentEnabled: isAgentPromptCommandEnabled(history.agentPromptCommand),
+        agentProgram: agentMeta.agentProgram,
+        resumeSupported: agentMeta.resumeSupported
     };
 }
@@ -1033,6 +1155,9 @@ function resolveVendorAsset(name) {
     if (name === 'xterm-addon-fit.js') {
         return XTERM_ADDON_FIT_JS_FILE && fs.existsSync(XTERM_ADDON_FIT_JS_FILE) ? XTERM_ADDON_FIT_JS_FILE : null;
     }
+    if (name === 'marked.min.js') {
+        return MARKED_MIN_JS_FILE && fs.existsSync(MARKED_MIN_JS_FILE) ? MARKED_MIN_JS_FILE : null;
+    }
     return null;
 }
@@ -1330,6 +1455,14 @@ function sendWebUnauthorized(res, pathname) {
 }
 async function handleWebApi(req, res, pathname, ctx, state) {
+    // [P2-03] 对非只读请求校验自定义头，防止 CSRF 攻击
+    // 跨站请求无法设置自定义头（浏览器同源策略），合法前端请求统一携带此头
+    if (req.method !== 'GET' && req.method !== 'HEAD') {
+        if (req.headers['x-requested-with'] !== 'XMLHttpRequest') {
+            sendJson(res, 403, { error: 'CSRF check failed' });
+            return true;
+        }
+    }
     const routes = [
         {
             method: 'GET',
@@ -1478,18 +1611,59 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     return;
                 }
-                const command = renderAgentPromptCommand(history.agentPromptCommand, prompt);
                 await ensureWebContainer(ctx, state, containerName);
-                appendWebSessionMessage(state.webHistoryDir, containerName, 'user', prompt, { mode: 'agent' });
+                const agentMeta = getAgentRuntimeMeta(history);
+                const hasPriorConversation = hasAgentConversationHistory(history);
+                let resumeAttempted = false;
+                let resumeSucceeded = false;
+                let resumeError = '';
+                if (hasPriorConversation && agentMeta.resumeSupported && agentMeta.resumeCommand) {
+                    resumeAttempted = true;
+                    const resumeResult = await execCommandInWebContainer(ctx, containerName, agentMeta.resumeCommand);
+                    if (resumeResult.exitCode === 0) {
+                        resumeSucceeded = true;
+                    } else {
+                        resumeError = clipText(String(resumeResult.output || '(无输出)'), 1200);
+                    }
+                }
+                const effectivePrompt = resumeSucceeded
+                    ? prompt
+                    : buildAgentPromptWithHistory(history, prompt);
+                const command = renderAgentPromptCommand(history.agentPromptCommand, effectivePrompt);
+                const contextMode = resumeSucceeded ? 'resume' : (hasPriorConversation ? 'history-injected' : 'first-turn');
+                appendWebSessionMessage(state.webHistoryDir, containerName, 'user', prompt, {
+                    mode: 'agent',
+                    contextMode
+                });
                 const result = await execCommandInWebContainer(ctx, containerName, command);
                 appendWebSessionMessage(
                     state.webHistoryDir,
                     containerName,
                     'assistant',
                     result.output,
-                    { exitCode: result.exitCode, mode: 'agent' }
+                    {
+                        exitCode: result.exitCode,
+                        mode: 'agent',
+                        contextMode,
+                        resumeAttempted,
+                        resumeSucceeded
+                    }
                 );
-                sendJson(res, 200, { exitCode: result.exitCode, output: result.output });
+                patchWebSessionAgentState(state.webHistoryDir, containerName, {
+                    agentProgram: agentMeta.agentProgram,
+                    resumeSupported: agentMeta.resumeSupported,
+                    lastResumeAt: resumeAttempted ? new Date().toISOString() : history.lastResumeAt || null,
+                    lastResumeOk: resumeAttempted ? resumeSucceeded : history.lastResumeOk,
+                    lastResumeError: resumeAttempted ? (resumeSucceeded ? '' : resumeError) : history.lastResumeError || ''
+                });
+                sendJson(res, 200, {
+                    exitCode: result.exitCode,
+                    output: result.output,
+                    contextMode,
+                    resumeAttempted,
+                    resumeSucceeded
+                });
             }
         },
         {
@@ -1629,7 +1803,7 @@ async function startWebServer(options) {
             const appFrontendMatch = pathname.match(/^\/app\/frontend\/([A-Za-z0-9._-]+)$/);
             if (req.method === 'GET' && appFrontendMatch) {
                 const assetName = appFrontendMatch[1];
-                if (!(assetName === 'app.css' || assetName === 'app.js')) {
+                if (!(assetName === 'app.css' || assetName === 'app.js' || assetName === 'markdown.css' || assetName === 'markdown-renderer.js')) {
                     sendHtml(res, 404, '<h1>404 Not Found</h1>');
                     return;
                 }
@@ -1640,7 +1814,7 @@ async function startWebServer(options) {
             const appVendorMatch = pathname.match(/^\/app\/vendor\/([A-Za-z0-9._-]+)$/);
             if (req.method === 'GET' && appVendorMatch) {
                 const assetName = appVendorMatch[1];
-                if (!(assetName === 'xterm.css' || assetName === 'xterm.js' || assetName === 'xterm-addon-fit.js')) {
+                if (!(assetName === 'xterm.css' || assetName === 'xterm.js' || assetName === 'xterm-addon-fit.js' || assetName === 'marked.min.js')) {
                     sendHtml(res, 404, '<h1>404 Not Found</h1>');
                     return;
                 }
@@ -1687,6 +1861,30 @@ async function startWebServer(options) {
             return;
         }
+        // [P1-03] Origin 校验，防止跨站 WebSocket 劫持（CSWSH）
+        // 浏览器发起的 WebSocket 请求必须携带 Origin 头，非浏览器客户端（如 curl）不携带则放行
+        const requestOrigin = req.headers.origin;
+        if (requestOrigin) {
+            const allowedOrigins = new Set();
+            if (ctx.serverHost === '0.0.0.0') {
+                // 0.0.0.0 监听时，以请求的 Host 头构造允许来源
+                const hostHeader = req.headers.host || '';
+                if (hostHeader) {
+                    allowedOrigins.add(`http://${hostHeader}`);
+                    allowedOrigins.add(`https://${hostHeader}`);
+                }
+            } else {
+                allowedOrigins.add(`http://${formatUrlHost(ctx.serverHost)}:${listenPort}`);
+                if (ctx.serverHost === '127.0.0.1') {
+                    allowedOrigins.add(`http://localhost:${listenPort}`);
+                }
+            }
+            if (allowedOrigins.size > 0 && !allowedOrigins.has(requestOrigin)) {
+                sendWebSocketUpgradeError(socket, 403, 'Forbidden');
+                return;
+            }
+        }
         const authSession = getWebAuthSession(state, req);
         if (!authSession) {
             sendWebSocketUpgradeError(socket, 401, 'UNAUTHORIZED');

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "5.2.0",
+    "version": "5.2.8",
     "imageVersion": "1.8.1-common",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",
     "keywords": [
@@ -58,6 +58,7 @@
         "@xterm/xterm": "^6.0.0",
         "commander": "^12.0.0",
         "json5": "^2.2.3",
+        "marked": "^12.0.2",
         "playwright": "1.58.2",
         "ws": "^8.19.0"
     },