Skip to content

armgit / orca

Public Imported from GitHub
0

Orca is the place for working with a fleet of agents (e.g. Grok Bot, Claude Code). Run any coding agent with your own subscription. Available on desktop, mobile and remote runtime.

Reorder same-ID worktrees independently by host (#36269)

Jinjinge9e4e9484432
diff --git a/src/renderer/src/components/sidebar/WorkspaceKanbanDrawer.search.test.tsx b/src/renderer/src/components/sidebar/WorkspaceKanbanDrawer.search.test.tsx
index ccb89889b5a..7be7f924ff5 100644
--- a/src/renderer/src/components/sidebar/WorkspaceKanbanDrawer.search.test.tsx
+++ b/src/renderer/src/components/sidebar/WorkspaceKanbanDrawer.search.test.tsx
@@ -39,7 +39,7 @@ type GridCapture = {
type PointerDragCapture = {
selectedWorktrees: readonly Worktree[]
onDropWorktreesInStatus: (args: {
- worktreeIds: readonly string[]
+ worktreeKeys: readonly string[]
status: string
dropIndex: number
}) => void
@@ -309,7 +309,7 @@ describe('WorkspaceKanbanDrawer search', () => {
act(() => {
pointerDragState.current?.onDropWorktreesInStatus({
- worktreeIds: [omega.id],
+ worktreeKeys: [getWorktreeHostIdentity(omega)],
status: 'todo',
dropIndex: 0
})
@@ -317,7 +317,7 @@ describe('WorkspaceKanbanDrawer search', () => {
expect(syncWorkspaceBoardTaskStatusesMock).toHaveBeenCalledWith(
expect.objectContaining({
- worktreeIds: [omega.id],
+ worktreeKeys: [getWorktreeHostIdentity(omega)],
targetStatus: { id: 'todo', label: 'Todo' }
})
)
@@ -403,7 +403,7 @@ describe('WorkspaceKanbanDrawer search', () => {
act(() => {
// Descending order is Delta/Gamma/Beta/Alpha; filtered index zero above Gamma maps to full-lane index one.
pointerDragState.current?.onDropWorktreesInStatus({
- worktreeIds: [omega.id],
+ worktreeKeys: [getWorktreeHostIdentity(omega)],
status: 'todo',
dropIndex: 0
})
diff --git a/src/renderer/src/components/sidebar/WorkspaceKanbanDrawer.task-status-sync.test.tsx b/src/renderer/src/components/sidebar/WorkspaceKanbanDrawer.task-status-sync.test.tsx
index 8f3b86dd119..fa44a85231e 100644
--- a/src/renderer/src/components/sidebar/WorkspaceKanbanDrawer.task-status-sync.test.tsx
+++ b/src/renderer/src/components/sidebar/WorkspaceKanbanDrawer.task-status-sync.test.tsx
@@ -8,10 +8,11 @@ import type { Repo } from '../../../../shared/repo-types'
import type { Worktree } from '../../../../shared/worktree/types'
import WorkspaceKanbanDrawer from './WorkspaceKanbanDrawer'
import type * as WorkspaceBoardTaskStatusSync from './workspace-board-task-status-sync'
+import { getWorktreeHostIdentity } from '../../../../shared/worktree/host-qualified-identity'
type PointerDragParams = {
onDropWorktreesInStatus: (args: {
- worktreeIds: readonly string[]
+ worktreeKeys: readonly string[]
status: string
dropIndex: number
}) => void
@@ -322,7 +323,7 @@ describe('WorkspaceKanbanDrawer task status sync wiring', () => {
expect(syncWorkspaceBoardTaskStatusesMock).toHaveBeenCalledWith(
expect.objectContaining({
- worktreeIds: [item.id],
+ worktreeKeys: [getWorktreeHostIdentity(item)],
targetStatus: { id: 'in-review', label: 'In review' },
getSettingsForWorktree: expect.any(Function),
getLatestWorkspaceStatus: expect.any(Function)
@@ -347,7 +348,7 @@ describe('WorkspaceKanbanDrawer task status sync wiring', () => {
act(() => {
pointerDragState.current?.onDropWorktreesInStatus({
- worktreeIds: [item.id],
+ worktreeKeys: [getWorktreeHostIdentity(item)],
status: 'in-review',
dropIndex: 0
})
@@ -355,7 +356,7 @@ describe('WorkspaceKanbanDrawer task status sync wiring', () => {
expect(syncWorkspaceBoardTaskStatusesMock).toHaveBeenCalledWith(
expect.objectContaining({
- worktreeIds: [item.id],
+ worktreeKeys: [getWorktreeHostIdentity(item)],
targetStatus: { id: 'in-review', label: 'In review' }
})
)
@@ -367,7 +368,7 @@ describe('WorkspaceKanbanDrawer task status sync wiring', () => {
act(() => {
pointerDragState.current?.onDropWorktreesInStatus({
- worktreeIds: [item.id],
+ worktreeKeys: [getWorktreeHostIdentity(item)],
status: 'in-review',
dropIndex: 0
})
@@ -422,7 +423,7 @@ describe('WorkspaceKanbanDrawer task status sync wiring', () => {
expect(syncWorkspaceBoardTaskStatusesMock).toHaveBeenCalledWith(
expect.objectContaining({
- worktreeIds: [item.id],
+ worktreeKeys: [getWorktreeHostIdentity(item)],
targetStatus: { id: 'in-review', label: 'In review' }
})
)
diff --git a/src/renderer/src/components/sidebar/WorkspaceKanbanDrawer.tsx b/src/renderer/src/components/sidebar/WorkspaceKanbanDrawer.tsx
index 87227e764e8..0b513202b1b 100644
--- a/src/renderer/src/components/sidebar/WorkspaceKanbanDrawer.tsx
+++ b/src/renderer/src/components/sidebar/WorkspaceKanbanDrawer.tsx
@@ -94,6 +94,7 @@ function WorkspaceKanbanDrawerContent({
renderedBoardWorktrees,
search: { query, setQuery, clearQuery, matchingWorktreeIds, hasQuery, isQueryTooLarge },
worktreeById,
+ worktreeByKey,
worktreesByStatus
} = useWorkspaceKanbanBoardProjection({
activeWorktreeId,
@@ -125,7 +126,7 @@ function WorkspaceKanbanDrawerContent({
useWorkspaceKanbanColumnResize(workspaceBoardColumnWidth, setWorkspaceBoardColumnWidth)
const maybeSyncWorkspaceBoardTaskStatuses = useWorkspaceBoardTaskStatusSync({
enabled: syncTaskStatusFromWorkspaceBoard,
- worktreesById: worktreeById,
+ worktreesByKey: worktreeByKey,
workspaceStatuses: offeredStatuses
})
const {
@@ -146,6 +147,7 @@ function WorkspaceKanbanDrawerContent({
updateWorktreesMeta,
workspaceStatuses: boardStatuses,
worktreeById,
+ worktreeByKey,
manualOrderCatalog,
worktreesByStatus
})
diff --git a/src/renderer/src/components/sidebar/WorkspaceKanbanLaneCardList.tsx b/src/renderer/src/components/sidebar/WorkspaceKanbanLaneCardList.tsx
index f49311007b9..fb49d2aa533 100644
--- a/src/renderer/src/components/sidebar/WorkspaceKanbanLaneCardList.tsx
+++ b/src/renderer/src/components/sidebar/WorkspaceKanbanLaneCardList.tsx
@@ -71,10 +71,9 @@ function WorkspaceKanbanLaneCardList({
scrollElement,
spacerElement,
getItemIds: () => itemIds,
- getWorktreeIds: () => items.map((item) => item.id),
getMeasurements: () => virtualizer.measurementsCache
})
- }, [itemIds, items, scrollRef, virtualizer])
+ }, [itemIds, scrollRef, virtualizer])
return (
<div
diff --git a/src/renderer/src/components/sidebar/WorkspaceKanbanStatusLane.tsx b/src/renderer/src/components/sidebar/WorkspaceKanbanStatusLane.tsx
index 48ce6c72688..94c6730e1de 100644
--- a/src/renderer/src/components/sidebar/WorkspaceKanbanStatusLane.tsx
+++ b/src/renderer/src/components/sidebar/WorkspaceKanbanStatusLane.tsx
@@ -15,6 +15,7 @@ import { Button } from '@/components/ui/button'
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
import WorkspaceKanbanLaneCardList from './WorkspaceKanbanLaneCardList'
import { serializeWorkspaceLaneFullIds } from './workspace-kanban-filtered-drop-index'
+import { getWorktreeHostIdentity } from '../../../../shared/worktree/host-qualified-identity'
import { getWorkspaceStatusVisualMeta } from './workspace-status'
import { translate } from '@/i18n/i18n'
import { useUiLanguageRevision } from '@/i18n/use-ui-language-revision'
@@ -88,7 +89,7 @@ function WorkspaceKanbanStatusLane({
return undefined
}
return (
- serializeWorkspaceLaneFullIds(fullWorktreeIds ?? items.map((worktree) => worktree.id)) ??
+ serializeWorkspaceLaneFullIds(fullWorktreeIds ?? items.map(getWorktreeHostIdentity)) ??
undefined
)
}, [fullWorktreeIds, hasQuery, items])
diff --git a/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/group-by-none.txt b/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/group-by-none.txt
index 26c369254cc..985c6b2d35f 100644
--- a/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/group-by-none.txt
+++ b/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/group-by-none.txt
@@ -24,7 +24,7 @@ renderedKeys: 23
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y local|shared::/w/same |orca::/orca |orca::/w/Zeta |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=orca::/orca
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=api::/w/api-y@runtime:env-1 9=orca::/orca
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=orca::/orca
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same api::/w/api-y orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -87,7 +87,7 @@ renderedKeys: 29
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca::/w/Zeta |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@ssh:gpu-vm 8=shared::/w/same@local 9=orca::/orca
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@local 8=shared::/w/same@ssh:gpu-vm 9=orca::/orca
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@ssh:gpu-vm 8=shared::/w/same@local 9=orca::/orca
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x api::/w/api-y shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -120,7 +120,7 @@ renderedKeys: 20
placeholders: -
selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca::/w/Zeta |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca::/w/Zeta 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca::/w/Zeta 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca::/w/Zeta 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
cmd ids unmounted: orca::/w/feat-a orca-ssh::/w/remote-x api::/w/api-y shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
=== sort=manual projectOrder=recent pinnedInGroups=false === same as sort=manual projectOrder=manual pinnedInGroups=false
=== sort=manual projectOrder=recent pinnedInGroups=true === same as sort=manual projectOrder=manual pinnedInGroups=true
@@ -150,7 +150,7 @@ renderedKeys: 23
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh |orca::/orca local|shared::/w/same |orca::/w/Zeta local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=api::/api@runtime:env-1 9=ext::/ext
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=api::/w/api-y@runtime:env-1 9=api::/api@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=api::/api@runtime:env-1 9=ext::/ext
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same api::/w/api-y api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/orca orca::/w/Zeta folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: api::/w/api-y orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/orca orca-ssh::/w/remote-x shared::/w/same shared::/w/same orca::/w/Zeta
@@ -276,7 +276,7 @@ renderedKeys: 23
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y |orca::/orca runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh local|shared::/w/same |orca::/w/Zeta local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=orca::/orca 9=api::/api@runtime:env-1
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=api::/w/api-y@runtime:env-1 9=orca::/orca
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=orca::/orca 9=api::/api@runtime:env-1
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same api::/w/api-y orca::/orca api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/w/Zeta folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: orca::/w/feat-a api::/w/api-y orca::/w/feat-b orca::/orca orca::/w/feat-c lab::/w/gitlab-mr api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca-ssh::/w/remote-x shared::/w/same shared::/w/same orca::/w/Zeta
@@ -406,7 +406,7 @@ renderedKeys: 23
placeholders: -
selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr |orca::/w/feat-b |orca::/w/feat-c ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh |orca::/orca |orca::/w/Zeta local|shared::/w/same local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b#lineage:orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=api::/api@runtime:env-1 9=ext::/ext
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=api::/w/api-y@runtime:env-1 9=api::/api@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=api::/api@runtime:env-1 9=ext::/ext
cmd ids unmounted: orca::/w/feat-a lab::/w/gitlab-mr orca::/w/feat-b orca::/w/feat-c orca-ssh::/w/remote-x shared::/w/same api::/w/api-y api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/orca orca::/w/Zeta folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: api::/w/api-y api::/api ext::/ext orca::/w/feat-a lab::/w/gitlab-mr lab::/lab orca::/w/feat-b orca::/w/feat-c orca-ssh::/orca-ssh orca::/orca orca-ssh::/w/remote-x orca::/w/Zeta shared::/w/same shared::/w/same
diff --git a/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/group-by-pr-status.txt b/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/group-by-pr-status.txt
index 3aecf78fd85..29ecf0eb818 100644
--- a/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/group-by-pr-status.txt
+++ b/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/group-by-pr-status.txt
@@ -86,7 +86,7 @@ renderedKeys: 32
placeholders: -
selectionOrder: |orca::/w/feat-b |orca::/w/feat-a runtime:env-1|api::/w/api-y ssh:gpu-vm|orca-ssh::/w/remote-x |lab::/w/gitlab-mr ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-b#lineage:orca::/w/feat-b 2=orca::/w/feat-a#lineage:orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=orca::/orca 9=orca-ssh::/orca-ssh
-cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@local 7=shared::/w/same@ssh:gpu-vm 8=orca::/orca 9=orca-ssh::/orca-ssh
+cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=orca::/orca 9=orca-ssh::/orca-ssh
cmd ids unmounted: orca::/w/feat-b orca::/w/feat-a api::/w/api-y orca-ssh::/w/remote-x lab::/w/gitlab-mr shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote orca::/w/Zeta
-- collapsed: pinned pr:in-review pr:closed lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -123,7 +123,7 @@ renderedKeys: 23
placeholders: -
selectionOrder: |orca::/w/feat-b ssh:gpu-vm|orca-ssh::/w/remote-x |lab::/w/gitlab-mr ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
-cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
+cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
cmd ids unmounted: orca::/w/feat-b orca-ssh::/w/remote-x lab::/w/gitlab-mr shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
=== sort=manual projectOrder=recent pinnedInGroups=false === same as sort=manual projectOrder=manual pinnedInGroups=false
=== sort=manual projectOrder=recent pinnedInGroups=true === same as sort=manual projectOrder=manual pinnedInGroups=true
@@ -155,7 +155,7 @@ renderedKeys: 25
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh |orca::/orca local|shared::/w/same local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=api::/api@runtime:env-1 9=ext::/ext
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=api::/api@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=api::/api@runtime:env-1 9=ext::/ext
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same api::/w/api-y api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/orca folder:fw-review folder:fw-notes folder:fw-remote orca::/w/Zeta
-- collapsed: pinned pr:in-progress lineage:orca::/w/feat-a --
visible: api::/w/api-y orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/orca orca-ssh::/w/remote-x shared::/w/same shared::/w/same orca::/w/Zeta
@@ -284,7 +284,7 @@ renderedKeys: 25
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y |orca::/orca runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh local|shared::/w/same local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=orca::/orca 9=api::/api@runtime:env-1
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=orca::/orca
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=orca::/orca 9=api::/api@runtime:env-1
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same api::/w/api-y orca::/orca api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh folder:fw-review folder:fw-notes folder:fw-remote orca::/w/Zeta
-- collapsed: pinned pr:in-progress lineage:orca::/w/feat-a --
visible: orca::/w/feat-a api::/w/api-y orca::/w/feat-b orca::/orca orca::/w/feat-c lab::/w/gitlab-mr api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca-ssh::/w/remote-x shared::/w/same shared::/w/same orca::/w/Zeta
@@ -417,7 +417,7 @@ renderedKeys: 25
placeholders: -
selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr |orca::/w/feat-b |orca::/w/feat-c ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh |orca::/orca local|shared::/w/same local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b#lineage:orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=api::/api@runtime:env-1 9=ext::/ext
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=api::/api@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=api::/api@runtime:env-1 9=ext::/ext
cmd ids unmounted: orca::/w/feat-a lab::/w/gitlab-mr orca::/w/feat-b orca::/w/feat-c orca-ssh::/w/remote-x shared::/w/same api::/w/api-y api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/orca folder:fw-review folder:fw-notes folder:fw-remote orca::/w/Zeta
-- collapsed: pinned pr:in-progress lineage:orca::/w/feat-a --
visible: api::/w/api-y api::/api ext::/ext orca::/w/feat-a lab::/w/gitlab-mr lab::/lab orca::/w/feat-b orca::/w/feat-c orca-ssh::/orca-ssh orca::/orca orca-ssh::/w/remote-x orca::/w/Zeta shared::/w/same shared::/w/same
diff --git a/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/group-by-workspace-status.txt b/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/group-by-workspace-status.txt
index 3f575eab867..69a0dc495a8 100644
--- a/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/group-by-workspace-status.txt
+++ b/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/group-by-workspace-status.txt
@@ -94,7 +94,7 @@ renderedKeys: 31
placeholders: -
selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/feat-b local|folder:fw-review runtime:env-1|api::/w/api-y |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
cmd ids unmounted: orca::/w/feat-a lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext folder:fw-notes folder:fw-remote orca::/w/feat-b folder:fw-review api::/w/api-y orca::/w/Zeta
-- collapsed: pinned workspace-status:in-review lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -130,7 +130,7 @@ renderedKeys: 21
placeholders: -
selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/w/api-y |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@ssh:gpu-vm 4=shared::/w/same@local 5=orca::/orca 6=orca-ssh::/orca-ssh 7=api::/api@runtime:env-1 8=orca::/w/feat-c 9=lab::/lab
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@local 4=shared::/w/same@ssh:gpu-vm 5=orca::/orca 6=orca-ssh::/orca-ssh 7=api::/api@runtime:env-1 8=orca::/w/feat-c 9=lab::/lab
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@ssh:gpu-vm 4=shared::/w/same@local 5=orca::/orca 6=orca-ssh::/orca-ssh 7=api::/api@runtime:env-1 8=orca::/w/feat-c 9=lab::/lab
cmd ids unmounted: orca::/w/feat-a orca-ssh::/w/remote-x shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext folder:fw-notes folder:fw-remote api::/w/api-y orca::/w/Zeta
=== sort=manual projectOrder=recent pinnedInGroups=false === same as sort=manual projectOrder=manual pinnedInGroups=false
=== sort=manual projectOrder=recent pinnedInGroups=true === same as sort=manual projectOrder=manual pinnedInGroups=true
@@ -163,7 +163,7 @@ renderedKeys: 25
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh |orca::/orca local|shared::/w/same local|folder:fw-notes ssh:gpu-vm|folder:fw-remote local|folder:fw-review runtime:env-1|api::/w/api-y |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/api@runtime:env-1 8=ext::/ext 9=lab::/lab
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=api::/api@runtime:env-1 9=ext::/ext
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/api@runtime:env-1 8=ext::/ext 9=lab::/lab
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/orca folder:fw-notes folder:fw-remote folder:fw-review api::/w/api-y orca::/w/Zeta
-- collapsed: pinned workspace-status:in-review lineage:orca::/w/feat-a --
visible: api::/w/api-y orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/orca orca-ssh::/w/remote-x shared::/w/same shared::/w/same orca::/w/Zeta
@@ -299,7 +299,7 @@ renderedKeys: 25
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same |orca::/orca runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh local|shared::/w/same local|folder:fw-notes ssh:gpu-vm|folder:fw-remote local|folder:fw-review runtime:env-1|api::/w/api-y |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=orca::/orca 8=api::/api@runtime:env-1 9=ext::/ext
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=orca::/orca 9=api::/api@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=orca::/orca 8=api::/api@runtime:env-1 9=ext::/ext
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same orca::/orca api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh folder:fw-notes folder:fw-remote folder:fw-review api::/w/api-y orca::/w/Zeta
-- collapsed: pinned workspace-status:in-review lineage:orca::/w/feat-a --
visible: orca::/w/feat-a api::/w/api-y orca::/w/feat-b orca::/orca orca::/w/feat-c lab::/w/gitlab-mr api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca-ssh::/w/remote-x shared::/w/same shared::/w/same orca::/w/Zeta
@@ -439,7 +439,7 @@ renderedKeys: 25
placeholders: -
selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr |orca::/w/feat-b |orca::/w/feat-c ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh |orca::/orca local|shared::/w/same local|folder:fw-notes ssh:gpu-vm|folder:fw-remote local|folder:fw-review runtime:env-1|api::/w/api-y |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b#lineage:orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/api@runtime:env-1 8=ext::/ext 9=lab::/lab
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=api::/api@runtime:env-1 9=ext::/ext
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/api@runtime:env-1 8=ext::/ext 9=lab::/lab
cmd ids unmounted: orca::/w/feat-a lab::/w/gitlab-mr orca::/w/feat-b orca::/w/feat-c orca-ssh::/w/remote-x shared::/w/same api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/orca folder:fw-notes folder:fw-remote folder:fw-review api::/w/api-y orca::/w/Zeta
-- collapsed: pinned workspace-status:in-review lineage:orca::/w/feat-a --
visible: api::/w/api-y api::/api ext::/ext orca::/w/feat-a lab::/w/gitlab-mr lab::/lab orca::/w/feat-b orca::/w/feat-c orca-ssh::/orca-ssh orca::/orca orca-ssh::/w/remote-x orca::/w/Zeta shared::/w/same shared::/w/same
diff --git a/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/scenario-hide-default-branch.txt b/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/scenario-hide-default-branch.txt
index ded1b9a496e..925c934d552 100644
--- a/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/scenario-hide-default-branch.txt
+++ b/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/scenario-hide-default-branch.txt
@@ -19,7 +19,7 @@ renderedKeys: 18
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y local|shared::/w/same |orca::/w/Zeta local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=orca::/w/Zeta
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=api::/w/api-y@runtime:env-1 9=orca::/w/Zeta
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=orca::/w/Zeta
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same api::/w/api-y orca::/w/Zeta folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/w/Zeta orca::/w/feat-c
@@ -72,7 +72,7 @@ renderedKeys: 24
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/w/Zeta local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@ssh:gpu-vm 8=shared::/w/same@local 9=orca::/w/Zeta
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@local 8=shared::/w/same@ssh:gpu-vm 9=orca::/w/Zeta
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@ssh:gpu-vm 8=shared::/w/same@local 9=orca::/w/Zeta
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x api::/w/api-y shared::/w/same orca::/w/Zeta folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/w/Zeta orca::/w/feat-c
@@ -100,7 +100,7 @@ renderedKeys: 15
placeholders: -
selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/w/Zeta local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/w/Zeta 7=folder:fw-review@local 8=folder:fw-notes@local 9=folder:fw-remote@ssh:gpu-vm
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/w/Zeta 7=folder:fw-review@local 8=folder:fw-notes@local 9=folder:fw-remote@ssh:gpu-vm
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/w/Zeta 7=folder:fw-review@local 8=folder:fw-notes@local 9=folder:fw-remote@ssh:gpu-vm
cmd ids unmounted: orca::/w/feat-a orca-ssh::/w/remote-x api::/w/api-y shared::/w/same orca::/w/Zeta folder:fw-review folder:fw-notes folder:fw-remote
=== groupBy=repo pinnedInGroups=false ===
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/w/Zeta orca::/w/feat-c
@@ -239,7 +239,7 @@ renderedKeys: 15
placeholders: empty
selectionOrder: ssh:gpu-vm|folder:fw-remote ssh:gpu-vm|shared::/w/same local|shared::/w/same
cmd1-9 mounted: 1=folder:fw-remote@ssh:gpu-vm 2=shared::/w/same@ssh:gpu-vm 3=shared::/w/same@local
-cmd1-9 unmounted: 1=folder:fw-remote@ssh:gpu-vm 2=shared::/w/same@local 3=shared::/w/same@ssh:gpu-vm
+cmd1-9 unmounted: 1=folder:fw-remote@ssh:gpu-vm 2=shared::/w/same@ssh:gpu-vm 3=shared::/w/same@local
cmd ids unmounted: folder:fw-remote shared::/w/same
=== groupBy=workspace-status pinnedInGroups=false ===
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/w/Zeta orca::/w/feat-c
@@ -322,7 +322,7 @@ renderedKeys: 26
placeholders: -
selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/w/feat-c local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/feat-b local|folder:fw-review runtime:env-1|api::/w/api-y |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/w/feat-c 7=folder:fw-notes@local 8=folder:fw-remote@ssh:gpu-vm 9=orca::/w/feat-b#lineage:orca::/w/feat-b
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/w/feat-c 7=folder:fw-notes@local 8=folder:fw-remote@ssh:gpu-vm 9=orca::/w/feat-b
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/w/feat-c 7=folder:fw-notes@local 8=folder:fw-remote@ssh:gpu-vm 9=orca::/w/feat-b
cmd ids unmounted: orca::/w/feat-a lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same orca::/w/feat-c folder:fw-notes folder:fw-remote orca::/w/feat-b folder:fw-review api::/w/api-y orca::/w/Zeta
-- collapsed: pinned workspace-status:in-review lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/w/Zeta orca::/w/feat-c
@@ -353,7 +353,7 @@ renderedKeys: 16
placeholders: -
selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/w/feat-c local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/w/api-y |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@ssh:gpu-vm 4=shared::/w/same@local 5=orca::/w/feat-c 6=folder:fw-notes@local 7=folder:fw-remote@ssh:gpu-vm 8=api::/w/api-y@runtime:env-1 9=orca::/w/Zeta
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@local 4=shared::/w/same@ssh:gpu-vm 5=orca::/w/feat-c 6=folder:fw-notes@local 7=folder:fw-remote@ssh:gpu-vm 8=api::/w/api-y@runtime:env-1 9=orca::/w/Zeta
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@ssh:gpu-vm 4=shared::/w/same@local 5=orca::/w/feat-c 6=folder:fw-notes@local 7=folder:fw-remote@ssh:gpu-vm 8=api::/w/api-y@runtime:env-1 9=orca::/w/Zeta
cmd ids unmounted: orca::/w/feat-a orca-ssh::/w/remote-x shared::/w/same orca::/w/feat-c folder:fw-notes folder:fw-remote api::/w/api-y orca::/w/Zeta
=== groupBy=pr-status pinnedInGroups=false ===
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/w/Zeta orca::/w/feat-c
@@ -433,7 +433,7 @@ renderedKeys: 27
placeholders: -
selectionOrder: |orca::/w/feat-b |orca::/w/feat-a runtime:env-1|api::/w/api-y ssh:gpu-vm|orca-ssh::/w/remote-x |lab::/w/gitlab-mr ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/w/feat-c local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-b#lineage:orca::/w/feat-b 2=orca::/w/feat-a#lineage:orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=orca::/w/feat-c 9=folder:fw-review@local
-cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@local 7=shared::/w/same@ssh:gpu-vm 8=orca::/w/feat-c 9=folder:fw-review@local
+cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=orca::/w/feat-c 9=folder:fw-review@local
cmd ids unmounted: orca::/w/feat-b orca::/w/feat-a api::/w/api-y orca-ssh::/w/remote-x lab::/w/gitlab-mr shared::/w/same orca::/w/feat-c folder:fw-review folder:fw-notes folder:fw-remote orca::/w/Zeta
-- collapsed: pinned pr:in-review pr:closed lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/w/Zeta orca::/w/feat-c
@@ -465,5 +465,5 @@ renderedKeys: 18
placeholders: -
selectionOrder: |orca::/w/feat-b ssh:gpu-vm|orca-ssh::/w/remote-x |lab::/w/gitlab-mr ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/w/feat-c local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/w/feat-c 7=folder:fw-review@local 8=folder:fw-notes@local 9=folder:fw-remote@ssh:gpu-vm
-cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/w/feat-c 7=folder:fw-review@local 8=folder:fw-notes@local 9=folder:fw-remote@ssh:gpu-vm
+cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/w/feat-c 7=folder:fw-review@local 8=folder:fw-notes@local 9=folder:fw-remote@ssh:gpu-vm
cmd ids unmounted: orca::/w/feat-b orca-ssh::/w/remote-x lab::/w/gitlab-mr shared::/w/same orca::/w/feat-c folder:fw-review folder:fw-notes folder:fw-remote
diff --git a/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/scenario-name-order.txt b/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/scenario-name-order.txt
index 41884f1c3b9..92c7bff5879 100644
--- a/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/scenario-name-order.txt
+++ b/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/scenario-name-order.txt
@@ -28,7 +28,7 @@ renderedKeys: 34
placeholders: -
selectionOrder: ssh:gpu-vm|r-angstrom::/w/angstrom |r-angstrom::/w/angstrom |r-angstrom::/w/ångström |r-eclair::/w/Eclair ssh:gpu-vm|r-ssh::/w/eclair |r-eclair::/w/eclair |r-eclair::/w/éclair |r-eclair::/w/éclair |r-eclair::/w/W2 ssh:gpu-vm|r-ssh::/w/w2 |r-eclair::/w/w2 |r-eclair::/w/w10 |r-eclair::/w/zebra local|folder:fw-angstrom local|folder:fw-angstrom-accent local|folder:fw-Eclair local|folder:fw-eclair local|folder:fw-eclair-accent local|folder:fw-W2 local|folder:fw-w2-a local|folder:fw-w2-b local|folder:fw-w10 local|folder:fw-zebra
cmd1-9 mounted: 1=r-angstrom::/w/angstrom@ssh:gpu-vm 2=r-angstrom::/w/angstrom 3=r-angstrom::/w/ångström 4=r-eclair::/w/Eclair 5=r-ssh::/w/eclair@ssh:gpu-vm 6=r-eclair::/w/eclair 7=r-eclair::/w/éclair 8=r-eclair::/w/éclair 9=r-eclair::/w/W2
-cmd1-9 unmounted: 1=r-angstrom::/w/angstrom 2=r-angstrom::/w/angstrom@ssh:gpu-vm 3=r-angstrom::/w/ångström 4=r-eclair::/w/Eclair 5=r-ssh::/w/eclair@ssh:gpu-vm 6=r-eclair::/w/eclair 7=r-eclair::/w/éclair 8=r-eclair::/w/éclair 9=r-eclair::/w/W2
+cmd1-9 unmounted: 1=r-angstrom::/w/angstrom@ssh:gpu-vm 2=r-angstrom::/w/angstrom 3=r-angstrom::/w/ångström 4=r-eclair::/w/Eclair 5=r-ssh::/w/eclair@ssh:gpu-vm 6=r-eclair::/w/eclair 7=r-eclair::/w/éclair 8=r-eclair::/w/éclair 9=r-eclair::/w/W2
cmd ids unmounted: r-angstrom::/w/angstrom r-angstrom::/w/ångström r-eclair::/w/Eclair r-ssh::/w/eclair r-eclair::/w/eclair r-eclair::/w/éclair r-eclair::/w/éclair r-eclair::/w/W2 r-ssh::/w/w2 r-eclair::/w/w2 r-eclair::/w/w10 r-eclair::/w/zebra folder:fw-angstrom folder:fw-angstrom-accent folder:fw-Eclair folder:fw-eclair folder:fw-eclair-accent folder:fw-W2 folder:fw-w2-a folder:fw-w2-b folder:fw-w10 folder:fw-zebra
=== groupBy=none sort=name projectOrder=recent === same as groupBy=none sort=name projectOrder=manual
=== groupBy=none sort=recent projectOrder=manual ===
@@ -61,7 +61,7 @@ renderedKeys: 34
placeholders: -
selectionOrder: |r-eclair::/w/w10 |r-eclair::/w/zebra ssh:gpu-vm|r-angstrom::/w/angstrom |r-angstrom::/w/angstrom |r-angstrom::/w/ångström |r-eclair::/w/Eclair ssh:gpu-vm|r-ssh::/w/eclair |r-eclair::/w/eclair |r-eclair::/w/éclair |r-eclair::/w/éclair |r-eclair::/w/W2 ssh:gpu-vm|r-ssh::/w/w2 |r-eclair::/w/w2 local|folder:fw-angstrom local|folder:fw-angstrom-accent local|folder:fw-Eclair local|folder:fw-eclair local|folder:fw-eclair-accent local|folder:fw-W2 local|folder:fw-w2-a local|folder:fw-w2-b local|folder:fw-w10 local|folder:fw-zebra
cmd1-9 mounted: 1=r-eclair::/w/w10 2=r-eclair::/w/zebra 3=r-angstrom::/w/angstrom@ssh:gpu-vm 4=r-angstrom::/w/angstrom 5=r-angstrom::/w/ångström 6=r-eclair::/w/Eclair 7=r-ssh::/w/eclair@ssh:gpu-vm 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
-cmd1-9 unmounted: 1=r-eclair::/w/w10 2=r-eclair::/w/zebra 3=r-angstrom::/w/angstrom 4=r-angstrom::/w/angstrom@ssh:gpu-vm 5=r-angstrom::/w/ångström 6=r-eclair::/w/Eclair 7=r-ssh::/w/eclair@ssh:gpu-vm 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
+cmd1-9 unmounted: 1=r-eclair::/w/w10 2=r-eclair::/w/zebra 3=r-angstrom::/w/angstrom@ssh:gpu-vm 4=r-angstrom::/w/angstrom 5=r-angstrom::/w/ångström 6=r-eclair::/w/Eclair 7=r-ssh::/w/eclair@ssh:gpu-vm 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
cmd ids unmounted: r-eclair::/w/w10 r-eclair::/w/zebra r-angstrom::/w/angstrom r-angstrom::/w/ångström r-eclair::/w/Eclair r-ssh::/w/eclair r-eclair::/w/eclair r-eclair::/w/éclair r-eclair::/w/éclair r-eclair::/w/W2 r-ssh::/w/w2 r-eclair::/w/w2 folder:fw-angstrom folder:fw-angstrom-accent folder:fw-Eclair folder:fw-eclair folder:fw-eclair-accent folder:fw-W2 folder:fw-w2-a folder:fw-w2-b folder:fw-w10 folder:fw-zebra
=== groupBy=none sort=recent projectOrder=recent === same as groupBy=none sort=recent projectOrder=manual
=== groupBy=none sort=repo projectOrder=manual ===
@@ -94,7 +94,7 @@ renderedKeys: 34
placeholders: -
selectionOrder: ssh:gpu-vm|r-angstrom::/w/angstrom |r-angstrom::/w/angstrom |r-angstrom::/w/ångström ssh:gpu-vm|r-ssh::/w/eclair ssh:gpu-vm|r-ssh::/w/w2 |r-eclair::/w/Eclair |r-eclair::/w/eclair |r-eclair::/w/éclair |r-eclair::/w/éclair |r-eclair::/w/W2 |r-eclair::/w/w2 |r-eclair::/w/w10 |r-eclair::/w/zebra local|folder:fw-angstrom local|folder:fw-angstrom-accent local|folder:fw-Eclair local|folder:fw-eclair local|folder:fw-eclair-accent local|folder:fw-W2 local|folder:fw-w2-a local|folder:fw-w2-b local|folder:fw-w10 local|folder:fw-zebra
cmd1-9 mounted: 1=r-angstrom::/w/angstrom@ssh:gpu-vm 2=r-angstrom::/w/angstrom 3=r-angstrom::/w/ångström 4=r-ssh::/w/eclair@ssh:gpu-vm 5=r-ssh::/w/w2@ssh:gpu-vm 6=r-eclair::/w/Eclair 7=r-eclair::/w/eclair 8=r-eclair::/w/éclair 9=r-eclair::/w/éclair
-cmd1-9 unmounted: 1=r-angstrom::/w/angstrom 2=r-angstrom::/w/angstrom@ssh:gpu-vm 3=r-angstrom::/w/ångström 4=r-ssh::/w/eclair@ssh:gpu-vm 5=r-ssh::/w/w2@ssh:gpu-vm 6=r-eclair::/w/Eclair 7=r-eclair::/w/eclair 8=r-eclair::/w/éclair 9=r-eclair::/w/éclair
+cmd1-9 unmounted: 1=r-angstrom::/w/angstrom@ssh:gpu-vm 2=r-angstrom::/w/angstrom 3=r-angstrom::/w/ångström 4=r-ssh::/w/eclair@ssh:gpu-vm 5=r-ssh::/w/w2@ssh:gpu-vm 6=r-eclair::/w/Eclair 7=r-eclair::/w/eclair 8=r-eclair::/w/éclair 9=r-eclair::/w/éclair
cmd ids unmounted: r-angstrom::/w/angstrom r-angstrom::/w/ångström r-ssh::/w/eclair r-ssh::/w/w2 r-eclair::/w/Eclair r-eclair::/w/eclair r-eclair::/w/éclair r-eclair::/w/éclair r-eclair::/w/W2 r-eclair::/w/w2 r-eclair::/w/w10 r-eclair::/w/zebra folder:fw-angstrom folder:fw-angstrom-accent folder:fw-Eclair folder:fw-eclair folder:fw-eclair-accent folder:fw-W2 folder:fw-w2-a folder:fw-w2-b folder:fw-w10 folder:fw-zebra
=== groupBy=none sort=repo projectOrder=recent === same as groupBy=none sort=repo projectOrder=manual
=== groupBy=repo sort=name projectOrder=manual ===
@@ -134,7 +134,7 @@ renderedKeys: 41
placeholders: -
selectionOrder: local|folder:fw-eclair ssh:gpu-vm|r-angstrom::/w/angstrom |r-angstrom::/w/angstrom |r-angstrom::/w/ångström local|folder:fw-angstrom local|folder:fw-angstrom-accent |r-eclair::/w/Eclair |r-eclair::/w/eclair |r-eclair::/w/éclair |r-eclair::/w/éclair |r-eclair::/w/W2 |r-eclair::/w/w2 |r-eclair::/w/w10 |r-eclair::/w/zebra local|folder:fw-Eclair local|folder:fw-eclair-accent local|folder:fw-W2 local|folder:fw-w2-a local|folder:fw-w2-b local|folder:fw-w10 local|folder:fw-zebra ssh:gpu-vm|r-ssh::/w/eclair ssh:gpu-vm|r-ssh::/w/w2
cmd1-9 mounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom@ssh:gpu-vm 3=r-angstrom::/w/angstrom 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/Eclair 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
-cmd1-9 unmounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom 3=r-angstrom::/w/angstrom@ssh:gpu-vm 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/Eclair 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
+cmd1-9 unmounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom@ssh:gpu-vm 3=r-angstrom::/w/angstrom 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/Eclair 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
cmd ids unmounted: folder:fw-eclair r-angstrom::/w/angstrom r-angstrom::/w/ångström folder:fw-angstrom folder:fw-angstrom-accent r-eclair::/w/Eclair r-eclair::/w/eclair r-eclair::/w/éclair r-eclair::/w/éclair r-eclair::/w/W2 r-eclair::/w/w2 r-eclair::/w/w10 r-eclair::/w/zebra folder:fw-Eclair folder:fw-eclair-accent folder:fw-W2 folder:fw-w2-a folder:fw-w2-b folder:fw-w10 folder:fw-zebra r-ssh::/w/eclair r-ssh::/w/w2
=== groupBy=repo sort=name projectOrder=recent === same as groupBy=repo sort=name projectOrder=manual
=== groupBy=repo sort=recent projectOrder=manual ===
@@ -174,7 +174,7 @@ renderedKeys: 41
placeholders: -
selectionOrder: local|folder:fw-eclair ssh:gpu-vm|r-angstrom::/w/angstrom |r-angstrom::/w/angstrom |r-angstrom::/w/ångström local|folder:fw-angstrom local|folder:fw-angstrom-accent |r-eclair::/w/w10 |r-eclair::/w/zebra |r-eclair::/w/Eclair |r-eclair::/w/eclair |r-eclair::/w/éclair |r-eclair::/w/éclair |r-eclair::/w/W2 |r-eclair::/w/w2 local|folder:fw-Eclair local|folder:fw-eclair-accent local|folder:fw-W2 local|folder:fw-w2-a local|folder:fw-w2-b local|folder:fw-w10 local|folder:fw-zebra ssh:gpu-vm|r-ssh::/w/eclair ssh:gpu-vm|r-ssh::/w/w2
cmd1-9 mounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom@ssh:gpu-vm 3=r-angstrom::/w/angstrom 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/w10 8=r-eclair::/w/zebra 9=r-eclair::/w/Eclair
-cmd1-9 unmounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom 3=r-angstrom::/w/angstrom@ssh:gpu-vm 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/w10 8=r-eclair::/w/zebra 9=r-eclair::/w/Eclair
+cmd1-9 unmounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom@ssh:gpu-vm 3=r-angstrom::/w/angstrom 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/w10 8=r-eclair::/w/zebra 9=r-eclair::/w/Eclair
cmd ids unmounted: folder:fw-eclair r-angstrom::/w/angstrom r-angstrom::/w/ångström folder:fw-angstrom folder:fw-angstrom-accent r-eclair::/w/w10 r-eclair::/w/zebra r-eclair::/w/Eclair r-eclair::/w/eclair r-eclair::/w/éclair r-eclair::/w/éclair r-eclair::/w/W2 r-eclair::/w/w2 folder:fw-Eclair folder:fw-eclair-accent folder:fw-W2 folder:fw-w2-a folder:fw-w2-b folder:fw-w10 folder:fw-zebra r-ssh::/w/eclair r-ssh::/w/w2
=== groupBy=repo sort=recent projectOrder=recent === same as groupBy=repo sort=recent projectOrder=manual
=== groupBy=repo sort=repo projectOrder=manual ===
@@ -214,6 +214,6 @@ renderedKeys: 41
placeholders: -
selectionOrder: local|folder:fw-eclair ssh:gpu-vm|r-angstrom::/w/angstrom |r-angstrom::/w/angstrom |r-angstrom::/w/ångström local|folder:fw-angstrom local|folder:fw-angstrom-accent |r-eclair::/w/Eclair |r-eclair::/w/eclair |r-eclair::/w/éclair |r-eclair::/w/éclair |r-eclair::/w/W2 |r-eclair::/w/w2 |r-eclair::/w/w10 |r-eclair::/w/zebra local|folder:fw-Eclair local|folder:fw-eclair-accent local|folder:fw-W2 local|folder:fw-w2-a local|folder:fw-w2-b local|folder:fw-w10 local|folder:fw-zebra ssh:gpu-vm|r-ssh::/w/eclair ssh:gpu-vm|r-ssh::/w/w2
cmd1-9 mounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom@ssh:gpu-vm 3=r-angstrom::/w/angstrom 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/Eclair 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
-cmd1-9 unmounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom 3=r-angstrom::/w/angstrom@ssh:gpu-vm 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/Eclair 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
+cmd1-9 unmounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom@ssh:gpu-vm 3=r-angstrom::/w/angstrom 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/Eclair 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
cmd ids unmounted: folder:fw-eclair r-angstrom::/w/angstrom r-angstrom::/w/ångström folder:fw-angstrom folder:fw-angstrom-accent r-eclair::/w/Eclair r-eclair::/w/eclair r-eclair::/w/éclair r-eclair::/w/éclair r-eclair::/w/W2 r-eclair::/w/w2 r-eclair::/w/w10 r-eclair::/w/zebra folder:fw-Eclair folder:fw-eclair-accent folder:fw-W2 folder:fw-w2-a folder:fw-w2-b folder:fw-w10 folder:fw-zebra r-ssh::/w/eclair r-ssh::/w/w2
=== groupBy=repo sort=repo projectOrder=recent === same as groupBy=repo sort=repo projectOrder=manual
diff --git a/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/scenario-new-external-inbox.txt b/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/scenario-new-external-inbox.txt
index 77327e19d3f..a2b6aff1e67 100644
--- a/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/scenario-new-external-inbox.txt
+++ b/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/scenario-new-external-inbox.txt
@@ -24,7 +24,7 @@ renderedKeys: 23
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y local|shared::/w/same |orca::/orca |orca::/w/Zeta |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=orca::/orca
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=api::/w/api-y@runtime:env-1 9=orca::/orca
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=orca::/orca
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same api::/w/api-y orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -87,7 +87,7 @@ renderedKeys: 29
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca::/w/Zeta |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@ssh:gpu-vm 8=shared::/w/same@local 9=orca::/orca
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@local 8=shared::/w/same@ssh:gpu-vm 9=orca::/orca
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@ssh:gpu-vm 8=shared::/w/same@local 9=orca::/orca
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x api::/w/api-y shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -120,7 +120,7 @@ renderedKeys: 20
placeholders: -
selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca::/w/Zeta |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca::/w/Zeta 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca::/w/Zeta 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca::/w/Zeta 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
cmd ids unmounted: orca::/w/feat-a orca-ssh::/w/remote-x api::/w/api-y shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
=== groupBy=repo pinnedInGroups=false ===
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -374,7 +374,7 @@ renderedKeys: 31
placeholders: -
selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/feat-b local|folder:fw-review runtime:env-1|api::/w/api-y |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
cmd ids unmounted: orca::/w/feat-a lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext folder:fw-notes folder:fw-remote orca::/w/feat-b folder:fw-review api::/w/api-y orca::/w/Zeta
-- collapsed: pinned workspace-status:in-review lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -410,7 +410,7 @@ renderedKeys: 21
placeholders: -
selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/w/api-y |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@ssh:gpu-vm 4=shared::/w/same@local 5=orca::/orca 6=orca-ssh::/orca-ssh 7=api::/api@runtime:env-1 8=orca::/w/feat-c 9=lab::/lab
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@local 4=shared::/w/same@ssh:gpu-vm 5=orca::/orca 6=orca-ssh::/orca-ssh 7=api::/api@runtime:env-1 8=orca::/w/feat-c 9=lab::/lab
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@ssh:gpu-vm 4=shared::/w/same@local 5=orca::/orca 6=orca-ssh::/orca-ssh 7=api::/api@runtime:env-1 8=orca::/w/feat-c 9=lab::/lab
cmd ids unmounted: orca::/w/feat-a orca-ssh::/w/remote-x shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext folder:fw-notes folder:fw-remote api::/w/api-y orca::/w/Zeta
=== groupBy=pr-status pinnedInGroups=false ===
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -500,7 +500,7 @@ renderedKeys: 32
placeholders: -
selectionOrder: |orca::/w/feat-b |orca::/w/feat-a runtime:env-1|api::/w/api-y ssh:gpu-vm|orca-ssh::/w/remote-x |lab::/w/gitlab-mr ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-b#lineage:orca::/w/feat-b 2=orca::/w/feat-a#lineage:orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=orca::/orca 9=orca-ssh::/orca-ssh
-cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@local 7=shared::/w/same@ssh:gpu-vm 8=orca::/orca 9=orca-ssh::/orca-ssh
+cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=orca::/orca 9=orca-ssh::/orca-ssh
cmd ids unmounted: orca::/w/feat-b orca::/w/feat-a api::/w/api-y orca-ssh::/w/remote-x lab::/w/gitlab-mr shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote orca::/w/Zeta
-- collapsed: pinned pr:in-review pr:closed lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -537,5 +537,5 @@ renderedKeys: 23
placeholders: -
selectionOrder: |orca::/w/feat-b ssh:gpu-vm|orca-ssh::/w/remote-x |lab::/w/gitlab-mr ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
-cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
+cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
cmd ids unmounted: orca::/w/feat-b orca-ssh::/w/remote-x lab::/w/gitlab-mr shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
diff --git a/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/scenario-stamp-tiers.txt b/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/scenario-stamp-tiers.txt
index 2671e48a535..35909d4e857 100644
--- a/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/scenario-stamp-tiers.txt
+++ b/src/renderer/src/components/sidebar/__goldens__/sidebar-list-stamp-order/scenario-stamp-tiers.txt
@@ -24,7 +24,7 @@ renderedKeys: 23
placeholders: -
selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr |orca::/w/feat-b |orca::/w/feat-c ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same |orca::/w/Zeta runtime:env-1|api::/w/api-y |orca::/orca runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh local|shared::/w/same local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b#lineage:orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=orca::/w/Zeta 8=api::/w/api-y@runtime:env-1 9=orca::/orca
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=orca::/w/Zeta 9=api::/w/api-y@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=orca::/w/Zeta 8=api::/w/api-y@runtime:env-1 9=orca::/orca
cmd ids unmounted: orca::/w/feat-a lab::/w/gitlab-mr orca::/w/feat-b orca::/w/feat-c orca-ssh::/w/remote-x shared::/w/same orca::/w/Zeta api::/w/api-y orca::/orca api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: orca::/w/Zeta orca::/w/feat-a orca-ssh::/w/remote-x lab::/w/gitlab-mr api::/w/api-y orca::/w/feat-b orca::/orca orca::/w/feat-c api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh shared::/w/same shared::/w/same
@@ -309,7 +309,7 @@ renderedKeys: 25
placeholders: -
selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr |orca::/w/feat-b |orca::/w/feat-c ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same |orca::/orca runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh local|shared::/w/same local|folder:fw-notes ssh:gpu-vm|folder:fw-remote local|folder:fw-review |orca::/w/Zeta runtime:env-1|api::/w/api-y
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b#lineage:orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=orca::/orca 8=api::/api@runtime:env-1 9=ext::/ext
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=orca::/orca 9=api::/api@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=orca::/orca 8=api::/api@runtime:env-1 9=ext::/ext
cmd ids unmounted: orca::/w/feat-a lab::/w/gitlab-mr orca::/w/feat-b orca::/w/feat-c orca-ssh::/w/remote-x shared::/w/same orca::/orca api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh folder:fw-notes folder:fw-remote folder:fw-review orca::/w/Zeta api::/w/api-y
-- collapsed: pinned workspace-status:in-review lineage:orca::/w/feat-a --
visible: orca::/w/Zeta orca::/w/feat-a orca-ssh::/w/remote-x lab::/w/gitlab-mr api::/w/api-y orca::/w/feat-b orca::/orca orca::/w/feat-c api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh shared::/w/same shared::/w/same
@@ -442,7 +442,7 @@ renderedKeys: 25
placeholders: -
selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr |orca::/w/feat-b |orca::/w/feat-c ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y |orca::/orca runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh local|shared::/w/same local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b#lineage:orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=orca::/orca 9=api::/api@runtime:env-1
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=orca::/orca
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=orca::/orca 9=api::/api@runtime:env-1
cmd ids unmounted: orca::/w/feat-a lab::/w/gitlab-mr orca::/w/feat-b orca::/w/feat-c orca-ssh::/w/remote-x shared::/w/same api::/w/api-y orca::/orca api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh folder:fw-review folder:fw-notes folder:fw-remote orca::/w/Zeta
-- collapsed: pinned pr:in-progress lineage:orca::/w/feat-a --
visible: orca::/w/Zeta orca::/w/feat-a orca-ssh::/w/remote-x lab::/w/gitlab-mr api::/w/api-y orca::/w/feat-b orca::/orca orca::/w/feat-c api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh shared::/w/same shared::/w/same
@@ -567,7 +567,7 @@ renderedKeys: 23
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y |orca::/orca runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh local|shared::/w/same |orca::/w/Zeta local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=orca::/orca 9=api::/api@runtime:env-1
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=api::/w/api-y@runtime:env-1 9=orca::/orca
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=orca::/orca 9=api::/api@runtime:env-1
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same api::/w/api-y orca::/orca api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/w/Zeta folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: orca::/w/feat-a api::/w/api-y orca::/w/feat-b orca::/orca orca::/w/feat-c lab::/w/gitlab-mr api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca-ssh::/w/remote-x shared::/w/same shared::/w/same orca::/w/Zeta
@@ -852,7 +852,7 @@ renderedKeys: 25
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same |orca::/orca runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh local|shared::/w/same local|folder:fw-notes ssh:gpu-vm|folder:fw-remote local|folder:fw-review runtime:env-1|api::/w/api-y |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=orca::/orca 8=api::/api@runtime:env-1 9=ext::/ext
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=orca::/orca 9=api::/api@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=orca::/orca 8=api::/api@runtime:env-1 9=ext::/ext
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same orca::/orca api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh folder:fw-notes folder:fw-remote folder:fw-review api::/w/api-y orca::/w/Zeta
-- collapsed: pinned workspace-status:in-review lineage:orca::/w/feat-a --
visible: orca::/w/feat-a api::/w/api-y orca::/w/feat-b orca::/orca orca::/w/feat-c lab::/w/gitlab-mr api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca-ssh::/w/remote-x shared::/w/same shared::/w/same orca::/w/Zeta
@@ -985,7 +985,7 @@ renderedKeys: 25
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y |orca::/orca runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh local|shared::/w/same local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=orca::/orca 9=api::/api@runtime:env-1
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=orca::/orca
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=orca::/orca 9=api::/api@runtime:env-1
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same api::/w/api-y orca::/orca api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh folder:fw-review folder:fw-notes folder:fw-remote orca::/w/Zeta
-- collapsed: pinned pr:in-progress lineage:orca::/w/feat-a --
visible: orca::/w/feat-a api::/w/api-y orca::/w/feat-b orca::/orca orca::/w/feat-c lab::/w/gitlab-mr api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca-ssh::/w/remote-x shared::/w/same shared::/w/same orca::/w/Zeta
diff --git a/src/renderer/src/components/sidebar/__goldens__/sidebar-list/group-by-none.txt b/src/renderer/src/components/sidebar/__goldens__/sidebar-list/group-by-none.txt
index 33dc0863cef..e637709711f 100644
--- a/src/renderer/src/components/sidebar/__goldens__/sidebar-list/group-by-none.txt
+++ b/src/renderer/src/components/sidebar/__goldens__/sidebar-list/group-by-none.txt
@@ -24,7 +24,7 @@ renderedKeys: 23
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y local|shared::/w/same |orca::/orca |orca::/w/Zeta |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=orca::/orca
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=api::/w/api-y@runtime:env-1 9=orca::/orca
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=orca::/orca
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same api::/w/api-y orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -66,8 +66,8 @@ ITEM rowKey=all:|orca::/w/feat-c depth=2 groupDepth=0 lastChild=true children=0
ITEM rowKey=all:|lab::/w/gitlab-mr depth=1 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" showProject=true placement=natural owning=project:repo:lab parent=all:|orca::/w/feat-a
ITEM rowKey=all:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=all:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=all:|orca::/w/Zeta depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=all:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
@@ -85,9 +85,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> all:ssh:gpu-vm|orca-ssh::/w/remote
PREFERRED ssh:gpu-vm|shared::/w/same -> all:ssh:gpu-vm|shared::/w/same
renderedKeys: 29
placeholders: -
-selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/orca |orca::/w/Zeta |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
-cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@local 8=shared::/w/same@ssh:gpu-vm 9=orca::/orca
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@local 8=shared::/w/same@ssh:gpu-vm 9=orca::/orca
+selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca::/w/Zeta |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
+cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@ssh:gpu-vm 8=shared::/w/same@local 9=orca::/orca
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@ssh:gpu-vm 8=shared::/w/same@local 9=orca::/orca
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x api::/w/api-y shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -97,8 +97,8 @@ HEADER key=all label="All" count=17 tone="text-foreground" icon=List hostCounts=
ITEM rowKey=all:|orca::/w/feat-a depth=0 groupDepth=0 children=2 lineageKey=lineage:orca::/w/feat-a lineageCollapsed=true hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=all:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=all:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=all:|orca::/w/Zeta depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=all:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
@@ -109,7 +109,7 @@ FOLDER key=folder-workspace:local|folder:fw-review projectGroup=pg-folders depth
FOLDER key=folder-workspace:local|folder:fw-notes projectGroup=pg-folders depth=0 groupDepth=0
FOLDER key=folder-workspace:ssh:gpu-vm|folder:fw-remote projectGroup=pg-remote-folders depth=0 groupDepth=0
SECTION pinned: pinned:|orca::/w/feat-a pinned:|orca::/w/feat-b pinned:|orca::/w/feat-c pinned:|lab::/w/gitlab-mr pinned:ssh:gpu-vm|orca-ssh::/w/remote-x pinned:ssh:gpu-vm|shared::/w/same
-SECTION all: all:|orca::/w/feat-a all:|orca::/w/feat-b all:|orca::/w/feat-c all:|lab::/w/gitlab-mr all:ssh:gpu-vm|orca-ssh::/w/remote-x all:runtime:env-1|api::/w/api-y all:local|shared::/w/same all:ssh:gpu-vm|shared::/w/same all:|orca::/orca all:|orca::/w/Zeta all:|orca-ssh::/orca-ssh all:runtime:env-1|api::/api all:|lab::/lab all:|ext::/ext
+SECTION all: all:|orca::/w/feat-a all:|orca::/w/feat-b all:|orca::/w/feat-c all:|lab::/w/gitlab-mr all:ssh:gpu-vm|orca-ssh::/w/remote-x all:runtime:env-1|api::/w/api-y all:ssh:gpu-vm|shared::/w/same all:local|shared::/w/same all:|orca::/orca all:|orca::/w/Zeta all:|orca-ssh::/orca-ssh all:runtime:env-1|api::/api all:|lab::/lab all:|ext::/ext
PREFERRED |orca::/w/feat-a -> all:|orca::/w/feat-a
PREFERRED |orca::/w/feat-b -> all:|orca::/w/feat-b
PREFERRED |orca::/w/feat-c -> all:|orca::/w/feat-c
@@ -118,9 +118,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> all:ssh:gpu-vm|orca-ssh::/w/remote
PREFERRED ssh:gpu-vm|shared::/w/same -> all:ssh:gpu-vm|shared::/w/same
renderedKeys: 20
placeholders: -
-selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/orca |orca::/w/Zeta |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
-cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca::/w/Zeta 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca::/w/Zeta 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
+selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca::/w/Zeta |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
+cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca::/w/Zeta 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca::/w/Zeta 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
cmd ids unmounted: orca::/w/feat-a orca-ssh::/w/remote-x api::/w/api-y shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
=== sort=manual projectOrder=recent pinnedInGroups=false === same as sort=manual projectOrder=manual pinnedInGroups=false
=== sort=manual projectOrder=recent pinnedInGroups=true === same as sort=manual projectOrder=manual pinnedInGroups=true
@@ -150,7 +150,7 @@ renderedKeys: 23
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh |orca::/orca local|shared::/w/same |orca::/w/Zeta local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=api::/api@runtime:env-1 9=ext::/ext
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=api::/w/api-y@runtime:env-1 9=api::/api@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=api::/api@runtime:env-1 9=ext::/ext
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same api::/w/api-y api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/orca orca::/w/Zeta folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: api::/w/api-y orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/orca orca-ssh::/w/remote-x shared::/w/same shared::/w/same orca::/w/Zeta
@@ -276,7 +276,7 @@ renderedKeys: 23
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same |orca::/w/Zeta runtime:env-1|api::/w/api-y |orca::/orca runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh local|shared::/w/same local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=orca::/w/Zeta 8=api::/w/api-y@runtime:env-1 9=orca::/orca
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=orca::/w/Zeta 9=api::/w/api-y@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=orca::/w/Zeta 8=api::/w/api-y@runtime:env-1 9=orca::/orca
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same orca::/w/Zeta api::/w/api-y orca::/orca api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: orca::/w/Zeta orca::/w/feat-a api::/w/api-y orca::/w/feat-b orca::/orca orca::/w/feat-c lab::/w/gitlab-mr api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca-ssh::/w/remote-x shared::/w/same shared::/w/same
@@ -402,7 +402,7 @@ renderedKeys: 23
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y |orca::/w/Zeta local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=orca::/w/Zeta 9=shared::/w/same@local
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=api::/w/api-y@runtime:env-1 9=orca::/w/Zeta
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=orca::/w/Zeta 9=shared::/w/same@local
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same api::/w/api-y orca::/w/Zeta orca::/orca orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y orca::/w/feat-c lab::/w/gitlab-mr orca::/w/Zeta shared::/w/same shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext
@@ -445,8 +445,8 @@ ITEM rowKey=all:|lab::/w/gitlab-mr depth=1 groupDepth=0 lastChild=true children=
ITEM rowKey=all:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=all:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
ITEM rowKey=all:|orca::/w/Zeta depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
-ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=all:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=all:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
@@ -463,9 +463,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> all:ssh:gpu-vm|orca-ssh::/w/remote
PREFERRED ssh:gpu-vm|shared::/w/same -> all:ssh:gpu-vm|shared::/w/same
renderedKeys: 29
placeholders: -
-selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y |orca::/w/Zeta local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
-cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=orca::/w/Zeta 8=shared::/w/same@local 9=shared::/w/same@ssh:gpu-vm
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=orca::/w/Zeta 8=shared::/w/same@local 9=shared::/w/same@ssh:gpu-vm
+selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y |orca::/w/Zeta ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
+cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=orca::/w/Zeta 8=shared::/w/same@ssh:gpu-vm 9=shared::/w/same@local
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=orca::/w/Zeta 8=shared::/w/same@ssh:gpu-vm 9=shared::/w/same@local
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x api::/w/api-y orca::/w/Zeta shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y orca::/w/feat-c lab::/w/gitlab-mr orca::/w/Zeta shared::/w/same shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext
@@ -476,8 +476,8 @@ ITEM rowKey=all:|orca::/w/feat-a depth=0 groupDepth=0 children=2 lineageKey=line
ITEM rowKey=all:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=all:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
ITEM rowKey=all:|orca::/w/Zeta depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
-ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=all:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=all:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
@@ -487,7 +487,7 @@ FOLDER key=folder-workspace:local|folder:fw-review projectGroup=pg-folders depth
FOLDER key=folder-workspace:local|folder:fw-notes projectGroup=pg-folders depth=0 groupDepth=0
FOLDER key=folder-workspace:ssh:gpu-vm|folder:fw-remote projectGroup=pg-remote-folders depth=0 groupDepth=0
SECTION pinned: pinned:|orca::/w/feat-a pinned:|orca::/w/feat-b pinned:|orca::/w/feat-c pinned:|lab::/w/gitlab-mr pinned:ssh:gpu-vm|orca-ssh::/w/remote-x pinned:ssh:gpu-vm|shared::/w/same
-SECTION all: all:|orca::/w/feat-a all:|orca::/w/feat-b all:|orca::/w/feat-c all:|lab::/w/gitlab-mr all:ssh:gpu-vm|orca-ssh::/w/remote-x all:runtime:env-1|api::/w/api-y all:|orca::/w/Zeta all:local|shared::/w/same all:ssh:gpu-vm|shared::/w/same all:|orca::/orca all:|orca-ssh::/orca-ssh all:runtime:env-1|api::/api all:|lab::/lab all:|ext::/ext
+SECTION all: all:|orca::/w/feat-a all:|orca::/w/feat-b all:|orca::/w/feat-c all:|lab::/w/gitlab-mr all:ssh:gpu-vm|orca-ssh::/w/remote-x all:runtime:env-1|api::/w/api-y all:|orca::/w/Zeta all:ssh:gpu-vm|shared::/w/same all:local|shared::/w/same all:|orca::/orca all:|orca-ssh::/orca-ssh all:runtime:env-1|api::/api all:|lab::/lab all:|ext::/ext
PREFERRED |orca::/w/feat-a -> all:|orca::/w/feat-a
PREFERRED |orca::/w/feat-b -> all:|orca::/w/feat-b
PREFERRED |orca::/w/feat-c -> all:|orca::/w/feat-c
@@ -496,9 +496,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> all:ssh:gpu-vm|orca-ssh::/w/remote
PREFERRED ssh:gpu-vm|shared::/w/same -> all:ssh:gpu-vm|shared::/w/same
renderedKeys: 20
placeholders: -
-selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y |orca::/w/Zeta local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
-cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=orca::/w/Zeta 5=shared::/w/same@local 6=shared::/w/same@ssh:gpu-vm 7=orca::/orca 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=orca::/w/Zeta 5=shared::/w/same@local 6=shared::/w/same@ssh:gpu-vm 7=orca::/orca 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
+selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y |orca::/w/Zeta ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
+cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=orca::/w/Zeta 5=shared::/w/same@ssh:gpu-vm 6=shared::/w/same@local 7=orca::/orca 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=orca::/w/Zeta 5=shared::/w/same@ssh:gpu-vm 6=shared::/w/same@local 7=orca::/orca 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
cmd ids unmounted: orca::/w/feat-a orca-ssh::/w/remote-x api::/w/api-y orca::/w/Zeta shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
=== sort=smart projectOrder=recent pinnedInGroups=false === same as sort=smart projectOrder=manual pinnedInGroups=false
=== sort=smart projectOrder=recent pinnedInGroups=true === same as sort=smart projectOrder=manual pinnedInGroups=true
@@ -528,7 +528,7 @@ renderedKeys: 23
placeholders: -
selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr |orca::/w/feat-b |orca::/w/feat-c ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh |orca::/orca |orca::/w/Zeta local|shared::/w/same local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b#lineage:orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=api::/api@runtime:env-1 9=ext::/ext
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=api::/w/api-y@runtime:env-1 9=api::/api@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=api::/api@runtime:env-1 9=ext::/ext
cmd ids unmounted: orca::/w/feat-a lab::/w/gitlab-mr orca::/w/feat-b orca::/w/feat-c orca-ssh::/w/remote-x shared::/w/same api::/w/api-y api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/orca orca::/w/Zeta folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: api::/w/api-y api::/api ext::/ext orca::/w/feat-a lab::/w/gitlab-mr lab::/lab orca::/w/feat-b orca::/w/feat-c orca-ssh::/orca-ssh orca::/orca orca-ssh::/w/remote-x orca::/w/Zeta shared::/w/same shared::/w/same
diff --git a/src/renderer/src/components/sidebar/__goldens__/sidebar-list/group-by-pr-status.txt b/src/renderer/src/components/sidebar/__goldens__/sidebar-list/group-by-pr-status.txt
index b1fe1f1edbc..fcdfd85d76f 100644
--- a/src/renderer/src/components/sidebar/__goldens__/sidebar-list/group-by-pr-status.txt
+++ b/src/renderer/src/components/sidebar/__goldens__/sidebar-list/group-by-pr-status.txt
@@ -63,8 +63,8 @@ ITEM rowKey=pr:in-review:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 lastCh
HEADER key=pr:in-progress label="In progress" count=13 tone="text-workspace-status-progress" icon=ConductorProgressIcon hostCounts={ssh:gpu-vm:4 local:8 runtime:env-1:1} hostIds={ssh:gpu-vm:[orca-ssh::/w/remote-x,shared::/w/same,orca-ssh::/orca-ssh] local:[lab::/w/gitlab-mr,shared::/w/same,orca::/orca,orca::/w/feat-c,lab::/lab,ext::/ext] runtime:env-1:[api::/api]} ids=[orca-ssh::/w/remote-x,lab::/w/gitlab-mr,shared::/w/same,shared::/w/same,orca::/orca,orca-ssh::/orca-ssh,api::/api,orca::/w/feat-c,lab::/lab,ext::/ext]
ITEM rowKey=pr:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|lab::/w/gitlab-mr depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:lab
-ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
@@ -84,9 +84,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> pr:in-progress:ssh:gpu-vm|orca-ssh
PREFERRED ssh:gpu-vm|shared::/w/same -> pr:in-progress:ssh:gpu-vm|shared::/w/same
renderedKeys: 32
placeholders: -
-selectionOrder: |orca::/w/feat-b |orca::/w/feat-a runtime:env-1|api::/w/api-y ssh:gpu-vm|orca-ssh::/w/remote-x |lab::/w/gitlab-mr local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/Zeta
-cmd1-9 mounted: 1=orca::/w/feat-b#lineage:orca::/w/feat-b 2=orca::/w/feat-a#lineage:orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@local 7=shared::/w/same@ssh:gpu-vm 8=orca::/orca 9=orca-ssh::/orca-ssh
-cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@local 7=shared::/w/same@ssh:gpu-vm 8=orca::/orca 9=orca-ssh::/orca-ssh
+selectionOrder: |orca::/w/feat-b |orca::/w/feat-a runtime:env-1|api::/w/api-y ssh:gpu-vm|orca-ssh::/w/remote-x |lab::/w/gitlab-mr ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/Zeta
+cmd1-9 mounted: 1=orca::/w/feat-b#lineage:orca::/w/feat-b 2=orca::/w/feat-a#lineage:orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=orca::/orca 9=orca-ssh::/orca-ssh
+cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=orca::/orca 9=orca-ssh::/orca-ssh
cmd ids unmounted: orca::/w/feat-b orca::/w/feat-a api::/w/api-y orca-ssh::/w/remote-x lab::/w/gitlab-mr shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote orca::/w/Zeta
-- collapsed: pinned pr:in-review pr:closed lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -98,8 +98,8 @@ HEADER key=pr:in-review label="In review" count=2 tone="text-workspace-status-re
HEADER key=pr:in-progress label="In progress" count=13 tone="text-workspace-status-progress" icon=ConductorProgressIcon hostCounts={ssh:gpu-vm:4 local:8 runtime:env-1:1} hostIds={ssh:gpu-vm:[orca-ssh::/w/remote-x,shared::/w/same,orca-ssh::/orca-ssh] local:[lab::/w/gitlab-mr,shared::/w/same,orca::/orca,orca::/w/feat-c,lab::/lab,ext::/ext] runtime:env-1:[api::/api]} ids=[orca-ssh::/w/remote-x,lab::/w/gitlab-mr,shared::/w/same,shared::/w/same,orca::/orca,orca-ssh::/orca-ssh,api::/api,orca::/w/feat-c,lab::/lab,ext::/ext]
ITEM rowKey=pr:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|lab::/w/gitlab-mr depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:lab
-ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
@@ -121,9 +121,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> pr:in-progress:ssh:gpu-vm|orca-ssh
PREFERRED ssh:gpu-vm|shared::/w/same -> pr:in-progress:ssh:gpu-vm|shared::/w/same
renderedKeys: 23
placeholders: -
-selectionOrder: |orca::/w/feat-b ssh:gpu-vm|orca-ssh::/w/remote-x |lab::/w/gitlab-mr local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
-cmd1-9 mounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
-cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
+selectionOrder: |orca::/w/feat-b ssh:gpu-vm|orca-ssh::/w/remote-x |lab::/w/gitlab-mr ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
+cmd1-9 mounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
+cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
cmd ids unmounted: orca::/w/feat-b orca-ssh::/w/remote-x lab::/w/gitlab-mr shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
=== sort=manual projectOrder=recent pinnedInGroups=false === same as sort=manual projectOrder=manual pinnedInGroups=false
=== sort=manual projectOrder=recent pinnedInGroups=true === same as sort=manual projectOrder=manual pinnedInGroups=true
@@ -155,7 +155,7 @@ renderedKeys: 25
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh |orca::/orca local|shared::/w/same local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=api::/api@runtime:env-1 9=ext::/ext
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=api::/api@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=api::/api@runtime:env-1 9=ext::/ext
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same api::/w/api-y api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/orca folder:fw-review folder:fw-notes folder:fw-remote orca::/w/Zeta
-- collapsed: pinned pr:in-progress lineage:orca::/w/feat-a --
visible: api::/w/api-y orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/orca orca-ssh::/w/remote-x shared::/w/same shared::/w/same orca::/w/Zeta
@@ -284,7 +284,7 @@ renderedKeys: 25
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y |orca::/orca runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh local|shared::/w/same local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=orca::/orca 9=api::/api@runtime:env-1
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=orca::/orca
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=orca::/orca 9=api::/api@runtime:env-1
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same api::/w/api-y orca::/orca api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh folder:fw-review folder:fw-notes folder:fw-remote orca::/w/Zeta
-- collapsed: pinned pr:in-progress lineage:orca::/w/feat-a --
visible: orca::/w/Zeta orca::/w/feat-a api::/w/api-y orca::/w/feat-b orca::/orca orca::/w/feat-c lab::/w/gitlab-mr api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca-ssh::/w/remote-x shared::/w/same shared::/w/same
@@ -451,8 +451,8 @@ HEADER key=pr:in-progress label="In progress" count=13 tone="text-workspace-stat
ITEM rowKey=pr:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|orca::/w/feat-c depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|lab::/w/gitlab-mr depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:lab
-ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
@@ -471,9 +471,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> pr:in-progress:ssh:gpu-vm|orca-ssh
PREFERRED ssh:gpu-vm|shared::/w/same -> pr:in-progress:ssh:gpu-vm|shared::/w/same
renderedKeys: 32
placeholders: -
-selectionOrder: |orca::/w/feat-b |orca::/w/feat-a runtime:env-1|api::/w/api-y ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/feat-c |lab::/w/gitlab-mr local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/Zeta
-cmd1-9 mounted: 1=orca::/w/feat-b#lineage:orca::/w/feat-b 2=orca::/w/feat-a#lineage:orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=orca::/w/feat-c 6=lab::/w/gitlab-mr 7=shared::/w/same@local 8=shared::/w/same@ssh:gpu-vm 9=orca::/orca
-cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=orca::/w/feat-c 6=lab::/w/gitlab-mr 7=shared::/w/same@local 8=shared::/w/same@ssh:gpu-vm 9=orca::/orca
+selectionOrder: |orca::/w/feat-b |orca::/w/feat-a runtime:env-1|api::/w/api-y ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/Zeta
+cmd1-9 mounted: 1=orca::/w/feat-b#lineage:orca::/w/feat-b 2=orca::/w/feat-a#lineage:orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=orca::/w/feat-c 6=lab::/w/gitlab-mr 7=shared::/w/same@ssh:gpu-vm 8=shared::/w/same@local 9=orca::/orca
+cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=orca::/w/feat-c 6=lab::/w/gitlab-mr 7=shared::/w/same@ssh:gpu-vm 8=shared::/w/same@local 9=orca::/orca
cmd ids unmounted: orca::/w/feat-b orca::/w/feat-a api::/w/api-y orca-ssh::/w/remote-x orca::/w/feat-c lab::/w/gitlab-mr shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote orca::/w/Zeta
-- collapsed: pinned pr:in-review pr:closed lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y orca::/w/feat-c lab::/w/gitlab-mr orca::/w/Zeta shared::/w/same shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext
@@ -486,8 +486,8 @@ HEADER key=pr:in-progress label="In progress" count=13 tone="text-workspace-stat
ITEM rowKey=pr:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|orca::/w/feat-c depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|lab::/w/gitlab-mr depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:lab
-ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
@@ -508,9 +508,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> pr:in-progress:ssh:gpu-vm|orca-ssh
PREFERRED ssh:gpu-vm|shared::/w/same -> pr:in-progress:ssh:gpu-vm|shared::/w/same
renderedKeys: 23
placeholders: -
-selectionOrder: |orca::/w/feat-b ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/feat-c |lab::/w/gitlab-mr local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
-cmd1-9 mounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=shared::/w/same@local 6=shared::/w/same@ssh:gpu-vm 7=orca::/orca 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
-cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=shared::/w/same@local 6=shared::/w/same@ssh:gpu-vm 7=orca::/orca 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
+selectionOrder: |orca::/w/feat-b ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
+cmd1-9 mounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=shared::/w/same@ssh:gpu-vm 6=shared::/w/same@local 7=orca::/orca 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=shared::/w/same@ssh:gpu-vm 6=shared::/w/same@local 7=orca::/orca 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
cmd ids unmounted: orca::/w/feat-b orca-ssh::/w/remote-x orca::/w/feat-c lab::/w/gitlab-mr shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
=== sort=smart projectOrder=recent pinnedInGroups=false === same as sort=smart projectOrder=manual pinnedInGroups=false
=== sort=smart projectOrder=recent pinnedInGroups=true === same as sort=smart projectOrder=manual pinnedInGroups=true
@@ -542,7 +542,7 @@ renderedKeys: 25
placeholders: -
selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr |orca::/w/feat-b |orca::/w/feat-c ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh |orca::/orca local|shared::/w/same local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b#lineage:orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=api::/api@runtime:env-1 9=ext::/ext
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=api::/api@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=api::/api@runtime:env-1 9=ext::/ext
cmd ids unmounted: orca::/w/feat-a lab::/w/gitlab-mr orca::/w/feat-b orca::/w/feat-c orca-ssh::/w/remote-x shared::/w/same api::/w/api-y api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/orca folder:fw-review folder:fw-notes folder:fw-remote orca::/w/Zeta
-- collapsed: pinned pr:in-progress lineage:orca::/w/feat-a --
visible: api::/w/api-y api::/api ext::/ext orca::/w/feat-a lab::/w/gitlab-mr lab::/lab orca::/w/feat-b orca::/w/feat-c orca-ssh::/orca-ssh orca::/orca orca-ssh::/w/remote-x orca::/w/Zeta shared::/w/same shared::/w/same
diff --git a/src/renderer/src/components/sidebar/__goldens__/sidebar-list/group-by-repo.txt b/src/renderer/src/components/sidebar/__goldens__/sidebar-list/group-by-repo.txt
index 1d561d2a7b9..0c735dfd976 100644
--- a/src/renderer/src/components/sidebar/__goldens__/sidebar-list/group-by-repo.txt
+++ b/src/renderer/src/components/sidebar/__goldens__/sidebar-list/group-by-repo.txt
@@ -98,9 +98,9 @@ HEADER key=project:repo:api label="api" count=2 tone="text-foreground" icon=Fold
PENDING key=pending:creation-1 creation=creation-1 repo=api
ITEM rowKey=project:repo:api:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
ITEM rowKey=project:repo:api:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 lastChild=true children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={local:1 ssh:gpu-vm:1} hostIds={local:[shared::/w/same] ssh:gpu-vm:[shared::/w/same]}
-ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
-ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={ssh:gpu-vm:1 local:1} hostIds={ssh:gpu-vm:[shared::/w/same] local:[shared::/w/same]}
+ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
HEADER key=project:repo:empty label="empty" count=0 tone="text-foreground" icon=FolderTree repo=empty projectGroupDepth=0
HEADER key=project:repo:ext label="ext" count=1 tone="text-foreground" icon=FolderTree repo=ext projectGroupDepth=0
IMPORTED key=imported-worktrees-card:repo-group:ext repo=ext placement=repo-group hidden=ext::/w/detected-hidden
@@ -114,7 +114,7 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> project:p-orca:ssh:gpu-vm|orca-ssh
PREFERRED ssh:gpu-vm|shared::/w/same -> project:repo:shared:ssh:gpu-vm|shared::/w/same
renderedKeys: 39
placeholders: empty
-selectionOrder: |orca::/orca |orca-ssh::/orca-ssh |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/Zeta |lab::/lab local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/api runtime:env-1|api::/w/api-y local|shared::/w/same ssh:gpu-vm|shared::/w/same |ext::/ext
+selectionOrder: |orca::/orca |orca-ssh::/orca-ssh |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/Zeta |lab::/lab local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/api runtime:env-1|api::/w/api-y ssh:gpu-vm|shared::/w/same local|shared::/w/same |ext::/ext
cmd1-9 mounted: 1=orca::/orca 2=orca-ssh::/orca-ssh 3=orca::/w/feat-a#lineage:orca::/w/feat-a 4=orca::/w/feat-b#lineage:orca::/w/feat-b 5=orca::/w/feat-c 6=lab::/w/gitlab-mr 7=orca-ssh::/w/remote-x@ssh:gpu-vm 8=orca::/w/Zeta 9=lab::/lab
cmd1-9 unmounted: 1=orca::/orca 2=orca-ssh::/orca-ssh 3=orca::/w/feat-a 4=orca::/w/feat-b 5=orca::/w/feat-c 6=lab::/w/gitlab-mr 7=orca-ssh::/w/remote-x@ssh:gpu-vm 8=orca::/w/Zeta 9=lab::/lab
cmd ids unmounted: orca::/orca orca-ssh::/orca-ssh orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x orca::/w/Zeta lab::/lab folder:fw-review folder:fw-notes folder:fw-remote api::/api api::/w/api-y shared::/w/same ext::/ext
@@ -133,13 +133,13 @@ HEADER key=project:repo:api label="api" count=2 tone="text-foreground" icon=Fold
PENDING key=pending:creation-1 creation=creation-1 repo=api
ITEM rowKey=project:repo:api:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
ITEM rowKey=project:repo:api:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 lastChild=true children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={local:1 ssh:gpu-vm:1} hostIds={local:[shared::/w/same] ssh:gpu-vm:[shared::/w/same]}
+HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={ssh:gpu-vm:1 local:1} hostIds={ssh:gpu-vm:[shared::/w/same] local:[shared::/w/same]}
HEADER key=project:repo:empty label="empty" count=0 tone="text-foreground" icon=FolderTree repo=empty projectGroupDepth=0
HEADER key=project:repo:ext label="ext" count=1 tone="text-foreground" icon=FolderTree repo=ext projectGroupDepth=0
SECTION pinned: pinned:|orca::/w/feat-a pinned:|orca::/w/feat-b pinned:|orca::/w/feat-c pinned:|lab::/w/gitlab-mr pinned:ssh:gpu-vm|orca-ssh::/w/remote-x pinned:ssh:gpu-vm|shared::/w/same
SECTION project:p-orca: project:p-orca:|orca::/orca project:p-orca:|orca-ssh::/orca-ssh project:p-orca:|orca::/w/feat-a project:p-orca:|orca::/w/feat-b project:p-orca:|orca::/w/feat-c project:p-orca:|lab::/w/gitlab-mr project:p-orca:ssh:gpu-vm|orca-ssh::/w/remote-x project:p-orca:|orca::/w/Zeta
SECTION project:repo:lab: project:repo:lab:|lab::/lab
-SECTION project:repo:shared: project:repo:shared:local|shared::/w/same project:repo:shared:ssh:gpu-vm|shared::/w/same
+SECTION project:repo:shared: project:repo:shared:ssh:gpu-vm|shared::/w/same project:repo:shared:local|shared::/w/same
SECTION project:repo:empty: -
SECTION project:repo:ext: project:repo:ext:|ext::/ext
PREFERRED |orca::/w/feat-a -> project:p-orca:|orca::/w/feat-a
@@ -255,9 +255,9 @@ HEADER key=project:repo:api label="api" count=2 tone="text-foreground" icon=Fold
PENDING key=pending:creation-1 creation=creation-1 repo=api
ITEM rowKey=project:repo:api:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
ITEM rowKey=project:repo:api:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 lastChild=true children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={local:1 ssh:gpu-vm:1} hostIds={local:[shared::/w/same] ssh:gpu-vm:[shared::/w/same]}
-ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
-ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={ssh:gpu-vm:1 local:1} hostIds={ssh:gpu-vm:[shared::/w/same] local:[shared::/w/same]}
+ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
HEADER key=project:repo:ext label="ext" count=1 tone="text-foreground" icon=FolderTree repo=ext projectGroupDepth=0
IMPORTED key=imported-worktrees-card:repo-group:ext repo=ext placement=repo-group hidden=ext::/w/detected-hidden
ITEM rowKey=project:repo:ext:|ext::/ext depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:repo:ext
@@ -271,7 +271,7 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> project:p-orca:ssh:gpu-vm|orca-ssh
PREFERRED ssh:gpu-vm|shared::/w/same -> project:repo:shared:ssh:gpu-vm|shared::/w/same
renderedKeys: 39
placeholders: empty
-selectionOrder: |orca::/orca |orca-ssh::/orca-ssh |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/Zeta |lab::/lab local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/api runtime:env-1|api::/w/api-y local|shared::/w/same ssh:gpu-vm|shared::/w/same |ext::/ext
+selectionOrder: |orca::/orca |orca-ssh::/orca-ssh |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/Zeta |lab::/lab local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/api runtime:env-1|api::/w/api-y ssh:gpu-vm|shared::/w/same local|shared::/w/same |ext::/ext
cmd1-9 mounted: 1=orca::/orca 2=orca-ssh::/orca-ssh 3=orca::/w/feat-a#lineage:orca::/w/feat-a 4=orca::/w/feat-b#lineage:orca::/w/feat-b 5=orca::/w/feat-c 6=lab::/w/gitlab-mr 7=orca-ssh::/w/remote-x@ssh:gpu-vm 8=orca::/w/Zeta 9=lab::/lab
cmd1-9 unmounted: 1=orca::/orca 2=orca-ssh::/orca-ssh 3=orca::/w/feat-a 4=orca::/w/feat-b 5=orca::/w/feat-c 6=lab::/w/gitlab-mr 7=orca-ssh::/w/remote-x@ssh:gpu-vm 8=orca::/w/Zeta 9=lab::/lab
cmd ids unmounted: orca::/orca orca-ssh::/orca-ssh orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x orca::/w/Zeta lab::/lab folder:fw-review folder:fw-notes folder:fw-remote api::/api api::/w/api-y shared::/w/same ext::/ext
@@ -290,7 +290,7 @@ HEADER key=project:repo:api label="api" count=2 tone="text-foreground" icon=Fold
PENDING key=pending:creation-1 creation=creation-1 repo=api
ITEM rowKey=project:repo:api:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
ITEM rowKey=project:repo:api:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 lastChild=true children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={local:1 ssh:gpu-vm:1} hostIds={local:[shared::/w/same] ssh:gpu-vm:[shared::/w/same]}
+HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={ssh:gpu-vm:1 local:1} hostIds={ssh:gpu-vm:[shared::/w/same] local:[shared::/w/same]}
HEADER key=project:repo:ext label="ext" count=1 tone="text-foreground" icon=FolderTree repo=ext projectGroupDepth=0
IMPORTED key=imported-worktrees-card:repo-group:ext repo=ext placement=repo-group hidden=ext::/w/detected-hidden
ITEM rowKey=project:repo:ext:|ext::/ext depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:repo:ext
@@ -298,7 +298,7 @@ HEADER key=project:repo:empty label="empty" count=0 tone="text-foreground" icon=
SECTION pinned: pinned:|orca::/w/feat-a pinned:|orca::/w/feat-b pinned:|orca::/w/feat-c pinned:|lab::/w/gitlab-mr pinned:ssh:gpu-vm|orca-ssh::/w/remote-x pinned:ssh:gpu-vm|shared::/w/same
SECTION project:p-orca: project:p-orca:|orca::/orca project:p-orca:|orca-ssh::/orca-ssh project:p-orca:|orca::/w/feat-a project:p-orca:|orca::/w/feat-b project:p-orca:|orca::/w/feat-c project:p-orca:|lab::/w/gitlab-mr project:p-orca:ssh:gpu-vm|orca-ssh::/w/remote-x project:p-orca:|orca::/w/Zeta
SECTION project:repo:lab: project:repo:lab:|lab::/lab
-SECTION project:repo:shared: project:repo:shared:local|shared::/w/same project:repo:shared:ssh:gpu-vm|shared::/w/same
+SECTION project:repo:shared: project:repo:shared:ssh:gpu-vm|shared::/w/same project:repo:shared:local|shared::/w/same
SECTION project:repo:empty: -
PREFERRED |orca::/w/feat-a -> project:p-orca:|orca::/w/feat-a
PREFERRED |orca::/w/feat-b -> project:p-orca:|orca::/w/feat-b
@@ -1040,9 +1040,9 @@ HEADER key=project:repo:api label="api" count=2 tone="text-foreground" icon=Fold
PENDING key=pending:creation-1 creation=creation-1 repo=api
ITEM rowKey=project:repo:api:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
ITEM rowKey=project:repo:api:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 lastChild=true children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={local:1 ssh:gpu-vm:1} hostIds={local:[shared::/w/same] ssh:gpu-vm:[shared::/w/same]}
-ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
-ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={ssh:gpu-vm:1 local:1} hostIds={ssh:gpu-vm:[shared::/w/same] local:[shared::/w/same]}
+ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
HEADER key=project:repo:empty label="empty" count=0 tone="text-foreground" icon=FolderTree repo=empty projectGroupDepth=0
HEADER key=project:repo:ext label="ext" count=1 tone="text-foreground" icon=FolderTree repo=ext projectGroupDepth=0
IMPORTED key=imported-worktrees-card:repo-group:ext repo=ext placement=repo-group hidden=ext::/w/detected-hidden
@@ -1056,7 +1056,7 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> project:p-orca:ssh:gpu-vm|orca-ssh
PREFERRED ssh:gpu-vm|shared::/w/same -> project:repo:shared:ssh:gpu-vm|shared::/w/same
renderedKeys: 39
placeholders: empty
-selectionOrder: |orca::/orca |orca-ssh::/orca-ssh |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/Zeta |lab::/lab local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/api runtime:env-1|api::/w/api-y local|shared::/w/same ssh:gpu-vm|shared::/w/same |ext::/ext
+selectionOrder: |orca::/orca |orca-ssh::/orca-ssh |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/Zeta |lab::/lab local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/api runtime:env-1|api::/w/api-y ssh:gpu-vm|shared::/w/same local|shared::/w/same |ext::/ext
cmd1-9 mounted: 1=orca::/orca 2=orca-ssh::/orca-ssh 3=orca::/w/feat-a#lineage:orca::/w/feat-a 4=orca::/w/feat-b#lineage:orca::/w/feat-b 5=orca::/w/feat-c 6=lab::/w/gitlab-mr 7=orca-ssh::/w/remote-x@ssh:gpu-vm 8=orca::/w/Zeta 9=lab::/lab
cmd1-9 unmounted: 1=orca::/orca 2=orca-ssh::/orca-ssh 3=orca::/w/feat-a 4=orca::/w/feat-b 5=orca::/w/feat-c 6=lab::/w/gitlab-mr 7=orca-ssh::/w/remote-x@ssh:gpu-vm 8=orca::/w/Zeta 9=lab::/lab
cmd ids unmounted: orca::/orca orca-ssh::/orca-ssh orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x orca::/w/Zeta lab::/lab folder:fw-review folder:fw-notes folder:fw-remote api::/api api::/w/api-y shared::/w/same ext::/ext
@@ -1075,13 +1075,13 @@ HEADER key=project:repo:api label="api" count=2 tone="text-foreground" icon=Fold
PENDING key=pending:creation-1 creation=creation-1 repo=api
ITEM rowKey=project:repo:api:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
ITEM rowKey=project:repo:api:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 lastChild=true children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={local:1 ssh:gpu-vm:1} hostIds={local:[shared::/w/same] ssh:gpu-vm:[shared::/w/same]}
+HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={ssh:gpu-vm:1 local:1} hostIds={ssh:gpu-vm:[shared::/w/same] local:[shared::/w/same]}
HEADER key=project:repo:empty label="empty" count=0 tone="text-foreground" icon=FolderTree repo=empty projectGroupDepth=0
HEADER key=project:repo:ext label="ext" count=1 tone="text-foreground" icon=FolderTree repo=ext projectGroupDepth=0
SECTION pinned: pinned:|orca::/w/feat-a pinned:|orca::/w/feat-b pinned:|orca::/w/feat-c pinned:|lab::/w/gitlab-mr pinned:ssh:gpu-vm|orca-ssh::/w/remote-x pinned:ssh:gpu-vm|shared::/w/same
SECTION project:p-orca: project:p-orca:|orca::/orca project:p-orca:|orca-ssh::/orca-ssh project:p-orca:|orca::/w/feat-a project:p-orca:|orca::/w/feat-b project:p-orca:|orca::/w/feat-c project:p-orca:|lab::/w/gitlab-mr project:p-orca:ssh:gpu-vm|orca-ssh::/w/remote-x project:p-orca:|orca::/w/Zeta
SECTION project:repo:lab: project:repo:lab:|lab::/lab
-SECTION project:repo:shared: project:repo:shared:local|shared::/w/same project:repo:shared:ssh:gpu-vm|shared::/w/same
+SECTION project:repo:shared: project:repo:shared:ssh:gpu-vm|shared::/w/same project:repo:shared:local|shared::/w/same
SECTION project:repo:empty: -
SECTION project:repo:ext: project:repo:ext:|ext::/ext
PREFERRED |orca::/w/feat-a -> project:p-orca:|orca::/w/feat-a
@@ -1197,9 +1197,9 @@ HEADER key=project:repo:api label="api" count=2 tone="text-foreground" icon=Fold
PENDING key=pending:creation-1 creation=creation-1 repo=api
ITEM rowKey=project:repo:api:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
ITEM rowKey=project:repo:api:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 lastChild=true children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={local:1 ssh:gpu-vm:1} hostIds={local:[shared::/w/same] ssh:gpu-vm:[shared::/w/same]}
-ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
-ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={ssh:gpu-vm:1 local:1} hostIds={ssh:gpu-vm:[shared::/w/same] local:[shared::/w/same]}
+ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
HEADER key=project:repo:ext label="ext" count=1 tone="text-foreground" icon=FolderTree repo=ext projectGroupDepth=0
IMPORTED key=imported-worktrees-card:repo-group:ext repo=ext placement=repo-group hidden=ext::/w/detected-hidden
ITEM rowKey=project:repo:ext:|ext::/ext depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:repo:ext
@@ -1213,7 +1213,7 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> project:p-orca:ssh:gpu-vm|orca-ssh
PREFERRED ssh:gpu-vm|shared::/w/same -> project:repo:shared:ssh:gpu-vm|shared::/w/same
renderedKeys: 39
placeholders: empty
-selectionOrder: |orca::/orca |orca-ssh::/orca-ssh |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/Zeta |lab::/lab local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/api runtime:env-1|api::/w/api-y local|shared::/w/same ssh:gpu-vm|shared::/w/same |ext::/ext
+selectionOrder: |orca::/orca |orca-ssh::/orca-ssh |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/Zeta |lab::/lab local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/api runtime:env-1|api::/w/api-y ssh:gpu-vm|shared::/w/same local|shared::/w/same |ext::/ext
cmd1-9 mounted: 1=orca::/orca 2=orca-ssh::/orca-ssh 3=orca::/w/feat-a#lineage:orca::/w/feat-a 4=orca::/w/feat-b#lineage:orca::/w/feat-b 5=orca::/w/feat-c 6=lab::/w/gitlab-mr 7=orca-ssh::/w/remote-x@ssh:gpu-vm 8=orca::/w/Zeta 9=lab::/lab
cmd1-9 unmounted: 1=orca::/orca 2=orca-ssh::/orca-ssh 3=orca::/w/feat-a 4=orca::/w/feat-b 5=orca::/w/feat-c 6=lab::/w/gitlab-mr 7=orca-ssh::/w/remote-x@ssh:gpu-vm 8=orca::/w/Zeta 9=lab::/lab
cmd ids unmounted: orca::/orca orca-ssh::/orca-ssh orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x orca::/w/Zeta lab::/lab folder:fw-review folder:fw-notes folder:fw-remote api::/api api::/w/api-y shared::/w/same ext::/ext
@@ -1232,7 +1232,7 @@ HEADER key=project:repo:api label="api" count=2 tone="text-foreground" icon=Fold
PENDING key=pending:creation-1 creation=creation-1 repo=api
ITEM rowKey=project:repo:api:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
ITEM rowKey=project:repo:api:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 lastChild=true children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={local:1 ssh:gpu-vm:1} hostIds={local:[shared::/w/same] ssh:gpu-vm:[shared::/w/same]}
+HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={ssh:gpu-vm:1 local:1} hostIds={ssh:gpu-vm:[shared::/w/same] local:[shared::/w/same]}
HEADER key=project:repo:ext label="ext" count=1 tone="text-foreground" icon=FolderTree repo=ext projectGroupDepth=0
IMPORTED key=imported-worktrees-card:repo-group:ext repo=ext placement=repo-group hidden=ext::/w/detected-hidden
ITEM rowKey=project:repo:ext:|ext::/ext depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:repo:ext
@@ -1240,7 +1240,7 @@ HEADER key=project:repo:empty label="empty" count=0 tone="text-foreground" icon=
SECTION pinned: pinned:|orca::/w/feat-a pinned:|orca::/w/feat-b pinned:|orca::/w/feat-c pinned:|lab::/w/gitlab-mr pinned:ssh:gpu-vm|orca-ssh::/w/remote-x pinned:ssh:gpu-vm|shared::/w/same
SECTION project:p-orca: project:p-orca:|orca::/orca project:p-orca:|orca-ssh::/orca-ssh project:p-orca:|orca::/w/feat-a project:p-orca:|orca::/w/feat-b project:p-orca:|orca::/w/feat-c project:p-orca:|lab::/w/gitlab-mr project:p-orca:ssh:gpu-vm|orca-ssh::/w/remote-x project:p-orca:|orca::/w/Zeta
SECTION project:repo:lab: project:repo:lab:|lab::/lab
-SECTION project:repo:shared: project:repo:shared:local|shared::/w/same project:repo:shared:ssh:gpu-vm|shared::/w/same
+SECTION project:repo:shared: project:repo:shared:ssh:gpu-vm|shared::/w/same project:repo:shared:local|shared::/w/same
SECTION project:repo:empty: -
PREFERRED |orca::/w/feat-a -> project:p-orca:|orca::/w/feat-a
PREFERRED |orca::/w/feat-b -> project:p-orca:|orca::/w/feat-b
diff --git a/src/renderer/src/components/sidebar/__goldens__/sidebar-list/group-by-workspace-status.txt b/src/renderer/src/components/sidebar/__goldens__/sidebar-list/group-by-workspace-status.txt
index e5501bdaae4..2c66f345351 100644
--- a/src/renderer/src/components/sidebar/__goldens__/sidebar-list/group-by-workspace-status.txt
+++ b/src/renderer/src/components/sidebar/__goldens__/sidebar-list/group-by-workspace-status.txt
@@ -68,8 +68,8 @@ HEADER key=workspace-status:in-progress label="In progress" count=13 tone="text-
ITEM rowKey=workspace-status:in-progress:|orca::/w/feat-a depth=0 groupDepth=0 children=1 lineageKey=lineage:orca::/w/feat-a hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:|lab::/w/gitlab-mr depth=1 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" showProject=true placement=natural owning=project:repo:lab parent=workspace-status:in-progress:|orca::/w/feat-a
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
-ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
@@ -92,9 +92,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> workspace-status:in-progress:ssh:g
PREFERRED ssh:gpu-vm|shared::/w/same -> workspace-status:in-progress:ssh:gpu-vm|shared::/w/same
renderedKeys: 31
placeholders: -
-selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/feat-b local|folder:fw-review runtime:env-1|api::/w/api-y |orca::/w/Zeta
-cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
+selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/feat-b local|folder:fw-review runtime:env-1|api::/w/api-y |orca::/w/Zeta
+cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
cmd ids unmounted: orca::/w/feat-a lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext folder:fw-notes folder:fw-remote orca::/w/feat-b folder:fw-review api::/w/api-y orca::/w/Zeta
-- collapsed: pinned workspace-status:in-review lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -103,8 +103,8 @@ HEADER key=pinned label="Pinned" count=6 tone="text-foreground" icon=Pin hostCou
HEADER key=workspace-status:in-progress label="In progress" count=13 tone="text-[#d4a300]" icon=ConductorProgressIcon hostCounts={local:8 ssh:gpu-vm:4 runtime:env-1:1} hostIds={local:[orca::/w/feat-a,lab::/w/gitlab-mr,shared::/w/same,orca::/orca,orca::/w/feat-c,lab::/lab,ext::/ext] ssh:gpu-vm:[orca-ssh::/w/remote-x,shared::/w/same,orca-ssh::/orca-ssh] runtime:env-1:[api::/api]} ids=[orca::/w/feat-a,orca-ssh::/w/remote-x,lab::/w/gitlab-mr,shared::/w/same,shared::/w/same,orca::/orca,orca-ssh::/orca-ssh,api::/api,orca::/w/feat-c,lab::/lab,ext::/ext]
ITEM rowKey=workspace-status:in-progress:|orca::/w/feat-a depth=0 groupDepth=0 children=1 lineageKey=lineage:orca::/w/feat-a lineageCollapsed=true hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
-ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
@@ -118,7 +118,7 @@ HEADER key=workspace-status:completed label="Done" count=2 tone="text-[#c7a594]"
ITEM rowKey=workspace-status:completed:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
ITEM rowKey=workspace-status:completed:|orca::/w/Zeta depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
SECTION pinned: pinned:|orca::/w/feat-a pinned:|orca::/w/feat-b pinned:|orca::/w/feat-c pinned:|lab::/w/gitlab-mr pinned:ssh:gpu-vm|orca-ssh::/w/remote-x pinned:ssh:gpu-vm|shared::/w/same
-SECTION workspace-status:in-progress: workspace-status:in-progress:|orca::/w/feat-a workspace-status:in-progress:|lab::/w/gitlab-mr workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x workspace-status:in-progress:local|shared::/w/same workspace-status:in-progress:ssh:gpu-vm|shared::/w/same workspace-status:in-progress:|orca::/orca workspace-status:in-progress:|orca-ssh::/orca-ssh workspace-status:in-progress:runtime:env-1|api::/api workspace-status:in-progress:|orca::/w/feat-c workspace-status:in-progress:|lab::/lab workspace-status:in-progress:|ext::/ext
+SECTION workspace-status:in-progress: workspace-status:in-progress:|orca::/w/feat-a workspace-status:in-progress:|lab::/w/gitlab-mr workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x workspace-status:in-progress:ssh:gpu-vm|shared::/w/same workspace-status:in-progress:local|shared::/w/same workspace-status:in-progress:|orca::/orca workspace-status:in-progress:|orca-ssh::/orca-ssh workspace-status:in-progress:runtime:env-1|api::/api workspace-status:in-progress:|orca::/w/feat-c workspace-status:in-progress:|lab::/lab workspace-status:in-progress:|ext::/ext
SECTION workspace-status:in-review: workspace-status:in-review:|orca::/w/feat-b
PREFERRED |orca::/w/feat-a -> workspace-status:in-progress:|orca::/w/feat-a
PREFERRED |orca::/w/feat-b -> workspace-status:in-review:|orca::/w/feat-b
@@ -128,9 +128,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> workspace-status:in-progress:ssh:g
PREFERRED ssh:gpu-vm|shared::/w/same -> workspace-status:in-progress:ssh:gpu-vm|shared::/w/same
renderedKeys: 21
placeholders: -
-selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/w/api-y |orca::/w/Zeta
-cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@local 4=shared::/w/same@ssh:gpu-vm 5=orca::/orca 6=orca-ssh::/orca-ssh 7=api::/api@runtime:env-1 8=orca::/w/feat-c 9=lab::/lab
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@local 4=shared::/w/same@ssh:gpu-vm 5=orca::/orca 6=orca-ssh::/orca-ssh 7=api::/api@runtime:env-1 8=orca::/w/feat-c 9=lab::/lab
+selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/w/api-y |orca::/w/Zeta
+cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@ssh:gpu-vm 4=shared::/w/same@local 5=orca::/orca 6=orca-ssh::/orca-ssh 7=api::/api@runtime:env-1 8=orca::/w/feat-c 9=lab::/lab
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@ssh:gpu-vm 4=shared::/w/same@local 5=orca::/orca 6=orca-ssh::/orca-ssh 7=api::/api@runtime:env-1 8=orca::/w/feat-c 9=lab::/lab
cmd ids unmounted: orca::/w/feat-a orca-ssh::/w/remote-x shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext folder:fw-notes folder:fw-remote api::/w/api-y orca::/w/Zeta
=== sort=manual projectOrder=recent pinnedInGroups=false === same as sort=manual projectOrder=manual pinnedInGroups=false
=== sort=manual projectOrder=recent pinnedInGroups=true === same as sort=manual projectOrder=manual pinnedInGroups=true
@@ -163,7 +163,7 @@ renderedKeys: 25
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh |orca::/orca local|shared::/w/same local|folder:fw-notes ssh:gpu-vm|folder:fw-remote local|folder:fw-review runtime:env-1|api::/w/api-y |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/api@runtime:env-1 8=ext::/ext 9=lab::/lab
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=api::/api@runtime:env-1 9=ext::/ext
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/api@runtime:env-1 8=ext::/ext 9=lab::/lab
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/orca folder:fw-notes folder:fw-remote folder:fw-review api::/w/api-y orca::/w/Zeta
-- collapsed: pinned workspace-status:in-review lineage:orca::/w/feat-a --
visible: api::/w/api-y orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/orca orca-ssh::/w/remote-x shared::/w/same shared::/w/same orca::/w/Zeta
@@ -299,7 +299,7 @@ renderedKeys: 25
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same |orca::/orca runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh local|shared::/w/same local|folder:fw-notes ssh:gpu-vm|folder:fw-remote local|folder:fw-review |orca::/w/Zeta runtime:env-1|api::/w/api-y
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=orca::/orca 8=api::/api@runtime:env-1 9=ext::/ext
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=orca::/orca 9=api::/api@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=orca::/orca 8=api::/api@runtime:env-1 9=ext::/ext
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same orca::/orca api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh folder:fw-notes folder:fw-remote folder:fw-review orca::/w/Zeta api::/w/api-y
-- collapsed: pinned workspace-status:in-review lineage:orca::/w/feat-a --
visible: orca::/w/Zeta orca::/w/feat-a api::/w/api-y orca::/w/feat-b orca::/orca orca::/w/feat-c lab::/w/gitlab-mr api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca-ssh::/w/remote-x shared::/w/same shared::/w/same
@@ -477,8 +477,8 @@ ITEM rowKey=workspace-status:in-progress:|orca::/w/feat-a depth=0 groupDepth=0 c
ITEM rowKey=workspace-status:in-progress:|lab::/w/gitlab-mr depth=1 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" showProject=true placement=natural owning=project:repo:lab parent=workspace-status:in-progress:|orca::/w/feat-a
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:|orca::/w/feat-c depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
-ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
@@ -500,9 +500,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> workspace-status:in-progress:ssh:g
PREFERRED ssh:gpu-vm|shared::/w/same -> workspace-status:in-progress:ssh:gpu-vm|shared::/w/same
renderedKeys: 31
placeholders: -
-selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/feat-c local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/feat-b local|folder:fw-review runtime:env-1|api::/w/api-y |orca::/w/Zeta
-cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=orca::/w/feat-c 5=shared::/w/same@local 6=shared::/w/same@ssh:gpu-vm 7=orca::/orca 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=orca::/w/feat-c 5=shared::/w/same@local 6=shared::/w/same@ssh:gpu-vm 7=orca::/orca 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
+selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/feat-c ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/feat-b local|folder:fw-review runtime:env-1|api::/w/api-y |orca::/w/Zeta
+cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=orca::/w/feat-c 5=shared::/w/same@ssh:gpu-vm 6=shared::/w/same@local 7=orca::/orca 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=orca::/w/feat-c 5=shared::/w/same@ssh:gpu-vm 6=shared::/w/same@local 7=orca::/orca 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
cmd ids unmounted: orca::/w/feat-a lab::/w/gitlab-mr orca-ssh::/w/remote-x orca::/w/feat-c shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext folder:fw-notes folder:fw-remote orca::/w/feat-b folder:fw-review api::/w/api-y orca::/w/Zeta
-- collapsed: pinned workspace-status:in-review lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y orca::/w/feat-c lab::/w/gitlab-mr orca::/w/Zeta shared::/w/same shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext
@@ -512,8 +512,8 @@ HEADER key=workspace-status:in-progress label="In progress" count=13 tone="text-
ITEM rowKey=workspace-status:in-progress:|orca::/w/feat-a depth=0 groupDepth=0 children=1 lineageKey=lineage:orca::/w/feat-a lineageCollapsed=true hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:|orca::/w/feat-c depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
-ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
@@ -526,7 +526,7 @@ HEADER key=workspace-status:completed label="Done" count=2 tone="text-[#c7a594]"
ITEM rowKey=workspace-status:completed:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
ITEM rowKey=workspace-status:completed:|orca::/w/Zeta depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
SECTION pinned: pinned:|orca::/w/feat-a pinned:|orca::/w/feat-b pinned:|orca::/w/feat-c pinned:|lab::/w/gitlab-mr pinned:ssh:gpu-vm|orca-ssh::/w/remote-x pinned:ssh:gpu-vm|shared::/w/same
-SECTION workspace-status:in-progress: workspace-status:in-progress:|orca::/w/feat-a workspace-status:in-progress:|lab::/w/gitlab-mr workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x workspace-status:in-progress:|orca::/w/feat-c workspace-status:in-progress:local|shared::/w/same workspace-status:in-progress:ssh:gpu-vm|shared::/w/same workspace-status:in-progress:|orca::/orca workspace-status:in-progress:|orca-ssh::/orca-ssh workspace-status:in-progress:runtime:env-1|api::/api workspace-status:in-progress:|lab::/lab workspace-status:in-progress:|ext::/ext
+SECTION workspace-status:in-progress: workspace-status:in-progress:|orca::/w/feat-a workspace-status:in-progress:|lab::/w/gitlab-mr workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x workspace-status:in-progress:|orca::/w/feat-c workspace-status:in-progress:ssh:gpu-vm|shared::/w/same workspace-status:in-progress:local|shared::/w/same workspace-status:in-progress:|orca::/orca workspace-status:in-progress:|orca-ssh::/orca-ssh workspace-status:in-progress:runtime:env-1|api::/api workspace-status:in-progress:|lab::/lab workspace-status:in-progress:|ext::/ext
SECTION workspace-status:in-review: workspace-status:in-review:|orca::/w/feat-b
PREFERRED |orca::/w/feat-a -> workspace-status:in-progress:|orca::/w/feat-a
PREFERRED |orca::/w/feat-b -> workspace-status:in-review:|orca::/w/feat-b
@@ -536,9 +536,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> workspace-status:in-progress:ssh:g
PREFERRED ssh:gpu-vm|shared::/w/same -> workspace-status:in-progress:ssh:gpu-vm|shared::/w/same
renderedKeys: 21
placeholders: -
-selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/feat-c local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/w/api-y |orca::/w/Zeta
-cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=orca::/w/feat-c 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=lab::/lab
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=orca::/w/feat-c 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=lab::/lab
+selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/feat-c ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/w/api-y |orca::/w/Zeta
+cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=orca::/w/feat-c 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=lab::/lab
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=orca::/w/feat-c 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=lab::/lab
cmd ids unmounted: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-c shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext folder:fw-notes folder:fw-remote api::/w/api-y orca::/w/Zeta
=== sort=smart projectOrder=recent pinnedInGroups=false === same as sort=smart projectOrder=manual pinnedInGroups=false
=== sort=smart projectOrder=recent pinnedInGroups=true === same as sort=smart projectOrder=manual pinnedInGroups=true
@@ -571,7 +571,7 @@ renderedKeys: 25
placeholders: -
selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr |orca::/w/feat-b |orca::/w/feat-c ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/api |ext::/ext |lab::/lab |orca-ssh::/orca-ssh |orca::/orca local|shared::/w/same local|folder:fw-notes ssh:gpu-vm|folder:fw-remote local|folder:fw-review runtime:env-1|api::/w/api-y |orca::/w/Zeta
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b#lineage:orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/api@runtime:env-1 8=ext::/ext 9=lab::/lab
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=api::/api@runtime:env-1 9=ext::/ext
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca::/w/feat-b 4=orca::/w/feat-c 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/api@runtime:env-1 8=ext::/ext 9=lab::/lab
cmd ids unmounted: orca::/w/feat-a lab::/w/gitlab-mr orca::/w/feat-b orca::/w/feat-c orca-ssh::/w/remote-x shared::/w/same api::/api ext::/ext lab::/lab orca-ssh::/orca-ssh orca::/orca folder:fw-notes folder:fw-remote folder:fw-review api::/w/api-y orca::/w/Zeta
-- collapsed: pinned workspace-status:in-review lineage:orca::/w/feat-a --
visible: api::/w/api-y api::/api ext::/ext orca::/w/feat-a lab::/w/gitlab-mr lab::/lab orca::/w/feat-b orca::/w/feat-c orca-ssh::/orca-ssh orca::/orca orca-ssh::/w/remote-x orca::/w/Zeta shared::/w/same shared::/w/same
diff --git a/src/renderer/src/components/sidebar/__goldens__/sidebar-list/scenario-hide-default-branch.txt b/src/renderer/src/components/sidebar/__goldens__/sidebar-list/scenario-hide-default-branch.txt
index d73569b7011..925c934d552 100644
--- a/src/renderer/src/components/sidebar/__goldens__/sidebar-list/scenario-hide-default-branch.txt
+++ b/src/renderer/src/components/sidebar/__goldens__/sidebar-list/scenario-hide-default-branch.txt
@@ -19,7 +19,7 @@ renderedKeys: 18
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y local|shared::/w/same |orca::/w/Zeta local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=orca::/w/Zeta
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=api::/w/api-y@runtime:env-1 9=orca::/w/Zeta
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=orca::/w/Zeta
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same api::/w/api-y orca::/w/Zeta folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/w/Zeta orca::/w/feat-c
@@ -56,8 +56,8 @@ ITEM rowKey=all:|orca::/w/feat-c depth=2 groupDepth=0 lastChild=true children=0
ITEM rowKey=all:|lab::/w/gitlab-mr depth=1 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" showProject=true placement=natural owning=project:repo:lab parent=all:|orca::/w/feat-a
ITEM rowKey=all:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=all:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:|orca::/w/Zeta depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
FOLDER key=folder-workspace:local|folder:fw-review projectGroup=pg-folders depth=0 groupDepth=0
FOLDER key=folder-workspace:local|folder:fw-notes projectGroup=pg-folders depth=0 groupDepth=0
@@ -70,9 +70,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> all:ssh:gpu-vm|orca-ssh::/w/remote
PREFERRED ssh:gpu-vm|shared::/w/same -> all:ssh:gpu-vm|shared::/w/same
renderedKeys: 24
placeholders: -
-selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/w/Zeta local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
-cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@local 8=shared::/w/same@ssh:gpu-vm 9=orca::/w/Zeta
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@local 8=shared::/w/same@ssh:gpu-vm 9=orca::/w/Zeta
+selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/w/Zeta local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
+cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@ssh:gpu-vm 8=shared::/w/same@local 9=orca::/w/Zeta
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@ssh:gpu-vm 8=shared::/w/same@local 9=orca::/w/Zeta
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x api::/w/api-y shared::/w/same orca::/w/Zeta folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/w/Zeta orca::/w/feat-c
@@ -82,14 +82,14 @@ HEADER key=all label="All" count=12 tone="text-foreground" icon=List hostCounts=
ITEM rowKey=all:|orca::/w/feat-a depth=0 groupDepth=0 children=2 lineageKey=lineage:orca::/w/feat-a lineageCollapsed=true hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=all:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=all:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:|orca::/w/Zeta depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
FOLDER key=folder-workspace:local|folder:fw-review projectGroup=pg-folders depth=0 groupDepth=0
FOLDER key=folder-workspace:local|folder:fw-notes projectGroup=pg-folders depth=0 groupDepth=0
FOLDER key=folder-workspace:ssh:gpu-vm|folder:fw-remote projectGroup=pg-remote-folders depth=0 groupDepth=0
SECTION pinned: pinned:|orca::/w/feat-a pinned:|orca::/w/feat-b pinned:|orca::/w/feat-c pinned:|lab::/w/gitlab-mr pinned:ssh:gpu-vm|orca-ssh::/w/remote-x pinned:ssh:gpu-vm|shared::/w/same
-SECTION all: all:|orca::/w/feat-a all:|orca::/w/feat-b all:|orca::/w/feat-c all:|lab::/w/gitlab-mr all:ssh:gpu-vm|orca-ssh::/w/remote-x all:runtime:env-1|api::/w/api-y all:local|shared::/w/same all:ssh:gpu-vm|shared::/w/same all:|orca::/w/Zeta
+SECTION all: all:|orca::/w/feat-a all:|orca::/w/feat-b all:|orca::/w/feat-c all:|lab::/w/gitlab-mr all:ssh:gpu-vm|orca-ssh::/w/remote-x all:runtime:env-1|api::/w/api-y all:ssh:gpu-vm|shared::/w/same all:local|shared::/w/same all:|orca::/w/Zeta
PREFERRED |orca::/w/feat-a -> all:|orca::/w/feat-a
PREFERRED |orca::/w/feat-b -> all:|orca::/w/feat-b
PREFERRED |orca::/w/feat-c -> all:|orca::/w/feat-c
@@ -98,9 +98,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> all:ssh:gpu-vm|orca-ssh::/w/remote
PREFERRED ssh:gpu-vm|shared::/w/same -> all:ssh:gpu-vm|shared::/w/same
renderedKeys: 15
placeholders: -
-selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/w/Zeta local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
-cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/w/Zeta 7=folder:fw-review@local 8=folder:fw-notes@local 9=folder:fw-remote@ssh:gpu-vm
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/w/Zeta 7=folder:fw-review@local 8=folder:fw-notes@local 9=folder:fw-remote@ssh:gpu-vm
+selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/w/Zeta local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
+cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/w/Zeta 7=folder:fw-review@local 8=folder:fw-notes@local 9=folder:fw-remote@ssh:gpu-vm
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/w/Zeta 7=folder:fw-review@local 8=folder:fw-notes@local 9=folder:fw-remote@ssh:gpu-vm
cmd ids unmounted: orca::/w/feat-a orca-ssh::/w/remote-x api::/w/api-y shared::/w/same orca::/w/Zeta folder:fw-review folder:fw-notes folder:fw-remote
=== groupBy=repo pinnedInGroups=false ===
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/w/Zeta orca::/w/feat-c
@@ -188,9 +188,9 @@ FOLDER key=folder-workspace:ssh:gpu-vm|folder:fw-remote projectGroup=pg-remote-f
HEADER key=project:repo:api label="api" count=1 tone="text-foreground" icon=FolderTree repo=api projectGroupDepth=0
PENDING key=pending:creation-1 creation=creation-1 repo=api
ITEM rowKey=project:repo:api:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 lastChild=true children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={local:1 ssh:gpu-vm:1} hostIds={local:[shared::/w/same] ssh:gpu-vm:[shared::/w/same]}
-ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
-ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={ssh:gpu-vm:1 local:1} hostIds={ssh:gpu-vm:[shared::/w/same] local:[shared::/w/same]}
+ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
HEADER key=project:repo:empty label="empty" count=0 tone="text-foreground" icon=FolderTree repo=empty projectGroupDepth=0
HEADER key=project:repo:ext label="ext" count=0 tone="text-foreground" icon=FolderTree repo=ext projectGroupDepth=0
IMPORTED key=imported-worktrees-card:repo-group:ext repo=ext placement=repo-group hidden=ext::/w/detected-hidden
@@ -204,7 +204,7 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> project:p-orca:ssh:gpu-vm|orca-ssh
PREFERRED ssh:gpu-vm|shared::/w/same -> project:repo:shared:ssh:gpu-vm|shared::/w/same
renderedKeys: 33
placeholders: empty
-selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/Zeta local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/w/api-y local|shared::/w/same ssh:gpu-vm|shared::/w/same
+selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/Zeta local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/w/api-y ssh:gpu-vm|shared::/w/same local|shared::/w/same
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=orca::/w/Zeta 7=folder:fw-review@local 8=folder:fw-notes@local 9=folder:fw-remote@ssh:gpu-vm
cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=orca::/w/Zeta 7=folder:fw-review@local 8=folder:fw-notes@local 9=folder:fw-remote@ssh:gpu-vm
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x orca::/w/Zeta folder:fw-review folder:fw-notes folder:fw-remote api::/w/api-y shared::/w/same
@@ -218,9 +218,9 @@ HEADER key=project-group:pg-folders label="Folders" count=2 tone="text-foregroun
HEADER key=project-group:pg-remote-folders label="Remote folders" count=1 tone="text-foreground" icon=FolderTree projectGroup=pg-remote-folders projectGroupDepth=0
FOLDER key=folder-workspace:ssh:gpu-vm|folder:fw-remote projectGroup=pg-remote-folders depth=0 groupDepth=1
HEADER key=project:repo:api label="api" count=1 tone="text-foreground" icon=FolderTree repo=api projectGroupDepth=0
-HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={local:1 ssh:gpu-vm:1} hostIds={local:[shared::/w/same] ssh:gpu-vm:[shared::/w/same]}
-ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
-ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={ssh:gpu-vm:1 local:1} hostIds={ssh:gpu-vm:[shared::/w/same] local:[shared::/w/same]}
+ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
HEADER key=project:repo:empty label="empty" count=0 tone="text-foreground" icon=FolderTree repo=empty projectGroupDepth=0
HEADER key=project:repo:ext label="ext" count=0 tone="text-foreground" icon=FolderTree repo=ext projectGroupDepth=0
IMPORTED key=imported-worktrees-card:repo-group:ext repo=ext placement=repo-group hidden=ext::/w/detected-hidden
@@ -237,9 +237,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> project:p-orca:ssh:gpu-vm|orca-ssh
PREFERRED ssh:gpu-vm|shared::/w/same -> project:repo:shared:ssh:gpu-vm|shared::/w/same
renderedKeys: 15
placeholders: empty
-selectionOrder: ssh:gpu-vm|folder:fw-remote local|shared::/w/same ssh:gpu-vm|shared::/w/same
-cmd1-9 mounted: 1=folder:fw-remote@ssh:gpu-vm 2=shared::/w/same@local 3=shared::/w/same@ssh:gpu-vm
-cmd1-9 unmounted: 1=folder:fw-remote@ssh:gpu-vm 2=shared::/w/same@local 3=shared::/w/same@ssh:gpu-vm
+selectionOrder: ssh:gpu-vm|folder:fw-remote ssh:gpu-vm|shared::/w/same local|shared::/w/same
+cmd1-9 mounted: 1=folder:fw-remote@ssh:gpu-vm 2=shared::/w/same@ssh:gpu-vm 3=shared::/w/same@local
+cmd1-9 unmounted: 1=folder:fw-remote@ssh:gpu-vm 2=shared::/w/same@ssh:gpu-vm 3=shared::/w/same@local
cmd ids unmounted: folder:fw-remote shared::/w/same
=== groupBy=workspace-status pinnedInGroups=false ===
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/w/Zeta orca::/w/feat-c
@@ -301,8 +301,8 @@ HEADER key=workspace-status:in-progress label="In progress" count=8 tone="text-[
ITEM rowKey=workspace-status:in-progress:|orca::/w/feat-a depth=0 groupDepth=0 children=1 lineageKey=lineage:orca::/w/feat-a hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:|lab::/w/gitlab-mr depth=1 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" showProject=true placement=natural owning=project:repo:lab parent=workspace-status:in-progress:|orca::/w/feat-a
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
-ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:|orca::/w/feat-c depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
FOLDER key=folder-workspace:local|folder:fw-notes projectGroup=pg-folders depth=0 groupDepth=0
FOLDER key=folder-workspace:ssh:gpu-vm|folder:fw-remote projectGroup=pg-remote-folders depth=0 groupDepth=0
@@ -320,9 +320,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> workspace-status:in-progress:ssh:g
PREFERRED ssh:gpu-vm|shared::/w/same -> workspace-status:in-progress:ssh:gpu-vm|shared::/w/same
renderedKeys: 26
placeholders: -
-selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/w/feat-c local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/feat-b local|folder:fw-review runtime:env-1|api::/w/api-y |orca::/w/Zeta
-cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/w/feat-c 7=folder:fw-notes@local 8=folder:fw-remote@ssh:gpu-vm 9=orca::/w/feat-b#lineage:orca::/w/feat-b
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/w/feat-c 7=folder:fw-notes@local 8=folder:fw-remote@ssh:gpu-vm 9=orca::/w/feat-b
+selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/w/feat-c local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/feat-b local|folder:fw-review runtime:env-1|api::/w/api-y |orca::/w/Zeta
+cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/w/feat-c 7=folder:fw-notes@local 8=folder:fw-remote@ssh:gpu-vm 9=orca::/w/feat-b#lineage:orca::/w/feat-b
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/w/feat-c 7=folder:fw-notes@local 8=folder:fw-remote@ssh:gpu-vm 9=orca::/w/feat-b
cmd ids unmounted: orca::/w/feat-a lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same orca::/w/feat-c folder:fw-notes folder:fw-remote orca::/w/feat-b folder:fw-review api::/w/api-y orca::/w/Zeta
-- collapsed: pinned workspace-status:in-review lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/w/Zeta orca::/w/feat-c
@@ -331,8 +331,8 @@ HEADER key=pinned label="Pinned" count=6 tone="text-foreground" icon=Pin hostCou
HEADER key=workspace-status:in-progress label="In progress" count=8 tone="text-[#d4a300]" icon=ConductorProgressIcon hostCounts={local:5 ssh:gpu-vm:3} hostIds={local:[orca::/w/feat-a,lab::/w/gitlab-mr,shared::/w/same,orca::/w/feat-c] ssh:gpu-vm:[orca-ssh::/w/remote-x,shared::/w/same]} ids=[orca::/w/feat-a,orca-ssh::/w/remote-x,lab::/w/gitlab-mr,shared::/w/same,shared::/w/same,orca::/w/feat-c]
ITEM rowKey=workspace-status:in-progress:|orca::/w/feat-a depth=0 groupDepth=0 children=1 lineageKey=lineage:orca::/w/feat-a lineageCollapsed=true hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
-ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:|orca::/w/feat-c depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
FOLDER key=folder-workspace:local|folder:fw-notes projectGroup=pg-folders depth=0 groupDepth=0
FOLDER key=folder-workspace:ssh:gpu-vm|folder:fw-remote projectGroup=pg-remote-folders depth=0 groupDepth=0
@@ -341,7 +341,7 @@ HEADER key=workspace-status:completed label="Done" count=2 tone="text-[#c7a594]"
ITEM rowKey=workspace-status:completed:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
ITEM rowKey=workspace-status:completed:|orca::/w/Zeta depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
SECTION pinned: pinned:|orca::/w/feat-a pinned:|orca::/w/feat-b pinned:|orca::/w/feat-c pinned:|lab::/w/gitlab-mr pinned:ssh:gpu-vm|orca-ssh::/w/remote-x pinned:ssh:gpu-vm|shared::/w/same
-SECTION workspace-status:in-progress: workspace-status:in-progress:|orca::/w/feat-a workspace-status:in-progress:|lab::/w/gitlab-mr workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x workspace-status:in-progress:local|shared::/w/same workspace-status:in-progress:ssh:gpu-vm|shared::/w/same workspace-status:in-progress:|orca::/w/feat-c
+SECTION workspace-status:in-progress: workspace-status:in-progress:|orca::/w/feat-a workspace-status:in-progress:|lab::/w/gitlab-mr workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x workspace-status:in-progress:ssh:gpu-vm|shared::/w/same workspace-status:in-progress:local|shared::/w/same workspace-status:in-progress:|orca::/w/feat-c
SECTION workspace-status:in-review: workspace-status:in-review:|orca::/w/feat-b
PREFERRED |orca::/w/feat-a -> workspace-status:in-progress:|orca::/w/feat-a
PREFERRED |orca::/w/feat-b -> workspace-status:in-review:|orca::/w/feat-b
@@ -351,9 +351,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> workspace-status:in-progress:ssh:g
PREFERRED ssh:gpu-vm|shared::/w/same -> workspace-status:in-progress:ssh:gpu-vm|shared::/w/same
renderedKeys: 16
placeholders: -
-selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/w/feat-c local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/w/api-y |orca::/w/Zeta
-cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@local 4=shared::/w/same@ssh:gpu-vm 5=orca::/w/feat-c 6=folder:fw-notes@local 7=folder:fw-remote@ssh:gpu-vm 8=api::/w/api-y@runtime:env-1 9=orca::/w/Zeta
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@local 4=shared::/w/same@ssh:gpu-vm 5=orca::/w/feat-c 6=folder:fw-notes@local 7=folder:fw-remote@ssh:gpu-vm 8=api::/w/api-y@runtime:env-1 9=orca::/w/Zeta
+selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/w/feat-c local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/w/api-y |orca::/w/Zeta
+cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@ssh:gpu-vm 4=shared::/w/same@local 5=orca::/w/feat-c 6=folder:fw-notes@local 7=folder:fw-remote@ssh:gpu-vm 8=api::/w/api-y@runtime:env-1 9=orca::/w/Zeta
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@ssh:gpu-vm 4=shared::/w/same@local 5=orca::/w/feat-c 6=folder:fw-notes@local 7=folder:fw-remote@ssh:gpu-vm 8=api::/w/api-y@runtime:env-1 9=orca::/w/Zeta
cmd ids unmounted: orca::/w/feat-a orca-ssh::/w/remote-x shared::/w/same orca::/w/feat-c folder:fw-notes folder:fw-remote api::/w/api-y orca::/w/Zeta
=== groupBy=pr-status pinnedInGroups=false ===
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/w/Zeta orca::/w/feat-c
@@ -415,8 +415,8 @@ ITEM rowKey=pr:in-review:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 lastCh
HEADER key=pr:in-progress label="In progress" count=8 tone="text-workspace-status-progress" icon=ConductorProgressIcon hostCounts={ssh:gpu-vm:3 local:5} hostIds={ssh:gpu-vm:[orca-ssh::/w/remote-x,shared::/w/same] local:[lab::/w/gitlab-mr,shared::/w/same,orca::/w/feat-c]} ids=[orca-ssh::/w/remote-x,lab::/w/gitlab-mr,shared::/w/same,shared::/w/same,orca::/w/feat-c]
ITEM rowKey=pr:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|lab::/w/gitlab-mr depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:lab
-ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:|orca::/w/feat-c depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
FOLDER key=folder-workspace:local|folder:fw-review projectGroup=pg-folders depth=0 groupDepth=0
FOLDER key=folder-workspace:local|folder:fw-notes projectGroup=pg-folders depth=0 groupDepth=0
@@ -431,9 +431,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> pr:in-progress:ssh:gpu-vm|orca-ssh
PREFERRED ssh:gpu-vm|shared::/w/same -> pr:in-progress:ssh:gpu-vm|shared::/w/same
renderedKeys: 27
placeholders: -
-selectionOrder: |orca::/w/feat-b |orca::/w/feat-a runtime:env-1|api::/w/api-y ssh:gpu-vm|orca-ssh::/w/remote-x |lab::/w/gitlab-mr local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/w/feat-c local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/Zeta
-cmd1-9 mounted: 1=orca::/w/feat-b#lineage:orca::/w/feat-b 2=orca::/w/feat-a#lineage:orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@local 7=shared::/w/same@ssh:gpu-vm 8=orca::/w/feat-c 9=folder:fw-review@local
-cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@local 7=shared::/w/same@ssh:gpu-vm 8=orca::/w/feat-c 9=folder:fw-review@local
+selectionOrder: |orca::/w/feat-b |orca::/w/feat-a runtime:env-1|api::/w/api-y ssh:gpu-vm|orca-ssh::/w/remote-x |lab::/w/gitlab-mr ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/w/feat-c local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/Zeta
+cmd1-9 mounted: 1=orca::/w/feat-b#lineage:orca::/w/feat-b 2=orca::/w/feat-a#lineage:orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=orca::/w/feat-c 9=folder:fw-review@local
+cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=orca::/w/feat-c 9=folder:fw-review@local
cmd ids unmounted: orca::/w/feat-b orca::/w/feat-a api::/w/api-y orca-ssh::/w/remote-x lab::/w/gitlab-mr shared::/w/same orca::/w/feat-c folder:fw-review folder:fw-notes folder:fw-remote orca::/w/Zeta
-- collapsed: pinned pr:in-review pr:closed lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/w/Zeta orca::/w/feat-c
@@ -445,8 +445,8 @@ HEADER key=pr:in-review label="In review" count=2 tone="text-workspace-status-re
HEADER key=pr:in-progress label="In progress" count=8 tone="text-workspace-status-progress" icon=ConductorProgressIcon hostCounts={ssh:gpu-vm:3 local:5} hostIds={ssh:gpu-vm:[orca-ssh::/w/remote-x,shared::/w/same] local:[lab::/w/gitlab-mr,shared::/w/same,orca::/w/feat-c]} ids=[orca-ssh::/w/remote-x,lab::/w/gitlab-mr,shared::/w/same,shared::/w/same,orca::/w/feat-c]
ITEM rowKey=pr:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|lab::/w/gitlab-mr depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:lab
-ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:|orca::/w/feat-c depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
FOLDER key=folder-workspace:local|folder:fw-review projectGroup=pg-folders depth=0 groupDepth=0
FOLDER key=folder-workspace:local|folder:fw-notes projectGroup=pg-folders depth=0 groupDepth=0
@@ -463,7 +463,7 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> pr:in-progress:ssh:gpu-vm|orca-ssh
PREFERRED ssh:gpu-vm|shared::/w/same -> pr:in-progress:ssh:gpu-vm|shared::/w/same
renderedKeys: 18
placeholders: -
-selectionOrder: |orca::/w/feat-b ssh:gpu-vm|orca-ssh::/w/remote-x |lab::/w/gitlab-mr local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/w/feat-c local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
-cmd1-9 mounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/w/feat-c 7=folder:fw-review@local 8=folder:fw-notes@local 9=folder:fw-remote@ssh:gpu-vm
-cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/w/feat-c 7=folder:fw-review@local 8=folder:fw-notes@local 9=folder:fw-remote@ssh:gpu-vm
+selectionOrder: |orca::/w/feat-b ssh:gpu-vm|orca-ssh::/w/remote-x |lab::/w/gitlab-mr ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/w/feat-c local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
+cmd1-9 mounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/w/feat-c 7=folder:fw-review@local 8=folder:fw-notes@local 9=folder:fw-remote@ssh:gpu-vm
+cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/w/feat-c 7=folder:fw-review@local 8=folder:fw-notes@local 9=folder:fw-remote@ssh:gpu-vm
cmd ids unmounted: orca::/w/feat-b orca-ssh::/w/remote-x lab::/w/gitlab-mr shared::/w/same orca::/w/feat-c folder:fw-review folder:fw-notes folder:fw-remote
diff --git a/src/renderer/src/components/sidebar/__goldens__/sidebar-list/scenario-host-sections.txt b/src/renderer/src/components/sidebar/__goldens__/sidebar-list/scenario-host-sections.txt
index 5f99dd63152..4779d3ce260 100644
--- a/src/renderer/src/components/sidebar/__goldens__/sidebar-list/scenario-host-sections.txt
+++ b/src/renderer/src/components/sidebar/__goldens__/sidebar-list/scenario-host-sections.txt
@@ -140,8 +140,8 @@ ITEM rowKey=all:|orca::/w/feat-c depth=2 groupDepth=0 lastChild=true children=0
ITEM rowKey=all:|lab::/w/gitlab-mr depth=1 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" showProject=true placement=natural owning=project:repo:lab parent=all:|orca::/w/feat-a
ITEM rowKey=all:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=all:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=all:|orca::/w/Zeta depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=all:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
@@ -186,8 +186,8 @@ HEADER key=all label="All" count=17 tone="text-foreground" icon=List hostCounts=
ITEM rowKey=all:|orca::/w/feat-a depth=0 groupDepth=0 children=2 lineageKey=lineage:orca::/w/feat-a lineageCollapsed=true hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=all:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=all:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=all:|orca::/w/Zeta depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=all:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
@@ -198,7 +198,7 @@ FOLDER key=folder-workspace:local|folder:fw-review projectGroup=pg-folders depth
FOLDER key=folder-workspace:local|folder:fw-notes projectGroup=pg-folders depth=0 groupDepth=0
FOLDER key=folder-workspace:ssh:gpu-vm|folder:fw-remote projectGroup=pg-remote-folders depth=0 groupDepth=0
SECTION pinned: pinned:|orca::/w/feat-a pinned:|orca::/w/feat-b pinned:|orca::/w/feat-c pinned:|lab::/w/gitlab-mr pinned:ssh:gpu-vm|orca-ssh::/w/remote-x pinned:ssh:gpu-vm|shared::/w/same
-SECTION all: all:|orca::/w/feat-a all:|orca::/w/feat-b all:|orca::/w/feat-c all:|lab::/w/gitlab-mr all:ssh:gpu-vm|orca-ssh::/w/remote-x all:runtime:env-1|api::/w/api-y all:local|shared::/w/same all:ssh:gpu-vm|shared::/w/same all:|orca::/orca all:|orca::/w/Zeta all:|orca-ssh::/orca-ssh all:runtime:env-1|api::/api all:|lab::/lab all:|ext::/ext
+SECTION all: all:|orca::/w/feat-a all:|orca::/w/feat-b all:|orca::/w/feat-c all:|lab::/w/gitlab-mr all:ssh:gpu-vm|orca-ssh::/w/remote-x all:runtime:env-1|api::/w/api-y all:ssh:gpu-vm|shared::/w/same all:local|shared::/w/same all:|orca::/orca all:|orca::/w/Zeta all:|orca-ssh::/orca-ssh all:runtime:env-1|api::/api all:|lab::/lab all:|ext::/ext
PREFERRED |orca::/w/feat-a -> all:|orca::/w/feat-a
PREFERRED |orca::/w/feat-b -> all:|orca::/w/feat-b
PREFERRED |orca::/w/feat-c -> all:|orca::/w/feat-c
@@ -345,8 +345,8 @@ ITEM rowKey=project:repo:lab:|lab::/lab depth=0 groupDepth=2 lastChild=true chil
HEADER key=project-group:pg-folders label="Folders" count=2 tone="text-foreground" icon=FolderTree projectGroup=pg-folders projectGroupDepth=0 hostId=local
FOLDER key=folder-workspace:local|folder:fw-review projectGroup=pg-folders depth=0 groupDepth=1
FOLDER key=folder-workspace:local|folder:fw-notes projectGroup=pg-folders depth=0 groupDepth=1
-HEADER key=project:repo:shared label="shared" count=1 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostId=local hostCounts={local:1 ssh:gpu-vm:1} hostIds={local:[shared::/w/same] ssh:gpu-vm:[shared::/w/same]} ids=[shared::/w/same]
-ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 children=0 placement=natural owning=project:repo:shared
+HEADER key=project:repo:shared label="shared" count=1 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostId=local hostCounts={ssh:gpu-vm:1 local:1} hostIds={ssh:gpu-vm:[shared::/w/same] local:[shared::/w/same]} ids=[shared::/w/same]
+ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 placement=natural owning=project:repo:shared
HEADER key=project:repo:empty label="empty" count=0 tone="text-foreground" icon=FolderTree repo=empty projectGroupDepth=0 hostId=local
HEADER key=project:repo:ext label="ext" count=1 tone="text-foreground" icon=FolderTree repo=ext projectGroupDepth=0 hostId=local
IMPORTED key=imported-worktrees-card:repo-group:ext repo=ext placement=repo-group hidden=ext::/w/detected-hidden
@@ -366,7 +366,7 @@ ITEM rowKey=project:p-orca:|orca-ssh::/orca-ssh depth=0 groupDepth=1 children=0
ITEM rowKey=project:p-orca:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=1 children=0 placement=natural owning=project:p-orca path=project-group:pg-work>project:p-orca
HEADER key=project-group:pg-remote-folders label="Remote folders" count=1 tone="text-foreground" icon=FolderTree projectGroup=pg-remote-folders projectGroupDepth=0 hostId=ssh:gpu-vm
FOLDER key=folder-workspace:ssh:gpu-vm|folder:fw-remote projectGroup=pg-remote-folders depth=0 groupDepth=1
-ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 placement=natural owning=project:repo:shared
+ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 placement=natural owning=project:repo:shared
-- rows before host sections --
HEADER key=pinned label="Pinned" count=6 tone="text-foreground" icon=Pin hostCounts={local:4 ssh:gpu-vm:2} hostIds={local:[orca::/w/feat-a,orca::/w/feat-b,lab::/w/gitlab-mr,orca::/w/feat-c] ssh:gpu-vm:[orca-ssh::/w/remote-x,shared::/w/same]} ids=[orca::/w/feat-a,orca-ssh::/w/remote-x,orca::/w/feat-b,lab::/w/gitlab-mr,shared::/w/same,orca::/w/feat-c]
ITEM rowKey=pinned:|orca::/w/feat-a depth=0 groupDepth=0 children=2 lineageKey=lineage:orca::/w/feat-a hostLabel="Local Linux" placement=pinned owning=project:p-orca
@@ -397,9 +397,9 @@ HEADER key=project:repo:api label="api" count=2 tone="text-foreground" icon=Fold
PENDING key=pending:creation-1 creation=creation-1 repo=api
ITEM rowKey=project:repo:api:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
ITEM rowKey=project:repo:api:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 lastChild=true children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={local:1 ssh:gpu-vm:1} hostIds={local:[shared::/w/same] ssh:gpu-vm:[shared::/w/same]}
-ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
-ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={ssh:gpu-vm:1 local:1} hostIds={ssh:gpu-vm:[shared::/w/same] local:[shared::/w/same]}
+ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
HEADER key=project:repo:empty label="empty" count=0 tone="text-foreground" icon=FolderTree repo=empty projectGroupDepth=0
HEADER key=project:repo:ext label="ext" count=1 tone="text-foreground" icon=FolderTree repo=ext projectGroupDepth=0
IMPORTED key=imported-worktrees-card:repo-group:ext repo=ext placement=repo-group hidden=ext::/w/detected-hidden
@@ -434,9 +434,9 @@ HEADER key=project-group:pg-work label="Work" count=2 tone="text-foreground" ico
HEADER key=project-group:pg-folders label="Folders" count=2 tone="text-foreground" icon=FolderTree projectGroup=pg-folders projectGroupDepth=0
HEADER key=project-group:pg-remote-folders label="Remote folders" count=1 tone="text-foreground" icon=FolderTree projectGroup=pg-remote-folders projectGroupDepth=0
HEADER key=project:repo:api label="api" count=2 tone="text-foreground" icon=FolderTree repo=api projectGroupDepth=0
-HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={local:1 ssh:gpu-vm:1} hostIds={local:[shared::/w/same] ssh:gpu-vm:[shared::/w/same]}
-ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
-ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={ssh:gpu-vm:1 local:1} hostIds={ssh:gpu-vm:[shared::/w/same] local:[shared::/w/same]}
+ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
HEADER key=project:repo:empty label="empty" count=0 tone="text-foreground" icon=FolderTree repo=empty projectGroupDepth=0
HEADER key=project:repo:ext label="ext" count=1 tone="text-foreground" icon=FolderTree repo=ext projectGroupDepth=0
IMPORTED key=imported-worktrees-card:repo-group:ext repo=ext placement=repo-group hidden=ext::/w/detected-hidden
@@ -445,7 +445,7 @@ SECTION pinned: pinned:|orca::/w/feat-a pinned:|orca::/w/feat-b pinned:|orca::/w
SECTION project:p-orca: project:p-orca:|orca::/orca project:p-orca:|orca-ssh::/orca-ssh project:p-orca:|orca::/w/feat-a project:p-orca:|orca::/w/feat-b project:p-orca:|orca::/w/feat-c project:p-orca:|lab::/w/gitlab-mr project:p-orca:ssh:gpu-vm|orca-ssh::/w/remote-x project:p-orca:|orca::/w/Zeta
SECTION project:repo:api: project:repo:api:runtime:env-1|api::/api project:repo:api:runtime:env-1|api::/w/api-y
SECTION project:repo:lab: project:repo:lab:|lab::/lab
-SECTION project:repo:shared: project:repo:shared:local|shared::/w/same project:repo:shared:ssh:gpu-vm|shared::/w/same
+SECTION project:repo:shared: project:repo:shared:ssh:gpu-vm|shared::/w/same project:repo:shared:local|shared::/w/same
SECTION project:repo:empty: -
SECTION project:repo:ext: project:repo:ext:|ext::/ext
PREFERRED |orca::/w/feat-a -> project:p-orca:|orca::/w/feat-a
@@ -610,8 +610,8 @@ HEADER key=workspace-status:in-progress label="In progress" count=13 tone="text-
ITEM rowKey=workspace-status:in-progress:|orca::/w/feat-a depth=0 groupDepth=0 children=1 lineageKey=lineage:orca::/w/feat-a hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:|lab::/w/gitlab-mr depth=1 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" showProject=true placement=natural owning=project:repo:lab parent=workspace-status:in-progress:|orca::/w/feat-a
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
-ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
@@ -656,8 +656,8 @@ ITEM rowKey=pinned:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 lastChild=tru
HEADER key=workspace-status:in-progress label="In progress" count=13 tone="text-[#d4a300]" icon=ConductorProgressIcon hostCounts={local:8 ssh:gpu-vm:4 runtime:env-1:1} hostIds={local:[orca::/w/feat-a,lab::/w/gitlab-mr,shared::/w/same,orca::/orca,orca::/w/feat-c,lab::/lab,ext::/ext] ssh:gpu-vm:[orca-ssh::/w/remote-x,shared::/w/same,orca-ssh::/orca-ssh] runtime:env-1:[api::/api]} ids=[orca::/w/feat-a,orca-ssh::/w/remote-x,lab::/w/gitlab-mr,shared::/w/same,shared::/w/same,orca::/orca,orca-ssh::/orca-ssh,api::/api,orca::/w/feat-c,lab::/lab,ext::/ext]
ITEM rowKey=workspace-status:in-progress:|orca::/w/feat-a depth=0 groupDepth=0 children=1 lineageKey=lineage:orca::/w/feat-a lineageCollapsed=true hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
-ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
@@ -673,7 +673,7 @@ HEADER key=workspace-status:completed label="Done" count=2 tone="text-[#c7a594]"
ITEM rowKey=workspace-status:completed:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
ITEM rowKey=workspace-status:completed:|orca::/w/Zeta depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
SECTION pinned: pinned:|orca::/w/feat-a pinned:|orca::/w/feat-b pinned:|orca::/w/feat-c pinned:|lab::/w/gitlab-mr pinned:ssh:gpu-vm|orca-ssh::/w/remote-x pinned:ssh:gpu-vm|shared::/w/same
-SECTION workspace-status:in-progress: workspace-status:in-progress:|orca::/w/feat-a workspace-status:in-progress:|lab::/w/gitlab-mr workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x workspace-status:in-progress:local|shared::/w/same workspace-status:in-progress:ssh:gpu-vm|shared::/w/same workspace-status:in-progress:|orca::/orca workspace-status:in-progress:|orca-ssh::/orca-ssh workspace-status:in-progress:runtime:env-1|api::/api workspace-status:in-progress:|orca::/w/feat-c workspace-status:in-progress:|lab::/lab workspace-status:in-progress:|ext::/ext
+SECTION workspace-status:in-progress: workspace-status:in-progress:|orca::/w/feat-a workspace-status:in-progress:|lab::/w/gitlab-mr workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x workspace-status:in-progress:ssh:gpu-vm|shared::/w/same workspace-status:in-progress:local|shared::/w/same workspace-status:in-progress:|orca::/orca workspace-status:in-progress:|orca-ssh::/orca-ssh workspace-status:in-progress:runtime:env-1|api::/api workspace-status:in-progress:|orca::/w/feat-c workspace-status:in-progress:|lab::/lab workspace-status:in-progress:|ext::/ext
SECTION workspace-status:in-review: workspace-status:in-review:|orca::/w/feat-b
SECTION workspace-status:completed: workspace-status:completed:runtime:env-1|api::/w/api-y workspace-status:completed:|orca::/w/Zeta
PREFERRED |orca::/w/feat-a -> workspace-status:in-progress:|orca::/w/feat-a
@@ -841,8 +841,8 @@ ITEM rowKey=pr:in-review:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 lastCh
HEADER key=pr:in-progress label="In progress" count=13 tone="text-workspace-status-progress" icon=ConductorProgressIcon hostCounts={ssh:gpu-vm:4 local:8 runtime:env-1:1} hostIds={ssh:gpu-vm:[orca-ssh::/w/remote-x,shared::/w/same,orca-ssh::/orca-ssh] local:[lab::/w/gitlab-mr,shared::/w/same,orca::/orca,orca::/w/feat-c,lab::/lab,ext::/ext] runtime:env-1:[api::/api]} ids=[orca-ssh::/w/remote-x,lab::/w/gitlab-mr,shared::/w/same,shared::/w/same,orca::/orca,orca-ssh::/orca-ssh,api::/api,orca::/w/feat-c,lab::/lab,ext::/ext]
ITEM rowKey=pr:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|lab::/w/gitlab-mr depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:lab
-ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
@@ -891,8 +891,8 @@ ITEM rowKey=pr:in-review:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 lastCh
HEADER key=pr:in-progress label="In progress" count=13 tone="text-workspace-status-progress" icon=ConductorProgressIcon hostCounts={ssh:gpu-vm:4 local:8 runtime:env-1:1} hostIds={ssh:gpu-vm:[orca-ssh::/w/remote-x,shared::/w/same,orca-ssh::/orca-ssh] local:[lab::/w/gitlab-mr,shared::/w/same,orca::/orca,orca::/w/feat-c,lab::/lab,ext::/ext] runtime:env-1:[api::/api]} ids=[orca-ssh::/w/remote-x,lab::/w/gitlab-mr,shared::/w/same,shared::/w/same,orca::/orca,orca-ssh::/orca-ssh,api::/api,orca::/w/feat-c,lab::/lab,ext::/ext]
ITEM rowKey=pr:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|lab::/w/gitlab-mr depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:lab
-ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
@@ -907,7 +907,7 @@ ITEM rowKey=pr:closed:|orca::/w/Zeta depth=0 groupDepth=0 lastChild=true childre
SECTION pinned: pinned:|orca::/w/feat-a pinned:|orca::/w/feat-b pinned:|orca::/w/feat-c pinned:|lab::/w/gitlab-mr pinned:ssh:gpu-vm|orca-ssh::/w/remote-x pinned:ssh:gpu-vm|shared::/w/same
SECTION pr:done: pr:done:|orca::/w/feat-b
SECTION pr:in-review: pr:in-review:|orca::/w/feat-a pr:in-review:runtime:env-1|api::/w/api-y
-SECTION pr:in-progress: pr:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x pr:in-progress:|lab::/w/gitlab-mr pr:in-progress:local|shared::/w/same pr:in-progress:ssh:gpu-vm|shared::/w/same pr:in-progress:|orca::/orca pr:in-progress:|orca-ssh::/orca-ssh pr:in-progress:runtime:env-1|api::/api pr:in-progress:|orca::/w/feat-c pr:in-progress:|lab::/lab pr:in-progress:|ext::/ext
+SECTION pr:in-progress: pr:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x pr:in-progress:|lab::/w/gitlab-mr pr:in-progress:ssh:gpu-vm|shared::/w/same pr:in-progress:local|shared::/w/same pr:in-progress:|orca::/orca pr:in-progress:|orca-ssh::/orca-ssh pr:in-progress:runtime:env-1|api::/api pr:in-progress:|orca::/w/feat-c pr:in-progress:|lab::/lab pr:in-progress:|ext::/ext
SECTION pr:closed: pr:closed:|orca::/w/Zeta
PREFERRED |orca::/w/feat-a -> pr:in-review:|orca::/w/feat-a
PREFERRED |orca::/w/feat-b -> pr:done:|orca::/w/feat-b
diff --git a/src/renderer/src/components/sidebar/__goldens__/sidebar-list/scenario-name-order.txt b/src/renderer/src/components/sidebar/__goldens__/sidebar-list/scenario-name-order.txt
index 2d89ce5e400..92c7bff5879 100644
--- a/src/renderer/src/components/sidebar/__goldens__/sidebar-list/scenario-name-order.txt
+++ b/src/renderer/src/components/sidebar/__goldens__/sidebar-list/scenario-name-order.txt
@@ -1,8 +1,8 @@
=== groupBy=none sort=name projectOrder=manual ===
visible: r-angstrom::/w/angstrom r-angstrom::/w/angstrom r-angstrom::/w/ångström r-eclair::/w/Eclair r-ssh::/w/eclair r-eclair::/w/eclair r-eclair::/w/éclair r-eclair::/w/éclair r-eclair::/w/W2 r-ssh::/w/w2 r-eclair::/w/w2 r-eclair::/w/w10 r-eclair::/w/zebra
-HEADER key=all label="All" count=23 tone="text-foreground" icon=List hostCounts={local:20 ssh:gpu-vm:3} hostIds={local:[r-angstrom::/w/angstrom,r-angstrom::/w/ångström,r-eclair::/w/Eclair,r-eclair::/w/eclair,r-eclair::/w/éclair,r-eclair::/w/éclair,r-eclair::/w/W2,r-eclair::/w/w2,r-eclair::/w/w10,r-eclair::/w/zebra] ssh:gpu-vm:[r-angstrom::/w/angstrom,r-ssh::/w/eclair,r-ssh::/w/w2]} ids=[r-angstrom::/w/angstrom,r-angstrom::/w/angstrom,r-angstrom::/w/ångström,r-eclair::/w/Eclair,r-ssh::/w/eclair,r-eclair::/w/eclair,r-eclair::/w/éclair,r-eclair::/w/éclair,r-eclair::/w/W2,r-ssh::/w/w2,r-eclair::/w/w2,r-eclair::/w/w10,r-eclair::/w/zebra]
-ITEM rowKey=all:|r-angstrom::/w/angstrom depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-angstrom
+HEADER key=all label="All" count=23 tone="text-foreground" icon=List hostCounts={ssh:gpu-vm:3 local:20} hostIds={ssh:gpu-vm:[r-angstrom::/w/angstrom,r-ssh::/w/eclair,r-ssh::/w/w2] local:[r-angstrom::/w/angstrom,r-angstrom::/w/ångström,r-eclair::/w/Eclair,r-eclair::/w/eclair,r-eclair::/w/éclair,r-eclair::/w/éclair,r-eclair::/w/W2,r-eclair::/w/w2,r-eclair::/w/w10,r-eclair::/w/zebra]} ids=[r-angstrom::/w/angstrom,r-angstrom::/w/angstrom,r-angstrom::/w/ångström,r-eclair::/w/Eclair,r-ssh::/w/eclair,r-eclair::/w/eclair,r-eclair::/w/éclair,r-eclair::/w/éclair,r-eclair::/w/W2,r-ssh::/w/w2,r-eclair::/w/w2,r-eclair::/w/w10,r-eclair::/w/zebra]
ITEM rowKey=all:ssh:gpu-vm|r-angstrom::/w/angstrom depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:r-angstrom
+ITEM rowKey=all:|r-angstrom::/w/angstrom depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-angstrom
ITEM rowKey=all:|r-angstrom::/w/ångström depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-angstrom
ITEM rowKey=all:|r-eclair::/w/Eclair depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-eclair
ITEM rowKey=all:ssh:gpu-vm|r-ssh::/w/eclair depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:r-ssh
@@ -26,9 +26,9 @@ FOLDER key=folder-workspace:local|folder:fw-w10 projectGroup=pg-zebra depth=0 gr
FOLDER key=folder-workspace:local|folder:fw-zebra projectGroup=pg-zebra depth=0 groupDepth=0
renderedKeys: 34
placeholders: -
-selectionOrder: |r-angstrom::/w/angstrom ssh:gpu-vm|r-angstrom::/w/angstrom |r-angstrom::/w/ångström |r-eclair::/w/Eclair ssh:gpu-vm|r-ssh::/w/eclair |r-eclair::/w/eclair |r-eclair::/w/éclair |r-eclair::/w/éclair |r-eclair::/w/W2 ssh:gpu-vm|r-ssh::/w/w2 |r-eclair::/w/w2 |r-eclair::/w/w10 |r-eclair::/w/zebra local|folder:fw-angstrom local|folder:fw-angstrom-accent local|folder:fw-Eclair local|folder:fw-eclair local|folder:fw-eclair-accent local|folder:fw-W2 local|folder:fw-w2-a local|folder:fw-w2-b local|folder:fw-w10 local|folder:fw-zebra
-cmd1-9 mounted: 1=r-angstrom::/w/angstrom 2=r-angstrom::/w/angstrom@ssh:gpu-vm 3=r-angstrom::/w/ångström 4=r-eclair::/w/Eclair 5=r-ssh::/w/eclair@ssh:gpu-vm 6=r-eclair::/w/eclair 7=r-eclair::/w/éclair 8=r-eclair::/w/éclair 9=r-eclair::/w/W2
-cmd1-9 unmounted: 1=r-angstrom::/w/angstrom 2=r-angstrom::/w/angstrom@ssh:gpu-vm 3=r-angstrom::/w/ångström 4=r-eclair::/w/Eclair 5=r-ssh::/w/eclair@ssh:gpu-vm 6=r-eclair::/w/eclair 7=r-eclair::/w/éclair 8=r-eclair::/w/éclair 9=r-eclair::/w/W2
+selectionOrder: ssh:gpu-vm|r-angstrom::/w/angstrom |r-angstrom::/w/angstrom |r-angstrom::/w/ångström |r-eclair::/w/Eclair ssh:gpu-vm|r-ssh::/w/eclair |r-eclair::/w/eclair |r-eclair::/w/éclair |r-eclair::/w/éclair |r-eclair::/w/W2 ssh:gpu-vm|r-ssh::/w/w2 |r-eclair::/w/w2 |r-eclair::/w/w10 |r-eclair::/w/zebra local|folder:fw-angstrom local|folder:fw-angstrom-accent local|folder:fw-Eclair local|folder:fw-eclair local|folder:fw-eclair-accent local|folder:fw-W2 local|folder:fw-w2-a local|folder:fw-w2-b local|folder:fw-w10 local|folder:fw-zebra
+cmd1-9 mounted: 1=r-angstrom::/w/angstrom@ssh:gpu-vm 2=r-angstrom::/w/angstrom 3=r-angstrom::/w/ångström 4=r-eclair::/w/Eclair 5=r-ssh::/w/eclair@ssh:gpu-vm 6=r-eclair::/w/eclair 7=r-eclair::/w/éclair 8=r-eclair::/w/éclair 9=r-eclair::/w/W2
+cmd1-9 unmounted: 1=r-angstrom::/w/angstrom@ssh:gpu-vm 2=r-angstrom::/w/angstrom 3=r-angstrom::/w/ångström 4=r-eclair::/w/Eclair 5=r-ssh::/w/eclair@ssh:gpu-vm 6=r-eclair::/w/eclair 7=r-eclair::/w/éclair 8=r-eclair::/w/éclair 9=r-eclair::/w/W2
cmd ids unmounted: r-angstrom::/w/angstrom r-angstrom::/w/ångström r-eclair::/w/Eclair r-ssh::/w/eclair r-eclair::/w/eclair r-eclair::/w/éclair r-eclair::/w/éclair r-eclair::/w/W2 r-ssh::/w/w2 r-eclair::/w/w2 r-eclair::/w/w10 r-eclair::/w/zebra folder:fw-angstrom folder:fw-angstrom-accent folder:fw-Eclair folder:fw-eclair folder:fw-eclair-accent folder:fw-W2 folder:fw-w2-a folder:fw-w2-b folder:fw-w10 folder:fw-zebra
=== groupBy=none sort=name projectOrder=recent === same as groupBy=none sort=name projectOrder=manual
=== groupBy=none sort=recent projectOrder=manual ===
@@ -36,8 +36,8 @@ visible: r-eclair::/w/w10 r-eclair::/w/zebra r-angstrom::/w/angstrom r-angstrom:
HEADER key=all label="All" count=23 tone="text-foreground" icon=List hostCounts={local:20 ssh:gpu-vm:3} hostIds={local:[r-eclair::/w/w10,r-eclair::/w/zebra,r-angstrom::/w/angstrom,r-angstrom::/w/ångström,r-eclair::/w/Eclair,r-eclair::/w/eclair,r-eclair::/w/éclair,r-eclair::/w/éclair,r-eclair::/w/W2,r-eclair::/w/w2] ssh:gpu-vm:[r-angstrom::/w/angstrom,r-ssh::/w/eclair,r-ssh::/w/w2]} ids=[r-eclair::/w/w10,r-eclair::/w/zebra,r-angstrom::/w/angstrom,r-angstrom::/w/angstrom,r-angstrom::/w/ångström,r-eclair::/w/Eclair,r-ssh::/w/eclair,r-eclair::/w/eclair,r-eclair::/w/éclair,r-eclair::/w/éclair,r-eclair::/w/W2,r-ssh::/w/w2,r-eclair::/w/w2]
ITEM rowKey=all:|r-eclair::/w/w10 depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-eclair
ITEM rowKey=all:|r-eclair::/w/zebra depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-eclair
-ITEM rowKey=all:|r-angstrom::/w/angstrom depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-angstrom
ITEM rowKey=all:ssh:gpu-vm|r-angstrom::/w/angstrom depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:r-angstrom
+ITEM rowKey=all:|r-angstrom::/w/angstrom depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-angstrom
ITEM rowKey=all:|r-angstrom::/w/ångström depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-angstrom
ITEM rowKey=all:|r-eclair::/w/Eclair depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-eclair
ITEM rowKey=all:ssh:gpu-vm|r-ssh::/w/eclair depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:r-ssh
@@ -59,16 +59,16 @@ FOLDER key=folder-workspace:local|folder:fw-w10 projectGroup=pg-zebra depth=0 gr
FOLDER key=folder-workspace:local|folder:fw-zebra projectGroup=pg-zebra depth=0 groupDepth=0
renderedKeys: 34
placeholders: -
-selectionOrder: |r-eclair::/w/w10 |r-eclair::/w/zebra |r-angstrom::/w/angstrom ssh:gpu-vm|r-angstrom::/w/angstrom |r-angstrom::/w/ångström |r-eclair::/w/Eclair ssh:gpu-vm|r-ssh::/w/eclair |r-eclair::/w/eclair |r-eclair::/w/éclair |r-eclair::/w/éclair |r-eclair::/w/W2 ssh:gpu-vm|r-ssh::/w/w2 |r-eclair::/w/w2 local|folder:fw-angstrom local|folder:fw-angstrom-accent local|folder:fw-Eclair local|folder:fw-eclair local|folder:fw-eclair-accent local|folder:fw-W2 local|folder:fw-w2-a local|folder:fw-w2-b local|folder:fw-w10 local|folder:fw-zebra
-cmd1-9 mounted: 1=r-eclair::/w/w10 2=r-eclair::/w/zebra 3=r-angstrom::/w/angstrom 4=r-angstrom::/w/angstrom@ssh:gpu-vm 5=r-angstrom::/w/ångström 6=r-eclair::/w/Eclair 7=r-ssh::/w/eclair@ssh:gpu-vm 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
-cmd1-9 unmounted: 1=r-eclair::/w/w10 2=r-eclair::/w/zebra 3=r-angstrom::/w/angstrom 4=r-angstrom::/w/angstrom@ssh:gpu-vm 5=r-angstrom::/w/ångström 6=r-eclair::/w/Eclair 7=r-ssh::/w/eclair@ssh:gpu-vm 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
+selectionOrder: |r-eclair::/w/w10 |r-eclair::/w/zebra ssh:gpu-vm|r-angstrom::/w/angstrom |r-angstrom::/w/angstrom |r-angstrom::/w/ångström |r-eclair::/w/Eclair ssh:gpu-vm|r-ssh::/w/eclair |r-eclair::/w/eclair |r-eclair::/w/éclair |r-eclair::/w/éclair |r-eclair::/w/W2 ssh:gpu-vm|r-ssh::/w/w2 |r-eclair::/w/w2 local|folder:fw-angstrom local|folder:fw-angstrom-accent local|folder:fw-Eclair local|folder:fw-eclair local|folder:fw-eclair-accent local|folder:fw-W2 local|folder:fw-w2-a local|folder:fw-w2-b local|folder:fw-w10 local|folder:fw-zebra
+cmd1-9 mounted: 1=r-eclair::/w/w10 2=r-eclair::/w/zebra 3=r-angstrom::/w/angstrom@ssh:gpu-vm 4=r-angstrom::/w/angstrom 5=r-angstrom::/w/ångström 6=r-eclair::/w/Eclair 7=r-ssh::/w/eclair@ssh:gpu-vm 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
+cmd1-9 unmounted: 1=r-eclair::/w/w10 2=r-eclair::/w/zebra 3=r-angstrom::/w/angstrom@ssh:gpu-vm 4=r-angstrom::/w/angstrom 5=r-angstrom::/w/ångström 6=r-eclair::/w/Eclair 7=r-ssh::/w/eclair@ssh:gpu-vm 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
cmd ids unmounted: r-eclair::/w/w10 r-eclair::/w/zebra r-angstrom::/w/angstrom r-angstrom::/w/ångström r-eclair::/w/Eclair r-ssh::/w/eclair r-eclair::/w/eclair r-eclair::/w/éclair r-eclair::/w/éclair r-eclair::/w/W2 r-ssh::/w/w2 r-eclair::/w/w2 folder:fw-angstrom folder:fw-angstrom-accent folder:fw-Eclair folder:fw-eclair folder:fw-eclair-accent folder:fw-W2 folder:fw-w2-a folder:fw-w2-b folder:fw-w10 folder:fw-zebra
=== groupBy=none sort=recent projectOrder=recent === same as groupBy=none sort=recent projectOrder=manual
=== groupBy=none sort=repo projectOrder=manual ===
visible: r-angstrom::/w/angstrom r-angstrom::/w/angstrom r-angstrom::/w/ångström r-ssh::/w/eclair r-ssh::/w/w2 r-eclair::/w/Eclair r-eclair::/w/eclair r-eclair::/w/éclair r-eclair::/w/éclair r-eclair::/w/W2 r-eclair::/w/w2 r-eclair::/w/w10 r-eclair::/w/zebra
-HEADER key=all label="All" count=23 tone="text-foreground" icon=List hostCounts={local:20 ssh:gpu-vm:3} hostIds={local:[r-angstrom::/w/angstrom,r-angstrom::/w/ångström,r-eclair::/w/Eclair,r-eclair::/w/eclair,r-eclair::/w/éclair,r-eclair::/w/éclair,r-eclair::/w/W2,r-eclair::/w/w2,r-eclair::/w/w10,r-eclair::/w/zebra] ssh:gpu-vm:[r-angstrom::/w/angstrom,r-ssh::/w/eclair,r-ssh::/w/w2]} ids=[r-angstrom::/w/angstrom,r-angstrom::/w/angstrom,r-angstrom::/w/ångström,r-ssh::/w/eclair,r-ssh::/w/w2,r-eclair::/w/Eclair,r-eclair::/w/eclair,r-eclair::/w/éclair,r-eclair::/w/éclair,r-eclair::/w/W2,r-eclair::/w/w2,r-eclair::/w/w10,r-eclair::/w/zebra]
-ITEM rowKey=all:|r-angstrom::/w/angstrom depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-angstrom
+HEADER key=all label="All" count=23 tone="text-foreground" icon=List hostCounts={ssh:gpu-vm:3 local:20} hostIds={ssh:gpu-vm:[r-angstrom::/w/angstrom,r-ssh::/w/eclair,r-ssh::/w/w2] local:[r-angstrom::/w/angstrom,r-angstrom::/w/ångström,r-eclair::/w/Eclair,r-eclair::/w/eclair,r-eclair::/w/éclair,r-eclair::/w/éclair,r-eclair::/w/W2,r-eclair::/w/w2,r-eclair::/w/w10,r-eclair::/w/zebra]} ids=[r-angstrom::/w/angstrom,r-angstrom::/w/angstrom,r-angstrom::/w/ångström,r-ssh::/w/eclair,r-ssh::/w/w2,r-eclair::/w/Eclair,r-eclair::/w/eclair,r-eclair::/w/éclair,r-eclair::/w/éclair,r-eclair::/w/W2,r-eclair::/w/w2,r-eclair::/w/w10,r-eclair::/w/zebra]
ITEM rowKey=all:ssh:gpu-vm|r-angstrom::/w/angstrom depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:r-angstrom
+ITEM rowKey=all:|r-angstrom::/w/angstrom depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-angstrom
ITEM rowKey=all:|r-angstrom::/w/ångström depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-angstrom
ITEM rowKey=all:ssh:gpu-vm|r-ssh::/w/eclair depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:r-ssh
ITEM rowKey=all:ssh:gpu-vm|r-ssh::/w/w2 depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:r-ssh
@@ -92,9 +92,9 @@ FOLDER key=folder-workspace:local|folder:fw-w10 projectGroup=pg-zebra depth=0 gr
FOLDER key=folder-workspace:local|folder:fw-zebra projectGroup=pg-zebra depth=0 groupDepth=0
renderedKeys: 34
placeholders: -
-selectionOrder: |r-angstrom::/w/angstrom ssh:gpu-vm|r-angstrom::/w/angstrom |r-angstrom::/w/ångström ssh:gpu-vm|r-ssh::/w/eclair ssh:gpu-vm|r-ssh::/w/w2 |r-eclair::/w/Eclair |r-eclair::/w/eclair |r-eclair::/w/éclair |r-eclair::/w/éclair |r-eclair::/w/W2 |r-eclair::/w/w2 |r-eclair::/w/w10 |r-eclair::/w/zebra local|folder:fw-angstrom local|folder:fw-angstrom-accent local|folder:fw-Eclair local|folder:fw-eclair local|folder:fw-eclair-accent local|folder:fw-W2 local|folder:fw-w2-a local|folder:fw-w2-b local|folder:fw-w10 local|folder:fw-zebra
-cmd1-9 mounted: 1=r-angstrom::/w/angstrom 2=r-angstrom::/w/angstrom@ssh:gpu-vm 3=r-angstrom::/w/ångström 4=r-ssh::/w/eclair@ssh:gpu-vm 5=r-ssh::/w/w2@ssh:gpu-vm 6=r-eclair::/w/Eclair 7=r-eclair::/w/eclair 8=r-eclair::/w/éclair 9=r-eclair::/w/éclair
-cmd1-9 unmounted: 1=r-angstrom::/w/angstrom 2=r-angstrom::/w/angstrom@ssh:gpu-vm 3=r-angstrom::/w/ångström 4=r-ssh::/w/eclair@ssh:gpu-vm 5=r-ssh::/w/w2@ssh:gpu-vm 6=r-eclair::/w/Eclair 7=r-eclair::/w/eclair 8=r-eclair::/w/éclair 9=r-eclair::/w/éclair
+selectionOrder: ssh:gpu-vm|r-angstrom::/w/angstrom |r-angstrom::/w/angstrom |r-angstrom::/w/ångström ssh:gpu-vm|r-ssh::/w/eclair ssh:gpu-vm|r-ssh::/w/w2 |r-eclair::/w/Eclair |r-eclair::/w/eclair |r-eclair::/w/éclair |r-eclair::/w/éclair |r-eclair::/w/W2 |r-eclair::/w/w2 |r-eclair::/w/w10 |r-eclair::/w/zebra local|folder:fw-angstrom local|folder:fw-angstrom-accent local|folder:fw-Eclair local|folder:fw-eclair local|folder:fw-eclair-accent local|folder:fw-W2 local|folder:fw-w2-a local|folder:fw-w2-b local|folder:fw-w10 local|folder:fw-zebra
+cmd1-9 mounted: 1=r-angstrom::/w/angstrom@ssh:gpu-vm 2=r-angstrom::/w/angstrom 3=r-angstrom::/w/ångström 4=r-ssh::/w/eclair@ssh:gpu-vm 5=r-ssh::/w/w2@ssh:gpu-vm 6=r-eclair::/w/Eclair 7=r-eclair::/w/eclair 8=r-eclair::/w/éclair 9=r-eclair::/w/éclair
+cmd1-9 unmounted: 1=r-angstrom::/w/angstrom@ssh:gpu-vm 2=r-angstrom::/w/angstrom 3=r-angstrom::/w/ångström 4=r-ssh::/w/eclair@ssh:gpu-vm 5=r-ssh::/w/w2@ssh:gpu-vm 6=r-eclair::/w/Eclair 7=r-eclair::/w/eclair 8=r-eclair::/w/éclair 9=r-eclair::/w/éclair
cmd ids unmounted: r-angstrom::/w/angstrom r-angstrom::/w/ångström r-ssh::/w/eclair r-ssh::/w/w2 r-eclair::/w/Eclair r-eclair::/w/eclair r-eclair::/w/éclair r-eclair::/w/éclair r-eclair::/w/W2 r-eclair::/w/w2 r-eclair::/w/w10 r-eclair::/w/zebra folder:fw-angstrom folder:fw-angstrom-accent folder:fw-Eclair folder:fw-eclair folder:fw-eclair-accent folder:fw-W2 folder:fw-w2-a folder:fw-w2-b folder:fw-w10 folder:fw-zebra
=== groupBy=none sort=repo projectOrder=recent === same as groupBy=none sort=repo projectOrder=manual
=== groupBy=repo sort=name projectOrder=manual ===
@@ -102,9 +102,9 @@ visible: r-angstrom::/w/angstrom r-angstrom::/w/angstrom r-angstrom::/w/ångstr
HEADER key=project-group:pg-angstrom label="angstrom" count=1 tone="text-foreground" icon=FolderTree projectGroup=pg-angstrom projectGroupDepth=0
FOLDER key=folder-workspace:local|folder:fw-eclair projectGroup=pg-angstrom depth=0 groupDepth=1
HEADER key=project-group:pg-angstrom-accent label="ångström" count=1 tone="text-foreground" icon=FolderTree projectGroup=pg-angstrom-accent projectGroupDepth=0
-HEADER key=project:repo:r-angstrom label="ångström" count=3 tone="text-foreground" icon=FolderTree repo=r-angstrom projectGroupDepth=1 hostCounts={local:2 ssh:gpu-vm:1} hostIds={local:[r-angstrom::/w/angstrom,r-angstrom::/w/ångström] ssh:gpu-vm:[r-angstrom::/w/angstrom]}
-ITEM rowKey=project:repo:r-angstrom:|r-angstrom::/w/angstrom depth=0 groupDepth=1 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-angstrom path=project-group:pg-angstrom-accent>project:repo:r-angstrom
+HEADER key=project:repo:r-angstrom label="ångström" count=3 tone="text-foreground" icon=FolderTree repo=r-angstrom projectGroupDepth=1 hostCounts={ssh:gpu-vm:1 local:2} hostIds={ssh:gpu-vm:[r-angstrom::/w/angstrom] local:[r-angstrom::/w/angstrom,r-angstrom::/w/ångström]}
ITEM rowKey=project:repo:r-angstrom:ssh:gpu-vm|r-angstrom::/w/angstrom depth=0 groupDepth=1 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:r-angstrom path=project-group:pg-angstrom-accent>project:repo:r-angstrom
+ITEM rowKey=project:repo:r-angstrom:|r-angstrom::/w/angstrom depth=0 groupDepth=1 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-angstrom path=project-group:pg-angstrom-accent>project:repo:r-angstrom
ITEM rowKey=project:repo:r-angstrom:|r-angstrom::/w/ångström depth=0 groupDepth=1 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-angstrom path=project-group:pg-angstrom-accent>project:repo:r-angstrom
HEADER key=project-group:pg-eclair label="eclair" count=2 tone="text-foreground" icon=FolderTree projectGroup=pg-eclair projectGroupDepth=0
FOLDER key=folder-workspace:local|folder:fw-angstrom projectGroup=pg-eclair depth=0 groupDepth=1
@@ -132,9 +132,9 @@ ITEM rowKey=project:repo:r-ssh:ssh:gpu-vm|r-ssh::/w/eclair depth=0 groupDepth=0
ITEM rowKey=project:repo:r-ssh:ssh:gpu-vm|r-ssh::/w/w2 depth=0 groupDepth=0 lastChild=true children=0 hostLabel="GPU VM" placement=natural owning=project:repo:r-ssh
renderedKeys: 41
placeholders: -
-selectionOrder: local|folder:fw-eclair |r-angstrom::/w/angstrom ssh:gpu-vm|r-angstrom::/w/angstrom |r-angstrom::/w/ångström local|folder:fw-angstrom local|folder:fw-angstrom-accent |r-eclair::/w/Eclair |r-eclair::/w/eclair |r-eclair::/w/éclair |r-eclair::/w/éclair |r-eclair::/w/W2 |r-eclair::/w/w2 |r-eclair::/w/w10 |r-eclair::/w/zebra local|folder:fw-Eclair local|folder:fw-eclair-accent local|folder:fw-W2 local|folder:fw-w2-a local|folder:fw-w2-b local|folder:fw-w10 local|folder:fw-zebra ssh:gpu-vm|r-ssh::/w/eclair ssh:gpu-vm|r-ssh::/w/w2
-cmd1-9 mounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom 3=r-angstrom::/w/angstrom@ssh:gpu-vm 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/Eclair 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
-cmd1-9 unmounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom 3=r-angstrom::/w/angstrom@ssh:gpu-vm 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/Eclair 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
+selectionOrder: local|folder:fw-eclair ssh:gpu-vm|r-angstrom::/w/angstrom |r-angstrom::/w/angstrom |r-angstrom::/w/ångström local|folder:fw-angstrom local|folder:fw-angstrom-accent |r-eclair::/w/Eclair |r-eclair::/w/eclair |r-eclair::/w/éclair |r-eclair::/w/éclair |r-eclair::/w/W2 |r-eclair::/w/w2 |r-eclair::/w/w10 |r-eclair::/w/zebra local|folder:fw-Eclair local|folder:fw-eclair-accent local|folder:fw-W2 local|folder:fw-w2-a local|folder:fw-w2-b local|folder:fw-w10 local|folder:fw-zebra ssh:gpu-vm|r-ssh::/w/eclair ssh:gpu-vm|r-ssh::/w/w2
+cmd1-9 mounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom@ssh:gpu-vm 3=r-angstrom::/w/angstrom 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/Eclair 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
+cmd1-9 unmounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom@ssh:gpu-vm 3=r-angstrom::/w/angstrom 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/Eclair 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
cmd ids unmounted: folder:fw-eclair r-angstrom::/w/angstrom r-angstrom::/w/ångström folder:fw-angstrom folder:fw-angstrom-accent r-eclair::/w/Eclair r-eclair::/w/eclair r-eclair::/w/éclair r-eclair::/w/éclair r-eclair::/w/W2 r-eclair::/w/w2 r-eclair::/w/w10 r-eclair::/w/zebra folder:fw-Eclair folder:fw-eclair-accent folder:fw-W2 folder:fw-w2-a folder:fw-w2-b folder:fw-w10 folder:fw-zebra r-ssh::/w/eclair r-ssh::/w/w2
=== groupBy=repo sort=name projectOrder=recent === same as groupBy=repo sort=name projectOrder=manual
=== groupBy=repo sort=recent projectOrder=manual ===
@@ -142,9 +142,9 @@ visible: r-eclair::/w/w10 r-eclair::/w/zebra r-angstrom::/w/angstrom r-angstrom:
HEADER key=project-group:pg-angstrom label="angstrom" count=1 tone="text-foreground" icon=FolderTree projectGroup=pg-angstrom projectGroupDepth=0
FOLDER key=folder-workspace:local|folder:fw-eclair projectGroup=pg-angstrom depth=0 groupDepth=1
HEADER key=project-group:pg-angstrom-accent label="ångström" count=1 tone="text-foreground" icon=FolderTree projectGroup=pg-angstrom-accent projectGroupDepth=0
-HEADER key=project:repo:r-angstrom label="ångström" count=3 tone="text-foreground" icon=FolderTree repo=r-angstrom projectGroupDepth=1 hostCounts={local:2 ssh:gpu-vm:1} hostIds={local:[r-angstrom::/w/angstrom,r-angstrom::/w/ångström] ssh:gpu-vm:[r-angstrom::/w/angstrom]}
-ITEM rowKey=project:repo:r-angstrom:|r-angstrom::/w/angstrom depth=0 groupDepth=1 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-angstrom path=project-group:pg-angstrom-accent>project:repo:r-angstrom
+HEADER key=project:repo:r-angstrom label="ångström" count=3 tone="text-foreground" icon=FolderTree repo=r-angstrom projectGroupDepth=1 hostCounts={ssh:gpu-vm:1 local:2} hostIds={ssh:gpu-vm:[r-angstrom::/w/angstrom] local:[r-angstrom::/w/angstrom,r-angstrom::/w/ångström]}
ITEM rowKey=project:repo:r-angstrom:ssh:gpu-vm|r-angstrom::/w/angstrom depth=0 groupDepth=1 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:r-angstrom path=project-group:pg-angstrom-accent>project:repo:r-angstrom
+ITEM rowKey=project:repo:r-angstrom:|r-angstrom::/w/angstrom depth=0 groupDepth=1 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-angstrom path=project-group:pg-angstrom-accent>project:repo:r-angstrom
ITEM rowKey=project:repo:r-angstrom:|r-angstrom::/w/ångström depth=0 groupDepth=1 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-angstrom path=project-group:pg-angstrom-accent>project:repo:r-angstrom
HEADER key=project-group:pg-eclair label="eclair" count=2 tone="text-foreground" icon=FolderTree projectGroup=pg-eclair projectGroupDepth=0
FOLDER key=folder-workspace:local|folder:fw-angstrom projectGroup=pg-eclair depth=0 groupDepth=1
@@ -172,9 +172,9 @@ ITEM rowKey=project:repo:r-ssh:ssh:gpu-vm|r-ssh::/w/eclair depth=0 groupDepth=0
ITEM rowKey=project:repo:r-ssh:ssh:gpu-vm|r-ssh::/w/w2 depth=0 groupDepth=0 lastChild=true children=0 hostLabel="GPU VM" placement=natural owning=project:repo:r-ssh
renderedKeys: 41
placeholders: -
-selectionOrder: local|folder:fw-eclair |r-angstrom::/w/angstrom ssh:gpu-vm|r-angstrom::/w/angstrom |r-angstrom::/w/ångström local|folder:fw-angstrom local|folder:fw-angstrom-accent |r-eclair::/w/w10 |r-eclair::/w/zebra |r-eclair::/w/Eclair |r-eclair::/w/eclair |r-eclair::/w/éclair |r-eclair::/w/éclair |r-eclair::/w/W2 |r-eclair::/w/w2 local|folder:fw-Eclair local|folder:fw-eclair-accent local|folder:fw-W2 local|folder:fw-w2-a local|folder:fw-w2-b local|folder:fw-w10 local|folder:fw-zebra ssh:gpu-vm|r-ssh::/w/eclair ssh:gpu-vm|r-ssh::/w/w2
-cmd1-9 mounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom 3=r-angstrom::/w/angstrom@ssh:gpu-vm 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/w10 8=r-eclair::/w/zebra 9=r-eclair::/w/Eclair
-cmd1-9 unmounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom 3=r-angstrom::/w/angstrom@ssh:gpu-vm 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/w10 8=r-eclair::/w/zebra 9=r-eclair::/w/Eclair
+selectionOrder: local|folder:fw-eclair ssh:gpu-vm|r-angstrom::/w/angstrom |r-angstrom::/w/angstrom |r-angstrom::/w/ångström local|folder:fw-angstrom local|folder:fw-angstrom-accent |r-eclair::/w/w10 |r-eclair::/w/zebra |r-eclair::/w/Eclair |r-eclair::/w/eclair |r-eclair::/w/éclair |r-eclair::/w/éclair |r-eclair::/w/W2 |r-eclair::/w/w2 local|folder:fw-Eclair local|folder:fw-eclair-accent local|folder:fw-W2 local|folder:fw-w2-a local|folder:fw-w2-b local|folder:fw-w10 local|folder:fw-zebra ssh:gpu-vm|r-ssh::/w/eclair ssh:gpu-vm|r-ssh::/w/w2
+cmd1-9 mounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom@ssh:gpu-vm 3=r-angstrom::/w/angstrom 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/w10 8=r-eclair::/w/zebra 9=r-eclair::/w/Eclair
+cmd1-9 unmounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom@ssh:gpu-vm 3=r-angstrom::/w/angstrom 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/w10 8=r-eclair::/w/zebra 9=r-eclair::/w/Eclair
cmd ids unmounted: folder:fw-eclair r-angstrom::/w/angstrom r-angstrom::/w/ångström folder:fw-angstrom folder:fw-angstrom-accent r-eclair::/w/w10 r-eclair::/w/zebra r-eclair::/w/Eclair r-eclair::/w/eclair r-eclair::/w/éclair r-eclair::/w/éclair r-eclair::/w/W2 r-eclair::/w/w2 folder:fw-Eclair folder:fw-eclair-accent folder:fw-W2 folder:fw-w2-a folder:fw-w2-b folder:fw-w10 folder:fw-zebra r-ssh::/w/eclair r-ssh::/w/w2
=== groupBy=repo sort=recent projectOrder=recent === same as groupBy=repo sort=recent projectOrder=manual
=== groupBy=repo sort=repo projectOrder=manual ===
@@ -182,9 +182,9 @@ visible: r-angstrom::/w/angstrom r-angstrom::/w/angstrom r-angstrom::/w/ångstr
HEADER key=project-group:pg-angstrom label="angstrom" count=1 tone="text-foreground" icon=FolderTree projectGroup=pg-angstrom projectGroupDepth=0
FOLDER key=folder-workspace:local|folder:fw-eclair projectGroup=pg-angstrom depth=0 groupDepth=1
HEADER key=project-group:pg-angstrom-accent label="ångström" count=1 tone="text-foreground" icon=FolderTree projectGroup=pg-angstrom-accent projectGroupDepth=0
-HEADER key=project:repo:r-angstrom label="ångström" count=3 tone="text-foreground" icon=FolderTree repo=r-angstrom projectGroupDepth=1 hostCounts={local:2 ssh:gpu-vm:1} hostIds={local:[r-angstrom::/w/angstrom,r-angstrom::/w/ångström] ssh:gpu-vm:[r-angstrom::/w/angstrom]}
-ITEM rowKey=project:repo:r-angstrom:|r-angstrom::/w/angstrom depth=0 groupDepth=1 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-angstrom path=project-group:pg-angstrom-accent>project:repo:r-angstrom
+HEADER key=project:repo:r-angstrom label="ångström" count=3 tone="text-foreground" icon=FolderTree repo=r-angstrom projectGroupDepth=1 hostCounts={ssh:gpu-vm:1 local:2} hostIds={ssh:gpu-vm:[r-angstrom::/w/angstrom] local:[r-angstrom::/w/angstrom,r-angstrom::/w/ångström]}
ITEM rowKey=project:repo:r-angstrom:ssh:gpu-vm|r-angstrom::/w/angstrom depth=0 groupDepth=1 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:r-angstrom path=project-group:pg-angstrom-accent>project:repo:r-angstrom
+ITEM rowKey=project:repo:r-angstrom:|r-angstrom::/w/angstrom depth=0 groupDepth=1 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-angstrom path=project-group:pg-angstrom-accent>project:repo:r-angstrom
ITEM rowKey=project:repo:r-angstrom:|r-angstrom::/w/ångström depth=0 groupDepth=1 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:repo:r-angstrom path=project-group:pg-angstrom-accent>project:repo:r-angstrom
HEADER key=project-group:pg-eclair label="eclair" count=2 tone="text-foreground" icon=FolderTree projectGroup=pg-eclair projectGroupDepth=0
FOLDER key=folder-workspace:local|folder:fw-angstrom projectGroup=pg-eclair depth=0 groupDepth=1
@@ -212,8 +212,8 @@ ITEM rowKey=project:repo:r-ssh:ssh:gpu-vm|r-ssh::/w/eclair depth=0 groupDepth=0
ITEM rowKey=project:repo:r-ssh:ssh:gpu-vm|r-ssh::/w/w2 depth=0 groupDepth=0 lastChild=true children=0 hostLabel="GPU VM" placement=natural owning=project:repo:r-ssh
renderedKeys: 41
placeholders: -
-selectionOrder: local|folder:fw-eclair |r-angstrom::/w/angstrom ssh:gpu-vm|r-angstrom::/w/angstrom |r-angstrom::/w/ångström local|folder:fw-angstrom local|folder:fw-angstrom-accent |r-eclair::/w/Eclair |r-eclair::/w/eclair |r-eclair::/w/éclair |r-eclair::/w/éclair |r-eclair::/w/W2 |r-eclair::/w/w2 |r-eclair::/w/w10 |r-eclair::/w/zebra local|folder:fw-Eclair local|folder:fw-eclair-accent local|folder:fw-W2 local|folder:fw-w2-a local|folder:fw-w2-b local|folder:fw-w10 local|folder:fw-zebra ssh:gpu-vm|r-ssh::/w/eclair ssh:gpu-vm|r-ssh::/w/w2
-cmd1-9 mounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom 3=r-angstrom::/w/angstrom@ssh:gpu-vm 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/Eclair 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
-cmd1-9 unmounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom 3=r-angstrom::/w/angstrom@ssh:gpu-vm 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/Eclair 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
+selectionOrder: local|folder:fw-eclair ssh:gpu-vm|r-angstrom::/w/angstrom |r-angstrom::/w/angstrom |r-angstrom::/w/ångström local|folder:fw-angstrom local|folder:fw-angstrom-accent |r-eclair::/w/Eclair |r-eclair::/w/eclair |r-eclair::/w/éclair |r-eclair::/w/éclair |r-eclair::/w/W2 |r-eclair::/w/w2 |r-eclair::/w/w10 |r-eclair::/w/zebra local|folder:fw-Eclair local|folder:fw-eclair-accent local|folder:fw-W2 local|folder:fw-w2-a local|folder:fw-w2-b local|folder:fw-w10 local|folder:fw-zebra ssh:gpu-vm|r-ssh::/w/eclair ssh:gpu-vm|r-ssh::/w/w2
+cmd1-9 mounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom@ssh:gpu-vm 3=r-angstrom::/w/angstrom 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/Eclair 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
+cmd1-9 unmounted: 1=folder:fw-eclair@local 2=r-angstrom::/w/angstrom@ssh:gpu-vm 3=r-angstrom::/w/angstrom 4=r-angstrom::/w/ångström 5=folder:fw-angstrom@local 6=folder:fw-angstrom-accent@local 7=r-eclair::/w/Eclair 8=r-eclair::/w/eclair 9=r-eclair::/w/éclair
cmd ids unmounted: folder:fw-eclair r-angstrom::/w/angstrom r-angstrom::/w/ångström folder:fw-angstrom folder:fw-angstrom-accent r-eclair::/w/Eclair r-eclair::/w/eclair r-eclair::/w/éclair r-eclair::/w/éclair r-eclair::/w/W2 r-eclair::/w/w2 r-eclair::/w/w10 r-eclair::/w/zebra folder:fw-Eclair folder:fw-eclair-accent folder:fw-W2 folder:fw-w2-a folder:fw-w2-b folder:fw-w10 folder:fw-zebra r-ssh::/w/eclair r-ssh::/w/w2
=== groupBy=repo sort=repo projectOrder=recent === same as groupBy=repo sort=repo projectOrder=manual
diff --git a/src/renderer/src/components/sidebar/__goldens__/sidebar-list/scenario-new-external-inbox.txt b/src/renderer/src/components/sidebar/__goldens__/sidebar-list/scenario-new-external-inbox.txt
index d639f03b517..a2b6aff1e67 100644
--- a/src/renderer/src/components/sidebar/__goldens__/sidebar-list/scenario-new-external-inbox.txt
+++ b/src/renderer/src/components/sidebar/__goldens__/sidebar-list/scenario-new-external-inbox.txt
@@ -24,7 +24,7 @@ renderedKeys: 23
placeholders: -
selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same runtime:env-1|api::/w/api-y local|shared::/w/same |orca::/orca |orca::/w/Zeta |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=orca::/orca
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=api::/w/api-y@runtime:env-1 9=orca::/orca
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=shared::/w/same@ssh:gpu-vm 7=api::/w/api-y@runtime:env-1 8=shared::/w/same@local 9=orca::/orca
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same api::/w/api-y orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -66,8 +66,8 @@ ITEM rowKey=all:|orca::/w/feat-c depth=2 groupDepth=0 lastChild=true children=0
ITEM rowKey=all:|lab::/w/gitlab-mr depth=1 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" showProject=true placement=natural owning=project:repo:lab parent=all:|orca::/w/feat-a
ITEM rowKey=all:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=all:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=all:|orca::/w/Zeta depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=all:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
@@ -85,9 +85,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> all:ssh:gpu-vm|orca-ssh::/w/remote
PREFERRED ssh:gpu-vm|shared::/w/same -> all:ssh:gpu-vm|shared::/w/same
renderedKeys: 29
placeholders: -
-selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/orca |orca::/w/Zeta |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
-cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@local 8=shared::/w/same@ssh:gpu-vm 9=orca::/orca
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@local 8=shared::/w/same@ssh:gpu-vm 9=orca::/orca
+selectionOrder: |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca::/w/Zeta |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
+cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca::/w/feat-b#lineage:orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@ssh:gpu-vm 8=shared::/w/same@local 9=orca::/orca
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca::/w/feat-b 3=orca::/w/feat-c 4=lab::/w/gitlab-mr 5=orca-ssh::/w/remote-x@ssh:gpu-vm 6=api::/w/api-y@runtime:env-1 7=shared::/w/same@ssh:gpu-vm 8=shared::/w/same@local 9=orca::/orca
cmd ids unmounted: orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x api::/w/api-y shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
-- collapsed: pinned lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -97,8 +97,8 @@ HEADER key=all label="All" count=17 tone="text-foreground" icon=List hostCounts=
ITEM rowKey=all:|orca::/w/feat-a depth=0 groupDepth=0 children=2 lineageKey=lineage:orca::/w/feat-a lineageCollapsed=true hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=all:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=all:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=all:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=all:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=all:|orca::/w/Zeta depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=all:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
@@ -109,7 +109,7 @@ FOLDER key=folder-workspace:local|folder:fw-review projectGroup=pg-folders depth
FOLDER key=folder-workspace:local|folder:fw-notes projectGroup=pg-folders depth=0 groupDepth=0
FOLDER key=folder-workspace:ssh:gpu-vm|folder:fw-remote projectGroup=pg-remote-folders depth=0 groupDepth=0
SECTION pinned: pinned:|orca::/w/feat-a pinned:|orca::/w/feat-b pinned:|orca::/w/feat-c pinned:|lab::/w/gitlab-mr pinned:ssh:gpu-vm|orca-ssh::/w/remote-x pinned:ssh:gpu-vm|shared::/w/same
-SECTION all: all:|orca::/w/feat-a all:|orca::/w/feat-b all:|orca::/w/feat-c all:|lab::/w/gitlab-mr all:ssh:gpu-vm|orca-ssh::/w/remote-x all:runtime:env-1|api::/w/api-y all:local|shared::/w/same all:ssh:gpu-vm|shared::/w/same all:|orca::/orca all:|orca::/w/Zeta all:|orca-ssh::/orca-ssh all:runtime:env-1|api::/api all:|lab::/lab all:|ext::/ext
+SECTION all: all:|orca::/w/feat-a all:|orca::/w/feat-b all:|orca::/w/feat-c all:|lab::/w/gitlab-mr all:ssh:gpu-vm|orca-ssh::/w/remote-x all:runtime:env-1|api::/w/api-y all:ssh:gpu-vm|shared::/w/same all:local|shared::/w/same all:|orca::/orca all:|orca::/w/Zeta all:|orca-ssh::/orca-ssh all:runtime:env-1|api::/api all:|lab::/lab all:|ext::/ext
PREFERRED |orca::/w/feat-a -> all:|orca::/w/feat-a
PREFERRED |orca::/w/feat-b -> all:|orca::/w/feat-b
PREFERRED |orca::/w/feat-c -> all:|orca::/w/feat-c
@@ -118,9 +118,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> all:ssh:gpu-vm|orca-ssh::/w/remote
PREFERRED ssh:gpu-vm|shared::/w/same -> all:ssh:gpu-vm|shared::/w/same
renderedKeys: 20
placeholders: -
-selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/orca |orca::/w/Zeta |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
-cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca::/w/Zeta 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca::/w/Zeta 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
+selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x runtime:env-1|api::/w/api-y ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca::/w/Zeta |orca-ssh::/orca-ssh runtime:env-1|api::/api |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
+cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca::/w/Zeta 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=api::/w/api-y@runtime:env-1 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca::/w/Zeta 8=orca-ssh::/orca-ssh 9=api::/api@runtime:env-1
cmd ids unmounted: orca::/w/feat-a orca-ssh::/w/remote-x api::/w/api-y shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
=== groupBy=repo pinnedInGroups=false ===
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -222,9 +222,9 @@ HEADER key=project:repo:api label="api" count=2 tone="text-foreground" icon=Fold
PENDING key=pending:creation-1 creation=creation-1 repo=api
ITEM rowKey=project:repo:api:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
ITEM rowKey=project:repo:api:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 lastChild=true children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={local:1 ssh:gpu-vm:1} hostIds={local:[shared::/w/same] ssh:gpu-vm:[shared::/w/same]}
-ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
-ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={ssh:gpu-vm:1 local:1} hostIds={ssh:gpu-vm:[shared::/w/same] local:[shared::/w/same]}
+ITEM rowKey=project:repo:shared:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=project:repo:shared:local|shared::/w/same depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
HEADER key=project:repo:empty label="empty" count=0 tone="text-foreground" icon=FolderTree repo=empty projectGroupDepth=0
HEADER key=project:repo:ext label="ext" count=1 tone="text-foreground" icon=FolderTree repo=ext projectGroupDepth=0
INBOX key=new-external-worktrees-inbox:ext repo=ext inbox=ext::/w/detected-hidden
@@ -238,7 +238,7 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> project:p-orca:ssh:gpu-vm|orca-ssh
PREFERRED ssh:gpu-vm|shared::/w/same -> project:repo:shared:ssh:gpu-vm|shared::/w/same
renderedKeys: 39
placeholders: empty
-selectionOrder: |orca::/orca |orca-ssh::/orca-ssh |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/Zeta |lab::/lab local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/api runtime:env-1|api::/w/api-y local|shared::/w/same ssh:gpu-vm|shared::/w/same |ext::/ext
+selectionOrder: |orca::/orca |orca-ssh::/orca-ssh |orca::/w/feat-a |orca::/w/feat-b |orca::/w/feat-c |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x |orca::/w/Zeta |lab::/lab local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/api runtime:env-1|api::/w/api-y ssh:gpu-vm|shared::/w/same local|shared::/w/same |ext::/ext
cmd1-9 mounted: 1=orca::/orca 2=orca-ssh::/orca-ssh 3=orca::/w/feat-a#lineage:orca::/w/feat-a 4=orca::/w/feat-b#lineage:orca::/w/feat-b 5=orca::/w/feat-c 6=lab::/w/gitlab-mr 7=orca-ssh::/w/remote-x@ssh:gpu-vm 8=orca::/w/Zeta 9=lab::/lab
cmd1-9 unmounted: 1=orca::/orca 2=orca-ssh::/orca-ssh 3=orca::/w/feat-a 4=orca::/w/feat-b 5=orca::/w/feat-c 6=lab::/w/gitlab-mr 7=orca-ssh::/w/remote-x@ssh:gpu-vm 8=orca::/w/Zeta 9=lab::/lab
cmd ids unmounted: orca::/orca orca-ssh::/orca-ssh orca::/w/feat-a orca::/w/feat-b orca::/w/feat-c lab::/w/gitlab-mr orca-ssh::/w/remote-x orca::/w/Zeta lab::/lab folder:fw-review folder:fw-notes folder:fw-remote api::/api api::/w/api-y shared::/w/same ext::/ext
@@ -257,13 +257,13 @@ HEADER key=project:repo:api label="api" count=2 tone="text-foreground" icon=Fold
PENDING key=pending:creation-1 creation=creation-1 repo=api
ITEM rowKey=project:repo:api:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
ITEM rowKey=project:repo:api:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 lastChild=true children=0 hostLabel="env-1" placement=natural owning=project:repo:api
-HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={local:1 ssh:gpu-vm:1} hostIds={local:[shared::/w/same] ssh:gpu-vm:[shared::/w/same]}
+HEADER key=project:repo:shared label="shared" count=2 tone="text-foreground" icon=FolderTree repo=shared projectGroupDepth=0 hostCounts={ssh:gpu-vm:1 local:1} hostIds={ssh:gpu-vm:[shared::/w/same] local:[shared::/w/same]}
HEADER key=project:repo:empty label="empty" count=0 tone="text-foreground" icon=FolderTree repo=empty projectGroupDepth=0
HEADER key=project:repo:ext label="ext" count=1 tone="text-foreground" icon=FolderTree repo=ext projectGroupDepth=0
SECTION pinned: pinned:|orca::/w/feat-a pinned:|orca::/w/feat-b pinned:|orca::/w/feat-c pinned:|lab::/w/gitlab-mr pinned:ssh:gpu-vm|orca-ssh::/w/remote-x pinned:ssh:gpu-vm|shared::/w/same
SECTION project:p-orca: project:p-orca:|orca::/orca project:p-orca:|orca-ssh::/orca-ssh project:p-orca:|orca::/w/feat-a project:p-orca:|orca::/w/feat-b project:p-orca:|orca::/w/feat-c project:p-orca:|lab::/w/gitlab-mr project:p-orca:ssh:gpu-vm|orca-ssh::/w/remote-x project:p-orca:|orca::/w/Zeta
SECTION project:repo:lab: project:repo:lab:|lab::/lab
-SECTION project:repo:shared: project:repo:shared:local|shared::/w/same project:repo:shared:ssh:gpu-vm|shared::/w/same
+SECTION project:repo:shared: project:repo:shared:ssh:gpu-vm|shared::/w/same project:repo:shared:local|shared::/w/same
SECTION project:repo:empty: -
SECTION project:repo:ext: project:repo:ext:|ext::/ext
PREFERRED |orca::/w/feat-a -> project:p-orca:|orca::/w/feat-a
@@ -348,8 +348,8 @@ HEADER key=workspace-status:in-progress label="In progress" count=13 tone="text-
ITEM rowKey=workspace-status:in-progress:|orca::/w/feat-a depth=0 groupDepth=0 children=1 lineageKey=lineage:orca::/w/feat-a hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:|lab::/w/gitlab-mr depth=1 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" showProject=true placement=natural owning=project:repo:lab parent=workspace-status:in-progress:|orca::/w/feat-a
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
-ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
@@ -372,9 +372,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> workspace-status:in-progress:ssh:g
PREFERRED ssh:gpu-vm|shared::/w/same -> workspace-status:in-progress:ssh:gpu-vm|shared::/w/same
renderedKeys: 31
placeholders: -
-selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/feat-b local|folder:fw-review runtime:env-1|api::/w/api-y |orca::/w/Zeta
-cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
+selectionOrder: |orca::/w/feat-a |lab::/w/gitlab-mr ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/feat-b local|folder:fw-review runtime:env-1|api::/w/api-y |orca::/w/Zeta
+cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=lab::/w/gitlab-mr 3=orca-ssh::/w/remote-x@ssh:gpu-vm 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
cmd ids unmounted: orca::/w/feat-a lab::/w/gitlab-mr orca-ssh::/w/remote-x shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext folder:fw-notes folder:fw-remote orca::/w/feat-b folder:fw-review api::/w/api-y orca::/w/Zeta
-- collapsed: pinned workspace-status:in-review lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -383,8 +383,8 @@ HEADER key=pinned label="Pinned" count=6 tone="text-foreground" icon=Pin hostCou
HEADER key=workspace-status:in-progress label="In progress" count=13 tone="text-[#d4a300]" icon=ConductorProgressIcon hostCounts={local:8 ssh:gpu-vm:4 runtime:env-1:1} hostIds={local:[orca::/w/feat-a,lab::/w/gitlab-mr,shared::/w/same,orca::/orca,orca::/w/feat-c,lab::/lab,ext::/ext] ssh:gpu-vm:[orca-ssh::/w/remote-x,shared::/w/same,orca-ssh::/orca-ssh] runtime:env-1:[api::/api]} ids=[orca::/w/feat-a,orca-ssh::/w/remote-x,lab::/w/gitlab-mr,shared::/w/same,shared::/w/same,orca::/orca,orca-ssh::/orca-ssh,api::/api,orca::/w/feat-c,lab::/lab,ext::/ext]
ITEM rowKey=workspace-status:in-progress:|orca::/w/feat-a depth=0 groupDepth=0 children=1 lineageKey=lineage:orca::/w/feat-a lineageCollapsed=true hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
-ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=workspace-status:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=workspace-status:in-progress:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=workspace-status:in-progress:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
@@ -398,7 +398,7 @@ HEADER key=workspace-status:completed label="Done" count=2 tone="text-[#c7a594]"
ITEM rowKey=workspace-status:completed:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
ITEM rowKey=workspace-status:completed:|orca::/w/Zeta depth=0 groupDepth=0 lastChild=true children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
SECTION pinned: pinned:|orca::/w/feat-a pinned:|orca::/w/feat-b pinned:|orca::/w/feat-c pinned:|lab::/w/gitlab-mr pinned:ssh:gpu-vm|orca-ssh::/w/remote-x pinned:ssh:gpu-vm|shared::/w/same
-SECTION workspace-status:in-progress: workspace-status:in-progress:|orca::/w/feat-a workspace-status:in-progress:|lab::/w/gitlab-mr workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x workspace-status:in-progress:local|shared::/w/same workspace-status:in-progress:ssh:gpu-vm|shared::/w/same workspace-status:in-progress:|orca::/orca workspace-status:in-progress:|orca-ssh::/orca-ssh workspace-status:in-progress:runtime:env-1|api::/api workspace-status:in-progress:|orca::/w/feat-c workspace-status:in-progress:|lab::/lab workspace-status:in-progress:|ext::/ext
+SECTION workspace-status:in-progress: workspace-status:in-progress:|orca::/w/feat-a workspace-status:in-progress:|lab::/w/gitlab-mr workspace-status:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x workspace-status:in-progress:ssh:gpu-vm|shared::/w/same workspace-status:in-progress:local|shared::/w/same workspace-status:in-progress:|orca::/orca workspace-status:in-progress:|orca-ssh::/orca-ssh workspace-status:in-progress:runtime:env-1|api::/api workspace-status:in-progress:|orca::/w/feat-c workspace-status:in-progress:|lab::/lab workspace-status:in-progress:|ext::/ext
SECTION workspace-status:in-review: workspace-status:in-review:|orca::/w/feat-b
PREFERRED |orca::/w/feat-a -> workspace-status:in-progress:|orca::/w/feat-a
PREFERRED |orca::/w/feat-b -> workspace-status:in-review:|orca::/w/feat-b
@@ -408,9 +408,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> workspace-status:in-progress:ssh:g
PREFERRED ssh:gpu-vm|shared::/w/same -> workspace-status:in-progress:ssh:gpu-vm|shared::/w/same
renderedKeys: 21
placeholders: -
-selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/w/api-y |orca::/w/Zeta
-cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@local 4=shared::/w/same@ssh:gpu-vm 5=orca::/orca 6=orca-ssh::/orca-ssh 7=api::/api@runtime:env-1 8=orca::/w/feat-c 9=lab::/lab
-cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@local 4=shared::/w/same@ssh:gpu-vm 5=orca::/orca 6=orca-ssh::/orca-ssh 7=api::/api@runtime:env-1 8=orca::/w/feat-c 9=lab::/lab
+selectionOrder: |orca::/w/feat-a ssh:gpu-vm|orca-ssh::/w/remote-x ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-notes ssh:gpu-vm|folder:fw-remote runtime:env-1|api::/w/api-y |orca::/w/Zeta
+cmd1-9 mounted: 1=orca::/w/feat-a#lineage:orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@ssh:gpu-vm 4=shared::/w/same@local 5=orca::/orca 6=orca-ssh::/orca-ssh 7=api::/api@runtime:env-1 8=orca::/w/feat-c 9=lab::/lab
+cmd1-9 unmounted: 1=orca::/w/feat-a 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=shared::/w/same@ssh:gpu-vm 4=shared::/w/same@local 5=orca::/orca 6=orca-ssh::/orca-ssh 7=api::/api@runtime:env-1 8=orca::/w/feat-c 9=lab::/lab
cmd ids unmounted: orca::/w/feat-a orca-ssh::/w/remote-x shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext folder:fw-notes folder:fw-remote api::/w/api-y orca::/w/Zeta
=== groupBy=pr-status pinnedInGroups=false ===
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -477,8 +477,8 @@ ITEM rowKey=pr:in-review:runtime:env-1|api::/w/api-y depth=0 groupDepth=0 lastCh
HEADER key=pr:in-progress label="In progress" count=13 tone="text-workspace-status-progress" icon=ConductorProgressIcon hostCounts={ssh:gpu-vm:4 local:8 runtime:env-1:1} hostIds={ssh:gpu-vm:[orca-ssh::/w/remote-x,shared::/w/same,orca-ssh::/orca-ssh] local:[lab::/w/gitlab-mr,shared::/w/same,orca::/orca,orca::/w/feat-c,lab::/lab,ext::/ext] runtime:env-1:[api::/api]} ids=[orca-ssh::/w/remote-x,lab::/w/gitlab-mr,shared::/w/same,shared::/w/same,orca::/orca,orca-ssh::/orca-ssh,api::/api,orca::/w/feat-c,lab::/lab,ext::/ext]
ITEM rowKey=pr:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|lab::/w/gitlab-mr depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:lab
-ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
@@ -498,9 +498,9 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> pr:in-progress:ssh:gpu-vm|orca-ssh
PREFERRED ssh:gpu-vm|shared::/w/same -> pr:in-progress:ssh:gpu-vm|shared::/w/same
renderedKeys: 32
placeholders: -
-selectionOrder: |orca::/w/feat-b |orca::/w/feat-a runtime:env-1|api::/w/api-y ssh:gpu-vm|orca-ssh::/w/remote-x |lab::/w/gitlab-mr local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/Zeta
-cmd1-9 mounted: 1=orca::/w/feat-b#lineage:orca::/w/feat-b 2=orca::/w/feat-a#lineage:orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@local 7=shared::/w/same@ssh:gpu-vm 8=orca::/orca 9=orca-ssh::/orca-ssh
-cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@local 7=shared::/w/same@ssh:gpu-vm 8=orca::/orca 9=orca-ssh::/orca-ssh
+selectionOrder: |orca::/w/feat-b |orca::/w/feat-a runtime:env-1|api::/w/api-y ssh:gpu-vm|orca-ssh::/w/remote-x |lab::/w/gitlab-mr ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote |orca::/w/Zeta
+cmd1-9 mounted: 1=orca::/w/feat-b#lineage:orca::/w/feat-b 2=orca::/w/feat-a#lineage:orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=orca::/orca 9=orca-ssh::/orca-ssh
+cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca::/w/feat-a 3=api::/w/api-y@runtime:env-1 4=orca-ssh::/w/remote-x@ssh:gpu-vm 5=lab::/w/gitlab-mr 6=shared::/w/same@ssh:gpu-vm 7=shared::/w/same@local 8=orca::/orca 9=orca-ssh::/orca-ssh
cmd ids unmounted: orca::/w/feat-b orca::/w/feat-a api::/w/api-y orca-ssh::/w/remote-x lab::/w/gitlab-mr shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote orca::/w/Zeta
-- collapsed: pinned pr:in-review pr:closed lineage:orca::/w/feat-a --
visible: orca::/w/feat-a orca-ssh::/w/remote-x orca::/w/feat-b api::/w/api-y lab::/w/gitlab-mr shared::/w/same shared::/w/same orca::/orca orca::/w/Zeta orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext
@@ -512,8 +512,8 @@ HEADER key=pr:in-review label="In review" count=2 tone="text-workspace-status-re
HEADER key=pr:in-progress label="In progress" count=13 tone="text-workspace-status-progress" icon=ConductorProgressIcon hostCounts={ssh:gpu-vm:4 local:8 runtime:env-1:1} hostIds={ssh:gpu-vm:[orca-ssh::/w/remote-x,shared::/w/same,orca-ssh::/orca-ssh] local:[lab::/w/gitlab-mr,shared::/w/same,orca::/orca,orca::/w/feat-c,lab::/lab,ext::/ext] runtime:env-1:[api::/api]} ids=[orca-ssh::/w/remote-x,lab::/w/gitlab-mr,shared::/w/same,shared::/w/same,orca::/orca,orca-ssh::/orca-ssh,api::/api,orca::/w/feat-c,lab::/lab,ext::/ext]
ITEM rowKey=pr:in-progress:ssh:gpu-vm|orca-ssh::/w/remote-x depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|lab::/w/gitlab-mr depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:lab
-ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:ssh:gpu-vm|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:repo:shared
+ITEM rowKey=pr:in-progress:local|shared::/w/same depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:repo:shared
ITEM rowKey=pr:in-progress:|orca::/orca depth=0 groupDepth=0 children=0 hostLabel="Local Linux" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:|orca-ssh::/orca-ssh depth=0 groupDepth=0 children=0 hostLabel="GPU VM" placement=natural owning=project:p-orca
ITEM rowKey=pr:in-progress:runtime:env-1|api::/api depth=0 groupDepth=0 children=0 hostLabel="env-1" placement=natural owning=project:repo:api
@@ -535,7 +535,7 @@ PREFERRED ssh:gpu-vm|orca-ssh::/w/remote-x -> pr:in-progress:ssh:gpu-vm|orca-ssh
PREFERRED ssh:gpu-vm|shared::/w/same -> pr:in-progress:ssh:gpu-vm|shared::/w/same
renderedKeys: 23
placeholders: -
-selectionOrder: |orca::/w/feat-b ssh:gpu-vm|orca-ssh::/w/remote-x |lab::/w/gitlab-mr local|shared::/w/same ssh:gpu-vm|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
-cmd1-9 mounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
-cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@local 5=shared::/w/same@ssh:gpu-vm 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
+selectionOrder: |orca::/w/feat-b ssh:gpu-vm|orca-ssh::/w/remote-x |lab::/w/gitlab-mr ssh:gpu-vm|shared::/w/same local|shared::/w/same |orca::/orca |orca-ssh::/orca-ssh runtime:env-1|api::/api |orca::/w/feat-c |lab::/lab |ext::/ext local|folder:fw-review local|folder:fw-notes ssh:gpu-vm|folder:fw-remote
+cmd1-9 mounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
+cmd1-9 unmounted: 1=orca::/w/feat-b 2=orca-ssh::/w/remote-x@ssh:gpu-vm 3=lab::/w/gitlab-mr 4=shared::/w/same@ssh:gpu-vm 5=shared::/w/same@local 6=orca::/orca 7=orca-ssh::/orca-ssh 8=api::/api@runtime:env-1 9=orca::/w/feat-c
cmd ids unmounted: orca::/w/feat-b orca-ssh::/w/remote-x lab::/w/gitlab-mr shared::/w/same orca::/orca orca-ssh::/orca-ssh api::/api orca::/w/feat-c lab::/lab ext::/ext folder:fw-review folder:fw-notes folder:fw-remote
diff --git a/src/renderer/src/components/sidebar/natural-worktree-ids.ts b/src/renderer/src/components/sidebar/natural-worktree-ids.ts
deleted file mode 100644
index d15a351d7cb..00000000000
--- a/src/renderer/src/components/sidebar/natural-worktree-ids.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { PINNED_GROUP_KEY } from '../../../../shared/sidebar-list/group-keys'
-
-type NaturalWorktreeIdRow = { type: string } & Partial<{
- sectionKey: string
- worktree: { id: string }
-}>
-
-/** Pinned duplicates have no separate natural drag slot; avoid allocating arrays per row during rebuilds. */
-export function getNaturalWorktreeIds(rows: readonly NaturalWorktreeIdRow[]): Set<string> {
- const ids = new Set<string>()
- for (const row of rows) {
- if (row.type === 'item' && row.sectionKey !== PINNED_GROUP_KEY && row.worktree) {
- ids.add(row.worktree.id)
- }
- }
- return ids
-}
diff --git a/src/renderer/src/components/sidebar/natural-worktree-keys.ts b/src/renderer/src/components/sidebar/natural-worktree-keys.ts
new file mode 100644
index 00000000000..ef98b55e78a
--- /dev/null
+++ b/src/renderer/src/components/sidebar/natural-worktree-keys.ts
@@ -0,0 +1,20 @@
+import { PINNED_GROUP_KEY } from '../../../../shared/sidebar-list/group-keys'
+import { composeWorktreeHostIdentity } from '../../../../shared/worktree/host-qualified-identity'
+import type { ExecutionHostId } from '../../../../shared/execution-host'
+
+type NaturalWorktreeKeyRow = { type: string } & Partial<{
+ sectionKey: string
+ worktree: { id: string; hostId?: ExecutionHostId }
+}>
+
+/** Pinned duplicates have no separate natural drag slot; avoid allocating arrays per row during rebuilds.
+ * Keyed by host identity so a pinned card is not mistaken for its natural twin on another host. */
+export function getNaturalWorktreeKeys(rows: readonly NaturalWorktreeKeyRow[]): Set<string> {
+ const keys = new Set<string>()
+ for (const row of rows) {
+ if (row.type === 'item' && row.sectionKey !== PINNED_GROUP_KEY && row.worktree) {
+ keys.add(composeWorktreeHostIdentity(row.worktree.hostId, row.worktree.id))
+ }
+ }
+ return keys
+}
diff --git a/src/renderer/src/components/sidebar/use-workspace-board-task-status-sync.queued.test.ts b/src/renderer/src/components/sidebar/use-workspace-board-task-status-sync.queued.test.ts
new file mode 100644
index 00000000000..eaf7c141517
--- /dev/null
+++ b/src/renderer/src/components/sidebar/use-workspace-board-task-status-sync.queued.test.ts
@@ -0,0 +1,156 @@
+// @vitest-environment happy-dom
+
+import { cleanup, renderHook } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { linearGetIssue, linearUpdateIssue } from '@/runtime/runtime-linear-issue-mutations'
+import { linearTeamStates } from '@/runtime/runtime-linear-project-client'
+import type { LinearMutationResult } from '@/runtime/runtime-linear-client'
+import type { WorktreeOperationRouteState } from '@/lib/worktree-operation-route'
+import type { WorkspaceRecordState } from '@/store/workspace-record-selectors'
+import { makeWorktree } from '@/store/slices/worktrees-slice-test-fixtures'
+import { findKnownWorktreeById } from '@/store/slices/worktrees/listing/detected-worktree-meta'
+import type { ExecutionHostId } from '../../../../shared/execution-host'
+import type { LinearIssue } from '../../../../shared/linear/issue-types'
+import { getWorktreeHostIdentity } from '../../../../shared/worktree/host-qualified-identity'
+import * as taskStatusSync from './workspace-board-task-status-sync'
+import { useWorkspaceBoardTaskStatusSync } from './use-workspace-board-task-status-sync'
+
+const { getState } = vi.hoisted(() => ({
+ getState: vi.fn<() => WorktreeOperationRouteState & WorkspaceRecordState>()
+}))
+
+vi.mock('@/store', () => ({ useAppStore: { getState } }))
+vi.mock('@/runtime/runtime-linear-issue-mutations', () => ({
+ linearGetIssue: vi.fn(),
+ linearUpdateIssue: vi.fn()
+}))
+vi.mock('@/runtime/runtime-linear-project-client', () => ({ linearTeamStates: vi.fn() }))
+vi.mock('sonner', () => ({ toast: { error: vi.fn(), warning: vi.fn() } }))
+
+const issue: LinearIssue = {
+ id: 'issue-1',
+ identifier: 'ORC-1',
+ title: 'Sync the board',
+ description: '',
+ url: 'https://linear.app/orca/issue/ORC-1',
+ state: { name: 'Todo', type: 'unstarted', color: '#999' },
+ team: { id: 'team-1', name: 'Orca', key: 'ORC' },
+ labels: [],
+ labelIds: [],
+ priority: 0,
+ updatedAt: '2026-06-15T00:00:00.000Z'
+}
+const statuses = [
+ { id: 'todo', label: 'Todo' },
+ { id: 'in-review', label: 'In review' }
+]
+
+function setup(hostId: 'local' | 'runtime:env-b') {
+ const card = makeWorktree({
+ id: 'repo::/w',
+ repoId: 'repo',
+ hostId,
+ workspaceStatus: 'todo',
+ linkedLinearIssue: issue.identifier
+ })
+ const twin = { ...card, hostId: hostId === 'local' ? 'runtime:env-b' : 'local' } as const
+ const catalog = (rows: (typeof card)[]) => {
+ const state = {
+ worktreesByRepo: { repo: rows },
+ folderWorkspaces: [],
+ detectedWorktreesByRepo: {},
+ floatingWorkspacePath: null,
+ getKnownWorktreeById: (id: string, hostId?: ExecutionHostId) =>
+ findKnownWorktreeById(state, id, hostId)
+ }
+ return state
+ }
+ getState.mockReturnValue(catalog([{ ...card, workspaceStatus: 'in-review' }, twin]))
+ const sync = vi.spyOn(taskStatusSync, 'syncWorkspaceBoardTaskStatuses')
+ const { result } = renderHook(() =>
+ useWorkspaceBoardTaskStatusSync({
+ enabled: true,
+ worktreesByKey: new Map([[getWorktreeHostIdentity(card), card]]),
+ workspaceStatuses: statuses
+ })
+ )
+ return {
+ sync,
+ move: () => result.current([getWorktreeHostIdentity(card)], 'in-review'),
+ removeCard: () => {
+ getState.mockReturnValue(catalog([{ ...twin, workspaceStatus: 'in-review' }]))
+ },
+ settings:
+ hostId === 'local'
+ ? { kind: 'local' as const }
+ : { kind: 'environment' as const, environmentId: 'env-b' }
+ }
+}
+
+beforeEach(() => {
+ vi.mocked(linearGetIssue).mockResolvedValue(issue)
+ vi.mocked(linearTeamStates).mockResolvedValue([
+ { id: 'state-review', name: 'In review', type: 'started', color: '#111', position: 1 }
+ ])
+ vi.mocked(linearUpdateIssue).mockResolvedValue({ ok: true })
+ vi.spyOn(console, 'info').mockImplementation(() => {})
+ vi.spyOn(console, 'warn').mockImplementation(() => {})
+})
+
+afterEach(() => {
+ cleanup()
+ vi.restoreAllMocks()
+ vi.clearAllMocks()
+})
+
+describe.each(['local', 'runtime:env-b'] as const)('queued task sync for %s', (hostId) => {
+ it('refuses provider access when the captured copy disappears while queued', async () => {
+ const { sync, move, removeCard, settings } = setup(hostId)
+ const firstUpdate = Promise.withResolvers<LinearMutationResult>()
+ vi.mocked(linearUpdateIssue).mockReturnValueOnce(firstUpdate.promise)
+
+ move()
+ await vi.waitFor(() => expect(linearUpdateIssue).toHaveBeenCalledTimes(1))
+ move()
+ expect(sync).toHaveBeenCalledTimes(2)
+ expect(linearGetIssue).toHaveBeenCalledTimes(1)
+
+ removeCard()
+ firstUpdate.resolve({ ok: true })
+ const results = await Promise.all(sync.mock.results.map((result) => result.value))
+
+ expect(results).toEqual([
+ { updated: 1, skipped: 0, failed: 0, messages: [] },
+ {
+ updated: 0,
+ skipped: 1,
+ failed: 0,
+ messages: [{ kind: 'owner-ambiguous', issueIdentifier: issue.identifier }]
+ }
+ ])
+ expect(linearGetIssue).toHaveBeenCalledExactlyOnceWith(settings, issue.identifier, undefined)
+ expect(linearTeamStates).toHaveBeenCalledExactlyOnceWith(settings, 'team-1', undefined)
+ expect(linearUpdateIssue).toHaveBeenCalledExactlyOnceWith(
+ settings,
+ issue.id,
+ { stateId: 'state-review' },
+ undefined
+ )
+ })
+
+ it('does not borrow the surviving twin status when the captured copy disappears during a read', async () => {
+ const { sync, move, removeCard, settings } = setup(hostId)
+ const pendingIssue = Promise.withResolvers<LinearIssue | null>()
+ vi.mocked(linearGetIssue).mockReturnValueOnce(pendingIssue.promise)
+
+ move()
+ await vi.waitFor(() => expect(linearGetIssue).toHaveBeenCalledTimes(1))
+ removeCard()
+ pendingIssue.resolve(issue)
+ const results = await Promise.all(sync.mock.results.map((result) => result.value))
+
+ expect(results).toEqual([{ updated: 0, skipped: 1, failed: 0, messages: [] }])
+ expect(linearTeamStates).toHaveBeenCalledExactlyOnceWith(settings, 'team-1', undefined)
+ expect(linearUpdateIssue).not.toHaveBeenCalled()
+ })
+})
diff --git a/src/renderer/src/components/sidebar/use-workspace-board-task-status-sync.test.ts b/src/renderer/src/components/sidebar/use-workspace-board-task-status-sync.test.ts
index 206ddeb7c6b..f6da874a968 100644
--- a/src/renderer/src/components/sidebar/use-workspace-board-task-status-sync.test.ts
+++ b/src/renderer/src/components/sidebar/use-workspace-board-task-status-sync.test.ts
@@ -3,20 +3,25 @@ import { describe, expect, it, vi } from 'vitest'
vi.mock('@/store', () => ({ useAppStore: { getState: () => ({}) } }))
import { linearSettingsForBoardWorktree } from './use-workspace-board-task-status-sync'
+import { makeFolderWorkspace, makeWorktree } from '@/store/slices/worktrees-slice-test-fixtures'
+import { folderWorkspaceKey } from '../../../../shared/workspace-scope'
const WORKTREE_ID = 'repo::/w'
type OwnerHost = 'local' | 'runtime:env-b'
function ownedBy(...hostIds: OwnerHost[]) {
return {
+ folderWorkspaces: [],
repos: hostIds.map((hostId) => ({ id: 'repo', executionHostId: hostId })),
worktreesByRepo: {
- repo: hostIds.map((hostId) => ({
- id: WORKTREE_ID,
- repoId: 'repo',
- hostId,
- ...(hostId === 'local' ? {} : { runtimeOwnerEnvironmentId: 'env-b' })
- }))
+ repo: hostIds.map((hostId) =>
+ makeWorktree({
+ id: WORKTREE_ID,
+ repoId: 'repo',
+ hostId,
+ ...(hostId === 'local' ? {} : { runtimeOwnerEnvironmentId: 'env-b' })
+ })
+ )
}
}
}
@@ -38,4 +43,65 @@ describe('linearSettingsForBoardWorktree', () => {
expect(warn.mock.calls[0]).toContain(WORKTREE_ID)
warn.mockRestore()
})
+
+ it("uses a dragged twin card's own host, not this computer's Linear", () => {
+ expect(
+ linearSettingsForBoardWorktree(
+ ownedBy('local', 'runtime:env-b'),
+ WORKTREE_ID,
+ 'runtime:env-b'
+ )
+ ).toEqual({ kind: 'environment', environmentId: 'env-b' })
+ })
+
+ it('uses the captured host for a workspace on one host', () => {
+ const state = ownedBy('runtime:env-b')
+ expect(linearSettingsForBoardWorktree(state, WORKTREE_ID, 'runtime:env-b')).toEqual(
+ linearSettingsForBoardWorktree(state, WORKTREE_ID)
+ )
+ })
+
+ it.each<OwnerHost>(['local', 'runtime:env-b'])(
+ 'refuses a removed %s copy when only its twin remains',
+ (hostId) => {
+ const survivor = hostId === 'local' ? 'runtime:env-b' : 'local'
+ expect(linearSettingsForBoardWorktree(ownedBy(survivor), WORKTREE_ID, hostId)).toBeNull()
+ }
+ )
+
+ it('refuses a captured copy when all copies are gone', () => {
+ expect(linearSettingsForBoardWorktree(ownedBy(), WORKTREE_ID, 'runtime:env-b')).toBeNull()
+ })
+
+ it('keeps folder workspace sync on the captured host', () => {
+ const folder = makeFolderWorkspace({ executionHostId: 'runtime:env-b' })
+ const state = { ...ownedBy(), folderWorkspaces: [folder] }
+ const id = folderWorkspaceKey(folder.id)
+ expect(linearSettingsForBoardWorktree(state, id, 'runtime:env-b')).toEqual({
+ kind: 'environment',
+ environmentId: 'env-b'
+ })
+ expect(linearSettingsForBoardWorktree(state, id, 'local')).toBeNull()
+ })
+
+ it('indexes an unchanged catalog once across a bulk sync', () => {
+ let idReads = 0
+ const rows = Array.from({ length: 100 }, (_, index) => ({
+ ...makeWorktree({ id: `repo::/w-${index}`, repoId: 'repo', hostId: 'runtime:env-b' }),
+ get id() {
+ idReads += 1
+ return `repo::/w-${index}`
+ }
+ }))
+ const state = { ...ownedBy('runtime:env-b'), worktreesByRepo: { repo: rows } }
+
+ for (let index = 0; index < rows.length; index += 1) {
+ expect(linearSettingsForBoardWorktree(state, `repo::/w-${index}`, 'runtime:env-b')).toEqual({
+ kind: 'environment',
+ environmentId: 'env-b'
+ })
+ }
+
+ expect(idReads).toBeLessThanOrEqual(rows.length * 2)
+ })
})
diff --git a/src/renderer/src/components/sidebar/use-workspace-board-task-status-sync.ts b/src/renderer/src/components/sidebar/use-workspace-board-task-status-sync.ts
index 2ecd1767ba0..536a0b4be56 100644
--- a/src/renderer/src/components/sidebar/use-workspace-board-task-status-sync.ts
+++ b/src/renderer/src/components/sidebar/use-workspace-board-task-status-sync.ts
@@ -1,7 +1,14 @@
import { useCallback } from 'react'
import { toast } from 'sonner'
import { useAppStore } from '@/store'
+import {
+ selectWorkspaceByHostTarget,
+ type WorkspaceRecordState
+} from '@/store/workspace-record-selectors'
+import { hostWorktreeTarget } from '../../../../shared/worktree/host-qualified-identity'
import { getRuntimeTargetForWorktreeOwner } from '@/lib/file-owner-runtime-target'
+import { runtimeTargetForWorkspaceOwner } from '@/lib/resolve-owner'
+import type { ExecutionHostId } from '../../../../shared/execution-host'
import { warnAmbiguousOwnerOnce } from '@/lib/ambiguous-owner-warning'
import type { WorktreeOperationRouteState } from '@/lib/worktree-operation-route'
import type { RuntimeLinearSettings } from '@/runtime/runtime-linear-client'
@@ -122,13 +129,22 @@ function reportTaskStatusSyncResult(result: WorkspaceBoardTaskStatusSyncResult):
)
}
-/** Linear settings of the worktree's owner, or `null` to skip a worktree whose owner is ambiguous. */
+/** Linear settings of the worktree's owner, or `null` when its captured copy is gone or ambiguous. */
export function linearSettingsForBoardWorktree(
- state: WorktreeOperationRouteState,
- worktreeId: string
+ state: WorktreeOperationRouteState & WorkspaceRecordState,
+ worktreeId: string,
+ /** The card's own host, retained even if its same-id copies change while queued. */
+ hostId?: ExecutionHostId
): RuntimeLinearSettings | null {
- // Why: a workspace no row places is this computer's, but a twin must not borrow its Linear account.
- const target = getRuntimeTargetForWorktreeOwner(state, worktreeId)
+ if (
+ hostId &&
+ !selectWorkspaceByHostTarget(state, hostWorktreeTarget({ id: worktreeId, hostId }))
+ ) {
+ return null
+ }
+ const target = hostId
+ ? runtimeTargetForWorkspaceOwner(state, { workspaceId: worktreeId, hostId })
+ : getRuntimeTargetForWorktreeOwner(state, worktreeId)
if (!target) {
warnAmbiguousOwnerOnce(worktreeId, 'sync a board task status')
}
@@ -137,29 +153,45 @@ export function linearSettingsForBoardWorktree(
export function useWorkspaceBoardTaskStatusSync(args: {
enabled: boolean
- worktreesById: ReadonlyMap<string, Worktree>
+ /** Board cards by host identity, so each same-id copy syncs through its own host. */
+ worktreesByKey: ReadonlyMap<string, Worktree>
workspaceStatuses: readonly WorkspaceStatusDefinition[]
-}): (worktreeIds: readonly string[], status: WorkspaceStatus) => void {
+}): (worktreeKeys: readonly string[], status: WorkspaceStatus) => void {
return useCallback(
- (worktreeIds, status) => {
+ (worktreeKeys, status) => {
const request = getWorkspaceBoardTaskStatusSyncRequest({
enabled: args.enabled,
- worktreeIds,
+ worktreeKeys,
status,
- worktreesById: args.worktreesById,
+ worktreesByKey: args.worktreesByKey,
workspaceStatuses: args.workspaceStatuses
})
if (!request) {
return
}
void syncWorkspaceBoardTaskStatuses({
- worktreeIds: request.worktreeIds,
+ worktreeKeys: request.worktreeKeys,
targetStatus: request.targetStatus,
- worktreesById: args.worktreesById,
- getSettingsForWorktree: (worktreeId) =>
- linearSettingsForBoardWorktree(useAppStore.getState(), worktreeId),
- getLatestWorkspaceStatus: (worktreeId) =>
- useAppStore.getState().getKnownWorktreeById(worktreeId)?.workspaceStatus
+ worktreesByKey: args.worktreesByKey,
+ getSettingsForWorktree: (key) => {
+ const worktree = args.worktreesByKey.get(key)
+ return worktree
+ ? linearSettingsForBoardWorktree(useAppStore.getState(), worktree.id, worktree.hostId)
+ : null
+ },
+ getLatestWorkspaceStatus: (key) => {
+ const worktree = args.worktreesByKey.get(key)
+ if (!worktree) {
+ return undefined
+ }
+ const state = useAppStore.getState()
+ return worktree.hostId
+ ? selectWorkspaceByHostTarget(
+ state,
+ hostWorktreeTarget({ id: worktree.id, hostId: worktree.hostId })
+ )?.workspaceStatus
+ : state.getKnownWorktreeById(worktree.id)?.workspaceStatus
+ }
})
.then((result) => {
if (result.updated > 0 || result.failed > 0 || result.messages.length > 0) {
@@ -172,7 +204,7 @@ export function useWorkspaceBoardTaskStatusSync(args: {
reportTaskStatusSyncResult({
updated: 0,
skipped: 0,
- failed: request.worktreeIds.length,
+ failed: request.worktreeKeys.length,
messages: [
{
kind: 'unexpected-error',
@@ -182,6 +214,6 @@ export function useWorkspaceBoardTaskStatusSync(args: {
})
})
},
- [args.enabled, args.workspaceStatuses, args.worktreesById]
+ [args.enabled, args.workspaceStatuses, args.worktreesByKey]
)
}
diff --git a/src/renderer/src/components/sidebar/use-workspace-kanban-board-projection.ts b/src/renderer/src/components/sidebar/use-workspace-kanban-board-projection.ts
index 77c8db1a769..55225b80178 100644
--- a/src/renderer/src/components/sidebar/use-workspace-kanban-board-projection.ts
+++ b/src/renderer/src/components/sidebar/use-workspace-kanban-board-projection.ts
@@ -42,15 +42,22 @@ export function useWorkspaceKanbanBoardProjection(args: {
() => buildUnambiguousWorktreeIdIndex(args.allWorktrees),
[args.allWorktrees]
)
+ // Drops carry each card's host identity, so same-id copies on two hosts stay separate cards.
+ const worktreeByKey = useMemo(
+ () =>
+ new Map(args.allWorktrees.map((worktree) => [getWorktreeHostIdentity(worktree), worktree])),
+ [args.allWorktrees]
+ )
const boardWorktrees = useMemo(
() => args.workspaceStatuses.flatMap((status) => worktreesByStatus.get(status.id) ?? []),
[args.workspaceStatuses, worktreesByStatus]
)
+ // Lane members are host identities, as in the sidebar's drag groups.
const boardDragGroups = useMemo<WorktreeDragGroup[]>(
() =>
args.workspaceStatuses.map((status) => ({
key: status.id,
- worktreeIds: (worktreesByStatus.get(status.id) ?? []).map((worktree) => worktree.id)
+ worktreeIds: (worktreesByStatus.get(status.id) ?? []).map(getWorktreeHostIdentity)
})),
[args.workspaceStatuses, worktreesByStatus]
)
@@ -101,6 +108,7 @@ export function useWorkspaceKanbanBoardProjection(args: {
renderedBoardWorktrees,
search,
worktreeById,
+ worktreeByKey,
worktreesByStatus
}
}
diff --git a/src/renderer/src/components/sidebar/use-workspace-kanban-card-pointer-drag.test.ts b/src/renderer/src/components/sidebar/use-workspace-kanban-card-pointer-drag.test.ts
index 7961452cef8..20c10576987 100644
--- a/src/renderer/src/components/sidebar/use-workspace-kanban-card-pointer-drag.test.ts
+++ b/src/renderer/src/components/sidebar/use-workspace-kanban-card-pointer-drag.test.ts
@@ -49,7 +49,8 @@ describe('workspace kanban pointer drag selection identity', () => {
})
).toEqual({
worktreeIds: ['shared'],
- worktreeIdentities: ['ssh:host-b|shared']
+ worktreeIdentities: ['ssh:host-b|shared'],
+ worktreeKeys: ['ssh:host-b|shared']
})
})
@@ -66,7 +67,8 @@ describe('workspace kanban pointer drag selection identity', () => {
})
).toEqual({
worktreeIds: ['shared', 'shared'],
- worktreeIdentities: ['local|shared', 'ssh:host-b|shared']
+ worktreeIdentities: ['local|shared', 'ssh:host-b|shared'],
+ worktreeKeys: ['local|shared', 'ssh:host-b|shared']
})
})
})
diff --git a/src/renderer/src/components/sidebar/use-workspace-kanban-card-pointer-drag.ts b/src/renderer/src/components/sidebar/use-workspace-kanban-card-pointer-drag.ts
index af5d6a66f92..de400531c73 100644
--- a/src/renderer/src/components/sidebar/use-workspace-kanban-card-pointer-drag.ts
+++ b/src/renderer/src/components/sidebar/use-workspace-kanban-card-pointer-drag.ts
@@ -31,6 +31,7 @@ type DragState = {
currentY: number
worktreeIds: string[]
worktreeIdentities: string[]
+ worktreeKeys: string[]
sourceCard: HTMLElement
preview: HTMLElement | null
previewOffsetX: number
@@ -128,7 +129,7 @@ export function useWorkspaceKanbanCardPointerDrag({
pinWorktreesRef.current(state.worktreeIds)
} else if (commitTarget.status) {
dropWorktreesInStatusRef.current({
- worktreeIds: state.worktreeIds,
+ worktreeKeys: state.worktreeKeys,
status: commitTarget.status,
dropIndex: commitTarget.dropIndex
})
@@ -170,7 +171,7 @@ export function useWorkspaceKanbanCardPointerDrag({
dragTargetChangeRef.current(dropTarget.status)
if (
dropTarget.status &&
- shouldShowDropIndicatorRef.current(state.worktreeIds, dropTarget.status)
+ shouldShowDropIndicatorRef.current(state.worktreeKeys, dropTarget.status)
) {
updateCardDropIndicator(board, dropTarget)
} else {
@@ -290,12 +291,13 @@ export function useWorkspaceKanbanCardPointerDrag({
}
const selectedWorktrees = selectedWorktreesRef.current
- const { worktreeIds, worktreeIdentities } = resolveWorkspaceKanbanPointerDragSelection({
- sourceWorktreeId: worktreeId,
- sourceWorktreeIdentity: worktreeIdentity,
- selectedWorktreeIds: selectedWorktreeIdsRef.current,
- selectedWorktrees
- })
+ const { worktreeIds, worktreeIdentities, worktreeKeys } =
+ resolveWorkspaceKanbanPointerDragSelection({
+ sourceWorktreeId: worktreeId,
+ sourceWorktreeIdentity: worktreeIdentity,
+ selectedWorktreeIds: selectedWorktreeIdsRef.current,
+ selectedWorktrees
+ })
dragRef.current = {
pointerId: event.pointerId,
startX: event.clientX,
@@ -304,6 +306,7 @@ export function useWorkspaceKanbanCardPointerDrag({
currentY: event.clientY,
worktreeIds,
worktreeIdentities,
+ worktreeKeys,
sourceCard: card,
preview: null,
previewOffsetX: 0,
diff --git a/src/renderer/src/components/sidebar/use-workspace-kanban-worktree-actions.ts b/src/renderer/src/components/sidebar/use-workspace-kanban-worktree-actions.ts
index 0230f4afe5d..ba524595266 100644
--- a/src/renderer/src/components/sidebar/use-workspace-kanban-worktree-actions.ts
+++ b/src/renderer/src/components/sidebar/use-workspace-kanban-worktree-actions.ts
@@ -17,6 +17,7 @@ import type {
import type { WorktreeMetaBatchUpdate } from '../../store/slices/worktree-helpers'
import type { WorktreeManualOrderCatalog } from './worktree-manual-order-catalog'
import { isWorkspaceStatusAllowedOnHost } from '@/store/host-workspace-status-columns'
+import { getWorktreeHostIdentity } from '../../../../shared/worktree/host-qualified-identity'
type LaneView = { items: readonly Worktree[] }
@@ -24,12 +25,15 @@ export function useWorkspaceKanbanWorktreeActions(args: {
boardDragGroups: readonly WorktreeDragGroup[]
laneFullWorktreeIds: ReadonlyMap<string, readonly string[]>
laneViews: ReadonlyMap<string, LaneView>
- maybeSyncTaskStatuses: (worktreeIds: readonly string[], status: WorkspaceStatus) => void
+ /** Host identities of the cards whose status changed. */
+ maybeSyncTaskStatuses: (worktreeKeys: readonly string[], status: WorkspaceStatus) => void
sortBy: ReturnType<typeof useAppStore.getState>['sortBy']
updateWorktreeMeta: ReturnType<typeof useAppStore.getState>['updateWorktreeMeta']
updateWorktreesMeta: ReturnType<typeof useAppStore.getState>['updateWorktreesMeta']
workspaceStatuses: readonly WorkspaceStatusDefinition[]
worktreeById: ReadonlyMap<string, Worktree>
+ /** Every card by host identity; lanes, drops and manual ranks use these keys. */
+ worktreeByKey: ReadonlyMap<string, Worktree>
manualOrderCatalog: WorktreeManualOrderCatalog
worktreesByStatus: ReadonlyMap<string, readonly Worktree[]>
}) {
@@ -37,18 +41,18 @@ export function useWorkspaceKanbanWorktreeActions(args: {
useAppStore.getState().recordFeatureInteraction('workspace-board-actions')
}
const getSourceStatusKeys = useCallback(
- (worktreeIds: readonly string[]): WorkspaceStatus[] =>
- worktreeIds.flatMap((worktreeId) => {
- const worktree = args.worktreeById.get(worktreeId)
+ (worktreeKeys: readonly string[]): WorkspaceStatus[] =>
+ worktreeKeys.flatMap((key) => {
+ const worktree = args.worktreeByKey.get(key)
return worktree ? [getWorkspaceStatus(worktree, args.workspaceStatuses)] : []
}),
- [args.workspaceStatuses, args.worktreeById]
+ [args.workspaceStatuses, args.worktreeByKey]
)
const shouldWriteDropManualOrder = useCallback(
- (worktreeIds: readonly string[], status: WorkspaceStatus): boolean =>
+ (worktreeKeys: readonly string[], status: WorkspaceStatus): boolean =>
shouldWriteManualOrderForGroupDrop({
sortBy: args.sortBy,
- sourceGroupKeys: getSourceStatusKeys(worktreeIds),
+ sourceGroupKeys: getSourceStatusKeys(worktreeKeys),
targetGroupKey: status
}),
[args.sortBy, getSourceStatusKeys]
@@ -65,97 +69,97 @@ export function useWorkspaceKanbanWorktreeActions(args: {
{ workspaceStatus: status },
{ executionHostId: current.hostId ?? 'local' }
)
- args.maybeSyncTaskStatuses([worktreeId], status)
+ args.maybeSyncTaskStatuses([getWorktreeHostIdentity(current)], status)
},
[args]
)
const moveWorktreesToStatus = useCallback(
(worktreeIds: readonly string[], status: WorkspaceStatus) => {
const updates: WorktreeMetaBatchUpdate[] = []
- const changedIds: string[] = []
+ const changedKeys: string[] = []
for (const worktreeId of worktreeIds) {
const current = args.worktreeById.get(worktreeId)
if (!current || getWorkspaceStatus(current, args.workspaceStatuses) === status) {
continue
}
- changedIds.push(worktreeId)
+ changedKeys.push(getWorktreeHostIdentity(current))
updates.push({
worktreeId,
updates: { workspaceStatus: status },
executionHostId: current.hostId ?? 'local'
})
}
- if (changedIds.length === 0) {
+ if (changedKeys.length === 0) {
return
}
recordInteraction()
void args.updateWorktreesMeta(updates)
- args.maybeSyncTaskStatuses(changedIds, status)
+ args.maybeSyncTaskStatuses(changedKeys, status)
},
[args]
)
const dropWorktreesInStatus = useCallback(
- (requestedDrop: {
- worktreeIds: readonly string[]
+ (drop: {
+ worktreeKeys: readonly string[]
status: WorkspaceStatus
dropIndex: number
writeManualOrder?: boolean
}) => {
// Cards that can't take this status (another paired host's column) aren't re-ranked either.
const state = useAppStore.getState()
- const worktreeIds = requestedDrop.worktreeIds.filter((worktreeId) => {
- const current = args.worktreeById.get(worktreeId)
- return current && isWorkspaceStatusAllowedOnHost(state, current, requestedDrop.status)
+ const rows = drop.worktreeKeys.flatMap((key) => {
+ const current = args.worktreeByKey.get(key)
+ return current && isWorkspaceStatusAllowedOnHost(state, current, drop.status)
+ ? [current]
+ : []
})
- if (worktreeIds.length === 0) {
+ if (rows.length === 0) {
return
}
- const drop = { ...requestedDrop, worktreeIds }
- const updates: WorktreeMetaBatchUpdate[] = []
+ const worktreeKeys = rows.map(getWorktreeHostIdentity)
const writeManualOrder =
- drop.writeManualOrder ?? shouldWriteDropManualOrder(drop.worktreeIds, drop.status)
+ drop.writeManualOrder ?? shouldWriteDropManualOrder(worktreeKeys, drop.status)
const order = writeManualOrder
? buildManualOrderUpdatesForGroupDrop({
groups: args.boardDragGroups,
targetGroupKey: drop.status,
- draggedIds: drop.worktreeIds,
+ draggedIds: worktreeKeys,
dropIndex: drop.dropIndex,
now: Date.now(),
- rankByWorktreeId: args.manualOrderCatalog.rankByWorktreeId,
- allWorktreeIds: args.manualOrderCatalog.orderedIds
+ rankByWorktreeId: args.manualOrderCatalog.rankByKey,
+ allWorktreeIds: args.manualOrderCatalog.orderedKeys
})
: { changed: false, updates: new Map<string, { manualOrder: number }>() }
- for (const worktreeId of drop.worktreeIds) {
- const current = args.worktreeById.get(worktreeId)
- if (!current) {
- continue
- }
+ const updatesByKey = new Map<string, WorktreeMetaBatchUpdate>()
+ for (const current of rows) {
const next: Partial<WorktreeMeta> = {}
if (getWorkspaceStatus(current, args.workspaceStatuses) !== drop.status) {
next.workspaceStatus = drop.status
}
- updates.push({
- worktreeId,
+ updatesByKey.set(getWorktreeHostIdentity(current), {
+ worktreeId: current.id,
updates: next,
executionHostId: current.hostId ?? 'local'
})
}
- for (const [worktreeId, manualOrder] of order.updates) {
- const entry = updates.find((candidate) => candidate.worktreeId === worktreeId)
+ for (const [key, manualOrder] of order.updates) {
+ const entry = updatesByKey.get(key)
if (entry) {
entry.updates = { ...entry.updates, ...manualOrder }
continue
}
- const current = args.worktreeById.get(worktreeId)
+ const current = args.worktreeByKey.get(key)
if (current) {
- updates.push({
- worktreeId,
+ updatesByKey.set(key, {
+ worktreeId: current.id,
updates: manualOrder,
executionHostId: current.hostId ?? 'local'
})
}
}
- const changed = updates.filter((entry) => Object.keys(entry.updates).length > 0)
+ const changed = [...updatesByKey.values()].filter(
+ (entry) => Object.keys(entry.updates).length > 0
+ )
if (changed.length === 0) {
return
}
@@ -164,17 +168,17 @@ export function useWorkspaceKanbanWorktreeActions(args: {
}
recordInteraction()
void args.updateWorktreesMeta(changed)
- args.maybeSyncTaskStatuses(drop.worktreeIds, drop.status)
+ args.maybeSyncTaskStatuses(worktreeKeys, drop.status)
},
[args, shouldWriteDropManualOrder]
)
const dropPointerDraggedWorktreesInStatus = useCallback(
- (drop: { worktreeIds: readonly string[]; status: WorkspaceStatus; dropIndex: number }) => {
+ (drop: { worktreeKeys: readonly string[]; status: WorkspaceStatus; dropIndex: number }) => {
dropWorktreesInStatus({
...drop,
dropIndex: resolveFullLaneDropIndex({
fullLaneIds: args.laneFullWorktreeIds.get(drop.status) ?? [],
- renderedIds: (args.laneViews.get(drop.status)?.items ?? []).map((item) => item.id),
+ renderedIds: (args.laneViews.get(drop.status)?.items ?? []).map(getWorktreeHostIdentity),
filteredDropIndex: drop.dropIndex
})
})
@@ -183,14 +187,19 @@ export function useWorkspaceKanbanWorktreeActions(args: {
)
const dropWorktreesAtEndOfStatus = useCallback(
(worktreeIds: readonly string[], status: WorkspaceStatus) => {
+ // These drops carry bare ids, so only an id one host owns can name its card.
+ const worktreeKeys = worktreeIds.flatMap((worktreeId) => {
+ const current = args.worktreeById.get(worktreeId)
+ return current ? [getWorktreeHostIdentity(current)] : []
+ })
dropWorktreesInStatus({
- worktreeIds,
+ worktreeKeys,
status,
dropIndex: args.worktreesByStatus.get(status)?.length ?? 0,
writeManualOrder: args.sortBy === 'manual'
})
},
- [args.sortBy, args.worktreesByStatus, dropWorktreesInStatus]
+ [args.sortBy, args.worktreeById, args.worktreesByStatus, dropWorktreesInStatus]
)
const pinWorktree = useCallback(
(worktreeId: string) => {
diff --git a/src/renderer/src/components/sidebar/visible-worktrees.ts b/src/renderer/src/components/sidebar/visible-worktrees.ts
index fcd66ea4b00..ff1dd8c09e0 100644
--- a/src/renderer/src/components/sidebar/visible-worktrees.ts
+++ b/src/renderer/src/components/sidebar/visible-worktrees.ts
@@ -4,7 +4,8 @@ export {
computeVisibleWorktrees,
type VisibleWorktreeOptions
} from './compute-visible-worktrees'
-import { computeVisibleWorktreeIds } from './compute-visible-worktrees'
+import { computeVisibleWorktrees } from './compute-visible-worktrees'
+import { getWorktreeHostIdentity } from '../../../../shared/worktree/host-qualified-identity'
export { sidebarHasActiveFilters } from './sidebar-filter-actions'
import {
getVisibleWorkspaceHostIdSet,
@@ -54,20 +55,17 @@ export function getPublishedVisibleWorktreeShortcutTargets():
return _publishedVisibleShortcutTargets
}
-export function getVisibleWorktreeIds(): string[] {
- if (_publishedVisibleIds) {
- return _publishedVisibleIds
- }
-
+/** The unmounted list's visible rows in sidebar sort order, ranked per host copy like the mounted list. */
+function computeUnmountedVisibleWorktrees(): Worktree[] {
const state = useAppStore.getState()
const allWorktrees = getAllWorktreesFromState(state).filter((w) => !w.isArchived)
const repoMap = getRepoMapFromState(state)
- let sortedIds: string[]
+ let sortedKeys: string[]
if (state.sortBy === 'smart') {
- sortedIds = sortWorktreesSmart(
+ sortedKeys = sortWorktreesSmart(
allWorktrees,
state.tabsByWorktree,
repoMap,
@@ -76,33 +74,36 @@ export function getVisibleWorktreeIds(): string[] {
state.ptyIdsByTabId,
state.migrationUnsupportedByPtyId,
state.terminalLayoutsByTabId
- ).map((w) => w.id)
+ ).map(getWorktreeHostIdentity)
} else {
// Non-smart comparators ignore attention; the required argument protects smart-mode callers.
const sorted = [...allWorktrees].sort(
buildWorktreeComparator(state.sortBy, repoMap, Date.now(), new Map())
)
- sortedIds = sorted.map((w) => w.id)
+ sortedKeys = sorted.map(getWorktreeHostIdentity)
}
- const visibleIds = computeVisibleWorktreeIds(
- selectWorktreesByRepo(state),
- sortedIds,
- buildVisibleWorktreeOptionsFromState(state, repoMap)
- )
-
- const visibleIdRank = new Map(visibleIds.map((id, index) => [id, index]))
const visibleHostIds = getVisibleWorkspaceHostIdSet(state)
const defaultHostId = getSettingsFocusedExecutionHostId(state.settings)
- const visibleWorktrees = allWorktrees
- .filter(
- (worktree) =>
- visibleIdRank.has(worktree.id) &&
- worktreeMatchesVisibleHost(worktree, visibleHostIds, repoMap, defaultHostId)
- )
- .sort((a, b) => (visibleIdRank.get(a.id) ?? 0) - (visibleIdRank.get(b.id) ?? 0))
+ return computeVisibleWorktrees(selectWorktreesByRepo(state), sortedKeys, {
+ ...buildVisibleWorktreeOptionsFromState(state, repoMap),
+ sortedByHostIdentity: true
+ }).filter(
+ (worktree) =>
+ !worktree.isArchived &&
+ worktreeMatchesVisibleHost(worktree, visibleHostIds, repoMap, defaultHostId)
+ )
+}
+
+export function getVisibleWorktreeIds(): string[] {
+ if (_publishedVisibleIds) {
+ return _publishedVisibleIds
+ }
// Grouping, pinning and main-worktree hoisting must also govern shortcut numbering.
- return computeRenderedSidebarWorktreeOrder(state, visibleWorktrees)
+ return computeRenderedSidebarWorktreeOrder(
+ useAppStore.getState(),
+ computeUnmountedVisibleWorktrees()
+ )
}
export function getVisibleWorktreeShortcutTargets(): VisibleWorktreeShortcutTarget[] {
@@ -110,7 +111,12 @@ export function getVisibleWorktreeShortcutTargets(): VisibleWorktreeShortcutTarg
return _publishedVisibleShortcutTargets
}
const state = useAppStore.getState()
- const visibleIds = getVisibleWorktreeIds()
+ if (!_publishedVisibleIds) {
+ return toShortcutTargets(
+ computeRenderedSidebarWorktrees(state, computeUnmountedVisibleWorktrees())
+ )
+ }
+ const visibleIds = _publishedVisibleIds
const visibleIdRank = new Map(visibleIds.map((id, index) => [id, index]))
const repoMap = getRepoMapFromState(state)
const visibleHostIds = getVisibleWorkspaceHostIdSet(state)
@@ -123,7 +129,11 @@ export function getVisibleWorktreeShortcutTargets(): VisibleWorktreeShortcutTarg
worktreeMatchesVisibleHost(worktree, visibleHostIds, repoMap, defaultHostId)
)
.sort((a, b) => (visibleIdRank.get(a.id) ?? 0) - (visibleIdRank.get(b.id) ?? 0))
- return computeRenderedSidebarWorktrees(state, worktrees).map((worktree) => ({
+ return toShortcutTargets(computeRenderedSidebarWorktrees(state, worktrees))
+}
+
+function toShortcutTargets(worktrees: readonly Worktree[]): VisibleWorktreeShortcutTarget[] {
+ return worktrees.map((worktree) => ({
id: worktree.id,
...(worktree.hostId ? { executionHostId: worktree.hostId } : {})
}))
diff --git a/src/renderer/src/components/sidebar/workspace-board-host-column-drops.test.tsx b/src/renderer/src/components/sidebar/workspace-board-host-column-drops.test.tsx
index d2c46bc4e10..942682bd467 100644
--- a/src/renderer/src/components/sidebar/workspace-board-host-column-drops.test.tsx
+++ b/src/renderer/src/components/sidebar/workspace-board-host-column-drops.test.tsx
@@ -8,6 +8,7 @@ import { makeWorktree } from '@/store/slices/worktrees-slice-test-fixtures'
import { toRuntimeExecutionHostId } from '../../../../shared/execution-host'
import { useWorkspaceKanbanWorktreeActions } from './use-workspace-kanban-worktree-actions'
import { useWorktreeStatusMutations } from './worktree-list/drag/use-status-mutations'
+import { getWorktreeHostIdentity } from '../../../../shared/worktree/host-qualified-identity'
const local = makeWorktree({ id: 'repo::/local', repoId: 'repo', path: '/local' })
const hosted = makeWorktree({
@@ -16,7 +17,10 @@ const hosted = makeWorktree({
path: '/hosted',
hostId: toRuntimeExecutionHostId('env-1')
})
-const catalog = { orderedIds: [local.id, hosted.id], rankByWorktreeId: new Map<string, number>() }
+const catalog = {
+ orderedKeys: [getWorktreeHostIdentity(local), getWorktreeHostIdentity(hosted)],
+ rankByKey: new Map<string, number>()
+}
let updateWorktreesMeta: ReturnType<typeof vi.fn<AppState['updateWorktreesMeta']>>
@@ -51,6 +55,7 @@ describe("drops into a paired host's own column", () => {
[local.id, local],
[hosted.id, hosted]
]),
+ worktreeByKey: new Map([local, hosted].map((row) => [getWorktreeHostIdentity(row), row])),
manualOrderCatalog: catalog,
worktreesByStatus: new Map()
})
diff --git a/src/renderer/src/components/sidebar/workspace-board-task-status-sync.test.ts b/src/renderer/src/components/sidebar/workspace-board-task-status-sync.test.ts
index 65499bc0398..60f60e0a405 100644
--- a/src/renderer/src/components/sidebar/workspace-board-task-status-sync.test.ts
+++ b/src/renderer/src/components/sidebar/workspace-board-task-status-sync.test.ts
@@ -82,9 +82,9 @@ function setup(overrides: Partial<Worktree> = {}) {
updateIssue,
run: () =>
syncWorkspaceBoardTaskStatuses({
- worktreeIds: [item.id],
+ worktreeKeys: [item.id],
targetStatus: target,
- worktreesById: new Map([[item.id, item]]),
+ worktreesByKey: new Map([[item.id, item]]),
settings: { kind: 'environment', environmentId: 'runtime-1' },
getLatestWorkspaceStatus: () => target.id,
deps: { getIssue, teamStates, updateIssue }
@@ -123,9 +123,9 @@ describe('syncWorkspaceBoardTaskStatuses', () => {
getIssue.mockResolvedValueOnce(issue({ workspaceId: 'issue-workspace' }))
await syncWorkspaceBoardTaskStatuses({
- worktreeIds: [item.id],
+ worktreeKeys: [item.id],
targetStatus: target,
- worktreesById: new Map([[item.id, item]]),
+ worktreesByKey: new Map([[item.id, item]]),
settings: { kind: 'local' },
getLatestWorkspaceStatus: () => target.id,
deps: { getIssue, teamStates, updateIssue }
@@ -157,9 +157,9 @@ describe('syncWorkspaceBoardTaskStatuses', () => {
}))
await syncWorkspaceBoardTaskStatuses({
- worktreeIds: [first.id, second.id],
+ worktreeKeys: [first.id, second.id],
targetStatus: target,
- worktreesById: new Map([
+ worktreesByKey: new Map([
[first.id, first],
[second.id, second]
]),
@@ -204,9 +204,9 @@ describe('syncWorkspaceBoardTaskStatuses', () => {
const getSettingsForWorktree = vi.fn(() => ({ kind: 'local' as const }))
await syncWorkspaceBoardTaskStatuses({
- worktreeIds: [item.id],
+ worktreeKeys: [item.id],
targetStatus: target,
- worktreesById: new Map([[item.id, item]]),
+ worktreesByKey: new Map([[item.id, item]]),
settings: { kind: 'environment', environmentId: 'focused-runtime' },
getSettingsForWorktree,
getLatestWorkspaceStatus: () => target.id,
@@ -228,9 +228,9 @@ describe('syncWorkspaceBoardTaskStatuses', () => {
const { item, target, getIssue, teamStates, updateIssue } = setup()
const result = await syncWorkspaceBoardTaskStatuses({
- worktreeIds: [item.id],
+ worktreeKeys: [item.id],
targetStatus: target,
- worktreesById: new Map([[item.id, item]]),
+ worktreesByKey: new Map([[item.id, item]]),
getSettingsForWorktree: () => null,
getLatestWorkspaceStatus: () => target.id,
deps: { getIssue, teamStates, updateIssue }
@@ -251,9 +251,9 @@ describe('syncWorkspaceBoardTaskStatuses', () => {
const { item, target, getIssue, teamStates, updateIssue } = setup({ linkedLinearIssue: null })
const result = await syncWorkspaceBoardTaskStatuses({
- worktreeIds: [item.id],
+ worktreeKeys: [item.id],
targetStatus: target,
- worktreesById: new Map([[item.id, item]]),
+ worktreesByKey: new Map([[item.id, item]]),
settings: { kind: 'local' },
getLatestWorkspaceStatus: () => target.id,
deps: { getIssue, teamStates, updateIssue }
@@ -307,9 +307,9 @@ describe('syncWorkspaceBoardTaskStatuses', () => {
const { item, target, getIssue, teamStates, updateIssue } = setup()
const result = await syncWorkspaceBoardTaskStatuses({
- worktreeIds: [item.id],
+ worktreeKeys: [item.id],
targetStatus: target,
- worktreesById: new Map([[item.id, item]]),
+ worktreesByKey: new Map([[item.id, item]]),
settings: { kind: 'local' },
getLatestWorkspaceStatus: () => 'done',
deps: { getIssue, teamStates, updateIssue }
@@ -333,9 +333,9 @@ describe('syncWorkspaceBoardTaskStatuses', () => {
.mockResolvedValueOnce({ ok: true })
const firstSync = syncWorkspaceBoardTaskStatuses({
- worktreeIds: [item.id],
+ worktreeKeys: [item.id],
targetStatus: targetStatus(),
- worktreesById: new Map([[item.id, item]]),
+ worktreesByKey: new Map([[item.id, item]]),
settings: { kind: 'local' },
getLatestWorkspaceStatus: () => 'in-review',
deps: { getIssue, teamStates, updateIssue }
@@ -344,9 +344,9 @@ describe('syncWorkspaceBoardTaskStatuses', () => {
expect(updateIssue).toHaveBeenCalledTimes(1)
const secondSync = syncWorkspaceBoardTaskStatuses({
- worktreeIds: [item.id],
+ worktreeKeys: [item.id],
targetStatus: targetStatus({ id: 'done', label: 'Done' }),
- worktreesById: new Map([[item.id, item]]),
+ worktreesByKey: new Map([[item.id, item]]),
settings: { kind: 'local' },
getLatestWorkspaceStatus: () => 'done',
deps: { getIssue, teamStates, updateIssue }
@@ -402,14 +402,14 @@ describe('getWorkspaceBoardTaskStatusSyncRequest', () => {
it('builds a sync request for enabled status moves', () => {
const request = getWorkspaceBoardTaskStatusSyncRequest({
enabled: true,
- worktreeIds: ['repo::/a'],
+ worktreeKeys: ['repo::/a'],
status: 'in-review',
- worktreesById: new Map([['repo::/a', worktree({ workspaceStatus: 'todo' })]]),
+ worktreesByKey: new Map([['repo::/a', worktree({ workspaceStatus: 'todo' })]]),
workspaceStatuses
})
expect(request).toEqual({
- worktreeIds: ['repo::/a'],
+ worktreeKeys: ['repo::/a'],
targetStatus: { id: 'in-review', label: 'In review' }
})
})
@@ -418,9 +418,9 @@ describe('getWorkspaceBoardTaskStatusSyncRequest', () => {
expect(
getWorkspaceBoardTaskStatusSyncRequest({
enabled: false,
- worktreeIds: ['repo::/a'],
+ worktreeKeys: ['repo::/a'],
status: 'in-review',
- worktreesById: new Map([['repo::/a', worktree({ workspaceStatus: 'todo' })]]),
+ worktreesByKey: new Map([['repo::/a', worktree({ workspaceStatus: 'todo' })]]),
workspaceStatuses
})
).toBeNull()
@@ -430,9 +430,9 @@ describe('getWorkspaceBoardTaskStatusSyncRequest', () => {
expect(
getWorkspaceBoardTaskStatusSyncRequest({
enabled: true,
- worktreeIds: ['repo::/a', 'repo::/a'],
+ worktreeKeys: ['repo::/a', 'repo::/a'],
status: 'in-review',
- worktreesById: new Map([['repo::/a', worktree({ workspaceStatus: 'in-review' })]]),
+ worktreesByKey: new Map([['repo::/a', worktree({ workspaceStatus: 'in-review' })]]),
workspaceStatuses
})
).toBeNull()
@@ -442,9 +442,9 @@ describe('getWorkspaceBoardTaskStatusSyncRequest', () => {
expect(
getWorkspaceBoardTaskStatusSyncRequest({
enabled: true,
- worktreeIds: ['repo::/a'],
+ worktreeKeys: ['repo::/a'],
status: 'unknown-status',
- worktreesById: new Map([['repo::/a', worktree({ workspaceStatus: 'todo' })]]),
+ worktreesByKey: new Map([['repo::/a', worktree({ workspaceStatus: 'todo' })]]),
workspaceStatuses
})
).toBeNull()
diff --git a/src/renderer/src/components/sidebar/workspace-board-task-status-sync.ts b/src/renderer/src/components/sidebar/workspace-board-task-status-sync.ts
index b24f585579a..fcba0718381 100644
--- a/src/renderer/src/components/sidebar/workspace-board-task-status-sync.ts
+++ b/src/renderer/src/components/sidebar/workspace-board-task-status-sync.ts
@@ -32,47 +32,48 @@ type WorkspaceBoardTaskStatusSyncDependencies = {
updateIssue: typeof linearUpdateIssue
}
+/** Cards are keyed by host identity: same-id copies on two hosts each sync their own linked issue. */
export type SyncWorkspaceBoardTaskStatusesArgs = {
- worktreeIds: readonly string[]
+ worktreeKeys: readonly string[]
targetStatus: WorkspaceStatusDefinition
- worktreesById: ReadonlyMap<
+ worktreesByKey: ReadonlyMap<
string,
Pick<Worktree, 'linkedLinearIssue' | 'linkedLinearIssueWorkspaceId'>
>
settings?: RuntimeLinearSettings
/** `null` refuses the worktree: its owner is ambiguous, so no host's Linear settings apply. */
- getSettingsForWorktree?: (worktreeId: string) => RuntimeLinearSettings | null
- getLatestWorkspaceStatus: (worktreeId: string) => WorkspaceStatus | null | undefined
+ getSettingsForWorktree?: (worktreeKey: string) => RuntimeLinearSettings | null
+ getLatestWorkspaceStatus: (worktreeKey: string) => WorkspaceStatus | null | undefined
deps?: Partial<WorkspaceBoardTaskStatusSyncDependencies>
}
export type WorkspaceBoardTaskStatusSyncRequest = {
- worktreeIds: string[]
+ worktreeKeys: string[]
targetStatus: WorkspaceStatusDefinition
}
export function getWorkspaceBoardTaskStatusSyncRequest(args: {
enabled: boolean
- worktreeIds: readonly string[]
+ worktreeKeys: readonly string[]
status: WorkspaceStatus
- worktreesById: ReadonlyMap<string, Pick<Worktree, 'workspaceStatus'>>
+ worktreesByKey: ReadonlyMap<string, Pick<Worktree, 'workspaceStatus'>>
workspaceStatuses: readonly WorkspaceStatusDefinition[]
}): WorkspaceBoardTaskStatusSyncRequest | null {
- if (!args.enabled || args.worktreeIds.length === 0) {
+ if (!args.enabled || args.worktreeKeys.length === 0) {
return null
}
const targetStatus = args.workspaceStatuses.find((item) => item.id === args.status)
if (!targetStatus) {
return null
}
- const changedWorktreeIds = [...new Set(args.worktreeIds)].filter((worktreeId) => {
- const worktree = args.worktreesById.get(worktreeId)
+ const changedWorktreeKeys = [...new Set(args.worktreeKeys)].filter((key) => {
+ const worktree = args.worktreesByKey.get(key)
return worktree ? getWorkspaceStatus(worktree, args.workspaceStatuses) !== args.status : false
})
- if (changedWorktreeIds.length === 0) {
+ if (changedWorktreeKeys.length === 0) {
return null
}
- return { worktreeIds: changedWorktreeIds, targetStatus }
+ return { worktreeKeys: changedWorktreeKeys, targetStatus }
}
const defaultDeps: WorkspaceBoardTaskStatusSyncDependencies = {
@@ -149,23 +150,23 @@ function mergeResult(
}
async function enqueueWorktreeSync(
- worktreeId: string,
+ worktreeKey: string,
task: () => Promise<WorkspaceBoardTaskStatusSyncResult>
): Promise<WorkspaceBoardTaskStatusSyncResult> {
- const previous = worktreeSyncQueues.get(worktreeId) ?? Promise.resolve()
+ const previous = worktreeSyncQueues.get(worktreeKey) ?? Promise.resolve()
const next = previous.catch(() => undefined).then(task)
const cleanup = next.finally(() => {
- if (worktreeSyncQueues.get(worktreeId) === cleanup) {
- worktreeSyncQueues.delete(worktreeId)
+ if (worktreeSyncQueues.get(worktreeKey) === cleanup) {
+ worktreeSyncQueues.delete(worktreeKey)
}
})
- worktreeSyncQueues.set(worktreeId, cleanup)
+ worktreeSyncQueues.set(worktreeKey, cleanup)
return next
}
async function syncLinearWorktreeStatus(
args: SyncWorkspaceBoardTaskStatusesArgs,
- worktreeId: string,
+ worktreeKey: string,
deps: WorkspaceBoardTaskStatusSyncDependencies
): Promise<WorkspaceBoardTaskStatusSyncResult> {
const result: WorkspaceBoardTaskStatusSyncResult = {
@@ -174,14 +175,14 @@ async function syncLinearWorktreeStatus(
failed: 0,
messages: []
}
- const worktree = args.worktreesById.get(worktreeId)
+ const worktree = args.worktreesByKey.get(worktreeKey)
if (!worktree?.linkedLinearIssue) {
return skipped(result)
}
// Legacy callers without source settings route to this computer.
const settings = args.getSettingsForWorktree
- ? args.getSettingsForWorktree(worktreeId)
+ ? args.getSettingsForWorktree(worktreeKey)
: (args.settings ?? { kind: 'local' })
if (!settings) {
return skipped(result, { kind: 'owner-ambiguous', issueIdentifier: worktree.linkedLinearIssue })
@@ -219,7 +220,7 @@ async function syncLinearWorktreeStatus(
}
// Board moves are local-first; a slow provider read must not let an older move overwrite a newer one.
- if (args.getLatestWorkspaceStatus(worktreeId) !== args.targetStatus.id) {
+ if (args.getLatestWorkspaceStatus(worktreeKey) !== args.targetStatus.id) {
return skipped(result)
}
@@ -258,11 +259,11 @@ export async function syncWorkspaceBoardTaskStatuses(
messages: []
}
- const uniqueIds = new Set(args.worktreeIds)
+ const uniqueKeys = new Set(args.worktreeKeys)
await Promise.all(
- [...uniqueIds].map(async (worktreeId) => {
- const item = await enqueueWorktreeSync(worktreeId, () =>
- syncLinearWorktreeStatus(args, worktreeId, deps)
+ [...uniqueKeys].map(async (worktreeKey) => {
+ const item = await enqueueWorktreeSync(worktreeKey, () =>
+ syncLinearWorktreeStatus(args, worktreeKey, deps)
)
mergeResult(aggregate, item)
})
diff --git a/src/renderer/src/components/sidebar/workspace-board-twin-drops.test.tsx b/src/renderer/src/components/sidebar/workspace-board-twin-drops.test.tsx
new file mode 100644
index 00000000000..9ec7d0aa637
--- /dev/null
+++ b/src/renderer/src/components/sidebar/workspace-board-twin-drops.test.tsx
@@ -0,0 +1,140 @@
+// @vitest-environment happy-dom
+
+import { cleanup, renderHook } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
+import type { AppState } from '@/store/types'
+import { makeWorktree } from '@/store/slices/worktrees-slice-test-fixtures'
+import type { Worktree } from '../../../../shared/worktree/types'
+import { getWorktreeHostIdentity } from '../../../../shared/worktree/host-qualified-identity'
+import { useWorkspaceKanbanWorktreeActions } from './use-workspace-kanban-worktree-actions'
+import { buildWorktreeManualOrderCatalog } from './worktree-manual-order-catalog'
+import { buildUnambiguousWorktreeIdIndex } from './worktree-unambiguous-id-index'
+
+vi.mock('sonner', () => ({ toast: { info: vi.fn(), dismiss: vi.fn() } }))
+
+// Same repo id and path on two machines: one worktree id, two cards.
+const TWIN_ID = 'repo::/home/dev/app'
+const onVmA = makeWorktree({
+ id: TWIN_ID,
+ repoId: 'repo',
+ path: '/home/dev/app',
+ hostId: 'ssh:vm-a',
+ workspaceStatus: 'todo',
+ manualOrder: 300
+})
+const other = makeWorktree({
+ id: 'repo::/home/dev/other',
+ repoId: 'repo',
+ path: '/home/dev/other',
+ hostId: 'ssh:vm-a',
+ workspaceStatus: 'todo',
+ manualOrder: 200
+})
+const onVmB = { ...onVmA, hostId: 'ssh:vm-b' as const, manualOrder: 100 }
+const lane: Worktree[] = [onVmA, other, onVmB]
+const keyOf = getWorktreeHostIdentity
+
+let updateWorktreesMeta: ReturnType<typeof vi.fn<AppState['updateWorktreesMeta']>>
+const maybeSyncTaskStatuses = vi.fn()
+
+beforeEach(() => {
+ updateWorktreesMeta = vi.fn<AppState['updateWorktreesMeta']>(() => Promise.resolve())
+ maybeSyncTaskStatuses.mockClear()
+ useAppStore.setState({
+ sortBy: 'manual',
+ worktreesByRepo: { repo: lane },
+ folderWorkspaces: [],
+ workspaceStatuses: [
+ { id: 'todo', label: 'Todo' },
+ { id: 'done', label: 'Done' }
+ ],
+ updateWorktreesMeta,
+ recordFeatureInteraction: vi.fn()
+ })
+})
+
+afterEach(cleanup)
+
+function renderBoardActions() {
+ return renderHook(() =>
+ useWorkspaceKanbanWorktreeActions({
+ boardDragGroups: [
+ { key: 'todo', worktreeIds: lane.map(keyOf) },
+ { key: 'done', worktreeIds: [] }
+ ],
+ laneFullWorktreeIds: new Map([
+ ['todo', lane.map(keyOf)],
+ ['done', []]
+ ]),
+ laneViews: new Map([
+ ['todo', { items: lane }],
+ ['done', { items: [] }]
+ ]),
+ maybeSyncTaskStatuses,
+ sortBy: 'manual',
+ updateWorktreeMeta: vi.fn(),
+ updateWorktreesMeta,
+ workspaceStatuses: [
+ { id: 'todo', label: 'Todo' },
+ { id: 'done', label: 'Done' }
+ ],
+ worktreeById: buildUnambiguousWorktreeIdIndex(lane),
+ worktreeByKey: new Map(lane.map((row) => [keyOf(row), row])),
+ manualOrderCatalog: buildWorktreeManualOrderCatalog({
+ worktrees: lane,
+ folderWorkspaces: []
+ }),
+ worktreesByStatus: new Map([
+ ['todo', lane],
+ ['done', []]
+ ])
+ })
+ ).result
+}
+
+describe('board drops on one copy of a same-id pair', () => {
+ it('reorders only the dragged copy within its lane', () => {
+ const actions = renderBoardActions()
+
+ actions.current.dropPointerDraggedWorktreesInStatus({
+ worktreeKeys: [keyOf(onVmB)],
+ status: 'todo',
+ dropIndex: 0
+ })
+
+ const writes = updateWorktreesMeta.mock.calls[0]?.[0] ?? []
+ expect(writes).toEqual([
+ {
+ worktreeId: TWIN_ID,
+ updates: { manualOrder: expect.any(Number) },
+ executionHostId: 'ssh:vm-b'
+ }
+ ])
+ expect(writes[0]!.updates.manualOrder).toBeGreaterThan(300)
+ })
+
+ it('moves only the dragged copy to another lane and syncs only its task', () => {
+ const actions = renderBoardActions()
+
+ actions.current.dropPointerDraggedWorktreesInStatus({
+ worktreeKeys: [keyOf(onVmA)],
+ status: 'done',
+ dropIndex: 0
+ })
+
+ const writes = updateWorktreesMeta.mock.calls[0]?.[0] ?? []
+ expect(writes.map((entry) => [entry.executionHostId, entry.updates.workspaceStatus])).toEqual([
+ ['ssh:vm-a', 'done']
+ ])
+ expect(maybeSyncTaskStatuses).toHaveBeenCalledWith([keyOf(onVmA)], 'done')
+ })
+
+ it('still refuses a bare-id drop that cannot name one copy', () => {
+ const actions = renderBoardActions()
+
+ actions.current.dropWorktreesAtEndOfStatus([TWIN_ID], 'done')
+
+ expect(updateWorktreesMeta).not.toHaveBeenCalled()
+ })
+})
diff --git a/src/renderer/src/components/sidebar/workspace-kanban-pointer-drag-selection.ts b/src/renderer/src/components/sidebar/workspace-kanban-pointer-drag-selection.ts
index a5002d442fa..f01f4c75d88 100644
--- a/src/renderer/src/components/sidebar/workspace-kanban-pointer-drag-selection.ts
+++ b/src/renderer/src/components/sidebar/workspace-kanban-pointer-drag-selection.ts
@@ -1,4 +1,5 @@
import type { WorkspaceStatus, Worktree } from '../../../../shared/worktree/types'
+import { getWorktreeHostIdentity } from '../../../../shared/worktree/host-qualified-identity'
/** Qualify by host so dragging one workspace cannot move its same-ID twin on another host. */
export function resolveWorkspaceKanbanPointerDragSelection(args: {
@@ -6,19 +7,22 @@ export function resolveWorkspaceKanbanPointerDragSelection(args: {
sourceWorktreeIdentity: string
selectedWorktreeIds: ReadonlySet<string>
selectedWorktrees: readonly Worktree[]
-}): { worktreeIds: string[]; worktreeIdentities: string[] } {
+}): { worktreeIds: string[]; worktreeIdentities: string[]; worktreeKeys: string[] } {
if (
args.selectedWorktreeIds.has(args.sourceWorktreeIdentity) &&
args.selectedWorktrees.length > 1
) {
return {
worktreeIds: args.selectedWorktrees.map((worktree) => worktree.id),
- worktreeIdentities: [...args.selectedWorktreeIds]
+ worktreeIdentities: [...args.selectedWorktreeIds],
+ // The drop moves the rendered selection only, like worktreeIds.
+ worktreeKeys: args.selectedWorktrees.map(getWorktreeHostIdentity)
}
}
return {
worktreeIds: [args.sourceWorktreeId],
- worktreeIdentities: [args.sourceWorktreeIdentity]
+ worktreeIdentities: [args.sourceWorktreeIdentity],
+ worktreeKeys: [args.sourceWorktreeIdentity]
}
}
@@ -28,11 +32,12 @@ export type UseWorkspaceKanbanCardPointerDragParams = {
selectedWorktreeIds: ReadonlySet<string>
selectedWorktrees: readonly Worktree[]
onDropWorktreesInStatus: (args: {
- worktreeIds: readonly string[]
+ /** Host identities of the dragged cards. */
+ worktreeKeys: readonly string[]
status: WorkspaceStatus
dropIndex: number
}) => void
- onShouldShowDropIndicator: (worktreeIds: readonly string[], status: WorkspaceStatus) => boolean
+ onShouldShowDropIndicator: (worktreeKeys: readonly string[], status: WorkspaceStatus) => boolean
onPinWorktrees: (worktreeIds: readonly string[]) => void
onDragTargetChange: (status: WorkspaceStatus | null) => void
onPinDragTargetChange: (isOver: boolean) => void
diff --git a/src/renderer/src/components/sidebar/workspace-kanban-sidebar-drop.test.ts b/src/renderer/src/components/sidebar/workspace-kanban-sidebar-drop.test.ts
index 6e9744dc50d..43ef90d6406 100644
--- a/src/renderer/src/components/sidebar/workspace-kanban-sidebar-drop.test.ts
+++ b/src/renderer/src/components/sidebar/workspace-kanban-sidebar-drop.test.ts
@@ -1,5 +1,9 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import type { WorkspaceStatusDefinition, Worktree } from '../../../../shared/worktree/types'
+import {
+ composeWorktreeHostIdentity,
+ getWorktreeHostIdentity
+} from '../../../../shared/worktree/host-qualified-identity'
import { serializeWorkspaceLaneFullIds } from './workspace-kanban-filtered-drop-index'
import {
buildWorkspaceKanbanSidebarDropUpdates,
@@ -548,13 +552,21 @@ describe('workspace kanban sidebar drop DOM bridge', () => {
})
function rowsFrom(byId: ReadonlyMap<string, Worktree>) {
- const rowsFor = (worktreeId: string): Worktree[] => {
- const row = byId.get(worktreeId)
- return row ? [row] : []
+ const byKey = new Map<string, Worktree[]>(
+ [...byId.values()].map((row) => [getWorktreeHostIdentity(row), [row]])
+ )
+ return {
+ status: (worktreeId: string): Worktree[] => {
+ const row = byId.get(worktreeId)
+ return row ? [row] : []
+ },
+ orderByKey: (key: string): Worktree[] => byKey.get(key) ?? []
}
- return { status: rowsFor, order: rowsFor }
}
+// Board lanes and manual ranks key cards by host identity; these rows carry no host.
+const k = (id: string): string => composeWorktreeHostIdentity(undefined, id)
+
describe('workspace kanban sidebar drop updates', () => {
it('writes a status-only update for cross-lane drops outside Manual sort', () => {
const worktreeById = new Map([
@@ -567,12 +579,12 @@ describe('workspace kanban sidebar drop updates', () => {
status: 'doing',
dropIndex: 1,
groups: [
- { key: 'todo', worktreeIds: ['todo-a'] },
- { key: 'doing', worktreeIds: ['doing-a'] }
+ { key: 'todo', worktreeIds: [k('todo-a')] },
+ { key: 'doing', worktreeIds: [k('doing-a')] }
],
rowsFor: rowsFrom(worktreeById),
- allWorktreeIds: [...worktreeById.keys()],
- rankByWorktreeId: new Map(),
+ allWorktreeKeys: [...worktreeById.keys()].map(k),
+ rankByKey: new Map(),
workspaceStatuses,
sortBy: 'recent',
now: 10_000
@@ -596,12 +608,12 @@ describe('workspace kanban sidebar drop updates', () => {
status: 'doing',
dropIndex: 1,
groups: [
- { key: 'todo', worktreeIds: ['todo-a'] },
- { key: 'doing', worktreeIds: ['doing-a', 'doing-b'] }
+ { key: 'todo', worktreeIds: [k('todo-a')] },
+ { key: 'doing', worktreeIds: [k('doing-a'), k('doing-b')] }
],
rowsFor: rowsFrom(worktreeById),
- allWorktreeIds: [...worktreeById.keys()],
- rankByWorktreeId: new Map(),
+ allWorktreeKeys: [...worktreeById.keys()].map(k),
+ rankByKey: new Map(),
workspaceStatuses,
sortBy: 'manual',
now: 10_000
@@ -650,11 +662,11 @@ describe('workspace kanban sidebar drop updates', () => {
})
]
])
- const rankByWorktreeId = new Map([
- ['todo-a', 4000],
- ['filtered', 3000],
- ['doing-a', 2000],
- ['doing-b', 1000]
+ const rankByKey = new Map([
+ [k('todo-a'), 4000],
+ [k('filtered'), 3000],
+ [k('doing-a'), 2000],
+ [k('doing-b'), 1000]
])
const result = buildWorkspaceKanbanSidebarDropUpdates({
@@ -662,12 +674,12 @@ describe('workspace kanban sidebar drop updates', () => {
status: 'doing',
dropIndex: 1,
groups: [
- { key: 'todo', worktreeIds: ['todo-a'] },
- { key: 'doing', worktreeIds: ['doing-a', 'doing-b'] }
+ { key: 'todo', worktreeIds: [k('todo-a')] },
+ { key: 'doing', worktreeIds: [k('doing-a'), k('doing-b')] }
],
rowsFor: rowsFrom(worktreeById),
- allWorktreeIds: ['todo-a', 'filtered', 'doing-a', 'doing-b'],
- rankByWorktreeId,
+ allWorktreeKeys: ['todo-a', 'filtered', 'doing-a', 'doing-b'].map(k),
+ rankByKey,
workspaceStatuses,
sortBy: 'manual',
now: 10_000
diff --git a/src/renderer/src/components/sidebar/workspace-kanban-sidebar-drop.ts b/src/renderer/src/components/sidebar/workspace-kanban-sidebar-drop.ts
index 7e0b367e36c..49858f2fb86 100644
--- a/src/renderer/src/components/sidebar/workspace-kanban-sidebar-drop.ts
+++ b/src/renderer/src/components/sidebar/workspace-kanban-sidebar-drop.ts
@@ -4,7 +4,11 @@ import {
resolveFullLaneDropIndex
} from './workspace-kanban-filtered-drop-index'
import { getWorkspaceStatus } from './workspace-status'
-import { collectDropWrites, type DropWriteRows } from './worktree-list/drag/dragged-worktree-copies'
+import {
+ collectDropWrites,
+ uniqueDraggedKeys,
+ type DropWriteRows
+} from './worktree-list/drag/dragged-worktree-copies'
import {
buildManualOrderUpdatesForGroupDrop,
shouldWriteManualOrderForGroupDrop,
@@ -52,8 +56,9 @@ function getLaneCardIds(lane: HTMLElement): HTMLElement[] {
return Array.from(lane.querySelectorAll<HTMLElement>(CARD_SELECTOR))
}
-function getCardWorktreeId(card: HTMLElement): string | undefined {
- return card.dataset.workspaceBoardWorktreeId ?? card.dataset.workspaceBoardCardId
+/** Lanes key cards by host identity, so same-id copies on two hosts keep separate slots. */
+function getCardWorktreeKey(card: HTMLElement): string | undefined {
+ return card.dataset.workspaceBoardCardId
}
/** Prefer the virtualizer’s complete view over mounted cards; fullLaneIds also retains search-hidden members. */
@@ -67,10 +72,10 @@ function toLaneDropIds(lane: HTMLElement): { fullLaneIds: string[]; viewIds: str
}
const cards = getLaneCardIds(lane)
return {
- fullLaneIds: publishedFullLaneIds ?? cards.flatMap((card) => getCardWorktreeId(card) ?? []),
+ fullLaneIds: publishedFullLaneIds ?? cards.flatMap((card) => getCardWorktreeKey(card) ?? []),
viewIds: cards
.filter((card) => card.offsetParent !== null)
- .flatMap((card) => getCardWorktreeId(card) ?? [])
+ .flatMap((card) => getCardWorktreeKey(card) ?? [])
}
}
@@ -197,8 +202,9 @@ export function buildWorkspaceKanbanSidebarDropUpdates(args: {
groups: readonly WorktreeDragGroup[]
/** The rows each id may write; a twin's id names another host's copy too. */
rowsFor: DropWriteRows
- allWorktreeIds: readonly string[]
- rankByWorktreeId: ReadonlyMap<string, number>
+ /** Manual ranks by host identity, as board lanes key their cards. */
+ allWorktreeKeys: readonly string[]
+ rankByKey: ReadonlyMap<string, number>
workspaceStatuses: readonly WorkspaceStatusDefinition[]
sortBy: string
now: number
@@ -218,11 +224,12 @@ export function buildWorkspaceKanbanSidebarDropUpdates(args: {
? buildManualOrderUpdatesForGroupDrop({
groups: args.groups,
targetGroupKey: args.status,
- draggedIds: args.worktreeIds,
+ // Rank only the copies this drop writes, not a same-id twin on another host.
+ draggedIds: uniqueDraggedKeys(args.worktreeIds.flatMap(args.rowsFor.status)),
dropIndex: args.dropIndex,
now: args.now,
- rankByWorktreeId: args.rankByWorktreeId,
- allWorktreeIds: args.allWorktreeIds
+ rankByWorktreeId: args.rankByKey,
+ allWorktreeIds: args.allWorktreeKeys
})
: { changed: false, updates: new Map<string, { manualOrder: number }>() }
@@ -232,7 +239,7 @@ export function buildWorkspaceKanbanSidebarDropUpdates(args: {
statusIds: args.worktreeIds,
status: args.status,
workspaceStatuses: args.workspaceStatuses,
- orderUpdates: order.updates
+ orderUpdatesByKey: order.updates
}),
shouldSwitchToManual: writeManualOrder && order.changed
}
diff --git a/src/renderer/src/components/sidebar/workspace-kanban-virtual-lane-layout.ts b/src/renderer/src/components/sidebar/workspace-kanban-virtual-lane-layout.ts
index f07d4a6eaf5..82557f26b53 100644
--- a/src/renderer/src/components/sidebar/workspace-kanban-virtual-lane-layout.ts
+++ b/src/renderer/src/components/sidebar/workspace-kanban-virtual-lane-layout.ts
@@ -2,8 +2,8 @@ import type { VirtualItem } from '@tanstack/react-virtual'
type VirtualLaneLayoutRegistration = {
spacerElement: HTMLElement
+ /** Card host identities, the board's lane keys. */
getItemIds: () => readonly string[]
- getWorktreeIds?: () => readonly string[]
getMeasurements: () => readonly Pick<VirtualItem, 'index' | 'start' | 'end'>[]
}
@@ -30,13 +30,11 @@ export function registerWorkspaceKanbanVirtualLaneLayout(args: {
scrollElement: HTMLElement
spacerElement: HTMLElement
getItemIds: () => readonly string[]
- getWorktreeIds?: () => readonly string[]
getMeasurements: () => readonly Pick<VirtualItem, 'index' | 'start' | 'end'>[]
}): () => void {
const registration = {
spacerElement: args.spacerElement,
getItemIds: args.getItemIds,
- getWorktreeIds: args.getWorktreeIds,
getMeasurements: args.getMeasurements
}
virtualLaneLayouts.set(args.scrollElement, registration)
@@ -52,7 +50,7 @@ export function getWorkspaceKanbanVirtualLaneItemIds(
scrollElement: HTMLElement
): readonly string[] | null {
const registration = virtualLaneLayouts.get(scrollElement)
- return registration?.getWorktreeIds?.() ?? registration?.getItemIds() ?? null
+ return registration?.getItemIds() ?? null
}
export function getWorkspaceKanbanVirtualLaneItemRects(
diff --git a/src/renderer/src/components/sidebar/worktree-drag-units.test.ts b/src/renderer/src/components/sidebar/worktree-drag-units.test.ts
index 9d6f230d5cd..254be4a211a 100644
--- a/src/renderer/src/components/sidebar/worktree-drag-units.test.ts
+++ b/src/renderer/src/components/sidebar/worktree-drag-units.test.ts
@@ -3,6 +3,11 @@ import {
getFullDropIndexForWorktreeDragUnit,
getWorktreeDragUnitGroups
} from './worktree-drag-units'
+import { composeWorktreeHostIdentity } from '../../../../shared/worktree/host-qualified-identity'
+import type { ExecutionHostId } from '../../../../shared/execution-host'
+
+// Unit members are host identities; these rows carry no host.
+const k = (id: string): string => composeWorktreeHostIdentity(undefined, id)
function header(key: string): { type: 'header'; key: string } {
return { type: 'header', key }
@@ -33,10 +38,10 @@ describe('getWorktreeDragUnitGroups', () => {
expect(groups).toEqual([
{
key: 'all',
- worktreeIds: ['parent', 'sibling'],
+ worktreeIds: [k('parent'), k('sibling')],
units: [
- { worktreeId: 'parent', worktreeIds: ['parent', 'child', 'grandchild'] },
- { worktreeId: 'sibling', worktreeIds: ['sibling'] }
+ { worktreeId: k('parent'), worktreeIds: [k('parent'), k('child'), k('grandchild')] },
+ { worktreeId: k('sibling'), worktreeIds: [k('sibling')] }
]
}
])
@@ -56,16 +61,16 @@ describe('getWorktreeDragUnitGroups', () => {
expect(groups).toEqual([
{
key: 'repo:one',
- worktreeIds: ['main', 'feature'],
+ worktreeIds: [k('main'), k('feature')],
units: [
- { worktreeId: 'main', worktreeIds: ['main'] },
- { worktreeId: 'feature', worktreeIds: ['feature'] }
+ { worktreeId: k('main'), worktreeIds: [k('main')] },
+ { worktreeId: k('feature'), worktreeIds: [k('feature')] }
]
},
{
key: 'repo:two',
- worktreeIds: ['other'],
- units: [{ worktreeId: 'other', worktreeIds: ['other'] }]
+ worktreeIds: [k('other')],
+ units: [{ worktreeId: k('other'), worktreeIds: [k('other')] }]
}
])
})
@@ -80,10 +85,10 @@ describe('getWorktreeDragUnitGroups', () => {
expect(groups).toEqual([
{
key: 'pinned',
- worktreeIds: ['pinned-copy', 'other-pinned'],
+ worktreeIds: [k('pinned-copy'), k('other-pinned')],
units: [
- { worktreeId: 'pinned-copy', worktreeIds: ['pinned-copy'] },
- { worktreeId: 'other-pinned', worktreeIds: ['other-pinned'] }
+ { worktreeId: k('pinned-copy'), worktreeIds: [k('pinned-copy')] },
+ { worktreeId: k('other-pinned'), worktreeIds: [k('other-pinned')] }
]
}
])
@@ -101,14 +106,36 @@ describe('getWorktreeDragUnitGroups', () => {
expect(groups).toEqual([
{
key: 'all',
- worktreeIds: ['pinned-copy', 'other'],
+ worktreeIds: [k('pinned-copy'), k('other')],
units: [
- { worktreeId: 'pinned-copy', worktreeIds: ['pinned-copy'] },
- { worktreeId: 'other', worktreeIds: ['other'] }
+ { worktreeId: k('pinned-copy'), worktreeIds: [k('pinned-copy')] },
+ { worktreeId: k('other'), worktreeIds: [k('other')] }
]
}
])
})
+
+ it('keeps same-id copies on two hosts as separate units', () => {
+ const onHost = (hostId: ExecutionHostId, sectionKey = 'all') => ({
+ type: 'item' as const,
+ worktree: { id: 'repo::/w/same', hostId },
+ depth: 0,
+ sectionKey
+ })
+ const groups = getWorktreeDragUnitGroups([
+ header('pinned'),
+ onHost('ssh:vm-a', 'pinned'),
+ header('all'),
+ onHost('ssh:vm-b'),
+ onHost('ssh:vm-c')
+ ])
+
+ expect(groups.map((group) => group.worktreeIds)).toEqual([
+ // The pinned copy is the only one on vm-a, so it keeps its own pinned slot.
+ ['ssh:vm-a|repo::/w/same'],
+ ['ssh:vm-b|repo::/w/same', 'ssh:vm-c|repo::/w/same']
+ ])
+ })
})
describe('getFullDropIndexForWorktreeDragUnit', () => {
diff --git a/src/renderer/src/components/sidebar/worktree-drag-units.ts b/src/renderer/src/components/sidebar/worktree-drag-units.ts
index 0840e9ab089..fe19367146e 100644
--- a/src/renderer/src/components/sidebar/worktree-drag-units.ts
+++ b/src/renderer/src/components/sidebar/worktree-drag-units.ts
@@ -1,6 +1,8 @@
import type { WorktreeDragGroup } from './worktree-manual-order'
import { ALL_GROUP_KEY, PINNED_GROUP_KEY } from '../../../../shared/sidebar-list/group-keys'
-import { getNaturalWorktreeIds } from './natural-worktree-ids'
+import { getNaturalWorktreeKeys } from './natural-worktree-keys'
+import { composeWorktreeHostIdentity } from '../../../../shared/worktree/host-qualified-identity'
+import type { ExecutionHostId } from '../../../../shared/execution-host'
export type WorktreeDragUnitGroup = WorktreeDragGroup & {
units: { worktreeId: string; worktreeIds: string[] }[]
@@ -9,18 +11,24 @@ export type WorktreeDragUnitGroup = WorktreeDragGroup & {
type WorktreeDragUnitRow =
| { type: 'host-header' }
| { type: 'header'; key: string }
- | { type: 'item'; worktree: { id: string }; depth: number; sectionKey: string }
+ | {
+ type: 'item'
+ worktree: { id: string; hostId?: ExecutionHostId }
+ depth: number
+ sectionKey: string
+ }
| { type: 'imported-worktrees-card' }
| { type: 'new-external-worktrees-inbox' }
| { type: 'pending-creation' }
| { type: 'folder-workspace' }
+/** Unit members are host identities, matching getWorktreeDragGroups. */
export function getWorktreeDragUnitGroups(
rows: readonly WorktreeDragUnitRow[]
): WorktreeDragUnitGroup[] {
const groups: WorktreeDragUnitGroup[] = []
let current: { key: string; units: WorktreeDragUnitGroup['units'] } | null = null
- const naturalWorktreeIds = getNaturalWorktreeIds(rows)
+ const naturalWorktreeKeys = getNaturalWorktreeKeys(rows)
for (const row of rows) {
if (row.type === 'header') {
@@ -41,7 +49,8 @@ export function getWorktreeDragUnitGroups(
) {
continue
}
- if (row.sectionKey === PINNED_GROUP_KEY && naturalWorktreeIds.has(row.worktree.id)) {
+ const worktreeKey = composeWorktreeHostIdentity(row.worktree.hostId, row.worktree.id)
+ if (row.sectionKey === PINNED_GROUP_KEY && naturalWorktreeKeys.has(worktreeKey)) {
continue
}
if (!current) {
@@ -53,10 +62,10 @@ export function getWorktreeDragUnitGroups(
})
}
if (row.depth > 0 && current.units.length > 0) {
- current.units.at(-1)!.worktreeIds.push(row.worktree.id)
+ current.units.at(-1)!.worktreeIds.push(worktreeKey)
continue
}
- current.units.push({ worktreeId: row.worktree.id, worktreeIds: [row.worktree.id] })
+ current.units.push({ worktreeId: worktreeKey, worktreeIds: [worktreeKey] })
}
return groups
diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/dragged-worktree-copies.ts b/src/renderer/src/components/sidebar/worktree-list/drag/dragged-worktree-copies.ts
index 6c27947c5de..5a7c1ae2fef 100644
--- a/src/renderer/src/components/sidebar/worktree-list/drag/dragged-worktree-copies.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/drag/dragged-worktree-copies.ts
@@ -27,12 +27,17 @@ export function uniqueDraggedIds(copies: DraggedWorktreeCopies): string[] {
return [...new Set(copies.map((copy) => copy.id))]
}
+/** Host identities: the sidebar's drag slots and manual ranks keep same-id copies apart. */
+export function uniqueDraggedKeys(copies: DraggedWorktreeCopies): string[] {
+ return [...new Set(copies.map(getWorktreeHostIdentity))]
+}
+
/** Which rows a drop may write for an id; empty means refuse, never guess a host. */
export type DropWriteRows = {
/** Status is each card's own: the dragged copies (read fresh), else the id's only row. */
status: (worktreeId: string) => readonly Worktree[]
- /** Manual order is ranked per id (the catalog drops a rank its copies disagree on), so every copy. */
- order: (worktreeId: string) => readonly Worktree[]
+ /** Manual order ranks each card by host identity, so only that copy. */
+ orderByKey: (key: string) => readonly Worktree[]
}
export function dropWriteRows(
@@ -47,6 +52,20 @@ export function dropWriteRows(
]) {
rowsById.set(row.id, [...(rowsById.get(row.id) ?? []), row])
}
+ // Why lazy: board hover previews build these rows every pointer frame but never write by key.
+ let rowsByKey: Map<string, Worktree[]> | null = null
+ const getRowsByKey = (): Map<string, Worktree[]> => {
+ if (!rowsByKey) {
+ rowsByKey = new Map()
+ for (const rows of rowsById.values()) {
+ for (const row of rows) {
+ const key = getWorktreeHostIdentity(row)
+ rowsByKey.set(key, [...(rowsByKey.get(key) ?? []), row])
+ }
+ }
+ }
+ return rowsByKey
+ }
const dragged = new Set((copies ?? []).map(getWorktreeHostIdentity))
const draggedIds = new Set((copies ?? []).map((copy) => copy.id))
return {
@@ -57,7 +76,7 @@ export function dropWriteRows(
}
return rows.length === 1 ? rows : []
},
- order: (worktreeId) => rowsById.get(worktreeId) ?? []
+ orderByKey: (key) => getRowsByKey().get(key) ?? []
}
}
@@ -66,7 +85,8 @@ export function collectDropWrites(args: {
statusIds: readonly string[]
status: WorkspaceStatus | null
workspaceStatuses: readonly WorkspaceStatusDefinition[]
- orderUpdates: ReadonlyMap<string, { manualOrder: number }>
+ /** Manual ranks keyed by host identity. */
+ orderUpdatesByKey: ReadonlyMap<string, { manualOrder: number }>
}): WorktreeMetaBatchUpdate[] {
const writes = new Map<string, WorktreeMetaBatchUpdate>()
const write = (row: Worktree, updates: Partial<WorktreeMeta>): void => {
@@ -89,8 +109,8 @@ export function collectDropWrites(args: {
}
}
}
- for (const [worktreeId, manualOrder] of args.orderUpdates) {
- for (const row of args.rowsFor.order(worktreeId)) {
+ for (const [key, manualOrder] of args.orderUpdatesByKey) {
+ for (const row of args.rowsFor.orderByKey(key)) {
write(row, manualOrder)
}
}
diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/drop-commit-context.ts b/src/renderer/src/components/sidebar/worktree-list/drag/drop-commit-context.ts
index d25568e6df6..1a1365b9443 100644
--- a/src/renderer/src/components/sidebar/worktree-list/drag/drop-commit-context.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/drag/drop-commit-context.ts
@@ -29,7 +29,8 @@ export type ShouldShowWorkspaceBoardDropIndicator = (
export type WorktreeReorderArgs = {
groups: readonly WorktreeDragGroup[]
sourceGroupKey: string
- draggedIds: readonly string[]
+ /** Host identities, as the sidebar's drag groups key their members. */
+ draggedKeys: readonly string[]
dropIndex: number
draggedCopies?: DraggedWorktreeCopies
}
diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/groups.ts b/src/renderer/src/components/sidebar/worktree-list/drag/groups.ts
index 786d06effbc..4da773f52f6 100644
--- a/src/renderer/src/components/sidebar/worktree-list/drag/groups.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/drag/groups.ts
@@ -1,12 +1,14 @@
import { ALL_GROUP_KEY, PINNED_GROUP_KEY } from '../../../../../../shared/sidebar-list/group-keys'
-import { getNaturalWorktreeIds } from '../../natural-worktree-ids'
+import { getNaturalWorktreeKeys } from '../../natural-worktree-keys'
+import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity'
import type { HostSectionRow } from '../../../../../../shared/sidebar-list/host-section-rows'
import type { WorktreeDragGroup } from '../../worktree-manual-order'
+/** Group members are host identities: same-id copies on two machines are separate cards to reorder. */
export function getWorktreeDragGroups(rows: HostSectionRow[]): WorktreeDragGroup[] {
const groups: WorktreeDragGroup[] = []
let current: { key: string; ids: string[] } | null = null
- const naturalWorktreeIds = getNaturalWorktreeIds(rows)
+ const naturalWorktreeKeys = getNaturalWorktreeKeys(rows)
for (const row of rows) {
if (row.type === 'header') {
@@ -23,14 +25,15 @@ export function getWorktreeDragGroups(rows: HostSectionRow[]): WorktreeDragGroup
) {
continue
}
- if (row.sectionKey === PINNED_GROUP_KEY && naturalWorktreeIds.has(row.worktree.id)) {
+ const worktreeKey = getWorktreeHostIdentity(row.worktree)
+ if (row.sectionKey === PINNED_GROUP_KEY && naturalWorktreeKeys.has(worktreeKey)) {
continue
}
if (!current) {
current = { key: ALL_GROUP_KEY, ids: [] }
groups.push({ key: current.key, worktreeIds: current.ids })
}
- current.ids.push(row.worktree.id)
+ current.ids.push(worktreeKey)
}
return groups.filter((group) => group.worktreeIds.length > 0)
@@ -43,7 +46,7 @@ export function getWorktreeDragIndexes(rows: readonly HostSectionRow[]): {
const groupKeyByRowKey = new Map<string, string>()
const groupIndexByRowKey = new Map<string, number>()
const groupIndexes = new Map<string, number>()
- const naturalWorktreeIds = getNaturalWorktreeIds(rows)
+ const naturalWorktreeKeys = getNaturalWorktreeKeys(rows)
for (const row of rows) {
if (row.type === 'header') {
groupIndexes.set(row.key, 0)
@@ -52,7 +55,10 @@ export function getWorktreeDragIndexes(rows: readonly HostSectionRow[]): {
if (row.type !== 'item') {
continue
}
- if (row.sectionKey === PINNED_GROUP_KEY && naturalWorktreeIds.has(row.worktree.id)) {
+ if (
+ row.sectionKey === PINNED_GROUP_KEY &&
+ naturalWorktreeKeys.has(getWorktreeHostIdentity(row.worktree))
+ ) {
continue
}
const index = groupIndexes.get(row.sectionKey) ?? 0
diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/pointer-commit.ts b/src/renderer/src/components/sidebar/worktree-list/drag/pointer-commit.ts
index eacdaa0207a..1a94fee00b0 100644
--- a/src/renderer/src/components/sidebar/worktree-list/drag/pointer-commit.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/drag/pointer-commit.ts
@@ -104,7 +104,7 @@ export function commitWorktreePointerDrop(args: PointerDropCommitArgs): void {
? ctx.computeWorktreeStatusDrop({
pointerY: event.clientY,
status: preferredStatusTarget.status,
- draggedIds: drag.reorderDraggedIds
+ draggedKeys: drag.reorderDraggedKeys
})
: null
commitStatusOrPinDrop(args, preferredStatusTarget, statusDrop?.dropIndex ?? null)
@@ -116,7 +116,7 @@ export function commitWorktreePointerDrop(args: PointerDropCommitArgs): void {
ctx.onReorderWorktrees({
groups: ctx.worktreeDragGroups,
sourceGroupKey: drag.sourceGroupKey,
- draggedIds: drag.reorderDraggedIds,
+ draggedKeys: drag.reorderDraggedKeys,
dropIndex: getFullDropIndexForWorktreeDragUnit({
groups: ctx.worktreeDragUnitGroups,
sourceGroupKey: drag.sourceGroupKey,
@@ -132,7 +132,7 @@ export function commitWorktreePointerDrop(args: PointerDropCommitArgs): void {
? ctx.computeWorktreeStatusDrop({
pointerY: event.clientY,
status: preferredStatusTarget.status,
- draggedIds: drag.reorderDraggedIds
+ draggedKeys: drag.reorderDraggedKeys
})
: null
const { target, preview: statusDrop } = resolveWorktreeSidebarStatusDropCommitTarget({
diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/pointer-flush.test.ts b/src/renderer/src/components/sidebar/worktree-list/drag/pointer-flush.test.ts
index 0029e39b06c..394abde9c0b 100644
--- a/src/renderer/src/components/sidebar/worktree-list/drag/pointer-flush.test.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/drag/pointer-flush.test.ts
@@ -41,10 +41,12 @@ function setup() {
currentX: 100,
currentY: 300,
worktreeId: 'child',
+ worktreeKey: 'child',
draggedIds: ['child'],
draggedCopies: [],
reorderDraggedIds: ['child'],
- reorderUnitDraggedIds: ['child'],
+ reorderDraggedKeys: ['child'],
+ reorderUnitDraggedKeys: ['child'],
sourceGroupKey: 'repo',
rects: [],
active: true,
diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/pointer-flush.ts b/src/renderer/src/components/sidebar/worktree-list/drag/pointer-flush.ts
index ff6371bb7b5..29b07e410a7 100644
--- a/src/renderer/src/components/sidebar/worktree-list/drag/pointer-flush.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/drag/pointer-flush.ts
@@ -46,7 +46,7 @@ function showStatusHoverWithoutInsertionLine(
? ctx.computeWorktreeStatusDrop({
pointerY: drag.currentY,
status: target.status,
- draggedIds: drag.reorderDraggedIds
+ draggedKeys: drag.reorderDraggedKeys
})
: null
updateLatestWorktreeStatusDropTarget(drag, target, statusDrop)
diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/row-state.ts b/src/renderer/src/components/sidebar/worktree-list/drag/row-state.ts
index c1937e58d37..4a39175d9be 100644
--- a/src/renderer/src/components/sidebar/worktree-list/drag/row-state.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/drag/row-state.ts
@@ -8,6 +8,7 @@ import type {
} from '../../worktree-sidebar-drop-preview'
export type WorktreeRowDragState = {
+ /** Host identity of the dragged card; preview offsets are keyed the same way. */
draggingWorktreeId: string | null
sourceGroupKey: string | null
dropIndex: number | null
@@ -37,10 +38,13 @@ export type WorktreePointerDrag = {
currentX: number
currentY: number
worktreeId: string
+ /** Host identity of the pressed card. */
+ worktreeKey: string
draggedIds: readonly string[]
draggedCopies: DraggedWorktreeCopies
reorderDraggedIds: readonly string[]
- reorderUnitDraggedIds: readonly string[]
+ reorderDraggedKeys: readonly string[]
+ reorderUnitDraggedKeys: readonly string[]
sourceGroupKey: string
rects: readonly WorktreeSidebarDragRect[]
active: boolean
diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/status-drop-twin-host.test.ts b/src/renderer/src/components/sidebar/worktree-list/drag/status-drop-twin-host.test.ts
index 9e8e547fe27..01d2df58375 100644
--- a/src/renderer/src/components/sidebar/worktree-list/drag/status-drop-twin-host.test.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/drag/status-drop-twin-host.test.ts
@@ -11,6 +11,8 @@ import { DEFAULT_WORKSPACE_STATUSES } from '../../../../../../shared/workspace-s
import { makeFolderWorkspace, makeWorktree } from '../../../worktree-jump-palette-test-fixtures'
import { folderWorkspaceKey } from '../../../../../../shared/workspace-scope'
import { buildWorktreeManualOrderCatalog } from '../../worktree-manual-order-catalog'
+import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity'
+import { folderWorkspaceToWorktree } from '../../../../../../shared/folder-workspace-worktree'
import { useWorktreeStatusMutations } from './use-status-mutations'
import { useWorktreeDropCommitContext } from './use-drop-commit-context'
import { useWorktreeDragSession } from './use-session'
@@ -69,6 +71,7 @@ function writtenHosts(
}
const copyOf = (row: Worktree) => [{ id: row.id, hostId: row.hostId }]
+const keyOf = getWorktreeHostIdentity
describe('a sidebar drop on one card of a twin', () => {
beforeEach(() => {
@@ -97,35 +100,45 @@ describe('a sidebar drop on one card of a twin', () => {
expect(writtenHosts(TWIN_ID, 'workspaceStatus')).toEqual([dragged.hostId])
})
- // Manual order is ranked per id: the catalog drops a rank the copies disagree on.
- it("writes a dragged twin's new rank to every copy so the id keeps one rank", async () => {
- const { dragged } = seedTwins()
+ // The sidebar ranks each card: same-id copies on two machines reorder independently.
+ it("writes a dragged twin's new rank to that copy only", async () => {
+ const { local, ssh, dragged } = seedTwins()
+ const other = useAppStore.getState().worktreesByRepo[REPO_ID]!.find((w) => w.id === OTHER_ID)!
+ const ranked = { [keyOf(local)]: 300, [keyOf(other)]: 200, [keyOf(ssh)]: 100 }
+ useAppStore.setState({
+ worktreesByRepo: {
+ [REPO_ID]: useAppStore
+ .getState()
+ .worktreesByRepo[REPO_ID]!.map((row) => ({ ...row, manualOrder: ranked[keyOf(row)] }))
+ }
+ })
const mutations = renderMutations()
await act(async () => {
mutations.current.reorderWorktrees({
- groups: [{ key: 'all', worktreeIds: [OTHER_ID, TWIN_ID] }],
+ groups: [{ key: 'all', worktreeIds: [keyOf(local), keyOf(other), keyOf(ssh)] }],
sourceGroupKey: 'all',
- draggedIds: [TWIN_ID],
- dropIndex: 0,
+ draggedKeys: [keyOf(dragged)],
+ dropIndex: dragged === ssh ? 1 : 3,
draggedCopies: copyOf(dragged)
})
})
- expect(writtenHosts(TWIN_ID, 'manualOrder')).toEqual(['local', SSH])
+ expect(writtenHosts(TWIN_ID, 'manualOrder')).toEqual([dragged.hostId])
+ expect(writtenHosts(OTHER_ID)).toEqual([])
})
- it('re-ranks every copy of a twin sibling, not whichever one the id-keyed map kept', async () => {
- seedTwins()
+ it('ranks every copy of a twin when a drop first materializes the order', async () => {
+ const { local, ssh } = seedTwins()
const mutations = renderMutations()
const other = useAppStore.getState().worktreesByRepo[REPO_ID]!.find((w) => w.id === OTHER_ID)!
await act(async () => {
- // Drag the unique row between the twin's cards; the twin is only re-ranked, not dragged.
+ // Drag the unique row above both twin cards; neither twin is dragged, but every card gets a rank.
mutations.current.reorderWorktrees({
- groups: [{ key: 'all', worktreeIds: [TWIN_ID, OTHER_ID] }],
+ groups: [{ key: 'all', worktreeIds: [keyOf(local), keyOf(ssh), keyOf(other)] }],
sourceGroupKey: 'all',
- draggedIds: [OTHER_ID],
+ draggedKeys: [keyOf(other)],
dropIndex: 0,
draggedCopies: copyOf(other)
})
@@ -159,9 +172,9 @@ describe('a sidebar drop on one card of a twin', () => {
await act(async () => {
result.current.reorderWorktrees({
- groups: [{ key: 'all', worktreeIds: [a.id, b.id] }],
+ groups: [{ key: 'all', worktreeIds: [keyOf(a), keyOf(b)] }],
sourceGroupKey: 'all',
- draggedIds: [b.id],
+ draggedKeys: [keyOf(b)],
dropIndex: 0,
draggedCopies: copyOf(b)
})
@@ -191,9 +204,9 @@ describe('a sidebar drop on one card of a twin', () => {
await act(async () => {
mutations.current.reorderWorktrees({
- groups: [{ key: 'all', worktreeIds: [b.id, a.id] }],
+ groups: [{ key: 'all', worktreeIds: [keyOf(b), keyOf(a)] }],
sourceGroupKey: 'all',
- draggedIds: [b.id],
+ draggedKeys: [keyOf(b)],
dropIndex: 2,
draggedCopies: copyOf(b)
})
@@ -206,8 +219,8 @@ describe('a sidebar drop on one card of a twin', () => {
return write ? { ...row, ...write.updates } : row
})
expect(
- buildWorktreeManualOrderCatalog({ worktrees: applied, folderWorkspaces: [] }).orderedIds
- ).toEqual([a.id, b.id])
+ buildWorktreeManualOrderCatalog({ worktrees: applied, folderWorkspaces: [] }).orderedKeys
+ ).toEqual([keyOf(a), keyOf(b), keyOf(aOnSsh)])
})
it('ranks a selected folder workspace dragged together with a git card', async () => {
@@ -221,13 +234,14 @@ describe('a sidebar drop on one card of a twin', () => {
updateWorktreesMeta
})
const folderId = folderWorkspaceKey(folder.id)
+ const folderKey = keyOf(folderWorkspaceToWorktree(folder))
const mutations = renderMutations()
await act(async () => {
mutations.current.reorderWorktrees({
- groups: [{ key: 'all', worktreeIds: [a.id, b.id, folderId] }],
+ groups: [{ key: 'all', worktreeIds: [keyOf(a), keyOf(b), folderKey] }],
sourceGroupKey: 'all',
- draggedIds: [b.id, folderId],
+ draggedKeys: [keyOf(b), folderKey],
dropIndex: 0,
draggedCopies: [...copyOf(b), { id: folderId, hostId: 'local' }]
})
@@ -378,7 +392,7 @@ describe('a sidebar drop on one card of a twin', () => {
ctx.onReorderWorktrees({
groups: [],
sourceGroupKey: 'all',
- draggedIds: [TWIN_ID],
+ draggedKeys: [keyOf({ id: TWIN_ID, hostId: SSH })],
dropIndex: 0
})
diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/twin-reorder.test.ts b/src/renderer/src/components/sidebar/worktree-list/drag/twin-reorder.test.ts
new file mode 100644
index 00000000000..5ce25d85bef
--- /dev/null
+++ b/src/renderer/src/components/sidebar/worktree-list/drag/twin-reorder.test.ts
@@ -0,0 +1,217 @@
+import { describe, expect, it } from 'vitest'
+import type { ExecutionHostId } from '../../../../../../shared/execution-host'
+import type { Repo } from '../../../../../../shared/repo-types'
+import type { Worktree } from '../../../../../../shared/worktree/types'
+import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity'
+import { planSidebarRows } from '../../../../../../shared/sidebar-list/sidebar-row-plan'
+import { createHostScopedRepoOf } from '../../../../../../shared/sidebar-list/sidebar-feed-index'
+import {
+ NO_LIVE_SMART_SORT_SOURCES,
+ rankWorktreesForSort
+} from '../../../../../../shared/sidebar-list/smart-sort'
+import { cloneDefaultWorkspaceStatuses } from '../../../../../../shared/workspace-statuses'
+import { computeVisibleWorktrees } from '../../compute-visible-worktrees'
+import { repo, worktree } from '../../worktree-list-groups-test-fixtures'
+import {
+ buildManualOrderUpdatesForGroupDrop,
+ buildManualOrderUpdatesForVisibleGroups
+} from '../../worktree-manual-order'
+import { buildWorktreeManualOrderCatalog } from '../../worktree-manual-order-catalog'
+import { collectDropWrites, dropWriteRows } from './dragged-worktree-copies'
+import { getWorktreeDragGroups } from './groups'
+
+// Per-workspace VMs cloned from one base share the repo id and path, so every primary has the same id.
+const REPO_ID = 'repo-teal'
+const TWIN_ID = `${REPO_ID}::/home/dev/teal`
+const HOSTS = ['ssh:vm-a', 'ssh:vm-b', 'ssh:vm-c'] as const satisfies readonly ExecutionHostId[]
+const repos: Repo[] = HOSTS.map((hostId) => ({
+ ...repo,
+ id: REPO_ID,
+ path: '/home/dev/teal',
+ displayName: 'teal',
+ connectionId: hostId.slice('ssh:'.length)
+}))
+const repoMap = new Map([[REPO_ID, repos[0]!]])
+
+function primary(hostId: ExecutionHostId, manualOrder: number): Worktree {
+ return {
+ ...worktree,
+ id: TWIN_ID,
+ repoId: REPO_ID,
+ path: '/home/dev/teal',
+ hostId,
+ isMainWorktree: true,
+ displayName: hostId,
+ manualOrder
+ }
+}
+
+/** The window's Manual path: rank, filter, plan rows, then read the cards' hosts in order. */
+function renderedHosts(worktrees: Worktree[]): string[] {
+ const sortedKeys = rankWorktreesForSort({
+ worktrees: [...worktrees],
+ sortBy: 'manual',
+ latched: false,
+ repoMap,
+ now: 0,
+ sources: NO_LIVE_SMART_SORT_SOURCES
+ }).sorted.map(getWorktreeHostIdentity)
+ const visible = computeVisibleWorktrees({ [REPO_ID]: worktrees }, sortedKeys, {
+ filterRepoIds: [],
+ showSleepingWorkspaces: true,
+ tabsByWorktree: {},
+ ptyIdsByTabId: {},
+ worktreeIdsWithLiveAgent: new Set(),
+ hideDefaultBranchWorkspace: false,
+ hideAutomationGeneratedWorkspaces: false,
+ hideCliCreatedWorkspaces: false,
+ hideDetachedHeadWorkspaces: false,
+ hideWorkspacesFromOtherDevices: false,
+ pairedDeviceIdsByEnvironment: new Map(),
+ repoMap,
+ workspaceHostScope: 'all',
+ defaultHostId: 'local',
+ worktreeLineageById: {},
+ sortedByHostIdentity: true
+ })
+ return planRows(visible).flatMap((row) => (row.type === 'item' ? [row.worktree.hostId!] : []))
+}
+
+function planRows(worktrees: Worktree[]) {
+ return planSidebarRows({
+ groupBy: 'repo',
+ worktrees,
+ repoMap,
+ repoOfWorktree: createHostScopedRepoOf(repos, repoMap),
+ prGroupOf: () => 'in-progress',
+ workspaceStatuses: cloneDefaultWorkspaceStatuses(),
+ projectOrderBy: 'manual',
+ lineageById: {},
+ worktreeMap: new Map(worktrees.map((row) => [row.id, row])),
+ nestLineage: false,
+ projectGroups: [],
+ placeholderRepoIds: new Set(),
+ importedWorktreesByRepo: new Map(),
+ newExternalWorktreesInboxByRepo: new Map(),
+ pendingCreations: [],
+ folderWorkspaces: [],
+ defaultHostId: 'local',
+ pinnedDisplayPolicy: 'single-location',
+ filterRepoIds: []
+ }).render(new Set())
+}
+
+/** Drop one card at a slot the way the sidebar commits it, and apply the writes it would send. */
+function dropCard(worktrees: Worktree[], hostId: ExecutionHostId, dropIndex: number) {
+ const groups = getWorktreeDragGroups(planRows(worktrees))
+ const catalog = buildWorktreeManualOrderCatalog({ worktrees, folderWorkspaces: [] })
+ const dragged = worktrees.find((row) => row.hostId === hostId)!
+ const result = buildManualOrderUpdatesForVisibleGroups({
+ groups,
+ sourceGroupKey: groups[0]!.key,
+ draggedIds: [getWorktreeHostIdentity(dragged)],
+ dropIndex,
+ now: 1_000_000,
+ rankByWorktreeId: catalog.rankByKey,
+ allWorktreeIds: catalog.orderedKeys
+ })
+ const writes = collectDropWrites({
+ rowsFor: dropWriteRows(
+ // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: dropWriteRows reads only these two slices.
+ { worktreesByRepo: { [REPO_ID]: worktrees }, folderWorkspaces: [] } as never,
+ [{ id: dragged.id, hostId: dragged.hostId }]
+ ),
+ statusIds: [],
+ status: null,
+ workspaceStatuses: cloneDefaultWorkspaceStatuses(),
+ orderUpdatesByKey: result.updates
+ })
+ const applied = worktrees.map((row) => {
+ const write = writes.find((entry) => entry.executionHostId === row.hostId)
+ return write ? { ...row, ...write.updates } : row
+ })
+ return { groups, writes, applied }
+}
+
+describe('reordering same-id primaries on separate machines', () => {
+ const twins = [primary('ssh:vm-a', 300), primary('ssh:vm-b', 200), primary('ssh:vm-c', 100)]
+
+ it('renders each copy at its own rank', () => {
+ expect(renderedHosts(twins)).toEqual(['ssh:vm-a', 'ssh:vm-b', 'ssh:vm-c'])
+ expect(renderedHosts([twins[2]!, twins[0]!, twins[1]!])).toEqual([
+ 'ssh:vm-a',
+ 'ssh:vm-b',
+ 'ssh:vm-c'
+ ])
+ })
+
+ it('gives every copy its own drag slot', () => {
+ const { groups } = dropCard(twins, 'ssh:vm-c', 0)
+ expect(groups[0]!.worktreeIds).toEqual(HOSTS.map((hostId) => `${hostId}|${TWIN_ID}`))
+ })
+
+ it('moves the dropped copy to the top and writes only that copy', () => {
+ const { writes, applied } = dropCard(twins, 'ssh:vm-c', 0)
+
+ expect(writes.map((entry) => entry.executionHostId)).toEqual(['ssh:vm-c'])
+ expect(renderedHosts(applied)).toEqual(['ssh:vm-c', 'ssh:vm-a', 'ssh:vm-b'])
+ })
+
+ it('moves a copy down past its twins', () => {
+ const { applied } = dropCard(twins, 'ssh:vm-a', 3)
+
+ expect(renderedHosts(applied)).toEqual(['ssh:vm-b', 'ssh:vm-c', 'ssh:vm-a'])
+ })
+
+ it('materializes a rank for every copy when none has one yet', () => {
+ const unranked = twins.map(({ manualOrder: _manualOrder, ...row }, index) => ({
+ ...row,
+ sortOrder: 30 - index * 10
+ }))
+ const { writes, applied } = dropCard(unranked, 'ssh:vm-b', 0)
+
+ expect(writes.map((entry) => entry.executionHostId).sort()).toEqual([...HOSTS])
+ expect(renderedHosts(applied)).toEqual(['ssh:vm-b', 'ssh:vm-a', 'ssh:vm-c'])
+ })
+
+ it('places a board drop next to the lower copy, writing only the dragged card', () => {
+ // Lane a, vm-a copy, b, c, vm-b copy, d: the copies sit apart after a sidebar reorder.
+ const card = (name: string, manualOrder: number): Worktree => ({
+ ...worktree,
+ id: `${REPO_ID}::/w/${name}`,
+ repoId: REPO_ID,
+ path: `/w/${name}`,
+ hostId: 'ssh:vm-a',
+ displayName: name,
+ manualOrder
+ })
+ const lane = [
+ card('a', 0),
+ primary('ssh:vm-a', -1_000),
+ card('b', -2_000),
+ card('c', -3_000),
+ primary('ssh:vm-b', -3_500),
+ card('d', -4_000)
+ ]
+ const catalog = buildWorktreeManualOrderCatalog({ worktrees: lane, folderWorkspaces: [] })
+ const drop = (dropIndex: number) =>
+ buildManualOrderUpdatesForGroupDrop({
+ groups: [{ key: 'todo', worktreeIds: lane.map(getWorktreeHostIdentity) }],
+ targetGroupKey: 'todo',
+ draggedIds: [getWorktreeHostIdentity(lane[0]!)],
+ dropIndex,
+ now: 2_000_000,
+ rankByWorktreeId: catalog.rankByKey,
+ allWorktreeIds: catalog.orderedKeys
+ })
+
+ // Just below the vm-b copy: between it and d.
+ expect([...drop(5).updates]).toEqual([
+ [getWorktreeHostIdentity(lane[0]!), { manualOrder: -3_750 }]
+ ])
+ // Between c and the vm-b copy: still sparse, no full reindex.
+ expect([...drop(4).updates]).toEqual([
+ [getWorktreeHostIdentity(lane[0]!), { manualOrder: -3_250 }]
+ ])
+ })
+})
diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/use-document-drop.ts b/src/renderer/src/components/sidebar/worktree-list/drag/use-document-drop.ts
index 93c7ea43b3e..046c5418568 100644
--- a/src/renderer/src/components/sidebar/worktree-list/drag/use-document-drop.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/drag/use-document-drop.ts
@@ -48,7 +48,7 @@ export function useWorktreeDocumentDrop(args: {
? ctx.computeWorktreeStatusDrop({
pointerY: event.clientY,
status: target.status,
- draggedIds: session.reorderDraggedIds
+ draggedKeys: session.reorderDraggedKeys
})
: null
if (target.status && statusDrop) {
@@ -72,7 +72,7 @@ export function useWorktreeDocumentDrop(args: {
ctx.onReorderWorktrees({
groups: ctx.worktreeDragGroups,
sourceGroupKey: session.sourceGroupKey,
- draggedIds: session.reorderDraggedIds,
+ draggedKeys: session.reorderDraggedKeys,
dropIndex: getFullDropIndexForWorktreeDragUnit({
groups: ctx.worktreeDragUnitGroups,
sourceGroupKey: session.sourceGroupKey,
diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/use-lineage-drop-commit.ts b/src/renderer/src/components/sidebar/worktree-list/drag/use-lineage-drop-commit.ts
index 444db953bcb..423e3092f67 100644
--- a/src/renderer/src/components/sidebar/worktree-list/drag/use-lineage-drop-commit.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/drag/use-lineage-drop-commit.ts
@@ -9,6 +9,7 @@ import { isEligibleWorktreeParent } from '../../worktree-parent-candidates'
import { getCyclicProjectedWorktreeLineageIds } from '../../../../../../shared/sidebar-list/worktree-lineage-projection'
import { getReorderedWorktreeIdsToUnnest } from '../../worktree-lineage-drag-drop'
import { unnestWorktrees } from '../../worktree-unnest'
+import { getWorktreeIdFromHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity'
import type { WorktreeDragGroup } from '../../worktree-manual-order'
import type { WorktreeSidebarLineageDropTarget } from './row-state'
@@ -95,7 +96,8 @@ export function useWorktreeLineageDropCommit(args: {
}
const ids = getReorderedWorktreeIdsToUnnest({
draggedIds: unnestArgs.draggedIds,
- sourceGroupIds: sourceGroup.worktreeIds,
+ // Lineage is keyed by worktree id; drag groups key members by host identity.
+ sourceGroupIds: sourceGroup.worktreeIds.map(getWorktreeIdFromHostIdentity),
lineageById: worktreeLineageById,
worktreeMap,
cyclicLineageIds
diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/use-native-autoscroll.ts b/src/renderer/src/components/sidebar/worktree-list/drag/use-native-autoscroll.ts
index 983dea2f1a1..510dddb0396 100644
--- a/src/renderer/src/components/sidebar/worktree-list/drag/use-native-autoscroll.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/drag/use-native-autoscroll.ts
@@ -64,7 +64,7 @@ export function useWorktreeNativeDragAutoscroll(args: {
? ctx.computeWorktreeStatusDrop({
pointerY: point.clientY,
status: target.status,
- draggedIds: dragSession.reorderDraggedIds
+ draggedKeys: dragSession.reorderDraggedKeys
})
: null
if (statusDrop) {
diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/use-native-drag.ts b/src/renderer/src/components/sidebar/worktree-list/drag/use-native-drag.ts
index 21abcfc03d5..be15c251bdb 100644
--- a/src/renderer/src/components/sidebar/worktree-list/drag/use-native-drag.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/drag/use-native-drag.ts
@@ -1,4 +1,8 @@
-import { uniqueDraggedIds, type DraggedWorktreeCopies } from './dragged-worktree-copies'
+import {
+ uniqueDraggedIds,
+ uniqueDraggedKeys,
+ type DraggedWorktreeCopies
+} from './dragged-worktree-copies'
import { useCallback } from 'react'
import type React from 'react'
import { getWorkspaceKanbanSidebarDropTarget } from '../../workspace-kanban-sidebar-drop'
@@ -47,28 +51,38 @@ export function useWorktreeNativeDrag(args: {
draggedCopies: DraggedWorktreeCopies
) => {
const draggedIds = draggedCopies.map((copy) => copy.id)
- const sourceGroupKey =
- ctx.worktreeDragGroups.find((group) => group.worktreeIds.includes(worktreeId))?.key ?? null
- if (!sourceGroupKey) {
+ // Why the row's identity: a selection can hold both same-id copies; the pressed card is the one dragged.
+ const worktreeKey =
+ event.currentTarget
+ .closest<HTMLElement>('[data-worktree-host-identity]')
+ ?.getAttribute('data-worktree-host-identity') ??
+ uniqueDraggedKeys(draggedCopies.filter((copy) => copy.id === worktreeId))[0]
+ const sourceGroupKey = worktreeKey
+ ? (ctx.worktreeDragGroups.find((group) => group.worktreeIds.includes(worktreeKey))?.key ??
+ null)
+ : null
+ if (!worktreeKey || !sourceGroupKey) {
return
}
const reorderDraggedCopies = session.getReorderDraggedCopies(draggedCopies)
const reorderDraggedIds = uniqueDraggedIds(reorderDraggedCopies)
- const reorderUnitDraggedIds = session.getReorderUnitDraggedIds(
+ const reorderDraggedKeys = uniqueDraggedKeys(reorderDraggedCopies)
+ const reorderUnitDraggedKeys = session.getReorderUnitDraggedKeys(
sourceGroupKey,
- reorderDraggedIds
+ reorderDraggedKeys
)
const rects = scrollRef.current
? getWorktreeSidebarDragRectsForGroup(scrollRef.current, sourceGroupKey)
: []
const sourceRect = event.currentTarget.getBoundingClientRect()
session.worktreeDragSessionRef.current = {
- draggingWorktreeId: worktreeId,
+ draggingWorktreeId: worktreeKey,
sourceGroupKey,
draggedIds,
draggedCopies: reorderDraggedCopies,
reorderDraggedIds,
- reorderUnitDraggedIds,
+ reorderDraggedKeys,
+ reorderUnitDraggedKeys,
rects,
grab: getWorktreeSidebarDragGrab({
offsetY: event.clientY - sourceRect.top,
@@ -77,7 +91,7 @@ export function useWorktreeNativeDrag(args: {
anchor: null
}
setWorktreeDragState({
- draggingWorktreeId: worktreeId,
+ draggingWorktreeId: worktreeKey,
sourceGroupKey,
lineageDropTargetId: null,
dropIndex: null,
@@ -124,7 +138,7 @@ export function useWorktreeNativeDrag(args: {
? ctx.computeWorktreeStatusDrop({
pointerY: event.clientY,
status: target.status,
- draggedIds: dragSession.reorderDraggedIds
+ draggedKeys: dragSession.reorderDraggedKeys
})
: null
if (statusDrop) {
@@ -197,7 +211,7 @@ export function useWorktreeNativeDrag(args: {
? ctx.computeWorktreeStatusDrop({
pointerY: event.clientY,
status: target.status,
- draggedIds: dragSession.reorderDraggedIds
+ draggedKeys: dragSession.reorderDraggedKeys
})
: null
if (target.status && statusDrop) {
@@ -219,7 +233,7 @@ export function useWorktreeNativeDrag(args: {
ctx.onReorderWorktrees({
groups: ctx.worktreeDragGroups,
sourceGroupKey: dragSession.sourceGroupKey,
- draggedIds: dragSession.reorderDraggedIds,
+ draggedKeys: dragSession.reorderDraggedKeys,
dropIndex: getFullDropIndexForWorktreeDragUnit({
groups: ctx.worktreeDragUnitGroups,
sourceGroupKey: dragSession.sourceGroupKey,
diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/use-pointer-drag.ts b/src/renderer/src/components/sidebar/worktree-list/drag/use-pointer-drag.ts
index 93be97dcf43..fad88cf7baa 100644
--- a/src/renderer/src/components/sidebar/worktree-list/drag/use-pointer-drag.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/drag/use-pointer-drag.ts
@@ -22,7 +22,11 @@ import { useWorktreePointerDragAutoscroll } from './use-pointer-autoscroll'
import { useWorktreePointerDragWindowEvents } from './use-pointer-window-events'
import { flushWorktreePointerDragFrame } from './pointer-flush'
import { EMPTY_WORKTREE_DRAG_PREVIEW_OFFSETS, type WorktreePointerDrag } from './row-state'
-import { draggedWorktreeCopiesOf, uniqueDraggedIds } from './dragged-worktree-copies'
+import {
+ draggedWorktreeCopiesOf,
+ uniqueDraggedIds,
+ uniqueDraggedKeys
+} from './dragged-worktree-copies'
export function useWorktreePointerDrag(args: {
ctx: WorktreeDropCommitContext
@@ -121,19 +125,20 @@ export function useWorktreePointerDrag(args: {
suppressWorktreeClickUntilRef.current = window.performance.now() + 500
setSidebarPointerDragDocumentStyles(true)
session.worktreeDragSessionRef.current = {
- draggingWorktreeId: drag.worktreeId,
+ draggingWorktreeId: drag.worktreeKey,
sourceGroupKey: drag.sourceGroupKey,
draggedIds: drag.draggedIds,
draggedCopies: drag.draggedCopies,
reorderDraggedIds: drag.reorderDraggedIds,
- reorderUnitDraggedIds: drag.reorderUnitDraggedIds,
+ reorderDraggedKeys: drag.reorderDraggedKeys,
+ reorderUnitDraggedKeys: drag.reorderUnitDraggedKeys,
rects: drag.rects,
// Hit-test the floating card’s visual offset rather than the raw pointer.
grab: getWorktreeSidebarDragGrab({ offsetY, height }),
anchor: null
}
setWorktreeDragState({
- draggingWorktreeId: drag.worktreeId,
+ draggingWorktreeId: drag.worktreeKey,
sourceGroupKey: drag.sourceGroupKey,
lineageDropTargetId: null,
dropIndex: null,
@@ -187,9 +192,10 @@ export function useWorktreePointerDrag(args: {
const draggedIds = draggedCopies.map((copy) => copy.id)
const reorderDraggedCopies = session.getReorderDraggedCopies(draggedCopies)
const reorderDraggedIds = uniqueDraggedIds(reorderDraggedCopies)
- const reorderUnitDraggedIds = session.getReorderUnitDraggedIds(
+ const reorderDraggedKeys = uniqueDraggedKeys(reorderDraggedCopies)
+ const reorderUnitDraggedKeys = session.getReorderUnitDraggedKeys(
sourceGroupKey,
- reorderDraggedIds
+ reorderDraggedKeys
)
worktreePointerDragRef.current = {
pointerId: event.pointerId,
@@ -199,10 +205,12 @@ export function useWorktreePointerDrag(args: {
currentX: event.clientX,
currentY: event.clientY,
worktreeId,
+ worktreeKey: getWorktreeHostIdentity(worktree),
draggedIds,
draggedCopies: reorderDraggedCopies,
reorderDraggedIds,
- reorderUnitDraggedIds,
+ reorderDraggedKeys,
+ reorderUnitDraggedKeys,
sourceGroupKey,
rects,
active: false,
diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/use-session.ts b/src/renderer/src/components/sidebar/worktree-list/drag/use-session.ts
index 5426ce2a85c..07dc686ab06 100644
--- a/src/renderer/src/components/sidebar/worktree-list/drag/use-session.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/drag/use-session.ts
@@ -24,9 +24,10 @@ import {
} from '../../worktree-sidebar-drop-preview'
import { getWorktreeDragGroups, getWorktreeDragIndexes } from './groups'
import type { WorktreeItemRow } from '../listing/renderable-rows'
-import { getNaturalWorktreeIds } from '../../natural-worktree-ids'
+import { getNaturalWorktreeKeys } from '../../natural-worktree-keys'
import {
composeWorktreeHostIdentity,
+ getWorktreeHostIdentity,
getExecutionHostIdFromWorktreeHostIdentity,
getWorktreeIdFromHostIdentity
} from '../../../../../../shared/worktree/host-qualified-identity'
@@ -35,7 +36,8 @@ import type { DraggedWorktreeCopies } from './dragged-worktree-copies'
export type WorktreeStatusDropRequest = {
pointerY: number
status: WorkspaceStatus
- draggedIds: readonly string[]
+ /** Host identities, as the sidebar's drag groups key their members. */
+ draggedKeys: readonly string[]
}
export type WorktreeDragSession = ReturnType<typeof useWorktreeDragSession>
@@ -51,21 +53,22 @@ export function useWorktreeDragSession(args: {
const worktreeDragGroups = useMemo(() => getWorktreeDragGroups(rows), [rows])
const worktreeDragUnitGroups = useMemo(() => getWorktreeDragUnitGroups(rows), [rows])
- const naturalDragWorktreeIds = useMemo(() => getNaturalWorktreeIds(rows), [rows])
+ const naturalDragWorktreeKeys = useMemo(() => getNaturalWorktreeKeys(rows), [rows])
const worktreeLineageDragRows = useMemo(
() =>
rows
.filter((row): row is WorktreeItemRow => row.type === 'item')
.filter(
(row) =>
- row.sectionKey !== PINNED_GROUP_KEY || !naturalDragWorktreeIds.has(row.worktree.id)
+ row.sectionKey !== PINNED_GROUP_KEY ||
+ !naturalDragWorktreeKeys.has(getWorktreeHostIdentity(row.worktree))
)
.map((row) => ({
worktreeId: row.worktree.id,
hostId: row.worktree.hostId,
depth: row.depth
})),
- [naturalDragWorktreeIds, rows]
+ [naturalDragWorktreeKeys, rows]
)
const getReorderDraggedIds = useCallback(
(draggedIds: readonly string[]) =>
@@ -87,15 +90,15 @@ export function useWorktreeDragSession(args: {
})),
[worktreeLineageDragRows]
)
- const getReorderUnitDraggedIds = useCallback(
- (sourceGroupKey: string, reorderDraggedIds: readonly string[]) => {
+ const getReorderUnitDraggedKeys = useCallback(
+ (sourceGroupKey: string, reorderDraggedKeys: readonly string[]) => {
const group = worktreeDragUnitGroups.find((candidate) => candidate.key === sourceGroupKey)
if (!group) {
- return reorderDraggedIds
+ return reorderDraggedKeys
}
- const unitIds = new Set(group.worktreeIds)
- const filtered = reorderDraggedIds.filter((worktreeId) => unitIds.has(worktreeId))
- return filtered.length > 0 ? filtered : reorderDraggedIds
+ const unitKeys = new Set(group.worktreeIds)
+ const filtered = reorderDraggedKeys.filter((key) => unitKeys.has(key))
+ return filtered.length > 0 ? filtered : reorderDraggedKeys
},
[worktreeDragUnitGroups]
)
@@ -173,7 +176,7 @@ export function useWorktreeDragSession(args: {
pointerY,
groupKey: session.sourceGroupKey,
rects: session.rects,
- draggedIds: session.reorderUnitDraggedIds,
+ draggedIds: session.reorderUnitDraggedKeys,
draggingWorktreeId: session.draggingWorktreeId,
grab: session.grab,
anchor
@@ -207,7 +210,7 @@ export function useWorktreeDragSession(args: {
pointerY: request.pointerY,
groupKey,
rects: getWorktreeSidebarDragRectsForGroup(container, groupKey),
- draggedIds: request.draggedIds,
+ draggedIds: request.draggedKeys,
draggingWorktreeId: session?.draggingWorktreeId ?? null,
grab: session?.grab ?? null,
anchor
@@ -237,7 +240,7 @@ export function useWorktreeDragSession(args: {
groupIndexByRowKey,
getReorderDraggedIds,
getReorderDraggedCopies,
- getReorderUnitDraggedIds,
+ getReorderUnitDraggedKeys,
refreshWorktreeDragSession,
computeWorktreeDrop,
computeWorktreeStatusDrop
@@ -247,7 +250,7 @@ export function useWorktreeDragSession(args: {
computeWorktreeStatusDrop,
getReorderDraggedCopies,
getReorderDraggedIds,
- getReorderUnitDraggedIds,
+ getReorderUnitDraggedKeys,
groupIndexByRowKey,
groupKeyByRowKey,
refreshWorktreeDragSession,
diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/use-status-mutations.ts b/src/renderer/src/components/sidebar/worktree-list/drag/use-status-mutations.ts
index 78b13cdbddc..41f9bf8ffb1 100644
--- a/src/renderer/src/components/sidebar/worktree-list/drag/use-status-mutations.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/drag/use-status-mutations.ts
@@ -19,6 +19,7 @@ import type { WorktreeManualOrderCatalog } from '../../worktree-manual-order-cat
import {
collectDropWrites,
dropWriteRows,
+ uniqueDraggedKeys,
type DraggedWorktreeCopies
} from './dragged-worktree-copies'
@@ -56,7 +57,7 @@ export function useWorktreeStatusMutations(args: {
statusIds: worktreeIds,
status,
workspaceStatuses,
- orderUpdates: new Map()
+ orderUpdatesByKey: new Map()
})
if (updates.length > 0) {
void updateWorktreesMeta(updates)
@@ -92,22 +93,24 @@ export function useWorktreeStatusMutations(args: {
return
}
const dropArgs = { ...requestedDrop, worktreeIds }
+ // Sidebar lanes key their cards by host identity: rank only the copies this drop writes.
+ const draggedKeys = uniqueDraggedKeys(dropArgs.worktreeIds.flatMap(rowsFor.status))
const order = buildManualOrderUpdatesForGroupDrop({
groups: dropArgs.groups,
targetGroupKey: getWorkspaceStatusGroupKey(dropArgs.status),
- draggedIds: dropArgs.worktreeIds,
+ draggedIds: draggedKeys,
dropIndex: dropArgs.dropIndex,
now: Date.now(),
- rankByWorktreeId: manualOrderCatalog.rankByWorktreeId,
- allWorktreeIds: manualOrderCatalog.orderedIds
+ rankByWorktreeId: manualOrderCatalog.rankByKey,
+ allWorktreeIds: manualOrderCatalog.orderedKeys
})
- const dragged = new Set(dropArgs.worktreeIds)
+ const dragged = new Set(draggedKeys)
const updates = collectDropWrites({
rowsFor,
statusIds: dropArgs.worktreeIds,
status: dropArgs.status,
workspaceStatuses,
- orderUpdates: new Map([...order.updates].filter(([worktreeId]) => dragged.has(worktreeId)))
+ orderUpdatesByKey: new Map([...order.updates].filter(([key]) => dragged.has(key)))
})
if (updates.length === 0) {
return
@@ -137,17 +140,20 @@ export function useWorktreeStatusMutations(args: {
const reorderWorktrees = useCallback(
(reorderArgs: WorktreeReorderArgs) => {
const result = buildManualOrderUpdatesForVisibleGroups({
- ...reorderArgs,
+ groups: reorderArgs.groups,
+ sourceGroupKey: reorderArgs.sourceGroupKey,
+ draggedIds: reorderArgs.draggedKeys,
+ dropIndex: reorderArgs.dropIndex,
now: Date.now(),
- rankByWorktreeId: manualOrderCatalog.rankByWorktreeId,
- allWorktreeIds: manualOrderCatalog.orderedIds
+ rankByWorktreeId: manualOrderCatalog.rankByKey,
+ allWorktreeIds: manualOrderCatalog.orderedKeys
})
const updates = collectDropWrites({
rowsFor: dropWriteRows(useAppStore.getState(), reorderArgs.draggedCopies),
statusIds: [],
status: null,
workspaceStatuses,
- orderUpdates: result.updates
+ orderUpdatesByKey: result.updates
})
if (updates.length === 0) {
return
@@ -192,8 +198,8 @@ export function useWorktreeStatusMutations(args: {
workspaceStatuses,
sortBy,
now: Date.now(),
- allWorktreeIds: manualOrderCatalog.orderedIds,
- rankByWorktreeId: manualOrderCatalog.rankByWorktreeId
+ allWorktreeKeys: manualOrderCatalog.orderedKeys,
+ rankByKey: manualOrderCatalog.rankByKey
})
if (result.updates.length === 0) {
return
diff --git a/src/renderer/src/components/sidebar/worktree-list/drag/use-status-row-drag.ts b/src/renderer/src/components/sidebar/worktree-list/drag/use-status-row-drag.ts
index 8cc95aef9c8..95f3a45bf73 100644
--- a/src/renderer/src/components/sidebar/worktree-list/drag/use-status-row-drag.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/drag/use-status-row-drag.ts
@@ -93,7 +93,7 @@ export function useWorkspaceStatusRowDrag(args: {
? ctx.computeWorktreeStatusDrop({
pointerY: event.clientY,
status,
- draggedIds: dragSession.reorderDraggedIds
+ draggedKeys: dragSession.reorderDraggedKeys
})
: null
setDragOverStatus(null)
diff --git a/src/renderer/src/components/sidebar/worktree-list/grouping/imported-rows.test.ts b/src/renderer/src/components/sidebar/worktree-list/grouping/imported-rows.test.ts
index 59b46baf9af..6622783dd57 100644
--- a/src/renderer/src/components/sidebar/worktree-list/grouping/imported-rows.test.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/grouping/imported-rows.test.ts
@@ -6,6 +6,10 @@ import { renderRowContainsWorktree } from '../navigation/render-row-lookup'
import type { Repo } from '../../../../../../shared/repo-types'
import type { Worktree } from '../../../../../../shared/worktree/types'
import type { Row } from '../../../../../../shared/sidebar-list/row-types'
+import { composeWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity'
+
+// Drag groups key members by host identity; these rows carry no host.
+const k = (id: string): string => composeWorktreeHostIdentity(undefined, id)
const repo: Repo = {
id: 'repo-1',
@@ -88,14 +92,14 @@ describe('imported worktree virtual rows', () => {
makeImportedCardRow(),
makeWorktreeRow('feature')
])
- ).toEqual([{ key: 'repo:repo-1', worktreeIds: ['main', 'feature'] }])
+ ).toEqual([{ key: 'repo:repo-1', worktreeIds: [k('main'), k('feature')] }])
})
it('indexes pinned rows for sidebar drag when they are the only rendered copy', () => {
const rows = [makeHeaderRow('pinned'), makePinnedWorktreeRow('main')]
const { groupIndexByRowKey, groupKeyByRowKey } = getWorktreeDragIndexes(rows)
- expect(getWorktreeDragGroups(rows)).toEqual([{ key: 'pinned', worktreeIds: ['main'] }])
+ expect(getWorktreeDragGroups(rows)).toEqual([{ key: 'pinned', worktreeIds: [k('main')] }])
expect(groupKeyByRowKey.get('pinned:main')).toBe('pinned')
expect(groupIndexByRowKey.get('pinned:main')).toBe(0)
})
@@ -109,7 +113,7 @@ describe('imported worktree virtual rows', () => {
]
const { groupKeyByRowKey } = getWorktreeDragIndexes(rows)
- expect(getWorktreeDragGroups(rows)).toEqual([{ key: 'all', worktreeIds: ['main'] }])
+ expect(getWorktreeDragGroups(rows)).toEqual([{ key: 'all', worktreeIds: [k('main')] }])
expect(groupKeyByRowKey.has('pinned:main')).toBe(false)
expect(groupKeyByRowKey.get('all:main')).toBe('all')
})
diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.test.tsx b/src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.test.tsx
index 6b3c66c3e29..3ad4a6cd94d 100644
--- a/src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.test.tsx
+++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.test.tsx
@@ -10,8 +10,16 @@ import type { Worktree } from '../../../../../../shared/worktree/types'
import { makeRepo, makeWorktree } from '../../../worktree-jump-palette-test-fixtures'
import type { SortBy } from '../../../../../../shared/sidebar-list/smart-sort'
import { useSidebarWorktreeSortOrder } from './use-sort-order'
+import {
+ composeWorktreeHostIdentity,
+ getWorktreeHostIdentity
+} from '../../../../../../shared/worktree/host-qualified-identity'
import { makeTerminalTab } from '../../../../store/slices/worktrees-slice-test-fixtures'
+// The sort ranks each card by host identity; these rows carry no host.
+const key = (id: string): string => composeWorktreeHostIdentity(undefined, id)
+const keys = (...ids: string[]): string[] => ids.map(key)
+
const initialState = useAppStore.getInitialState()
const repo = makeRepo()
const repoMap = new Map([[repo.id, repo]])
@@ -117,14 +125,14 @@ describe('useSidebarWorktreeSortOrder', () => {
'manual'
)
const { result } = renderSortOrder({ strict: true })
- expect(result.current).toEqual(['a', 'b'])
+ expect(result.current).toEqual(keys('a', 'b'))
act(() =>
replaceWorktrees([
makeWorktree('a', 'A', { manualOrder: 2 }),
makeWorktree('b', 'B', { manualOrder: 3 })
])
)
- expect(result.current).toEqual(['b', 'a'])
+ expect(result.current).toEqual(keys('b', 'a'))
})
it('survives a burst of synchronous store bumps in Manual', () => {
@@ -154,7 +162,7 @@ describe('useSidebarWorktreeSortOrder', () => {
// Why newest activity: a structural add must land at its sorted position (first) immediately.
worktrees = [...worktrees, makeWorktree(`w${i}`, `W${i}`, { lastActivityAt: i * 100 })]
flushSync(() => replaceWorktrees(worktrees))
- expect(view.latest.ids[0]).toBe(`w${i}`)
+ expect(view.latest.ids[0]).toBe(key(`w${i}`))
} else {
// Why reversed activity: these bumps reorder rows, so only the settle may apply them.
worktrees = worktrees.map((w, index) => ({ ...w, lastActivityAt: i * 100 - index }))
@@ -162,15 +170,15 @@ describe('useSidebarWorktreeSortOrder', () => {
flushSync(() => bumpSortEpoch())
}
}
- expect(view.latest.ids[0]).toBe('w77')
+ expect(view.latest.ids[0]).toBe(key('w77'))
expect(view.errors).toEqual([])
flushSync(() => vi.advanceTimersByTime(3_000))
expect(view.errors).toEqual([])
const expected = [...useAppStore.getState().worktreesByRepo[repo.id]]
.sort((a, b) => b.lastActivityAt - a.lastActivityAt)
- .map((w) => w.id)
+ .map(getWorktreeHostIdentity)
expect(view.latest.ids).toEqual(expected)
- expect(view.latest.ids[0]).toBe('w0')
+ expect(view.latest.ids[0]).toBe(key('w0'))
expect(vi.getTimerCount()).toBe(0)
} finally {
view.unmount()
@@ -187,16 +195,16 @@ describe('useSidebarWorktreeSortOrder', () => {
'recent'
)
const { result } = renderSortOrder()
- expect(result.current).toEqual(['a', 'b'])
+ expect(result.current).toEqual(keys('a', 'b'))
act(() =>
replaceWorktrees([
makeWorktree('a', 'A', { lastActivityAt: 2_000 }),
makeWorktree('b', 'B', { lastActivityAt: 3_000 })
])
)
- expect(result.current).toEqual(['a', 'b'])
+ expect(result.current).toEqual(keys('a', 'b'))
act(() => vi.advanceTimersByTime(3_000))
- expect(result.current).toEqual(['b', 'a'])
+ expect(result.current).toEqual(keys('b', 'a'))
})
it('applies an added worktree immediately in debounced modes', () => {
@@ -204,7 +212,7 @@ describe('useSidebarWorktreeSortOrder', () => {
seed([makeWorktree('a', 'A')], 'name')
const { result } = renderSortOrder()
act(() => replaceWorktrees([makeWorktree('a', 'A'), makeWorktree('0', '0 first')]))
- expect(result.current).toEqual(['0', 'a'])
+ expect(result.current).toEqual(keys('0', 'a'))
})
it('re-sorts on Manual -> Recent and stays put at settle', () => {
@@ -220,9 +228,9 @@ describe('useSidebarWorktreeSortOrder', () => {
for (let i = 0; i < 5; i++) {
act(() => bumpSortEpoch())
}
- expect(result.current).toEqual(['a', 'b'])
+ expect(result.current).toEqual(keys('a', 'b'))
act(() => useAppStore.getState().setSortBy('recent'))
- expect(result.current).toEqual(['b', 'a'])
+ expect(result.current).toEqual(keys('b', 'a'))
const afterSwitch = result.current
act(() => vi.advanceTimersByTime(3_000))
expect(result.current).toBe(afterSwitch)
@@ -247,9 +255,9 @@ describe('useSidebarWorktreeSortOrder', () => {
act(() => vi.advanceTimersByTime(2_000))
act(() => bumpSortEpoch())
act(() => vi.advanceTimersByTime(2_000))
- expect(result.current).toEqual(['a', 'b'])
+ expect(result.current).toEqual(keys('a', 'b'))
act(() => vi.advanceTimersByTime(1_000))
- expect(result.current).toEqual(['b', 'a'])
+ expect(result.current).toEqual(keys('b', 'a'))
})
it('applies a removed worktree immediately in debounced modes', () => {
@@ -269,7 +277,7 @@ describe('useSidebarWorktreeSortOrder', () => {
makeWorktree('c', 'C', { lastActivityAt: 4_000 })
])
)
- expect(result.current).toEqual(['c', 'b'])
+ expect(result.current).toEqual(keys('c', 'b'))
})
it('does not re-sort when rows change without a sortEpoch bump', () => {
@@ -318,7 +326,7 @@ describe('useSidebarWorktreeSortOrder', () => {
)
expect(vi.getTimerCount()).toBe(1)
act(() => useAppStore.getState().setSortBy('name'))
- expect(result.current).toEqual(['b', 'a'])
+ expect(result.current).toEqual(keys('b', 'a'))
expect(useAppStore.getState().settledSortEpoch).toBe(useAppStore.getState().sortEpoch)
expect(vi.getTimerCount()).toBe(0)
})
@@ -331,9 +339,9 @@ describe('useSidebarWorktreeSortOrder', () => {
sortBy
)
const { result } = renderSortOrder()
- expect(result.current).toEqual(['a', 'b'])
+ expect(result.current).toEqual(keys('a', 'b'))
act(() => publishSortOrders({ a: 1, b: 2 }))
- expect(result.current).toEqual(['b', 'a'])
+ expect(result.current).toEqual(keys('b', 'a'))
expect(useAppStore.getState().sortEpoch).toBe(1)
}
)
@@ -380,9 +388,9 @@ describe('useSidebarWorktreeSortOrder', () => {
latched.unmount()
const cold = renderSortOrder()
- expect(cold.result.current).toEqual(['b', 'a'])
+ expect(cold.result.current).toEqual(keys('b', 'a'))
act(() => publishSortOrders({ a: 3 }))
- expect(cold.result.current).toEqual(['a', 'b'])
+ expect(cold.result.current).toEqual(keys('a', 'b'))
} finally {
vi.unstubAllGlobals()
}
diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.ts
index 6cee550ca3d..a1fe203cbfc 100644
--- a/src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.ts
@@ -15,7 +15,10 @@ import {
import { useReusedArrayIdentity } from './use-reused-array-identity'
import { useSidebarListSession } from '@/lib/sidebar-list-session'
import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../../../../shared/sidebar-inputs-switch'
-import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity'
+import {
+ getWorktreeHostIdentity,
+ getWorktreeIdFromHostIdentity
+} from '../../../../../../shared/worktree/host-qualified-identity'
import { selectWorktreesByRepo } from '@/store/workspace-record-selectors'
// Compute settled order synchronously; selection side effects must not reorder rows under the user.
@@ -48,7 +51,8 @@ function useSettledSidebarWorktreeSortOrder(args: {
sources: state
})
return {
- sortedIds: ranking.sorted.map((w) => w.id),
+ // Why host identity: same-id copies on two machines are separate cards with their own ranks.
+ sortedIds: ranking.sorted.map(getWorktreeHostIdentity),
detectedLiveSmartSignal: ranking.detectedLiveSmartSignal
}
// settledSortEpoch is an intentional trigger not read in the memo; its change signals a recompute.
@@ -76,7 +80,10 @@ function useSettledSidebarWorktreeSortOrder(args: {
return
}
// Why: sortOrder lives in each host's worktreeMeta, so persist each host's ids on that host.
- persistWorktreeSortOrderByHost(useAppStore.getState(), sortedIds)
+ persistWorktreeSortOrderByHost(
+ useAppStore.getState(),
+ sortedIds.map(getWorktreeIdFromHostIdentity)
+ )
}, [sortedIds, sortBy])
return sortedIds
diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts
index 7a3df326d42..5bf63b19942 100644
--- a/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts
@@ -1,7 +1,6 @@
import { useMemo } from 'react'
import { shallow } from 'zustand/shallow'
import type { AppState } from '@/store/types'
-import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../../../../shared/sidebar-inputs-switch'
import { useAppStore } from '@/store'
import { getAgentStatusEpochNow } from '@/lib/agent-status-epoch-clock'
import { getWorktreeIdsWithLiveAgent } from '@/lib/worktree-activity-state'
@@ -144,8 +143,8 @@ export function useVisibleSidebarWorktrees(args: {
defaultHostId,
worktreeLineageById,
preserveLineageParentOrder: sortBy === 'manual',
- // Switch point: the stamp sort ranks by host identity (use-sort-order.ts).
- sortedByHostIdentity: ORCA_SIDEBAR_INPUTS_IS_MAIN,
+ // Both sorts rank by host identity (use-sort-order.ts).
+ sortedByHostIdentity: true,
forcedVisibleWorktreeIds: args.agentSendTargetWorktreeId
? [args.agentSendTargetWorktreeId]
: undefined
diff --git a/src/renderer/src/components/sidebar/worktree-list/rows/item-row.tsx b/src/renderer/src/components/sidebar/worktree-list/rows/item-row.tsx
index 352968b6c30..aa059a80902 100644
--- a/src/renderer/src/components/sidebar/worktree-list/rows/item-row.tsx
+++ b/src/renderer/src/components/sidebar/worktree-list/rows/item-row.tsx
@@ -143,7 +143,7 @@ export function renderWorktreeItemRow(
className={cn(
// Why: don't transition 'transform' — it lags/flashes when TanStack Virtual repositions adjacent rows.
'relative transition-[opacity,filter] duration-150 ease-out',
- ctx.worktreeDragState.draggingWorktreeId === itemRow.worktree.id &&
+ ctx.worktreeDragState.draggingWorktreeId === worktreeIdentity &&
// Why: the fixed drag preview is the affordance; a translucent source row would bleed through sticky headers/footers.
'pointer-events-none opacity-0'
)}
diff --git a/src/renderer/src/components/sidebar/worktree-list/rows/virtual-row-dispatch.tsx b/src/renderer/src/components/sidebar/worktree-list/rows/virtual-row-dispatch.tsx
index 1126a898ba3..9960d847108 100644
--- a/src/renderer/src/components/sidebar/worktree-list/rows/virtual-row-dispatch.tsx
+++ b/src/renderer/src/components/sidebar/worktree-list/rows/virtual-row-dispatch.tsx
@@ -7,6 +7,7 @@ import type {
} from '../../../../../../shared/worktree/types'
import { getWorkspaceStatus } from '../../workspace-status'
import type { WorktreeGroupBy } from '../../../../../../shared/sidebar-list/row-types'
+import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity'
import {
getVirtualRowTransform,
getWorktreeVirtualRowTransform,
@@ -110,8 +111,9 @@ function renderLineageGroupVirtualRow(
): React.JSX.Element {
const [parent, ...children] = row.rows
const childIsActive = children.some((child) => child.worktree.id === ctx.activeWorktreeId)
- const parentPreviewOffset = parent
- ? (ctx.worktreeDragState.previewOffsetsByWorktreeId.get(parent.worktree.id) ?? 0)
+ const parentKey = parent ? getWorktreeHostIdentity(parent.worktree) : null
+ const parentPreviewOffset = parentKey
+ ? (ctx.worktreeDragState.previewOffsetsByWorktreeId.get(parentKey) ?? 0)
: 0
return (
<div
@@ -124,7 +126,9 @@ function renderLineageGroupVirtualRow(
ref={ctx.measureVirtualRowElement}
className={cn(
'absolute left-0 right-0 top-0',
- parent?.worktree.id === ctx.worktreeDragState.draggingWorktreeId && 'pointer-events-none',
+ parentKey !== null &&
+ parentKey === ctx.worktreeDragState.draggingWorktreeId &&
+ 'pointer-events-none',
ctx.worktreeDragState.draggingWorktreeId !== null &&
'transition-transform duration-150 ease-out will-change-transform'
)}
@@ -218,8 +222,8 @@ export function renderWorktreeVirtualRow(
ctx.groupBy === 'workspace-status'
? getWorkspaceStatus(row.worktree, ctx.workspaceStatuses)
: null
- const itemPreviewOffset =
- ctx.worktreeDragState.previewOffsetsByWorktreeId.get(row.worktree.id) ?? 0
+ const itemKey = getWorktreeHostIdentity(row.worktree)
+ const itemPreviewOffset = ctx.worktreeDragState.previewOffsetsByWorktreeId.get(itemKey) ?? 0
return (
<div
@@ -234,7 +238,7 @@ export function renderWorktreeVirtualRow(
data-workspace-status={itemWorkspaceStatus ?? undefined}
className={cn(
'absolute left-0 right-0 top-0',
- row.worktree.id === ctx.worktreeDragState.draggingWorktreeId && 'pointer-events-none',
+ itemKey === ctx.worktreeDragState.draggingWorktreeId && 'pointer-events-none',
ctx.worktreeDragState.draggingWorktreeId !== null &&
'transition-transform duration-150 ease-out will-change-transform'
)}
diff --git a/src/renderer/src/components/sidebar/worktree-manual-order-catalog.test.ts b/src/renderer/src/components/sidebar/worktree-manual-order-catalog.test.ts
index 1460c9bb739..e4551f2f7b7 100644
--- a/src/renderer/src/components/sidebar/worktree-manual-order-catalog.test.ts
+++ b/src/renderer/src/components/sidebar/worktree-manual-order-catalog.test.ts
@@ -3,6 +3,7 @@ import type { FolderWorkspace } from '../../../../shared/folder-workspace-types'
import type { Worktree } from '../../../../shared/worktree/types'
import { worktree } from './worktree-list-groups-test-fixtures'
import { buildWorktreeManualOrderCatalog } from './worktree-manual-order-catalog'
+import { getWorktreeIdFromHostIdentity } from '../../../../shared/worktree/host-qualified-identity'
function row(id: string, overrides: Partial<Worktree> = {}): Worktree {
return { ...worktree, id, displayName: id, ...overrides }
@@ -34,29 +35,33 @@ describe('buildWorktreeManualOrderCatalog', () => {
folderWorkspaces: [folder()]
})
- expect(catalog.orderedIds).toEqual(['high', 'folder:folder-1', 'low'])
- expect(catalog.rankByWorktreeId.size).toBe(0)
+ expect(catalog.orderedKeys.map(getWorktreeIdFromHostIdentity)).toEqual([
+ 'high',
+ 'folder:folder-1',
+ 'low'
+ ])
+ expect(catalog.rankByKey.size).toBe(0)
})
- it('treats a same-id host cluster as durable only when every owner agrees', () => {
+ it('ranks each same-id copy on its own host', () => {
const sameId = 'repo::/same'
- const complete = buildWorktreeManualOrderCatalog({
- worktrees: [
- row(sameId, { hostId: 'local', manualOrder: 900 }),
- row(sameId, { hostId: 'ssh:openclaw', manualOrder: 900 })
- ],
- folderWorkspaces: []
- })
- const incomplete = buildWorktreeManualOrderCatalog({
+ const catalog = buildWorktreeManualOrderCatalog({
worktrees: [
- row(sameId, { hostId: 'local', manualOrder: 900 }),
- row(sameId, { hostId: 'ssh:openclaw', manualOrder: undefined })
+ row(sameId, { hostId: 'ssh:vm-a', manualOrder: 100 }),
+ row(sameId, { hostId: 'ssh:vm-b', manualOrder: 900 }),
+ row(sameId, { hostId: 'ssh:vm-c', manualOrder: undefined })
],
folderWorkspaces: []
})
- expect(complete.orderedIds).toEqual([sameId])
- expect(complete.rankByWorktreeId.get(sameId)).toBe(900)
- expect(incomplete.rankByWorktreeId.has(sameId)).toBe(false)
+ expect(catalog.orderedKeys).toEqual([
+ `ssh:vm-b|${sameId}`,
+ `ssh:vm-a|${sameId}`,
+ `ssh:vm-c|${sameId}`
+ ])
+ expect([...catalog.rankByKey]).toEqual([
+ [`ssh:vm-b|${sameId}`, 900],
+ [`ssh:vm-a|${sameId}`, 100]
+ ])
})
})
diff --git a/src/renderer/src/components/sidebar/worktree-manual-order-catalog.ts b/src/renderer/src/components/sidebar/worktree-manual-order-catalog.ts
index b8caf143482..08b6c91a87c 100644
--- a/src/renderer/src/components/sidebar/worktree-manual-order-catalog.ts
+++ b/src/renderer/src/components/sidebar/worktree-manual-order-catalog.ts
@@ -1,14 +1,16 @@
import type { FolderWorkspace } from '../../../../shared/folder-workspace-types'
import { folderWorkspaceToWorktree } from '../../../../shared/folder-workspace-worktree'
import type { Worktree } from '../../../../shared/worktree/types'
+import { getWorktreeHostIdentity } from '../../../../shared/worktree/host-qualified-identity'
import {
buildWorktreeSortLabels,
compareWorktreeSortLabel
} from '../../../../shared/sidebar-list/smart-sort'
+/** Manual ranks by host identity: same-id copies on two hosts are separate cards. */
export type WorktreeManualOrderCatalog = {
- orderedIds: readonly string[]
- rankByWorktreeId: ReadonlyMap<string, number>
+ orderedKeys: readonly string[]
+ rankByKey: ReadonlyMap<string, number>
}
export function buildWorktreeManualOrderCatalog(args: {
@@ -25,19 +27,20 @@ export function buildWorktreeManualOrderCatalog(args: {
(right.manualOrder ?? right.sortOrder) - (left.manualOrder ?? left.sortOrder) ||
compareWorktreeSortLabel(left, right, labels)
)
- const rowsById = new Map<string, Worktree[]>()
+ const rowsByKey = new Map<string, Worktree[]>()
for (const row of rows) {
- const matches = rowsById.get(row.id)
+ const key = getWorktreeHostIdentity(row)
+ const matches = rowsByKey.get(key)
if (matches) {
matches.push(row)
} else {
- rowsById.set(row.id, [row])
+ rowsByKey.set(key, [row])
}
}
- const orderedIds = [...rowsById.keys()]
- const rankByWorktreeId = new Map<string, number>()
- for (const [worktreeId, matches] of rowsById) {
+ const orderedKeys = [...rowsByKey.keys()]
+ const rankByKey = new Map<string, number>()
+ for (const [key, matches] of rowsByKey) {
const ranks = matches.map((row) => row.manualOrder)
const rank = ranks[0]
if (
@@ -45,8 +48,8 @@ export function buildWorktreeManualOrderCatalog(args: {
Number.isFinite(rank) &&
ranks.every((candidate) => candidate === rank)
) {
- rankByWorktreeId.set(worktreeId, rank)
+ rankByKey.set(key, rank)
}
}
- return { orderedIds, rankByWorktreeId }
+ return { orderedKeys, rankByKey }
}
diff --git a/src/renderer/src/components/sidebar/worktree-manual-order-store-write.test.ts b/src/renderer/src/components/sidebar/worktree-manual-order-store-write.test.ts
index 61b821eaa4e..93749b72e18 100644
--- a/src/renderer/src/components/sidebar/worktree-manual-order-store-write.test.ts
+++ b/src/renderer/src/components/sidebar/worktree-manual-order-store-write.test.ts
@@ -7,6 +7,10 @@ import type { Worktree } from '../../../../shared/worktree/types'
import { makeWorktree } from '../worktree-jump-palette-test-fixtures'
import { buildWorktreeManualOrderCatalog } from './worktree-manual-order-catalog'
import { useWorktreeStatusMutations } from './worktree-list/drag/use-status-mutations'
+import {
+ getWorktreeHostIdentity,
+ getWorktreeIdFromHostIdentity
+} from '../../../../shared/worktree/host-qualified-identity'
const toastInfo = vi.hoisted(() => vi.fn())
vi.mock('sonner', () => ({ toast: { info: toastInfo, dismiss: vi.fn() } }))
@@ -51,7 +55,7 @@ function manualOrderedIds(): readonly string[] {
return buildWorktreeManualOrderCatalog({
worktrees: useAppStore.getState().worktreesByRepo[REPO_ID] ?? [],
folderWorkspaces: []
- }).orderedIds
+ }).orderedKeys.map(getWorktreeIdFromHostIdentity)
}
describe('sidebar manual-order drop', () => {
@@ -70,13 +74,14 @@ describe('sidebar manual-order drop', () => {
it('moves the dragged row past its neighbor in the store', async () => {
const worktrees = seedManualOrderedRows(3)
const ids = worktrees.map((worktree) => worktree.id)
+ const keys = worktrees.map(getWorktreeHostIdentity)
const reorder = renderReorder(worktrees)
await act(async () => {
reorder.current.reorderWorktrees({
- groups: [{ key: GROUP_KEY, worktreeIds: ids }],
+ groups: [{ key: GROUP_KEY, worktreeIds: keys }],
sourceGroupKey: GROUP_KEY,
- draggedIds: [ids[0]!],
+ draggedKeys: [keys[0]!],
dropIndex: 2
})
})
@@ -94,14 +99,15 @@ describe('sidebar manual-order drop', () => {
it('leaves the order alone when the drop lands where the row already is', async () => {
const worktrees = seedManualOrderedRows(3)
const ids = worktrees.map((worktree) => worktree.id)
+ const keys = worktrees.map(getWorktreeHostIdentity)
const reorder = renderReorder(worktrees)
const epochBeforeDrop = useAppStore.getState().sortEpoch
await act(async () => {
reorder.current.reorderWorktrees({
- groups: [{ key: GROUP_KEY, worktreeIds: ids }],
+ groups: [{ key: GROUP_KEY, worktreeIds: keys }],
sourceGroupKey: GROUP_KEY,
- draggedIds: [ids[0]!],
+ draggedKeys: [keys[0]!],
dropIndex: 1
})
})
@@ -117,13 +123,14 @@ describe('sidebar manual-order drop', () => {
const worktrees = seedManualOrderedRows(3)
useAppStore.setState({ sortBy: 'manual' })
const ids = worktrees.map((worktree) => worktree.id)
+ const keys = worktrees.map(getWorktreeHostIdentity)
const reorder = renderReorder(worktrees)
await act(async () => {
reorder.current.reorderWorktrees({
- groups: [{ key: GROUP_KEY, worktreeIds: ids }],
+ groups: [{ key: GROUP_KEY, worktreeIds: keys }],
sourceGroupKey: GROUP_KEY,
- draggedIds: [ids[0]!],
+ draggedKeys: [keys[0]!],
dropIndex: 2
})
})
diff --git a/src/renderer/src/components/sidebar/worktree-manual-order.ts b/src/renderer/src/components/sidebar/worktree-manual-order.ts
index f653e809234..ce8e60b4668 100644
--- a/src/renderer/src/components/sidebar/worktree-manual-order.ts
+++ b/src/renderer/src/components/sidebar/worktree-manual-order.ts
@@ -7,6 +7,7 @@ export type { WorktreeManualOrderUpdate } from './worktree-manual-order-ranks'
export type WorktreeDragGroup = {
key: string
+ /** Host identities: same-id copies on two hosts are separate cards. */
worktreeIds: readonly string[]
}
diff --git a/src/renderer/src/components/sidebar/worktree-sidebar-drag-autoscroll.test.ts b/src/renderer/src/components/sidebar/worktree-sidebar-drag-autoscroll.test.ts
index b43793bfae1..26e8d1d7aba 100644
--- a/src/renderer/src/components/sidebar/worktree-sidebar-drag-autoscroll.test.ts
+++ b/src/renderer/src/components/sidebar/worktree-sidebar-drag-autoscroll.test.ts
@@ -21,7 +21,8 @@ const SESSION: WorktreeSidebarDragSession = {
draggedIds: ['b'],
draggedCopies: [],
reorderDraggedIds: ['b'],
- reorderUnitDraggedIds: ['b'],
+ reorderDraggedKeys: ['b'],
+ reorderUnitDraggedKeys: ['b'],
rects: [{ worktreeId: 'b', groupIndex: 1, top: 48, bottom: 88 }],
grab: null,
anchor: null
@@ -186,7 +187,7 @@ describe('refreshWorktreeSidebarDragSession', () => {
).toBeNull()
expect(
refreshWorktreeSidebarDragSession({
- session: { ...SESSION, reorderUnitDraggedIds: ['missing'] },
+ session: { ...SESSION, reorderUnitDraggedKeys: ['missing'] },
groups: [{ key: 'repo:one', worktreeIds: ['a', 'b'] }],
unitGroups: [{ key: 'repo:one', worktreeIds: ['a'], units: [] }],
rects: []
@@ -211,7 +212,8 @@ describe('refreshWorktreeSidebarDragSession', () => {
draggingWorktreeId: 'child',
draggedIds: ['child'],
reorderDraggedIds: ['child'],
- reorderUnitDraggedIds: ['child']
+ reorderDraggedKeys: ['child'],
+ reorderUnitDraggedKeys: ['child']
}
const rects: WorktreeSidebarDragRect[] = [
{ worktreeId: 'parent', groupIndex: 0, top: 0, bottom: 80 },
@@ -272,6 +274,8 @@ function makeDragElement(
): HTMLElement {
const attributes = new Map([
['data-worktree-drag-id', worktreeId],
+ // Rects key slots by host identity; these fixtures reuse the id string as that key.
+ ['data-worktree-host-identity', worktreeId],
['data-worktree-drag-group-key', groupKey],
['data-worktree-drag-group-index', groupIndex]
])
diff --git a/src/renderer/src/components/sidebar/worktree-sidebar-drag-autoscroll.ts b/src/renderer/src/components/sidebar/worktree-sidebar-drag-autoscroll.ts
index a87b7c93c81..5f1bbf148e2 100644
--- a/src/renderer/src/components/sidebar/worktree-sidebar-drag-autoscroll.ts
+++ b/src/renderer/src/components/sidebar/worktree-sidebar-drag-autoscroll.ts
@@ -18,6 +18,7 @@ export type WorktreeSidebarDragPoint = {
}
export type WorktreeSidebarDragRect = {
+ /** Host identity, as drag groups key their members. */
worktreeId: string
groupIndex: number
top: number
@@ -25,12 +26,16 @@ export type WorktreeSidebarDragRect = {
}
export type WorktreeSidebarDragSession = {
+ /** Host identity of the pressed card; drag groups key members the same way. */
draggingWorktreeId: string
sourceGroupKey: string
draggedIds: readonly string[]
draggedCopies: DraggedWorktreeCopies
+ /** Worktree ids, for status, pin and board writes. */
reorderDraggedIds: readonly string[]
- reorderUnitDraggedIds: readonly string[]
+ /** Host identities, for sidebar reorder slots and manual ranks. */
+ reorderDraggedKeys: readonly string[]
+ reorderUnitDraggedKeys: readonly string[]
// Keep live geometry for rendering/hit tests; hold the drop decision in anchor to resist mid-drag resizing.
rects: readonly WorktreeSidebarDragRect[]
grab: WorktreeSidebarDragGrab | null
@@ -135,7 +140,8 @@ export function getWorktreeSidebarDragRectsForGroup(
if (element.getAttribute('data-worktree-drag-group-key') !== groupKey) {
return
}
- const worktreeId = element.getAttribute('data-worktree-drag-id')
+ // Why host identity: same-id copies on two machines are separate drop slots.
+ const worktreeId = element.getAttribute('data-worktree-host-identity')
const rawGroupIndex = element.getAttribute('data-worktree-drag-group-index')
const groupIndex = rawGroupIndex === null ? Number.NaN : Number(rawGroupIndex)
if (!worktreeId || !Number.isFinite(groupIndex)) {
@@ -191,8 +197,8 @@ export function refreshWorktreeSidebarDragSession(args: {
const sourceGroupIds = new Set(sourceGroup.worktreeIds)
const sourceUnitIds = new Set(sourceUnitGroup.worktreeIds)
if (
- args.session.reorderUnitDraggedIds.some(
- (worktreeId) => !sourceUnitIds.has(worktreeId) && !sourceGroupIds.has(worktreeId)
+ args.session.reorderUnitDraggedKeys.some(
+ (key) => !sourceUnitIds.has(key) && !sourceGroupIds.has(key)
)
) {
return null
diff --git a/src/renderer/src/components/sidebar/worktree-sidebar-drag-geometry.test.ts b/src/renderer/src/components/sidebar/worktree-sidebar-drag-geometry.test.ts
index e5c6a871b05..d640427d3b0 100644
--- a/src/renderer/src/components/sidebar/worktree-sidebar-drag-geometry.test.ts
+++ b/src/renderer/src/components/sidebar/worktree-sidebar-drag-geometry.test.ts
@@ -181,7 +181,8 @@ describe('worktree sidebar drag geometry under mid-drag card growth', () => {
draggedIds: ['a'],
draggedCopies: [],
reorderDraggedIds: ['a'],
- reorderUnitDraggedIds: ['a'],
+ reorderDraggedKeys: ['a'],
+ reorderUnitDraggedKeys: ['a'],
rects: COLLAPSED,
grab: GRAB,
anchor: null