@xcanwin/manyoyo 5.9.2 → 5.9.11

package/lib/web/server.js

@@ -34,7 +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;
-const WEB_FILE_PREVIEW_MAX_BYTES = 256 * 1024;
+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';
 const WEB_AUTH_TTL_SECONDS = 12 * 60 * 60;
 const WEB_SESSION_KEY_SEPARATOR = '~';
@@ -165,6 +166,7 @@ function createEmptyWebAgentSession(agentId, agentName) {
         agentId,
         agentName: normalizeWebAgentName(agentId, agentName),
         agentPromptCommand: '',
+        createdAt: null,
         updatedAt: null,
         messages: [],
         lastResumeAt: null,
@@ -181,6 +183,7 @@ function normalizeWebAgentSessionRecord(agentId, rawAgent) {
         agentPromptCommand: typeof source.agentPromptCommand === 'string'
             ? normalizeAgentPromptCommandTemplate(source.agentPromptCommand, `agents.${agentId}.agentPromptCommand`)
             : '',
+        createdAt: typeof source.createdAt === 'string' ? source.createdAt : null,
         updatedAt: typeof source.updatedAt === 'string' ? source.updatedAt : null,
         messages: Array.isArray(source.messages) ? source.messages : [],
         lastResumeAt: typeof source.lastResumeAt === 'string' ? source.lastResumeAt : null,
@@ -384,6 +387,45 @@ function listWebAgentSessions(history, options = {}) {
         });
 }
 
+function getWebAgentCreationRank(agentId) {
+    if (agentId === WEB_DEFAULT_AGENT_ID) {
+        return 1;
+    }
+    const matched = String(agentId || '').match(/^agent-(\d+)$/);
+    return matched ? (Number(matched[1]) || 0) : 0;
+}
+
+function getWebSessionCreatedTime(sessionSummary) {
+    if (sessionSummary && sessionSummary.createdAt) {
+        const time = new Date(sessionSummary.createdAt).getTime();
+        if (Number.isFinite(time)) {
+            return time;
+        }
+    }
+    return 0;
+}
+
+function compareWebSessionCreatedDesc(a, b) {
+    const timeA = getWebSessionCreatedTime(a);
+    const timeB = getWebSessionCreatedTime(b);
+    if (timeA !== timeB) {
+        return timeB - timeA;
+    }
+    if (a && b && a.containerName === b.containerName) {
+        const rankA = getWebAgentCreationRank(a.agentId);
+        const rankB = getWebAgentCreationRank(b.agentId);
+        if (rankA !== rankB) {
+            return rankB - rankA;
+        }
+    }
+    const updatedA = a && a.updatedAt ? new Date(a.updatedAt).getTime() : 0;
+    const updatedB = b && b.updatedAt ? new Date(b.updatedAt).getTime() : 0;
+    if (updatedA !== updatedB) {
+        return updatedB - updatedA;
+    }
+    return String((a && a.name) || '').localeCompare(String((b && b.name) || ''), 'zh-CN');
+}
+
 function createWebSessionMessageId() {
     return `${Date.now()}-${Math.random().toString(16).slice(2, 8)}`;
 }
@@ -402,6 +444,9 @@ function appendWebSessionMessage(webHistoryDir, sessionRefOrContainerName, role,
         timestamp,
         ...extra
     };
+    if (!agentSession.createdAt) {
+        agentSession.createdAt = timestamp;
+    }
     agentSession.messages.push(message);
 
     if (agentSession.messages.length > WEB_HISTORY_MAX_MESSAGES) {
@@ -584,7 +629,11 @@ function createWebAgentSession(history) {
     }
     const agentId = `agent-${agentIndex}`;
     const agentSession = createEmptyWebAgentSession(agentId, `AGENT ${agentIndex}`);
+    const timestamp = new Date().toISOString();
+    agentSession.createdAt = timestamp;
+    agentSession.updatedAt = timestamp;
     sessionHistory.agents[agentId] = agentSession;
+    sessionHistory.updatedAt = timestamp;
     return agentSession;
 }
 
@@ -2609,7 +2658,12 @@ async function execCommandInWebContainer(ctx, containerName, command, options =
             const extractedAgentMessage = extractAgentMessageFromStructuredOutput(agentProgram, clippedStdout);
             const cleanOutputSource = extractedAgentMessage || clippedRaw;
             const output = clipText(stripAnsi(cleanOutputSource).trim() || '(无输出)');
-            resolve({ exitCode, output });
+            resolve({
+                exitCode,
+                output,
+                stdout: clippedStdout,
+                stderr: clippedStderr
+            });
         });
     });
 }
@@ -2631,7 +2685,7 @@ async function execJsonCommandInWebContainer(ctx, containerName, command) {
         throw new Error(result.output || '容器命令执行失败');
     }
     try {
-        return JSON.parse(String(result.output || '{}'));
+        return JSON.parse(String(result.stdout || '{}'));
     } catch (e) {
         throw new Error('容器返回了无法解析的 JSON');
     }
