@lsamien/yaovi 0.1.4 → 0.1.5

package/dist/index.html

@@ -9,7 +9,7 @@
     <link rel="apple-touch-icon" sizes="180x180" href="/icons/apple-touch-icon.png" />
     <link rel="manifest" href="/manifest.webmanifest" />
     <title>Yaovi</title>
-    <script type="module" crossorigin src="/assets/index-Cx1SdzRY.js"></script>
+    <script type="module" crossorigin src="/assets/index-P_kZCZ2-.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-Dd_uD5pT.js">
     <link rel="modulepreload" crossorigin href="/assets/_plugin-vue_export-helper-CD0r-vVb.js">
     <link rel="stylesheet" crossorigin href="/assets/index-C-5Gq82f.css">

package/dist-server/server/workspaceCollaboration.js

@@ -1,3 +1,4 @@
+import { peerExchange } from '../shared/peerExchange.js';
 import { createHash, randomUUID } from 'node:crypto';
 import { toolStatus } from '../shared/chatTools.js';
 import { normalizeUploadName } from '../shared/uploadNames.js';
@@ -88,20 +89,11 @@ export class WorkspaceCollaboration {
                 throw missing();
         }
         const chainPeers = this.store.db.prepare("SELECT data FROM workspace_entities WHERE owner=? AND kind='peer-message' AND json_extract(data,'$.chainId')=?").all(owner, focus.chainId).map(row => JSON.parse(String(row.data)));
-        const byId = new Map(chainPeers.map(peer => [peer.id, peer])), replies = new Map();
+        const replies = new Map();
         for (const peer of chainPeers)
             if (peer.replyTo)
                 replies.set(peer.replyTo, [...replies.get(peer.replyTo) ?? [], peer]);
-        const related = new Map([[focus.id, focus]]);
-        for (let up = focus.replyTo ? byId.get(focus.replyTo) : undefined; up && !related.has(up.id); up = up.replyTo ? byId.get(up.replyTo) : undefined)
-            related.set(up.id, up);
-        for (const queue = [focus.id]; queue.length;)
-            for (const reply of replies.get(queue.shift()) ?? [])
-                if (!related.has(reply.id)) {
-                    related.set(reply.id, reply);
-                    queue.push(reply.id);
-                }
-        const ordered = [...related.values()].sort((a, b) => a.createdAt - b.createdAt || a.id.localeCompare(b.id)), shown = ordered.slice(-32);
+        const ordered = peerExchange(focus, chainPeers).sort((a, b) => a.createdAt - b.createdAt || a.id.localeCompare(b.id)), shown = ordered.slice(-32);
         const chain = this.store.get(owner, 'collaboration-chain', focus.chainId);
         const progressRun = focus.runId ? this.store.get(owner, 'run', focus.runId) : focus.replyTo ? this.store.get(owner, 'run', focus.sourceRunId) : undefined;
         const privateRun = (runId) => {
@@ -306,7 +298,12 @@ export class WorkspaceCollaboration {
                 replying.status = 'complete';
                 replying.updatedAt = now;
                 this.store.put(owner, 'peer-message', replying.id, replying);
-                this.changed(owner, replying);
+                // Every ancestor caption counts this new reply. Refresh existing records only.
+                const seen = new Set();
+                for (let ancestor = replying; ancestor && ancestor.chainId === chainId && !seen.has(ancestor.id); ancestor = ancestor.replyTo ? this.store.get(owner, 'peer-message', ancestor.replyTo) : undefined) {
+                    seen.add(ancestor.id);
+                    this.changed(owner, ancestor);
+                }
             }
             const peerName = target ? target.name : destination.name;
             this.notice(owner, peer, workspaceDialoguePolicy().style

package/dist-server/server/workspaceStore.js

@@ -1,3 +1,4 @@
+import { peerExchange } from '../shared/peerExchange.js';
 import { recordOperationCommand } from './remoteAccess/operationScope.js';
 import { chmodSync, mkdirSync } from 'node:fs';
 import { join } from 'node:path';
@@ -1391,8 +1392,9 @@ export class WorkspaceStore {
                 const file = this.get(owner, 'file', id) ?? message.attachments.find(file => file.id === id);
                 return file ? [{ id: file.id, name: file.sender === 'user' ? normalizeUploadName(file.name) : file.name, mimeType: file.mimeType, size: file.size, sender: file.sender, createdAt: file.createdAt }] : [];
             });
+            const peers = this.db.prepare("SELECT data FROM workspace_entities WHERE owner=? AND kind='peer-message' AND json_extract(data,'$.chainId')=?").all(owner, peer.chainId).map(row => JSON.parse(String(row.data)));
             return { ...message, reasoning: '', tools: [], attachments: message.visible === false ? [] : files,
-                communication: { direction: incoming ? 'incoming' : 'outgoing', peerId, peerName, peerAvatar, peerKind, content: peer.content,
+                communication: { messageCount: peerExchange(peer, peers).length, direction: incoming ? 'incoming' : 'outgoing', peerId, peerName, peerAvatar, peerKind, content: peer.content,
                     peerMessageId: peer.id, chainId: peer.chainId, replyTo: peer.replyTo, fromName: peer.fromName, toName: peer.targetName,
                     status: peer.status, hasReply: !!this.db.prepare("SELECT 1 FROM workspace_entities WHERE owner=? AND kind='peer-message' AND json_extract(data,'$.replyTo')=? AND (json_extract(data,'$.runId') IS NOT NULL OR json_extract(data,'$.status')='complete') LIMIT 1").get(owner, peer.id) } };
         }

package/dist-server/shared/peerExchange.js

@@ -0,0 +1,26 @@
+/** The same ancestor/descendant slice used by the record page, not all Bot-pair history. */
+export function peerExchange(focus, peers) {
+    const byId = new Map(peers.map(peer => [peer.id, peer]));
+    const replies = new Map();
+    for (const peer of peers)
+        if (peer.replyTo)
+            replies.set(peer.replyTo, [...replies.get(peer.replyTo) ?? [], peer]);
+    const related = new Map([[focus.id, focus]]);
+    for (let up = focus.replyTo ? byId.get(focus.replyTo) : undefined; up && !related.has(up.id); up = up.replyTo ? byId.get(up.replyTo) : undefined)
+        related.set(up.id, up);
+    for (const queue = [focus.id]; queue.length;)
+        for (const reply of replies.get(queue.shift()) ?? []) {
+            if (!related.has(reply.id)) {
+                related.set(reply.id, reply);
+                queue.push(reply.id);
+            }
+        }
+    return [...related.values()];
+}
+export function peerExchangeCaption(value) {
+    if (value.direction === 'incoming')
+        return '消息来自';
+    const count = Number.isInteger(value.messageCount) && value.messageCount > 0
+        ? value.messageCount : value.hasReply || value.replyTo ? 2 : 1;
+    return `${count}条往来消息：`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lsamien/yaovi",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "license": "Apache-2.0",
   "description": "Yaovi：单用户、多 Bot、多设备服务器",
   "type": "module",

package/release.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "releaseVersion": "0.1.4",
-  "webVersion": "0.1.4",
-  "gitTag": "v0.1.4"
+  "releaseVersion": "0.1.5",
+  "webVersion": "0.1.5",
+  "gitTag": "v0.1.5"
 }