From 65687d9ecfbfed0e5706aa8dca8806d0380fca6c Mon Sep 17 00:00:00 2001 From: Jinjing <6427696+AmethystLiang@users.noreply.github.com> Date: Tue, 3 Nov 2026 13:15:19 -0800 Subject: [PATCH] Add chat width settings to pane headers (#37753) * feat: add chat width settings after pane close button * Translate chat settings label * Fix chat width options import and verify settings placement --- .../NativeChatPaneHeader.fixture.tsx | 9 +++ .../native-chat/NativeChatPaneHeader.test.tsx | 28 ++++++++- .../native-chat/NativeChatPaneHeader.tsx | 2 + .../NativeChatSettingsButton.fixture.tsx | 27 ++++++++ .../native-chat/NativeChatSettingsButton.tsx | 61 +++++++++++++++++++ ...uctured-native-chat-pane-commands.test.tsx | 2 + .../TerminalPaneHeaderOverlay.test.tsx | 12 +++- .../TerminalPaneHeaderOverlay.tsx | 2 + src/renderer/src/i18n/locales/de.json | 3 +- src/renderer/src/i18n/locales/en.json | 3 +- src/renderer/src/i18n/locales/es.json | 3 +- src/renderer/src/i18n/locales/fr.json | 3 +- src/renderer/src/i18n/locales/ja.json | 3 +- src/renderer/src/i18n/locales/ko.json | 3 +- src/renderer/src/i18n/locales/pt.json | 3 +- src/renderer/src/i18n/locales/ru.json | 3 +- src/renderer/src/i18n/locales/tr.json | 3 +- src/renderer/src/i18n/locales/zh-Hant.json | 3 +- src/renderer/src/i18n/locales/zh.json | 3 +- 19 files changed, 161 insertions(+), 15 deletions(-) create mode 100644 src/renderer/src/components/native-chat/NativeChatSettingsButton.fixture.tsx create mode 100644 src/renderer/src/components/native-chat/NativeChatSettingsButton.tsx diff --git a/src/renderer/src/components/native-chat/NativeChatPaneHeader.fixture.tsx b/src/renderer/src/components/native-chat/NativeChatPaneHeader.fixture.tsx index 5d43f3dec0e..bc7cc0ff4ec 100644 --- a/src/renderer/src/components/native-chat/NativeChatPaneHeader.fixture.tsx +++ b/src/renderer/src/components/native-chat/NativeChatPaneHeader.fixture.tsx @@ -19,3 +19,12 @@ export const splitShortcut = defineFixture({ frame.querySelector('button[aria-label="Split Chat Right"]')?.focus() } }) + +export const settings = defineFixture({ + ...splitShortcut, + interact: (frame) => { + frame + .querySelector('button[aria-label="Chat settings"]') + ?.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true })) + } +}) diff --git a/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx b/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx index e69fe9af914..17ec5cb1913 100644 --- a/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx +++ b/src/renderer/src/components/native-chat/NativeChatPaneHeader.test.tsx @@ -1,5 +1,6 @@ // @vitest-environment happy-dom -import { act, cleanup, fireEvent, render, screen } from '@testing-library/react' +import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react' +import { getDefaultSettings } from '../../../../shared/constants' import { afterEach, beforeEach, expect, it, vi } from 'vitest' import { TooltipProvider } from '@/components/ui/tooltip' import { useAppStore } from '@/store' @@ -60,7 +61,8 @@ it('offers chat actions without a duplicate close button and targets Resume at t const source = renderHeader() expect(screen.getAllByRole('button').map((button) => button.getAttribute('aria-label'))).toEqual([ 'Continue with Terminal Agent', - 'Split Chat Right' + 'Split Chat Right', + 'Chat settings' ]) const folder = useAppStore.getState().folderWorkspaces[0] act(() => useAppStore.setState({ folderWorkspaces: [{ ...folder, executionHostId: 'ssh:dev' }] })) @@ -81,6 +83,28 @@ it('offers chat actions without a duplicate close button and targets Resume at t ) }) +it('changes the saved chat width from the standalone chat toolbar', async () => { + const settings = { + ...getDefaultSettings('/tmp'), + nativeChatAppearance: { fontSize: 16, width: 'wide' as const } + } + const updateSettings = vi.fn(async (updates) => { + useAppStore.setState({ settings: { ...settings, ...updates } }) + }) + useAppStore.setState({ settings, updateSettings }) + renderHeader() + fireEvent.keyDown(screen.getByRole('button', { name: 'Chat settings' }), { key: 'Enter' }) + expect(screen.getByRole('menuitemradio', { name: 'Wide' }).getAttribute('aria-checked')).toBe( + 'true' + ) + fireEvent.click(screen.getByRole('menuitemradio', { name: 'Full' })) + await waitFor(() => + expect(updateSettings).toHaveBeenCalledWith({ + nativeChatAppearance: { fontSize: 16, width: 'full' } + }) + ) +}) + async function splitTooltipText(): Promise { const trigger = screen.getByRole('button', { name: 'Split Chat Right' }) fireEvent.pointerMove(trigger, { pointerType: 'mouse' }) diff --git a/src/renderer/src/components/native-chat/NativeChatPaneHeader.tsx b/src/renderer/src/components/native-chat/NativeChatPaneHeader.tsx index 4a603b9db6d..bd2fe0a8258 100644 --- a/src/renderer/src/components/native-chat/NativeChatPaneHeader.tsx +++ b/src/renderer/src/components/native-chat/NativeChatPaneHeader.tsx @@ -10,6 +10,7 @@ import type { NativeChatTabSession } from '../tab-bar/tab-session-history-switch import { useDocumentDarkTheme } from '@/hooks/use-document-dark-theme' import { useStructuredChatPaneActions } from './use-structured-chat-pane-actions' import { NativeChatResumeInCliButton } from './NativeChatResumeInCliButton' +import { NativeChatSettingsButton } from './NativeChatSettingsButton' import type { NativeChatStructuredViewProps } from './native-chat-view-types' import type { NativeChatHandOff } from './use-native-chat-hand-off' @@ -119,6 +120,7 @@ export function NativeChatPaneHeader({ + ) diff --git a/src/renderer/src/components/native-chat/NativeChatSettingsButton.fixture.tsx b/src/renderer/src/components/native-chat/NativeChatSettingsButton.fixture.tsx new file mode 100644 index 00000000000..9eb61343ce4 --- /dev/null +++ b/src/renderer/src/components/native-chat/NativeChatSettingsButton.fixture.tsx @@ -0,0 +1,27 @@ +import { defineFixture } from '../../component-fixtures/component-fixture' +import { NativeChatSettingsButton } from './NativeChatSettingsButton' +import { useAppStore } from '../../store' + +export const menu = defineFixture({ + width: 320, + render: () => ( +
+
+
+ +
+
+
+ ), + interact: (frame) => { + frame + .querySelector('button') + ?.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true })) + } +}) diff --git a/src/renderer/src/components/native-chat/NativeChatSettingsButton.tsx b/src/renderer/src/components/native-chat/NativeChatSettingsButton.tsx new file mode 100644 index 00000000000..03ea85e8cd8 --- /dev/null +++ b/src/renderer/src/components/native-chat/NativeChatSettingsButton.tsx @@ -0,0 +1,61 @@ +import { Settings } from 'lucide-react' +import { useAppStore } from '../../store' +import { translate } from '@/i18n/i18n' +import { Button } from '../ui/button' +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuLabel, + DropdownMenuRadioGroup, + DropdownMenuRadioItem, + DropdownMenuTrigger +} from '../ui/dropdown-menu' +import { Tooltip, TooltipContent, TooltipTrigger } from '../ui/tooltip' +import { getChatWidthOptions } from '../settings/appearance/chat/chat-appearance-search' +import { writeNativeChatAppearance } from './native-chat-appearance-write' + +export function NativeChatSettingsButton(): React.JSX.Element { + const width = useAppStore((state) => state.settings?.nativeChatAppearance?.width ?? 'comfortable') + const label = translate('components.native-chat.settings', 'Chat settings') + + return ( + + + + + + + + + {label} + + + event.stopPropagation()}> + + {translate('settings.appearance.chat.width', 'Width')} + + + {getChatWidthOptions().map((option) => ( + { + void writeNativeChatAppearance((current) => ({ ...current, width: option.value })) + }} + > + {option.label} + + ))} + + + + ) +} diff --git a/src/renderer/src/components/native-chat/use-structured-native-chat-pane-commands.test.tsx b/src/renderer/src/components/native-chat/use-structured-native-chat-pane-commands.test.tsx index e2b7b9cec43..d58f9701990 100644 --- a/src/renderer/src/components/native-chat/use-structured-native-chat-pane-commands.test.tsx +++ b/src/renderer/src/components/native-chat/use-structured-native-chat-pane-commands.test.tsx @@ -98,6 +98,8 @@ vi.mock('@/components/ui/dropdown-menu', () => { return props.children }, DropdownMenuLabel: Pass, + DropdownMenuRadioGroup: Pass, + DropdownMenuRadioItem: Pass, DropdownMenuSeparator: () => null, DropdownMenuShortcut: Pass, DropdownMenuSub: Pass, diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.test.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.test.tsx index a6eb8918091..dd668cf3297 100644 --- a/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.test.tsx +++ b/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.test.tsx @@ -8,6 +8,7 @@ import { isTerminalLeafId } from '../../../../shared/stable-pane-id' import { afterEach, describe, expect, it, vi } from 'vitest' import type { ManagedPane, PaneManager } from '@/lib/pane-manager/pane-manager' import type { PtyTransport } from './pty-transport-types' +import type { AppState } from '../../store/types' import TerminalPaneHeaderOverlay from './TerminalPaneHeaderOverlay' import { encodeWorkspaceFilePaths, @@ -30,7 +31,7 @@ vi.mock('@/i18n/i18n', () => ({ ) })) vi.mock('@/store', () => ({ - useAppStore: { + useAppStore: Object.assign((selector: (state: Partial) => unknown) => selector({}), { getState: () => ({ settings: { activeRuntimeEnvironmentId: null }, repos: [{ id: 'repo1', connectionId: null, executionHostId: 'local' }], @@ -39,7 +40,7 @@ vi.mock('@/store', () => ({ folderWorkspaces: [], sshConnectionStates: new Map() }) - } + }) })) vi.mock('./terminal-input-activity', () => ({ recordTerminalUserInputForLeaf: vi.fn() })) vi.mock('./TerminalPaneResumeInChatButton', () => ({ @@ -202,6 +203,7 @@ describe('TerminalPaneHeaderOverlay', () => { true ) expect(container.querySelector('button[aria-label="Show chat view"]')).toBeNull() + expect(container.querySelector('button[aria-label="Chat settings"]')).toBeNull() }) it('keeps Show terminal as the way back from chat view', () => { @@ -212,6 +214,12 @@ describe('TerminalPaneHeaderOverlay', () => { }) expect(container.querySelector('button[aria-label="Show terminal"]')).not.toBeNull() + expect(container.querySelectorAll('button[aria-label="Chat settings"]')).toHaveLength(1) + expect( + container.querySelector( + '.pane-title-bar[data-active-pane] button[aria-label="Chat settings"]' + ) + ).not.toBeNull() expect(container.textContent).not.toContain('Continue in Chat UI') }) diff --git a/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.tsx b/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.tsx index 708dd493aef..752f5262a91 100644 --- a/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.tsx +++ b/src/renderer/src/components/terminal-pane/TerminalPaneHeaderOverlay.tsx @@ -11,6 +11,7 @@ import type { PtyTransport } from './pty-transport-types' import { TerminalPaneHeaderDropSurface } from './TerminalPaneHeaderDropSurface' import { TerminalPaneResumeInChatButton } from './TerminalPaneResumeInChatButton' import { makePaneKey } from '../../../../shared/stable-pane-id' +import { NativeChatSettingsButton } from '../native-chat/NativeChatSettingsButton' export type PaneTitleOverlayRect = { left: number @@ -338,6 +339,7 @@ export default function TerminalPaneHeaderOverlay({ ) : null} + {canShowTerminal && isActivePane ? : null} )} diff --git a/src/renderer/src/i18n/locales/de.json b/src/renderer/src/i18n/locales/de.json index 7c2c12ef080..b59589a62db 100644 --- a/src/renderer/src/i18n/locales/de.json +++ b/src/renderer/src/i18n/locales/de.json @@ -20014,7 +20014,8 @@ "effortPickerFailed": "Die Auswahl des Denkaufwands konnte nicht geöffnet werden.", "modelApplyFailed": "Modell {{value}} konnte nicht angewendet werden.", "effortApplyFailed": "Denkaufwand {{value}} konnte nicht angewendet werden." - } + }, + "settings": "Chat-Einstellungen" }, "tab": { "bar": { diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index 6224f3cb422..9962a7d1be3 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -20425,7 +20425,8 @@ "cancelled": "Orca won't continue this chat automatically.", "scheduled": "Orca will continue this chat at {{time}}.", "cancel": "Don't continue" - } + }, + "settings": "Chat settings" }, "tab": { "bar": { diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json index b7ca5691efc..a484c60ea50 100644 --- a/src/renderer/src/i18n/locales/es.json +++ b/src/renderer/src/i18n/locales/es.json @@ -19845,7 +19845,8 @@ "cancelled": "Orca no continuará este chat automáticamente.", "scheduled": "Orca continuará este chat a las {{time}}.", "cancel": "No continuar" - } + }, + "settings": "Configuración del chat" }, "tab": { "bar": { diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json index 0e5ca9c90a7..3852250e826 100644 --- a/src/renderer/src/i18n/locales/fr.json +++ b/src/renderer/src/i18n/locales/fr.json @@ -20065,7 +20065,8 @@ "cancelled": "Orca ne reprendra pas ce chat automatiquement.", "scheduled": "Orca reprendra ce chat à {{time}}.", "cancel": "Ne pas reprendre" - } + }, + "settings": "Paramètres du chat" }, "tab": { "bar": { diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json index 90976a3102c..722a2aa9a96 100644 --- a/src/renderer/src/i18n/locales/ja.json +++ b/src/renderer/src/i18n/locales/ja.json @@ -19322,7 +19322,8 @@ "cancelled": "Orca はこのチャットを自動的には続けません。", "scheduled": "Orca は {{time}} にこのチャットを続けます。", "cancel": "続けない" - } + }, + "settings": "チャット設定" }, "tab": { "bar": { diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json index 11f35510029..be60a6b871e 100644 --- a/src/renderer/src/i18n/locales/ko.json +++ b/src/renderer/src/i18n/locales/ko.json @@ -19311,7 +19311,8 @@ "cancelled": "Orca가 이 채팅을 자동으로 계속하지 않습니다.", "scheduled": "Orca가 {{time}}에 이 채팅을 계속합니다.", "cancel": "계속하지 않기" - } + }, + "settings": "채팅 설정" }, "tab": { "bar": { diff --git a/src/renderer/src/i18n/locales/pt.json b/src/renderer/src/i18n/locales/pt.json index c0b795bc67f..d8fd6bd0781 100644 --- a/src/renderer/src/i18n/locales/pt.json +++ b/src/renderer/src/i18n/locales/pt.json @@ -20969,7 +20969,8 @@ "effortPickerFailed": "Não foi possível abrir o seletor de esforço.", "modelApplyFailed": "Não foi possível aplicar o modelo {{value}}.", "effortApplyFailed": "Não foi possível aplicar o esforço {{value}}." - } + }, + "settings": "Configurações do chat" }, "tab": { "bar": { diff --git a/src/renderer/src/i18n/locales/ru.json b/src/renderer/src/i18n/locales/ru.json index 0b2075c4583..778087226cb 100644 --- a/src/renderer/src/i18n/locales/ru.json +++ b/src/renderer/src/i18n/locales/ru.json @@ -20682,7 +20682,8 @@ "effortPickerFailed": "Не удалось открыть меню выбора глубины рассуждений.", "modelApplyFailed": "Не удалось применить модель {{value}}.", "effortApplyFailed": "Не удалось применить глубину рассуждений {{value}}." - } + }, + "settings": "Настройки чата" }, "tab": { "bar": { diff --git a/src/renderer/src/i18n/locales/tr.json b/src/renderer/src/i18n/locales/tr.json index 006b1fc541f..21d2fd33933 100644 --- a/src/renderer/src/i18n/locales/tr.json +++ b/src/renderer/src/i18n/locales/tr.json @@ -19998,7 +19998,8 @@ "effortPickerFailed": "Çaba seçici açılamadı.", "modelApplyFailed": "{{value}} modeli uygulanamadı.", "effortApplyFailed": "Çaba düzeyi {{value}} olarak ayarlanamadı." - } + }, + "settings": "Sohbet ayarları" }, "tab": { "bar": { diff --git a/src/renderer/src/i18n/locales/zh-Hant.json b/src/renderer/src/i18n/locales/zh-Hant.json index 91c87a8ac0d..b44d9bc6aec 100644 --- a/src/renderer/src/i18n/locales/zh-Hant.json +++ b/src/renderer/src/i18n/locales/zh-Hant.json @@ -19707,7 +19707,8 @@ "effortPickerFailed": "無法開啟推理強度選擇器。", "modelApplyFailed": "無法套用模型 {{value}}。", "effortApplyFailed": "無法套用推理強度 {{value}}。" - } + }, + "settings": "聊天設定" }, "tab": { "bar": { diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json index a1f761ae532..2c5dc80010a 100644 --- a/src/renderer/src/i18n/locales/zh.json +++ b/src/renderer/src/i18n/locales/zh.json @@ -19277,7 +19277,8 @@ "cancelled": "Orca 不会自动继续此聊天。", "scheduled": "Orca 将在 {{time}} 继续此聊天。", "cancel": "不要继续" - } + }, + "settings": "聊天设置" }, "tab": { "bar": {