feat: make DiffRenderer respect ui.showLineNumbers setting

packages/cli/src/ui/components/messages/DiffRenderer.tsx

@@ -11,6 +11,7 @@ import { colorizeCode, colorizeLine } from '../../utils/CodeColorizer.js';
 import { MaxSizedBox } from '../shared/MaxSizedBox.js';
 import { theme as semanticTheme } from '../../semantic-colors.js';
 import type { Theme } from '../../themes/theme.js';
+import type { LoadedSettings } from '../../../config/settings.js';
 
 interface DiffLine {
   type: 'add' | 'del' | 'context' | 'hunk' | 'other';
@@ -86,6 +87,7 @@ interface DiffRendererProps {
   availableTerminalHeight?: number;
   terminalWidth: number;
   theme?: Theme;
+  settings?: LoadedSettings;
 }
 
 const DEFAULT_TAB_WIDTH = 4; // Spaces per tab for normalization
@@ -97,6 +99,7 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
   availableTerminalHeight,
   terminalWidth,
   theme,
+  settings,
 }) => {
   const screenReaderEnabled = useIsScreenReaderEnabled();
   if (!diffContent || typeof diffContent !== 'string') {
@@ -157,6 +160,7 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
       availableTerminalHeight,
       terminalWidth,
       theme,
+      settings,
     );
   } else {
     renderedOutput = renderDiffContent(
@@ -165,6 +169,7 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
       tabWidth,
       availableTerminalHeight,
       terminalWidth,
+      settings,
     );
   }
 
@@ -177,6 +182,7 @@ const renderDiffContent = (
   tabWidth = DEFAULT_TAB_WIDTH,
   availableTerminalHeight: number | undefined,
   terminalWidth: number,
+  settings?: LoadedSettings,
 ) => {
   // 1. Normalize whitespace (replace tabs with spaces) *before* further processing
   const normalizedLines = parsedLines.map((line) => ({
@@ -201,6 +207,8 @@ const renderDiffContent = (
     );
   }
 
+  const showLineNumbers = settings?.merged.ui?.showLineNumbers ?? true;
+
   const maxLineNumber = Math.max(
     0,
     ...displayableLines.map((l) => l.oldLine ?? 0),
@@ -299,18 +307,20 @@ const renderDiffContent = (
 
         acc.push(
           <Box key={lineKey} flexDirection="row">
-            <Text
-              color={semanticTheme.text.secondary}
-              backgroundColor={
-                line.type === 'add'
-                  ? semanticTheme.background.diff.added
-                  : line.type === 'del'
-                    ? semanticTheme.background.diff.removed
-                    : undefined
-              }
-            >
-              {gutterNumStr.padStart(gutterWidth)}{' '}
-            </Text>
+            {showLineNumbers && (
+              <Text
+                color={semanticTheme.text.secondary}
+                backgroundColor={
+                  line.type === 'add'
+                    ? semanticTheme.background.diff.added
+                    : line.type === 'del'
+                      ? semanticTheme.background.diff.removed
+                      : undefined
+                }
+              >
+                {gutterNumStr.padStart(gutterWidth)}{' '}
+              </Text>
+            )}
             {line.type === 'context' ? (
               <>
                 <Text>{prefixSymbol} </Text>