From b488ff3c2b26f43b7c2570d30f8809e9631b160c Mon Sep 17 00:00:00 2001
From: jacob314 <jacob314@gmail.com>
Date: Wed, 4 Mar 2026 19:59:25 -0800
Subject: [PATCH 1/3] Code review comments as a pr

---
 .../cli/src/ui/components/Footer.test.tsx     |  37 +-
 packages/cli/src/ui/components/Footer.tsx     |  63 ++-
 .../ui/components/FooterConfigDialog.test.tsx |  62 ++-
 .../src/ui/components/FooterConfigDialog.tsx  | 395 +++++++++---------
 .../__snapshots__/Footer.test.tsx.snap        |  24 +-
 ...ts-the-active-item-in-the-preview.snap.svg | 156 +++++++
 ...s-correctly-with-default-settings.snap.svg | 151 +++++++
 .../FooterConfigDialog.test.tsx.snap          | 125 +++++-
 .../components/shared/BaseSelectionList.tsx   |   4 +-
 9 files changed, 743 insertions(+), 274 deletions(-)
 create mode 100644 packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-highlights-the-active-item-in-the-preview.snap.svg
 create mode 100644 packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-renders-correctly-with-default-settings.snap.svg

diff --git a/packages/cli/src/ui/components/Footer.test.tsx b/packages/cli/src/ui/components/Footer.test.tsx
index 667168dbc5c..21aa6ee5c05 100644
--- a/packages/cli/src/ui/components/Footer.test.tsx
+++ b/packages/cli/src/ui/components/Footer.test.tsx
@@ -132,9 +132,7 @@ describe('<Footer />', () => {
       const output = lastFrame();
       expect(output).toBeDefined();
       // Should contain some part of the path, likely shortened
-      expect(output).toContain(
-        path.join('directories', 'to', 'make', 'it', 'long'),
-      );
+      expect(output).toContain(path.join('make', 'it'));
       unmount();
     });
 
@@ -149,9 +147,38 @@ describe('<Footer />', () => {
       await waitUntilReady();
       const output = lastFrame();
       expect(output).toBeDefined();
-      expect(output).toContain(
-        path.join('directories', 'to', 'make', 'it', 'long'),
+      expect(output).toContain(path.join('make', 'it'));
+      unmount();
+    });
+
+    it('should not truncate high-priority items on narrow terminals (regression)', async () => {
+      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+        <Footer />,
+        {
+          width: 60,
+          uiState: {
+            sessionStats: mockSessionStats,
+          },
+          settings: createMockSettings({
+            general: {
+              vimMode: true,
+            },
+            ui: {
+              footer: {
+                showLabels: true,
+                items: ['workspace', 'model-name'],
+              },
+            },
+          }),
+        },
       );
+      await waitUntilReady();
+      const output = lastFrame();
+      // [INSERT] is high priority and should be fully visible
+      // (Note: VimModeProvider defaults to 'INSERT' mode when enabled)
+      expect(output).toContain('[INSERT]');
+      // Other items should be present but might be shortened
+      expect(output).toContain('gemini-pro');
       unmount();
     });
   });
diff --git a/packages/cli/src/ui/components/Footer.tsx b/packages/cli/src/ui/components/Footer.tsx
index 83a7c059b9f..e5a1f9e8b60 100644
--- a/packages/cli/src/ui/components/Footer.tsx
+++ b/packages/cli/src/ui/components/Footer.tsx
@@ -103,6 +103,9 @@ export interface FooterRowItem {
   key: string;
   header: string;
   element: React.ReactNode;
+  flexGrow?: number;
+  flexShrink?: number;
+  isFocused?: boolean;
 }
 
 const COLUMN_GAP = 3;