@@ -2700,13 +2754,17 @@ try {
 `);
 }
 
-function buildContainerFileReadCommand(requestedPath) {
+function buildContainerFileReadCommand(requestedPath, options = {}) {
+    const opts = options && typeof options === 'object' ? options : {};
+    const maxBytes = Number.isFinite(opts.maxBytes) && opts.maxBytes > 0
+        ? Math.floor(opts.maxBytes)
+        : 0;
     return buildWebContainerNodeCommand(`
 // __MANYOYO_FS_READ__
 const fs = require('fs');
 
 const requestedPath = ${JSON.stringify(String(requestedPath || ''))};
-const maxBytes = ${String(WEB_FILE_PREVIEW_MAX_BYTES)};
+const maxBytes = ${String(maxBytes)};
 
 function looksBinary(buffer) {
     const length = Math.min(buffer.length, 4096);
@@ -2731,7 +2789,7 @@ try {
     }
 
     const size = stat.size;
-    const readBytes = Math.min(size, maxBytes);
+    const readBytes = maxBytes > 0 ? Math.min(size, maxBytes) : size;
     const buffer = Buffer.alloc(readBytes);
     const fd = fs.openSync(realPath, 'r');
     try {
@@ -2745,14 +2803,14 @@ try {
             path: realPath,
             kind: 'binary',
             size,
-            truncated: size > maxBytes
+            truncated: maxBytes > 0 && size > maxBytes
         }));
     } else {
         process.stdout.write(JSON.stringify({
             path: realPath,
             kind: 'text',
             size,
-            truncated: size > maxBytes,
+            truncated: maxBytes > 0 && size > maxBytes,
             content: buffer.toString('utf8')
         }));
     }
@@ -2764,6 +2822,71 @@ try {
 `);
 }
 
+function buildContainerFileWriteCommand(requestedPath, content) {
+    return buildWebContainerNodeCommand(`
+// __MANYOYO_FS_WRITE__
+const fs = require('fs');
+
+const requestedPath = ${JSON.stringify(String(requestedPath || ''))};
+const nextContent = ${JSON.stringify(String(content == null ? '' : content))};
+
+try {
+    const realPath = fs.realpathSync(requestedPath);
+    const stat = fs.statSync(realPath);
+    if (!stat.isFile()) {
+        throw new Error('目标不是文件: ' + realPath);
+    }
+
+    fs.writeFileSync(realPath, nextContent, 'utf8');
+    const savedStat = fs.statSync(realPath);
+    process.stdout.write(JSON.stringify({
+        path: realPath,
+        saved: true,
+        size: savedStat.size
+    }));
+} catch (e) {
+    process.stdout.write(JSON.stringify({
+        error: e && e.message ? e.message : '保存文件失败'
+    }));
+}
+`);
+}
+
+function buildContainerFileMkdirCommand(requestedPath) {
+    return buildWebContainerNodeCommand(`
+// __MANYOYO_FS_MKDIR__
+const fs = require('fs');
+const path = require('path');
+
+const requestedPath = ${JSON.stringify(String(requestedPath || ''))};
+
+try {
+    const resolvedPath = path.resolve(requestedPath);
+    const parentPath = path.dirname(resolvedPath);
+    const realParentPath = fs.realpathSync(parentPath);
+    const targetPath = path.join(realParentPath, path.basename(resolvedPath));
+    if (fs.existsSync(targetPath)) {
+        throw new Error('目录已存在: ' + targetPath);
+    }
+
+    fs.mkdirSync(targetPath, { recursive: true });
+    const stat = fs.statSync(targetPath);
+    process.stdout.write(JSON.stringify({
+        path: targetPath,
+        name: path.basename(targetPath),
+        kind: 'directory',
+        size: 0,
+        mtimeMs: stat.mtimeMs,
+        created: true
+    }));
+} 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'
@@ -3041,7 +3164,13 @@ function buildSessionSummary(ctx, state, containerMap, sessionRef) {
             status: containerInfo.status || 'history',
             defaultCommand: containerInfo.defaultCommand || ''
         });
-    const updatedAt = agentSession.updatedAt || history.updatedAt || (latestMessage && latestMessage.timestamp) || containerInfo.createdAt || null;
+    const createdAt = agentSession.createdAt || containerInfo.createdAt || null;
+    const updatedAt = agentSession.updatedAt
+        || (latestMessage && latestMessage.timestamp)
+        || (agentId === WEB_DEFAULT_AGENT_ID
+            ? (history.updatedAt || containerInfo.createdAt)
+            : null)
+        || null;
     return {
         name: buildWebSessionKey(containerName, agentId),
         containerName,
@@ -3049,6 +3178,7 @@ function buildSessionSummary(ctx, state, containerMap, sessionRef) {
         agentName: agentSession.agentName,
         status: containerInfo.status || 'history',
         image: containerInfo.image || '',
+        createdAt,
         updatedAt,
         messageCount: agentSession.messages.length,
         agentEnabled: isAgentPromptCommandEnabled(effectiveAgentPromptCommand),
@@ -3533,6 +3663,25 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 });
             }
         },
