From 2b3ea7e554472426a6a7c2b13c572cc047291c2b Mon Sep 17 00:00:00 2001
From: "vs-code-engineering[bot]"
 <vs-code-engineering[bot]@users.noreply.github.com>
Date: Sun, 6 Sep 2026 11:02:06 +0000
Subject: [PATCH] [cherry-pick] [cherry-pick] agentHost: Preserve workspace
 transition boundaries

---
 .../contrib/chat/test/browser/widget/chatListRenderer.test.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/test/browser/widget/chatListRenderer.test.ts b/src/vs/workbench/contrib/chat/test/browser/widget/chatListRenderer.test.ts
index 84875920b6e73a..79ede239203a8a 100644
--- a/src/vs/workbench/contrib/chat/test/browser/widget/chatListRenderer.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/widget/chatListRenderer.test.ts
@@ -1558,6 +1558,10 @@ suite('ChatListRenderer', () => {
 		configurationService.setUserConfiguration(ChatConfiguration.CollapseCompletedResponses, true);
 		configurationService.setUserConfiguration('chat.checkpoints.enabled', false);
 		configurationService.setUserConfiguration('chat.checkpoints.showFileChanges', false);
+<<<<<<< HEAD
+=======
+		configurationService.setUserConfiguration(ChatConfiguration.TurnStatusPills, false);
+>>>>>>> f9a273540ca ([cherry-pick] agentHost: Preserve workspace transition boundaries (#334694))
 		configurationService.setUserConfiguration(ChatConfiguration.Verbose, false);
 		instantiationService.stub(IConfigurationService, configurationService);
 		instantiationService.stub(IChatService, new MockChatService());