@@ -123,10 +126,20 @@ export const FooterRow: React.FC<{
     }
 
     elements.push(
-      <Box key={item.key} flexDirection="column">
+      <Box
+        key={item.key}
+        flexDirection="column"
+        flexGrow={item.flexGrow ?? 0}
+        flexShrink={item.flexShrink ?? 1}
+        backgroundColor={item.isFocused ? theme.background.focus : undefined}
+      >
         {showLabels && (
           <Box height={1}>
-            <Text color={theme.ui.comment}>{item.header}</Text>
+            <Text
+              color={item.isFocused ? theme.text.primary : theme.ui.comment}
+            >
+              {item.header}
+            </Text>
           </Box>
         )}
         <Box height={1}>{item.element}</Box>
@@ -138,6 +151,7 @@ export const FooterRow: React.FC<{
     <Box
       flexDirection="row"
       flexWrap="nowrap"
+      width="100%"
       columnGap={showLabels ? COLUMN_GAP : 0}
     >
       {elements}
@@ -408,41 +422,50 @@ export const Footer: React.FC = () => {
   }
 
   // --- Width Fitting Logic ---
-  let currentWidth = 2; // Initial padding
   const columnsToRender: FooterColumn[] = [];
   let droppedAny = false;
+  let currentUsedWidth = 2; // Initial padding
 
-  for (let i = 0; i < potentialColumns.length; i++) {
-    const col = potentialColumns[i];
-    const gap = columnsToRender.length > 0 ? (showLabels ? COLUMN_GAP : 3) : 0; // Use 3 for dot separator width
+  for (const col of potentialColumns) {
+    const gap = columnsToRender.length > 0 ? (showLabels ? COLUMN_GAP : 3) : 0;
     const budgetWidth = col.id === 'workspace' ? 20 : col.width;
 
     if (
       col.isHighPriority ||
-      currentWidth + gap + budgetWidth <= terminalWidth - 2
+      currentUsedWidth + gap + budgetWidth <= terminalWidth - 2
     ) {
       columnsToRender.push(col);
-      currentWidth += gap + budgetWidth;
+      currentUsedWidth += gap + budgetWidth;
     } else {
       droppedAny = true;
     }
   }
 
-  const totalBudgeted = columnsToRender.reduce(
-    (sum, c, idx) =>
-      sum +
-      (c.id === 'workspace' ? 20 : c.width) +
-      (idx > 0 ? (showLabels ? COLUMN_GAP : 3) : 0),
-    2,
-  );
-  const excessSpace = Math.max(0, terminalWidth - totalBudgeted);
-
   const rowItems: FooterRowItem[] = columnsToRender.map((col) => {
-    const maxWidth = col.id === 'workspace' ? 20 + excessSpace : col.width;
+    const isWorkspace = col.id === 'workspace';
+
+    // Calculate exact space available for growth to prevent over-estimation truncation
+    const otherItemsWidth = columnsToRender
+      .filter((c) => c.id !== 'workspace')
+      .reduce((sum, c) => sum + c.width, 0);
+    const numItems = columnsToRender.length + (droppedAny ? 1 : 0);
+    const numGaps = numItems > 1 ? numItems - 1 : 0;
+    const gapsWidth = numGaps * (showLabels ? COLUMN_GAP : 3);
+    const ellipsisWidth = droppedAny ? 1 : 0;
+
+    const availableForWorkspace = Math.max(
+      20,
+      terminalWidth - 2 - gapsWidth - otherItemsWidth - ellipsisWidth,
+    );
+
+    const estimatedWidth = isWorkspace ? availableForWorkspace : col.width;
+
     return {
       key: col.id,
       header: col.header,
-      element: col.element(maxWidth),
+      element: col.element(estimatedWidth),
+      flexGrow: isWorkspace ? 1 : 0,
+      flexShrink: isWorkspace ? 1 : 0,
     };
   });
 
@@ -451,6 +474,8 @@ export const Footer: React.FC = () => {
       key: 'ellipsis',
       header: '',
       element: <Text color={theme.ui.comment}>…</Text>,
+      flexGrow: 0,
+      flexShrink: 0,
     });
   }
 
diff --git a/packages/cli/src/ui/components/FooterConfigDialog.test.tsx b/packages/cli/src/ui/components/FooterConfigDialog.test.tsx
index c8b0b936590..e5a2364377b 100644
--- a/packages/cli/src/ui/components/FooterConfigDialog.test.tsx
+++ b/packages/cli/src/ui/components/FooterConfigDialog.test.tsx
@@ -24,13 +24,14 @@ describe('<FooterConfigDialog />', () => {
 
   it('renders correctly with default settings', async () => {
     const settings = createMockSettings();
-    const { lastFrame, waitUntilReady } = renderWithProviders(
+    const renderResult = renderWithProviders(
       <FooterConfigDialog onClose={mockOnClose} />,
       { settings },
     );
 
-    await waitUntilReady();
-    expect(lastFrame()).toMatchSnapshot();
+    await renderResult.waitUntilReady();
+    expect(renderResult.lastFrame()).toMatchSnapshot();
+    await expect(renderResult).toMatchSvgSnapshot();
   });
 
   it('toggles an item when enter is pressed', async () => {
@@ -69,7 +70,7 @@ describe('<FooterConfigDialog />', () => {
     // Initial order: workspace, branch, ...
     const output = lastFrame();
     const cwdIdx = output.indexOf('] workspace');
-    const branchIdx = output.indexOf('] git-branch');
+    const branchIdx = output.indexOf('] branch');
     expect(cwdIdx).toBeGreaterThan(-1);
     expect(branchIdx).toBeGreaterThan(-1);
     expect(cwdIdx).toBeLessThan(branchIdx);
@@ -82,7 +83,7 @@ describe('<FooterConfigDialog />', () => {
     await waitFor(() => {
       const outputAfter = lastFrame();
       const cwdIdxAfter = outputAfter.indexOf('] workspace');
-      const branchIdxAfter = outputAfter.indexOf('] git-branch');
+      const branchIdxAfter = outputAfter.indexOf('] branch');
       expect(cwdIdxAfter).toBeGreaterThan(-1);
       expect(branchIdxAfter).toBeGreaterThan(-1);
       expect(branchIdxAfter).toBeLessThan(cwdIdxAfter);
@@ -108,22 +109,40 @@ describe('<FooterConfigDialog />', () => {
 
   it('highlights the active item in the preview', async () => {
     const settings = createMockSettings();
-    const { lastFrame, stdin, waitUntilReady } = renderWithProviders(
+    const renderResult = renderWithProviders(
       <FooterConfigDialog onClose={mockOnClose} />,
       { settings },
     );
 
+    const { lastFrame, stdin, waitUntilReady } = renderResult;
+
     await waitUntilReady();
     expect(lastFrame()).toContain('~/project/path');
 
-    // Move focus down to 'git-branch'
+    // Move focus down to 'diff' (which has key 'code-changes' and colored elements)
+    for (let i = 0; i < 8; i++) {
+      act(() => {
+        stdin.write('\u001b[B'); // Down arrow
+      });
+    }
+
+    await waitFor(() => {
+      // The selected indicator should be next to 'diff'
+      expect(lastFrame()).toMatch(/> \[ \] diff/);
+    });
+
+    // Toggle it on
     act(() => {
-      stdin.write('\u001b[B'); // Down arrow
+      stdin.write('\r');
     });
 
     await waitFor(() => {
-      expect(lastFrame()).toContain('main');
+      // It should now be checked and appear in the preview
+      expect(lastFrame()).toMatch(/> \[✓\] diff/);
+      expect(lastFrame()).toContain('+12 -4');
     });
+
+    await expect(renderResult).toMatchSvgSnapshot();
   });
 
   it('shows an empty preview when all items are deselected', async () => {
@@ -134,20 +153,25 @@ describe('<FooterConfigDialog />', () => {
     );
 
     await waitUntilReady();
-    for (let i = 0; i < 10; i++) {
+
+    // Default items are the first 5. We toggle them off.
+    for (let i = 0; i < 5; i++) {
+      act(() => {
+        stdin.write('\r'); // Toggle off
+      });
       act(() => {
-        stdin.write('\r'); // Toggle (deselect)
         stdin.write('\u001b[B'); // Down arrow
       });
     }
 
-    await waitFor(() => {
-      const output = lastFrame();
-      expect(output).toContain('Preview:');
-      expect(output).not.toContain('~/project/path');
-      expect(output).not.toContain('docker');
-      expect(output).not.toContain('gemini-2.5-pro');
-      expect(output).not.toContain('1.2k left');
-    });
+    await waitFor(
+      () => {
+        const output = lastFrame();
+        expect(output).toContain('Preview:');
+        expect(output).not.toContain('~/project/path');
+        expect(output).not.toContain('docker');
+      },
+      { timeout: 2000 },
+    );
   });
 });
diff --git a/packages/cli/src/ui/components/FooterConfigDialog.tsx b/packages/cli/src/ui/components/FooterConfigDialog.tsx
index 8c43c0ee1e3..1fb2d3dcaab 100644
--- a/packages/cli/src/ui/components/FooterConfigDialog.tsx
+++ b/packages/cli/src/ui/components/FooterConfigDialog.tsx
@@ -5,119 +5,75 @@
  */
 
 import type React from 'react';
-import { useCallback, useMemo, useReducer } from 'react';
+import { useCallback, useMemo, useReducer, useState } from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../semantic-colors.js';
 import { useSettingsStore } from '../contexts/SettingsContext.js';
+import { useUIState } from '../contexts/UIStateContext.js';
 import { useKeypress, type Key } from '../hooks/useKeypress.js';
 import { keyMatchers, Command } from '../keyMatchers.js';
 import { FooterRow, type FooterRowItem } from './Footer.js';
 import { ALL_ITEMS, resolveFooterState } from '../../config/footerItems.js';
 import { SettingScope } from '../../config/settings.js';
+import { BaseSelectionList } from './shared/BaseSelectionList.js';
+import type { SelectionListItem } from '../hooks/useSelectionList.js';
+import { DialogFooter } from './shared/DialogFooter.js';
 
 interface FooterConfigDialogProps {
   onClose?: () => void;
 }
 
+interface FooterConfigItem {
+  key: string;
+  id: string;
+  label: string;
+  description?: string;
+  type: 'config' | 'labels-toggle' | 'reset';
+}
+
 interface FooterConfigState {
   orderedIds: string[];
   selectedIds: Set<string>;
-  activeIndex: number;
-  scrollOffset: number;
 }
 
 type FooterConfigAction =
-  | { type: 'MOVE_UP'; itemCount: number; maxToShow: number }
-  | { type: 'MOVE_DOWN'; itemCount: number; maxToShow: number }
-  | {
-      type: 'MOVE_LEFT';
-      items: Array<{ key: string }>;
-    }
-  | {
-      type: 'MOVE_RIGHT';
-      items: Array<{ key: string }>;
-    }
-  | { type: 'TOGGLE_ITEM'; items: Array<{ key: string }> }
-  | { type: 'SET_STATE'; payload: Partial<FooterConfigState> }
-  | { type: 'RESET_INDEX' };
+  | { type: 'MOVE_ITEM'; id: string; direction: number }
+  | { type: 'TOGGLE_ITEM'; id: string }
+  | { type: 'SET_STATE'; payload: Partial<FooterConfigState> };
 
 function footerConfigReducer(
   state: FooterConfigState,
   action: FooterConfigAction,
 ): FooterConfigState {
   switch (action.type) {
-    case 'MOVE_UP': {
-      const { itemCount, maxToShow } = action;
-      const totalSlots = itemCount + 2; // +1 for showLabels, +1 for reset
-      const newIndex =
-        state.activeIndex > 0 ? state.activeIndex - 1 : totalSlots - 1;
-      let newOffset = state.scrollOffset;
-
-      if (newIndex < itemCount) {
-        if (newIndex === itemCount - 1) {
-          newOffset = Math.max(0, itemCount - maxToShow);
-        } else if (newIndex < state.scrollOffset) {
-          newOffset = newIndex;
-        }
-      }
-      return { ...state, activeIndex: newIndex, scrollOffset: newOffset };
-    }
-    case 'MOVE_DOWN': {
-      const { itemCount, maxToShow } = action;
-      const totalSlots = itemCount + 2;
-      const newIndex =
-        state.activeIndex < totalSlots - 1 ? state.activeIndex + 1 : 0;
-      let newOffset = state.scrollOffset;
-
-      if (newIndex === 0) {
-        newOffset = 0;
-      } else if (
-        newIndex < itemCount &&
-        newIndex >= state.scrollOffset + maxToShow
+    case 'MOVE_ITEM': {
+      const currentIndex = state.orderedIds.indexOf(action.id);
+      const newIndex = currentIndex + action.direction;
+      if (
+        currentIndex === -1 ||
+        newIndex < 0 ||
+        newIndex >= state.orderedIds.length
       ) {
-        newOffset = newIndex - maxToShow + 1;
+        return state;
       }
-      return { ...state, activeIndex: newIndex, scrollOffset: newOffset };
-    }
-    case 'MOVE_LEFT':
-    case 'MOVE_RIGHT': {
-      const direction = action.type === 'MOVE_LEFT' ? -1 : 1;
-      const currentItem = action.items[state.activeIndex];
-      if (!currentItem) return state;
-
-      const currentId = currentItem.key;
-      const currentIndex = state.orderedIds.indexOf(currentId);
-      const newIndex = currentIndex + direction;
-
-      if (newIndex < 0 || newIndex >= state.orderedIds.length) return state;
-
       const newOrderedIds = [...state.orderedIds];
       [newOrderedIds[currentIndex], newOrderedIds[newIndex]] = [
         newOrderedIds[newIndex],
         newOrderedIds[currentIndex],
       ];
-
-      return { ...state, orderedIds: newOrderedIds, activeIndex: newIndex };
+      return { ...state, orderedIds: newOrderedIds };
     }
     case 'TOGGLE_ITEM': {
-      const isSystemFocused = state.activeIndex >= action.items.length;
-      if (isSystemFocused) return state;
-
-      const item = action.items[state.activeIndex];
-      if (!item) return state;
-
       const nextSelected = new Set(state.selectedIds);
-      if (nextSelected.has(item.key)) {
-        nextSelected.delete(item.key);
+      if (nextSelected.has(action.id)) {
+        nextSelected.delete(action.id);
       } else {
-        nextSelected.add(item.key);
+        nextSelected.add(action.id);
       }
       return { ...state, selectedIds: nextSelected };
     }
     case 'SET_STATE':
       return { ...state, ...action.payload };
-    case 'RESET_INDEX':
-      return { ...state, activeIndex: 0, scrollOffset: 0 };
     default:
       return state;
   }
@@ -127,40 +83,54 @@ export const FooterConfigDialog: React.FC<FooterConfigDialogProps> = ({
   onClose,
 }) => {
   const { settings, setSetting } = useSettingsStore();
-  const maxItemsToShow = 10;
-
-  const [state, dispatch] = useReducer(footerConfigReducer, undefined, () => ({
-    ...resolveFooterState(settings.merged),
-    activeIndex: 0,
-    scrollOffset: 0,
-  }));
-
-  const { orderedIds, selectedIds, activeIndex, scrollOffset } = state;
-
-  // Prepare items
-  const listItems = useMemo(
-    () =>
-      orderedIds
-        .map((id: string) => {
-          const item = ALL_ITEMS.find((i) => i.id === id);
-          if (!item) return null;
-          return {
+  const { constrainHeight, terminalHeight, staticExtraHeight } = useUIState();
+  const [state, dispatch] = useReducer(footerConfigReducer, undefined, () =>
+    resolveFooterState(settings.merged),
+  );
+
+  const { orderedIds, selectedIds } = state;
+  const [focusKey, setFocusKey] = useState<string | undefined>(orderedIds[0]);
+
+  const listItems = useMemo((): Array<SelectionListItem<FooterConfigItem>> => {
+    const items: Array<SelectionListItem<FooterConfigItem>> = orderedIds
+      .map((id: string) => {
+        const item = ALL_ITEMS.find((i) => i.id === id);
+        if (!item) return null;
+        return {
+          key: id,
+          value: {
             key: id,
-            label: item.id,
+            id,
+            label: item.header,
             description: item.description as string,
-          };
-        })
-        .filter((i): i is NonNullable<typeof i> => i !== null),
-    [orderedIds],
-  );
+            type: 'config' as const,
+          },
+        };
+      })
+      .filter((i): i is NonNullable<typeof i> => i !== null);
+
+    items.push({
+      key: 'show-labels',
+      value: {
+        key: 'show-labels',
+        id: 'show-labels',
+        label: 'Show footer labels',
+        type: 'labels-toggle',
+      },
+    });
 
-  const maxLabelWidth = useMemo(
-    () => listItems.reduce((max, item) => Math.max(max, item.label.length), 0),
-    [listItems],
-  );
+    items.push({
+      key: 'reset',
+      value: {
+        key: 'reset',
+        id: 'reset',
+        label: 'Reset to default footer',
+        type: 'reset',
+      },
+    });
 
-  const isResetFocused = activeIndex === listItems.length + 1;
-  const isShowLabelsFocused = activeIndex === listItems.length;
+    return items;
+  }, [orderedIds]);
 
   const handleSaveAndClose = useCallback(() => {
     const finalItems = orderedIds.filter((id: string) => selectedIds.has(id));
@@ -179,14 +149,9 @@ export const FooterConfigDialog: React.FC<FooterConfigDialogProps> = ({
 
   const handleResetToDefaults = useCallback(() => {
     setSetting(SettingScope.User, 'ui.footer.items', undefined);
-    dispatch({
-      type: 'SET_STATE',
-      payload: {
-        ...resolveFooterState(settings.merged),
-        activeIndex: 0,
-        scrollOffset: 0,
-      },
-    });
+    const newState = resolveFooterState(settings.merged);
+    dispatch({ type: 'SET_STATE', payload: newState });
+    setFocusKey(newState.orderedIds[0]);
   }, [setSetting, settings.merged]);
 
   const handleToggleLabels = useCallback(() => {
@@ -194,6 +159,23 @@ export const FooterConfigDialog: React.FC<FooterConfigDialogProps> = ({
     setSetting(SettingScope.User, 'ui.footer.showLabels', !current);
   }, [setSetting, settings.merged.ui.footer.showLabels]);
 
+  const handleSelect = useCallback(
+    (item: FooterConfigItem) => {
+      if (item.type === 'config') {
+        dispatch({ type: 'TOGGLE_ITEM', id: item.id });
+      } else if (item.type === 'labels-toggle') {
+        handleToggleLabels();
+      } else if (item.type === 'reset') {
+        handleResetToDefaults();
+      }
+    },
+    [handleResetToDefaults, handleToggleLabels],
+  );
+
+  const handleHighlight = useCallback((item: FooterConfigItem) => {
+    setFocusKey(item.key);
+  }, []);
+
   useKeypress(
     (key: Key) => {
       if (keyMatchers[Command.ESCAPE](key)) {
@@ -201,43 +183,18 @@ export const FooterConfigDialog: React.FC<FooterConfigDialogProps> = ({
         return true;
       }
 
-      if (keyMatchers[Command.DIALOG_NAVIGATION_UP](key)) {
-        dispatch({
-          type: 'MOVE_UP',
-          itemCount: listItems.length,
-          maxToShow: maxItemsToShow,
-        });
-        return true;
-      }
-
-      if (keyMatchers[Command.DIALOG_NAVIGATION_DOWN](key)) {
-        dispatch({
-          type: 'MOVE_DOWN',
-          itemCount: listItems.length,
-          maxToShow: maxItemsToShow,
-        });
-        return true;
-      }
-
       if (keyMatchers[Command.MOVE_LEFT](key)) {
-        dispatch({ type: 'MOVE_LEFT', items: listItems });
-        return true;
+        if (focusKey && orderedIds.includes(focusKey)) {
+          dispatch({ type: 'MOVE_ITEM', id: focusKey, direction: -1 });
+          return true;
+        }
       }
 
       if (keyMatchers[Command.MOVE_RIGHT](key)) {
-        dispatch({ type: 'MOVE_RIGHT', items: listItems });
-        return true;
-      }
-
-      if (keyMatchers[Command.RETURN](key) || key.name === 'space') {
-        if (isResetFocused) {
-          handleResetToDefaults();
-        } else if (isShowLabelsFocused) {
-          handleToggleLabels();
-        } else {
-          dispatch({ type: 'TOGGLE_ITEM', items: listItems });
+        if (focusKey && orderedIds.includes(focusKey)) {
+          dispatch({ type: 'MOVE_ITEM', id: focusKey, direction: 1 });
+          return true;
         }
-        return true;
       }
 
       return false;
@@ -245,17 +202,11 @@ export const FooterConfigDialog: React.FC<FooterConfigDialogProps> = ({
     { isActive: true, priority: true },
   );
 
-  const visibleItems = listItems.slice(
-    scrollOffset,
-    scrollOffset + maxItemsToShow,
-  );
-
-  const activeId = listItems[activeIndex]?.key;
   const showLabels = settings.merged.ui.footer.showLabels !== false;
 
   // Preview logic
   const previewContent = useMemo(() => {
-    if (isResetFocused) {
+    if (focusKey === 'reset') {
       return (
         <Text color={theme.ui.comment} italic>
           Default footer (uses legacy settings)
@@ -269,8 +220,9 @@ export const FooterConfigDialog: React.FC<FooterConfigDialogProps> = ({
     if (itemsToPreview.length === 0) return null;
 
     const itemColor = showLabels ? theme.text.primary : theme.ui.comment;
+
     const getColor = (id: string, defaultColor?: string) =>
-      id === activeId ? 'white' : defaultColor || itemColor;
+      defaultColor || itemColor;
 
     // Mock data for preview (headers come from ALL_ITEMS)
     const mockData: Record<string, React.ReactNode> = {
@@ -312,16 +264,43 @@ export const FooterConfigDialog: React.FC<FooterConfigDialogProps> = ({
         key: id,
         header: ALL_ITEMS.find((i) => i.id === id)?.header ?? id,
         element: mockData[id],
+        flexGrow: 1,
+        isFocused: id === focusKey,
       }));
 
     return (
-      <Box overflow="hidden" flexWrap="nowrap">
-        <Box flexShrink={0}>
-          <FooterRow items={rowItems} showLabels={showLabels} />
-        </Box>
+      <Box overflow="hidden" flexWrap="nowrap" width="100%">
+        <FooterRow items={rowItems} showLabels={showLabels} />
       </Box>
     );
-  }, [orderedIds, selectedIds, activeId, isResetFocused, showLabels]);
+  }, [orderedIds, selectedIds, focusKey, showLabels]);
+
+  const availableTerminalHeight = constrainHeight
+    ? terminalHeight - staticExtraHeight
+    : Number.MAX_SAFE_INTEGER;
+
+  const BORDER_HEIGHT = 2; // Outer round border
+  const STATIC_ELEMENTS = 13; // Text, margins, preview box, dialog footer
+
+  // Default padding adds 2 lines (top and bottom)
+  let includePadding = true;
+  if (availableTerminalHeight < BORDER_HEIGHT + 2 + STATIC_ELEMENTS + 6) {
+    includePadding = false;
+  }
+
+  const effectivePaddingY = includePadding ? 2 : 0;
+  const availableListSpace = Math.max(
+    0,
+    availableTerminalHeight -
+      BORDER_HEIGHT -
+      effectivePaddingY -
+      STATIC_ELEMENTS,
+  );
+
+  const maxItemsToShow = Math.max(
+    1,
+    Math.min(listItems.length, Math.floor(availableListSpace / 2)),
+  );
 
   return (
     <Box
@@ -329,7 +308,7 @@ export const FooterConfigDialog: React.FC<FooterConfigDialogProps> = ({
       borderStyle="round"
       borderColor={theme.border.default}
       paddingX={2}
-      paddingY={1}
+      paddingY={includePadding ? 1 : 0}
       width="100%"
     >
       <Text bold>Configure Footer{'\n'}</Text>
@@ -337,59 +316,65 @@ export const FooterConfigDialog: React.FC<FooterConfigDialogProps> = ({
         Select which items to display in the footer.
       </Text>
 
-      <Box flexDirection="column" marginTop={1} minHeight={maxItemsToShow}>
-        {visibleItems.length === 0 ? (
-          <Text color={theme.text.secondary}>No items found.</Text>
-        ) : (
-          visibleItems.map((item, idx) => {
-            const index = scrollOffset + idx;
-            const isFocused = index === activeIndex;
-            const isChecked = selectedIds.has(item.key);
+      <Box flexDirection="column" marginTop={1} flexGrow={1}>
+        <BaseSelectionList<FooterConfigItem>
+          items={listItems}
+          onSelect={handleSelect}
+          onHighlight={handleHighlight}
+          focusKey={focusKey}
+          showNumbers={false}
+          maxItemsToShow={maxItemsToShow}
+          showScrollArrows={true}
+          selectedIndicator=">"
+          renderItem={(item, { isSelected, titleColor }) => {
+            const configItem = item.value;
+            const isChecked =
+              configItem.type === 'config'
+                ? selectedIds.has(configItem.id)
+                : configItem.type === 'labels-toggle'
+                  ? showLabels
+                  : false;
 
             return (
-              <Box key={item.key} flexDirection="row">
-                <Text color={isFocused ? theme.status.success : undefined}>
-                  {isFocused ? '> ' : '  '}
-                </Text>
-                <Text
-                  color={isFocused ? theme.status.success : theme.text.primary}
-                >
-                  [{isChecked ? '✓' : ' '}]{' '}
-                  {item.label.padEnd(maxLabelWidth + 1)}
-                </Text>
-                <Text color={theme.text.secondary}> {item.description}</Text>
+              <Box flexDirection="column" minHeight={2}>
+                <Box flexDirection="row">
+                  {configItem.type !== 'reset' && (
+                    <Text
+                      color={
+                        isChecked ? theme.status.success : theme.text.secondary
+                      }
+                    >
+                      [{isChecked ? '✓' : ' '}]
+                    </Text>
+                  )}
+                  <Text
+                    color={
+                      configItem.type === 'reset' && isSelected
+                        ? theme.status.warning
+                        : titleColor
+                    }
+                  >
+                    {configItem.type !== 'reset' ? ' ' : ''}
+                    {configItem.label}
+                  </Text>
+                </Box>
+                {configItem.description && (
+                  <Text color={theme.text.secondary} wrap="wrap">
+                    {' '}
+                    {configItem.description}
+                  </Text>
+                )}
               </Box>
             );
-          })
-        )}
-      </Box>
-
-      <Box marginTop={1} flexDirection="column">
-        <Box flexDirection="row">
-          <Text color={isShowLabelsFocused ? theme.status.success : undefined}>
-            {isShowLabelsFocused ? '> ' : '  '}
-          </Text>
-          <Text color={isShowLabelsFocused ? theme.status.success : undefined}>
-            [{showLabels ? '✓' : ' '}] Show footer labels
-          </Text>
-        </Box>
-        <Box flexDirection="row">
-          <Text color={isResetFocused ? theme.status.warning : undefined}>
-            {isResetFocused ? '> ' : '  '}
-          </Text>
-          <Text
-            color={isResetFocused ? theme.status.warning : theme.text.secondary}
-          >
-            Reset to default footer
-          </Text>
-        </Box>
+          }}
+        />
       </Box>
 
-      <Box marginTop={1} flexDirection="column">
-        <Text color={theme.text.secondary}>
-          ↑/↓ navigate · ←/→ reorder · enter/space select · esc close
-        </Text>
-      </Box>
+      <DialogFooter
+        primaryAction="Enter to select"
+        navigationActions="↑/↓ to navigate · ←/→ to reorder"
+        cancelAction="Esc to close"
+      />
 
       <Box
         marginTop={1}
@@ -399,7 +384,9 @@ export const FooterConfigDialog: React.FC<FooterConfigDialogProps> = ({
         flexDirection="column"
       >
         <Text bold>Preview:</Text>
-        <Box flexDirection="row">{previewContent}</Box>
+        <Box flexDirection="row" width="100%">
+          {previewContent}
+        </Box>
       </Box>
     </Box>
   );
diff --git a/packages/cli/src/ui/components/__snapshots__/Footer.test.tsx.snap b/packages/cli/src/ui/components/__snapshots__/Footer.test.tsx.snap
index f2892488c31..2d98d66f03d 100644
--- a/packages/cli/src/ui/components/__snapshots__/Footer.test.tsx.snap
+++ b/packages/cli/src/ui/components/__snapshots__/Footer.test.tsx.snap
@@ -1,26 +1,26 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`<Footer /> > displays "Limit reached" message when remaining is 0 1`] = `
-" workspace (/directory)                                        sandbox      /model       /stats
- ~/project/foo/bar/and/some/more/directories/to/make/it/long   no sandbox   gemini-pro   limit reached
+" workspace (/directory)                                                         sandbox      /model       /stats
+ ~/project/foo/bar/and/some/more/directories/to/make/it/long                    no sandbox   gemini-pro   limit reached
 "
 `;
 
 exports[`<Footer /> > displays the usage indicator when usage is low 1`] = `
-" workspace (/directory)                                        sandbox      /model       /stats
- ~/project/foo/bar/and/some/more/directories/to/make/it/long   no sandbox   gemini-pro   85%
+" workspace (/directory)                                                                sandbox      /model       /stats
+ ~/project/foo/bar/and/some/more/directories/to/make/it/long                           no sandbox   gemini-pro   85%
 "
 `;
 
 exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders complete footer in narrow terminal (baseline narrow) > complete-footer-narrow 1`] = `
-" workspace (/directory)                   sandbox      /model       context
- ...me/more/directories/to/make/it/long   no sandbox   gemini-pro   14%
+" workspace (/directory)                      sandbox      /model       context
+ ...me/more/directories/to/make/it/long      no sandbox   gemini-pro   14%
 "
 `;
 
 exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders complete footer with all sections visible (baseline) > complete-footer-wide 1`] = `
-" workspace (/directory)                                        sandbox      /model       context
- ~/project/foo/bar/and/some/more/directories/to/make/it/long   no sandbox   gemini-pro   14% used
+" workspace (/directory)                                                              sandbox      /model       context
+ ~/project/foo/bar/and/some/more/directories/to/make/it/long                         no sandbox   gemini-pro   14% used
 "
 `;
 
@@ -33,13 +33,13 @@ exports[`<Footer /> > footer configuration filtering (golden snapshots) > render
 exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders footer with all optional sections hidden (minimal footer) > footer-minimal 1`] = `""`;
 
 exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders footer with only model info hidden (partial filtering) > footer-no-model 1`] = `
-" workspace (/directory)                                        sandbox
- ~/project/foo/bar/and/some/more/directories/to/make/it/long   no sandbox
+" workspace (/directory)                                                                                      sandbox
+ ~/project/foo/bar/and/some/more/directories/to/make/it/long                                                 no sandbox
 "
 `;
 
 exports[`<Footer /> > hides the usage indicator when usage is not near limit 1`] = `
-" workspace (/directory)                                        sandbox      /model       /stats
- ~/project/foo/bar/and/some/more/directories/to/make/it/long   no sandbox   gemini-pro   15%
+" workspace (/directory)                                                                sandbox      /model       /stats
+ ~/project/foo/bar/and/some/more/directories/to/make/it/long                           no sandbox   gemini-pro   15%
 "
 `;
diff --git a/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-highlights-the-active-item-in-the-preview.snap.svg b/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-highlights-the-active-item-in-the-preview.snap.svg
new file mode 100644
index 00000000000..893d52778f9
--- /dev/null
+++ b/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-highlights-the-active-item-in-the-preview.snap.svg
@@ -0,0 +1,156 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="920" height="700" viewBox="0 0 920 700">
+  <style>
+    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
+  </style>
+  <rect width="920" height="700" fill="#000000" />
+  <g transform="translate(10, 10)">
+    <text x="0" y="2" fill="#333333" textLength="900" lengthAdjust="spacingAndGlyphs">╭──────────────────────────────────────────────────────────────────────────────────────────────────╮</text>
+    <text x="0" y="19" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="19" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="36" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="36" fill="#ffffff" textLength="144" lengthAdjust="spacingAndGlyphs" font-weight="bold">Configure Footer</text>
+    <text x="891" y="36" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="53" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="53" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="70" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="70" fill="#6c7086" textLength="396" lengthAdjust="spacingAndGlyphs">Select which items to display in the footer.</text>
+    <text x="891" y="70" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="87" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="87" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="104" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="104" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="104" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> workspace (/directory)                                                                    </text>
+    <text x="891" y="104" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="121" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="121" fill="#6c7086" textLength="234" lengthAdjust="spacingAndGlyphs"> Current working directory</text>
+    <text x="891" y="121" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="138" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="138" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="138" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> branch                                                                                    </text>
+    <text x="891" y="138" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="155" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="155" fill="#6c7086" textLength="477" lengthAdjust="spacingAndGlyphs"> Current git branch name (not shown when unavailable)</text>
+    <text x="891" y="155" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="172" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="172" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="172" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> sandbox                                                                                   </text>
+    <text x="891" y="172" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="189" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="189" fill="#6c7086" textLength="297" lengthAdjust="spacingAndGlyphs"> Sandbox type and trust indicator</text>
+    <text x="891" y="189" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="206" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="206" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="206" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> /model                                                                                    </text>
+    <text x="891" y="206" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="223" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="223" fill="#6c7086" textLength="225" lengthAdjust="spacingAndGlyphs"> Current model identifier</text>
+    <text x="891" y="223" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="240" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="240" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="240" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> /stats                                                                                    </text>
+    <text x="891" y="240" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="257" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="257" fill="#6c7086" textLength="540" lengthAdjust="spacingAndGlyphs"> Remaining usage on daily limit (not shown when unavailable)</text>
+    <text x="891" y="257" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="274" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="274" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="274" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> context                                                                                   </text>
+    <text x="891" y="274" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="291" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="291" fill="#6c7086" textLength="306" lengthAdjust="spacingAndGlyphs"> Percentage of context window used</text>
+    <text x="891" y="291" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="308" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="308" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="308" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> memory                                                                                    </text>
+    <text x="891" y="308" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="325" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="325" fill="#6c7086" textLength="279" lengthAdjust="spacingAndGlyphs"> Memory used by the application</text>
+    <text x="891" y="325" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="342" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="342" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="342" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> session                                                                                   </text>
+    <text x="891" y="342" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="359" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="359" fill="#6c7086" textLength="378" lengthAdjust="spacingAndGlyphs"> Unique identifier for the current session</text>
+    <text x="891" y="359" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="376" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <rect x="27" y="374" width="9" height="17" fill="#001a00" />
+    <text x="27" y="376" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">&gt;</text>
+    <rect x="36" y="374" width="9" height="17" fill="#001a00" />
+    <rect x="45" y="374" width="27" height="17" fill="#001a00" />
+    <text x="45" y="376" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <rect x="72" y="374" width="45" height="17" fill="#001a00" />
+    <text x="72" y="376" fill="#00cd00" textLength="45" lengthAdjust="spacingAndGlyphs"> diff</text>
+    <rect x="117" y="374" width="756" height="17" fill="#001a00" />
+    <text x="891" y="376" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <rect x="27" y="391" width="18" height="17" fill="#001a00" />
+    <rect x="45" y="391" width="513" height="17" fill="#001a00" />
+    <text x="45" y="393" fill="#6c7086" textLength="513" lengthAdjust="spacingAndGlyphs"> Lines added/removed in the session (not shown when zero)</text>
+    <rect x="558" y="391" width="315" height="17" fill="#001a00" />
+    <text x="891" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="410" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="410" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> tokens                                                                                    </text>
+    <text x="891" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="427" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="427" fill="#6c7086" textLength="495" lengthAdjust="spacingAndGlyphs"> Total tokens used in the session (not shown when zero)</text>
+    <text x="891" y="427" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="444" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="444" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="444" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> Show footer labels                                                                        </text>
+    <text x="891" y="444" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="461" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="461" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="478" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="9" y="478" fill="#ffffff" textLength="882" lengthAdjust="spacingAndGlyphs">    Reset to default footer                                                                       </text>
+    <text x="891" y="478" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="495" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="495" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="512" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="512" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="529" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="529" fill="#6c7086" textLength="585" lengthAdjust="spacingAndGlyphs">Enter to select · ↑/↓ to navigate · ←/→ to reorder · Esc to close</text>
+    <text x="891" y="529" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="546" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="546" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="563" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="563" fill="#333333" textLength="846" lengthAdjust="spacingAndGlyphs">┌────────────────────────────────────────────────────────────────────────────────────────────┐</text>
+    <text x="891" y="563" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="580" fill="#ffffff" textLength="72" lengthAdjust="spacingAndGlyphs" font-weight="bold">Preview:</text>
+    <text x="864" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="597" fill="#6c7086" textLength="198" lengthAdjust="spacingAndGlyphs">workspace (/directory)</text>
+    <text x="288" y="597" fill="#6c7086" textLength="54" lengthAdjust="spacingAndGlyphs">branch</text>
+    <text x="396" y="597" fill="#6c7086" textLength="63" lengthAdjust="spacingAndGlyphs">sandbox</text>
+    <text x="504" y="597" fill="#6c7086" textLength="54" lengthAdjust="spacingAndGlyphs">/model</text>
+    <text x="675" y="597" fill="#6c7086" textLength="54" lengthAdjust="spacingAndGlyphs">/stats</text>
+    <rect x="783" y="595" width="72" height="17" fill="#001a00" />
+    <text x="783" y="597" fill="#ffffff" textLength="72" lengthAdjust="spacingAndGlyphs">diff    </text>
+    <text x="864" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="36" y="614" fill="#ffffff" textLength="360" lengthAdjust="spacingAndGlyphs"> ~/project/path             main        </text>
+    <text x="396" y="614" fill="#00cd00" textLength="54" lengthAdjust="spacingAndGlyphs">docker</text>
+    <text x="450" y="614" fill="#ffffff" textLength="333" lengthAdjust="spacingAndGlyphs">      gemini-2.5-pro     97%         </text>
+    <rect x="783" y="612" width="27" height="17" fill="#001a00" />
+    <text x="783" y="614" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">+12</text>
+    <rect x="810" y="612" width="9" height="17" fill="#001a00" />
+    <rect x="819" y="612" width="18" height="17" fill="#001a00" />
+    <text x="819" y="614" fill="#f38ba8" textLength="18" lengthAdjust="spacingAndGlyphs">-4</text>
+    <rect x="837" y="612" width="18" height="17" fill="#001a00" />
+    <text x="864" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="631" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="631" fill="#333333" textLength="846" lengthAdjust="spacingAndGlyphs">└────────────────────────────────────────────────────────────────────────────────────────────┘</text>
+    <text x="891" y="631" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="648" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="648" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="665" fill="#333333" textLength="900" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────────────────────────╯</text>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-renders-correctly-with-default-settings.snap.svg b/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-renders-correctly-with-default-settings.snap.svg
new file mode 100644
index 00000000000..2387e7585ba
--- /dev/null
+++ b/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-renders-correctly-with-default-settings.snap.svg
@@ -0,0 +1,151 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="920" height="700" viewBox="0 0 920 700">
+  <style>
+    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
+  </style>
+  <rect width="920" height="700" fill="#000000" />
+  <g transform="translate(10, 10)">
+    <text x="0" y="2" fill="#333333" textLength="900" lengthAdjust="spacingAndGlyphs">╭──────────────────────────────────────────────────────────────────────────────────────────────────╮</text>
+    <text x="0" y="19" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="19" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="36" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="36" fill="#ffffff" textLength="144" lengthAdjust="spacingAndGlyphs" font-weight="bold">Configure Footer</text>
+    <text x="891" y="36" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="53" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="53" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="70" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="70" fill="#6c7086" textLength="396" lengthAdjust="spacingAndGlyphs">Select which items to display in the footer.</text>
+    <text x="891" y="70" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="87" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="87" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="104" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <rect x="27" y="102" width="9" height="17" fill="#001a00" />
+    <text x="27" y="104" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">&gt;</text>
+    <rect x="36" y="102" width="9" height="17" fill="#001a00" />
+    <rect x="45" y="102" width="27" height="17" fill="#001a00" />
+    <text x="45" y="104" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <rect x="72" y="102" width="207" height="17" fill="#001a00" />
+    <text x="72" y="104" fill="#00cd00" textLength="207" lengthAdjust="spacingAndGlyphs"> workspace (/directory)</text>
+    <rect x="279" y="102" width="594" height="17" fill="#001a00" />
+    <text x="891" y="104" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="121" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <rect x="27" y="119" width="18" height="17" fill="#001a00" />
+    <rect x="45" y="119" width="234" height="17" fill="#001a00" />
+    <text x="45" y="121" fill="#6c7086" textLength="234" lengthAdjust="spacingAndGlyphs"> Current working directory</text>
+    <rect x="279" y="119" width="594" height="17" fill="#001a00" />
+    <text x="891" y="121" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="138" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="138" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="138" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> branch                                                                                    </text>
+    <text x="891" y="138" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="155" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="155" fill="#6c7086" textLength="477" lengthAdjust="spacingAndGlyphs"> Current git branch name (not shown when unavailable)</text>
+    <text x="891" y="155" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="172" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="172" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="172" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> sandbox                                                                                   </text>
+    <text x="891" y="172" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="189" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="189" fill="#6c7086" textLength="297" lengthAdjust="spacingAndGlyphs"> Sandbox type and trust indicator</text>
+    <text x="891" y="189" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="206" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="206" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="206" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> /model                                                                                    </text>
+    <text x="891" y="206" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="223" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="223" fill="#6c7086" textLength="225" lengthAdjust="spacingAndGlyphs"> Current model identifier</text>
+    <text x="891" y="223" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="240" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="240" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="240" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> /stats                                                                                    </text>
+    <text x="891" y="240" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="257" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="257" fill="#6c7086" textLength="540" lengthAdjust="spacingAndGlyphs"> Remaining usage on daily limit (not shown when unavailable)</text>
+    <text x="891" y="257" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="274" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="274" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="274" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> context                                                                                   </text>
+    <text x="891" y="274" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="291" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="291" fill="#6c7086" textLength="306" lengthAdjust="spacingAndGlyphs"> Percentage of context window used</text>
+    <text x="891" y="291" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="308" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="308" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="308" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> memory                                                                                    </text>
+    <text x="891" y="308" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="325" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="325" fill="#6c7086" textLength="279" lengthAdjust="spacingAndGlyphs"> Memory used by the application</text>
+    <text x="891" y="325" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="342" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="342" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="342" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> session                                                                                   </text>
+    <text x="891" y="342" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="359" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="359" fill="#6c7086" textLength="378" lengthAdjust="spacingAndGlyphs"> Unique identifier for the current session</text>
+    <text x="891" y="359" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="376" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="376" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="376" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> diff                                                                                      </text>
+    <text x="891" y="376" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="393" fill="#6c7086" textLength="513" lengthAdjust="spacingAndGlyphs"> Lines added/removed in the session (not shown when zero)</text>
+    <text x="891" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="410" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="410" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> tokens                                                                                    </text>
+    <text x="891" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="427" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="427" fill="#6c7086" textLength="495" lengthAdjust="spacingAndGlyphs"> Total tokens used in the session (not shown when zero)</text>
+    <text x="891" y="427" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="444" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="444" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="444" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> Show footer labels                                                                        </text>
+    <text x="891" y="444" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="461" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="461" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="478" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="9" y="478" fill="#ffffff" textLength="882" lengthAdjust="spacingAndGlyphs">    Reset to default footer                                                                       </text>
+    <text x="891" y="478" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="495" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="495" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="512" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="512" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="529" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="529" fill="#6c7086" textLength="585" lengthAdjust="spacingAndGlyphs">Enter to select · ↑/↓ to navigate · ←/→ to reorder · Esc to close</text>
+    <text x="891" y="529" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="546" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="546" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="563" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="563" fill="#333333" textLength="846" lengthAdjust="spacingAndGlyphs">┌────────────────────────────────────────────────────────────────────────────────────────────┐</text>
+    <text x="891" y="563" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="45" y="580" fill="#ffffff" textLength="72" lengthAdjust="spacingAndGlyphs" font-weight="bold">Preview:</text>
+    <text x="864" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <rect x="45" y="595" width="243" height="17" fill="#001a00" />
+    <text x="45" y="597" fill="#ffffff" textLength="243" lengthAdjust="spacingAndGlyphs">workspace (/directory)     </text>
+    <text x="315" y="597" fill="#6c7086" textLength="54" lengthAdjust="spacingAndGlyphs">branch</text>
+    <text x="432" y="597" fill="#6c7086" textLength="63" lengthAdjust="spacingAndGlyphs">sandbox</text>
+    <text x="567" y="597" fill="#6c7086" textLength="54" lengthAdjust="spacingAndGlyphs">/model</text>
+    <text x="756" y="597" fill="#6c7086" textLength="54" lengthAdjust="spacingAndGlyphs">/stats</text>
+    <text x="864" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <rect x="45" y="612" width="243" height="17" fill="#001a00" />
+    <text x="45" y="614" fill="#ffffff" textLength="243" lengthAdjust="spacingAndGlyphs">~/project/path             </text>
+    <text x="288" y="614" fill="#ffffff" textLength="144" lengthAdjust="spacingAndGlyphs">   main         </text>
+    <text x="432" y="614" fill="#00cd00" textLength="54" lengthAdjust="spacingAndGlyphs">docker</text>
+    <text x="486" y="614" fill="#ffffff" textLength="378" lengthAdjust="spacingAndGlyphs">         gemini-2.5-pro       97%         </text>
+    <text x="864" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="631" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="27" y="631" fill="#333333" textLength="846" lengthAdjust="spacingAndGlyphs">└────────────────────────────────────────────────────────────────────────────────────────────┘</text>
+    <text x="891" y="631" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="648" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="891" y="648" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="665" fill="#333333" textLength="900" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────────────────────────╯</text>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog.test.tsx.snap b/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog.test.tsx.snap
index a55f40d1e25..39b01e38c71 100644
--- a/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog.test.tsx.snap
+++ b/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog.test.tsx.snap
@@ -1,34 +1,131 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`<FooterConfigDialog /> > renders correctly with default settings 1`] = `
+exports[`<FooterConfigDialog /> > highlights the active item in the preview 1`] = `
 "╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
 │                                                                                                  │
 │  Configure Footer                                                                                │
 │                                                                                                  │
 │  Select which items to display in the footer.                                                    │
 │                                                                                                  │
-│  > [✓] workspace     Current working directory                                                   │
-│    [✓] git-branch    Current git branch name (not shown when unavailable)                        │
-│    [✓] sandbox       Sandbox type and trust indicator                                            │
-│    [✓] model-name    Current model identifier                                                    │
-│    [✓] quota         Remaining usage on daily limit (not shown when unavailable)                 │
-│    [ ] context-used  Percentage of context window used                                           │
-│    [ ] memory-usage  Memory used by the application                                              │
-│    [ ] session-id    Unique identifier for the current session                                   │
-│    [ ] code-changes  Lines added/removed in the session (not shown when zero)                    │
-│    [ ] token-count   Total tokens used in the session (not shown when zero)                      │
+│    [✓] workspace (/directory)                                                                    │
+│     Current working directory                                                                    │
+│    [✓] branch                                                                                    │
+│     Current git branch name (not shown when unavailable)                                         │
+│    [✓] sandbox                                                                                   │
+│     Sandbox type and trust indicator                                                             │
+│    [✓] /model                                                                                    │
+│     Current model identifier                                                                     │
+│    [✓] /stats                                                                                    │
+│     Remaining usage on daily limit (not shown when unavailable)                                  │
+│    [ ] context                                                                                   │
+│     Percentage of context window used                                                            │
+│    [ ] memory                                                                                    │
+│     Memory used by the application                                                               │
+│    [ ] session                                                                                   │
+│     Unique identifier for the current session                                                    │
+│  > [✓] diff                                                                                      │
+│     Lines added/removed in the session (not shown when zero)                                     │
+│    [ ] tokens                                                                                    │
+│     Total tokens used in the session (not shown when zero)                                       │
+│    [✓] Show footer labels                                                                        │
+│                                                                                                  │
+│    Reset to default footer                                                                       │
+│                                                                                                  │
+│                                                                                                  │
+│  Enter to select · ↑/↓ to navigate · ←/→ to reorder · Esc to close                               │
+│                                                                                                  │
+│  ┌────────────────────────────────────────────────────────────────────────────────────────────┐  │
+│  │ Preview:                                                                                   │  │
+│  │ workspace (/directory)     branch      sandbox     /model             /stats      diff     │  │
+│  │ ~/project/path             main        docker      gemini-2.5-pro     97%         +12 -4   │  │
+│  └────────────────────────────────────────────────────────────────────────────────────────────┘  │
+│                                                                                                  │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
+`;
+
+exports[`<FooterConfigDialog /> > renders correctly with default settings 1`] = `
+"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
+│                                                                                                  │
+│  Configure Footer                                                                                │
 │                                                                                                  │
+│  Select which items to display in the footer.                                                    │
+│                                                                                                  │
+│  > [✓] workspace (/directory)                                                                    │
+│     Current working directory                                                                    │
+│    [✓] branch                                                                                    │
+│     Current git branch name (not shown when unavailable)                                         │
+│    [✓] sandbox                                                                                   │
+│     Sandbox type and trust indicator                                                             │
+│    [✓] /model                                                                                    │
+│     Current model identifier                                                                     │
+│    [✓] /stats                                                                                    │
+│     Remaining usage on daily limit (not shown when unavailable)                                  │
+│    [ ] context                                                                                   │
+│     Percentage of context window used                                                            │
+│    [ ] memory                                                                                    │
+│     Memory used by the application                                                               │
+│    [ ] session                                                                                   │
+│     Unique identifier for the current session                                                    │
+│    [ ] diff                                                                                      │
+│     Lines added/removed in the session (not shown when zero)                                     │
+│    [ ] tokens                                                                                    │
+│     Total tokens used in the session (not shown when zero)                                       │
 │    [✓] Show footer labels                                                                        │
+│                                                                                                  │
 │    Reset to default footer                                                                       │
 │                                                                                                  │
-│  ↑/↓ navigate · ←/→ reorder · enter/space select · esc close                                     │
+│                                                                                                  │
+│  Enter to select · ↑/↓ to navigate · ←/→ to reorder · Esc to close                               │
 │                                                                                                  │
 │  ┌────────────────────────────────────────────────────────────────────────────────────────────┐  │
 │  │ Preview:                                                                                   │  │
-│  │ workspace (/directory)   branch   sandbox   /model           /stats                        │  │
-│  │ ~/project/path           main     docker    gemini-2.5-pro   97%                           │  │
+│  │ workspace (/directory)        branch       sandbox        /model               /stats      │  │
+│  │ ~/project/path                main         docker         gemini-2.5-pro       97%         │  │
 │  └────────────────────────────────────────────────────────────────────────────────────────────┘  │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
 "
 `;
+
+exports[`<FooterConfigDialog /> > renders correctly with default settings 2`] = `
+"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
+│                                                                                                  │
+│  Configure Footer                                                                                │
+│                                                                                                  │
+│  Select which items to display in the footer.                                                    │
+│                                                                                                  │
+│  > [✓] workspace (/directory)                                                                    │
+│     Current working directory                                                                    │
+│    [✓] branch                                                                                    │
+│     Current git branch name (not shown when unavailable)                                         │
+│    [✓] sandbox                                                                                   │
+│     Sandbox type and trust indicator                                                             │
+│    [✓] /model                                                                                    │
+│     Current model identifier                                                                     │
+│    [✓] /stats                                                                                    │
+│     Remaining usage on daily limit (not shown when unavailable)                                  │
+│    [ ] context                                                                                   │
+│     Percentage of context window used                                                            │
+│    [ ] memory                                                                                    │
+│     Memory used by the application                                                               │
+│    [ ] session                                                                                   │
+│     Unique identifier for the current session                                                    │
+│    [ ] diff                                                                                      │
+│     Lines added/removed in the session (not shown when zero)                                     │
+│    [ ] tokens                                                                                    │
+│     Total tokens used in the session (not shown when zero)                                       │
+│    [✓] Show footer labels                                                                        │
+│                                                                                                  │
+│    Reset to default footer                                                                       │
+│                                                                                                  │
+│                                                                                                  │
+│  Enter to select · ↑/↓ to navigate · ←/→ to reorder · Esc to close                               │
+│                                                                                                  │
+│  ┌────────────────────────────────────────────────────────────────────────────────────────────┐  │
+│  │ Preview:                                                                                   │  │
+│  │ workspace (/directory)        branch       sandbox        /model               /stats      │  │
+│  │ ~/project/path                main         docker         gemini-2.5-pro       97%         │  │
+│  └────────────────────────────────────────────────────────────────────────────────────────────┘  │
+│                                                                                                  │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
+`;
diff --git a/packages/cli/src/ui/components/shared/BaseSelectionList.tsx b/packages/cli/src/ui/components/shared/BaseSelectionList.tsx
index 1467bb357ec..7efb40b3aec 100644
--- a/packages/cli/src/ui/components/shared/BaseSelectionList.tsx
+++ b/packages/cli/src/ui/components/shared/BaseSelectionList.tsx
@@ -33,6 +33,7 @@ export interface BaseSelectionListProps<
   wrapAround?: boolean;
   focusKey?: string;
   priority?: boolean;
+  selectedIndicator?: string;
   renderItem: (item: TItem, context: RenderItemContext) => React.ReactNode;
 }
 
@@ -65,6 +66,7 @@ export function BaseSelectionList<
   wrapAround = true,
   focusKey,
   priority,
+  selectedIndicator = '●',
   renderItem,
 }: BaseSelectionListProps<T, TItem>): React.JSX.Element {
   const { activeIndex } = useSelectionList({
@@ -148,7 +150,7 @@ export function BaseSelectionList<
                 color={isSelected ? theme.ui.focus : theme.text.primary}
                 aria-hidden
               >
-                {isSelected ? '●' : ' '}
+                {isSelected ? selectedIndicator : ' '}
               </Text>
             </Box>
 

From 6db68751f550e814594ae42bbe76be517c7a4840 Mon Sep 17 00:00:00 2001
From: jacob314 <jacob314@gmail.com>
Date: Fri, 6 Mar 2026 18:33:59 -0800
Subject: [PATCH 2/3] Code review fixes.

---
 .../ui/components/FooterConfigDialog.test.tsx | 53 +++++++++++++---
 .../src/ui/components/FooterConfigDialog.tsx  |  2 +-
 ...ts-the-active-item-in-the-preview.snap.svg | 22 +++----
 ...s-correctly-with-default-settings.snap.svg | 22 +++----
 .../FooterConfigDialog.test.tsx.snap          | 54 ++++++++--------
 .../src/ui/hooks/useSelectionList.test.tsx    | 63 +++++++++++++++++++
 packages/cli/src/ui/hooks/useSelectionList.ts |  3 +-
 7 files changed, 160 insertions(+), 59 deletions(-)

diff --git a/packages/cli/src/ui/components/FooterConfigDialog.test.tsx b/packages/cli/src/ui/components/FooterConfigDialog.test.tsx
index e5a2364377b..3141c3a1d7d 100644
--- a/packages/cli/src/ui/components/FooterConfigDialog.test.tsx
+++ b/packages/cli/src/ui/components/FooterConfigDialog.test.tsx
@@ -67,10 +67,10 @@ describe('<FooterConfigDialog />', () => {
     );
 
     await waitUntilReady();
-    // Initial order: workspace, branch, ...
+    // Initial order: workspace, git-branch, ...
     const output = lastFrame();
     const cwdIdx = output.indexOf('] workspace');
-    const branchIdx = output.indexOf('] branch');
+    const branchIdx = output.indexOf('] git-branch');
     expect(cwdIdx).toBeGreaterThan(-1);
     expect(branchIdx).toBeGreaterThan(-1);
     expect(cwdIdx).toBeLessThan(branchIdx);
@@ -83,7 +83,7 @@ describe('<FooterConfigDialog />', () => {
     await waitFor(() => {
       const outputAfter = lastFrame();
       const cwdIdxAfter = outputAfter.indexOf('] workspace');
-      const branchIdxAfter = outputAfter.indexOf('] branch');
+      const branchIdxAfter = outputAfter.indexOf('] git-branch');
       expect(cwdIdxAfter).toBeGreaterThan(-1);
       expect(branchIdxAfter).toBeGreaterThan(-1);
       expect(branchIdxAfter).toBeLessThan(cwdIdxAfter);
@@ -119,7 +119,7 @@ describe('<FooterConfigDialog />', () => {
     await waitUntilReady();
     expect(lastFrame()).toContain('~/project/path');
 
-    // Move focus down to 'diff' (which has key 'code-changes' and colored elements)
+    // Move focus down to 'code-changes' (which has colored elements)
     for (let i = 0; i < 8; i++) {
       act(() => {
         stdin.write('\u001b[B'); // Down arrow
@@ -127,8 +127,8 @@ describe('<FooterConfigDialog />', () => {
     }
 
     await waitFor(() => {
-      // The selected indicator should be next to 'diff'
-      expect(lastFrame()).toMatch(/> \[ \] diff/);
+      // The selected indicator should be next to 'code-changes'
+      expect(lastFrame()).toMatch(/> \[ \] code-changes/);
     });
 
     // Toggle it on
@@ -138,7 +138,7 @@ describe('<FooterConfigDialog />', () => {
 
     await waitFor(() => {
       // It should now be checked and appear in the preview
-      expect(lastFrame()).toMatch(/> \[✓\] diff/);
+      expect(lastFrame()).toMatch(/> \[✓\] code-changes/);
       expect(lastFrame()).toContain('+12 -4');
     });
 
@@ -174,4 +174,43 @@ describe('<FooterConfigDialog />', () => {
       { timeout: 2000 },
     );
   });
+
+  it('moves item correctly after trying to move up at the top', async () => {
+    const settings = createMockSettings();
+    const { lastFrame, stdin, waitUntilReady } = renderWithProviders(
+      <FooterConfigDialog onClose={mockOnClose} />,
+      { settings },
+    );
+    await waitUntilReady();
+
+    // Default initial items in mock settings are 'git-branch', 'workspace', ...
+    await waitFor(() => {
+      const output = lastFrame();
+      expect(output).toContain('] git-branch');
+      expect(output).toContain('] workspace');
+    });
+
+    const output = lastFrame();
+    const branchIdx = output.indexOf('] git-branch');
+    const workspaceIdx = output.indexOf('] workspace');
+    expect(workspaceIdx).toBeLessThan(branchIdx);
+
+    // Try to move workspace up (left arrow) while it's at the top
+    act(() => {
+      stdin.write('\u001b[D'); // Left arrow
+    });
+
+    // Move workspace down (right arrow)
+    act(() => {
+      stdin.write('\u001b[C'); // Right arrow
+    });
+
+    await waitFor(() => {
+      const outputAfter = lastFrame();
+      const bIdxAfter = outputAfter.indexOf('] git-branch');
+      const wIdxAfter = outputAfter.indexOf('] workspace');
+      // workspace should now be after git-branch
+      expect(bIdxAfter).toBeLessThan(wIdxAfter);
+    });
+  });
 });
diff --git a/packages/cli/src/ui/components/FooterConfigDialog.tsx b/packages/cli/src/ui/components/FooterConfigDialog.tsx
index 1fb2d3dcaab..c31dc73e455 100644
--- a/packages/cli/src/ui/components/FooterConfigDialog.tsx
+++ b/packages/cli/src/ui/components/FooterConfigDialog.tsx
@@ -101,7 +101,7 @@ export const FooterConfigDialog: React.FC<FooterConfigDialogProps> = ({
           value: {
             key: id,
             id,
-            label: item.header,
+            label: item.id,
             description: item.description as string,
             type: 'config' as const,
           },
diff --git a/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-highlights-the-active-item-in-the-preview.snap.svg b/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-highlights-the-active-item-in-the-preview.snap.svg
index 893d52778f9..f642cb39374 100644
--- a/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-highlights-the-active-item-in-the-preview.snap.svg
+++ b/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-highlights-the-active-item-in-the-preview.snap.svg
@@ -19,14 +19,14 @@
     <text x="891" y="87" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="104" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="104" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="104" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> workspace (/directory)                                                                    </text>
+    <text x="72" y="104" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> workspace                                                                                 </text>
     <text x="891" y="104" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="121" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="121" fill="#6c7086" textLength="234" lengthAdjust="spacingAndGlyphs"> Current working directory</text>
     <text x="891" y="121" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="138" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="138" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="138" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> branch                                                                                    </text>
+    <text x="72" y="138" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> git-branch                                                                                </text>
     <text x="891" y="138" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="155" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="155" fill="#6c7086" textLength="477" lengthAdjust="spacingAndGlyphs"> Current git branch name (not shown when unavailable)</text>
@@ -40,35 +40,35 @@
     <text x="891" y="189" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="206" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="206" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="206" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> /model                                                                                    </text>
+    <text x="72" y="206" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> model-name                                                                                </text>
     <text x="891" y="206" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="223" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="223" fill="#6c7086" textLength="225" lengthAdjust="spacingAndGlyphs"> Current model identifier</text>
     <text x="891" y="223" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="240" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="240" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="240" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> /stats                                                                                    </text>
+    <text x="72" y="240" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> quota                                                                                     </text>
     <text x="891" y="240" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="257" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="257" fill="#6c7086" textLength="540" lengthAdjust="spacingAndGlyphs"> Remaining usage on daily limit (not shown when unavailable)</text>
     <text x="891" y="257" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="274" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="274" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="274" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> context                                                                                   </text>
+    <text x="72" y="274" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> context-used                                                                              </text>
     <text x="891" y="274" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="291" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="291" fill="#6c7086" textLength="306" lengthAdjust="spacingAndGlyphs"> Percentage of context window used</text>
     <text x="891" y="291" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="308" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="308" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="308" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> memory                                                                                    </text>
+    <text x="72" y="308" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> memory-usage                                                                              </text>
     <text x="891" y="308" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="325" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="325" fill="#6c7086" textLength="279" lengthAdjust="spacingAndGlyphs"> Memory used by the application</text>
     <text x="891" y="325" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="342" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="342" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="342" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> session                                                                                   </text>
+    <text x="72" y="342" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> session-id                                                                                </text>
     <text x="891" y="342" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="359" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="359" fill="#6c7086" textLength="378" lengthAdjust="spacingAndGlyphs"> Unique identifier for the current session</text>
@@ -79,9 +79,9 @@
     <rect x="36" y="374" width="9" height="17" fill="#001a00" />
     <rect x="45" y="374" width="27" height="17" fill="#001a00" />
     <text x="45" y="376" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <rect x="72" y="374" width="45" height="17" fill="#001a00" />
-    <text x="72" y="376" fill="#00cd00" textLength="45" lengthAdjust="spacingAndGlyphs"> diff</text>
-    <rect x="117" y="374" width="756" height="17" fill="#001a00" />
+    <rect x="72" y="374" width="117" height="17" fill="#001a00" />
+    <text x="72" y="376" fill="#00cd00" textLength="117" lengthAdjust="spacingAndGlyphs"> code-changes</text>
+    <rect x="189" y="374" width="684" height="17" fill="#001a00" />
     <text x="891" y="376" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <rect x="27" y="391" width="18" height="17" fill="#001a00" />
@@ -91,7 +91,7 @@
     <text x="891" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="410" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="410" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> tokens                                                                                    </text>
+    <text x="72" y="410" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> token-count                                                                               </text>
     <text x="891" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="427" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="427" fill="#6c7086" textLength="495" lengthAdjust="spacingAndGlyphs"> Total tokens used in the session (not shown when zero)</text>
diff --git a/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-renders-correctly-with-default-settings.snap.svg b/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-renders-correctly-with-default-settings.snap.svg
index 2387e7585ba..f2b66ddb81e 100644
--- a/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-renders-correctly-with-default-settings.snap.svg
+++ b/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-renders-correctly-with-default-settings.snap.svg
@@ -23,9 +23,9 @@
     <rect x="36" y="102" width="9" height="17" fill="#001a00" />
     <rect x="45" y="102" width="27" height="17" fill="#001a00" />
     <text x="45" y="104" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <rect x="72" y="102" width="207" height="17" fill="#001a00" />
-    <text x="72" y="104" fill="#00cd00" textLength="207" lengthAdjust="spacingAndGlyphs"> workspace (/directory)</text>
-    <rect x="279" y="102" width="594" height="17" fill="#001a00" />
+    <rect x="72" y="102" width="90" height="17" fill="#001a00" />
+    <text x="72" y="104" fill="#00cd00" textLength="90" lengthAdjust="spacingAndGlyphs"> workspace</text>
+    <rect x="162" y="102" width="711" height="17" fill="#001a00" />
     <text x="891" y="104" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="121" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <rect x="27" y="119" width="18" height="17" fill="#001a00" />
@@ -35,7 +35,7 @@
     <text x="891" y="121" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="138" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="138" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="138" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> branch                                                                                    </text>
+    <text x="72" y="138" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> git-branch                                                                                </text>
     <text x="891" y="138" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="155" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="155" fill="#6c7086" textLength="477" lengthAdjust="spacingAndGlyphs"> Current git branch name (not shown when unavailable)</text>
@@ -49,49 +49,49 @@
     <text x="891" y="189" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="206" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="206" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="206" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> /model                                                                                    </text>
+    <text x="72" y="206" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> model-name                                                                                </text>
     <text x="891" y="206" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="223" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="223" fill="#6c7086" textLength="225" lengthAdjust="spacingAndGlyphs"> Current model identifier</text>
     <text x="891" y="223" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="240" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="240" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="240" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> /stats                                                                                    </text>
+    <text x="72" y="240" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> quota                                                                                     </text>
     <text x="891" y="240" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="257" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="257" fill="#6c7086" textLength="540" lengthAdjust="spacingAndGlyphs"> Remaining usage on daily limit (not shown when unavailable)</text>
     <text x="891" y="257" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="274" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="274" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="274" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> context                                                                                   </text>
+    <text x="72" y="274" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> context-used                                                                              </text>
     <text x="891" y="274" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="291" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="291" fill="#6c7086" textLength="306" lengthAdjust="spacingAndGlyphs"> Percentage of context window used</text>
     <text x="891" y="291" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="308" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="308" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="308" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> memory                                                                                    </text>
+    <text x="72" y="308" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> memory-usage                                                                              </text>
     <text x="891" y="308" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="325" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="325" fill="#6c7086" textLength="279" lengthAdjust="spacingAndGlyphs"> Memory used by the application</text>
     <text x="891" y="325" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="342" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="342" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="342" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> session                                                                                   </text>
+    <text x="72" y="342" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> session-id                                                                                </text>
     <text x="891" y="342" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="359" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="359" fill="#6c7086" textLength="378" lengthAdjust="spacingAndGlyphs"> Unique identifier for the current session</text>
     <text x="891" y="359" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="376" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="376" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="376" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> diff                                                                                      </text>
+    <text x="72" y="376" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> code-changes                                                                              </text>
     <text x="891" y="376" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="393" fill="#6c7086" textLength="513" lengthAdjust="spacingAndGlyphs"> Lines added/removed in the session (not shown when zero)</text>
     <text x="891" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="410" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="410" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> tokens                                                                                    </text>
+    <text x="72" y="410" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> token-count                                                                               </text>
     <text x="891" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="427" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="45" y="427" fill="#6c7086" textLength="495" lengthAdjust="spacingAndGlyphs"> Total tokens used in the session (not shown when zero)</text>
diff --git a/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog.test.tsx.snap b/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog.test.tsx.snap
index 39b01e38c71..f2fee0a8c38 100644
--- a/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog.test.tsx.snap
+++ b/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog.test.tsx.snap
@@ -7,25 +7,25 @@ exports[`<FooterConfigDialog /> > highlights the active item in the preview 1`]
 │                                                                                                  │
 │  Select which items to display in the footer.                                                    │
 │                                                                                                  │
-│    [✓] workspace (/directory)                                                                    │
+│    [✓] workspace                                                                                 │
 │     Current working directory                                                                    │
-│    [✓] branch                                                                                    │
+│    [✓] git-branch                                                                                │
 │     Current git branch name (not shown when unavailable)                                         │
 │    [✓] sandbox                                                                                   │
 │     Sandbox type and trust indicator                                                             │
-│    [✓] /model                                                                                    │
+│    [✓] model-name                                                                                │
 │     Current model identifier                                                                     │
-│    [✓] /stats                                                                                    │
+│    [✓] quota                                                                                     │
 │     Remaining usage on daily limit (not shown when unavailable)                                  │
-│    [ ] context                                                                                   │
+│    [ ] context-used                                                                              │
 │     Percentage of context window used                                                            │
-│    [ ] memory                                                                                    │
+│    [ ] memory-usage                                                                              │
 │     Memory used by the application                                                               │
-│    [ ] session                                                                                   │
+│    [ ] session-id                                                                                │
 │     Unique identifier for the current session                                                    │
-│  > [✓] diff                                                                                      │
+│  > [✓] code-changes                                                                              │
 │     Lines added/removed in the session (not shown when zero)                                     │
-│    [ ] tokens                                                                                    │
+│    [ ] token-count                                                                               │
 │     Total tokens used in the session (not shown when zero)                                       │
 │    [✓] Show footer labels                                                                        │
 │                                                                                                  │
@@ -50,25 +50,25 @@ exports[`<FooterConfigDialog /> > renders correctly with default settings 1`] =
 │                                                                                                  │
 │  Select which items to display in the footer.                                                    │
 │                                                                                                  │
-│  > [✓] workspace (/directory)                                                                    │
+│  > [✓] workspace                                                                                 │
 │     Current working directory                                                                    │
-│    [✓] branch                                                                                    │
+│    [✓] git-branch                                                                                │
 │     Current git branch name (not shown when unavailable)                                         │
 │    [✓] sandbox                                                                                   │
 │     Sandbox type and trust indicator                                                             │
-│    [✓] /model                                                                                    │
+│    [✓] model-name                                                                                │
 │     Current model identifier                                                                     │
-│    [✓] /stats                                                                                    │
+│    [✓] quota                                                                                     │
 │     Remaining usage on daily limit (not shown when unavailable)                                  │
-│    [ ] context                                                                                   │
+│    [ ] context-used                                                                              │
 │     Percentage of context window used                                                            │
-│    [ ] memory                                                                                    │
+│    [ ] memory-usage                                                                              │
 │     Memory used by the application                                                               │
-│    [ ] session                                                                                   │
+│    [ ] session-id                                                                                │
 │     Unique identifier for the current session                                                    │
-│    [ ] diff                                                                                      │
+│    [ ] code-changes                                                                              │
 │     Lines added/removed in the session (not shown when zero)                                     │
-│    [ ] tokens                                                                                    │
+│    [ ] token-count                                                                               │
 │     Total tokens used in the session (not shown when zero)                                       │
 │    [✓] Show footer labels                                                                        │
 │                                                                                                  │
@@ -94,25 +94,25 @@ exports[`<FooterConfigDialog /> > renders correctly with default settings 2`] =
 │                                                                                                  │
 │  Select which items to display in the footer.                                                    │
 │                                                                                                  │
-│  > [✓] workspace (/directory)                                                                    │
+│  > [✓] workspace                                                                                 │
 │     Current working directory                                                                    │
-│    [✓] branch                                                                                    │
+│    [✓] git-branch                                                                                │
 │     Current git branch name (not shown when unavailable)                                         │
 │    [✓] sandbox                                                                                   │
 │     Sandbox type and trust indicator                                                             │
-│    [✓] /model                                                                                    │
+│    [✓] model-name                                                                                │
 │     Current model identifier                                                                     │
-│    [✓] /stats                                                                                    │
+│    [✓] quota                                                                                     │
 │     Remaining usage on daily limit (not shown when unavailable)                                  │
-│    [ ] context                                                                                   │
+│    [ ] context-used                                                                              │
 │     Percentage of context window used                                                            │
-│    [ ] memory                                                                                    │
+│    [ ] memory-usage                                                                              │
 │     Memory used by the application                                                               │
-│    [ ] session                                                                                   │
+│    [ ] session-id                                                                                │
 │     Unique identifier for the current session                                                    │
-│    [ ] diff                                                                                      │
+│    [ ] code-changes                                                                              │
 │     Lines added/removed in the session (not shown when zero)                                     │
-│    [ ] tokens                                                                                    │
+│    [ ] token-count                                                                               │
 │     Total tokens used in the session (not shown when zero)                                       │
 │    [✓] Show footer labels                                                                        │
 │                                                                                                  │
diff --git a/packages/cli/src/ui/hooks/useSelectionList.test.tsx b/packages/cli/src/ui/hooks/useSelectionList.test.tsx
index 6b9342d025d..41513752807 100644
--- a/packages/cli/src/ui/hooks/useSelectionList.test.tsx
+++ b/packages/cli/src/ui/hooks/useSelectionList.test.tsx
@@ -81,6 +81,8 @@ describe('useSelectionList', () => {
     isFocused?: boolean;
     showNumbers?: boolean;
     wrapAround?: boolean;
+    focusKey?: string;
+    priority?: boolean;
   }) => {
     let hookResult: ReturnType<typeof useSelectionList>;
     function TestComponent(props: typeof initialProps) {
@@ -771,6 +773,67 @@ describe('useSelectionList', () => {
     });
   });
 
+  describe('Programmatic Focus (focusKey)', () => {
+    it('should change the activeIndex when a valid focusKey is provided', async () => {
+      const { result, rerender, waitUntilReady } =
+        await renderSelectionListHook({
+          items,
+          onSelect: mockOnSelect,
+        });
+      expect(result.current.activeIndex).toBe(0);
+
+      await rerender({ focusKey: 'C' });
+      await waitUntilReady();
+      expect(result.current.activeIndex).toBe(2);
+    });
+
+    it('should ignore a focusKey that does not exist', async () => {
+      const { result, rerender, waitUntilReady } =
+        await renderSelectionListHook({
+          items,
+          onSelect: mockOnSelect,
+        });
+      expect(result.current.activeIndex).toBe(0);
+
+      await rerender({ focusKey: 'UNKNOWN' });
+      await waitUntilReady();
+      expect(result.current.activeIndex).toBe(0);
+    });
+
+    it('should ignore a focusKey that points to a disabled item', async () => {
+      const { result, rerender, waitUntilReady } =
+        await renderSelectionListHook({
+          items, // B is disabled
+          onSelect: mockOnSelect,
+        });
+      expect(result.current.activeIndex).toBe(0);
+
+      await rerender({ focusKey: 'B' });
+      await waitUntilReady();
+      expect(result.current.activeIndex).toBe(0);
+    });
+
+    it('should handle clearing the focusKey', async () => {
+      const { result, rerender, waitUntilReady } =
+        await renderSelectionListHook({
+          items,
+          onSelect: mockOnSelect,
+          focusKey: 'C',
+        });
+      expect(result.current.activeIndex).toBe(2);
+
+      await rerender({ focusKey: undefined });
+      await waitUntilReady();
+      // Should remain at 2
+      expect(result.current.activeIndex).toBe(2);
+
+      // We can then change it again to something else
+      await rerender({ focusKey: 'D' });
+      await waitUntilReady();
+      expect(result.current.activeIndex).toBe(3);
+    });
+  });
+
   describe('Reactivity (Dynamic Updates)', () => {
     it('should update activeIndex when initialIndex prop changes', async () => {
       const { result, rerender } = await renderSelectionListHook({
diff --git a/packages/cli/src/ui/hooks/useSelectionList.ts b/packages/cli/src/ui/hooks/useSelectionList.ts
index 80ca40a0edd..f74c1b1dc27 100644
--- a/packages/cli/src/ui/hooks/useSelectionList.ts
+++ b/packages/cli/src/ui/hooks/useSelectionList.ts
@@ -213,8 +213,7 @@ function selectionListReducer(
     case 'INITIALIZE': {
       const { initialIndex, items, wrapAround } = action.payload;
       const activeKey =
-        initialIndex === state.initialIndex &&
-        state.activeIndex !== state.initialIndex
+        initialIndex === state.initialIndex
           ? state.items[state.activeIndex]?.key
           : undefined;
 

From c88a16232caf3453776961033d778774295ba6ab Mon Sep 17 00:00:00 2001
From: jacob314 <jacob314@gmail.com>
Date: Sat, 7 Mar 2026 12:11:51 -0800
Subject: [PATCH 3/3] test: update cli snapshot tests

---
 ...ts-the-active-item-in-the-preview.snap.svg | 93 ++++++++++---------
 ...s-correctly-with-default-settings.snap.svg | 91 +++++++++---------
 2 files changed, 95 insertions(+), 89 deletions(-)

diff --git a/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-highlights-the-active-item-in-the-preview.snap.svg b/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-highlights-the-active-item-in-the-preview.snap.svg
index f642cb39374..7cec49200d7 100644
--- a/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-highlights-the-active-item-in-the-preview.snap.svg
+++ b/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-highlights-the-active-item-in-the-preview.snap.svg
@@ -13,72 +13,72 @@
     <text x="0" y="53" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="53" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="70" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="27" y="70" fill="#6c7086" textLength="396" lengthAdjust="spacingAndGlyphs">Select which items to display in the footer.</text>
+    <text x="27" y="70" fill="#afafaf" textLength="396" lengthAdjust="spacingAndGlyphs">Select which items to display in the footer.</text>
     <text x="891" y="70" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="87" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="87" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="104" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="104" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="104" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> workspace                                                                                 </text>
+    <text x="45" y="104" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="104" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs"> workspace</text>
     <text x="891" y="104" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="121" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="121" fill="#6c7086" textLength="234" lengthAdjust="spacingAndGlyphs"> Current working directory</text>
+    <text x="45" y="121" fill="#afafaf" textLength="234" lengthAdjust="spacingAndGlyphs"> Current working directory</text>
     <text x="891" y="121" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="138" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="138" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="138" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> git-branch                                                                                </text>
+    <text x="45" y="138" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="138" fill="#ffffff" textLength="99" lengthAdjust="spacingAndGlyphs"> git-branch</text>
     <text x="891" y="138" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="155" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="155" fill="#6c7086" textLength="477" lengthAdjust="spacingAndGlyphs"> Current git branch name (not shown when unavailable)</text>
+    <text x="45" y="155" fill="#afafaf" textLength="477" lengthAdjust="spacingAndGlyphs"> Current git branch name (not shown when unavailable)</text>
     <text x="891" y="155" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="172" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="172" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="172" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> sandbox                                                                                   </text>
+    <text x="45" y="172" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="172" fill="#ffffff" textLength="72" lengthAdjust="spacingAndGlyphs"> sandbox</text>
     <text x="891" y="172" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="189" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="189" fill="#6c7086" textLength="297" lengthAdjust="spacingAndGlyphs"> Sandbox type and trust indicator</text>
+    <text x="45" y="189" fill="#afafaf" textLength="297" lengthAdjust="spacingAndGlyphs"> Sandbox type and trust indicator</text>
     <text x="891" y="189" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="206" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="206" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="206" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> model-name                                                                                </text>
+    <text x="45" y="206" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="206" fill="#ffffff" textLength="99" lengthAdjust="spacingAndGlyphs"> model-name</text>
     <text x="891" y="206" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="223" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="223" fill="#6c7086" textLength="225" lengthAdjust="spacingAndGlyphs"> Current model identifier</text>
+    <text x="45" y="223" fill="#afafaf" textLength="225" lengthAdjust="spacingAndGlyphs"> Current model identifier</text>
     <text x="891" y="223" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="240" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="240" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="240" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> quota                                                                                     </text>
+    <text x="45" y="240" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="240" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs"> quota</text>
     <text x="891" y="240" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="257" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="257" fill="#6c7086" textLength="540" lengthAdjust="spacingAndGlyphs"> Remaining usage on daily limit (not shown when unavailable)</text>
+    <text x="45" y="257" fill="#afafaf" textLength="540" lengthAdjust="spacingAndGlyphs"> Remaining usage on daily limit (not shown when unavailable)</text>
     <text x="891" y="257" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="274" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="274" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="274" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> context-used                                                                              </text>
+    <text x="45" y="274" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="274" fill="#ffffff" textLength="117" lengthAdjust="spacingAndGlyphs"> context-used</text>
     <text x="891" y="274" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="291" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="291" fill="#6c7086" textLength="306" lengthAdjust="spacingAndGlyphs"> Percentage of context window used</text>
+    <text x="45" y="291" fill="#afafaf" textLength="306" lengthAdjust="spacingAndGlyphs"> Percentage of context window used</text>
     <text x="891" y="291" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="308" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="308" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="308" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> memory-usage                                                                              </text>
+    <text x="45" y="308" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="308" fill="#ffffff" textLength="117" lengthAdjust="spacingAndGlyphs"> memory-usage</text>
     <text x="891" y="308" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="325" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="325" fill="#6c7086" textLength="279" lengthAdjust="spacingAndGlyphs"> Memory used by the application</text>
+    <text x="45" y="325" fill="#afafaf" textLength="279" lengthAdjust="spacingAndGlyphs"> Memory used by the application</text>
     <text x="891" y="325" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="342" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="342" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="342" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> session-id                                                                                </text>
+    <text x="45" y="342" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="342" fill="#ffffff" textLength="99" lengthAdjust="spacingAndGlyphs"> session-id</text>
     <text x="891" y="342" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="359" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="359" fill="#6c7086" textLength="378" lengthAdjust="spacingAndGlyphs"> Unique identifier for the current session</text>
+    <text x="45" y="359" fill="#afafaf" textLength="378" lengthAdjust="spacingAndGlyphs"> Unique identifier for the current session</text>
     <text x="891" y="359" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="376" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <rect x="27" y="374" width="9" height="17" fill="#001a00" />
     <text x="27" y="376" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">&gt;</text>
     <rect x="36" y="374" width="9" height="17" fill="#001a00" />
     <rect x="45" y="374" width="27" height="17" fill="#001a00" />
-    <text x="45" y="376" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="45" y="376" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
     <rect x="72" y="374" width="117" height="17" fill="#001a00" />
     <text x="72" y="376" fill="#00cd00" textLength="117" lengthAdjust="spacingAndGlyphs"> code-changes</text>
     <rect x="189" y="374" width="684" height="17" fill="#001a00" />
@@ -86,31 +86,31 @@
     <text x="0" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <rect x="27" y="391" width="18" height="17" fill="#001a00" />
     <rect x="45" y="391" width="513" height="17" fill="#001a00" />
-    <text x="45" y="393" fill="#6c7086" textLength="513" lengthAdjust="spacingAndGlyphs"> Lines added/removed in the session (not shown when zero)</text>
+    <text x="45" y="393" fill="#afafaf" textLength="513" lengthAdjust="spacingAndGlyphs"> Lines added/removed in the session (not shown when zero)</text>
     <rect x="558" y="391" width="315" height="17" fill="#001a00" />
     <text x="891" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="410" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="410" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> token-count                                                                               </text>
+    <text x="45" y="410" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="410" fill="#ffffff" textLength="108" lengthAdjust="spacingAndGlyphs"> token-count</text>
     <text x="891" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="427" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="427" fill="#6c7086" textLength="495" lengthAdjust="spacingAndGlyphs"> Total tokens used in the session (not shown when zero)</text>
+    <text x="45" y="427" fill="#afafaf" textLength="495" lengthAdjust="spacingAndGlyphs"> Total tokens used in the session (not shown when zero)</text>
     <text x="891" y="427" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="444" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="444" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="444" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> Show footer labels                                                                        </text>
+    <text x="45" y="444" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="444" fill="#ffffff" textLength="171" lengthAdjust="spacingAndGlyphs"> Show footer labels</text>
     <text x="891" y="444" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="461" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="461" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="478" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="9" y="478" fill="#ffffff" textLength="882" lengthAdjust="spacingAndGlyphs">    Reset to default footer                                                                       </text>
+    <text x="45" y="478" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Reset to default footer</text>
     <text x="891" y="478" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="495" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="495" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="512" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="512" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="529" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="27" y="529" fill="#6c7086" textLength="585" lengthAdjust="spacingAndGlyphs">Enter to select · ↑/↓ to navigate · ←/→ to reorder · Esc to close</text>
+    <text x="27" y="529" fill="#afafaf" textLength="585" lengthAdjust="spacingAndGlyphs">Enter to select · ↑/↓ to navigate · ←/→ to reorder · Esc to close</text>
     <text x="891" y="529" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="546" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="546" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
@@ -124,25 +124,28 @@
     <text x="891" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="27" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="597" fill="#6c7086" textLength="198" lengthAdjust="spacingAndGlyphs">workspace (/directory)</text>
-    <text x="288" y="597" fill="#6c7086" textLength="54" lengthAdjust="spacingAndGlyphs">branch</text>
-    <text x="396" y="597" fill="#6c7086" textLength="63" lengthAdjust="spacingAndGlyphs">sandbox</text>
-    <text x="504" y="597" fill="#6c7086" textLength="54" lengthAdjust="spacingAndGlyphs">/model</text>
-    <text x="675" y="597" fill="#6c7086" textLength="54" lengthAdjust="spacingAndGlyphs">/stats</text>
-    <rect x="783" y="595" width="72" height="17" fill="#001a00" />
-    <text x="783" y="597" fill="#ffffff" textLength="72" lengthAdjust="spacingAndGlyphs">diff    </text>
+    <text x="45" y="597" fill="#afafaf" textLength="198" lengthAdjust="spacingAndGlyphs">workspace (/directory)</text>
+    <text x="288" y="597" fill="#afafaf" textLength="54" lengthAdjust="spacingAndGlyphs">branch</text>
+    <text x="396" y="597" fill="#afafaf" textLength="63" lengthAdjust="spacingAndGlyphs">sandbox</text>
+    <text x="504" y="597" fill="#afafaf" textLength="54" lengthAdjust="spacingAndGlyphs">/model</text>
+    <text x="675" y="597" fill="#afafaf" textLength="54" lengthAdjust="spacingAndGlyphs">/stats</text>
+    <rect x="783" y="595" width="36" height="17" fill="#001a00" />
+    <text x="783" y="597" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs">diff</text>
+    <rect x="819" y="595" width="36" height="17" fill="#001a00" />
     <text x="864" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="27" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="36" y="614" fill="#ffffff" textLength="360" lengthAdjust="spacingAndGlyphs"> ~/project/path             main        </text>
+    <text x="45" y="614" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">~/project/path</text>
+    <text x="288" y="614" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs">main</text>
     <text x="396" y="614" fill="#00cd00" textLength="54" lengthAdjust="spacingAndGlyphs">docker</text>
-    <text x="450" y="614" fill="#ffffff" textLength="333" lengthAdjust="spacingAndGlyphs">      gemini-2.5-pro     97%         </text>
+    <text x="504" y="614" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">gemini-2.5-pro</text>
+    <text x="675" y="614" fill="#ffffff" textLength="27" lengthAdjust="spacingAndGlyphs">97%</text>
     <rect x="783" y="612" width="27" height="17" fill="#001a00" />
-    <text x="783" y="614" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">+12</text>
+    <text x="783" y="614" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">+12</text>
     <rect x="810" y="612" width="9" height="17" fill="#001a00" />
     <rect x="819" y="612" width="18" height="17" fill="#001a00" />
-    <text x="819" y="614" fill="#f38ba8" textLength="18" lengthAdjust="spacingAndGlyphs">-4</text>
+    <text x="819" y="614" fill="#ff87af" textLength="18" lengthAdjust="spacingAndGlyphs">-4</text>
     <rect x="837" y="612" width="18" height="17" fill="#001a00" />
     <text x="864" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
diff --git a/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-renders-correctly-with-default-settings.snap.svg b/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-renders-correctly-with-default-settings.snap.svg
index f2b66ddb81e..ae9b8eecea1 100644
--- a/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-renders-correctly-with-default-settings.snap.svg
+++ b/packages/cli/src/ui/components/__snapshots__/FooterConfigDialog--FooterConfigDialog-renders-correctly-with-default-settings.snap.svg
@@ -13,7 +13,7 @@
     <text x="0" y="53" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="53" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="70" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="27" y="70" fill="#6c7086" textLength="396" lengthAdjust="spacingAndGlyphs">Select which items to display in the footer.</text>
+    <text x="27" y="70" fill="#afafaf" textLength="396" lengthAdjust="spacingAndGlyphs">Select which items to display in the footer.</text>
     <text x="891" y="70" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="87" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="87" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
@@ -22,7 +22,7 @@
     <text x="27" y="104" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">&gt;</text>
     <rect x="36" y="102" width="9" height="17" fill="#001a00" />
     <rect x="45" y="102" width="27" height="17" fill="#001a00" />
-    <text x="45" y="104" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="45" y="104" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
     <rect x="72" y="102" width="90" height="17" fill="#001a00" />
     <text x="72" y="104" fill="#00cd00" textLength="90" lengthAdjust="spacingAndGlyphs"> workspace</text>
     <rect x="162" y="102" width="711" height="17" fill="#001a00" />
@@ -30,87 +30,87 @@
     <text x="0" y="121" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <rect x="27" y="119" width="18" height="17" fill="#001a00" />
     <rect x="45" y="119" width="234" height="17" fill="#001a00" />
-    <text x="45" y="121" fill="#6c7086" textLength="234" lengthAdjust="spacingAndGlyphs"> Current working directory</text>
+    <text x="45" y="121" fill="#afafaf" textLength="234" lengthAdjust="spacingAndGlyphs"> Current working directory</text>
     <rect x="279" y="119" width="594" height="17" fill="#001a00" />
     <text x="891" y="121" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="138" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="138" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="138" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> git-branch                                                                                </text>
+    <text x="45" y="138" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="138" fill="#ffffff" textLength="99" lengthAdjust="spacingAndGlyphs"> git-branch</text>
     <text x="891" y="138" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="155" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="155" fill="#6c7086" textLength="477" lengthAdjust="spacingAndGlyphs"> Current git branch name (not shown when unavailable)</text>
+    <text x="45" y="155" fill="#afafaf" textLength="477" lengthAdjust="spacingAndGlyphs"> Current git branch name (not shown when unavailable)</text>
     <text x="891" y="155" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="172" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="172" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="172" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> sandbox                                                                                   </text>
+    <text x="45" y="172" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="172" fill="#ffffff" textLength="72" lengthAdjust="spacingAndGlyphs"> sandbox</text>
     <text x="891" y="172" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="189" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="189" fill="#6c7086" textLength="297" lengthAdjust="spacingAndGlyphs"> Sandbox type and trust indicator</text>
+    <text x="45" y="189" fill="#afafaf" textLength="297" lengthAdjust="spacingAndGlyphs"> Sandbox type and trust indicator</text>
     <text x="891" y="189" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="206" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="206" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="206" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> model-name                                                                                </text>
+    <text x="45" y="206" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="206" fill="#ffffff" textLength="99" lengthAdjust="spacingAndGlyphs"> model-name</text>
     <text x="891" y="206" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="223" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="223" fill="#6c7086" textLength="225" lengthAdjust="spacingAndGlyphs"> Current model identifier</text>
+    <text x="45" y="223" fill="#afafaf" textLength="225" lengthAdjust="spacingAndGlyphs"> Current model identifier</text>
     <text x="891" y="223" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="240" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="240" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="240" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> quota                                                                                     </text>
+    <text x="45" y="240" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="240" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs"> quota</text>
     <text x="891" y="240" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="257" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="257" fill="#6c7086" textLength="540" lengthAdjust="spacingAndGlyphs"> Remaining usage on daily limit (not shown when unavailable)</text>
+    <text x="45" y="257" fill="#afafaf" textLength="540" lengthAdjust="spacingAndGlyphs"> Remaining usage on daily limit (not shown when unavailable)</text>
     <text x="891" y="257" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="274" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="274" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="274" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> context-used                                                                              </text>
+    <text x="45" y="274" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="274" fill="#ffffff" textLength="117" lengthAdjust="spacingAndGlyphs"> context-used</text>
     <text x="891" y="274" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="291" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="291" fill="#6c7086" textLength="306" lengthAdjust="spacingAndGlyphs"> Percentage of context window used</text>
+    <text x="45" y="291" fill="#afafaf" textLength="306" lengthAdjust="spacingAndGlyphs"> Percentage of context window used</text>
     <text x="891" y="291" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="308" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="308" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="308" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> memory-usage                                                                              </text>
+    <text x="45" y="308" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="308" fill="#ffffff" textLength="117" lengthAdjust="spacingAndGlyphs"> memory-usage</text>
     <text x="891" y="308" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="325" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="325" fill="#6c7086" textLength="279" lengthAdjust="spacingAndGlyphs"> Memory used by the application</text>
+    <text x="45" y="325" fill="#afafaf" textLength="279" lengthAdjust="spacingAndGlyphs"> Memory used by the application</text>
     <text x="891" y="325" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="342" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="342" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="342" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> session-id                                                                                </text>
+    <text x="45" y="342" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="342" fill="#ffffff" textLength="99" lengthAdjust="spacingAndGlyphs"> session-id</text>
     <text x="891" y="342" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="359" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="359" fill="#6c7086" textLength="378" lengthAdjust="spacingAndGlyphs"> Unique identifier for the current session</text>
+    <text x="45" y="359" fill="#afafaf" textLength="378" lengthAdjust="spacingAndGlyphs"> Unique identifier for the current session</text>
     <text x="891" y="359" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="376" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="376" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="376" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> code-changes                                                                              </text>
+    <text x="45" y="376" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="376" fill="#ffffff" textLength="117" lengthAdjust="spacingAndGlyphs"> code-changes</text>
     <text x="891" y="376" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="393" fill="#6c7086" textLength="513" lengthAdjust="spacingAndGlyphs"> Lines added/removed in the session (not shown when zero)</text>
+    <text x="45" y="393" fill="#afafaf" textLength="513" lengthAdjust="spacingAndGlyphs"> Lines added/removed in the session (not shown when zero)</text>
     <text x="891" y="393" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="410" fill="#6c7086" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
-    <text x="72" y="410" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> token-count                                                                               </text>
+    <text x="45" y="410" fill="#afafaf" textLength="27" lengthAdjust="spacingAndGlyphs">[ ]</text>
+    <text x="72" y="410" fill="#ffffff" textLength="108" lengthAdjust="spacingAndGlyphs"> token-count</text>
     <text x="891" y="410" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="427" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="427" fill="#6c7086" textLength="495" lengthAdjust="spacingAndGlyphs"> Total tokens used in the session (not shown when zero)</text>
+    <text x="45" y="427" fill="#afafaf" textLength="495" lengthAdjust="spacingAndGlyphs"> Total tokens used in the session (not shown when zero)</text>
     <text x="891" y="427" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="444" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="45" y="444" fill="#a6e3a1" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
-    <text x="72" y="444" fill="#ffffff" textLength="819" lengthAdjust="spacingAndGlyphs"> Show footer labels                                                                        </text>
+    <text x="45" y="444" fill="#d7ffd7" textLength="27" lengthAdjust="spacingAndGlyphs">[✓]</text>
+    <text x="72" y="444" fill="#ffffff" textLength="171" lengthAdjust="spacingAndGlyphs"> Show footer labels</text>
     <text x="891" y="444" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="461" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="461" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="478" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="9" y="478" fill="#ffffff" textLength="882" lengthAdjust="spacingAndGlyphs">    Reset to default footer                                                                       </text>
+    <text x="45" y="478" fill="#ffffff" textLength="207" lengthAdjust="spacingAndGlyphs">Reset to default footer</text>
     <text x="891" y="478" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="495" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="495" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="512" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="512" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="529" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="27" y="529" fill="#6c7086" textLength="585" lengthAdjust="spacingAndGlyphs">Enter to select · ↑/↓ to navigate · ←/→ to reorder · Esc to close</text>
+    <text x="27" y="529" fill="#afafaf" textLength="585" lengthAdjust="spacingAndGlyphs">Enter to select · ↑/↓ to navigate · ←/→ to reorder · Esc to close</text>
     <text x="891" y="529" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="546" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="546" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
@@ -124,21 +124,24 @@
     <text x="891" y="580" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="27" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <rect x="45" y="595" width="243" height="17" fill="#001a00" />
-    <text x="45" y="597" fill="#ffffff" textLength="243" lengthAdjust="spacingAndGlyphs">workspace (/directory)     </text>
-    <text x="315" y="597" fill="#6c7086" textLength="54" lengthAdjust="spacingAndGlyphs">branch</text>
-    <text x="432" y="597" fill="#6c7086" textLength="63" lengthAdjust="spacingAndGlyphs">sandbox</text>
-    <text x="567" y="597" fill="#6c7086" textLength="54" lengthAdjust="spacingAndGlyphs">/model</text>
-    <text x="756" y="597" fill="#6c7086" textLength="54" lengthAdjust="spacingAndGlyphs">/stats</text>
+    <rect x="45" y="595" width="198" height="17" fill="#001a00" />
+    <text x="45" y="597" fill="#ffffff" textLength="198" lengthAdjust="spacingAndGlyphs">workspace (/directory)</text>
+    <rect x="243" y="595" width="45" height="17" fill="#001a00" />
+    <text x="315" y="597" fill="#afafaf" textLength="54" lengthAdjust="spacingAndGlyphs">branch</text>
+    <text x="432" y="597" fill="#afafaf" textLength="63" lengthAdjust="spacingAndGlyphs">sandbox</text>
+    <text x="567" y="597" fill="#afafaf" textLength="54" lengthAdjust="spacingAndGlyphs">/model</text>
+    <text x="756" y="597" fill="#afafaf" textLength="54" lengthAdjust="spacingAndGlyphs">/stats</text>
     <text x="864" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="597" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="27" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <rect x="45" y="612" width="243" height="17" fill="#001a00" />
-    <text x="45" y="614" fill="#ffffff" textLength="243" lengthAdjust="spacingAndGlyphs">~/project/path             </text>
-    <text x="288" y="614" fill="#ffffff" textLength="144" lengthAdjust="spacingAndGlyphs">   main         </text>
+    <rect x="45" y="612" width="126" height="17" fill="#001a00" />
+    <text x="45" y="614" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">~/project/path</text>
+    <rect x="171" y="612" width="117" height="17" fill="#001a00" />
+    <text x="315" y="614" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs">main</text>
     <text x="432" y="614" fill="#00cd00" textLength="54" lengthAdjust="spacingAndGlyphs">docker</text>
-    <text x="486" y="614" fill="#ffffff" textLength="378" lengthAdjust="spacingAndGlyphs">         gemini-2.5-pro       97%         </text>
+    <text x="567" y="614" fill="#ffffff" textLength="126" lengthAdjust="spacingAndGlyphs">gemini-2.5-pro</text>
+    <text x="756" y="614" fill="#ffffff" textLength="27" lengthAdjust="spacingAndGlyphs">97%</text>
     <text x="864" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="891" y="614" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="0" y="631" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>