@xcanwin/manyoyo 5.8.11 → 5.9.1

package/lib/web/server.js

@@ -34,6 +34,7 @@ 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_FILE_PREVIEW_MAX_BYTES = 256 * 1024;
 const WEB_AUTH_COOKIE_NAME = 'manyoyo_web_auth';
 const WEB_AUTH_TTL_SECONDS = 12 * 60 * 60;
 const WEB_SESSION_KEY_SEPARATOR = '~';
@@ -109,6 +110,24 @@ const MIME_TYPES = {
     '.js': 'application/javascript; charset=utf-8',
     '.html': 'text/html; charset=utf-8'
 };
+const FILE_LANGUAGE_MAP = {
+    '.cjs': 'javascript',
+    '.css': 'css',
+    '.htm': 'html',
+    '.html': 'html',
+    '.java': 'javascript',
+    '.js': 'javascript',
+    '.json': 'json',
+    '.jsx': 'javascript',
+    '.md': 'markdown',
+    '.markdown': 'markdown',
+    '.mjs': 'javascript',
+    '.py': 'python',
+    '.ts': 'javascript',
+    '.tsx': 'javascript',
+    '.yaml': 'yaml',
+    '.yml': 'yaml'
+};
 
 function formatUrlHost(host) {
     if (typeof host !== 'string' || !host) return '127.0.0.1';
@@ -365,6 +384,10 @@ function listWebAgentSessions(history, options = {}) {
         });
 }
 
