fix: persist context bar settings across restarts

src/renderer/App.test.tsx

@@ -2,6 +2,17 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
 import { render, waitFor } from '@testing-library/react'
 import App from './App'
 import { useUpdaterStore } from '@/stores/updater-store'
+import { CONTEXT_BAR_SETTINGS_KEY } from '@/types/settings'
+
+const { mockContextBarSettingsRead } = vi.hoisted(() => ({
+  mockContextBarSettingsRead: vi.fn()
+}))
+
+vi.mock('./hooks/use-context-bar-settings', () => ({
+  useContextBarSettings: () => {
+    void mockContextBarSettingsRead(CONTEXT_BAR_SETTINGS_KEY)
+  }
+}))
 
 const mockCheckForUpdates = vi.fn(async () => {})
 const mockInitializeUpdater = vi.fn(async () => {})
@@ -32,7 +43,8 @@ const mockApi = {
     saveProjects: vi.fn(),
     getHomeDirectory: vi.fn(() => Promise.resolve({ success: true, data: '/home/user' })),
     read: vi.fn(() => Promise.resolve({ success: true, data: null })),
-    writeDebounced: vi.fn(() => Promise.resolve({ success: true, data: undefined }))
+    writeDebounced: vi.fn(() => Promise.resolve({ success: true, data: undefined })),
+    flushPendingWrites: vi.fn(() => Promise.resolve({ success: true, data: undefined }))
   },
   updater: {
     checkForUpdates: vi.fn(() => Promise.resolve({ success: true, data: null })),
@@ -107,6 +119,14 @@ describe('App Routes', () => {
     // Check for presence of rendered content (indicates route matched)
     expect(document.body.innerHTML).toBeTruthy()
   })
+
+  it('loads context bar settings on mount', async () => {
+    render(<App />)
+
+    await waitFor(() => {
+      expect(mockContextBarSettingsRead).toHaveBeenCalledWith(CONTEXT_BAR_SETTINGS_KEY)
+    })
+  })
 })
 
 describe('App Updater Integration', () => {

src/renderer/TauriApp.test.tsx

@@ -0,0 +1,118 @@
+import { beforeEach, describe, expect, it, vi, afterEach } from 'vitest'
+import { render, waitFor } from '@testing-library/react'
+import TauriApp from './TauriApp'
+import { CONTEXT_BAR_SETTINGS_KEY } from '@/types/settings'
+
+const { mockPersistenceRead } = vi.hoisted(() => ({
+  mockPersistenceRead: vi.fn()
+}))
+
+vi.mock('@/lib/api', () => ({
+  persistenceApi: {
+    read: mockPersistenceRead
+  }
+}))
+
+vi.mock('@/hooks/use-window-state', () => ({
+  useWindowState: () => false
+}))
+
+vi.mock('./layouts/WorkspaceLayout', () => ({
+  default: () => <div>Workspace Layout</div>
+}))
+
+vi.mock('./pages/WorkspaceDashboard', () => ({
+  default: () => null
+}))
+
+vi.mock('./pages/ProjectSettings', () => ({
+  default: () => null
+}))
+
+vi.mock('./pages/AppPreferences', () => ({
+  default: () => null
+}))
+
+vi.mock('./pages/WorkspaceSnapshots', () => ({
+  default: () => null
+}))
+
+vi.mock('./pages/NotFound', () => ({
+  default: () => null
+}))
+
+vi.mock('./hooks/useTerminalAutoSave', () => ({
+  useTerminalAutoSave: () => undefined
+}))
+
+vi.mock('./hooks/use-terminal-restore', () => ({
+  useTerminalRestore: () => undefined
+}))
+
+vi.mock('./hooks/use-cwd', () => ({
+  useCwd: () => undefined
+}))
+
+vi.mock('./hooks/use-git-branch', () => ({
+  useGitBranch: () => undefined
+}))
+
+vi.mock('./hooks/use-git-status', () => ({
+  useGitStatus: () => undefined
+}))
+
+vi.mock('./hooks/use-exit-code', () => ({
+  useExitCode: () => undefined
+}))
+
+vi.mock('./hooks/use-app-settings', () => ({
+  useAppSettingsLoader: () => undefined
+}))
+
+vi.mock('./hooks/use-keyboard-shortcuts', () => ({
+  useKeyboardShortcutsLoader: () => undefined
+}))
+
+vi.mock('./hooks/use-projects-persistence', () => ({
+  useProjectsLoader: () => undefined,
+  useProjectsAutoSave: () => undefined
+}))
+
+vi.mock('./hooks/use-menu-updater-listener', () => ({
+  useMenuUpdaterListener: () => undefined
+}))
+
+vi.mock('./hooks/use-updater', () => ({
+  useUpdateCheck: () => undefined
+}))
+
+vi.mock('./components/UpdateAvailableToast', () => ({
+  useUpdateToast: () => undefined
+}))
+
+vi.mock('./hooks/use-visibility-state', () => ({
+  useVisibilityState: () => undefined
+}))
+
+beforeEach(() => {
+  vi.clearAllMocks()
+  mockPersistenceRead.mockResolvedValue({
+    success: false,
+    error: 'Key not found',
+    code: 'KEY_NOT_FOUND'
+  })
+})
+
+afterEach(() => {
+  vi.unstubAllGlobals()
+})
+
+describe('TauriApp', () => {
+  it('loads context bar settings on mount', async () => {
+    render(<TauriApp />)
+
+    await waitFor(() => {
+      expect(mockPersistenceRead).toHaveBeenCalledWith(CONTEXT_BAR_SETTINGS_KEY)
+    })
+  })
+})

src/renderer/components/ContextBarSettingsPopover.test.tsx

@@ -0,0 +1,58 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { fireEvent, render, screen, within } from '@testing-library/react'
+import { ContextBarSettingsPopover } from './ContextBarSettingsPopover'
+import { useContextBarSettingsStore } from '@/stores/context-bar-settings-store'
+import { DEFAULT_CONTEXT_BAR_SETTINGS } from '@/types/settings'
+
+const { mockUpdateContextBarSetting } = vi.hoisted(() => ({
+  mockUpdateContextBarSetting: vi.fn()
+}))
+
+vi.mock('@/hooks/use-context-bar-settings', () => ({
+  useUpdateContextBarSetting: () => mockUpdateContextBarSetting
+}))
+
+describe('ContextBarSettingsPopover', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    useContextBarSettingsStore.setState({
+      settings: { ...DEFAULT_CONTEXT_BAR_SETTINGS },
+      isLoaded: true
+    })
+  })
+
+  it('renders the context bar settings popover trigger', () => {
+    render(<ContextBarSettingsPopover />)
+
+    expect(
+      screen.getByRole('button', { name: 'Context bar settings' })
+    ).toBeInTheDocument()
+  })
+
+  it('opens the popover and dispatches updates for each switch', () => {
+    render(<ContextBarSettingsPopover />)
+
+    fireEvent.click(screen.getByRole('button', { name: 'Context bar settings' }))
+
+    expect(screen.getByText('Show in Context Bar')).toBeInTheDocument()
+
+    const toggleCases: Array<[string, string]> = [
+      ['Git Branch', 'showGitBranch'],
+      ['Git Status', 'showGitStatus'],
+      ['Working Directory', 'showWorkingDirectory'],
+      ['Exit Code', 'showExitCode']
+    ]
+
+    toggleCases.forEach(([label, key]) => {
+      const row = screen.getByText(label).closest('div')
+      expect(row).not.toBeNull()
+
+      const toggle = within(row as HTMLElement).getByRole('switch')
+      fireEvent.click(toggle)
+
+      expect(mockUpdateContextBarSetting).toHaveBeenCalledWith(key)
+    })
+
+    expect(mockUpdateContextBarSetting).toHaveBeenCalledTimes(toggleCases.length)
+  })
+})

