From 673e558f49bbc5328ad61cbdbf8d602f9eb75bd5 Mon Sep 17 00:00:00 2001
From: Jinjing <6427696+AmethystLiang@users.noreply.github.com>
Date: Sun, 17 May 2026 00:07:42 -0700
Subject: [PATCH] fix: address review findings (#2143)

---
 src/main/codex-accounts/runtime-home-service.test.ts      | 2 +-
 src/main/codex-accounts/service.test.ts                   | 2 +-
 src/main/persistence.test.ts                              | 2 +-
 src/renderer/src/components/editor/CombinedDiffViewer.tsx | 4 +++-
 src/shared/constants.ts                                   | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/codex-accounts/runtime-home-service.test.ts b/src/main/codex-accounts/runtime-home-service.test.ts
index 498294880fe..ec15accdfed 100644
--- a/src/main/codex-accounts/runtime-home-service.test.ts
+++ b/src/main/codex-accounts/runtime-home-service.test.ts
@@ -74,7 +74,7 @@ function createSettings(overrides: Partial<GlobalSettings> = {}): GlobalSettings
     floatingTerminalCwd: '~',
     floatingTerminalTriggerLocation: 'floating-button',
     diffDefaultView: 'inline',
-    combinedDiffFileTreeVisibleByDefault: true,
+    combinedDiffFileTreeVisibleByDefault: false,
     notifications: {
       enabled: true,
       agentTaskComplete: true,
diff --git a/src/main/codex-accounts/service.test.ts b/src/main/codex-accounts/service.test.ts
index ca978d04c28..27a881a9ca5 100644
--- a/src/main/codex-accounts/service.test.ts
+++ b/src/main/codex-accounts/service.test.ts
@@ -67,7 +67,7 @@ function createSettings(overrides: Partial<GlobalSettings> = {}): GlobalSettings
     floatingTerminalCwd: '~',
     floatingTerminalTriggerLocation: 'floating-button',
     diffDefaultView: 'inline',
-    combinedDiffFileTreeVisibleByDefault: true,
+    combinedDiffFileTreeVisibleByDefault: false,
     notifications: {
       enabled: true,
       agentTaskComplete: true,
diff --git a/src/main/persistence.test.ts b/src/main/persistence.test.ts
index 01cdd7feafd..d74124435e0 100644
--- a/src/main/persistence.test.ts
+++ b/src/main/persistence.test.ts
@@ -596,7 +596,7 @@ describe('Store', () => {
     expect(store.getSettings().refreshLocalBaseRefOnWorktreeCreate).toBe(false)
     expect(store.getSettings().rightSidebarOpenByDefault).toBe(true)
     expect(store.getSettings().showTasksButton).toBe(true)
-    expect(store.getSettings().combinedDiffFileTreeVisibleByDefault).toBe(true)
+    expect(store.getSettings().combinedDiffFileTreeVisibleByDefault).toBe(false)
     expect(store.getSettings().visibleTaskProviders).toEqual(['github', 'gitlab', 'linear'])
     expect(store.getSettings().experimentalActivity).toBe(true)
     expect(store.getSettings().notifications.customSoundPath).toBeNull()
diff --git a/src/renderer/src/components/editor/CombinedDiffViewer.tsx b/src/renderer/src/components/editor/CombinedDiffViewer.tsx
index fcb7262094a..58e6a7eedae 100644
--- a/src/renderer/src/components/editor/CombinedDiffViewer.tsx
+++ b/src/renderer/src/components/editor/CombinedDiffViewer.tsx
@@ -121,7 +121,9 @@ function getInitialCombinedDiffSideBySide(diffDefaultView: string | undefined):
 function getInitialCombinedDiffFileTreeCollapsed(
   combinedDiffFileTreeVisibleByDefault: boolean | undefined
 ): boolean {
-  return combinedDiffFileTreeCollapsedPreference ?? combinedDiffFileTreeVisibleByDefault === false
+  // Why: the tree is opt-in for new sessions; only an explicit saved setting
+  // should make it the opening surface while settings are still loading.
+  return combinedDiffFileTreeCollapsedPreference ?? combinedDiffFileTreeVisibleByDefault !== true
 }
 
 function commitMessageBody(message: string | undefined, subject: string | undefined): string {
diff --git a/src/shared/constants.ts b/src/shared/constants.ts
index 92df6558f73..7ce34db456d 100644
--- a/src/shared/constants.ts
+++ b/src/shared/constants.ts
@@ -222,7 +222,7 @@ export function getDefaultSettings(homedir: string): GlobalSettings {
     floatingTerminalTriggerLocation: 'floating-button',
     notifications: getDefaultNotificationSettings(),
     diffDefaultView: 'inline',
-    combinedDiffFileTreeVisibleByDefault: true,
+    combinedDiffFileTreeVisibleByDefault: false,
     promptCacheTimerEnabled: false,
     promptCacheTtlMs: 300_000,
     codexManagedAccounts: [],