diff --git a/apps/web/tests/snapshots/lifecycle-chrome/hero.expected.md b/apps/web/tests/snapshots/lifecycle-chrome/hero.expected.md
index c666681b0b..64ff6ae8f0 100644
--- a/apps/web/tests/snapshots/lifecycle-chrome/hero.expected.md
+++ b/apps/web/tests/snapshots/lifecycle-chrome/hero.expected.md
@@ -5,17 +5,17 @@
   - img
   - text: New Session
 - text: Workspaces
-- button "Group by":
+- button "Search sessions":
+  - img
+- textbox "Search sessions..."
+- button "View options":
   - img
 - button "Add workspace":
   - img
-- button "Search sessions":
-  - img
-- textbox "Search name, keywords..."
 - tree "Sessions":
-  - treeitem "workspace 1 session" [expanded]:
+  - treeitem "workspace" [expanded]:
     - img
-    - text: workspace 1 session
+    - text: workspace
   - treeitem "New Session" [selected]
 - button "Settings":
   - img
diff --git a/apps/web/tests/snapshots/lifecycle-chrome/plan-active.expected.md b/apps/web/tests/snapshots/lifecycle-chrome/plan-active.expected.md
index 2f9c701936..396a9bfa88 100644
--- a/apps/web/tests/snapshots/lifecycle-chrome/plan-active.expected.md
+++ b/apps/web/tests/snapshots/lifecycle-chrome/plan-active.expected.md
@@ -5,17 +5,17 @@
   - img
   - text: New Session
 - text: Workspaces
-- button "Group by":
+- button "Search sessions":
+  - img
+- textbox "Search sessions..."
+- button "View options":
   - img
 - button "Add workspace":
   - img
-- button "Search sessions":
-  - img
-- textbox "Search name, keywords..."
 - tree "Sessions":
-  - treeitem "workspace 1 session" [expanded]:
+  - treeitem "workspace" [expanded]:
     - img
-    - text: workspace 1 session
+    - text: workspace
   - treeitem "New Session" [selected]
 - button "Settings":
   - img
diff --git a/apps/web/tests/snapshots/message-actions/fork.expected.md b/apps/web/tests/snapshots/message-actions/fork.expected.md
index d20754711d..2487b6c374 100644
--- a/apps/web/tests/snapshots/message-actions/fork.expected.md
+++ b/apps/web/tests/snapshots/message-actions/fork.expected.md
@@ -1,7 +1,7 @@
 - tree "Sessions":
-  - treeitem "Ungrouped 3 sessions" [expanded]:
+  - treeitem "Ungrouped" [expanded]:
     - img
-    - text: Ungrouped 3 sessions
-  - treeitem "Use the read tool twice (2) now" [selected]
-  - treeitem "Use the read tool twice (1) now"
+    - text: Ungrouped
   - treeitem "Use the read tool twice 1min"
+  - treeitem "Use the read tool twice (1) now"
+  - treeitem "Use the read tool twice (2) now" [selected]
diff --git a/apps/web/tests/snapshots/sidebar-subagent-activity/owner-running.expected.md b/apps/web/tests/snapshots/sidebar-subagent-activity/owner-running.expected.md
index c5a2766750..a4167b5190 100644
--- a/apps/web/tests/snapshots/sidebar-subagent-activity/owner-running.expected.md
+++ b/apps/web/tests/snapshots/sidebar-subagent-activity/owner-running.expected.md
@@ -1,6 +1,6 @@
 - tree "Sessions":
-  - treeitem "workspace 2 sessions" [expanded]:
+  - treeitem "workspace" [expanded]:
     - img
-    - text: workspace 2 sessions
-  - treeitem "1 subagent running Delegate a background task. now"
+    - text: workspace
   - treeitem "New Session" [selected]
+  - treeitem "1 subagent running Delegate a background task. now"
diff --git a/apps/web/tests/snapshots/subagent-conversation/fork.expected.md b/apps/web/tests/snapshots/subagent-conversation/fork.expected.md
index 020fe01e1a..398c3ceddd 100644
--- a/apps/web/tests/snapshots/subagent-conversation/fork.expected.md
+++ b/apps/web/tests/snapshots/subagent-conversation/fork.expected.md
@@ -1,6 +1,6 @@
 - tree "Sessions":
-  - treeitem "workspace 2 sessions" [expanded]:
+  - treeitem "workspace" [expanded]:
     - img
-    - text: workspace 2 sessions
-  - treeitem "Explain event sourcing in one (1) now" [selected]
+    - text: workspace
   - treeitem "Ask a research subagent to now"
+  - treeitem "Explain event sourcing in one (1) now" [selected]
diff --git a/apps/web/tests/snapshots/subagent-conversation/sidebar.expected.md b/apps/web/tests/snapshots/subagent-conversation/sidebar.expected.md
index 934cc4a210..aa3cadb40c 100644
--- a/apps/web/tests/snapshots/subagent-conversation/sidebar.expected.md
+++ b/apps/web/tests/snapshots/subagent-conversation/sidebar.expected.md
@@ -1,5 +1,5 @@
 - tree "Sessions":
-  - treeitem "workspace 1 session" [expanded]:
+  - treeitem "workspace" [expanded]:
     - img
-    - text: workspace 1 session
+    - text: workspace
   - treeitem "Ask a research subagent to now"