feat: finished phase 3

src/renderer/components/GitDiffView/GitDiffView.tsx

@@ -36,7 +36,7 @@ function detectLanguage(filePath: string): string {
 }
 
 export const GitDiffView: React.FC<GitDiffViewProps> = ({ filePath }) => {
-  const { activeProject } = useAppStore();
+  const { activeProject, gitDiffPreferences } = useAppStore();
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
   const [original, setOriginal] = useState('');
@@ -105,14 +105,17 @@ export const GitDiffView: React.FC<GitDiffViewProps> = ({ filePath }) => {
           height="100%"
           options={{
             readOnly: true,
-            renderSideBySide: false,
+            renderSideBySide: gitDiffPreferences.viewStyle === 'side-by-side',
             minimap: { enabled: false },
             lineNumbers: 'on',
             scrollBeyondLastLine: false,
             renderOverviewRuler: true,
             originalEditable: false,
             diffCodeLens: false,
-            wordWrap: 'off',
+            wordWrap: gitDiffPreferences.wordWrap ? 'on' : 'off',
+            hideUnchangedRegions: {
+              enabled: gitDiffPreferences.hideUnchangedRegions,
+            },
             ignoreTrimWhitespace: false,
           }}
         />

src/renderer/components/SettingsView/SettingsView.tsx

@@ -90,7 +90,14 @@ const SettingSection: React.FC<{
 };
 
 export const SettingsView: React.FC = () => {
-  const { preferredEditorMode, setPreferredEditorMode, activeProject, setActiveProject } = useAppStore();
+  const {
+    preferredEditorMode,
+    setPreferredEditorMode,
+    gitDiffPreferences,
+    setGitDiffPreferences,
+    activeProject,
+    setActiveProject,
+  } = useAppStore();
   const [searchQuery, setSearchQuery] = useState('');
   const [credentials, setCredentials] = useState<Credentials>(defaultCredentials);
   const [showSecrets, setShowSecrets] = useState(false);
@@ -410,6 +417,65 @@ export const SettingsView: React.FC = () => {
           <option value="preview">Preview (Read-only)</option>
         </select>
       </SettingRow>
+
+      <SettingRow
+        id="diff-view-style"
+        label="Diff View Style"
+        description="Choose how Git diffs are shown by default."
+      >
+        <select
+          id="diff-view-style"
+          aria-label="Diff View Style"
+          value={gitDiffPreferences.viewStyle}
+          onChange={(e) =>
+            setGitDiffPreferences({
+              ...gitDiffPreferences,
+              viewStyle: e.target.value as 'inline' | 'side-by-side',
+            })
+          }
+        >
+          <option value="inline">Inline</option>
+          <option value="side-by-side">Side by Side</option>
+        </select>
+      </SettingRow>
+
+      <SettingRow
+        id="diff-wrap-long-lines"
+        label="Wrap Long Lines in Diff"
+        description="Enable word wrapping for long lines in Git diffs."
+      >
+        <input
+          id="diff-wrap-long-lines"
+          aria-label="Wrap long lines in diff"
+          type="checkbox"
+          checked={gitDiffPreferences.wordWrap}
+          onChange={(e) =>
+            setGitDiffPreferences({
+              ...gitDiffPreferences,
+              wordWrap: e.target.checked,
+            })
+          }
+        />
+      </SettingRow>
+
+      <SettingRow
+        id="diff-hide-unchanged-regions"
+        label="Hide Unchanged Regions"
+        description="Collapse unchanged regions in Git diffs."
+      >
+        <input
+          id="diff-hide-unchanged-regions"
+          aria-label="Hide unchanged regions"
+          type="checkbox"
+          checked={gitDiffPreferences.hideUnchangedRegions}
+          onChange={(e) =>
+            setGitDiffPreferences({
+              ...gitDiffPreferences,
+              hideUnchangedRegions: e.target.checked,
+            })
+          }
+        />
+      </SettingRow>
     </SettingSection>
   );