From 03a9c69dc6f6f4e1ca41ce95aca33e357a0e57c1 Mon Sep 17 00:00:00 2001 From: fangliquanflq Date: Mon, 10 Aug 2026 08:16:44 +0800 Subject: [PATCH] fix(desktop): preserve keyless plugin row identity --- .../app/settings/plugins-settings.test.tsx | 22 +++++++++++++++++++ .../src/app/settings/plugins-settings.tsx | 5 ++++- apps/desktop/src/store/agent-plugins.ts | 10 ++++++--- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/apps/desktop/src/app/settings/plugins-settings.test.tsx b/apps/desktop/src/app/settings/plugins-settings.test.tsx index f23551c555a38..547633fdbcca5 100644 --- a/apps/desktop/src/app/settings/plugins-settings.test.tsx +++ b/apps/desktop/src/app/settings/plugins-settings.test.tsx @@ -40,6 +40,7 @@ beforeEach(() => { afterEach(() => { cleanup() + vi.restoreAllMocks() }) describe('PluginsSettings', () => { @@ -68,6 +69,27 @@ describe('PluginsSettings', () => { ) }) + it('keeps duplicate-named legacy rows distinct after a name-addressed toggle', async () => { + const sibling = { + ...legacyRow, + description: 'A second plugin category with the same legacy name' + } + const consoleError = vi.spyOn(console, 'error').mockImplementation(() => undefined) + + $agentPlugins.set([legacyRow, sibling]) + requestGateway.mockResolvedValue({ ok: true, plugin: { ...legacyRow, status: 'enabled' } }) + + render() + fireEvent.click(screen.getAllByRole('switch', { name: 'Enable Legacy plugin' })[0]) + + await waitFor(() => + expect(screen.getAllByRole('switch', { name: 'Disable Legacy plugin' })).toHaveLength(2) + ) + + expect(screen.getByText(sibling.description)).toBeTruthy() + expect(consoleError.mock.calls.flat().join(' ')).not.toContain('same key') + }) + it('keeps using the canonical key when the backend provides one', async () => { const keyedRow = { ...legacyRow, key: 'image_gen/legacy' } diff --git a/apps/desktop/src/app/settings/plugins-settings.tsx b/apps/desktop/src/app/settings/plugins-settings.tsx index b66c7f19a7a3d..cfc4700d1b396 100644 --- a/apps/desktop/src/app/settings/plugins-settings.tsx +++ b/apps/desktop/src/app/settings/plugins-settings.tsx @@ -45,6 +45,9 @@ const isDesktopRelevant = (row: AgentPluginRow) => { return !key || !HIDDEN_KEY_PREFIXES.some(prefix => key.startsWith(prefix)) } +const agentPluginRowKey = (row: AgentPluginRow) => + row.key ?? [row.name, row.source, row.version, row.description].join('\0') + function reveal(file: string) { void window.hermesDesktop?.revealPath?.(file)?.catch(() => undefined) } @@ -240,7 +243,7 @@ function AgentPluginsSection() { ) : (
{sorted.map(row => ( - + ))}
)} diff --git a/apps/desktop/src/store/agent-plugins.ts b/apps/desktop/src/store/agent-plugins.ts index 7e927cbd8988d..aaf9218fbc728 100644 --- a/apps/desktop/src/store/agent-plugins.ts +++ b/apps/desktop/src/store/agent-plugins.ts @@ -96,10 +96,14 @@ export async function toggleAgentPlugin( const refreshed = result.plugin if (refreshed) { + const currentRows = $agentPlugins.get() + $agentPlugins.set( - $agentPlugins - .get() - .map(current => ((current.key ?? current.name) === address ? { ...current, ...refreshed } : current)) + row.key + ? currentRows.map(current => (current.key === row.key ? { ...current, ...refreshed } : current)) + : currentRows.map(current => + current.name === row.name ? { ...current, status: refreshed.status } : current + ) ) } else { await loadAgentPlugins(request)