@xcanwin/manyoyo 7.0.12 → 7.0.15

package/lib/web/server.js

@@ -2068,7 +2068,7 @@ async function prepareWebAgentExecution(ctx, state, sessionRef, prompt) {
 
 function finalizeWebAgentExecution(state, sessionRef, agentSession, agentMeta, meta, result) {
     const turnUsage = extractTurnUsage(agentMeta.agentProgram, result.stdout);
-    appendWebSessionMessage(state.webHistoryDir, sessionRef, 'assistant', result.output, {
+    const replyMessage = appendWebSessionMessage(state.webHistoryDir, sessionRef, 'assistant', result.output, {
         exitCode: result.exitCode,
         mode: 'agent',
         contextMode: meta.contextMode,
@@ -2090,6 +2090,7 @@ function finalizeWebAgentExecution(state, sessionRef, agentSession, agentMeta, m
         patch.usageTotal = accumulateUsageTotal(agentSession.usageTotal, turnUsage);
     }
     patchWebAgentSessionState(state.webHistoryDir, sessionRef, patch);
+    return replyMessage;
 }
 
 function appendWebAgentTraceMessage(webHistoryDir, sessionRefOrContainerName, content, extra = {}) {
@@ -3799,11 +3800,37 @@ function stopWebAgentRun(state, containerName) {
     try {
         runState.process.kill('SIGTERM');
     } catch (e) {
-        return false;
+        // 进程可能已自行退出，视为停止成功（close 事件会收尾）
     }
     return true;
 }
 
+// serve 重启等原因会丢失 agentRuns 运行登记，但消息里可能残留 pending 标记
+// （孤儿任务：容器里的进程或许还在跑，但再没有任何代码会去收尾这些消息）。
+// 前端把 pending 视为"任务进行中"会永久禁用输入，这里把它们标记为已中断
+function interruptOrphanPendingMessages(webHistoryDir, sessionRef) {
+    const history = loadWebSessionHistory(webHistoryDir, sessionRef.containerName);
+    const agentSession = getWebAgentSession(history, sessionRef.agentId, { includeArchived: true });
+    if (!agentSession || !Array.isArray(agentSession.messages)) {
+        return;
+    }
+    let touched = false;
+    for (const message of agentSession.messages) {
+        if (message && message.pending === true) {
+            message.pending = false;
+            message.interrupted = true;
+            touched = true;
+        }
+    }
+    if (!touched) {
+        return;
+    }
+    const timestamp = new Date().toISOString();
+    agentSession.updatedAt = timestamp;
+    history.updatedAt = timestamp;
+    saveWebSessionHistory(webHistoryDir, sessionRef.containerName, history);
+}
+
 function sendHtml(res, statusCode, html, extraHeaders = {}) {
     res.writeHead(statusCode, {
         'Content-Type': 'text/html; charset=utf-8',
@@ -5212,7 +5239,8 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     return;
                 }
                 if (state.agentRuns.has(sessionRef.containerName)) {
-                    sendJson(res, 409, { error: '当前会话已有运行中的 agent 任务' });
+                    // 锁是容器级的：同一容器里其他 agent 会话在跑任务时同样命中这里
+                    sendJson(res, 409, { error: '当前容器已有运行中的 agent 任务，请等它结束或先停止' });
                     return;
                 }
 
@@ -5259,6 +5287,10 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     type: 'meta',
                     containerName: sessionRef.containerName,
                     sessionName: buildWebSessionKey(sessionRef.containerName, sessionRef.agentId),
+                    // 前端用这两个 id 把本地乐观占位（local-* / __streaming_trace__）换成
+                    // 服务端持久化 id，轮询对账时 React key 才能对得上、DOM 不整体重建
+                    userMessageId: userMessage && userMessage.id,
+                    traceMessageId: traceMessage && traceMessage.id,
                     contextMode,
                     resumeAttempted,
                     resumeSucceeded,
@@ -5342,7 +5374,7 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                     if (streamingReplyMessageId) {
                         removeWebSessionMessage(state.webHistoryDir, sessionRef, streamingReplyMessageId);
                     }
-                    finalizeWebAgentExecution(state, sessionRef, agentSession, agentMeta, {
+                    const replyMessage = finalizeWebAgentExecution(state, sessionRef, agentSession, agentMeta, {
                         contextMode,
                         resumeAttempted,
                         resumeSucceeded,
@@ -5353,6 +5385,9 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                         type: 'result',
                         exitCode: result.exitCode,
                         output: result.output,
+                        // 最终 assistant 消息的持久化 id：前端把 __streaming__ 占位换成它，
+                        // 发送后的首次对账才不会重建整个消息列表 DOM（滚动位置/选区保持）
+                        replyMessageId: replyMessage && replyMessage.id,
                         contextMode,
                         resumeAttempted,
                         resumeSucceeded,
@@ -5397,6 +5432,9 @@ async function handleWebApi(req, res, pathname, ctx, state) {
                 }
                 const stopped = stopWebAgentRun(state, sessionRef.containerName);
                 if (!stopped) {
+                    // 运行登记不存在（serve 重启后常见的孤儿任务）：把残留的
+                    // pending 消息标记为已中断，否则前端会因 pending 永久禁用输入
+                    interruptOrphanPendingMessages(state.webHistoryDir, sessionRef);
                     sendJson(res, 404, { error: '当前会话没有运行中的 agent 任务' });
                     return;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "7.0.12",
+    "version": "7.0.15",
     "imageVersion": "1.9.1-common",
     "playwrightCliVersion": "0.1.18",
     "description": "AI Agent CLI Security Sandbox for Docker and Podman",