@xcanwin/manyoyo 5.9.0 → 5.9.1

package/lib/web/frontend/app.js

@@ -92,6 +92,10 @@
             controller: null,
             traceMessageId: ''
         },
+        agentRecovery: {
+            sessionName: '',
+            timer: null
+        },
         terminal: {
             term: null,
             fitAddon: null,
@@ -1334,6 +1338,114 @@
         );
     }
 
+    function clearAgentRecoveryPoll() {
+        if (state.agentRecovery && state.agentRecovery.timer) {
+            window.clearTimeout(state.agentRecovery.timer);
+            state.agentRecovery.timer = null;
+        }
+        if (state.agentRecovery) {
+            state.agentRecovery.sessionName = '';
+        }
+    }
+
+    function hasPendingAgentMessagesForSession(sessionName) {
+        const targetSession = String(sessionName || '').trim();
+        if (!targetSession || state.active !== targetSession) {
+            return false;
+        }
+        return state.messages.some(function (message) {
+            return Boolean(
+                message
+                && message.mode === 'agent'
+                && (message.pending === true || message.streamingReply === true)
+            );
+        });
+    }
+
+    function scheduleAgentRecoveryPoll(sessionName, immediate) {
+        const targetSession = String(sessionName || '').trim();
+        if (!targetSession || state.active !== targetSession) {
+            clearAgentRecoveryPoll();
+            return;
+        }
+        if (isAgentRunActiveForSession(targetSession)) {
+            clearAgentRecoveryPoll();
+            return;
+        }
+        if (!hasPendingAgentMessagesForSession(targetSession)) {
+            clearAgentRecoveryPoll();
+            return;
+        }
+        if (state.agentRecovery.sessionName !== targetSession) {
+            clearAgentRecoveryPoll();
+            state.agentRecovery.sessionName = targetSession;
+        }
+        if (state.agentRecovery.timer) {
+            return;
+        }
+
+        const delay = immediate === true ? 0 : 1500;
+        state.agentRecovery.timer = window.setTimeout(async function () {
+            state.agentRecovery.timer = null;
+            if (state.active !== targetSession || isAgentRunActiveForSession(targetSession)) {
+                clearAgentRecoveryPoll();
+                syncUi();
+                return;
+            }
+            try {
+                await refreshSessionsSilent({ preferredName: targetSession });
+                await Promise.all([
+                    loadMessagesForSession(targetSession, { silent: true }),
+                    loadSessionDetailForSession(targetSession)
+                ]);
+            } catch (e) {
+                // 静默失败，等待下一轮轮询
+            }
+            if (state.active === targetSession && !isAgentRunActiveForSession(targetSession) && hasPendingAgentMessagesForSession(targetSession)) {
+                scheduleAgentRecoveryPoll(targetSession, false);
+            } else {
+                clearAgentRecoveryPoll();
+            }
+            syncUi();
+        }, delay);
+    }
+
+    function syncAgentRecoveryForSession(sessionName) {
+        const targetSession = String(sessionName || '').trim();
+        if (!targetSession || state.active !== targetSession) {
+            clearAgentRecoveryPoll();
+            return;
+        }
+        if (isAgentRunActiveForSession(targetSession)) {
+            clearAgentRecoveryPoll();
+            return;
+        }
+        if (hasPendingAgentMessagesForSession(targetSession)) {
+            scheduleAgentRecoveryPoll(targetSession, false);
+            return;
+        }
+        if (state.agentRecovery.sessionName === targetSession) {
+            clearAgentRecoveryPoll();
+        }
+    }
+
+    async function recoverAgentRunFromServer(sessionName) {
+        const targetSession = String(sessionName || '').trim();
+        if (!targetSession) {
+            return false;
+        }
+        try {
+            await refreshSessionsSilent({ preferredName: targetSession });
+            await Promise.all([
+                loadMessagesForSession(targetSession, { silent: true }),
+                loadSessionDetailForSession(targetSession)
+            ]);
+        } catch (e) {
+            return false;
+        }
+        return hasPendingAgentMessagesForSession(targetSession);
+    }
+
     function isActiveSessionHistoryOnly() {
         const session = getActiveSession();
         return sessionStatusInfo(session && session.status).tone === 'history';
@@ -2076,7 +2188,7 @@
             });
         }
 
