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。

fix(chat): never repeat a room reaction version across chat runtimes

Dash0ccc5fcd0223
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 d31004fff9..d4db69fa19 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/chatServer.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/chatServer.test.ts
@@ -1100,7 +1100,8 @@ describe('Chat Server result delivery and refresh', () => {
const r = await service.getGroup(roomId);
return r.ok ? { room: r.group.reactionRevision, messages: r.group.reactionRevisions } : undefined;
};
- expect(await revisions()).toEqual({ room: 0, messages: {} });
+ const initial = (await revisions())!.room!;
+ expect(await revisions()).toEqual({ room: initial, messages: {} });
await vi.advanceTimersByTimeAsync(2000);
const socket = fixture.sockets[0];
// One member removes 👍 and another adds it in one batch: same count, different reactor.
@@ -1109,30 +1110,50 @@ 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 revisions()).toEqual({ room: 0, messages: { [message.id]: 2 } });
+ expect(await revisions()).toEqual({ room: initial, messages: { [message.id]: 2 } });
// A reaction elsewhere leaves this message's version alone; other changes do not invalidate reactor reads.
socket.emit('message', JSON.stringify({ type: 'changes', scope: `conversation:${roomId}`, cursor: '6', changes: [
{ type: 'reaction.changed', entityId: 'other-message', data: { emoji: '🎉', present: true } },
{ type: 'message.updated', entityId: message.id },
] }));
- expect(await revisions()).toEqual({ room: 0, messages: { [message.id]: 2, 'other-message': 1 } });
+ expect(await revisions()).toEqual({ room: initial, messages: { [message.id]: 2, 'other-message': 1 } });
// A reset skips whatever changed while disconnected: the whole 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 revisions()).toEqual({ room: 1, messages: {} });
+ const reset = (await revisions())!.room!;
+ expect(reset).toBeGreaterThan(initial);
+ expect(await revisions()).toEqual({ room: reset, messages: {} });
// Per-message versions stay bounded: one more message past the limit re-versions the whole room instead.
const reacted = (ids: string[], cursor: string) => socket.emit('message', JSON.stringify({ type: 'changes', scope: `conversation:${roomId}`, cursor,
changes: ids.map(id => ({ type: 'reaction.changed', entityId: id, data: { emoji: '👍', present: true } })) }));
const ids = Array.from({ length: REACTION_REVISION_MESSAGE_LIMIT }, (_, i) => `m${i}`);
reacted(ids, '7');
const state = await revisions();
- expect(state?.room).toBe(1);
+ expect(state?.room).toBe(reset);
expect(Object.keys(state?.messages ?? {})).toHaveLength(REACTION_REVISION_MESSAGE_LIMIT);
reacted(['m0'], '8');
expect((await revisions())?.messages?.m0).toBe(2);
reacted(['one-more'], '9');
- expect(await revisions()).toEqual({ room: 2, messages: {} });
+ const capped = (await revisions())!.room!;
+ expect(capped).toBeGreaterThan(reset);
+ expect(await revisions()).toEqual({ room: capped, messages: {} });
+ });
+ it('starts a recreated chat runtime above every reaction version the previous one handed out', async () => {
+ // A same-owner repair replaces the runtime while mounted badges keep their read; whatever changed in between
+ // must not look unchanged just because the new runtime's counters start over.
+ let generation = 0;
+ deps.captureOwnerScope = () => ({ generation }) as unknown as ReturnType<NonNullable<typeof deps.captureOwnerScope>>;
+ deps.isOwnerScopeCurrent = scope => (scope as unknown as { generation: number }).generation === generation;
+ service.dispose();
+ service = withChatServer({ listGroups: async () => ({ ok: true, groups: [] }), dispose: vi.fn() } as unknown as BotGroupChatService, deps);
+ const room = async () => { const r = await service.getGroup(roomId); return r.ok ? r.group.reactionRevision : undefined; };
+ const before = (await room())!;
+ expect(await room()).toBe(before);
+ generation += 1;
+ const after = (await room())!;
+ expect(after).toBeGreaterThan(before);
+ expect(await room()).toBe(after);
});
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 fe471aa0b0..8208dc60cf 100644
--- a/apps/desktop/src/main/maker-ipc/chatServer.ts
+++ b/apps/desktop/src/main/maker-ipc/chatServer.ts
@@ -89,6 +89,8 @@ const THREAD_BACKGROUND_LIMIT = 30;
const ATTACHMENT_REFRESH_COALESCE_MS = 200;
/** Messages per group with their own reaction version; past this the group re-versions as a whole, like a reset. */
export const REACTION_REVISION_MESSAGE_LIMIT = 500;
+// Room reaction versions come from one process-wide sequence, so they never repeat across chat runtimes.
+let reactionRevisionSequence = 0;
const CHAT_REFRESHABLE_ERROR_CODES = new Set(['TOKEN_EXPIRED', 'INVALID_TOKEN', 'AUTH_REQUIRED']);
const recoverableAuth = (error: ChatResponseError) => error.status === 401
&& (CHAT_REFRESHABLE_ERROR_CODES.has(error.message) || error.message === 'INVALID_CHAT_RESPONSE');
@@ -185,12 +187,15 @@ function createChatServer(local: BotGroupChatService, deps: BotGroupChatServiceD
let actorsStale = false;
// Who reacted can change while counts stay the same. A realtime reaction change versions only its
// message; a reset that skipped events versions the whole room (and makes per-message versions moot).
- // Both ride on the group, so every loaded page and the Thread see them on refresh.
+ // Both ride on the group, so every loaded page and the Thread see them on refresh. A recreated runtime
+ // (same owner, badges still mounted) may have missed changes while switching, so its rooms start above
+ // every version handed out before.
+ const runtimeReactionRevision = ++reactionRevisionSequence;
const reactionRevisions = new Map<string, { room: number; messages: Record<string, number> }>();
- const resetReactions = (roomId: string) => reactionRevisions.set(roomId, { room: (reactionRevisions.get(roomId)?.room ?? 0) + 1, messages: {} });
+ const resetReactions = (roomId: string) => reactionRevisions.set(roomId, { room: ++reactionRevisionSequence, messages: {} });
// A long-open group stays bounded: once too many messages carry their own version, the group re-versions instead.
const bumpMessageReactions = (roomId: string, messageId: string) => {
- const revisions = reactionRevisions.get(roomId) ?? { room: 0, messages: {} };
+ const revisions = reactionRevisions.get(roomId) ?? { room: runtimeReactionRevision, messages: {} };
if (!(messageId in revisions.messages) && Object.keys(revisions.messages).length >= REACTION_REVISION_MESSAGE_LIMIT) return resetReactions(roomId);
revisions.messages[messageId] = (revisions.messages[messageId] ?? 0) + 1;
reactionRevisions.set(roomId, revisions);
@@ -744,7 +749,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, reactionRevision: reactionRevisions.get(roomId)?.room ?? 0, reactionRevisions: { ...reactionRevisions.get(roomId)?.messages }, 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)?.room ?? runtimeReactionRevision, reactionRevisions: { ...reactionRevisions.get(roomId)?.messages }, 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/docs/product-rules/bot-group-chat.md b/docs/product-rules/bot-group-chat.md
index 17f1332fe6..183b7037bf 100644
--- a/docs/product-rules/bot-group-chat.md
+++ b/docs/product-rules/bot-group-chat.md
@@ -368,7 +368,8 @@ Chat Server 既有的回应者接口直到最后一页(离群成员保留回
如实显示数字。回应数、自己的状态或这条消息的实时回应事件(含人数不变、只换了人的情况)变化时重新读取;
回应版本按消息记在群详情上,已加载的更早消息页与话题里的徽标也会随之更新,别的消息被回应不会让它重新读取;
单个群记版本的消息超过 500 条时,改为整群加一次版本并清空记录,避免长时间打开时无限增长;
-实时连接断开期间,只换人不换数的变化要到重连回放后才更新,无法回放而重置时,整个群的回应都按已变化重新读取。回应者是否在群、叫什么,
+实时连接断开期间,只换人不换数的变化要到重连回放后才更新,无法回放而重置时,整个群的回应都按已变化重新读取;
+同一账号下群聊连接被重建时同样按整群已变化处理,不会因版本从头计数而沿用旧头像。回应者是否在群、叫什么,
始终按最新的群成员资料双向投影:改昵称、离群或重新加入都会立即更新,离群后沿用读取时的名字并标注不在群中。点击仍是添加/取消回应。回归见 `ChatReactionButton.test.tsx`
与 `chatServer.test.ts`;手机端暂不显示回应。
diff --git a/packages/maker-shared/src/botGroupChat.ts b/packages/maker-shared/src/botGroupChat.ts
index dc57673b2c..493ea97182 100644
--- a/packages/maker-shared/src/botGroupChat.ts
+++ b/packages/maker-shared/src/botGroupChat.ts
@@ -313,7 +313,7 @@ export interface BotGroupSummary {
}
export interface BotGroupDetail extends BotGroupSummary {
- /** Room-wide; bumped when a reset skipped realtime events, so every message's reactors count as changed. */
+ /** Room-wide; bumped when a reset skipped realtime events or the chat runtime was recreated, so every message's reactors count as changed. */
reactionRevision?: number;
/** Per message id; bumped by realtime reaction changes, so a same-count change of who reacted is noticed. */
reactionRevisions?: Record<string, number>;