From 039b890a111fed2c6dd3b1f623d400aac45c9933 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 2 Apr 2026 00:11:34 +0200
Subject: [PATCH 1/2] Sessions - tree rendering fixes

---
 src/vs/sessions/contrib/changes/browser/changesView.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/vs/sessions/contrib/changes/browser/changesView.ts b/src/vs/sessions/contrib/changes/browser/changesView.ts
index 62dbb96c3687a..be4033bbf1d61 100644
--- a/src/vs/sessions/contrib/changes/browser/changesView.ts
+++ b/src/vs/sessions/contrib/changes/browser/changesView.ts
@@ -189,10 +189,14 @@ function buildTreeChildren(items: IChangesFileItem[], treeRootInfo?: IChangesTre
 					incompressible: true,
 				});
 			} else {
-				// Folder node
+				// Folder node. Ensure that the first level of folders under
+				// the root folder are not being collapsed with the root folder
+				// as that is a special node showing the workspace folder and
+				// branch information.
 				result.push({
 					element: child,
 					children: convertChildren(child),
+					incompressible: child.parent?.parent === undefined,
 					collapsible: true,
 					collapsed: false,
 				});
@@ -1706,6 +1710,7 @@ class ChangesTreeRenderer implements ICompressibleTreeRenderer<ChangesTreeElemen
 	private renderFolderElement(node: IResourceNode<IChangesFileItem, undefined>, templateData: IChangesTreeTemplate): void {
 		templateData.label.setFile(node.uri, {
 			fileKind: FileKind.FOLDER,
+			hidePath: true,
 		});
 
 		// Hide file-specific decorations for folders

From 16a65a2162a7aa81770ffbc259e55c0ec30bf6e0 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 2 Apr 2026 00:21:22 +0200
Subject: [PATCH 2/2] Pull request feedback

---
 src/vs/sessions/contrib/changes/browser/changesView.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/vs/sessions/contrib/changes/browser/changesView.ts b/src/vs/sessions/contrib/changes/browser/changesView.ts
index be4033bbf1d61..981464d7c0fcc 100644
--- a/src/vs/sessions/contrib/changes/browser/changesView.ts
+++ b/src/vs/sessions/contrib/changes/browser/changesView.ts
@@ -196,7 +196,7 @@ function buildTreeChildren(items: IChangesFileItem[], treeRootInfo?: IChangesTre
 				result.push({
 					element: child,
 					children: convertChildren(child),
-					incompressible: child.parent?.parent === undefined,
+					incompressible: parent === resourceTree.root,
 					collapsible: true,
 					collapsed: false,
 				});
@@ -1546,6 +1546,10 @@ class ChangesTreeRenderer implements ICompressibleTreeRenderer<ChangesTreeElemen
 			return activeSession?.sessionType ?? '';
 		}));
 
+		templateDisposables.add(bindContextKey(hasGitRepositoryContextKey, contextKeyService, reader => {
+			return this.viewModel.activeSessionHasGitRepositoryObs.read(reader);
+		}));
+
 		templateDisposables.add(bindContextKey(changesVersionModeContextKey, contextKeyService, reader => {
 			return this.viewModel.versionModeObs.read(reader);
 		}));