Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

refactor(chat): version reactions per room instead of per message

Dash68bf44a4b2a8
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/chatServer.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/chatServer.test.ts
index 9d3ea3bcd2..8d88b99e07 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/chatServer.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/chatServer.test.ts
@@ -1091,12 +1091,12 @@ describe('Chat Server result delivery and refresh', () => {
const recovered = await service.getGroup(roomId);
expect(recovered.ok && recovered.group.messages[0].attachments[0].name).toBe('report.pdf');
});
- it('versions a message’s reactions on every realtime reaction change, even when the count is unchanged', async () => {
+ it('versions the room’s reactions on realtime reaction changes and resets, even when counts are unchanged', async () => {
const message = { id: execution.source_message_id, seq: '1', authorId: selfId, author: { kind: 'human', name: 'Me' },
content: [{ type: 'text', text: 'Hi' }], createdAt: new Date().toISOString(), deleted: false, threadRootId: null,
reactions: [{ emoji: '👍', count: 1, me: false }] };
fixture.handle.mockImplementation(route => route.includes('/messages?') ? { body: [message] } : response(route));
- const revision = async () => { const r = await service.getGroup(roomId); return r.ok ? r.group.messages[0].reactionRevision : undefined; };
+ const revision = async () => { const r = await service.getGroup(roomId); return r.ok ? r.group.reactionRevision : undefined; };
expect(await revision()).toBe(0);
await vi.advanceTimersByTimeAsync(2000);
const socket = fixture.sockets[0];
@@ -1106,12 +1106,15 @@ describe('Chat Server result delivery and refresh', () => {
{ type: 'reaction.changed', entityId: message.id, data: { emoji: '👍', present: true } },
{ type: 'message.updated', entityId: message.id },
] }));
- expect(await revision()).toBe(2);
- // A reset skips whatever changed while disconnected: every message counts as changed once.
+ expect(await revision()).toBe(1);
+ // Other changes do not invalidate reactor reads.
+ socket.emit('message', JSON.stringify({ type: 'changes', scope: `conversation:${roomId}`, cursor: '6', changes: [{ type: 'message.updated', entityId: message.id }] }));
+ expect(await revision()).toBe(1);
+ // A reset skips whatever changed while disconnected: the room counts as changed once.
Object.defineProperty(socket, 'readyState', { value: 1 });
socket.emit('message', JSON.stringify({ type: 'scope_error', scope: `conversation:${roomId}`, error: { code: 'RESET_REQUIRED' } }));
await vi.advanceTimersByTimeAsync(0);
- expect(await revision()).toBe(3);
+ expect(await revision()).toBe(2);
});
it('refreshes a reset room and resumes realtime from the authorized snapshot cursor', async () => {
await service.getGroup(roomId);
diff --git a/apps/desktop/src/main/maker-ipc/chatServer.ts b/apps/desktop/src/main/maker-ipc/chatServer.ts
index be438baafe..50f42c50d2 100644
--- a/apps/desktop/src/main/maker-ipc/chatServer.ts
+++ b/apps/desktop/src/main/maker-ipc/chatServer.ts
@@ -181,10 +181,10 @@ function createChatServer(local: BotGroupChatService, deps: BotGroupChatServiceD
let companion: CompanionCloudRuntime | undefined;
let companionSelf: string | null = null;
let actorsStale = false;
- // Who reacted can change while the count stays the same; each realtime reaction change versions the message.
+ // Who reacted can change while counts stay the same. Any realtime reaction change, or a reset that
+ // skipped events, versions the whole room, so every loaded page and the Thread see it on refresh.
const reactionRevisions = new Map<string, number>();
- // A reset skips the missed events, so every message's reactions are treated as changed once.
- let reactionResets = 0;
+ const bumpReactions = (roomId: string) => reactionRevisions.set(roomId, (reactionRevisions.get(roomId) ?? 0) + 1);
let profiles: Array<typeof botProfiles.$inferSelect> = [];
const workspaces = () => chatServerWorkspaces(config.baseUrl, selfId, current);
const planning = new Map<string, { botId: string; controller: AbortController }>();
@@ -561,9 +561,7 @@ function createChatServer(local: BotGroupChatService, deps: BotGroupChatServiceD
if (event.scope.startsWith('conversation:')) {
const roomId = event.scope.slice(13);
if (rooms.has(roomId)) advanceRoom(roomId, event.cursor);
- for (const change of event.changes ?? []) if (change.type === 'reaction.changed' && typeof change.entityId === 'string') {
- reactionRevisions.set(change.entityId, (reactionRevisions.get(change.entityId) ?? 0) + 1);
- }
+ if ((event.changes ?? []).some((change: { type?: unknown }) => change.type === 'reaction.changed')) bumpReactions(roomId);
changed(roomId);
for (const run of running.values()) if (run.execution.conversation_id === roomId) void checkLease(run);
}
@@ -579,7 +577,7 @@ function createChatServer(local: BotGroupChatService, deps: BotGroupChatServiceD
void api<Snapshot>(`/conversations/${roomId}/snapshot`).then(value => {
if (!current() || socket !== ws || ws.readyState !== WebSocket.OPEN) return;
if (rooms.has(roomId)) advanceRoom(roomId, value.cursor);
- reactionResets++;
+ bumpReactions(roomId);
changed(roomId);
ws.send(JSON.stringify({ type: 'subscribe', scope: event.scope, after: value.cursor }));
}).catch(() => ws.close());
@@ -644,7 +642,6 @@ function createChatServer(local: BotGroupChatService, deps: BotGroupChatServiceD
const quote = m.deleted || planCard ? null : readBotGroupQuote(m.content);
return { id: m.id, sequence: Number(m.seq), deleted: m.deleted, kind: planCard ? 'plan' : 'message', authorKind: legacy?.authorKind === 'system' ? 'system' : m.author.kind === 'human' ? 'user' : 'bot',
isSelf: m.authorId === selfId, threadRootId: m.threadRootId, replyCount: m.replyCount ?? 0, reactions: m.reactions ?? [], ...(quote ? { quote } : {}),
- reactionRevision: (reactionRevisions.get(m.id) ?? 0) + reactionResets,
authorBotId: localBot(m.authorId)?.id ?? m.authorId, authorName: legacy?.authorKind === 'system' && typeof legacy.authorName === 'string' ? legacy.authorName : member ? memberName(member) : m.author.name, content: bodyText(m),
mentions: { all: false, botIds: [] }, noticeCode: null, planId: typeof planCard?.data?.planId === 'string' ? planCard.data.planId : null, files: [], attachments: [], createdAt: Date.parse(m.createdAt) };
}
@@ -735,7 +732,7 @@ function createChatServer(local: BotGroupChatService, deps: BotGroupChatServiceD
const messages = summaryOnly ? [] : (await messageViews(roomId, page, s.members)).sort((a, b) => a.sequence - b.sequence);
const last = s.messages[0];
const lastView = last ? messageView(last, s.members) : null;
- return { serverBacked: true, migrationPending: [...upgradeErrors.keys()].some(source => upgradedGroups.get(source) === roomId), archived: s.room.archived, selfActorId: selfId, topic: s.room.topic, description: s.room.description, revision: s.room.revision, canInvite: s.members.some(m => m.ownerActorId === selfId && m.state === 'joined' && ['owner', 'admin'].includes(m.role)), id: s.room.id, name: s.room.name, replyMode: s.room.response_mode, speakingMode: s.room.speaking_mode,
+ return { serverBacked: true, reactionRevision: reactionRevisions.get(roomId) ?? 0, migrationPending: [...upgradeErrors.keys()].some(source => upgradedGroups.get(source) === roomId), archived: s.room.archived, selfActorId: selfId, topic: s.room.topic, description: s.room.description, revision: s.room.revision, canInvite: s.members.some(m => m.ownerActorId === selfId && m.state === 'joined' && ['owner', 'admin'].includes(m.role)), id: s.room.id, name: s.room.name, replyMode: s.room.response_mode, speakingMode: s.room.speaking_mode,
members: s.members.filter(m => m.state === 'joined').map(m => {
const p = localBot(m.id);
return { botId: p?.id ?? m.id, actorId: m.id, actorKind: m.kind, isSelf: m.id === selfId,
diff --git a/apps/desktop/src/renderer/features/bots/BotGroupChatView.tsx b/apps/desktop/src/renderer/features/bots/BotGroupChatView.tsx
index 89139c95c8..5eb5c33249 100644
--- a/apps/desktop/src/renderer/features/bots/BotGroupChatView.tsx
+++ b/apps/desktop/src/renderer/features/bots/BotGroupChatView.tsx
@@ -840,7 +840,7 @@ function BotGroupChatContent({ groupId }: { groupId: string }) {
quoteDisplay={message.quote ? resolveBotGroupQuote(message.quote, quoteSources) : undefined}
onLocateQuote={message.quote ? () => void locateQuoted(message.quote!) : undefined}
actions={message.kind === 'message' ? <ChatMessageActions
- groupId={group.serverBacked ? group.id : undefined} shareScope={shareScope} message={message} members={group.members}
+ groupId={group.serverBacked ? group.id : undefined} shareScope={shareScope} message={message} members={group.members} reactionRevision={group.reactionRevision}
align={message.authorKind === 'user' && message.isSelf !== false ? 'right' : 'left'}
onQuote={group.serverBacked && !group.archived && isBotGroupMessageQuotable(message)
? () => setQuoteDraft(botGroupQuoteFromMessage(message)) : undefined}
diff --git a/apps/desktop/src/renderer/features/bots/ChatServerControls.tsx b/apps/desktop/src/renderer/features/bots/ChatServerControls.tsx
index 9155a1cb9f..424541e00c 100644
--- a/apps/desktop/src/renderer/features/bots/ChatServerControls.tsx
+++ b/apps/desktop/src/renderer/features/bots/ChatServerControls.tsx
@@ -23,8 +23,8 @@ export { chatErrorKey } from './chatError';
* `onQuote` is 引用回复: a new main-timeline message that quotes this one. `onReply` opens the
* message's Thread (话题) — 创建话题 before anyone answered, 查看话题 after.
*/
-export function ChatMessageActions({ groupId, shareScope, message, members, align = message.isSelf ? 'right' : 'left', onQuote, onReply, onChanged }: {
- groupId?: string; shareScope: string; message: BotGroupMessageView; members?: BotGroupMemberView[]; align?: 'left' | 'right'; onQuote?: () => void; onReply?: () => void; onChanged: () => void;
+export function ChatMessageActions({ groupId, shareScope, message, members, reactionRevision, align = message.isSelf ? 'right' : 'left', onQuote, onReply, onChanged }: {
+ groupId?: string; shareScope: string; message: BotGroupMessageView; members?: BotGroupMemberView[]; reactionRevision?: number; align?: 'left' | 'right'; onQuote?: () => void; onReply?: () => void; onChanged: () => void;
}) {
const { t } = useTranslation();
const [busy, setBusy] = useState(false);
@@ -46,7 +46,7 @@ export function ChatMessageActions({ groupId, shareScope, message, members, alig
<div {...{ [SHARE_EXCLUDE_ATTR]: '' }} className="mt-1 flex flex-col gap-1">
{!!message.reactions?.length && <div className={`flex flex-wrap items-center gap-1 ${align === 'right' ? 'justify-end' : ''}`}>
{message.reactions.map(reaction => (
- <ChatReactionButton key={reaction.emoji} groupId={groupId} messageId={message.id} reaction={reaction} revision={message.reactionRevision} members={members}
+ <ChatReactionButton key={reaction.emoji} groupId={groupId} messageId={message.id} reaction={reaction} revision={reactionRevision} members={members}
disabled={busy || !groupId} onToggle={() => void react(reaction.emoji, !reaction.me)} />
))}
</div>}
diff --git a/apps/desktop/src/renderer/features/bots/ChatThreadPanel.tsx b/apps/desktop/src/renderer/features/bots/ChatThreadPanel.tsx
index c60472742a..389f883905 100644
--- a/apps/desktop/src/renderer/features/bots/ChatThreadPanel.tsx
+++ b/apps/desktop/src/renderer/features/bots/ChatThreadPanel.tsx
@@ -46,7 +46,7 @@ function ThreadMessage({ group, message, quoteSources, shareScope, sharing, onCh
<div className="break-words text-14 leading-relaxed text-[var(--text-primary)]">
<MarkdownRenderer workingDir="" content={message.content} allowPrivilegedLinks={false} />
</div>
- <ChatMessageActions groupId={group.id} shareScope={shareScope} message={message} members={group.members} align="left" onChanged={onChanged} />
+ <ChatMessageActions groupId={group.id} shareScope={shareScope} message={message} members={group.members} reactionRevision={group.reactionRevision} align="left" onChanged={onChanged} />
</div>
</article>;
}
diff --git a/apps/desktop/src/renderer/features/bots/__tests__/ChatReactionButton.test.tsx b/apps/desktop/src/renderer/features/bots/__tests__/ChatReactionButton.test.tsx
index f4d6b89388..00095562ef 100644
--- a/apps/desktop/src/renderer/features/bots/__tests__/ChatReactionButton.test.tsx
+++ b/apps/desktop/src/renderer/features/bots/__tests__/ChatReactionButton.test.tsx
@@ -142,11 +142,11 @@ describe('reaction avatars', () => {
mocks.reactors.mockResolvedValueOnce({ ok: true, reactors: [reactor('z', 'Zoe')] })
.mockResolvedValueOnce({ ok: true, reactors: [reactor('c1', 'Cindy (Chris)')] });
const view = render(<ChatMessageActions shareScope="group:room" groupId="room" members={members} onChanged={vi.fn()}
- message={{ ...message([{ emoji: '👍', count: 1, me: false }]), reactionRevision: 3 }} />);
+ reactionRevision={3} message={message([{ emoji: '👍', count: 1, me: false }])} />);
await waitFor(() => expect(badge().getAttribute('aria-label')).toBe('👍 · 1: Zoe'));
- // Zoe removed 👍 and Chris's companion added it: same count and `me`, a new realtime revision.
+ // Zoe removed 👍 and Chris's companion added it: same count and `me`, a new room reaction revision.
view.rerender(<ChatMessageActions shareScope="group:room" groupId="room" members={members} onChanged={vi.fn()}
- message={{ ...message([{ emoji: '👍', count: 1, me: false }]), reactionRevision: 4 }} />);
+ reactionRevision={4} message={message([{ emoji: '👍', count: 1, me: false }])} />);
await waitFor(() => expect(badge().getAttribute('aria-label')).toBe('👍 · 1: Cindy (Chris)'));
expect(images()).toEqual(['https://example.test/cindy-chris.png']);
});
diff --git a/apps/desktop/src/renderer/features/bots/__tests__/ChatServerControls.test.tsx b/apps/desktop/src/renderer/features/bots/__tests__/ChatServerControls.test.tsx
index 448cb5f694..ce527ab9d4 100644
--- a/apps/desktop/src/renderer/features/bots/__tests__/ChatServerControls.test.tsx
+++ b/apps/desktop/src/renderer/features/bots/__tests__/ChatServerControls.test.tsx
@@ -145,6 +145,14 @@ describe('chat interaction controls', () => {
expect(mocks.react).toHaveBeenCalledWith({ groupId: 'room', messageId: 'root', emoji: '👍', present: false });
});
+ it('re-reads Thread reactors when the room reaction revision changes, even if the page is not reloaded', async () => {
+ const view = render(<ChatThreadPanel group={{ ...group, reactionRevision: 1 }} rootId="root" onClose={vi.fn()} />);
+ await screen.findByRole('button', { name: k('reactionCount') });
+ await waitFor(() => expect(mocks.reactors).toHaveBeenCalledTimes(1));
+ view.rerender(<Tooltip.Provider><ChatThreadPanel group={{ ...group, reactionRevision: 2 }} rootId="root" onClose={vi.fn()} /></Tooltip.Provider>);
+ await waitFor(() => expect(mocks.reactors).toHaveBeenCalledTimes(2));
+ });
+
it('uses the refreshed Thread root reaction state while the main timeline remains stale', async () => {
mocks.thread.mockResolvedValueOnce({ ok: true, root: message, replies: [], hasMore: false })
.mockResolvedValue({ ok: true, root: { ...message, reactions: [{ emoji: '👍', count: 1, me: false }] }, replies: [], hasMore: false });
diff --git a/docs/product-rules/bot-group-chat.md b/docs/product-rules/bot-group-chat.md
index 9aaefa0b97..78d4ccdb32 100644
--- a/docs/product-rules/bot-group-chat.md
+++ b/docs/product-rules/bot-group-chat.md
@@ -365,7 +365,8 @@ Desktop 主群与 Thread 的表情回应徽标参考 Telegram:某个表情的
不额外读取名单。只有接近可视区域的徽标才读取回应者,打开长历史不会逐个徽标发请求。名单按 Actor ID 去重,由主进程读取
Chat Server 既有的回应者接口直到最后一页(离群成员保留回应,总数可超过群人数上限)并按群成员投影命名;
读取只读,不触发伙伴资料同步等任何写入。加载期间按人数预留头像位,不撑动消息;读取失败或名单与人数暂不一致时
-如实显示数字。回应数、自己的状态或实时回应事件(含人数不变、只换了人的情况)变化时重新读取;实时连接断开期间,
+如实显示数字。回应数、自己的状态或群内的实时回应事件(含人数不变、只换了人的情况)变化时重新读取;回应版本按群计,
+已加载的更早消息页与话题里的徽标也会随之更新;实时连接断开期间,
只换人不换数的变化要到重连回放后才更新,无法回放而重置时,所有回应都按已变化重新读取。回应者是否在群、叫什么,
始终按最新的群成员资料双向投影:改昵称、离群或重新加入都会立即更新,离群后沿用读取时的名字并标注不在群中。点击仍是添加/取消回应。回归见 `ChatReactionButton.test.tsx`
与 `chatServer.test.ts`;手机端暂不显示回应。
diff --git a/packages/maker-shared/src/botGroupChat.ts b/packages/maker-shared/src/botGroupChat.ts
index b59096cd36..5a4f3625f5 100644
--- a/packages/maker-shared/src/botGroupChat.ts
+++ b/packages/maker-shared/src/botGroupChat.ts
@@ -145,8 +145,6 @@ export interface BotGroupMessageView {
/** 引用回复: the earlier main-timeline message this one quotes; not a Thread parent. */
quote?: BotGroupQuoteView;
reactions?: Array<{ emoji: string; count: number; me: boolean }>;
- /** Bumped by realtime reaction changes, so a same-count change of who reacted is still noticed. */
- reactionRevision?: number;
id: string;
sequence: number;
kind: BotGroupMessageKind;
@@ -315,6 +313,8 @@ export interface BotGroupSummary {
}
export interface BotGroupDetail extends BotGroupSummary {
+ /** Room-wide; bumped by realtime reaction changes and resets, so a same-count change of who reacted is noticed. */
+ reactionRevision?: number;
/** Oldest first. */
messages: BotGroupMessageView[];
/** Authorized current failures, independent of message pagination. Local/older hosts omit this. */