From 55db56d989ff5e057f864ab74d7fca77a0831e83 Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Mon, 9 Nov 2026 16:12:36 -0800 Subject: [PATCH 01/14] Make Settings easier to scan and organize General (#40249) * Simplify Settings chrome and organize General into focused views * Preserve search and skill actions across Settings views * Correct Settings validation leftovers * Keep skill conflict details visible in compact Settings rows * Refresh Settings search and protected copy catalogs * Use Settings design tokens and button variants * Keep Settings test setup and translation catalogs current * Keep Settings search metadata independent of display labels * Build repository search groups only for the selected pane * Keep pending skill installs and server menu labels accurate * Use the supported role locator in the skill regression * Keep absent skill installation actions on their supported path * Restore the Settings sidebar to its existing appearance * Restore shared navigation title keys in pane headings * Preserve the Settings shell entry animation * Drop unused Voice labels after the main sync * Preserve main Voice translations and the moved skill module import --- docs/STYLEGUIDE.md | 2 +- src/renderer/src/assets/main.css | 41 + .../AgentDashboardExperimentalSetting.tsx | 2 +- .../settings-persistence-test-fixture.ts | 4 +- .../accounts/accounts-claude-search.ts | 2 +- .../accounts-pane-removal-dialogs.tsx | 4 +- .../settings/accounts/accounts-search.ts | 25 +- .../claude/accounts-pane-claude-section.tsx | 4 +- .../codex/accounts-pane-codex-section.tsx | 4 +- .../accounts-pane-opencode-section.tsx | 6 +- .../scope/accounts-pane-location-section.tsx | 2 +- .../accounts-pane-minimax-credentials.tsx | 8 +- .../accounts-pane-opencode-credentials.tsx | 4 +- .../settings/advanced/AdvancedPane.tsx | 6 +- .../advanced/ExperimentalPane.test.tsx | 25 + .../settings/advanced/ExperimentalPane.tsx | 18 +- .../advanced/HiddenExperimentalGroup.tsx | 17 +- .../settings/advanced/advanced-search.ts | 117 +- .../settings/advanced/experimental-search.ts | 393 +++-- .../AdvancedNetworkSettingsSection.tsx | 10 +- .../settings/agents/agents-search.ts | 7 +- .../agents/behavior/AgentAwakeSetting.tsx | 2 +- .../behavior/AgentCacheTimerSection.tsx | 14 +- .../behavior/agent-cache-timer-search.ts | 2 +- .../agents/launch/AgentDefaultSetting.tsx | 2 +- .../permissions/AgentPermissionsSetting.tsx | 2 +- .../appearance/AppearanceInterfaceSection.tsx | 24 +- .../settings/appearance/AppearancePane.tsx | 6 +- .../AppearanceWindowSidebarSection.tsx | 36 +- .../LeftSidebarAppearanceSetting.tsx | 16 +- .../appearance/RecentTabOrderControl.tsx | 4 +- .../appearance/ReduceVisualEffectsSetting.tsx | 2 +- .../appearance/WindowMaterialSetting.tsx | 2 +- .../appearance/appearance-app-icon-search.ts | 2 +- ...appearance-reduce-visual-effects-search.ts | 2 +- .../settings/appearance/appearance-search.ts | 15 +- .../appearance/appearance-sidebar-search.ts | 18 +- ...ce-status-bar-antigravity-toggle-search.ts | 5 +- ...earance-status-bar-cursor-toggle-search.ts | 5 +- ...ppearance-status-bar-grok-toggle-search.ts | 2 +- ...arance-status-bar-minimax-toggle-search.ts | 2 +- ...ppearance-status-bar-muse-toggle-search.ts | 2 +- .../appearance-status-bar-search.ts | 16 +- ...pearance-status-bar-zcode-toggle-search.ts | 2 +- .../appearance-system-presence-search.ts | 6 +- .../themes/AppearanceThemeControl.tsx | 4 +- .../artifacts/ArtifactsSettingsPane.tsx | 4 +- .../artifacts/artifacts-settings-search.ts | 2 +- .../automations/AutomationsSettingsPane.tsx | 4 +- .../automations-settings-search.ts | 2 +- .../browser/BrowserDefaultZoomSetting.tsx | 4 +- .../browser/BrowserHomePageSetting.tsx | 4 +- .../browser/BrowserSearchEngineSetting.tsx | 4 +- .../settings/browser/browser-search.ts | 12 +- .../BrowserExtensionsExperimentalSetting.tsx | 2 +- .../profiles/BrowserNewProfileDialog.tsx | 2 +- .../browser/profiles/BrowserProfileRow.tsx | 4 +- .../profiles/BrowserSessionCookiesSection.tsx | 13 +- .../routing/BrowserLinkRoutingSetting.tsx | 6 +- .../BrowserLocalhostWorktreeLabelsSetting.tsx | 4 +- .../use/BrowserUseComputerUseNotice.tsx | 4 +- .../use/BrowserUseCookieImportStep.tsx | 6 +- .../browser/use/BrowserUseEnableSwitch.tsx | 4 +- .../settings/browser/use/BrowserUsePane.tsx | 8 +- .../browser/use/browser-use-search.ts | 8 +- .../settings/cli/install/CliSection.tsx | 83 +- .../computer-use/computer-use-search.ts | 2 +- .../DeveloperPermissionsPane.tsx | 36 +- .../LocalNetworkConnectionTest.tsx | 4 +- .../TerminalTccAttributionNotice.tsx | 4 +- .../developer-permissions-search.ts | 12 +- .../CollapseUnchangedRegionsSetting.tsx | 6 +- .../editor/DiffShowWhitespaceSetting.tsx | 14 +- .../editor/EditorFontFamilySetting.tsx | 9 +- .../editor/EditorFormatOnSaveSetting.tsx | 5 +- .../EditorInsertFinalNewlineSetting.tsx | 5 +- .../editor/EditorTypographySettings.tsx | 11 +- .../settings/editor/EditorWordWrapSetting.tsx | 14 +- .../editor/GeneralAutoSaveSetting.tsx | 45 + .../editor/GeneralEditorSettingsSection.tsx | 557 ++++--- .../editor/MarkdownDefaultViewSetting.tsx | 8 +- .../editor/RichMarkdownSpellcheckSetting.tsx | 10 +- .../editor/editor-typography-search.ts | 26 +- .../settings/editor/general-editor-search.ts | 133 +- .../FloatingWorkspacePane.tsx | 18 +- .../floating-workspace-search.ts | 4 +- .../form-controls/SettingsFormControls.tsx | 4 +- .../form-controls/SettingsNavigationRow.tsx | 39 + .../SettingsSearchableSelect.tsx | 8 +- .../general/GeneralConfirmationsSection.tsx | 79 + .../general/GeneralPane.navigation.test.tsx | 176 +++ .../settings/general/GeneralPane.tsx | 441 +++--- .../settings/general/GeneralSearchResults.tsx | 53 + .../general/GeneralSupportSection.tsx | 23 +- .../GeneralWorkspaceSettingsSection.tsx | 322 ++-- ...GlobalWorktreeVisibilitySourcesSetting.tsx | 1 + .../settings/general/OpenInMenuSetting.tsx | 25 +- .../general/WorkspaceDirectorySetting.tsx | 10 +- .../general/general-confirmations-search.ts | 116 ++ .../settings/general/general-search.ts | 158 +- .../general/general-setting-anchors.ts | 70 + .../settings/general/general-sub-pages.ts | 21 + .../general-project-runtime-search.ts | 4 +- .../host-scope/SettingsHostScopePicker.tsx | 11 +- .../components/settings/input/InputPane.tsx | 12 +- .../components/settings/input/input-search.ts | 4 +- .../integrations/integrations-search.ts | 26 +- .../settings/mobile/MobileSettingsPane.tsx | 8 +- .../MobileEmulatorAgentControlRow.tsx | 4 +- .../emulator/MobileEmulatorSettingsPane.tsx | 12 +- .../mobile/emulator/mobile-emulator-search.ts | 16 +- .../settings/mobile/mobile-pane-search.ts | 6 +- .../settings/mobile/mobile-settings-search.ts | 4 +- .../pairing/MobilePairedDevicesSection.tsx | 2 +- .../settings/navigation/SettingsHeader.tsx | 67 + .../use-settings-repo-scroll-effects.ts | 19 +- .../NotificationSettingToggle.tsx | 2 +- .../NotificationSoundSection.tsx | 6 +- .../notifications/NotificationsPane.tsx | 16 +- .../notifications/notifications-search.ts | 30 +- .../orchestration/OrchestrationPane.tsx | 2 +- .../orchestration/orchestration-search.ts | 4 +- .../settings-advanced-section-renderers.tsx | 2 +- .../settings-capability-section-renderers.tsx | 5 +- .../settings-git-task-section-renderers.tsx | 4 +- ...gs-interface-primary-section-renderers.tsx | 6 +- ...-interface-secondary-section-renderers.tsx | 4 +- .../settings/page/settings-page-renderer.tsx | 119 +- ...ings-remote-security-section-renderers.tsx | 10 +- ...tings-setup-workflow-section-renderers.tsx | 17 +- .../settings/page/settings-view-model.ts | 9 + .../use-settings-interaction-controller.ts | 14 +- .../page/use-settings-page-effects.ts | 25 +- .../settings/page/use-settings-store-model.ts | 10 +- .../privacy/PrivacyDiagnosticsSection.tsx | 2 +- .../settings/privacy/PrivacyPane.tsx | 2 +- .../settings/privacy/privacy-search.ts | 6 +- .../quick-commands/QuickCommandsToolbar.tsx | 2 +- .../quick-commands/quick-commands-search.ts | 2 +- .../repository/RepositoryFormatterSection.tsx | 2 +- .../repository/RepositoryPane.search.test.tsx | 70 + .../settings/repository/RepositoryPane.tsx | 55 +- .../RepositoryRemoveProjectButton.tsx | 2 +- .../hooks/RepositoryHookPolicySettings.tsx | 2 +- .../hooks/RepositoryHooksSection.tsx | 14 +- .../hooks/RepositoryIssueCommandSetting.tsx | 8 +- .../repository-git-hooks-search-entries.ts | 10 +- .../hooks/repository-hook-settings-draft.ts | 4 +- .../hosts/RepositoryHostSetupsSection.tsx | 4 +- .../identity/RepositoryIconPicker.tsx | 2 +- .../identity/RepositoryIconTabs.tsx | 2 +- .../repository/mcp/McpConfigSection.tsx | 2 +- .../repository/mcp/mcp-config-search.ts | 2 +- .../repository/repository-search.perf.test.ts | 53 + .../settings/repository/repository-search.ts | 481 +++--- .../RepositoryWindowsRuntimeSection.tsx | 2 +- .../RepositoryForkSyncSection.tsx | 14 +- .../RepositoryGitHubAccountSection.tsx | 10 +- .../RepositorySourceControlAiSection.tsx | 4 +- .../repository-git-author-search-entries.ts | 2 +- .../RepositoryWorktreeDefaultsSection.tsx | 10 +- .../worktrees/SparsePresetSettingsSection.tsx | 6 +- .../worktrees/WorktreeSymlinksSection.tsx | 10 +- .../repository-git-worktree-search-entries.ts | 49 +- .../catalog/runtime-environment-dialogs.tsx | 4 +- .../catalog/runtime-environments-search.ts | 8 +- .../updates/RemoteServerUpdateDialog.tsx | 4 +- .../section-layout/SearchableSetting.tsx | 13 +- .../settings/section-layout/SettingsGroup.tsx | 10 +- .../section-layout/SettingsSection.tsx | 4 +- .../settings-target-highlight.ts | 4 + .../shortcuts/KeybindingsFileActions.tsx | 12 +- .../ShortcutTerminalPolicyControl.tsx | 8 +- .../settings/shortcuts/ShortcutsPane.tsx | 2 +- .../shortcuts/keybinding-title-copy.ts | 111 +- .../settings/shortcuts/shortcuts-search.ts | 4 +- .../skills/linear/LinearAgentSkillGuide.tsx | 2 +- .../sharing/ShareSkillsSettingsPane.tsx | 4 +- .../CompareAgainstUpstreamSetting.tsx | 2 +- .../settings/source-control/GitPane.tsx | 18 +- .../GitProviderApiBudgetPane.tsx | 8 +- .../git-provider-api-budget-search.ts | 4 +- .../settings/source-control/git-search.ts | 20 +- .../keep-local-main-up-to-date-setting.ts | 4 +- .../src/components/settings/ssh/ssh-search.ts | 8 +- .../targets/SshManagedHostRemoveDialog.tsx | 8 +- .../targets/SshTargetDestructiveActions.tsx | 4 +- .../settings/ssh/targets/SshTargetForm.tsx | 6 +- .../tasks/JiraIssueKeyCasingSetting.tsx | 2 +- .../settings/tasks/TaskSourceProviderCard.tsx | 2 +- .../tasks/TaskSourceShowInTasksStep.tsx | 2 +- .../components/settings/tasks/TasksPane.tsx | 2 +- .../components/settings/tasks/tasks-search.ts | 2 +- .../terminal/TerminalAdvancedSection.tsx | 16 +- .../terminal/TerminalInteractionSection.tsx | 33 +- .../TerminalAdvancedTypographyControls.tsx | 26 +- .../appearance/TerminalAppearanceSection.tsx | 12 +- .../appearance/TerminalContrastSetting.tsx | 2 +- .../TerminalCursorAppearanceSection.tsx | 18 +- .../appearance/TerminalFontSizeSetting.tsx | 4 +- .../TerminalPaneAppearanceSection.tsx | 18 +- .../appearance/TerminalRenderingSection.tsx | 10 +- .../appearance/TerminalWindowSection.tsx | 40 +- .../terminal-pane-appearance-search.ts | 21 +- .../appearance/terminal-typography-search.ts | 20 +- .../terminal-window-color-groups.tsx | 50 +- .../appearance/terminal-window-search.ts | 14 +- .../TerminalConfigImportModal.tsx | 4 +- .../TerminalWindowsAdministratorSection.tsx | 2 +- .../platform/TerminalWindowsShellSection.tsx | 8 +- .../terminal-advanced-platform-search.ts | 4 +- .../platform/terminal-windows-search.ts | 8 +- .../ManageSessionsSection.tsx | 2 +- .../manage-sessions-search.ts | 2 +- .../terminal/terminal-clipboard-search.ts | 13 +- .../terminal/themes/TerminalThemeSections.tsx | 18 +- .../terminal/themes/WarpThemeImportModal.tsx | 6 +- .../terminal/themes/terminal-theme-search.ts | 17 +- .../updates/GeneralRemoteServerUpdates.tsx | 19 +- .../updates/GeneralUpdateSettingsSection.tsx | 39 +- .../updates/UpdateDelaySetting.fixture.tsx | 2 +- .../settings/updates/UpdateDelaySetting.tsx | 4 +- .../settings/updates/update-delay-copy.ts | 2 +- .../EphemeralVmsExperimentalSetting.tsx | 6 +- .../runtimes/EphemeralVmRuntimesSection.tsx | 4 +- .../voice/OpenAiTranscriptionKeyDialog.tsx | 10 +- .../voice/OpenAiTranscriptionSettingsRow.tsx | 6 +- .../VoiceDictationLanguageSetting.test.tsx | 4 +- .../voice/VoiceDictationLanguageSetting.tsx | 2 +- .../settings/voice/VoiceMicrophoneSetting.tsx | 2 +- .../voice/VoiceModelUnloadSetting.tsx | 2 +- .../components/settings/voice/VoicePane.tsx | 2 +- .../voice/VoiceSpeechModelSection.tsx | 4 +- .../settings/voice/voice-pane-search.ts | 25 +- .../WorktreeSourceVisibilityControl.tsx | 65 + .../WorktreeVisibilitySourceAddForm.tsx | 35 + .../sources/WorktreeVisibilitySourceList.tsx | 54 +- .../skills/SkillFreshnessStatusPill.tsx | 53 +- .../AgentSkillSetupPanel.plan-status.test.tsx | 51 +- .../skills/setup/AgentSkillSetupPanel.tsx | 38 +- .../skills/setup/SkillSetupCommand.tsx | 41 + .../components/skills/setup/SkillSetupRow.tsx | 34 + .../skills/setup/WslAgentSkillSetupPanel.tsx | 170 +- .../setup/agent-skill-setup-panel-props.ts | 2 +- .../wsl-agent-skill-setup-panel-props.ts | 2 +- .../src/i18n/en-runtime-required.json | 7 + src/renderer/src/i18n/locales/de.json | 1200 +++++++-------- src/renderer/src/i18n/locales/en.json | 1361 +++++++++-------- src/renderer/src/i18n/locales/es.json | 1198 +++++++-------- src/renderer/src/i18n/locales/fr.json | 1198 +++++++-------- src/renderer/src/i18n/locales/ja.json | 1198 +++++++-------- src/renderer/src/i18n/locales/ko.json | 1198 +++++++-------- src/renderer/src/i18n/locales/pt.json | 1202 +++++++-------- src/renderer/src/i18n/locales/ru.json | 1202 +++++++-------- src/renderer/src/i18n/locales/tr.json | 1200 +++++++-------- src/renderer/src/i18n/locales/zh-Hant.json | 1200 +++++++-------- src/renderer/src/i18n/locales/zh.json | 1198 +++++++-------- .../skill-freshness-display-status.ts | 12 +- .../languages/protected-copy-keys.json | 6 +- tests/e2e/sparse-preset-proof.spec.ts | 4 +- 260 files changed, 10269 insertions(+), 9300 deletions(-) create mode 100644 src/renderer/src/components/settings/advanced/ExperimentalPane.test.tsx create mode 100644 src/renderer/src/components/settings/editor/GeneralAutoSaveSetting.tsx create mode 100644 src/renderer/src/components/settings/form-controls/SettingsNavigationRow.tsx create mode 100644 src/renderer/src/components/settings/general/GeneralConfirmationsSection.tsx create mode 100644 src/renderer/src/components/settings/general/GeneralPane.navigation.test.tsx create mode 100644 src/renderer/src/components/settings/general/GeneralSearchResults.tsx create mode 100644 src/renderer/src/components/settings/general/general-confirmations-search.ts create mode 100644 src/renderer/src/components/settings/general/general-setting-anchors.ts create mode 100644 src/renderer/src/components/settings/general/general-sub-pages.ts create mode 100644 src/renderer/src/components/settings/navigation/SettingsHeader.tsx create mode 100644 src/renderer/src/components/settings/repository/RepositoryPane.search.test.tsx create mode 100644 src/renderer/src/components/settings/repository/repository-search.perf.test.ts create mode 100644 src/renderer/src/components/settings/section-layout/settings-target-highlight.ts create mode 100644 src/renderer/src/components/sidebar/workspace-visibility/sources/WorktreeSourceVisibilityControl.tsx create mode 100644 src/renderer/src/components/skills/setup/SkillSetupCommand.tsx create mode 100644 src/renderer/src/components/skills/setup/SkillSetupRow.tsx diff --git a/docs/STYLEGUIDE.md b/docs/STYLEGUIDE.md index 8befb02e39a..ee8a8c1e177 100644 --- a/docs/STYLEGUIDE.md +++ b/docs/STYLEGUIDE.md @@ -44,7 +44,7 @@ Tokens pair a **surface** with a **foreground** that meets contrast on it; alway - Body letter-spacing is set globally on `body`; don't override per component. - Use Tailwind's scale. Common: 14px body/default buttons, 13px sidebar items and dense rows, 12px sub-text and paths, 11px uppercase meta/captions. - Use `text-2xs` (11px) and `text-3xs` (10px), not `text-[11px]` / `text-[10px]`. -- Category labels: 11px, `font-semibold`, `uppercase`, `tracking-wider` (0.05em). +- Category labels: 11px, `font-semibold`, `uppercase`, `tracking-wider` (0.05em). Settings content uses sentence case without tracking: 14px row labels, `text-settings-detail` (12.5px) help, and `text-settings-heading` (15px) semibold section headings. Settings form rows use about 9px vertical padding (44px minimum), selects are 28px, and the centered content column is at most 720px with at least 32px side gutters. These density rules are scoped to `.settings-view-shell`; shared primitives retain their defaults elsewhere. - Native chat has its own lint-enforced scale and colours: see [native-chat.md](./styleguide/native-chat.md). ## Radius and elevation diff --git a/src/renderer/src/assets/main.css b/src/renderer/src/assets/main.css index 59c6fd15fb5..181e66ac5aa 100644 --- a/src/renderer/src/assets/main.css +++ b/src/renderer/src/assets/main.css @@ -49,6 +49,10 @@ --text-2xs--line-height: calc(1 / 0.6875); --text-3xs: 0.625rem; --text-3xs--line-height: calc(0.875 / 0.625); + --text-settings-detail: 0.78125rem; + --text-settings-detail--line-height: 1.35; + --text-settings-heading: 0.9375rem; + --text-settings-heading--line-height: 1.4; --text-chat-code: 0.75rem; --text-chat-code--line-height: calc(1 / 0.75); } @@ -2149,6 +2153,43 @@ html.native-shell .app-layout { animation: settings-shell-enter 180ms ease-out; } +/* Shared row primitives also render outside Settings; their density stays local to this page. */ +.settings-view-shell > :not(aside) [data-slot='label'], +.settings-view-shell > :not(aside) [data-source-title] { + font-size: var(--text-sm); + line-height: 1.4; +} + +.settings-view-shell > :not(aside) p.text-xs, +.settings-view-shell > :not(aside) p.text-2xs, +.settings-view-shell > :not(aside) p[class~='text-[10px]'], +.settings-view-shell > :not(aside) p[class~='text-[11px]'], +.settings-view-shell > :not(aside) p[class~='text-[12px]'], +.settings-view-shell > :not(aside) p[class~='text-[13px]'], +.settings-view-shell > :not(aside) [data-source-path] { + font-size: var(--text-settings-detail); + line-height: 1.35; +} + +.settings-view-shell > :not(aside) [data-slot='select-trigger'], +.settings-view-shell > :not(aside) button[role='combobox'] { + min-height: 28px; + height: 28px; +} + +.settings-view-shell > :not(aside) [data-settings-row]:not(:has([data-settings-row])) { + padding-block: 9px; + min-height: 44px; +} + +.settings-view-shell > :not(aside) [data-settings-group-heading] { + font-size: var(--text-settings-heading); +} + +.settings-view-shell > :not(aside) [data-settings-group-description] { + font-size: var(--text-settings-detail); +} + .repo-icon-emoji-picker .EmojiPickerReact { --epr-bg-color: var(--card); --epr-category-label-bg-color: var(--card); 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/__fixtures__/settings-persistence-test-fixture.ts b/src/renderer/src/components/settings/__fixtures__/settings-persistence-test-fixture.ts index 7e30c7ecc3f..39c0a6d6099 100644 --- a/src/renderer/src/components/settings/__fixtures__/settings-persistence-test-fixture.ts +++ b/src/renderer/src/components/settings/__fixtures__/settings-persistence-test-fixture.ts @@ -91,12 +91,12 @@ export function settingsModel(): SettingsPersistenceModel { hasUnsavedBranchPromptChanges: false, hasUnsavedChatPromptChanges: false, hasUnsavedCommitPromptChanges: false, - highlightedSettingsTargetId: null, + highlightedSettingsTarget: null, setFontSuggestions: vi.fn(), setHasUnsavedBranchPromptChanges: vi.fn(), setHasUnsavedChatPromptChanges: vi.fn(), setHasUnsavedCommitPromptChanges: vi.fn(), - setHighlightedSettingsTargetId: vi.fn(), + setHighlightedSettingsTarget: vi.fn(), setSettingsSearchQuery: vi.fn(), setSourceControlAiPromptDiscardSignal: vi.fn() } satisfies SettingsPersistenceModel diff --git a/src/renderer/src/components/settings/accounts/accounts-claude-search.ts b/src/renderer/src/components/settings/accounts/accounts-claude-search.ts index a5ac0bccc7b..6ea25153719 100644 --- a/src/renderer/src/components/settings/accounts/accounts-claude-search.ts +++ b/src/renderer/src/components/settings/accounts/accounts-claude-search.ts @@ -4,7 +4,7 @@ import { translateSearchKeyword } from '../search/settings-search-keywords' export const getAccountsClaudeSearchEntries = createLocalizedCatalog(() => [ { - title: translate('auto.components.settings.accounts.search.75682e1b62', 'Claude Accounts'), + title: translate('auto.components.settings.accounts.search.be3a748ebb', 'Claude accounts'), description: translate( 'auto.components.settings.accounts.search.dd75a73991', 'Optional account switching for Claude while preserving shared chat context.' diff --git a/src/renderer/src/components/settings/accounts/accounts-pane-removal-dialogs.tsx b/src/renderer/src/components/settings/accounts/accounts-pane-removal-dialogs.tsx index efd18c7f1c1..377ad532bcb 100644 --- a/src/renderer/src/components/settings/accounts/accounts-pane-removal-dialogs.tsx +++ b/src/renderer/src/components/settings/accounts/accounts-pane-removal-dialogs.tsx @@ -65,7 +65,7 @@ export function renderAccountsRemovalDialogs( ) }} > - {t('auto.components.settings.AccountsPane.c2d2751587', 'Remove Account')} + {t('auto.components.settings.AccountsPane.699680a328', 'Remove account')} @@ -105,7 +105,7 @@ export function renderAccountsRemovalDialogs( ) }} > - {t('auto.components.settings.AccountsPane.c2d2751587', 'Remove Account')} + {t('auto.components.settings.AccountsPane.699680a328', 'Remove account')} diff --git a/src/renderer/src/components/settings/accounts/accounts-search.ts b/src/renderer/src/components/settings/accounts/accounts-search.ts index fd78aba0d15..dbf6bdb196f 100644 --- a/src/renderer/src/components/settings/accounts/accounts-search.ts +++ b/src/renderer/src/components/settings/accounts/accounts-search.ts @@ -6,7 +6,7 @@ import { getAccountsClaudeSearchEntries } from './accounts-claude-search' export const getAccountsLocationSearchEntries = createLocalizedCatalog(() => [ { - title: translate('auto.components.settings.accounts.search.d09fb5ca92', 'Account Location'), + title: translate('auto.components.settings.accounts.search.5e2101f61f', 'Account location'), description: translate( 'auto.components.settings.accounts.search.b84a5b0c8a', 'Choose whether provider accounts are inspected and added on this device or in WSL.' @@ -25,7 +25,7 @@ export const getAccountsLocationSearchEntries = createLocalizedCatalog(() => [ export const getAccountsCodexSearchEntries = createLocalizedCatalog(() => [ { - title: translate('auto.components.settings.accounts.search.17c5d244eb', 'Codex Accounts'), + title: translate('auto.components.settings.accounts.search.54c541fc6e', 'Codex accounts'), description: translate( 'auto.components.settings.accounts.search.b40d5b6570', 'Optional account switching for Codex and live rate limit fetching.' @@ -55,7 +55,7 @@ export const getAccountsCodexSearchEntries = createLocalizedCatalog(() => [ ] }, { - title: translate('auto.components.settings.accounts.search.a4bcfd6f86', 'Active Codex Account'), + title: translate('auto.components.settings.accounts.search.4518496456', 'Active Codex account'), description: translate( 'auto.components.settings.accounts.search.87a4a8584e', 'Choose which optional saved Codex account powers live quota reads.' @@ -109,8 +109,8 @@ export const getAccountsGeminiSearchEntries = createLocalizedCatalog(() => [ export const getAccountsOpencodeSearchEntries = createLocalizedCatalog(() => [ { title: translate( - 'auto.components.settings.accounts.search.6ed1401020', - 'OpenCode Go Session Cookie' + 'auto.components.settings.accounts.search.f0e6678f99', + 'OpenCode Go session cookie' ), description: translate( 'auto.components.settings.accounts.search.25591bf95b', @@ -130,8 +130,8 @@ export const getAccountsOpencodeSearchEntries = createLocalizedCatalog(() => [ }, { title: translate( - 'auto.components.settings.accounts.search.4ee2029e9c', - 'OpenCode Go Workspace ID' + 'auto.components.settings.accounts.search.8eef999193', + 'OpenCode Go workspace id' ), description: translate( 'auto.components.settings.accounts.search.38d22ff8d6', @@ -153,7 +153,7 @@ export const getAccountsOpencodeSearchEntries = createLocalizedCatalog(() => [ export const getAccountsMiniMaxSearchEntries = createLocalizedCatalog(() => [ { - title: translate('auto.components.settings.accounts.search.733f9e2a93', 'MiniMax Usage'), + title: translate('auto.components.settings.accounts.search.9b6ce52c36', 'MiniMax usage'), description: translate( 'auto.components.settings.accounts.search.f8374c3151', 'Configure MiniMax usage tracking. Pick the overseas or China endpoint, then paste a session cookie or save an API key that works on either host.' @@ -198,7 +198,7 @@ export const getAccountsGrokSearchEntries = createLocalizedCatalog(() => [ export const getAccountsAntigravitySearchEntries = createLocalizedCatalog(() => [ { - title: translate('accounts.antigravity.searchTitle', 'Antigravity Accounts'), + title: translate('accounts.antigravity.fd47b5a5dd', 'Antigravity accounts'), description: translate( 'accounts.antigravity.searchDescription', 'Save and select native agy Google accounts on the execution host.' @@ -216,7 +216,7 @@ export const getAccountsAntigravitySearchEntries = createLocalizedCatalog(() => export const getAccountsCursorSearchEntries = createLocalizedCatalog(() => [ { - title: translate('auto.components.settings.accounts.search.cursor.title', 'Cursor Usage'), + title: translate('auto.components.settings.accounts.search.cursor.39bbdebe13', 'Cursor usage'), description: translate( 'auto.components.settings.accounts.search.cursor.description', 'Plan usage read from the Cursor sign-in already on this computer (cursor-agent login).' @@ -248,7 +248,10 @@ export const getAccountsCursorSearchEntries = createLocalizedCatalog(() => [ export const getAccountsZcodePlanSearchEntries = createLocalizedCatalog(() => [ { - title: translate('auto.components.settings.accounts.search.zcodePlan.title', 'GLM Coding Plan'), + title: translate( + 'auto.components.settings.accounts.search.zcodePlan.0db9d0465f', + 'GLM coding plan' + ), description: translate( 'auto.components.settings.accounts.search.zcodePlan.description', 'Track Z.AI or Zhipu (BigModel) GLM Coding Plan usage. Pick the site and save the plan API key.' diff --git a/src/renderer/src/components/settings/accounts/claude/accounts-pane-claude-section.tsx b/src/renderer/src/components/settings/accounts/claude/accounts-pane-claude-section.tsx index 117ef72b818..bc05589e570 100644 --- a/src/renderer/src/components/settings/accounts/claude/accounts-pane-claude-section.tsx +++ b/src/renderer/src/components/settings/accounts/claude/accounts-pane-claude-section.tsx @@ -98,7 +98,7 @@ export function renderClaudeAccountsSection( )} > )} - {t('auto.components.settings.AccountsPane.b0e948a4f9', 'Add Account')} + {t('auto.components.settings.AccountsPane.7e9977b560', 'Add account')} {!isRemoteAccountScope && canOfferClaudeSignInLink(accountRuntime.runtime) ? ( )} - {t('auto.components.settings.AccountsPane.b0e948a4f9', 'Add Account')} + {t('auto.components.settings.AccountsPane.7e9977b560', 'Add account')} {/* Follow the running addition; hide Cancel only when its server prompt already offers it. */} {codexAction === 'adding' && !accountAdditionShownInPrompt('codex', accountOwner) ? ( diff --git a/src/renderer/src/components/settings/accounts/providers/accounts-pane-opencode-section.tsx b/src/renderer/src/components/settings/accounts/providers/accounts-pane-opencode-section.tsx index 3c166ba7143..251606f4ca9 100644 --- a/src/renderer/src/components/settings/accounts/providers/accounts-pane-opencode-section.tsx +++ b/src/renderer/src/components/settings/accounts/providers/accounts-pane-opencode-section.tsx @@ -32,8 +32,8 @@ export function renderOpenCodeAccountsSection(
{cookieNotice ?

{cookieNotice}

: null} diff --git a/src/renderer/src/components/settings/accounts/usage/accounts-pane-opencode-credentials.tsx b/src/renderer/src/components/settings/accounts/usage/accounts-pane-opencode-credentials.tsx index d56984df1b0..c4d7acc10c9 100644 --- a/src/renderer/src/components/settings/accounts/usage/accounts-pane-opencode-credentials.tsx +++ b/src/renderer/src/components/settings/accounts/usage/accounts-pane-opencode-credentials.tsx @@ -58,8 +58,8 @@ export function OpenCodeGoCredentials({ onSaved }: { onSaved: () => void }): Rea return ( 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 6de87e81686..447a7d57660 100644 --- a/src/renderer/src/components/settings/advanced/HiddenExperimentalGroup.tsx +++ b/src/renderer/src/components/settings/advanced/HiddenExperimentalGroup.tsx @@ -8,7 +8,7 @@ import { import { useTranslate } from '@/i18n/use-translate' import { getShortcutPlatform } from '@/lib/shortcut-platform' -// Use shared orange styling to identify unfinished/staff-only controls. +// Warning tokens distinguish unfinished controls across themes. export function HiddenExperimentalGroup(): React.JSX.Element { const t = useTranslate() const isMac = getShortcutPlatform() === 'darwin' @@ -20,23 +20,26 @@ export function HiddenExperimentalGroup(): React.JSX.Element { setRenderDiagnosticsArmed(armed) } return ( -
-

+
+

{t( 'auto.components.settings.HiddenExperimentalGroup.f2c81d904a', 'Hidden experimental settings' )}

-
+
-
diff --git a/src/renderer/src/components/settings/advanced/advanced-search.ts b/src/renderer/src/components/settings/advanced/advanced-search.ts index f252ae2f56c..5b8f97f6205 100644 --- a/src/renderer/src/components/settings/advanced/advanced-search.ts +++ b/src/renderer/src/components/settings/advanced/advanced-search.ts @@ -2,61 +2,72 @@ import type { SettingsSearchEntry } from '../search/settings-search' import { getAdvancedNetworkSearchEntries } from './network/advanced-network-search' import { createLocalizedCatalog } from '@/i18n/localized-catalog' import { translate } from '@/i18n/i18n' -import type { Translate } from '@/i18n/use-translate' import { translateSearchKeyword } from '../search/settings-search-keywords' +export const getAdvancedSearchEntry = createLocalizedCatalog( + () => + ({ + http1Compatibility: { + title: translate( + 'auto.components.settings.advanced.search.11eea3da72', + 'HTTP/1.1 Compatibility' + ), + description: translate( + 'auto.components.settings.advanced.search.585f56fae0', + 'Use HTTP/1.1 for Electron networking when HTTP/2 fails behind a proxy.' + ), + keywords: [ + ...translateSearchKeyword( + 'auto.components.settings.advanced.search.e04e9db503', + 'advanced' + ), + ...translateSearchKeyword( + 'auto.components.settings.advanced.search.2b4d26d11e', + 'networking' + ), + ...translateSearchKeyword( + 'auto.components.settings.advanced.search.4d44352eea', + 'network' + ), + ...translateSearchKeyword('auto.components.settings.advanced.search.48a1c8f534', 'http'), + ...translateSearchKeyword('auto.components.settings.advanced.search.4b4ae4345a', 'http2'), + ...translateSearchKeyword( + 'auto.components.settings.advanced.search.a0f71bd909', + 'http/2' + ), + ...translateSearchKeyword('auto.components.settings.advanced.search.f8ff125ebe', 'http1'), + ...translateSearchKeyword( + 'auto.components.settings.advanced.search.621233008b', + 'http/1.1' + ), + ...translateSearchKeyword( + 'auto.components.settings.advanced.search.65bf6af262', + 'compatibility' + ), + ...translateSearchKeyword('auto.components.settings.advanced.search.f98a60af11', 'proxy'), + ...translateSearchKeyword('auto.components.settings.advanced.search.4383251647', 'vpn'), + ...translateSearchKeyword( + 'auto.components.settings.advanced.search.79e0947e95', + 'support' + ), + ...translateSearchKeyword( + 'auto.components.settings.advanced.search.6576fce4d2', + 'troubleshooting' + ), + ...translateSearchKeyword( + 'auto.components.settings.advanced.search.e61ed8ab33', + 'updates' + ), + ...translateSearchKeyword( + 'auto.components.settings.advanced.search.a7002e1ac4', + 'updater' + ) + ] + } + }) satisfies Record +) + export const getAdvancedPaneSearchEntries = createLocalizedCatalog((): SettingsSearchEntry[] => [ ...getAdvancedNetworkSearchEntries(), - { - title: translate( - 'auto.components.settings.advanced.search.11eea3da72', - 'HTTP/1.1 Compatibility' - ), - description: translate( - 'auto.components.settings.advanced.search.585f56fae0', - 'Use HTTP/1.1 for Electron networking when HTTP/2 fails behind a proxy.' - ), - keywords: [ - ...translateSearchKeyword('auto.components.settings.advanced.search.e04e9db503', 'advanced'), - ...translateSearchKeyword( - 'auto.components.settings.advanced.search.2b4d26d11e', - 'networking' - ), - ...translateSearchKeyword('auto.components.settings.advanced.search.4d44352eea', 'network'), - ...translateSearchKeyword('auto.components.settings.advanced.search.48a1c8f534', 'http'), - ...translateSearchKeyword('auto.components.settings.advanced.search.4b4ae4345a', 'http2'), - ...translateSearchKeyword('auto.components.settings.advanced.search.a0f71bd909', 'http/2'), - ...translateSearchKeyword('auto.components.settings.advanced.search.f8ff125ebe', 'http1'), - ...translateSearchKeyword('auto.components.settings.advanced.search.621233008b', 'http/1.1'), - ...translateSearchKeyword( - 'auto.components.settings.advanced.search.65bf6af262', - 'compatibility' - ), - ...translateSearchKeyword('auto.components.settings.advanced.search.f98a60af11', 'proxy'), - ...translateSearchKeyword('auto.components.settings.advanced.search.4383251647', 'vpn'), - ...translateSearchKeyword('auto.components.settings.advanced.search.79e0947e95', 'support'), - ...translateSearchKeyword( - 'auto.components.settings.advanced.search.6576fce4d2', - 'troubleshooting' - ), - ...translateSearchKeyword('auto.components.settings.advanced.search.e61ed8ab33', 'updates'), - ...translateSearchKeyword('auto.components.settings.advanced.search.a7002e1ac4', 'updater') - ] - } + getAdvancedSearchEntry().http1Compatibility ]) - -function findEntry(title: string): SettingsSearchEntry { - const entry = getAdvancedPaneSearchEntries().find((e) => e.title === title) - if (!entry) { - throw new Error(`Missing advanced-pane search entry: "${title}"`) - } - return entry -} - -export function getAdvancedSearchEntry(t: Translate = translate) { - return { - http1Compatibility: findEntry( - t('auto.components.settings.advanced.search.11eea3da72', 'HTTP/1.1 Compatibility') - ) - } as const -} diff --git a/src/renderer/src/components/settings/advanced/experimental-search.ts b/src/renderer/src/components/settings/advanced/experimental-search.ts index 97f63766797..d69b5528840 100644 --- a/src/renderer/src/components/settings/advanced/experimental-search.ts +++ b/src/renderer/src/components/settings/advanced/experimental-search.ts @@ -1,227 +1,200 @@ import type { SettingsSearchEntry } from '../search/settings-search' import { createLocalizedCatalog } from '@/i18n/localized-catalog' import { translate } from '@/i18n/i18n' -import type { Translate } from '@/i18n/use-translate' import { translateSearchKeyword } from '../search/settings-search-keywords' import { getNewWorktreeCardStyleSearchEntry } from './new-worktree-card-style-search-entry' import { getEphemeralVmsSearchEntry } from '../virtual-machines/recipes/ephemeral-vms-search' import { getBrowserExtensionsExperimentalSearchEntry } from '../browser/extensions/browser-extensions-experimental-search' import { getWslHostsExperimentalSearchEntry } from '../wsl/hosts/wsl-hosts-experimental-search' +export const getExperimentalSearchEntry = createLocalizedCatalog( + () => + ({ + pet: { + title: translate('auto.components.settings.experimental.search.87d99e634b', 'Pet'), + description: translate( + 'auto.components.settings.experimental.search.6b5a56ac35', + 'Floating animated pet in the bottom-right corner.' + ), + keywords: [ + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.0d24759f14', + 'experimental' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.051203d37c', + 'pet' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.b54cea709b', + 'sidekick' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.2a33975d72', + 'mascot' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.9f5609bfb8', + 'overlay' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.65df471ab2', + 'animated' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.791fefc0b0', + 'corner' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.9af7a518db', + 'character' + ) + ] + }, + agentDashboard: { + title: translate( + 'auto.components.settings.experimental.search.agentDashboard.eaf17a7214', + 'Agent dashboard' + ), + description: translate( + 'auto.components.settings.experimental.search.agentDashboard.description', + 'Kanban board for monitoring agents across worktrees, in-window or as a pop-out.' + ), + keywords: [ + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.0d24759f14', + 'experimental' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.agentDashboard.agent', + 'agent' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.agentDashboard.dashboard', + 'dashboard' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.agentDashboard.kanban', + 'kanban' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.agentDashboard.popout', + 'pop-out' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.agentDashboard.board', + 'board' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.agentDashboard.inWindow', + 'in-window' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.agentDashboard.worktrees', + 'worktrees' + ) + ] + }, + terminalAttention: { + title: translate( + 'auto.components.settings.experimental.search.9e4ddf776d', + 'Terminal attention' + ), + description: translate( + 'auto.components.settings.experimental.search.11877246fc', + 'Persistent pane highlight for terminal bell and agent-completion events.' + ), + keywords: [ + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.0d24759f14', + 'experimental' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.9bb3bd5098', + 'terminal' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.01567f19ca', + 'attention' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.268e99d957', + 'highlight' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.edc49480a1', + 'pane' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.8facf10138', + 'bell' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.7695fd30e9', + 'notification' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.5f067ba0f9', + 'agent' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.f10d307468', + 'completion' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.7b79081695', + 'unread' + ) + ] + }, + agentHibernation: { + title: translate( + 'auto.components.settings.experimental.search.agentHibernation.title', + 'Agent sleep' + ), + description: translate( + 'auto.components.settings.experimental.search.agentHibernation.description', + 'Stops idle background agent terminals after the configured idle window and resumes supported sessions when opened again. Agent sleep preserves launch options for agents started by Orca; manually started agents may resume with current Orca defaults.' + ), + keywords: [ + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.0d24759f14', + 'experimental' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.agentHibernation.agent', + 'agent' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.agentHibernation.agents', + 'agents' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.agentHibernation.sleep', + 'sleep' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.agentHibernation.minutes', + 'minutes' + ), + ...translateSearchKeyword( + 'auto.components.settings.experimental.search.agentHibernation.terminal', + 'terminal' + ) + ] + }, + newWorktreeCardStyle: getNewWorktreeCardStyleSearchEntry(), + ephemeralVms: getEphemeralVmsSearchEntry(), + browserExtensions: getBrowserExtensionsExperimentalSearchEntry() + }) satisfies Record +) + export const getExperimentalPaneSearchEntries = createLocalizedCatalog( (): SettingsSearchEntry[] => [ - { - title: translate('auto.components.settings.experimental.search.87d99e634b', 'Pet'), - description: translate( - 'auto.components.settings.experimental.search.6b5a56ac35', - 'Floating animated pet in the bottom-right corner.' - ), - keywords: [ - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.0d24759f14', - 'experimental' - ), - ...translateSearchKeyword('auto.components.settings.experimental.search.051203d37c', 'pet'), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.b54cea709b', - 'sidekick' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.2a33975d72', - 'mascot' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.9f5609bfb8', - 'overlay' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.65df471ab2', - 'animated' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.791fefc0b0', - 'corner' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.9af7a518db', - 'character' - ) - ] - }, - { - title: translate( - 'auto.components.settings.experimental.search.agentDashboard.title', - 'Agent Dashboard' - ), - description: translate( - 'auto.components.settings.experimental.search.agentDashboard.description', - 'Kanban board for monitoring agents across worktrees, in-window or as a pop-out.' - ), - keywords: [ - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.0d24759f14', - 'experimental' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.agentDashboard.agent', - 'agent' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.agentDashboard.dashboard', - 'dashboard' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.agentDashboard.kanban', - 'kanban' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.agentDashboard.popout', - 'pop-out' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.agentDashboard.board', - 'board' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.agentDashboard.inWindow', - 'in-window' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.agentDashboard.worktrees', - 'worktrees' - ) - ] - }, - { - title: translate( - 'auto.components.settings.experimental.search.9e4ddf776d', - 'Terminal attention' - ), - description: translate( - 'auto.components.settings.experimental.search.11877246fc', - 'Persistent pane highlight for terminal bell and agent-completion events.' - ), - keywords: [ - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.0d24759f14', - 'experimental' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.9bb3bd5098', - 'terminal' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.01567f19ca', - 'attention' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.268e99d957', - 'highlight' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.edc49480a1', - 'pane' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.8facf10138', - 'bell' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.7695fd30e9', - 'notification' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.5f067ba0f9', - 'agent' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.f10d307468', - 'completion' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.7b79081695', - 'unread' - ) - ] - }, - { - title: translate( - 'auto.components.settings.experimental.search.agentHibernation.title', - 'Agent sleep' - ), - description: translate( - 'auto.components.settings.experimental.search.agentHibernation.description', - 'Stops idle background agent terminals after the configured idle window and resumes supported sessions when opened again. Agent sleep preserves launch options for agents started by Orca; manually started agents may resume with current Orca defaults.' - ), - keywords: [ - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.0d24759f14', - 'experimental' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.agentHibernation.agent', - 'agent' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.agentHibernation.agents', - 'agents' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.agentHibernation.sleep', - 'sleep' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.agentHibernation.minutes', - 'minutes' - ), - ...translateSearchKeyword( - 'auto.components.settings.experimental.search.agentHibernation.terminal', - 'terminal' - ) - ] - }, - getNewWorktreeCardStyleSearchEntry(), - getEphemeralVmsSearchEntry(), - getBrowserExtensionsExperimentalSearchEntry(), + ...Object.values(getExperimentalSearchEntry()), // Index WSL toggles only on Windows desktops that expose them. ...(typeof window !== 'undefined' && window.api?.runtimeEnvironments?.wslHosts ? [getWslHostsExperimentalSearchEntry()] : []) ] ) - -// Resolve by title and fail loudly on renames so changing catalog shape cannot silently retarget numeric indexes. -function findEntry(title: string): SettingsSearchEntry { - const entry = getExperimentalPaneSearchEntries().find((e) => e.title === title) - if (!entry) { - throw new Error(`Missing experimental-pane search entry: "${title}"`) - } - return entry -} - -export function getExperimentalSearchEntry(t: Translate = translate) { - return { - pet: findEntry(t('auto.components.settings.experimental.search.87d99e634b', 'Pet')), - agentDashboard: findEntry( - t('auto.components.settings.experimental.search.agentDashboard.title', 'Agent Dashboard') - ), - terminalAttention: findEntry( - t('auto.components.settings.experimental.search.9e4ddf776d', 'Terminal attention') - ), - agentHibernation: findEntry( - t('auto.components.settings.experimental.search.agentHibernation.title', 'Agent sleep') - ), - newWorktreeCardStyle: findEntry( - t('auto.components.settings.experimental.search.newWorktreeCardStyle.title', 'New card style') - ), - ephemeralVms: findEntry( - t('auto.components.settings.ephemeralVms.search.cloudVmTitle', 'Cloud VM') - ), - browserExtensions: findEntry( - t( - 'auto.components.settings.experimental.search.browserExtensions.title', - 'Browser extensions' - ) - ) - } as const -} diff --git a/src/renderer/src/components/settings/advanced/network/AdvancedNetworkSettingsSection.tsx b/src/renderer/src/components/settings/advanced/network/AdvancedNetworkSettingsSection.tsx index c9ab9f90216..d8943143898 100644 --- a/src/renderer/src/components/settings/advanced/network/AdvancedNetworkSettingsSection.tsx +++ b/src/renderer/src/components/settings/advanced/network/AdvancedNetworkSettingsSection.tsx @@ -245,7 +245,7 @@ export function AdvancedNetworkSettingsSection({

{t( @@ -278,8 +278,8 @@ export function AdvancedNetworkSettingsSection({