starred/orca
1
0
Fork 0
mirror of https://github.com/stablyai/orca.git synced 2026-10-25 08:04:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sidebar): preserve project group owner interactions

Browse Source
This commit is contained in:
Brennan Benson
2026-08-10 14:51:25 -07:00
parent bc1714b6f0
commit dfdc6d1c63
21 changed files with 730 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
issue-12532-reduced-candidate-report.md
+31 -31
View File
@@ -1,53 +1,53 @@
# #12532 correction review
# #12532 independent correction review
## Verdict
**NOT CLEAN.** The reviewed candidate `d9d80e705f9bff0722eac14488135ee04c30641f` modified immutable #13611 geometry. The illegal change and its dependent test are reverted locally for another fresh review; PR #13599 was not pushed or retargeted.
**NOT CLEAN.** Exact candidate `bc1714b6f0f29df377ae59181b8fdac8d13ed153` did not fully fix the reported duplicate/overlapping header and blocked-click behavior. The defects are fixed and committed locally; PR #13599 was not pushed or retargeted, PR #13611 was not modified, and Electron QA remains post-clean.
## Gate
| Metric | Limit | Actual |
| ----------- | ----- | ------ |
| Total files | ≤45 | **26** |
| Production | ≤28 | **13** |
| Tests | — | **11** |
| Total files | ≤45 | **41** |
| Production | ≤28 | **21** |
| Tests | — | **18** |
| Docs | — | **2** |
## SHAs
Base/dependency #13611 is `d0271cb46f2871c201f39c51e35356efd4658eac`. The reviewed candidate is `bc1714b6f0f29df377ae59181b8fdac8d13ed153`; the final local correction SHA is reported with worker completion.
| Role | SHA |
| --------------------- | ---------------------------------------------------------------------------------------------- |
| Base (#13611) | `d0271cb46f2871c201f39c51e35356efd4658eac` |
| Reviewed candidate | `d9d80e705f9bff0722eac14488135ee04c30641f` |
| Candidate code commit | `253f8c3f9e48dfec505d7ec96e104f099cf365a1` |
| Archived broad tip | `7c64936ce7` / docs `39d2585a90` on `archive/issue-12532-broad-66file-7c64936-20260810-122250` |
## Defects found and fixed
## Findings fixed
- `getRenderRowKey` discarded owner-qualified folder row keys, so same-ID local/runtime folders still gave TanStack duplicate keys and reused the wrong DOM/fiber during cold render, scrolling, and rebuilds.
- Runtime-stamped folder rows were sectioned from `connectionId` plus the focused default instead of `executionHostId`, splitting them from their runtime group after host-filter rebuilds.
- Rendered headers carried an owner but WorktreeList and WorktreeContextMenu still sent bare group IDs for rename, delete, move, create, reorder, cache lookup, and path-status prefetch; ambiguous calls therefore failed closed or targeted the first owner.
- Project-group drag was disabled by any catalog-wide duplicate. It now permits a filtered single-owner view and remains disabled for a mixed-owner rendered view until bare-ID drag internals are unambiguous.
- Composer group options and initial sidebar launches used bare group IDs. Options and initial selection now carry owner identity, and legacy ownerless restoration fails closed only when the ID is ambiguous.
- Host filtering could turn an owner-qualified header back into a bare key. The global ambiguity set now preserves collapse/render identity across filter rebuilds.
- Candidate-added filesystem-auth tests used wall-clock thresholds. Coverage now asserts deterministic operation shape instead.
- Restored byte identity for `worktree-list-virtual-rows.ts`, `host-section-rows.ts`, and `WorktreeList.tsx` against #13611 SHA `d0271cb46f2871c201f39c51e35356efd4658eac`.
- Retained owner-qualified folder row keys only when the same bare folder ID exists across owners; unambiguous rows keep `folder-workspace:<id>`.
- Removed owner-qualified folder identity propagation from `WorkspaceScope`, worktree/tab/session maps, active workspace IDs, and editor/file routing. Unambiguous folder activation keeps `folder:folder-workspace-1`; same-id ambiguity fails closed.
- Added optional owner selectors only at folder CRUD and path-status preload/IPC/persistence seams. Legacy unambiguous calls keep their prior payload shape, while ambiguous mutations require an exact owner.
- Made persistence folder lookup/update/delete and folder path-status selection fail closed on bare same-id ambiguity without purging a surviving sibling's shared bare session state.
- Scoped project-group removal, move, path auth, and sidebar row/collapse identity by owner without changing unrelated repo/worktree IDs or #13611 header geometry.
- Replaced quadratic filesystem-auth subtree materialization with a linear owner-indexed aggregation plus sorted path indexes; cycles fail closed and a 4,096-level adversarial chain remains bounded.
- Removed the sidebar's per-row full catalog scan by precomputing ambiguous group IDs.
- Corrected owner-qualified folder path-status cache eviction to use the same canonical identity codec as cache creation.
## Issue behavior covered
## Deferred finding
- Cold local + runtime render produces distinct owner-qualified header keys.
- Collapse affects only the selected owner and remains stable through a host-filter rebuild.
- Same-ID folder rows keep distinct virtualizer keys, preventing DOM reuse while scrolling.
- Runtime folder rows remain under their stamped runtime host.
- Header/menu actions, removal selection, path status, cache keys, and composer targets retain the selected owner.
- All-host mixed-owner drag fails closed; a filtered single-owner view can reorder with an explicit mutation owner.
Runtime-stamped folder rows can split from runtime project-group headers in the all-host section view. The frozen `host-section-rows.ts` assigns folder rows from `connectionId` plus one global default and cannot observe runtime owner stamps; fixing that behavior requires a dependency-owned geometry change, so this candidate does not expand scope around it.
## Remote compatibility decision
No new RPC field or stream opcode was introduced by this correction. Existing optional `ownerHostId` selectors remain additive: new clients with old hosts degrade to legacy unambiguous behavior, and current runtime mutations stay bare inside the owning runtime where unambiguous. Publishing an inner SSH owner through one paired runtime would require a separate composite ownership model and capability-aware transport; it is not needed for the reported local + paired-runtime topology and was not added here.
## Validation
- Node `v24.18.0` focused identity/sidebar/host matrix: **784 passed** across **14 files**.
- Node `v24.18.0` node/CLI/web typechecks: pass.
- Full lint, native/type-aware quality, reliability (73 gates), max-lines, skill, and localization gates: pass; baseline oxlint reported only pre-existing `WorktreeJumpPalette` hook warnings.
- Changed-code quality, type-aware quality, and React Doctor: 0 new findings across 24 changed source files.
- `oxfmt --check` on all 26 changed files and `git diff --check`: pass.
- Focused filesystem-auth and path-status performance gates: **20 passed** across **2 files**, including the 4,096-level adversarial hierarchy and 12,208-group cache fixture.
- #13611 `worktree-list-virtual-rows`, `host-section-rows`, and `WorktreeList` geometry: byte-identical to `d0271cb46f2871c201f39c51e35356efd4658eac`.
- Node `v26.5.0` node/CLI/web typechecks: pass.
- Focused candidate/sidebar/composer/auth matrix: **927 passed across 24 files** on Node 24 and again on Node 26.
- Additional runtime-folder regression: pass on Node 24 and Node 26.
- Full lint, native/type-aware quality, 73 reliability gates, max-lines ratchet, skill, and localization gates: pass; only pre-existing `WorktreeJumpPalette` hook warnings were reported.
- Changed-code quality and React Doctor changed gates: 0 new findings across 41 changed files.
- `oxfmt --check` on all edited files and `git diff --check`: pass.
## Remaining work
Another independent reviewer must review the fixed local commit. Because this review found an actionable scope defect, do not push or retarget PR #13599 yet; the runtime folder/header split remains dependency-owned, and Electron QA was intentionally not performed.
The coordinator should review the local correction commit. Because meaningful defects were found, do not push or retarget PR #13599 from this worker result; Electron QA remains intentionally deferred until a later clean review.
issue-12532-reduced-retention-table.md
+22 -14
View File
@@ -1,6 +1,6 @@
# #12532 reduced candidate — retained production file table
**Base:** `d0271cb46f` (#13611 geometry locked)
**Base:** `d0271cb46f` (#13611 dependency; branch never modified)
**Archived broad tip:** `7c64936ce7` / docs `39d2585a90` on `archive/issue-12532-broad-66file-7c64936-20260810-122250`
**Hard gate:** ≤45 total / ≤28 production
@@ -9,7 +9,7 @@
- Bare IDs remain the default when the catalog has a **single** owner for that bare id (legacy `folder:folder-workspace-1` unchanged).
- Owner-qualified refs are used only when **same bare id appears on multiple owners**, or when the caller already supplies `ownerHostId`.
- Ambiguous bare mutate/delete/auth **fails closed**.
- No global rewrite of worktree IDs, tabs, palette, chat, dashboard cards, WorktreeCard/ContextMenu, or #13611 geometry.
- No global rewrite of worktree IDs, tabs, palette, chat, or dashboard cards.
## Retained production files
@@ -28,22 +28,30 @@
| 11 | `src/renderer/src/components/sidebar/worktree-list-groups.ts` | Same-id groups share render and collapse keys | Row model mints both identities |
| 12 | `src/renderer/src/components/sidebar/project-group-sidebar-identity.ts` | Sidebar callers otherwise resolve owners inconsistently | One precomputed sidebar lookup index |
| 13 | `src/renderer/src/store/slices/worktrees.ts` | Bare same-id folder activation selects one owner while tabs still share `folder:<id>` | A bounded guard fails closed without changing workspace/tab identity |
| 14 | `src/renderer/src/components/sidebar/WorktreeList.tsx` | Rendered owner-qualified headers still send bare mutations and composer targets | Interaction handlers must carry the owner selected by the row |
| 15 | `src/renderer/src/components/sidebar/worktree-list-virtual-rows.ts` | Folder rows discard owner-qualified keys, causing virtual DOM reuse | TanStack row keys are minted at this boundary |
| 16 | `src/renderer/src/components/sidebar/host-section-rows.ts` | Runtime folders route from connection/default host instead of their runtime stamp | Host-section assignment owns this projection |
| 17 | `src/renderer/src/components/sidebar/worktree-list-host-filtering.ts` | Runtime path status and filter rebuilds can route the wrong owner | Shared filter/path-status routing must use one host resolver |
| 18 | `src/renderer/src/components/sidebar/WorktreeContextMenu.tsx` | Move/create/remove actions expose foreign-owner groups and send bare selectors | The context menu independently owns these action call sites |
| 19 | `src/renderer/src/lib/new-workspace-project-options.ts` | Duplicate group IDs produce duplicate composer values and first-owner selection | Option identity and parsing live here |
| 20 | `src/renderer/src/hooks/useComposerState.ts` | Selection immediately loses the option owner | Composer state must retain owner through selection and creation |
| 21 | `src/renderer/src/components/NewWorkspaceComposerModal.tsx` | Sidebar initial-group owner is dropped at the modal boundary | Modal data is the launch contract |
**Production count: 13** (≤28). WorktreeList and all header geometry stay on the dependency base; owner selectors stop at sidebar, store, IPC, persistence, path-status, and auth seams.
**Production count: 21** (≤28). Changes to dependency-origin files are narrow and remain only on this stacked candidate branch.
## Explicitly dropped vs broad 38-file tip (and why)
| Dropped | Reason |
| --------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------- |
| WorktreeCard / WorktreeContextMenu | Store fail-closed + optional owner covers delete; card can keep bare id when unambiguous |
| dashboard-snapshot-workspaces | Dashboard identity is unrelated to project-group catalog ownership |
| worktrees.ts bulk dual-read | Prefer bare session keys when unambiguous; avoid global session routing rewrite |
| folder-workspace-session-owner, workspace-session-host-persistence, worktree-runtime-owner | Cascade from always-qualified keys; not needed if default stays bare |
| folder-workspace-worktree | Keep bare synthetic `folder:<id>` when unambiguous |
| folder-workspace-connection, composer helpers/path-status | Not required for adversarial same-id group/folder CRUD |
| project-group-header-drag/drop/contract, move-targets, header-section-boundaries, folder-reveal, host-filtering, rendered-order, virtual-rows | Geometry/drag cascade; #13611 host stamp already unique for virtualizer; drag can follow store owner later if proven |
| ui.ts draft owner field | Optional convenience; not required for fail-closed CRUD |
| repos-runtime-routing-fixture | Test-only support (count under tests if reintroduced) |
| Dropped | Reason |
| ------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------- |
| WorktreeCard | Card workspace identity can keep bare id when unambiguous |
| dashboard-snapshot-workspaces | Dashboard identity is unrelated to project-group catalog ownership |
| worktrees.ts bulk dual-read | Prefer bare session keys when unambiguous; avoid global session routing rewrite |
| folder-workspace-session-owner, workspace-session-host-persistence, worktree-runtime-owner | Cascade from always-qualified keys; not needed if default stays bare |
| folder-workspace-worktree | Keep bare synthetic `folder:<id>` when unambiguous |
| folder-workspace-connection, composer helpers/path-status | Not required for adversarial same-id group/folder CRUD |
| project-group-header-drag/drop/contract, move-targets, header-section-boundaries, rendered-order | Existing contracts remain bare internally; the rendered-view gate guarantees one owner before drag |
| ui.ts draft owner field | Legacy drafts fail closed only for ambiguity; transient sidebar launches carry owner through modal data |
| repos-runtime-routing-fixture | Test-only support (count under tests if reintroduced) |
## Test budget (focused only)
src/main/ipc/filesystem-auth.test.ts
-6
View File
@@ -363,14 +363,11 @@ describe('filesystem-auth path containment', () => {
})
const store = makeStore(repos, { projectGroups, folderWorkspaces })
const started = performance.now()
const allowed = isPathAllowed('/local/group-0', store)
const elapsedMs = performance.now() - started
expect(allowed).toBe(true)
// Why: indexed auth must not re-scan every path for every group/folder on each authorize.
expect(pathReads).toBeLessThan(repoCount * 4)
expect(elapsedMs).toBeLessThan(250)
})
it('bounds deep legacy folder hierarchies without materializing every subtree', () => {
@@ -393,12 +390,9 @@ describe('filesystem-auth path containment', () => {
]
const store = makeStore(repos, { projectGroups, folderWorkspaces: [] })
const started = performance.now()
const allowed = isPathAllowed('/legacy/root', store)
const elapsedMs = performance.now() - started
expect(allowed).toBe(false)
expect(elapsedMs).toBeLessThan(250)
})
it.skipIf(process.platform === 'win32')(
src/renderer/src/components/NewWorkspaceComposerModal.tsx
+3
View File
@@ -26,6 +26,7 @@ import type {
WorkspaceStatus
} from '../../../shared/types'
import type { TaskSourceContext } from '../../../shared/task-source-context'
import type { ExecutionHostId } from '../../../shared/execution-host'
import { translate } from '@/i18n/i18n'
import { getWorkspaceComposerInitialFocusTarget } from '@/lib/workspace-composer-initial-focus'
import { getFolderWorkspacePrimaryActionLabel } from '@/components/sidebar/folder-workspace-composer-helpers'
@@ -41,6 +42,7 @@ type ComposerModalData = {
initialRepoId?: string
initialEphemeralVmRecipeId?: string
initialProjectGroupId?: string
initialProjectGroupOwnerHostId?: ExecutionHostId
linkedWorkItem?: LinkedWorkItemSummary | null
initialGitHubWorkItem?: GitHubWorkItem | null
taskSourceContext?: TaskSourceContext | null
@@ -141,6 +143,7 @@ function QuickTabBody({
initialRepoId: modalData.initialRepoId,
initialEphemeralVmRecipeId: modalData.initialEphemeralVmRecipeId,
initialProjectGroupId: modalData.initialProjectGroupId,
initialProjectGroupOwnerHostId: modalData.initialProjectGroupOwnerHostId,
initialWorkspaceStatus: modalData.initialWorkspaceStatus,
...(modalData.initialBaseBranch ? { initialBaseBranch: modalData.initialBaseBranch } : {}),
persistDraft: false,
src/renderer/src/components/sidebar/WorktreeContextMenu.test.ts
+22 -1
View File
@@ -1,5 +1,6 @@
import { describe, expect, it } from 'vitest'
import {
getContextMenuProjectGroupTargets,
isContextWorktreeDeletable,
shouldUseNativeContextMenu,
shouldIgnoreNestedWorktreeContextMenuScope,
@@ -14,7 +15,27 @@ import {
selectMenuScopedMap,
shouldRevealWorktreeDeveloperMenu
} from './WorktreeContextMenu'
import type { Worktree, WorktreeLineage, WorkspaceStatusDefinition } from '../../../../shared/types'
import type {
ProjectGroup,
Worktree,
WorktreeLineage,
WorkspaceStatusDefinition
} from '../../../../shared/types'
describe('getContextMenuProjectGroupTargets', () => {
const group = (executionHostId: 'local' | 'runtime:env-1'): ProjectGroup =>
({ id: 'same-id', executionHostId }) as ProjectGroup
it('offers and mutates only groups owned by the repo host', () => {
const result = getContextMenuProjectGroupTargets(
{ connectionId: null, executionHostId: 'runtime:env-1' },
[group('local'), group('runtime:env-1')]
)
expect(result.ownerHostId).toBe('runtime:env-1')
expect(result.projectGroups).toEqual([group('runtime:env-1')])
})
})
describe('shouldRevealWorktreeDeveloperMenu', () => {
it('stays hidden for an ordinary right-click', () => {
src/renderer/src/components/sidebar/WorktreeContextMenu.tsx
+35 -7
View File
@@ -35,6 +35,7 @@ import type { AppState } from '@/store/types'
import { useAllWorktrees, useRepoById, useRepoMap, useWorktreeMap } from '@/store/selectors'
import { cn } from '@/lib/utils'
import type {
ProjectGroup,
Repo,
Worktree,
WorkspaceStatus,
@@ -67,6 +68,11 @@ import {
parseWorkspaceKey,
worktreeWorkspaceKey
} from '../../../../shared/workspace-scope'
import { getRepoExecutionHostId, type ExecutionHostId } from '../../../../shared/execution-host'
import {
getProjectGroupOwnerHostId,
getProjectGroupOwnerIdentity
} from '../../../../shared/project-groups'
type Props = {
worktree: Worktree
@@ -111,6 +117,19 @@ export function selectMenuScopedMap<T>(menuOpen: boolean, live: T, empty: T): T
return menuOpen ? live : empty
}
export function getContextMenuProjectGroupTargets(
repo: Pick<Repo, 'connectionId' | 'executionHostId'>,
projectGroups: readonly ProjectGroup[]
): { ownerHostId: ExecutionHostId; projectGroups: readonly ProjectGroup[] } {
const ownerHostId = getRepoExecutionHostId(repo)
return {
ownerHostId,
projectGroups: projectGroups.filter(
(group) => getProjectGroupOwnerHostId(group) === ownerHostId
)
}
}
// Why: the Developer submenu is hidden by default and revealed only by holding
// Option/Alt at right-click. altKey is the same physical key on every platform
// (Option on macOS, Alt on Windows/Linux), so no platform branch is needed.
@@ -335,6 +354,10 @@ const WorktreeContextMenu = React.memo(function WorktreeContextMenu({
const deleteFolderWorkspace = useAppStore((s) => s.deleteFolderWorkspace)
const setActiveWorktree = useAppStore((s) => s.setActiveWorktree)
const repo = useRepoById(worktree.repoId)
const projectGroupTargets = useMemo(
() => (repo ? getContextMenuProjectGroupTargets(repo, projectGroups) : null),
[projectGroups, repo]
)
const deleteState = useAppStore((s) => s.deleteStateByWorktreeId[worktree.id])
const [menuOpen, setMenuOpen] = useState(false)
// Why: the Developer submenu is a power-user affordance, so it is revealed by
@@ -579,9 +602,10 @@ const WorktreeContextMenu = React.memo(function WorktreeContextMenu({
if (!repo) {
return
}
const group = await createProjectGroup(name)
const ownerHostId = getRepoExecutionHostId(repo)
const group = await createProjectGroup(name, { ownerHostId })
if (group) {
await moveProjectToGroup(repo.id, group.id)
await moveProjectToGroup(repo.id, group.id, undefined, { ownerHostId })
}
},
[createProjectGroup, moveProjectToGroup, repo]
@@ -592,7 +616,9 @@ const WorktreeContextMenu = React.memo(function WorktreeContextMenu({
if (!repo || repo.projectGroupId === groupId) {
return
}
void moveProjectToGroup(repo.id, groupId)
void moveProjectToGroup(repo.id, groupId, undefined, {
ownerHostId: getRepoExecutionHostId(repo)
})
},
[moveProjectToGroup, repo]
)
@@ -601,7 +627,9 @@ const WorktreeContextMenu = React.memo(function WorktreeContextMenu({
if (!repo) {
return
}
void moveProjectToGroup(repo.id, null)
void moveProjectToGroup(repo.id, null, undefined, {
ownerHostId: getRepoExecutionHostId(repo)
})
}, [moveProjectToGroup, repo])
const handleAssignWorkspaceStatus = useCallback(
@@ -947,7 +975,7 @@ const WorktreeContextMenu = React.memo(function WorktreeContextMenu({
'New group from project'
)}
</DropdownMenuItem>
{projectGroups.length > 0 ? (
{projectGroupTargets && projectGroupTargets.projectGroups.length > 0 ? (
<DropdownMenuSub>
<DropdownMenuSubTrigger disabled={isDeleting}>
<FolderInput className="size-3.5" />
@@ -957,9 +985,9 @@ const WorktreeContextMenu = React.memo(function WorktreeContextMenu({
)}
</DropdownMenuSubTrigger>
<DropdownMenuSubContent>
{projectGroups.map((group) => (
{projectGroupTargets.projectGroups.map((group) => (
<DropdownMenuItem
key={group.id}
key={getProjectGroupOwnerIdentity(group)}
disabled={repo.projectGroupId === group.id}
onSelect={() => handleMoveProjectToGroup(group.id)}
>
src/renderer/src/components/sidebar/WorktreeList.tsx
+156 -39
View File
@@ -42,6 +42,7 @@ import {
getRepoHeaderSectionEndByRepoId
} from './worktree-header-section-boundaries'
import { folderWorkspaceToWorktree } from '../../../../shared/folder-workspace-worktree'
import { resolveFolderWorkspaceCatalogOwnerHostId } from '../../../../shared/folder-workspaces'
import { PendingWorktreeRow } from './PendingWorktreeRow'
import { SUPPRESS_WORKTREE_LIST_SCROLL_ADJUSTMENT_EVENT } from './WorktreeCardAgents'
import { Button } from '@/components/ui/button'
@@ -310,6 +311,14 @@ import {
import { getFolderWorkspaceCardPrDisplay } from './folder-workspace-card-pr-display'
import { getRenderedWorktreesInSidebarOrder } from './worktree-sidebar-row-preference'
import { getCyclableWorktreeIds, resolveCycledWorktreeId } from './worktree-keyboard-cycle'
import {
buildProjectGroupSidebarIndex,
getProjectGroupMutationSelector,
getProjectGroupSidebarIdentity,
getSingleProjectGroupMutationOwner,
parseProjectGroupSidebarHeaderKey,
type ProjectGroupMutationSelector
} from './project-group-sidebar-identity'
export {
getScrollTopToRevealBounds,
@@ -318,10 +327,9 @@ export {
type ProjectGroupNameDialogState =
| { type: 'create-from-repo'; repo: Repo }
| { type: 'rename'; groupId: string; currentName: string }
| ({ type: 'rename'; currentName: string } & ProjectGroupMutationSelector)
type ProjectGroupDeleteDialogState = {
groupId: string
type ProjectGroupDeleteDialogState = ProjectGroupMutationSelector & {
groupName: string
removeContainedProjects: boolean
}
@@ -582,9 +590,19 @@ function getRepoIdsFromHeaderRowKey(
function getProjectGroupAncestorKeys(
projectGroupId: string | null | undefined,
projectGroups: readonly ProjectGroup[]
projectGroups: readonly ProjectGroup[],
ownerHostId?: ExecutionHostId
): string[] {
const groupsById = new Map(projectGroups.map((group) => [group.id, group]))
const ownerGroups = ownerHostId
? projectGroups.filter(
(group) => getProjectGroupMutationSelector(group).ownerHostId === ownerHostId
)
: projectGroups
const groupsById = new Map(ownerGroups.map((group) => [group.id, group]))
const groupIdCounts = new Map<string, number>()
for (const group of projectGroups) {
groupIdCounts.set(group.id, (groupIdCounts.get(group.id) ?? 0) + 1)
}
const keys: string[] = []
const seen = new Set<string>()
let currentGroupId = projectGroupId ?? null
@@ -594,7 +612,9 @@ function getProjectGroupAncestorKeys(
break
}
seen.add(currentGroupId)
keys.unshift(getProjectGroupHeaderKey(group.id))
keys.unshift(
getProjectGroupHeaderKey(group.id, groupIdCounts.get(group.id)! > 1 ? ownerHostId : undefined)
)
currentGroupId = group.parentGroupId
}
return keys
@@ -607,9 +627,21 @@ function getSidebarRowRevealAncestorKeys(args: {
projectGrouping?: ProjectGroupingModel
}): string[] {
if (args.rowKey.startsWith('project-group:')) {
const groupId = args.rowKey.slice('project-group:'.length)
const group = args.projectGroups.find((candidate) => candidate.id === groupId)
return getProjectGroupAncestorKeys(group?.parentGroupId, args.projectGroups)
const selector = parseProjectGroupSidebarHeaderKey(args.rowKey)
if (!selector) {
return []
}
const group = args.projectGroups.find(
(candidate) =>
candidate.id === selector.groupId &&
(!selector.ownerHostId ||
getProjectGroupMutationSelector(candidate).ownerHostId === selector.ownerHostId)
)
return getProjectGroupAncestorKeys(
group?.parentGroupId,
args.projectGroups,
selector.ownerHostId
)
}
const keys = new Set<string>()
for (const repoId of getRepoIdsFromHeaderRowKey(
@@ -618,7 +650,11 @@ function getSidebarRowRevealAncestorKeys(args: {
args.projectGrouping
)) {
const repo = args.repoMap.get(repoId)
for (const key of getProjectGroupAncestorKeys(repo?.projectGroupId, args.projectGroups)) {
for (const key of getProjectGroupAncestorKeys(
repo?.projectGroupId,
args.projectGroups,
repo ? getRepoExecutionHostId(repo) : undefined
)) {
keys.add(key)
}
}
@@ -658,8 +694,8 @@ type VirtualizedWorktreeViewportProps = {
handleCreateGroupFromRepo: (repo: Repo) => void
handleMoveProjectToGroup: (repo: Repo, groupId: string) => void
handleRemoveProjectFromGroup: (repo: Repo) => void
handleRenameProjectGroup: (groupId: string, currentName: string) => void
handleDeleteProjectGroup: (groupId: string, groupName: string) => void
handleRenameProjectGroup: (projectGroup: ProjectGroup, currentName: string) => void
handleDeleteProjectGroup: (projectGroup: ProjectGroup, groupName: string) => void
handleCreateFolderWorkspace: (projectGroup: ProjectGroup) => void
activeModal: string
pendingRevealWorktree: PendingSidebarWorktreeReveal | null
@@ -1449,7 +1485,26 @@ const VirtualizedWorktreeViewport = React.memo(function VirtualizedWorktreeViewp
const suppressWorktreeClickUntilRef = useRef(0)
const hasProjectGroups = projectGroups.length > 0
const canReorderRepoHeaders = groupBy === 'repo' && projectOrderBy === 'manual'
const canReorderProjectGroupHeaders = groupBy === 'repo' && hasProjectGroups
const renderedProjectGroupsForHeaderDrag = useMemo(() => {
const byIdentity = new Map<string, ProjectGroup>()
for (const row of rows) {
if (
row.type === 'header' &&
row.projectGroup &&
typeof row.projectGroup.id === 'string' &&
!row.repo
) {
byIdentity.set(getProjectGroupSidebarIdentity(row.projectGroup), row.projectGroup)
}
}
return [...byIdentity.values()]
}, [rows])
const projectGroupHeaderMutationOwner = getSingleProjectGroupMutationOwner(
renderedProjectGroupsForHeaderDrag
)
// Why: bare-id drag internals are safe only when the rendered view has one explicit owner.
const canReorderProjectGroupHeaders =
groupBy === 'repo' && projectGroupHeaderMutationOwner !== null
const moveProjectToGroup = useAppStore((s) => s.moveProjectToGroup)
const updateProjectGroup = useAppStore((s) => s.updateProjectGroup)
const lastVisibleRefreshKeyRef = useRef('')
@@ -1474,8 +1529,8 @@ const VirtualizedWorktreeViewport = React.memo(function VirtualizedWorktreeViewp
[projectGroups]
)
const projectGroupByIdForHeaderDrag = useMemo(
() => new Map(projectGroups.map((group) => [group.id, group])),
[projectGroups]
() => new Map(renderedProjectGroupsForHeaderDrag.map((group) => [group.id, group])),
[renderedProjectGroupsForHeaderDrag]
)
useEffect(
@@ -1741,9 +1796,14 @@ const VirtualizedWorktreeViewport = React.memo(function VirtualizedWorktreeViewp
}, [sidebarProjectGroupHeaderIdsByBucket])
const commitProjectGroupOrder = useCallback(
(repoId: string, projectGroupId: string | null, order: number) => {
void moveProjectToGroup(repoId, projectGroupId, order)
const repo = repoMap.get(repoId)
if (repo) {
void moveProjectToGroup(repoId, projectGroupId, order, {
ownerHostId: getRepoExecutionHostId(repo)
})
}
},
[moveProjectToGroup]
[moveProjectToGroup, repoMap]
)
const commitProjectGroupHeaderOrder = useCallback(
(groupId: string, tabOrder: number) => {
@@ -1754,9 +1814,19 @@ const VirtualizedWorktreeViewport = React.memo(function VirtualizedWorktreeViewp
window.performance.now() + USER_SCROLL_MEASUREMENT_ADJUSTMENT_SUPPRESS_MS
suppressMeasurementAdjustmentUntilRef.current = suppressUntil
directScrollInputUntilRef.current = suppressUntil
void updateProjectGroup(groupId, { tabOrder })
const group = projectGroupByIdForHeaderDrag.get(groupId)
if (!group) {
return
}
void updateProjectGroup(
groupId,
{ tabOrder },
{
ownerHostId: getProjectGroupMutationSelector(group).ownerHostId
}
)
},
[updateProjectGroup]
[projectGroupByIdForHeaderDrag, updateProjectGroup]
)
// Drag applies only in manual order; still construct the controller inert for stable hook order.
const repoDrag = useRepoHeaderDrag({
@@ -1920,13 +1990,22 @@ const VirtualizedWorktreeViewport = React.memo(function VirtualizedWorktreeViewp
>()
for (const group of projectGroups) {
if (group.parentPath) {
const request = { scope: 'project-group' as const, projectGroupId: group.id }
const request = {
scope: 'project-group' as const,
projectGroupId: group.id,
ownerHostId: getProjectGroupMutationSelector(group).ownerHostId
}
const options = getFolderPathStatusRouteOptions(request)
requests.set(getFolderWorkspacePathStatusCacheKey(request, options), { request, options })
}
}
for (const workspace of folderWorkspaces) {
const request = { scope: 'folder-workspace' as const, folderWorkspaceId: workspace.id }
const ownerHostId = resolveFolderWorkspaceCatalogOwnerHostId(workspace, projectGroups)
const request = {
scope: 'folder-workspace' as const,
folderWorkspaceId: workspace.id,
...(ownerHostId ? { ownerHostId } : {})
}
const options = getFolderPathStatusRouteOptions(request)
requests.set(getFolderWorkspacePathStatusCacheKey(request, options), { request, options })
}
@@ -4187,7 +4266,8 @@ const VirtualizedWorktreeViewport = React.memo(function VirtualizedWorktreeViewp
row.projectGroup.parentPath
? getCachedFolderWorkspacePathStatus({
scope: 'project-group',
projectGroupId: row.projectGroup.id
projectGroupId: row.projectGroup.id,
ownerHostId: row.projectGroupOwnerHostId
})
: null
const folderWorkspaceCreateDisabled =
@@ -4432,7 +4512,7 @@ const VirtualizedWorktreeViewport = React.memo(function VirtualizedWorktreeViewp
<DropdownMenuItem
onSelect={() => {
if (row.projectGroup?.id) {
handleRenameProjectGroup(row.projectGroup.id, row.label)
handleRenameProjectGroup(row.projectGroup, row.label)
}
}}
>
@@ -4445,7 +4525,7 @@ const VirtualizedWorktreeViewport = React.memo(function VirtualizedWorktreeViewp
variant="destructive"
onSelect={() => {
if (row.projectGroup?.id) {
handleDeleteProjectGroup(row.projectGroup.id, row.label)
handleDeleteProjectGroup(row.projectGroup, row.label)
}
}}
>
@@ -5051,7 +5131,9 @@ const VirtualizedWorktreeViewport = React.memo(function VirtualizedWorktreeViewp
const folderWorktree = folderWorkspaceToWorktree(folderWorkspaceRow.folderWorkspace)
const folderWorkspacePathStatus = getCachedFolderWorkspacePathStatus({
scope: 'folder-workspace',
folderWorkspaceId: folderWorkspaceRow.folderWorkspace.id
folderWorkspaceId: folderWorkspaceRow.folderWorkspace.id,
ownerHostId: getProjectGroupMutationSelector(folderWorkspaceRow.projectGroup)
.ownerHostId
})
const folderWorkspaceActivationDisabled =
folderWorkspacePathStatus?.exists === false &&
@@ -5633,6 +5715,10 @@ const WorktreeList = React.memo(function WorktreeList({
() => filterProjectGroupsForVisibleHosts(projectGroups, visibleHostIdSet, defaultHostId),
[defaultHostId, projectGroups, visibleHostIdSet]
)
const ownerQualifiedProjectGroupIds = useMemo(
() => buildProjectGroupSidebarIndex(projectGroups).ambiguousIds,
[projectGroups]
)
const visibleFolderWorkspacesForRows = useMemo(
() =>
filterFolderWorkspacesForVisibleHosts(
@@ -5756,7 +5842,8 @@ const WorktreeList = React.memo(function WorktreeList({
visibleFolderWorkspacesForRows,
hostLabelById,
defaultHostId,
pinnedDisplayPolicy
pinnedDisplayPolicy,
ownerQualifiedProjectGroupIds
),
[
groupBy,
@@ -5779,7 +5866,8 @@ const WorktreeList = React.memo(function WorktreeList({
newExternalWorktreesInboxByRepo,
pendingCreations,
hostLabelById,
pinnedDisplayPolicy
pinnedDisplayPolicy,
ownerQualifiedProjectGroupIds
]
)
const orderedHostOptions = useMemo(
@@ -6189,20 +6277,28 @@ const WorktreeList = React.memo(function WorktreeList({
if (repo.projectGroupId === groupId) {
return
}
void moveProjectToGroup(repo.id, groupId)
void moveProjectToGroup(repo.id, groupId, undefined, {
ownerHostId: getRepoExecutionHostId(repo)
})
},
[moveProjectToGroup]
)
const handleRemoveProjectFromGroup = useCallback(
(repo: Repo) => {
void moveProjectToGroup(repo.id, null)
void moveProjectToGroup(repo.id, null, undefined, {
ownerHostId: getRepoExecutionHostId(repo)
})
},
[moveProjectToGroup]
)
const handleRenameProjectGroup = useCallback((groupId: string, currentName: string) => {
setProjectGroupNameDialog({ type: 'rename', groupId, currentName })
const handleRenameProjectGroup = useCallback((group: ProjectGroup, currentName: string) => {
setProjectGroupNameDialog({
type: 'rename',
currentName,
...getProjectGroupMutationSelector(group)
})
}, [])
const handleSubmitProjectGroupName = useCallback(
@@ -6211,13 +6307,22 @@ const WorktreeList = React.memo(function WorktreeList({
return
}
if (projectGroupNameDialog.type === 'create-from-repo') {
const group = await createProjectGroup(name)
const ownerHostId = getRepoExecutionHostId(projectGroupNameDialog.repo)
const group = await createProjectGroup(name, { ownerHostId })
if (group) {
await moveProjectToGroup(projectGroupNameDialog.repo.id, group.id)
await moveProjectToGroup(projectGroupNameDialog.repo.id, group.id, undefined, {
ownerHostId
})
}
return
}
await updateProjectGroup(projectGroupNameDialog.groupId, { name })
await updateProjectGroup(
projectGroupNameDialog.groupId,
{ name },
{
ownerHostId: projectGroupNameDialog.ownerHostId
}
)
},
[createProjectGroup, moveProjectToGroup, projectGroupNameDialog, updateProjectGroup]
)
@@ -6226,8 +6331,14 @@ const WorktreeList = React.memo(function WorktreeList({
if (!projectGroupDeleteDialog) {
return null
}
return selectProjectGroupRemovalTargets(projectGroups, repos, projectGroupDeleteDialog.groupId)
}, [projectGroupDeleteDialog, projectGroups, repos])
return selectProjectGroupRemovalTargets(
projectGroups,
repos,
projectGroupDeleteDialog.groupId,
projectGroupDeleteDialog.ownerHostId,
folderWorkspaces
)
}, [folderWorkspaces, projectGroupDeleteDialog, projectGroups, repos])
const projectGroupDeleteProjectCount = projectGroupDeleteTargets?.projectIds.length ?? 0
const projectGroupDeleteProjectNames = useMemo(
() =>
@@ -6239,8 +6350,12 @@ const WorktreeList = React.memo(function WorktreeList({
const projectGroupRemoveContainedProjects =
projectGroupDeleteProjectCount > 0 && projectGroupDeleteDialog?.removeContainedProjects === true
const handleDeleteProjectGroup = useCallback((groupId: string, groupName: string) => {
setProjectGroupDeleteDialog({ groupId, groupName, removeContainedProjects: false })
const handleDeleteProjectGroup = useCallback((group: ProjectGroup, groupName: string) => {
setProjectGroupDeleteDialog({
...getProjectGroupMutationSelector(group),
groupName,
removeContainedProjects: false
})
}, [])
const handleConfirmDeleteProjectGroup = useCallback(async () => {
@@ -6251,7 +6366,8 @@ const WorktreeList = React.memo(function WorktreeList({
const result = await deleteProjectGroupWithContainedProjects(
projectGroupDeleteDialog.groupId,
{
removeContainedProjects: projectGroupRemoveContainedProjects
removeContainedProjects: projectGroupRemoveContainedProjects,
ownerHostId: projectGroupDeleteDialog.ownerHostId
}
)
// Why: a missing group is already the desired end state, so only a real delete failure warrants a toast.
@@ -6308,6 +6424,7 @@ const WorktreeList = React.memo(function WorktreeList({
}
openModal('new-workspace-composer', {
initialProjectGroupId: projectGroup.id,
initialProjectGroupOwnerHostId: getProjectGroupMutationSelector(projectGroup).ownerHostId,
telemetrySource: 'sidebar'
})
},
src/renderer/src/components/sidebar/host-section-rows.ts
+8 -8
View File
@@ -13,6 +13,7 @@ import type { RuntimeCompatVerdict } from '../../../../shared/protocol-compat'
import type { SshConnectionStatus } from '../../../../shared/ssh-types'
import type { FolderWorkspace, ProjectGroup, Repo } from '../../../../shared/types'
import type { Row } from './worktree-list-groups'
import { getFolderWorkspaceExecutionHostIdForRows } from './worktree-list-host-filtering'
export type HostHeaderRow = {
type: 'host-header'
@@ -54,17 +55,16 @@ function getRepoHostId(
return defaultHostId
}
function getSshHostId(connectionId: string): ExecutionHostId {
return `ssh:${encodeURIComponent(connectionId)}` as ExecutionHostId
}
function getFolderWorkspaceHostId(
folderWorkspace: Pick<FolderWorkspace, 'connectionId'>,
projectGroup: Pick<ProjectGroup, 'connectionId'>,
folderWorkspace: Pick<FolderWorkspace, 'connectionId' | 'executionHostId'>,
projectGroup: Pick<ProjectGroup, 'connectionId' | 'executionHostId'>,
defaultHostId: ExecutionHostId
): ExecutionHostId {
const connectionId = folderWorkspace.connectionId ?? projectGroup.connectionId
return connectionId ? getSshHostId(connectionId) : defaultHostId
return getFolderWorkspaceExecutionHostIdForRows({
folderWorkspace,
projectGroup,
defaultHostId
})
}
function getRowHostId(row: Row, defaultHostId: ExecutionHostId): ExecutionHostId | null {
src/renderer/src/components/sidebar/host-section-runtime-folder-rows.test.ts
+99
View File
@@ -0,0 +1,99 @@
import { describe, expect, it } from 'vitest'
import type { FolderWorkspace, ProjectGroup } from '../../../../shared/types'
import type { Row } from './worktree-list-groups'
import { addHostSectionRows } from './host-section-rows'
describe('runtime folder host section rows', () => {
it('keeps a runtime-stamped folder under its host after a filter rebuild', () => {
const projectGroup = {
id: 'group-1',
name: 'Remote folder',
executionHostId: 'runtime:env-2',
parentPath: '/workspace',
parentGroupId: null,
createdFrom: 'manual',
tabOrder: 0,
isCollapsed: false,
color: null,
createdAt: 1,
updatedAt: 1
} satisfies ProjectGroup
const folderWorkspace = {
id: 'folder-1',
projectGroupId: projectGroup.id,
name: 'Runtime workspace',
folderPath: '/workspace',
executionHostId: 'runtime:env-2',
linkedTask: null,
comment: '',
isArchived: false,
isUnread: false,
isPinned: false,
sortOrder: 0,
lastActivityAt: 1,
createdAt: 1,
updatedAt: 1
} satisfies FolderWorkspace
const localProjectGroup = {
...projectGroup,
id: 'local-group',
name: 'Local folder',
executionHostId: 'local'
} satisfies ProjectGroup
const localFolderWorkspace = {
...folderWorkspace,
id: 'local-folder',
projectGroupId: localProjectGroup.id,
name: 'Local workspace',
executionHostId: 'local'
} satisfies FolderWorkspace
const rows: Row[] = [
{
type: 'folder-workspace',
key: 'folder-workspace:local:local-folder',
folderWorkspace: localFolderWorkspace,
projectGroup: localProjectGroup,
depth: 0,
groupDepth: 0
},
{
type: 'folder-workspace',
key: 'folder-workspace:runtime%3Aenv-2:folder-1',
folderWorkspace,
projectGroup,
depth: 0,
groupDepth: 0
}
]
const sectioned = addHostSectionRows({
rows,
hostOptions: [
{
id: 'local',
kind: 'local',
label: 'Local Mac',
detail: 'This computer',
health: 'local'
},
{
id: 'runtime:env-2',
kind: 'runtime',
label: 'env-2',
detail: 'Orca server',
health: 'available'
}
],
workspaceHostScope: 'all',
visibleWorkspaceHostIds: ['runtime:env-2', 'local'],
defaultHostId: 'local'
})
expect(sectioned.map((row) => (row.type === 'item' ? row.rowKey : row.key))).toEqual([
'host:local',
'folder-workspace:local:local-folder',
'host:runtime:env-2',
'folder-workspace:runtime%3Aenv-2:folder-1'
])
})
})
src/renderer/src/components/sidebar/project-group-header-dom.test.ts
+1 -1
View File
@@ -20,7 +20,7 @@ describe('Project Group header drag DOM source', () => {
const source = readWorktreeListSource()
expect(source).toContain('const updateProjectGroup = useAppStore((s) => s.updateProjectGroup)')
expect(source).toContain('void updateProjectGroup(groupId, { tabOrder })')
expect(source).toContain('ownerHostId: getProjectGroupMutationSelector(group).ownerHostId')
})
it('keeps grab cursor on the title surface and dual handle attrs on row + surface', () => {
src/renderer/src/components/sidebar/project-group-sidebar-identity.test.ts
+25 -1
View File
@@ -5,8 +5,11 @@ import {
buildProjectGroupSidebarIndex,
findProjectGroupForSidebarOwner,
getAmbiguousFolderWorkspaceSidebarIds,
getProjectGroupMutationSelector,
getProjectGroupSidebarIdentity,
hasSingleProjectGroupMutationOwner
getSingleProjectGroupMutationOwner,
hasSingleProjectGroupMutationOwner,
parseProjectGroupSidebarHeaderKey
} from './project-group-sidebar-identity'
function group(id: string, executionHostId: string): ProjectGroup {
@@ -61,6 +64,19 @@ describe('project-group sidebar identity', () => {
expect(getProjectGroupSidebarIdentity(local)).not.toBe(getProjectGroupSidebarIdentity(runtime))
})
it('carries the exact owner from a rendered header into mutations', () => {
const runtime = group('same-id', 'runtime:env-1')
expect(getProjectGroupMutationSelector(runtime)).toEqual({
groupId: 'same-id',
ownerHostId: 'runtime:env-1'
})
expect(parseProjectGroupSidebarHeaderKey('project-group:runtime%3Aenv-1:same-id')).toEqual({
groupId: 'same-id',
ownerHostId: 'runtime:env-1'
})
})
it('marks folder row ids ambiguous only across owners', () => {
const local = group('local-group', 'local')
const runtime = group('runtime-group', 'runtime:env-1')
@@ -91,4 +107,12 @@ describe('project-group sidebar identity', () => {
expect(hasSingleProjectGroupMutationOwner([localA, localB], 'runtime:env-1')).toBe(false)
expect(hasSingleProjectGroupMutationOwner([localA, runtime], 'local')).toBe(false)
})
it('allows header reorder after filtering duplicate ids to one owner', () => {
const local = group('same-id', 'local')
const runtime = group('same-id', 'runtime:env-1')
expect(getSingleProjectGroupMutationOwner([local, runtime])).toBeNull()
expect(getSingleProjectGroupMutationOwner([runtime])).toBe('runtime:env-1')
})
})
src/renderer/src/components/sidebar/project-group-sidebar-identity.ts
+21
View File
@@ -12,6 +12,11 @@ import {
export type ProjectGroupSidebarIdentity = string
export type ProjectGroupMutationSelector = {
groupId: string
ownerHostId: ExecutionHostId
}
export function getProjectGroupOwnerHostId(
group: Pick<ProjectGroup, 'connectionId' | 'executionHostId'>
): ExecutionHostId {
@@ -24,6 +29,12 @@ export function getProjectGroupSidebarIdentity(
return getProjectGroupOwnerIdentity(group)
}
export function getProjectGroupMutationSelector(
group: Pick<ProjectGroup, 'id' | 'connectionId' | 'executionHostId'>
): ProjectGroupMutationSelector {
return { groupId: group.id, ownerHostId: getProjectGroupOwnerHostId(group) }
}
export function hasSingleProjectGroupMutationOwner(
groups: readonly ProjectGroup[],
routedHostId: ExecutionHostId
@@ -34,6 +45,16 @@ export function hasSingleProjectGroupMutationOwner(
return groups.every((group) => getProjectGroupOwnerHostId(group) === routedHostId)
}
export function getSingleProjectGroupMutationOwner(
groups: readonly ProjectGroup[]
): ExecutionHostId | null {
const ownerHostId = groups[0] ? getProjectGroupOwnerHostId(groups[0]) : null
if (!ownerHostId || !hasSingleProjectGroupMutationOwner(groups, ownerHostId)) {
return null
}
return new Set(groups.map((group) => group.id)).size === groups.length ? ownerHostId : null
}
export function parseProjectGroupSidebarHeaderKey(
key: string
): { groupId: string; ownerHostId?: ExecutionHostId } | null {
src/renderer/src/components/sidebar/worktree-list-groups.ts
+7 -2
View File
@@ -1058,7 +1058,8 @@ export function buildRows(
folderWorkspaces: readonly FolderWorkspace[] = [],
hostLabelById?: ReadonlyMap<string, string>,
defaultHostId: ExecutionHostId = LOCAL_EXECUTION_HOST_ID,
pinnedDisplayPolicy: PinnedWorktreeDisplayPolicy = getPinnedWorktreeDisplayPolicy(settings)
pinnedDisplayPolicy: PinnedWorktreeDisplayPolicy = getPinnedWorktreeDisplayPolicy(settings),
ownerQualifiedProjectGroupIds: ReadonlySet<string> = new Set()
): Row[] {
const result: Row[] = []
const projectIndex = buildProjectGroupingIndex(projectGrouping)
@@ -1560,7 +1561,11 @@ export function buildRows(
const repoEntries = sortRepoEntriesWithinGroup(groupByProjectGroupIdentity.get(identity) ?? [])
const childGroups = childGroupsByParentIdentity.get(identity) ?? []
// Why: bare project-group:<id> stays when the bare id is unique; only same-id multi-owner rows need owner stamps.
const keyOwner = projectGroupIndex.ambiguousIds.has(projectGroup.id) ? ownerHostId : undefined
const keyOwner =
projectGroupIndex.ambiguousIds.has(projectGroup.id) ||
ownerQualifiedProjectGroupIds.has(projectGroup.id)
? ownerHostId
: undefined
const key = getProjectGroupHeaderKey(projectGroup.id, keyOwner)
// Why: same-id groups on distinct owners collapse independently in persisted sidebar state.
const collapseKey = getProjectGroupHeaderKey(projectGroup.id, keyOwner)
src/renderer/src/components/sidebar/worktree-list-host-filtering.test.ts
+16
View File
@@ -92,6 +92,22 @@ describe('WorktreeList host filtering ownership', () => {
).toEqual({ runtimeEnvironmentId: 'env-1' })
})
it('routes duplicate project-group ids from the request owner', () => {
const localGroup = group({ id: 'same-id' })
expect(
getFolderPathStatusRouteOptionsForRows({
request: {
scope: 'project-group',
projectGroupId: 'same-id',
ownerHostId: 'runtime:env-1'
},
projectGroupsById: new Map([[localGroup.id, localGroup]]),
folderWorkspacesById: new Map()
})
).toEqual({ runtimeEnvironmentId: 'env-1' })
})
it('routes folder-workspace path status through its project group runtime owner', () => {
const runtimeGroup = group({ executionHostId: 'runtime:env-1' })
const workspace = folderWorkspace({ connectionId: 'ssh-builder' })
src/renderer/src/components/sidebar/worktree-list-host-filtering.ts
+5
View File
@@ -121,6 +121,11 @@ export function getFolderPathStatusRouteOptionsForRows({
projectGroupsById: ReadonlyMap<string, ProjectGroup>
folderWorkspacesById: ReadonlyMap<string, FolderWorkspace>
}): { runtimeEnvironmentId: string | null } | undefined {
if (request.scope !== 'path' && request.ownerHostId) {
return {
runtimeEnvironmentId: getRuntimeEnvironmentIdForFolderPathStatusHost(request.ownerHostId)
}
}
const folderWorkspace =
request.scope === 'folder-workspace'
? folderWorkspacesById.get(request.folderWorkspaceId)
src/renderer/src/components/sidebar/worktree-list-project-group-headers-12532.test.ts
+132
View File
@@ -0,0 +1,132 @@
import { describe, expect, it } from 'vitest'
import type { ExecutionHostId } from '../../../../shared/execution-host'
import type { ProjectGroup, Repo, Worktree } from '../../../../shared/types'
import { buildRows } from './worktree-list-groups'
import { getRenderRowKey } from './worktree-list-virtual-rows'
function group(ownerHostId: ExecutionHostId): ProjectGroup {
return {
id: 'same-id',
name: `${ownerHostId} group`,
parentPath: null,
executionHostId: ownerHostId,
parentGroupId: null,
createdFrom: 'manual',
tabOrder: 0,
isCollapsed: false,
color: null,
createdAt: 1,
updatedAt: 1
}
}
function repo(id: string, ownerHostId: ExecutionHostId): Repo {
return {
id,
path: `/${id}`,
displayName: id,
badgeColor: '#000',
addedAt: 1,
projectGroupId: 'same-id',
projectGroupOrder: 0,
executionHostId: ownerHostId
}
}
function worktree(id: string, repoId: string): Worktree {
return {
id,
repoId,
path: `/${repoId}/${id}`,
head: 'abc',
branch: `refs/heads/${id}`,
isBare: false,
isMainWorktree: true,
displayName: id,
comment: '',
linkedIssue: null,
linkedPR: null,
linkedLinearIssue: null,
linkedGitLabMR: null,
linkedGitLabIssue: null,
isArchived: false,
isUnread: false,
isPinned: false,
sortOrder: 0,
lastActivityAt: 0
}
}
function buildOwnerRows(
owners: readonly ExecutionHostId[],
collapsed = new Set<string>(),
ownerQualifiedProjectGroupIds = new Set(['same-id'])
) {
const groups = owners.map(group)
const repos = owners.map((owner, index) => repo(`repo-${index}`, owner))
return buildRows(
'repo',
repos.map((project, index) => worktree(`wt-${index}`, project.id)),
new Map(repos.map((project) => [project.id, project])),
null,
collapsed,
undefined,
undefined,
'manual',
undefined,
undefined,
false,
undefined,
groups,
new Set(),
new Map(),
new Map(),
[],
undefined,
[],
undefined,
'local',
undefined,
ownerQualifiedProjectGroupIds
)
}
function projectGroupHeaderKeys(rows: ReturnType<typeof buildOwnerRows>): string[] {
return rows.flatMap((row) =>
row.type === 'header' && row.projectGroup && !row.repo ? [row.key] : []
)
}
describe('duplicate project-group header identity (#12532)', () => {
it('keeps cold-render and virtualizer identities distinct across owners', () => {
const rows = buildOwnerRows(['local', 'runtime:env-1'])
expect(projectGroupHeaderKeys(rows)).toEqual([
'project-group:local:same-id',
'project-group:runtime%3Aenv-1:same-id'
])
const renderKeys = rows.map(getRenderRowKey)
expect(new Set(renderKeys).size).toBe(renderKeys.length)
})
it('collapses only the selected owner and stays unique after rebuild', () => {
const collapsed = new Set(['project-group:runtime%3Aenv-1:same-id'])
const rows = buildOwnerRows(['local', 'runtime:env-1'], collapsed)
expect(projectGroupHeaderKeys(rows)).toEqual([
'project-group:local:same-id',
'project-group:runtime%3Aenv-1:same-id'
])
expect(rows.filter((row) => row.type === 'item')).toHaveLength(1)
const renderKeys = rows.map(getRenderRowKey)
expect(new Set(renderKeys).size).toBe(renderKeys.length)
})
it('keeps a host-filter rebuild owner-qualified without disabling the visible owner', () => {
const rows = buildOwnerRows(['runtime:env-1'])
expect(projectGroupHeaderKeys(rows)).toEqual(['project-group:runtime%3Aenv-1:same-id'])
const renderKeys = rows.map(getRenderRowKey)
expect(new Set(renderKeys).size).toBe(renderKeys.length)
})
})
src/renderer/src/components/sidebar/worktree-list-virtual-rows.test.ts
+10
View File
@@ -63,6 +63,16 @@ const stickyHeaderIndexes = getStickyHeaderIndexes(rows)
const virtualItems = rows.map((_, index) => virtualItem(index, index * 100))
describe('getRenderRowKey', () => {
it('preserves owner-qualified folder workspace keys across hosts', () => {
const folderRow = (key: string): RenderRow =>
({ type: 'folder-workspace', key }) as unknown as RenderRow
expect([
getRenderRowKey(folderRow('folder-workspace:local:same-id')),
getRenderRowKey(folderRow('folder-workspace:runtime%3Aenv-1:same-id'))
]).toEqual(['folder-workspace:local:same-id', 'folder-workspace:runtime%3Aenv-1:same-id'])
})
it('scopes repeated group headers to their host section', () => {
expect(getRenderRowKey(groupRow('workspace-status:in-progress', 'local'))).toBe(
'hdr:local:workspace-status:in-progress'
src/renderer/src/components/sidebar/worktree-list-virtual-rows.ts
+1 -1
View File
@@ -38,7 +38,7 @@ export function getRenderRowKey(row: RenderRow): string {
return `pending:${row.creationId}`
}
if (row.type === 'folder-workspace') {
return `folder-workspace:${row.folderWorkspace.id}`
return row.key
}
return `wt:${row.rowKey}`
}
src/renderer/src/hooks/useComposerState.ts
+38 -8
View File
@@ -131,7 +131,9 @@ import {
import {
buildNewWorkspaceCreateTargetOptions,
findActionableFolderProjectGroup,
getProjectGroupIdFromNewWorkspaceOptionId,
getNewWorkspaceProjectGroupOptionId,
getNewWorkspaceProjectGroupHostId,
getProjectGroupSelectorFromNewWorkspaceOptionId,
type NewWorkspaceProjectOption
} from '@/lib/new-workspace-project-options'
import { useDetectedAgents } from '@/hooks/useDetectedAgents'
@@ -240,6 +242,7 @@ export type UseComposerStateOptions = {
initialRepoId?: string
initialEphemeralVmRecipeId?: string
initialProjectGroupId?: string
initialProjectGroupOwnerHostId?: ExecutionHostId
initialName?: string
initialPrompt?: string
initialLinkedWorkItem?: LinkedWorkItemSummary | null
@@ -608,7 +611,8 @@ export function useComposerState(options: UseComposerStateOptions): UseComposerS
telemetrySource,
enableIssueAutomation = true,
createGateMode = 'full',
initialProjectGroupId
initialProjectGroupId,
initialProjectGroupOwnerHostId
} = options
// Why: fold stable actions into one subscription so store mutations run one equality check.
@@ -746,11 +750,18 @@ export function useComposerState(options: UseComposerStateOptions): UseComposerS
const initialFolderProjectGroup = findActionableFolderProjectGroup({
projectGroups,
groupId: initialFolderProjectGroupId,
ownerHostId: initialProjectGroupId ? initialProjectGroupOwnerHostId : undefined,
actionableHostIds
})
const [selectedProjectGroupId, setSelectedProjectGroupId] = useState<string | null>(
initialFolderProjectGroup?.id ?? null
)
const [selectedProjectGroupOwnerHostId, setSelectedProjectGroupOwnerHostId] =
useState<ExecutionHostId | null>(
initialFolderProjectGroup
? getNewWorkspaceProjectGroupHostId(initialFolderProjectGroup)
: null
)
const initialProjectGroupAppliedRef = useRef(Boolean(initialFolderProjectGroup))
const [projectError, setProjectError] = useState<string | null>(null)
const repoId = repoIdOverride ?? internalRepoId
@@ -759,13 +770,15 @@ export function useComposerState(options: UseComposerStateOptions): UseComposerS
findActionableFolderProjectGroup({
projectGroups,
groupId: selectedProjectGroupId,
ownerHostId: selectedProjectGroupOwnerHostId ?? undefined,
actionableHostIds
}),
[actionableHostIds, projectGroups, selectedProjectGroupId]
[actionableHostIds, projectGroups, selectedProjectGroupId, selectedProjectGroupOwnerHostId]
)
useEffect(() => {
if (selectedProjectGroupId && !selectedProjectGroup) {
setSelectedProjectGroupId(null)
setSelectedProjectGroupOwnerHostId(null)
}
}, [selectedProjectGroup, selectedProjectGroupId])
useEffect(() => {
@@ -779,13 +792,22 @@ export function useComposerState(options: UseComposerStateOptions): UseComposerS
const nextGroup = findActionableFolderProjectGroup({
projectGroups,
groupId: initialFolderProjectGroupId,
ownerHostId: initialProjectGroupId ? initialProjectGroupOwnerHostId : undefined,
actionableHostIds
})
if (nextGroup) {
initialProjectGroupAppliedRef.current = true
setSelectedProjectGroupId(nextGroup.id)
setSelectedProjectGroupOwnerHostId(getNewWorkspaceProjectGroupHostId(nextGroup))
}
}, [actionableHostIds, initialFolderProjectGroupId, projectGroups, selectedProjectGroupId])
}, [
actionableHostIds,
initialFolderProjectGroupId,
initialProjectGroupId,
initialProjectGroupOwnerHostId,
projectGroups,
selectedProjectGroupId
])
const isProjectGroupTarget = selectedProjectGroup !== null
const folderSourceRepos = useMemo(
() => getFolderSourceRepos(repos, projectGroups, selectedProjectGroup),
@@ -887,7 +909,10 @@ export function useComposerState(options: UseComposerStateOptions): UseComposerS
const selectedRepoProjectId =
selectedWorkspaceTarget.status === 'ready' ? selectedWorkspaceTarget.target.projectId : null
const selectedProjectId = selectedProjectGroup
? `project-group:${selectedProjectGroup.id}`
? getNewWorkspaceProjectGroupOptionId(
selectedProjectGroup.id,
getNewWorkspaceProjectGroupHostId(selectedProjectGroup)
)
: selectedRepoProjectId
const selectedProjectHostSetupId =
!selectedProjectGroup && selectedWorkspaceTarget.status === 'ready'
@@ -2794,15 +2819,17 @@ export function useComposerState(options: UseComposerStateOptions): UseComposerS
const handleProjectChange = useCallback(
(projectId: string): void => {
initialProjectGroupAppliedRef.current = true
const projectGroupId = getProjectGroupIdFromNewWorkspaceOptionId(projectId)
if (projectGroupId) {
const projectGroupSelector = getProjectGroupSelectorFromNewWorkspaceOptionId(projectId)
if (projectGroupSelector) {
const nextProjectGroup = findActionableFolderProjectGroup({
projectGroups,
groupId: projectGroupId,
groupId: projectGroupSelector.groupId,
ownerHostId: projectGroupSelector.ownerHostId,
actionableHostIds
})
if (!nextProjectGroup) {
setSelectedProjectGroupId(null)
setSelectedProjectGroupOwnerHostId(null)
setProjectError(
translate(
'auto.hooks.useComposerState.chooseOrAddProjectBeforeWorkspace',
@@ -2813,6 +2840,7 @@ export function useComposerState(options: UseComposerStateOptions): UseComposerS
}
const nextSourceRepo = getFolderSourceRepos(repos, projectGroups, nextProjectGroup)[0]
setSelectedProjectGroupId(nextProjectGroup.id)
setSelectedProjectGroupOwnerHostId(getNewWorkspaceProjectGroupHostId(nextProjectGroup))
setProjectError(null)
setRepoId(nextSourceRepo?.id ?? '')
setLinkedIssue('')
@@ -2839,6 +2867,7 @@ export function useComposerState(options: UseComposerStateOptions): UseComposerS
}
setSelectedProjectGroupId(null)
setSelectedProjectGroupOwnerHostId(null)
const preferredHostId =
selectedWorkspaceTarget.status === 'ready' ? selectedWorkspaceTarget.target.hostId : null
// Why: pass the current host as a preference (focusedHostScope), not a hard hostId — pinning made selecting a project set up only on another host a silent no-op.
@@ -2875,6 +2904,7 @@ export function useComposerState(options: UseComposerStateOptions): UseComposerS
// Why: clear the folder-group target when selecting the Add-Project repo, since the group's onRepoChange only accepts repos inside the group.
initialProjectGroupAppliedRef.current = true
setSelectedProjectGroupId(null)
setSelectedProjectGroupOwnerHostId(null)
setProjectError(null)
handleRepoChange(nextRepoId)
},
src/renderer/src/lib/new-workspace-project-options.test.ts
+57 -2
View File
@@ -477,15 +477,46 @@ describe('buildNewWorkspaceCreateTargetOptions', () => {
expect(options.map((option) => option.id).sort()).toEqual([
'github:stablyai/orca',
'project-group:folder-group'
'project-group:local:folder-group'
])
expect(options.find((option) => option.id === 'project-group:folder-group')).toMatchObject({
expect(
options.find((option) => option.id === 'project-group:local:folder-group')
).toMatchObject({
kind: 'project-group',
projectGroupId: 'folder-group',
displayName: 'Platform',
detail: '/tmp/platform'
})
})
it('gives duplicate group ids distinct owner-qualified option values', async () => {
const {
buildNewWorkspaceCreateTargetOptions,
getProjectGroupSelectorFromNewWorkspaceOptionId
} = await import('./new-workspace-project-options')
const options = buildNewWorkspaceCreateTargetOptions({
projects: [],
projectHostSetups: [],
eligibleRepos: [],
hosts: [
{ id: 'local', label: 'Local Mac' },
{ id: 'runtime:env-1', label: 'Remote' }
],
projectGroups: [
group({ id: 'same-id', executionHostId: 'local' }),
group({ id: 'same-id', executionHostId: 'runtime:env-1' })
]
})
expect(options.map((option) => option.id)).toEqual([
'project-group:local:same-id',
'project-group:runtime%3Aenv-1:same-id'
])
expect(getProjectGroupSelectorFromNewWorkspaceOptionId(options[1].id)).toEqual({
groupId: 'same-id',
ownerHostId: 'runtime:env-1'
})
})
})
describe('findActionableFolderProjectGroup', () => {
@@ -533,4 +564,28 @@ describe('findActionableFolderProjectGroup', () => {
})
).toBeNull()
})
it('fails closed for duplicate ids unless the owner is explicit', () => {
const duplicates = [
group({ id: 'same-id', executionHostId: 'local' }),
group({ id: 'same-id', executionHostId: 'runtime:env-1' })
]
const actionableHostIds = new Set(['local', 'runtime:env-1'] as const)
expect(
findActionableFolderProjectGroup({
projectGroups: duplicates,
groupId: 'same-id',
actionableHostIds
})
).toBeNull()
expect(
findActionableFolderProjectGroup({
projectGroups: duplicates,
groupId: 'same-id',
ownerHostId: 'runtime:env-1',
actionableHostIds
})
).toBe(duplicates[1])
})
})
src/renderer/src/lib/new-workspace-project-options.ts
+41 -13
View File
@@ -145,8 +145,11 @@ export function buildNewWorkspaceProjectOptions(
.sort((a, b) => a.displayName.localeCompare(b.displayName) || a.detail.localeCompare(b.detail))
}
function getProjectGroupOptionId(projectGroupId: string): string {
return `${NEW_WORKSPACE_PROJECT_GROUP_OPTION_PREFIX}${projectGroupId}`
export function getNewWorkspaceProjectGroupOptionId(
projectGroupId: string,
ownerHostId: ExecutionHostId
): string {
return `${NEW_WORKSPACE_PROJECT_GROUP_OPTION_PREFIX}${encodeURIComponent(ownerHostId)}:${encodeURIComponent(projectGroupId)}`
}
function getFolderSourceOptionId(repoId: string): string {
@@ -160,9 +163,32 @@ export function getRepoIdFromNewWorkspaceFolderSourceOptionId(optionId: string):
}
export function getProjectGroupIdFromNewWorkspaceOptionId(optionId: string): string | null {
return optionId.startsWith(NEW_WORKSPACE_PROJECT_GROUP_OPTION_PREFIX)
? optionId.slice(NEW_WORKSPACE_PROJECT_GROUP_OPTION_PREFIX.length)
: null
return getProjectGroupSelectorFromNewWorkspaceOptionId(optionId)?.groupId ?? null
}
export function getProjectGroupSelectorFromNewWorkspaceOptionId(
optionId: string
): { groupId: string; ownerHostId?: ExecutionHostId } | null {
if (!optionId.startsWith(NEW_WORKSPACE_PROJECT_GROUP_OPTION_PREFIX)) {
return null
}
const value = optionId.slice(NEW_WORKSPACE_PROJECT_GROUP_OPTION_PREFIX.length)
const separator = value.indexOf(':')
if (separator === -1) {
return value ? { groupId: value } : null
}
try {
const parsedOwner = parseExecutionHostId(decodeURIComponent(value.slice(0, separator)))
if (!parsedOwner) {
return null
}
return {
ownerHostId: parsedOwner.id,
groupId: decodeURIComponent(value.slice(separator + 1))
}
} catch {
return null
}
}
function getProjectGroupDetail(group: ProjectGroup): string {
@@ -185,23 +211,25 @@ export function getNewWorkspaceProjectGroupHostId(group: ProjectGroup): Executio
export function findActionableFolderProjectGroup({
projectGroups,
groupId,
ownerHostId,
actionableHostIds
}: {
projectGroups: readonly ProjectGroup[]
groupId: string | null | undefined
ownerHostId?: ExecutionHostId
actionableHostIds: ReadonlySet<ExecutionHostId>
}): ProjectGroup | null {
if (!groupId) {
return null
}
return (
projectGroups.find(
(group) =>
group.id === groupId &&
Boolean(group.parentPath?.trim()) &&
actionableHostIds.has(getNewWorkspaceProjectGroupHostId(group))
) ?? null
const candidates = projectGroups.filter(
(group) =>
group.id === groupId &&
Boolean(group.parentPath?.trim()) &&
actionableHostIds.has(getNewWorkspaceProjectGroupHostId(group)) &&
(!ownerHostId || getNewWorkspaceProjectGroupHostId(group) === ownerHostId)
)
return candidates.length === 1 ? candidates[0] : null
}
export function buildNewWorkspaceFolderSourceOptions(
@@ -233,7 +261,7 @@ export function buildNewWorkspaceCreateTargetOptions({
)
.map((group) => ({
kind: 'project-group' as const,
id: getProjectGroupOptionId(group.id),
id: getNewWorkspaceProjectGroupOptionId(group.id, getNewWorkspaceProjectGroupHostId(group)),
projectGroupId: group.id,
displayName: group.name,
badgeColor: group.color ?? 'var(--muted-foreground)',