+function createWebSessionMessageId() {
+    return `${Date.now()}-${Math.random().toString(16).slice(2, 8)}`;
+}
+
 function appendWebSessionMessage(webHistoryDir, sessionRefOrContainerName, role, content, extra = {}) {
     const sessionRef = typeof sessionRefOrContainerName === 'string'
         ? { containerName: sessionRefOrContainerName, agentId: WEB_DEFAULT_AGENT_ID }
@@ -372,13 +395,14 @@ function appendWebSessionMessage(webHistoryDir, sessionRefOrContainerName, role,
     const history = loadWebSessionHistory(webHistoryDir, sessionRef.containerName);
     const agentSession = getWebAgentSession(history, sessionRef.agentId, { create: true });
     const timestamp = new Date().toISOString();
-    agentSession.messages.push({
-        id: `${Date.now()}-${Math.random().toString(16).slice(2, 8)}`,
+    const message = {
+        id: createWebSessionMessageId(),
         role,
         content,
         timestamp,
         ...extra
-    });
+    };
+    agentSession.messages.push(message);
 
     if (agentSession.messages.length > WEB_HISTORY_MAX_MESSAGES) {
         agentSession.messages = agentSession.messages.slice(-WEB_HISTORY_MAX_MESSAGES);
@@ -387,6 +411,57 @@ function appendWebSessionMessage(webHistoryDir, sessionRefOrContainerName, role,
     agentSession.updatedAt = timestamp;
     history.updatedAt = timestamp;
     saveWebSessionHistory(webHistoryDir, sessionRef.containerName, history);
+    return message;
+}
+
+function patchWebSessionMessage(webHistoryDir, sessionRefOrContainerName, messageId, patch) {
+    const sessionRef = typeof sessionRefOrContainerName === 'string'
+        ? { containerName: sessionRefOrContainerName, agentId: WEB_DEFAULT_AGENT_ID }
+        : sessionRefOrContainerName;
+    const targetId = String(messageId || '').trim();
+    if (!targetId) {
+        return null;
+    }
+    const history = loadWebSessionHistory(webHistoryDir, sessionRef.containerName);
+    const agentSession = getWebAgentSession(history, sessionRef.agentId, { create: true });
+    const nextPatch = patch && typeof patch === 'object' ? patch : {};
+    const message = agentSession.messages.find(item => item && String(item.id || '') === targetId);
+    if (!message) {
+        return null;
+    }
+    Object.keys(nextPatch).forEach(key => {
+        if (key === 'id') {
+            return;
+        }
+        message[key] = nextPatch[key];
+    });
+    const timestamp = new Date().toISOString();
+    agentSession.updatedAt = timestamp;
+    history.updatedAt = timestamp;
+    saveWebSessionHistory(webHistoryDir, sessionRef.containerName, history);
+    return message;
+}
+
+function removeWebSessionMessage(webHistoryDir, sessionRefOrContainerName, messageId) {
+    const sessionRef = typeof sessionRefOrContainerName === 'string'
+        ? { containerName: sessionRefOrContainerName, agentId: WEB_DEFAULT_AGENT_ID }
+        : sessionRefOrContainerName;
+    const targetId = String(messageId || '').trim();
+    if (!targetId) {
+        return null;
+    }
+    const history = loadWebSessionHistory(webHistoryDir, sessionRef.containerName);
+    const agentSession = getWebAgentSession(history, sessionRef.agentId, { create: true });
+    const index = agentSession.messages.findIndex(item => item && String(item.id || '') === targetId);
+    if (index === -1) {
+        return null;
+    }
+    const removed = agentSession.messages.splice(index, 1)[0] || null;
+    const timestamp = new Date().toISOString();
+    agentSession.updatedAt = timestamp;
+    history.updatedAt = timestamp;
+    saveWebSessionHistory(webHistoryDir, sessionRef.containerName, history);
+    return removed;
 }
 
 function setWebSessionAgentPromptCommand(webHistoryDir, containerName, agentPromptCommand) {
@@ -797,6 +872,7 @@ function hasAgentConversationHistory(history) {
     for (const message of messages) {
         if (!message || typeof message !== 'object') continue;
         if (message.mode !== 'agent') continue;
+        if (message.pending === true) continue;
         if (message.streamTrace === true) continue;
         if (message.role === 'user' || message.role === 'assistant') {
             return true;
@@ -819,6 +895,7 @@ function buildAgentPromptWithHistory(history, prompt) {
         .filter(message => (
             message
             && message.mode === 'agent'
+            && message.pending !== true
             && message.streamTrace !== true
             && (message.role === 'user' || message.role === 'assistant')
         ))
@@ -1528,9 +1605,9 @@ function finalizeWebAgentExecution(state, sessionRef, agentSession, agentMeta, m
 function appendWebAgentTraceMessage(webHistoryDir, sessionRefOrContainerName, content, extra = {}) {
     const text = String(content || '').trim();
     if (!text) {
-        return;
+        return null;
     }
-    appendWebSessionMessage(webHistoryDir, sessionRefOrContainerName, 'assistant', text, {
+    return appendWebSessionMessage(webHistoryDir, sessionRefOrContainerName, 'assistant', text, {
         mode: 'agent',
         streamTrace: true,
         ...extra
@@ -2537,6 +2614,156 @@ async function execCommandInWebContainer(ctx, containerName, command, options =
     });
 }
 
+function buildWebContainerNodeCommand(scriptSource) {
+    return `node <<'__MANYOYO_NODE__'
+${scriptSource}
+__MANYOYO_NODE__`;
+}
+
+function inferFileLanguage(filePath) {
+    const ext = path.extname(String(filePath || '')).toLowerCase();
+    return FILE_LANGUAGE_MAP[ext] || 'text';
+}
+
+async function execJsonCommandInWebContainer(ctx, containerName, command) {
+    const result = await execCommandInWebContainer(ctx, containerName, command);
+    if (result.exitCode !== 0) {
+        throw new Error(result.output || '容器命令执行失败');
+    }
+    try {
+        return JSON.parse(String(result.output || '{}'));
+    } catch (e) {
+        throw new Error('容器返回了无法解析的 JSON');
+    }
+}
+
+function buildContainerFileListCommand(requestedPath) {
+    return buildWebContainerNodeCommand(`
+// __MANYOYO_FS_LIST__
+const fs = require('fs');
+const path = require('path');
+
+const requestedPath = ${JSON.stringify(String(requestedPath || '/'))};
+
+try {
+    const realPath = fs.realpathSync(requestedPath);
+    const stat = fs.statSync(realPath);
+    if (!stat.isDirectory()) {
+        throw new Error('目标不是目录: ' + realPath);
+    }
+
+    const root = path.parse(realPath).root;
+    const parentPath = realPath === root ? '' : path.dirname(realPath);
+    const entries = fs.readdirSync(realPath, { withFileTypes: true })
+        .map(entry => {
+            const fullPath = path.join(realPath, entry.name);
+            let itemStat = null;
+            try {
+                itemStat = fs.lstatSync(fullPath);
+            } catch (e) {
+                itemStat = null;
+            }
+            let kind = 'other';
+            if (entry.isDirectory()) {
+                kind = 'directory';
+            } else if (entry.isFile()) {
+                kind = 'file';
+            } else if (entry.isSymbolicLink()) {
+                kind = 'symlink';
+            }
+            return {
+                name: entry.name,
+                path: fullPath,
+                kind,
+                size: itemStat && typeof itemStat.size === 'number' ? itemStat.size : 0,
+                mtimeMs: itemStat && typeof itemStat.mtimeMs === 'number' ? Math.floor(itemStat.mtimeMs) : 0
+            };
+        })
+        .sort((a, b) => {
+            if (a.kind !== b.kind) {
+                if (a.kind === 'directory') return -1;
+                if (b.kind === 'directory') return 1;
+            }
+            return a.name.localeCompare(b.name, 'zh-CN');
+        });
+
+    process.stdout.write(JSON.stringify({
+        path: realPath,
+        parentPath,
+        entries
+    }));
+} catch (e) {
+    process.stdout.write(JSON.stringify({
+        error: e && e.message ? e.message : '读取目录失败'
+    }));
+}
+`);
+}
+
+function buildContainerFileReadCommand(requestedPath) {
+    return buildWebContainerNodeCommand(`
+// __MANYOYO_FS_READ__
+const fs = require('fs');
+
+const requestedPath = ${JSON.stringify(String(requestedPath || ''))};
+const maxBytes = ${String(WEB_FILE_PREVIEW_MAX_BYTES)};
+
+function looksBinary(buffer) {
+    const length = Math.min(buffer.length, 4096);
+    let suspicious = 0;
+    for (let i = 0; i < length; i += 1) {
+        const byte = buffer[i];
+        if (byte === 0) {
+            return true;
+        }
+        if (byte < 7 || (byte > 13 && byte < 32)) {
+            suspicious += 1;
+        }
+    }
+    return length > 0 && (suspicious / length) > 0.12;
+}
+
+try {
+    const realPath = fs.realpathSync(requestedPath);
+    const stat = fs.statSync(realPath);
+    if (!stat.isFile()) {
+        throw new Error('目标不是文件: ' + realPath);
+    }
+
+    const size = stat.size;
+    const readBytes = Math.min(size, maxBytes);
+    const buffer = Buffer.alloc(readBytes);
+    const fd = fs.openSync(realPath, 'r');
+    try {
+        fs.readSync(fd, buffer, 0, readBytes, 0);
+    } finally {
+        fs.closeSync(fd);
+    }
+
+    if (looksBinary(buffer)) {
+        process.stdout.write(JSON.stringify({
+            path: realPath,
+            kind: 'binary',
+            size,
+            truncated: size > maxBytes
+        }));
+    } else {
+        process.stdout.write(JSON.stringify({
+            path: realPath,
+            kind: 'text',
+            size,
+            truncated: size > maxBytes,
+            content: buffer.toString('utf8')
+        }));
+    }
+} catch (e) {
+    process.stdout.write(JSON.stringify({
+        error: e && e.message ? e.message : '读取文件失败'
+    }));
+}
+`);
+}
+
 async function execAgentInWebContainerStream(ctx, state, sessionRefOrContainerName, command, options = {}) {
     const opts = options && typeof options === 'object' ? options : {};
     const sessionRef = typeof sessionRefOrContainerName === 'string'
@@ -3435,6 +3662,61 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 });
             }
         },
+        {
+            method: 'GET',
+            match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/fs\/list$/),
+            handler: async match => {
+                const sessionRef = getValidSessionRef(ctx, res, match[1]);
+                if (!sessionRef) {
+                    return;
+                }
+                const requestUrl = new URL(req.url || '/api/sessions/x/fs/list', 'http://localhost');
+                const targetPath = String(requestUrl.searchParams.get('path') || '/').trim() || '/';
+
+                await ensureWebContainer(ctx, state, sessionRef.containerName, sessionRef);
+                const payload = await execJsonCommandInWebContainer(
+                    ctx,
+                    sessionRef.containerName,
+                    buildContainerFileListCommand(targetPath)
+                );
+                if (payload && payload.error) {
+                    sendJson(res, 400, { error: payload.error });
+                    return;
+                }
+                sendJson(res, 200, payload);
+            }
+        },
+        {
+            method: 'GET',
+            match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/fs\/read$/),
+            handler: async match => {
+                const sessionRef = getValidSessionRef(ctx, res, match[1]);
+                if (!sessionRef) {
+                    return;
+                }
+                const requestUrl = new URL(req.url || '/api/sessions/x/fs/read', 'http://localhost');
+                const targetPath = String(requestUrl.searchParams.get('path') || '').trim();
+                if (!targetPath) {
+                    sendJson(res, 400, { error: 'path 不能为空' });
+                    return;
+                }
+
+                await ensureWebContainer(ctx, state, sessionRef.containerName, sessionRef);
+                const payload = await execJsonCommandInWebContainer(
+                    ctx,
+                    sessionRef.containerName,
+                    buildContainerFileReadCommand(targetPath)
+                );
+                if (payload && payload.error) {
+                    sendJson(res, 400, { error: payload.error });
+                    return;
+                }
+                if (payload && payload.kind === 'text') {
+                    payload.language = inferFileLanguage(payload.path);
+                }
+                sendJson(res, 200, payload);
+            }
+        },
         {
             method: 'GET',
             match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/detail$/),
@@ -3603,10 +3885,26 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     return;
                 }
 
+                const userMessage = appendWebSessionMessage(state.webHistoryDir, sessionRef, 'user', prompt, {
+                    mode: 'agent',
+                    pending: true
+                });
+                const traceMessage = appendWebAgentTraceMessage(
+                    state.webHistoryDir,
+                    sessionRef,
+                    '[执行过程]\n等待 Agent 启动…',
+                    {
+                        traceEvents: [],
+                        pending: true
+                    }
+                );
+
                 let prepared = null;
                 try {
                     prepared = await prepareWebAgentExecution(ctx, state, sessionRef, prompt);
                 } catch (e) {
+                    removeWebSessionMessage(state.webHistoryDir, sessionRef, traceMessage && traceMessage.id);
+                    removeWebSessionMessage(state.webHistoryDir, sessionRef, userMessage && userMessage.id);
                     sendJson(res, 400, { error: e && e.message ? e.message : 'Agent 执行准备失败' });
                     return;
                 }
@@ -3614,8 +3912,9 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 const { agentSession, agentMeta, command, contextMode, resumeAttempted, resumeSucceeded, resumeError } = prepared;
                 const traceLines = ['[执行过程]'];
                 const traceEvents = [];
-                appendWebSessionMessage(state.webHistoryDir, sessionRef, 'user', prompt, {
-                    mode: 'agent',
+                let streamingReplyMessageId = '';
+                patchWebSessionMessage(state.webHistoryDir, sessionRef, userMessage && userMessage.id, {
+                    pending: true,
                     contextMode
                 });
 
@@ -3639,6 +3938,14 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 if (resumeAttempted) {
                     traceLines.push(resumeSucceeded ? '会话恢复成功' : '会话恢复失败，已回退到历史注入');
                 }
+                patchWebSessionMessage(state.webHistoryDir, sessionRef, traceMessage && traceMessage.id, {
+                    content: traceLines.join('\n'),
+                    traceEvents: traceEvents.slice(),
+                    contextMode,
+                    resumeAttempted,
+                    resumeSucceeded,
+                    pending: true
+                });
 
                 try {
                     const result = await execAgentInWebContainerStream(ctx, state, sessionRef, command, {
@@ -3649,18 +3956,57 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                                 if (event.traceEvent && typeof event.traceEvent === 'object') {
                                     traceEvents.push(event.traceEvent);
                                 }
+                                patchWebSessionMessage(state.webHistoryDir, sessionRef, traceMessage && traceMessage.id, {
+                                    content: traceLines.join('\n'),
+                                    traceEvents: traceEvents.slice(),
+                                    pending: true
+                                });
+                            }
+                            if (event && event.type === 'content_delta' && typeof event.content === 'string') {
+                                if (!streamingReplyMessageId) {
+                                    const streamingReplyMessage = appendWebSessionMessage(
+                                        state.webHistoryDir,
+                                        sessionRef,
+                                        'assistant',
+                                        event.content,
+                                        {
+                                            mode: 'agent',
+                                            streamingReply: true,
+                                            pending: true
+                                        }
+                                    );
+                                    streamingReplyMessageId = streamingReplyMessage && streamingReplyMessage.id
+                                        ? streamingReplyMessage.id
+                                        : '';
+                                } else {
+                                    patchWebSessionMessage(state.webHistoryDir, sessionRef, streamingReplyMessageId, {
+                                        content: event.content,
+                                        pending: true
+                                    });
+                                }
                             }
                             sendNdjson(res, event);
                         }
                     });
                     traceLines.push(result.interrupted === true ? '[任务] 已停止' : '[任务] 已完成');
-                    appendWebAgentTraceMessage(state.webHistoryDir, sessionRef, traceLines.join('\n'), {
+                    patchWebSessionMessage(state.webHistoryDir, sessionRef, userMessage && userMessage.id, {
+                        pending: false,
+                        contextMode,
+                        resumeAttempted,
+                        resumeSucceeded
+                    });
+                    patchWebSessionMessage(state.webHistoryDir, sessionRef, traceMessage && traceMessage.id, {
+                        content: traceLines.join('\n'),
                         traceEvents,
                         contextMode,
                         resumeAttempted,
                         resumeSucceeded,
-                        interrupted: result.interrupted === true
+                        interrupted: result.interrupted === true,
+                        pending: false
                     });
+                    if (streamingReplyMessageId) {
+                        removeWebSessionMessage(state.webHistoryDir, sessionRef, streamingReplyMessageId);
+                    }
                     finalizeWebAgentExecution(state, sessionRef, agentSession, agentMeta, {
                         contextMode,
                         resumeAttempted,
@@ -3678,13 +4024,24 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     });
                 } catch (e) {
                     traceLines.push(`[错误] ${e && e.message ? e.message : 'Agent 执行失败'}`);
-                    appendWebAgentTraceMessage(state.webHistoryDir, sessionRef, traceLines.join('\n'), {
+                    patchWebSessionMessage(state.webHistoryDir, sessionRef, userMessage && userMessage.id, {
+                        pending: false,
+                        contextMode,
+                        resumeAttempted,
+                        resumeSucceeded
+                    });
+                    patchWebSessionMessage(state.webHistoryDir, sessionRef, traceMessage && traceMessage.id, {
+                        content: traceLines.join('\n'),
                         traceEvents,
                         contextMode,
                         resumeAttempted,
                         resumeSucceeded,
-                        interrupted: true
+                        interrupted: true,
+                        pending: false
                     });
+                    if (streamingReplyMessageId) {
+                        removeWebSessionMessage(state.webHistoryDir, sessionRef, streamingReplyMessageId);
+                    }
                     sendNdjson(res, {
                         type: 'error',
                         error: e && e.message ? e.message : 'Agent 执行失败'
@@ -3872,7 +4229,12 @@ 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' || assetName === 'markdown.css' || assetName === 'markdown-renderer.js')) {
+                if (!(assetName === 'app.css'
+                    || assetName === 'app.js'
+                    || assetName === 'markdown.css'
+                    || assetName === 'markdown-renderer.js'
+                    || assetName === 'file-browser.js'
+                    || assetName === 'codemirror.bundle.js')) {
                     sendHtml(res, 404, '<h1>404 Not Found</h1>');
                     return;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "5.8.11",
+    "version": "5.9.1",
     "imageVersion": "1.9.0-common",
     "playwrightCliVersion": "0.1.1",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",
@@ -31,6 +31,7 @@
     },
     "scripts": {
         "dev:release": "node scripts/dev-release.js",
+        "build:web-editor": "node scripts/build-web-code-editor.js",
         "install-link": "npm link",
         "test": "jest --coverage",
         "test:unit": "jest test/",
@@ -66,6 +67,19 @@
         "ws": "^8.20.0"
     },
     "devDependencies": {
+        "@codemirror/commands": "^6.10.3",
+        "@codemirror/lang-css": "^6.3.1",
+        "@codemirror/lang-html": "^6.4.11",
+        "@codemirror/lang-javascript": "^6.2.5",
+        "@codemirror/lang-json": "^6.0.2",
+        "@codemirror/lang-markdown": "^6.5.0",
+        "@codemirror/lang-python": "^6.2.1",
+        "@codemirror/lang-yaml": "^6.1.3",
+        "@codemirror/language": "^6.12.3",
+        "@codemirror/search": "^6.6.0",
+        "@codemirror/state": "^6.6.0",
+        "@codemirror/view": "^6.41.0",
+        "codemirror": "^6.0.2",
         "jest": "^30.3.0",
         "vitepress": "^1.6.4"
     },