src/renderer/components/ContextBarSettingsPopover.tsx

@@ -2,9 +2,8 @@ import { Settings } from 'lucide-react'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
 import { Switch } from '@/components/ui/switch'
 import { useContextBarSettingsStore } from '@/stores/context-bar-settings-store'
-import { CONTEXT_BAR_SETTINGS_KEY } from '@/types/settings'
+import { useUpdateContextBarSetting } from '@/hooks/use-context-bar-settings'
 import type { ContextBarSettings } from '@/types/settings'
-import { persistenceApi } from '@/lib/api'
 
 interface SettingToggleProps {
   label: string
@@ -23,13 +22,10 @@ function SettingToggle({ label, checked, onCheckedChange }: SettingToggleProps):
 
 export function ContextBarSettingsPopover(): React.JSX.Element {
   const settings = useContextBarSettingsStore((state) => state.settings)
-  const toggleElement = useContextBarSettingsStore((state) => state.toggleElement)
+  const updateContextBarSetting = useUpdateContextBarSetting()
 
   const handleToggle = (element: keyof ContextBarSettings): void => {
-    toggleElement(element)
-    // Persist to disk with debounce
-    const newSettings = { ...settings, [element]: !settings[element] }
-    void persistenceApi.writeDebounced(CONTEXT_BAR_SETTINGS_KEY, newSettings)
+    void updateContextBarSetting(element)
   }
 
   return (

src/renderer/hooks/use-context-bar-settings.test.ts

@@ -0,0 +1,141 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { act, renderHook, waitFor } from '@testing-library/react'
+import {
+  useContextBarSettings,
+  useUpdateContextBarSetting
+} from './use-context-bar-settings'
+import { useContextBarSettingsStore } from '@/stores/context-bar-settings-store'
+import {
+  CONTEXT_BAR_SETTINGS_KEY,
+  DEFAULT_CONTEXT_BAR_SETTINGS,
+  type ContextBarSettings
+} from '@/types/settings'
+
+const { mockPersistenceRead, mockPersistenceWriteDebounced } = vi.hoisted(() => ({
+  mockPersistenceRead: vi.fn(),
+  mockPersistenceWriteDebounced: vi.fn()
+}))
+
+vi.mock('@/lib/api', () => ({
+  persistenceApi: {
+    read: mockPersistenceRead,
+    writeDebounced: mockPersistenceWriteDebounced
+  }
+}))
+
+describe('useContextBarSettings', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    useContextBarSettingsStore.setState({
+      settings: { ...DEFAULT_CONTEXT_BAR_SETTINGS },
+      isLoaded: false
+    })
+
+    mockPersistenceRead.mockResolvedValue({
+      success: false,
+      error: 'Key not found',
+      code: 'KEY_NOT_FOUND'
+    })
+    mockPersistenceWriteDebounced.mockResolvedValue({ success: true, data: undefined })
+  })
+
+  it('restores persisted settings on startup', async () => {
+    const persistedSettings: ContextBarSettings = {
+      showGitBranch: false,
+      showGitStatus: false,
+      showWorkingDirectory: true,
+      showExitCode: false
+    }
+
+    mockPersistenceRead.mockResolvedValue({ success: true, data: persistedSettings })
+
+    renderHook(() => useContextBarSettings())
+
+    await waitFor(() => {
+      expect(useContextBarSettingsStore.getState().settings).toEqual(persistedSettings)
+      expect(useContextBarSettingsStore.getState().isLoaded).toBe(true)
+    })
+
+    expect(mockPersistenceRead).toHaveBeenCalledWith(CONTEXT_BAR_SETTINGS_KEY)
+  })
+
+  it('keeps defaults when no persisted key exists', async () => {
+    renderHook(() => useContextBarSettings())
+
+    await waitFor(() => {
+      expect(useContextBarSettingsStore.getState().settings).toEqual(
+        DEFAULT_CONTEXT_BAR_SETTINGS
+      )
+      expect(useContextBarSettingsStore.getState().isLoaded).toBe(true)
+    })
+  })
+
+  it('keeps defaults when loading settings throws', async () => {
+    const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined)
+    mockPersistenceRead.mockRejectedValue(new Error('read failed'))
+
+    renderHook(() => useContextBarSettings())
+
+    await waitFor(() => {
+      expect(useContextBarSettingsStore.getState().settings).toEqual(
+        DEFAULT_CONTEXT_BAR_SETTINGS
+      )
+      expect(useContextBarSettingsStore.getState().isLoaded).toBe(true)
+    })
+
+    expect(consoleErrorSpy).toHaveBeenCalledWith('Failed to load context bar settings')
+    consoleErrorSpy.mockRestore()
+  })
+
+  it('merges partial persisted settings with defaults', async () => {
+    mockPersistenceRead.mockResolvedValue({
+      success: true,
+      data: {
+        showGitBranch: false,
+        showExitCode: false
+      } as ContextBarSettings
+    })
+
+    renderHook(() => useContextBarSettings())
+
+    await waitFor(() => {
+      expect(useContextBarSettingsStore.getState().settings).toEqual({
+        ...DEFAULT_CONTEXT_BAR_SETTINGS,
+        showGitBranch: false,
+        showExitCode: false
+      })
+    })
+  })
+})
+
+describe('useUpdateContextBarSetting', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    useContextBarSettingsStore.setState({
+      settings: { ...DEFAULT_CONTEXT_BAR_SETTINGS },
+      isLoaded: true
+    })
+
+    mockPersistenceWriteDebounced.mockResolvedValue({ success: true, data: undefined })
+  })
+
+  it('updates the selected setting and persists the latest full snapshot', async () => {
+    const { result } = renderHook(() => useUpdateContextBarSetting())
+
+    await act(async () => {
+      await result.current('showGitStatus')
+    })
+
+    expect(useContextBarSettingsStore.getState().settings).toEqual({
+      ...DEFAULT_CONTEXT_BAR_SETTINGS,
+      showGitStatus: false
+    })
+    expect(mockPersistenceWriteDebounced).toHaveBeenCalledWith(
+      CONTEXT_BAR_SETTINGS_KEY,
+      {
+        ...DEFAULT_CONTEXT_BAR_SETTINGS,
+        showGitStatus: false
+      }
+    )
+  })
+})