+        {
+            method: 'POST',
+            match: currentPath => currentPath === '/api/fs/directories/mkdir' ? [] : null,
+            handler: async () => {
+                const payload = await readJsonBody(req);
+                const requestedPath = expandHomeAliasPath(String(payload && payload.path ? payload.path : '').trim());
+                if (!requestedPath) {
+                    sendJson(res, 400, { error: 'path 不能为空' });
+                    return;
+                }
+
+                const targetPath = path.resolve(requestedPath);
+                fs.mkdirSync(targetPath, { recursive: true });
+                sendJson(res, 200, {
+                    path: targetPath,
+                    created: true
+                });
+            }
+        },
         {
             method: 'GET',
             match: currentPath => currentPath === '/api/config' ? [] : null,
@@ -3594,11 +3743,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                             }))
                             .filter(Boolean);
                     })
-                    .sort((a, b) => {
-                        const timeA = a.updatedAt ? new Date(a.updatedAt).getTime() : 0;
-                        const timeB = b.updatedAt ? new Date(b.updatedAt).getTime() : 0;
-                        return timeB - timeA;
-                    });
+                    .sort(compareWebSessionCreatedDesc);
 
                 sendJson(res, 200, { sessions });
             }
@@ -3696,6 +3841,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 }
                 const requestUrl = new URL(req.url || '/api/sessions/x/fs/read', 'http://localhost');
                 const targetPath = String(requestUrl.searchParams.get('path') || '').trim();
+                const fullRequested = ['1', 'true', 'yes'].includes(String(requestUrl.searchParams.get('full') || '').toLowerCase());
                 if (!targetPath) {
                     sendJson(res, 400, { error: 'path 不能为空' });
                     return;
@@ -3705,7 +3851,9 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 const payload = await execJsonCommandInWebContainer(
                     ctx,
                     sessionRef.containerName,
-                    buildContainerFileReadCommand(targetPath)
+                    buildContainerFileReadCommand(targetPath, {
+                        maxBytes: fullRequested ? 0 : WEB_FILE_PREVIEW_MAX_BYTES
+                    })
                 );
                 if (payload && payload.error) {
                     sendJson(res, 400, { error: payload.error });
@@ -3713,10 +3861,77 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 }
                 if (payload && payload.kind === 'text') {
                     payload.language = inferFileLanguage(payload.path);
+                    payload.editable = payload.truncated !== true
+                        && Number(payload.size || 0) < WEB_FILE_EDIT_MAX_BYTES;
                 }
                 sendJson(res, 200, payload);
             }
         },
+        {
+            method: 'PUT',
+            match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/fs\/write$/),
+            handler: async match => {
+                const sessionRef = getValidSessionRef(ctx, res, match[1]);
+                if (!sessionRef) {
+                    return;
+                }
+                const payload = await readJsonBody(req);
+                const targetPath = String(payload && payload.path ? payload.path : '').trim();
+                const content = typeof payload.content === 'string' ? payload.content : null;
+                if (!targetPath) {
+                    sendJson(res, 400, { error: 'path 不能为空' });
+                    return;
+                }
+                if (content === null) {
+                    sendJson(res, 400, { error: 'content 必须是字符串' });
+                    return;
+                }
+                if (Buffer.byteLength(content, 'utf8') >= WEB_FILE_EDIT_MAX_BYTES) {
+                    sendJson(res, 400, { error: '文件过大，当前仅支持编辑小于 2MB 的文本文件' });
+                    return;
+                }
+
+                await ensureWebContainer(ctx, state, sessionRef.containerName, sessionRef);
+                const result = await execJsonCommandInWebContainer(
+                    ctx,
+                    sessionRef.containerName,
+                    buildContainerFileWriteCommand(targetPath, content)
+                );
+                if (result && result.error) {
+                    sendJson(res, 400, { error: result.error });
+                    return;
+                }
+                sendJson(res, 200, result);
+            }
+        },
+        {
+            method: 'POST',
+            match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/fs\/mkdir$/),
+            handler: async match => {
+                const sessionRef = getValidSessionRef(ctx, res, match[1]);
+                if (!sessionRef) {
+                    return;
+                }
+                const payload = await readJsonBody(req);
+                const targetPath = String(payload && payload.path ? payload.path : '').trim();
+                if (!targetPath) {
+                    sendJson(res, 400, { error: 'path 不能为空' });
+                    return;
+                }
+
+                await ensureWebContainer(ctx, state, sessionRef.containerName, sessionRef);
+                const result = await execJsonCommandInWebContainer(
+                    ctx,
+                    sessionRef.containerName,
+                    buildContainerFileMkdirCommand(targetPath)
+                );
+                if (result && result.error) {
+                    sendJson(res, 400, { error: result.error });
+                    return;
+                }
+                sendJson(res, 200, result);
+            }
+        },
         {
             method: 'GET',
             match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/detail$/),

package/package.json

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