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(bots): 使用最新群版本重复保存设置

zcinta0514f1de6f14dd0d
diff --git a/apps/desktop/src/renderer/features/bots/ChatGroupSettings.tsx b/apps/desktop/src/renderer/features/bots/ChatGroupSettings.tsx
index 25b03b661e..eedb1212ad 100644
--- a/apps/desktop/src/renderer/features/bots/ChatGroupSettings.tsx
+++ b/apps/desktop/src/renderer/features/bots/ChatGroupSettings.tsx
@@ -119,7 +119,8 @@ export function ChatGroupSettings({ group }: { group: BotGroupSummary }) {
{error && <p role="alert" className="text-13 text-[var(--error-fg)]">{error}</p>}
<form className="space-y-3" onSubmit={event => {
event.preventDefault();
- void mutate({ type: 'update', name, topic, description, responseMode: replyMode, speakingMode, expectedRevision: draftRevision.current }).then(ok => { if (ok) dirty.current = false; });
+ void mutate({ type: 'update', name, topic, description, responseMode: replyMode, speakingMode,
+ expectedRevision: dirty.current ? draftRevision.current : group.revision! }).then(ok => { if (ok) dirty.current = false; });
}}>
<FormField label={t(key('name'))}>{props => <Input {...props} value={name} maxLength={40} required disabled={!manager || busy}
onChange={event => { editGroup(); setName(event); }} />}</FormField>
diff --git a/apps/desktop/src/renderer/features/bots/__tests__/ChatGroupSettings.test.tsx b/apps/desktop/src/renderer/features/bots/__tests__/ChatGroupSettings.test.tsx
index 7da9c3c21f..41e77c32f6 100644
--- a/apps/desktop/src/renderer/features/bots/__tests__/ChatGroupSettings.test.tsx
+++ b/apps/desktop/src/renderer/features/bots/__tests__/ChatGroupSettings.test.tsx
@@ -13,6 +13,36 @@ vi.mock('../BotAvatar', () => ({ BotAvatar: () => null }));
vi.mock('../botGroupStore', () => ({ refreshBotGroups: mocks.refresh }));
vi.mock('@/contexts/dataOwnerGeneration', () => ({ getDataOwnerGeneration: () => 1, isDataOwnerGenerationCurrent: () => true }));
const key = (name: string) => `bots.groupChat.server.settings.${name}`;
+// #6806: the update payload must follow refreshed data only when no draft is pending.
+it('uses the latest group revision when saving again after a successful save', async () => {
+ const initial = { ...group(true), replyMode: 'mentioned' as const, speakingMode: 'sequential' as const };
+ const { rerender } = render(<MemoryRouter><ChatGroupSettings group={initial} /></MemoryRouter>);
+ fireEvent.change(screen.getByRole('textbox', { name: key('name') }), { target: { value: 'Renamed' } });
+ fireEvent.submit(screen.getByRole('textbox', { name: key('name') }).closest('form')!);
+ await waitFor(() => expect(mocks.refresh).toHaveBeenCalledTimes(1));
+ rerender(<MemoryRouter><ChatGroupSettings group={{ ...initial, name: 'Renamed', revision: 2 }} /></MemoryRouter>);
+ fireEvent.submit(screen.getByRole('textbox', { name: key('name') }).closest('form')!);
+ await waitFor(() => expect(mocks.manage).toHaveBeenCalledTimes(2));
+ expect(mocks.manage.mock.calls[1]![0].action.expectedRevision).toBe(2);
+}, 30_000);
+it.each([false, true])('preserves optimistic conflict detection after a remote refresh, pending draft=%s', async dirty => {
+ const initial = { ...group(true), replyMode: 'all' as const, speakingMode: 'auto' as const };
+ const { rerender } = render(<MemoryRouter><ChatGroupSettings group={initial} /></MemoryRouter>);
+ if (dirty) fireEvent.change(screen.getByRole('textbox', { name: key('name') }), { target: { value: 'My draft' } });
+ rerender(<MemoryRouter><ChatGroupSettings group={{ ...initial, name: 'Remote name', revision: 2 }} /></MemoryRouter>);
+ expect((screen.getByRole('textbox', { name: key('name') }) as HTMLInputElement).value).toBe(dirty ? 'My draft' : 'Remote name');
+ if (dirty) mocks.manage.mockResolvedValue({ ok: false, errorCode: 'REVISION_CONFLICT' });
+ fireEvent.submit(screen.getByRole('textbox', { name: key('name') }).closest('form')!);
+ await waitFor(() => expect(mocks.manage).toHaveBeenCalledOnce());
+ expect(mocks.manage.mock.calls[0]![0].action).toMatchObject({ name: dirty ? 'My draft' : 'Remote name', expectedRevision: dirty ? 1 : 2 });
+ if (dirty) {
+ await waitFor(() => expect(screen.getByRole('alert')).toBeTruthy());
+ expect((screen.getByRole('textbox', { name: key('name') }) as HTMLInputElement).value).toBe('My draft');
+ fireEvent.submit(screen.getByRole('textbox', { name: key('name') }).closest('form')!);
+ await waitFor(() => expect(mocks.manage).toHaveBeenCalledTimes(2));
+ expect(mocks.manage.mock.calls[1]![0].action.expectedRevision).toBe(1);
+ }
+}, 30_000);
function group(owned = false): BotGroupSummary {
return { id: 'room', name: 'Team', serverBacked: true, revision: 1, members: [
{ actorId: 'me', botId: 'me', actorKind: 'human', isSelf: true, isOwned: true, name: 'My name', displayName: 'My name', role: 'member' },