@xcanwin/manyoyo 7.0.18 → 7.0.20

package/docker/res/claude/settings.json

@@ -2,10 +2,5 @@
     "statusLine": {
         "type": "command",
         "command": "bash /root/.claude/statusline.sh"
-    },
-    "attribution": {
-        "commit": "",
-        "pr": "",
-        "sessionUrl": false
     }
 }

package/lib/core/event-store.js

@@ -5,7 +5,6 @@ const path = require('path');
 const {
     validateControlEvent,
     selectEventsAfterCursor,
-    applyEventToProjection,
     projectSessionEvents
 } = require('./events');
 
@@ -18,11 +17,6 @@ class FileEventStore {
         this.rootDir = path.resolve(rootDir);
         this.eventsDir = path.join(this.rootDir, 'events');
         this.projectionsDir = path.join(this.rootDir, 'projections');
-        // append() 的增量缓存：aggregateId -> { lastSeq, projection }。命中时
-        // 避免每次追加都要整份重读 + 重新校验 + 重新投影该聚合的全部历史事件
-        // （O(该聚合累计事件数)），只有本实例第一次碰到这个 aggregateId 才退回
-        // read() 全量重建。仅作用于同一个长生命周期实例内，不跨进程/跨实例。
-        this._appendCache = new Map();
     }
 
     getEventFilePath(aggregateId) {
@@ -64,42 +58,18 @@ class FileEventStore {
         return events;
     }
 
-    _ensureCacheEntry(aggregateId) {
-        let cached = this._appendCache.get(aggregateId);
-        if (!cached) {
-            const events = this.read(aggregateId);
-            cached = {
-                lastSeq: events.length ? events[events.length - 1].seq : 0,
-                projection: projectSessionEvents(events)
-            };
-            this._appendCache.set(aggregateId, cached);
-        }
-        return cached;
-    }
-
-    // 调用方（例如 lib/web/server.js 的 appendWebSessionControlEvent）在构造下
-    // 一个事件前，用这个方法拿"权威的下一个 seq"，不要再依赖自己单独维护的
-    // 一份事件副本（如历史 JSON 里的 agentSession.events）——那份副本如果因为
-    // 落盘节流而滞后，算出来的 seq 会与这里的内存缓存不一致，append() 时报错。
-    getNextSeq(aggregateId) {
-        const normalizedAggregateId = String(aggregateId || '').trim();
-        return this._ensureCacheEntry(normalizedAggregateId).lastSeq + 1;
-    }
-
     append(event) {
         validateControlEvent(event);
-        const aggregateId = String(event.aggregateId || '').trim();
-        const cached = this._ensureCacheEntry(aggregateId);
-        const expectedSeq = cached.lastSeq ? cached.lastSeq + 1 : event.seq;
+        const events = this.read(event.aggregateId);
+        const expectedSeq = events.length ? events[events.length - 1].seq + 1 : event.seq;
         if (event.seq !== expectedSeq) {
             throw new Error(`seq 必须连续递增，期望 ${expectedSeq}，实际 ${event.seq}`);
         }
 
         fs.mkdirSync(this.eventsDir, { recursive: true });
-        fs.appendFileSync(this.getEventFilePath(aggregateId), `${JSON.stringify(event)}\n`);
-        cached.projection = applyEventToProjection(cached.projection, event);
-        cached.lastSeq = event.seq;
-        this.saveProjection(aggregateId, cached.projection);
+        fs.appendFileSync(this.getEventFilePath(event.aggregateId), `${JSON.stringify(event)}\n`);
+        const projection = projectSessionEvents([...events, event]);
+        this.saveProjection(event.aggregateId, projection);
         return event;
     }
 
@@ -139,7 +109,6 @@ class FileEventStore {
         if (fs.existsSync(projectionFilePath)) {
             fs.unlinkSync(projectionFilePath);
         }
-        this._appendCache.delete(String(aggregateId || '').trim());
     }
 }
 

package/lib/core/events.js

@@ -101,64 +101,42 @@ function selectEventsAfterCursor(events, cursor = 0) {
     return result;
 }
 
