Merge pull request #74729 from NousResearch/bb/no-auto-filetree

Opening the diff pane no longer opens the file tree

apps/desktop/src/app/contrib/controller.tsx

@@ -27,8 +27,6 @@ import {
   revealTreePane,
   setPaneCollapsed,
   setTreePaneHidden,
-  setTreeSideCollapsed,
-  treeSideOfPane,
   watchContributedPanes
 } from '@/components/pane-shell/tree/store'
 import { SidebarProvider } from '@/components/ui/sidebar'
@@ -629,18 +627,6 @@ registerPaneCloser('files', () =>
 // the side, unhide, front — a NEW target while already visible still fronts.
 const revealPreview = () => {
   dockPaneBeside('preview', 'files')
-
-  // The preview shares a collapsible column with the file tree, and
-  // revealTreePane un-collapses a column through its bound store — here ⌘J /
-  // $fileBrowserOpen, which IS the tree's toggle. Going through it would open
-  // the tree every time a preview opened. Un-collapse the column directly and
-  // leave the toggle alone, so a preview can appear on its own.
-  const side = treeSideOfPane('preview')
-
-  if (side) {
-    setTreeSideCollapsed(side, false)
-  }
-
   revealTreePane('preview')
 }
 

apps/desktop/src/components/pane-shell/tree/reactive-unhide.test.ts

@@ -29,19 +29,21 @@ describe('reactive pane unhide', () => {
     const model = await import('@/components/pane-shell/tree/model')
     const { registry } = await import('@/contrib/registry')
 
-    // Register `files` like controller.tsx does — placement 'right' is what
-    // makes `treeSideOfPane('files')` return 'right' (and therefore what
-    // makes the buggy `revealTreePane` auto-expand the right column).
-    registry.register({
-      id: 'files',
-      area: 'panes',
-      title: 'files',
-      data: { placement: 'right' },
-      render: () => null
-    })
+    // Register the right-column panes like controller.tsx does — placement
+    // 'right' is what makes `treeSideOfPane(id)` return 'right' (and therefore
+    // what makes the buggy `revealTreePane` auto-expand the right column).
+    for (const id of ['files', 'preview', 'review']) {
+      registry.register({
+        id,
+        area: 'panes',
+        title: id,
+        data: { placement: 'right' },
+        render: () => null
+      })
+    }
 
     // Declare a minimal default tree mirroring the production DEFAULT_TREE's
-    // row shape (sessions | workspace | right-column-with-files).
+    // row shape (sessions | workspace | right-column-with-the-rail).
     tree.declareDefaultTree(
       model.split(
         'row',
@@ -51,7 +53,16 @@ describe('reactive pane unhide', () => {
           model.split(
             'column',
             [
-              model.split('row', [model.group(['files'], { id: 'grp-files' })], [1], 'spl-rail'),
+              model.split(
+                'row',
+                [
+                  model.group(['review'], { id: 'grp-review' }),
+                  model.group(['preview'], { id: 'grp-preview' }),
+                  model.group(['files'], { id: 'grp-files' })
+                ],
+                [1, 1, 1.2],
+                'spl-rail'
+              ),
               model.group(['terminal'], { id: 'grp-terminal' })
             ],
             [1.6, 1],
@@ -127,30 +138,16 @@ describe('reactive pane unhide', () => {
     expect(tree.$collapsedTreeSides.get().has('right')).toBe(false)
   })
 
-  // Opening a preview used to drag the file tree open with it: the preview
-  // shares ⌘J's column, and `revealTreePane` un-collapses a column through its
-  // bound store — which for the right side IS the file-browser toggle. The
-  // reveal now un-collapses the column directly and leaves the toggle alone.
+  // Opening a neighbour used to drag the file tree open with it: review and
+  // preview share ⌘J's column, and `revealTreePane` un-collapsed a column
+  // through its bound store — which for the right side IS the file-browser
+  // toggle. The reveal now un-collapses the column directly.
   it('revealing a preview opens its column without flipping the file-tree toggle', async () => {
     const { tree, layout } = await setupWithFiles()
-    const { registry } = await import('@/contrib/registry')
-
-    registry.register({
-      id: 'preview',
-      area: 'panes',
-      data: { placement: 'right' },
-      render: () => null,
-      title: 'preview'
-    })
 
     layout.setFileBrowserOpen(false)
     expect(tree.$collapsedTreeSides.get().has('right')).toBe(true)
 
-    // The revealPreview sequence from controller.tsx.
-    const side = tree.treeSideOfPane('files')
-
-    expect(side).toBe('right')
-    tree.setTreeSideCollapsed(side!, false)
     tree.revealTreePane('preview')
 
     // The column is showing…
@@ -159,6 +156,20 @@ describe('reactive pane unhide', () => {
     expect(layout.$fileBrowserOpen.get()).toBe(false)
   })
 
+  it('opening the diff pane leaves the file tree closed', async () => {
+    const { tree, layout } = await setupWithFiles()
+
+    layout.setFileBrowserOpen(false)
+    expect(tree.$collapsedTreeSides.get().has('right')).toBe(true)
+
+    // ⌘G — `toggleReview` reveals the review pane, which lives in the same
+    // right column as the file tree.
+    tree.revealTreePane('review')
+
+    expect(tree.$collapsedTreeSides.get().has('right')).toBe(false)
+    expect(layout.$fileBrowserOpen.get()).toBe(false)
+  })
+
   it('reactive unhide does not invoke the right side opener directly', async () => {
     const { tree, layout } = await setupWithFiles()
 

apps/desktop/src/components/pane-shell/tree/store.ts

@@ -646,8 +646,10 @@ export type TreeSide = 'left' | 'right'
 export const $collapsedTreeSides = atom<ReadonlySet<TreeSide>>(new Set())
 
 // Side visibility is DERIVED from an app store (the binding owns persistence
-// + button state); reveals flow back through its setter so they never
-// disagree with the flag.
+// + button state). Reveals un-collapse the column directly instead of writing
+// back through the setter — the right side's store IS the file tree's toggle,
+// so a neighbour's reveal must not press it. Layout reset still reopens every
+// side through its setter, because there the toggles SHOULD move.
 const sideOpeners: Partial<Record<TreeSide, (open: boolean) => void>> = {}
 
 export function setTreeSideCollapsed(side: TreeSide, collapsed: boolean) {
@@ -772,14 +774,12 @@ export function revealTreePane(paneId: string) {
   const side = treeSideOfPane(paneId)
 
   if (side && $collapsedTreeSides.get().has(side)) {
-    const open = sideOpeners[side]
-
-    // Through the bound store when there is one, so the toggle stays truthful.
-    if (open) {
-      open(true)
-    } else {
-      setTreeSideCollapsed(side, false)
-    }
+    // Un-collapse the COLUMN, never the side's bound store: on the right that
+    // store is ⌘J / $fileBrowserOpen, i.e. the file tree's own toggle. Routing
+    // a reveal through it dragged the tree open behind every neighbour that
+    // shares the column — open the diff (⌘G) and the file tree appeared too.
+    // The tree opens only when the user opens it.
+    setTreeSideCollapsed(side, false)
   }
 
   const hiddenNow = $hiddenTreePanes.get()