root/goodbuddy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update workbar tab titles when switching language

Browse Source 
Derive application and default terminal titles from the current locale while preserving renamed and unmarked legacy terminal titles. Add locale-switch and layout-restoration regression coverage.

File-level scope also includes existing browser popup selection and close handling in the sidebar, its regression test, and workbar documentation updates.

Validation: 74 focused tests passed; typecheck and lint passed. Full test runs timed out with failures in settings navigation, Agent packaging, and database migration tests. Electron verification remains outstanding.

Release note: Workbar application and new default terminal titles now follow the interface language, including after restoring a layout; custom and legacy terminal names are preserved.
This commit is contained in:
mesalogo
2026-09-15 23:21:51 +08:00
parent a383b2d11f
commit b16b0d10e7
5 changed files with 236 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/src/RightAssistantSidebar.resize.test.tsx
+149 -11
View File
@@ -11,6 +11,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import type { TerminalSnapshot } from '../../shared/terminal-contracts'
import { workbarLayoutPreferencesSchema } from '../../shared/workbar-contracts'
import { DEFAULT_WORKBAR_INSTANCES } from './WorkbarShell'
import i18n from './i18n'
import type {
AssistantProject,
AssistantTask,
@@ -31,22 +32,34 @@ import {
} from './RightAssistantSidebar'
vi.mock('./TerminalPanel', () => ({
TerminalPanel: ({ onSessionChange }: {
TerminalPanel: ({ onSessionChange, onRename, title }: {
onSessionChange?: (snapshot: TerminalSnapshot) => void
onRename: (title: string) => void
title: string
}) => (
<button
onClick={() => onSessionChange?.({
sessionId: '00000000-0000-4000-8000-000000000498',
state: 'running'
} as TerminalSnapshot)}
type="button"
>
Start test terminal
</button>
<>
<input
aria-label="Test terminal name"
onChange={(event) => onRename(event.target.value)}
value={title}
/>
<button
onClick={() => onSessionChange?.({
sessionId: '00000000-0000-4000-8000-000000000498',
state: 'running'
} as TerminalSnapshot)}
type="button"
>
Start test terminal
</button>
</>
)
}))
afterEach(cleanup)
afterEach(async () => {
cleanup()
await i18n.changeLanguage('zh-CN')
})
const firstBrowserTabId =
'00000000-0000-4000-8000-000000000401' as BrowserTabId
@@ -224,6 +237,100 @@ function renderSidebar(options: Parameters<typeof sidebarElement>[0] = {}): HTML
})
}
describe('RightAssistantSidebar tab titles', () => {
it('updates application titles in place when the locale changes without rewriting the layout', async () => {
renderSidebar()
const initialTabs = screen.getAllByRole('tab')
const savedLayout = localStorage.getItem('goodbuddy.workbar-layout.v1')
expect(initialTabs.map((tab) => tab.textContent)).toEqual([
'任务中心', '工作区', '浏览器 · 未绑定会话', '成果'
])
await act(async () => { await i18n.changeLanguage('en-US') })
expect(screen.getAllByRole('tab').map((tab) => tab.textContent)).toEqual([
'Task center', 'Files', '浏览器 · 未绑定会话', 'Results'
])
expect(screen.getAllByRole('tab')).toEqual(initialTabs)
expect(screen.getByRole('tab', { name: 'Task center' })).toHaveAttribute('aria-selected', 'true')
expect(localStorage.getItem('goodbuddy.workbar-layout.v1')).toBe(savedLayout)
await act(async () => { await i18n.changeLanguage('zh-CN') })
expect(screen.getAllByRole('tab').map((tab) => tab.textContent)).toEqual([
'任务中心', '工作区', '浏览器 · 未绑定会话', '成果'
])
})
it('persists default terminal numbers and restores titles using the current locale', async () => {
const view = render(sidebarElement())
for (const number of [1, 2]) {
fireEvent.click(screen.getByRole('button', { name: '打开工作栏应用' }))
fireEvent.click(screen.getByText('终端', { selector: 'strong' }).closest('button')!)
expect(await screen.findByRole('tab', { name: `终端 ${number}` })).toBeInTheDocument()
}
const savedLayout = workbarLayoutPreferencesSchema.parse(
JSON.parse(localStorage.getItem('goodbuddy.workbar-layout.v1')!)
)
expect(savedLayout.instances.filter((instance) => instance.appId === 'terminal'))
.toEqual([1, 2].map((number) => expect.objectContaining({
title: `终端 ${number}`, defaultTitleNumber: number,
targetRef: { type: 'project', projectId: currentProject.id }
})))
view.unmount()
await i18n.changeLanguage('en-US')
render(sidebarElement())
expect(screen.getByRole('tab', { name: 'Terminal 1' })).toBeInTheDocument()
expect(screen.getByRole('tab', { name: 'Terminal 2' })).toHaveAttribute('aria-selected', 'true')
expect(await screen.findByRole('textbox', { name: 'Test terminal name' })).toHaveValue('Terminal 2')
for (const name of ['Task center', 'Files', 'Results']) {
expect(screen.getByRole('tab', { name })).toBeInTheDocument()
}
await act(async () => { await i18n.changeLanguage('zh-CN') })
expect(screen.getByRole('tab', { name: '终端 2' })).toHaveAttribute('aria-selected', 'true')
expect(screen.getByRole('textbox', { name: 'Test terminal name' })).toHaveValue('终端 2')
})
it('clears the default marker on rename and preserves a default-looking custom name across locale changes and restore', async () => {
const view = render(sidebarElement())
fireEvent.click(screen.getByRole('button', { name: '打开工作栏应用' }))
fireEvent.click(screen.getByText('终端', { selector: 'strong' }).closest('button')!)
const input = await screen.findByRole('textbox', { name: 'Test terminal name' })
fireEvent.change(input, { target: { value: 'Terminal 99' } })
const savedLayout = workbarLayoutPreferencesSchema.parse(
JSON.parse(localStorage.getItem('goodbuddy.workbar-layout.v1')!)
)
const terminal = savedLayout.instances.find((instance) => instance.appId === 'terminal')!
expect(terminal.title).toBe('Terminal 99')
expect(terminal).not.toHaveProperty('defaultTitleNumber')
await act(async () => { await i18n.changeLanguage('en-US') })
expect(screen.getByRole('tab', { name: 'Terminal 99' })).toBeInTheDocument()
view.unmount()
await i18n.changeLanguage('zh-CN')
render(sidebarElement())
expect(screen.getByRole('tab', { name: 'Terminal 99' })).toHaveAttribute('aria-selected', 'true')
expect(await screen.findByRole('textbox', { name: 'Test terminal name' })).toHaveValue('Terminal 99')
})
it.each(['终端 1', 'Terminal 2', '部署日志'])('preserves an unmarked legacy terminal title: %s', async (title) => {
const terminalId = '10000000-0000-4000-8000-000000000009'
localStorage.setItem('goodbuddy.workbar-layout.v1', JSON.stringify({
instances: [...DEFAULT_WORKBAR_INSTANCES, {
id: terminalId, appId: 'terminal', title, targetRef: { type: 'local' }
}],
activeInstanceId: terminalId, expanded: true, dock: 'right', widthRatio: 0.3
}))
renderSidebar()
expect(await screen.findByRole('textbox', { name: 'Test terminal name' })).toHaveValue(title)
await act(async () => { await i18n.changeLanguage('en-US') })
expect(screen.getByRole('tab', { name: title })).toHaveAttribute('aria-selected', 'true')
expect(screen.getByRole('textbox', { name: 'Test terminal name' })).toHaveValue(title)
const savedLayout = workbarLayoutPreferencesSchema.parse(
JSON.parse(localStorage.getItem('goodbuddy.workbar-layout.v1')!)
)
expect(savedLayout.instances.find((instance) => instance.id === terminalId))
.toEqual({ id: terminalId, appId: 'terminal', title, targetRef: { type: 'local' } })
})
})
describe('RightAssistantSidebar resizing', () => {
it('resizes with pointer capture and preserves compact pane minima', () => {
const sidebar = renderSidebar()
@@ -1172,6 +1279,37 @@ describe('RightAssistantSidebar resizing', () => {
expect(screen.queryByRole('tab', { name: '浏览器 1 · conversation-a' })).not.toBeInTheDocument()
})
it('selects a visible opener popup across conversation switches and removes its script-closed instance', async () => {
const conversationId = 'popup-owner'
const view = render(sidebarElement({ tab: 'browser', activeConversationId: conversationId }))
await waitFor(() => expect(browserApi.createTab).toHaveBeenCalledOnce())
const popup: BrowserLiveState = {
...browserSummary(conversationId, secondBrowserTabId, false),
workbarInstanceId: secondBrowserTabId, openerTabId: firstBrowserTabId,
sessionActive: true, url: 'https://popup.example/'
}
view.rerender(sidebarElement({
tab: 'browser', activeConversationId: 'another-conversation',
browserStates: { [conversationId]: { [secondBrowserTabId]: popup } }
}))
await waitFor(() => expect(screen.getByRole('textbox', { name: '浏览器地址' })).toHaveValue('https://popup.example/'))
expect(browserApi.createTab).toHaveBeenCalledOnce()
const stopped: BrowserLiveState = { ...popup, status: 'stopped', sessionActive: false }
act(() => {
for (const listener of browserStateListeners) listener(stopped)
view.rerender(sidebarElement({
tab: 'browser', activeConversationId: 'another-conversation',
browserStates: { [conversationId]: { [secondBrowserTabId]: stopped } }
}))
})
await waitFor(() => {
const saved = JSON.parse(localStorage.getItem('goodbuddy.workbar-layout.v1')!)
expect(saved.instances.some((instance: { id: string }) => instance.id === secondBrowserTabId)).toBe(false)
})
expect(browserApi.createTab).toHaveBeenCalledOnce()
expect(browserApi.closeTab).not.toHaveBeenCalled()
})
it('restores a browser by stable ownership and releases only its viewport lease', async () => {
const conversationId = 'conversation-restored'
const workbarInstanceId = '10000000-0000-4000-8000-000000000003'
src/renderer/src/RightAssistantSidebar.tsx
+41 -20
View File
@@ -701,32 +701,18 @@ export function RightAssistantSidebar({
}),
[t, tabs]
)
const defaultInstances = useMemo(
() =>
DEFAULT_WORKBAR_INSTANCES.map((instance) => ({
...instance,
title:
localizedAppDefinitions.find(
(definition) => definition.id === instance.appId
)?.label ?? instance.title
})),
[localizedAppDefinitions]
)
const [workbarInstances, setWorkbarInstances] = useState<
WorkbarTabInstance[]
>(() => {
const instances = (initialLayout?.instances ?? defaultInstances).map(
const instances = (initialLayout?.instances ?? DEFAULT_WORKBAR_INSTANCES).map(
(instance) => {
if (instance.appId === 'terminal') {
if (instance.appId !== 'browser') {
return instance
}
const label =
localizedAppDefinitions.find(
(definition) => definition.id === instance.appId
)?.label ?? instance.title
if (instance.appId !== 'browser') {
return { ...instance, title: label }
}
const conversationId =
instance.targetRef?.type === 'conversation'
? instance.targetRef.conversationId
@@ -751,6 +737,26 @@ export function RightAssistantSidebar({
)
return instances
})
const localizedWorkbarInstances = useMemo(
() => workbarInstances.map((instance) => {
if (
instance.appId === 'browser' ||
(instance.appId === 'terminal' && instance.defaultTitleNumber === undefined)
) {
return instance
}
const label = localizedAppDefinitions.find(
(definition) => definition.id === instance.appId
)?.label ?? instance.title
return {
...instance,
title: instance.appId === 'terminal'
? `${label} ${instance.defaultTitleNumber}`
: label
}
}),
[localizedAppDefinitions, workbarInstances]
)
const [activeWorkbarInstanceId, setActiveWorkbarInstanceId] =
useState<string | null>(
() =>
@@ -1119,6 +1125,9 @@ export function RightAssistantSidebar({
: request.appId === 'browser'
? browserTitle()
: definition.label,
...(request.appId === 'terminal'
? { defaultTitleNumber: sameTargetTerminals + 1 }
: {}),
...(request.targetRef || conversationTarget
? { targetRef: request.targetRef ?? conversationTarget }
: {})
@@ -1206,6 +1215,12 @@ export function RightAssistantSidebar({
useEffect(() => window.goodbuddy.browser?.onState?.((state) => {
if (state.status !== 'stopped') return
if (state.openerTabId && state.workbarInstanceId) {
setWorkbarInstances((current) => current.filter((instance) => instance.id !== state.workbarInstanceId))
const openerInstanceId = Object.entries(browserTabIdsRef.current)
.find(([, tabId]) => tabId === state.openerTabId)?.[0]
setActiveWorkbarInstanceId((current) => current === state.workbarInstanceId ? openerInstanceId ?? null : current)
}
const next = { ...browserTabIdsRef.current }
let changed = false
for (const [instanceId, tabId] of Object.entries(next)) {
@@ -1259,7 +1274,13 @@ export function RightAssistantSidebar({
.filter((candidate) => !current.some((instance) => instance.id === candidate.id))
.slice(0, Math.max(0, WORKBAR_LIMITS.maximumOpenInstances - current.length))
])
const requested = additions.find((instance) =>
const popup = additions.findLast((instance) => liveTabs.some((state) =>
state.workbarInstanceId === instance.id &&
state.openerTabId &&
activeWorkbarInstanceId &&
state.openerTabId === nextBindings[activeWorkbarInstanceId]
))
const requested = popup ?? additions.find((instance) =>
instance.targetRef?.type === 'conversation' &&
instance.targetRef.conversationId === activeConversationId
)
@@ -1267,7 +1288,7 @@ export function RightAssistantSidebar({
setActiveWorkbarInstanceId(requested.id)
}
}
}, [activeConversationId, browserStates, conversationTitles, tab, t, workbarInstances])
}, [activeConversationId, activeWorkbarInstanceId, browserStates, conversationTitles, tab, t, workbarInstances])
const removeWorkbarInstance = useCallback(
(instanceId: string): void => {
@@ -1778,7 +1799,7 @@ export function RightAssistantSidebar({
<WorkbarShell
activeInstanceId={activeWorkbarInstanceId}
appDefinitions={localizedAppDefinitions}
instances={workbarInstances}
instances={localizedWorkbarInstances}
onActiveInstanceChange={updateActiveWorkbarInstance}
onCloseInstance={requestCloseWorkbarInstance}
onCreateInstance={createWorkbarInstance}
@@ -1828,7 +1849,7 @@ export function RightAssistantSidebar({
setWorkbarInstances((current) =>
current.map((candidate) =>
candidate.id === instance.id
? { ...candidate, title }
? { ...candidate, title, defaultTitleNumber: undefined }
: candidate
)
)
src/shared/workbar-contracts.ts
+1
View File
@@ -199,6 +199,7 @@ export const workbarTabInstanceSchema = z
id: z.string().uuid(),
appId: workbarAppIdSchema,
title: boundedUtf8TextSchema(WORKBAR_LIMITS.maximumTitleBytes),
defaultTitleNumber: z.number().int().positive().optional(),
targetRef: workbarTargetRefSchema.optional()
})
.strict()