-function emptyProjection(aggregateId = '') {
-    return {
-        aggregateId,
+function projectSessionEvents(events) {
+    const orderedEvents = selectEventsAfterCursor(events, 0);
+    const projection = {
+        aggregateId: orderedEvents.length ? orderedEvents[0].aggregateId : '',
         status: 'idle',
-        lastSeq: 0,
+        lastSeq: orderedEvents.length ? orderedEvents[orderedEvents.length - 1].seq : 0,
         childSessions: []
     };
-}
+    const childSessions = new Map();
 
-// 单条事件对投影的影响只取决于"这条事件本身 + 上一次的投影结果"，不依赖更早
-// 的历史（status 各分支互相覆盖，取的始终是最后一条命中事件的值；childSessions
-// 按 id 增量合并）。这个性质让 FileEventStore.append() 可以在内存里增量维护
-// 投影，不必每次追加事件都重新扫一遍该聚合的全部历史事件。
-function applyEventToProjection(projection, event) {
-    const next = {
-        aggregateId: event.aggregateId,
-        status: projection.status,
-        lastSeq: event.seq,
-        childSessions: projection.childSessions.map(child => ({ ...child }))
-    };
-
-    if (event.type === 'session.created') next.status = 'starting';
-    if (event.type === 'session.ready' || event.type === 'process.started' || event.type === 'agent.turn.started') next.status = 'running';
-    if (event.type === 'session.stopping') next.status = 'stopping';
-    if (event.type === 'session.stopped' || event.type === 'process.interrupted') next.status = 'interrupted';
-    if (event.type === 'session.failed' || event.type === 'agent.turn.failed') next.status = 'failed';
-    if (event.type === 'process.exited') {
-        next.status = Number(event.data.exitCode) === 0 ? 'completed' : 'failed';
-    }
-    if (event.type.startsWith('agent.child.')) {
-        const childSessionId = String(event.data.childSessionId || '').trim();
-        if (childSessionId) {
-            const existingIndex = next.childSessions.findIndex(child => child.id === childSessionId);
-            const current = existingIndex >= 0
-                ? next.childSessions[existingIndex]
-                : { id: childSessionId, agentProgram: '', status: 'observed' };
+    for (const event of orderedEvents) {
+        if (event.type === 'session.created') projection.status = 'starting';
+        if (event.type === 'session.ready' || event.type === 'process.started' || event.type === 'agent.turn.started') projection.status = 'running';
+        if (event.type === 'session.stopping') projection.status = 'stopping';
+        if (event.type === 'session.stopped' || event.type === 'process.interrupted') projection.status = 'interrupted';
+        if (event.type === 'session.failed' || event.type === 'agent.turn.failed') projection.status = 'failed';
+        if (event.type === 'process.exited') {
+            projection.status = Number(event.data.exitCode) === 0 ? 'completed' : 'failed';
+        }
+        if (event.type.startsWith('agent.child.')) {
+            const childSessionId = String(event.data.childSessionId || '').trim();
+            if (!childSessionId) {
+                continue;
+            }
+            const current = childSessions.get(childSessionId) || { id: childSessionId, agentProgram: '', status: 'observed' };
             if (event.data.agentProgram) {
                 current.agentProgram = String(event.data.agentProgram);
             }
             if (event.type === 'agent.child.completed') current.status = 'completed';
             if (event.type === 'agent.child.failed') current.status = 'failed';
             if (event.type === 'agent.child.interrupted') current.status = 'interrupted';
-            if (existingIndex >= 0) {
-                next.childSessions[existingIndex] = current;
-            } else {
-                next.childSessions.push(current);
-            }
+            childSessions.set(childSessionId, current);
         }
     }
-    return next;
-}
-
-function projectSessionEvents(events) {
-    const orderedEvents = selectEventsAfterCursor(events, 0);
-    return orderedEvents.reduce(
-        applyEventToProjection,
-        emptyProjection(orderedEvents.length ? orderedEvents[0].aggregateId : '')
-    );
+    projection.childSessions = Array.from(childSessions.values());
+    return projection;
 }
 
 module.exports = {
@@ -167,7 +145,5 @@ module.exports = {
     createControlEvent,
     validateControlEvent,
     selectEventsAfterCursor,
-    emptyProjection,
-    applyEventToProjection,
     projectSessionEvents
 };

package/lib/web/frontend/app.js

@@ -4439,6 +4439,21 @@
         }
     }
 
+    function appendStreamingReplyChunkLocal(sessionName, replyMessageId, chunk, reset) {
+        if (state.active !== sessionName) {
+            return;
+        }
+        for (var i = state.messages.length - 1; i >= 0; i -= 1) {
+            var message = state.messages[i];
+            if (!message || String(message.id || '') !== String(replyMessageId || '')) {
+                continue;
+            }
+            message.content = reset ? '' : String(message.content || '') + String(chunk || '');
+            message.timestamp = new Date().toISOString();
+            return;
+        }
+    }
+
     function removeStreamingReplyLocal(sessionName, replyMessageId) {
         if (state.active !== sessionName) {
             return;
@@ -4522,6 +4537,23 @@
                         }
                         return;
                     }
+                    if (event.type === 'content_chunk') {
+                        // token 级增量：服务端只发新增片段，这里追加。
+                        // reset 表示换了一条 assistant 消息，从空白重新开始
+                        if (!streamingReplyId) {
+                            streamingReplyId = appendStreamingReplyLocal(sessionName);
+                        }
+                        appendStreamingReplyChunkLocal(
+                            sessionName,
+                            streamingReplyId,
+                            event.reset === true ? '' : String(event.text || ''),
+                            event.reset === true
+                        );
+                        if (state.active === sessionName) {
+                            renderMessages(state.messages);
+                        }
+                        return;
+                    }
                     if (event.type === 'result') {
                         finalResult = event;
                         if (event.interrupted) {