-        const activeAgentRunning = isAgentRunActiveForSession(state.active);
+        const activeAgentRunning = isAgentRunActiveForSession(state.active) || hasPendingAgentMessagesForSession(state.active);
         const busy = state.loadingSessions || state.loadingMessages || state.sending;
         refreshBtn.disabled = busy;
         if (addAgentBtn) {
@@ -2084,14 +2196,14 @@
         }
         removeBtn.disabled = !state.active || busy;
         removeAllBtn.disabled = !state.active || busy;
-        sendBtn.disabled = !activityTab || !state.active || busy || (agentMode && !agentEnabled);
+        sendBtn.disabled = !activityTab || !state.active || busy || (agentMode && (!agentEnabled || activeAgentRunning));
         if (stopBtn) {
             stopBtn.disabled = !activityTab || !agentMode || !activeAgentRunning || state.agentRun.stopping;
         }
         if (agentTemplateBtn) {
             agentTemplateBtn.disabled = !state.active || state.agentTemplateSaving;
         }
-        commandInput.disabled = !activityTab || !state.active || (agentMode && !agentEnabled);
+        commandInput.disabled = !activityTab || !state.active || (agentMode && (!agentEnabled || activeAgentRunning));
         if (commandInput) {
             commandInput.placeholder = agentMode
                 ? '输入提示词，例如：请帮我分析当前项目结构并给出重构建议'
@@ -3282,6 +3394,7 @@
             state.messageRequestId += 1;
             state.messages = [];
             state.loadingMessages = false;
+            clearAgentRecoveryPoll();
             renderMessages(state.messages);
             syncUi();
             return;
@@ -3314,6 +3427,9 @@
                 state.messages = Array.isArray(data && data.messages) ? data.messages : [];
             }
             if (!requestError || targetSession === state.active) {
+                if (targetSession === state.active) {
+                    syncAgentRecoveryForSession(targetSession);
+                }
                 renderMessages(state.messages);
                 syncUi();
             } else {
@@ -3451,6 +3567,7 @@
         state.agentRun.stopping = false;
         state.agentRun.sessionName = '';
         state.agentRun.traceMessageId = '';
+        clearAgentRecoveryPoll();
     }
 
     function appendAssistantMessageLocal(sessionName, result, mode) {
@@ -3524,6 +3641,7 @@
         state.agentRun.stopping = false;
         state.agentRun.controller = new window.AbortController();
         state.agentRun.traceMessageId = traceMessageId;
+        clearAgentRecoveryPoll();
         renderMessages(state.messages, { stickToBottom: true });
         syncUi();
 
@@ -3884,13 +4002,20 @@
                 });
             }
         } catch (e) {
-            if (state.active === submitSession) {
-                state.messages = state.messages.filter(function (message) {
-                    return !(message && message.id === pendingMessage.id);
-                });
-                renderMessages(state.messages, { stickToBottom: true });
+            if (mode === 'agent') {
+                const recovered = await recoverAgentRunFromServer(submitSession);
+                if (!recovered && document.visibilityState !== 'hidden') {
+                    alert(e.message);
+                }
+            } else {
+                if (state.active === submitSession) {
+                    state.messages = state.messages.filter(function (message) {
+                        return !(message && message.id === pendingMessage.id);
+                    });
+                    renderMessages(state.messages, { stickToBottom: true });
+                }
+                alert(e.message);
             }
-            alert(e.message);
         } finally {
             state.sending = false;
             syncUi();
@@ -4153,6 +4278,24 @@
         }
     });
 
+    document.addEventListener('visibilitychange', function () {
+        if (document.visibilityState !== 'visible' || !state.active) {
+            return;
+        }
+        recoverAgentRunFromServer(state.active).catch(function () {
+            // 静默恢复失败不打断当前交互
+        });
+    });
+
+    window.addEventListener('focus', function () {
+        if (!state.active) {
+            return;
+        }
+        recoverAgentRunFromServer(state.active).catch(function () {
+            // 静默恢复失败不打断当前交互
+        });
+    });
+
     if (typeof MOBILE_LAYOUT_MEDIA.addEventListener === 'function') {
         MOBILE_LAYOUT_MEDIA.addEventListener('change', onLayoutMediaChange);
     } else if (typeof MOBILE_LAYOUT_MEDIA.addListener === 'function') {

package/lib/web/server.js

@@ -384,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 }
@@ -391,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);
@@ -406,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) {
@@ -816,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;
@@ -838,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')
         ))
@@ -1547,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
@@ -3827,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;
                 }
@@ -3838,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
                 });
 
@@ -3863,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, {
@@ -3873,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,
@@ -3902,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 执行失败'

package/package.json

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