From a2cb7c6a8c86a6febb4e5037411ad54d2a8d6c8a Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Mon, 9 Nov 2026 01:52:27 -0800 Subject: [PATCH] Keep Settings search metadata independent of display labels --- .../AgentDashboardExperimentalSetting.tsx | 2 +- .../settings/advanced/AdvancedPane.tsx | 6 +- .../advanced/ExperimentalPane.test.tsx | 25 ++ .../settings/advanced/ExperimentalPane.tsx | 18 +- .../advanced/HiddenExperimentalGroup.tsx | 2 +- .../settings/advanced/advanced-search.ts | 117 +++--- .../settings/advanced/experimental-search.ts | 393 ++++++++---------- .../BrowserExtensionsExperimentalSetting.tsx | 2 +- .../editor/GeneralAutoSaveSetting.tsx | 4 +- .../general/general-confirmations-search.ts | 63 +-- .../settings-navigation-foundations.ts | 14 +- .../repository/RepositoryPane.search.test.tsx | 70 ++++ .../settings/repository/RepositoryPane.tsx | 49 +-- .../settings/repository/repository-search.ts | 101 +++-- .../repository-git-worktree-search-entries.ts | 32 +- .../TerminalInteractionSection.test.tsx | 2 +- .../EphemeralVmsExperimentalSetting.tsx | 8 +- .../recipes/ephemeral-vms-search.ts | 2 +- .../src/i18n/en-runtime-required.json | 10 +- src/renderer/src/i18n/locales/de.json | 33 +- src/renderer/src/i18n/locales/en.json | 51 ++- src/renderer/src/i18n/locales/es.json | 33 +- src/renderer/src/i18n/locales/fr.json | 33 +- src/renderer/src/i18n/locales/ja.json | 33 +- src/renderer/src/i18n/locales/ko.json | 33 +- src/renderer/src/i18n/locales/pt.json | 33 +- src/renderer/src/i18n/locales/ru.json | 33 +- src/renderer/src/i18n/locales/tr.json | 33 +- src/renderer/src/i18n/locales/zh-Hant.json | 33 +- src/renderer/src/i18n/locales/zh.json | 33 +- 30 files changed, 770 insertions(+), 531 deletions(-) create mode 100644 src/renderer/src/components/settings/advanced/ExperimentalPane.test.tsx create mode 100644 src/renderer/src/components/settings/repository/RepositoryPane.search.test.tsx diff --git a/src/renderer/src/components/dashboard/AgentDashboardExperimentalSetting.tsx b/src/renderer/src/components/dashboard/AgentDashboardExperimentalSetting.tsx index a2e48e51396..4f5f74314ae 100644 --- a/src/renderer/src/components/dashboard/AgentDashboardExperimentalSetting.tsx +++ b/src/renderer/src/components/dashboard/AgentDashboardExperimentalSetting.tsx @@ -27,7 +27,7 @@ export function AgentDashboardExperimentalSetting({ 'auto.components.settings.ExperimentalPane.agentDashboard.description', 'Kanban board for monitoring agents across worktrees, in-window or as a pop-out.' )} - keywords={getExperimentalSearchEntry(t).agentDashboard.keywords} + keywords={getExperimentalSearchEntry().agentDashboard.keywords} className="space-y-3 py-3" id="experimental-agent-dashboard" > diff --git a/src/renderer/src/components/settings/advanced/AdvancedPane.tsx b/src/renderer/src/components/settings/advanced/AdvancedPane.tsx index a3a4256e080..35875b83684 100644 --- a/src/renderer/src/components/settings/advanced/AdvancedPane.tsx +++ b/src/renderer/src/components/settings/advanced/AdvancedPane.tsx @@ -50,9 +50,9 @@ export function AdvancedPane({ settings, updateSettings }: AdvancedPaneProps): R )} > diff --git a/src/renderer/src/components/settings/advanced/ExperimentalPane.test.tsx b/src/renderer/src/components/settings/advanced/ExperimentalPane.test.tsx new file mode 100644 index 00000000000..b9c9627d224 --- /dev/null +++ b/src/renderer/src/components/settings/advanced/ExperimentalPane.test.tsx @@ -0,0 +1,25 @@ +// @vitest-environment happy-dom +import { cleanup, fireEvent, render, screen } from '@testing-library/react' +import { afterEach, beforeEach, expect, it, vi } from 'vitest' +import { getDefaultSettings } from '../../../../../shared/constants' +import { useAppStore } from '@/store' +import { TooltipProvider } from '../../ui/tooltip' +import { ExperimentalPane } from './ExperimentalPane' + +beforeEach(() => useAppStore.setState(useAppStore.getInitialState(), true)) +afterEach(cleanup) + +it('opens the ordinary Experimental pane and preserves its setting action', () => { + const updateSettings = vi.fn() + render( + + + + ) + + fireEvent.click(screen.getByRole('switch', { name: 'Pet' })) + expect(updateSettings).toHaveBeenCalledWith({ experimentalPet: true }) +}) diff --git a/src/renderer/src/components/settings/advanced/ExperimentalPane.tsx b/src/renderer/src/components/settings/advanced/ExperimentalPane.tsx index d50f0698959..941d1a333ea 100644 --- a/src/renderer/src/components/settings/advanced/ExperimentalPane.tsx +++ b/src/renderer/src/components/settings/advanced/ExperimentalPane.tsx @@ -36,18 +36,18 @@ export function ExperimentalPane({ }: ExperimentalPaneProps): React.JSX.Element { const t = useTranslate() const searchQuery = useAppStore((s) => s.settingsSearchQuery) - const showPet = matchesSettingsSearch(searchQuery, [getExperimentalSearchEntry(t).pet]) + const showPet = matchesSettingsSearch(searchQuery, [getExperimentalSearchEntry().pet]) const showAgentDashboard = matchesSettingsSearch(searchQuery, [ - getExperimentalSearchEntry(t).agentDashboard + getExperimentalSearchEntry().agentDashboard ]) const showTerminalAttention = matchesSettingsSearch(searchQuery, [ - getExperimentalSearchEntry(t).terminalAttention + getExperimentalSearchEntry().terminalAttention ]) const showAgentHibernation = matchesSettingsSearch(searchQuery, [ - getExperimentalSearchEntry(t).agentHibernation + getExperimentalSearchEntry().agentHibernation ]) const showNewWorktreeCardStyle = matchesSettingsSearch(searchQuery, [ - getExperimentalSearchEntry(t).newWorktreeCardStyle + getExperimentalSearchEntry().newWorktreeCardStyle ]) const agentHibernationEnabled = settings.experimentalAgentHibernation === true const newWorktreeCardStyleEnabled = settings.experimentalNewWorktreeCardStyle === true @@ -70,7 +70,7 @@ export function ExperimentalPane({ 'auto.components.settings.ExperimentalPane.0e89a574ae', 'Floating animated pet in the bottom-right corner.' )} - keywords={getExperimentalSearchEntry(t).pet.keywords} + keywords={getExperimentalSearchEntry().pet.keywords} className="space-y-3 py-3" id="experimental-pet" > @@ -102,7 +102,7 @@ export function ExperimentalPane({ 'auto.components.settings.ExperimentalPane.88b7613afb', 'Persistent pane highlight for terminal bell and agent-completion events.' )} - keywords={getExperimentalSearchEntry(t).terminalAttention.keywords} + keywords={getExperimentalSearchEntry().terminalAttention.keywords} className="space-y-3 py-3" >
@@ -143,7 +143,7 @@ export function ExperimentalPane({ 'auto.components.settings.ExperimentalPane.agentHibernation.description', 'Stops idle background agent terminals after the configured idle window and resumes supported sessions when you open them again.' )} - keywords={getExperimentalSearchEntry(t).agentHibernation.keywords} + keywords={getExperimentalSearchEntry().agentHibernation.keywords} className="space-y-3 py-3" id="experimental-agent-hibernation" > @@ -216,7 +216,7 @@ export function ExperimentalPane({ 'auto.components.settings.ExperimentalPane.newWorktreeCardStyle.description', 'Preview updated worktree-card layout, metadata placement, card-display menu options, and status presentation.' )} - keywords={getExperimentalSearchEntry(t).newWorktreeCardStyle.keywords} + keywords={getExperimentalSearchEntry().newWorktreeCardStyle.keywords} className="space-y-3 py-3" id="experimental-new-worktree-card-style" > diff --git a/src/renderer/src/components/settings/advanced/HiddenExperimentalGroup.tsx b/src/renderer/src/components/settings/advanced/HiddenExperimentalGroup.tsx index 92e36f5d7ea..447a7d57660 100644 --- a/src/renderer/src/components/settings/advanced/HiddenExperimentalGroup.tsx +++ b/src/renderer/src/components/settings/advanced/HiddenExperimentalGroup.tsx @@ -33,7 +33,7 @@ export function HiddenExperimentalGroup(): React.JSX.Element { className="flex items-start justify-between gap-4 rounded-md border border-status-warning-border bg-status-warning-background px-3 py-2.5" >
-