@xcanwin/manyoyo 6.0.5 → 6.1.3

package/lib/web/server.js

@@ -22,6 +22,13 @@ const {
     resolveAgentPromptCommandTemplate,
     buildAgentResumeCommand
 } = require('../agent-resume');
+const { resolveYoloCommand: resolveYoloCommandFromAdapters } = require('../agent-adapters');
+const {
+    createControlEvent,
+    validateControlEvent,
+    projectSessionEvents
+} = require('../core/events');
+const { FileEventStore } = require('../core/event-store');
 
 const WEB_HISTORY_MAX_MESSAGES = 500;
 const WEB_OUTPUT_MAX_CHARS = 16000;
@@ -50,19 +57,6 @@ const IMAGE_VERSION_TAG_PATTERN = /^(\d+\.\d+\.\d+)-([A-Za-z0-9][A-Za-z0-9_.-]*)
 const SENSITIVE_CONFIG_KEY_PATTERN = /(pass(word)?|passwd|secret|token|api(?:_|-)?key|auth(?:_|-)?token|oauth(?:_|-)?token)$/i;
 const REDACTED_CONFIG_VALUE = '***';
 
-const YOLO_COMMAND_MAP = {
-    claude: 'IS_SANDBOX=1 claude --dangerously-skip-permissions',
-    cc: 'IS_SANDBOX=1 claude --dangerously-skip-permissions',
-    c: 'IS_SANDBOX=1 claude --dangerously-skip-permissions',
-    gemini: 'gemini --yolo',
-    gm: 'gemini --yolo',
-    g: 'gemini --yolo',
-    codex: 'codex --dangerously-bypass-approvals-and-sandbox',
-    cx: 'codex --dangerously-bypass-approvals-and-sandbox',
-    opencode: 'OPENCODE_PERMISSION=\'{"*":"allow"}\' opencode',
-    oc: 'OPENCODE_PERMISSION=\'{"*":"allow"}\' opencode'
-};
-
 const DEFAULT_WEB_CONFIG_TEMPLATE = `{
     // MANYOYO 全局配置文件（JSON5）
     "containerName": "my-dev",
@@ -171,6 +165,7 @@ function createEmptyWebAgentSession(agentId, agentName) {
         createdAt: null,
         updatedAt: null,
         messages: [],
+        events: [],
         lastResumeAt: null,
         lastResumeOk: null,
         lastResumeError: '',
@@ -189,6 +184,16 @@ function normalizeWebAgentSessionRecord(agentId, rawAgent) {
         createdAt: typeof source.createdAt === 'string' ? source.createdAt : null,
         updatedAt: typeof source.updatedAt === 'string' ? source.updatedAt : null,
         messages: Array.isArray(source.messages) ? source.messages : [],
+        events: Array.isArray(source.events)
+            ? source.events.filter(event => {
+                try {
+                    validateControlEvent(event);
+                    return true;
+                } catch (e) {
+                    return false;
+                }
+            })
+            : [],
         lastResumeAt: typeof source.lastResumeAt === 'string' ? source.lastResumeAt : null,
         lastResumeOk: typeof source.lastResumeOk === 'boolean' ? source.lastResumeOk : null,
         lastResumeError: typeof source.lastResumeError === 'string' ? source.lastResumeError : '',
@@ -463,6 +468,40 @@ function appendWebSessionMessage(webHistoryDir, sessionRefOrContainerName, role,
     return message;
 }
 
+function appendWebSessionControlEvent(webHistoryDir, sessionRef, type, data = {}) {
+    const history = loadWebSessionHistory(webHistoryDir, sessionRef.containerName);
+    const agentSession = getWebAgentSession(history, sessionRef.agentId, { create: true });
+    const events = Array.isArray(agentSession.events) ? agentSession.events : [];
+    const lastEvent = events.length ? events[events.length - 1] : null;
+    const event = createControlEvent({
+        type,
+        aggregateId: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId),
+        seq: lastEvent ? lastEvent.seq + 1 : 1,
+        data
+    });
+    const eventStore = new FileEventStore(webHistoryDir);
+    eventStore.append(event);
+    agentSession.events = [...events, event].slice(-WEB_HISTORY_MAX_MESSAGES);
+    agentSession.updatedAt = event.timestamp;
+    history.updatedAt = event.timestamp;
+    saveWebSessionHistory(webHistoryDir, sessionRef.containerName, history);
+    return event;
+}
+
+function loadWebSessionControlEvents(webHistoryDir, sessionRef, fallbackEvents = []) {
+    try {
+        const events = new FileEventStore(webHistoryDir).read(
+            buildWebSessionKey(sessionRef.containerName, sessionRef.agentId)
+        );
+        if (events.length) {
+            return events;
+        }
+    } catch (error) {
+        // 旧 history 快照仍可作为只读恢复源；写入路径始终以日志为准。
+    }
+    return Array.isArray(fallbackEvents) ? fallbackEvents : [];
+}
+
 function patchWebSessionMessage(webHistoryDir, sessionRefOrContainerName, messageId, patch) {
     const sessionRef = typeof sessionRefOrContainerName === 'string'
         ? { containerName: sessionRefOrContainerName, agentId: WEB_DEFAULT_AGENT_ID }
@@ -2149,15 +2188,7 @@ function resolveContainerModeArgs(mode) {
 }
 
 function resolveYoloCommand(yolo) {
-    const key = String(yolo || '').trim().toLowerCase();
-    if (!key) {
-        return '';
-    }
-    const mapped = YOLO_COMMAND_MAP[key];
-    if (!mapped) {
-        throw new Error(`未知 yolo 值: ${yolo}`);
-    }
-    return mapped;
+    return resolveYoloCommandFromAdapters(yolo);
 }
 
 function buildDefaultCommand(shellPrefix, shell, shellSuffix) {
@@ -3149,6 +3180,23 @@ function sendNdjson(res, payload) {
     res.write(`${JSON.stringify(payload)}\n`);
 }
 
+function createWebStreamEmitter(res, webHistoryDir, sessionRef) {
+    return (payload, type, data = {}) => {
+        const controlEvent = appendWebSessionControlEvent(webHistoryDir, sessionRef, type, data);
+        sendNdjson(res, { ...payload, controlEvent });
+    };
+}
+
+function resolveWebStreamControlEventType(event) {
+    if (event && event.type === 'content_delta') {
+        return 'agent.turn.delta';
+    }
+    if (event && event.type === 'trace' && event.traceEvent) {
+        return 'agent.tool.observed';
+    }
+    return 'process.stdout';
+}
+
 function stopWebAgentRun(state, containerName) {
     const runState = state.agentRuns.get(containerName);
     if (!runState || !runState.process || runState.process.killed) {
@@ -3332,6 +3380,21 @@ function buildSessionDetail(ctx, state, containerMap, name) {
     };
 }
 
+function buildSessionAudit(ctx, state, sessionRef) {
+    const history = loadWebSessionHistory(state.webHistoryDir, sessionRef.containerName);
+    const agentSession = getWebAgentSession(history, sessionRef.agentId)
+        || createEmptyWebAgentSession(sessionRef.agentId);
+    const events = loadWebSessionControlEvents(state.webHistoryDir, sessionRef, agentSession.events);
+    const applied = history.applied && typeof history.applied === 'object' && !Array.isArray(history.applied)
+        ? history.applied
+        : {};
+    return {
+        runSpec: applied.runSpec ? redactConfigObject(applied.runSpec) : null,
+        events,
+        projection: projectSessionEvents(events)
+    };
+}
+
 function isSafeStaticAssetName(name) {
     return /^[A-Za-z0-9._-]+$/.test(name);
 }
@@ -4005,6 +4068,19 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 sendJson(res, 200, { name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId), detail });
             }
         },
+        {
+            method: 'GET',
+            match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/audit$/),
+            handler: async match => {
+                const sessionRef = getValidSessionRef(ctx, res, match[1]);
+                if (!sessionRef) {
+                    return;
+                }
+
+                const audit = buildSessionAudit(ctx, state, sessionRef);
+                sendJson(res, 200, { name: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId), audit });
+            }
+        },
         {
             method: 'PUT',
             match: currentPath => currentPath.match(/^\/api\/sessions\/([^/]+)\/agent-template$/),
@@ -4198,7 +4274,8 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     'Cache-Control': 'no-store',
                     'X-Accel-Buffering': 'no'
                 });
-                sendNdjson(res, {
+                const emitStreamEvent = createWebStreamEmitter(res, state.webHistoryDir, sessionRef);
+                emitStreamEvent({
                     type: 'meta',
                     containerName: sessionRef.containerName,
                     sessionName: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId),
@@ -4206,7 +4283,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     resumeAttempted,
                     resumeSucceeded,
                     agentProgram: agentMeta.agentProgram
-                });
+                }, 'session.ready', { agentProgram: agentMeta.agentProgram });
                 if (contextMode) {
                     traceLines.push(`上下文模式: ${contextMode}`);
                 }
@@ -4260,7 +4337,10 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                                     });
                                 }
                             }
-                            sendNdjson(res, event);
+                            emitStreamEvent(event, resolveWebStreamControlEventType(event), {
+                                transportType: event && event.type ? event.type : '',
+                                text: event && (event.text || event.content) ? String(event.text || event.content) : ''
+                            });
                         }
                     });
                     traceLines.push(result.interrupted === true ? '[任务] 已停止' : '[任务] 已完成');
@@ -4289,7 +4369,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                         resumeError,
                         engineSessionId
                     }, result);
-                    sendNdjson(res, {
+                    emitStreamEvent({
                         type: 'result',
                         exitCode: result.exitCode,
                         output: result.output,
@@ -4297,7 +4377,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                         resumeAttempted,
                         resumeSucceeded,
                         interrupted: result.interrupted === true
-                    });
+                    }, result.interrupted === true ? 'process.interrupted' : 'process.exited', { exitCode: result.exitCode });
                 } catch (e) {
                     traceLines.push(`[错误] ${e && e.message ? e.message : 'Agent 执行失败'}`);
                     patchWebSessionMessage(state.webHistoryDir, sessionRef, userMessage && userMessage.id, {
@@ -4318,10 +4398,10 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     if (streamingReplyMessageId) {
                         removeWebSessionMessage(state.webHistoryDir, sessionRef, streamingReplyMessageId);
                     }
-                    sendNdjson(res, {
+                    emitStreamEvent({
                         type: 'error',
                         error: e && e.message ? e.message : 'Agent 执行失败'
-                    });
+                    }, 'agent.turn.failed', { error: e && e.message ? e.message : 'Agent 执行失败' });
                 } finally {
                     res.end();
                 }
@@ -4340,6 +4420,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     sendJson(res, 404, { error: '当前会话没有运行中的 agent 任务' });
                     return;
                 }
+                appendWebSessionControlEvent(state.webHistoryDir, sessionRef, 'session.stopping');
                 sendJson(res, 200, { ok: true, stopping: true });
             }
         },
@@ -4509,6 +4590,7 @@ async function startWebServer(options) {
                     || assetName === 'app.js'
                     || assetName === 'markdown.css'
                     || assetName === 'markdown-renderer.js'
+                    || assetName === 'chat-behavior.js'
                     || assetName === 'file-browser.js'
                     || assetName === 'codemirror.bundle.js')) {
                     sendHtml(res, 404, '<h1>404 Not Found</h1>');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "6.0.5",
+    "version": "6.1.3",
     "imageVersion": "1.9.1-common",
     "playwrightCliVersion": "0.1.18",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",
@@ -32,6 +32,8 @@
     "scripts": {
         "dev:release": "node scripts/dev-release.js",
         "build:web-editor": "node scripts/build-web-code-editor.js",
+        "prepack": "npm run build:web-editor",
+        "prepare": "npm run build:web-editor",
         "install-link": "npm link",
         "test": "jest --coverage",
         "test:unit": "jest test/",