fix(sidebar): preserve folder workspace owner identity

src/main/ipc/repos.ts

@@ -109,9 +109,9 @@ import {
   buildProjectGroupOwnerIndex,
   getFolderWorkspaceProjectGroupOwnerHostId,
   getProjectGroupOwnerHostId,
-  resolveFolderWorkspaceProjectGroup,
   resolveProjectGroupOwner
 } from '../../shared/project-groups'
+import { resolveFolderWorkspaceProjectGroupWithLegacySsh } from '../../shared/folder-workspace-project-group-resolution'
 import { joinRemotePath } from '../ssh/ssh-remote-platform'
 import {
   assertFolderWorkspacePathUsable,
@@ -1571,7 +1571,7 @@ export function registerRepoHandlers(mainWindow: BrowserWindow, store: Store): v
         }
         const projectGroups = store.getProjectGroups()
         const projectGroupIndex = buildProjectGroupOwnerIndex(projectGroups)
-        const group = resolveFolderWorkspaceProjectGroup(projectGroupIndex, workspace)
+        const group = resolveFolderWorkspaceProjectGroupWithLegacySsh(projectGroupIndex, workspace)
         if (!group) {
           return null
         }

src/main/persistence.test.ts

@@ -3809,6 +3809,56 @@ describe('Store', () => {
     expect(store.getFolderWorkspace('same-folder', 'ssh:builder')?.name).toBe('Remote')
   })
 
+  it('loads a persisted legacy SSH folder under one unstamped group', async () => {
+    writeDataFile({
+      schemaVersion: 1,
+      repos: [],
+      worktreeMeta: {},
+      settings: {},
+      ui: {},
+      githubCache: { pr: {}, issue: {} },
+      projectGroups: [
+        {
+          id: 'legacy-group',
+          name: 'Legacy',
+          parentPath: '/remote',
+          parentGroupId: null,
+          createdFrom: 'migration',
+          tabOrder: 0,
+          isCollapsed: false,
+          color: null,
+          createdAt: 1,
+          updatedAt: 1
+        }
+      ],
+      folderWorkspaces: [
+        {
+          id: 'legacy-folder',
+          projectGroupId: 'legacy-group',
+          name: 'Legacy folder',
+          folderPath: '/remote/folder',
+          connectionId: 'builder',
+          linkedTask: null,
+          comment: '',
+          isArchived: false,
+          isUnread: false,
+          isPinned: false,
+          sortOrder: 0,
+          lastActivityAt: 1,
+          createdAt: 1,
+          updatedAt: 1
+        }
+      ]
+    })
+
+    const store = await createStore()
+
+    expect(store.getProjectGroups()[0]?.connectionId).toBeUndefined()
+    expect(store.getFolderWorkspace('legacy-folder', 'ssh:builder')).toBeDefined()
+    expect(store.deleteProjectGroup('legacy-group', 'local')).toBe(true)
+    expect(store.getFolderWorkspace('legacy-folder', 'ssh:builder')).toBeUndefined()
+  })
+
   it('adapts flat folder-scan groups into sparse nested folder scopes on load', async () => {
     writeDataFile({
       schemaVersion: 1,

src/main/persistence.ts

@@ -229,9 +229,9 @@ import {
   normalizeProjectGroupName,
   normalizeProjectGroups,
   resolveProjectGroupMembership,
-  resolveProjectGroupOwner,
-  resolveFolderWorkspaceProjectGroup
+  resolveProjectGroupOwner
 } from '../shared/project-groups'
+import { resolveFolderWorkspaceProjectGroupWithLegacySsh } from '../shared/folder-workspace-project-group-resolution'
 import { createNestedProjectGroupResolver } from './project-groups/nested-repo-import'
 import {
   mergeLegacyCommitMessageAiIntoSourceControlAi,
@@ -4491,7 +4491,7 @@ export class Store {
     })
     const folderWorkspaces = this.state.folderWorkspaces ?? []
     const removedFolderWorkspaces = folderWorkspaces.filter((workspace) => {
-      const group = resolveFolderWorkspaceProjectGroup(projectGroupIndex, workspace)
+      const group = resolveFolderWorkspaceProjectGroupWithLegacySsh(projectGroupIndex, workspace)
       return group && deletedGroupIdentities.has(getProjectGroupOwnerIdentity(group))
     })
     this.state.folderWorkspaces = folderWorkspaces.filter(

src/main/project-groups/folder-workspace-path-status.ts

@@ -15,7 +15,7 @@ import {
 import { getRepoExecutionHostId, type ExecutionHostId } from '../../shared/execution-host'
 import type { FolderWorkspace, ProjectGroup, Repo } from '../../shared/types'
 import {
-  resolveFolderWorkspaceCatalogOwnerHostId,
+  resolveFolderWorkspaceCatalogOwnerHostIdFromIndex,
   resolveLegacySshFolderWorkspaceProjectGroup
 } from '../../shared/folder-workspaces'
 import type { IFilesystemProvider } from '../providers/types'
@@ -202,7 +202,8 @@ export function resolveFolderWorkspaceStatusPath(args: {
     (entry) =>
       entry.id === request.folderWorkspaceId &&
       (!request.ownerHostId ||
-        resolveFolderWorkspaceCatalogOwnerHostId(entry, projectGroups) === request.ownerHostId)
+        resolveFolderWorkspaceCatalogOwnerHostIdFromIndex(entry, projectGroupIndex) ===
+          request.ownerHostId)
   )
   const workspace = matches.length === 1 ? matches[0] : null
   if (!workspace) {