Merge branch 'codex/project-sidebar-parity' into main

Author: friuns

src/components/sidebar/SidebarThreadTree.vue

@@ -290,7 +290,7 @@
               :data-dragging-handle="isDraggingProject(group.projectName)"
               @mousedown.left="onProjectHandleMouseDown($event, group.projectName)"
             >
-              <span class="project-title" :title="getProjectDisplayName(group.projectName)">
+              <span class="project-title" :title="getProjectTooltipTitle(group.projectName)">
                 {{ getProjectVisibleName(group) }}
               </span>
             </span>
@@ -1466,6 +1466,10 @@ function isPathLikeProjectName(value: string): boolean {
   return value.includes('/') || value.includes('\\')
 }
 
+function getProjectTooltipTitle(projectName: string): string {
+  return isPathLikeProjectName(projectName) ? projectName : getProjectDisplayName(projectName)
+}
+
 function isDuplicatePathLeafName(value: string): boolean {
   const leafName = getPathLeafName(value)
   if (!leafName) return false

src/composables/useDesktopState.test.ts

@@ -8,13 +8,13 @@ import {
 import type { UiProjectGroup } from '../types/codex'
 import type { WorkspaceRootsState } from '../api/codexGateway'
 
-function thread(id: string, cwd: string) {
+function thread(id: string, cwd: string, options: { hasWorktree?: boolean } = {}) {
   return {
     id,
     title: id,
     projectName: cwd ? cwd.split('/').at(-1) || cwd : 'Projectless',
     cwd,
-    hasWorktree: false,
+    hasWorktree: options.hasWorktree ?? false,
     createdAtIso: '2026-04-28T00:00:00.000Z',
     updatedAtIso: '2026-04-28T00:00:00.000Z',
     preview: '',
@@ -139,6 +139,79 @@ describe('filterGroupsByWorkspaceRoots', () => {
       ['local-project', 0],
     ])
   })
+
+  it('keeps managed worktree threads under the matching workspace root project', () => {
+    const groups: UiProjectGroup[] = [
+      {
+        projectName: 'codex-web-local',
+        threads: [
+          thread('main-chat', '/Users/igor/Git-projects/codex-web-local'),
+          thread('worktree-chat', '/Users/igor/.codex/worktrees/53e7/codex-web-local', { hasWorktree: true }),
+        ],
+      },
+    ]
+    const rootsState: WorkspaceRootsState = {
+      order: ['/Users/igor/Git-projects/codex-web-local'],
+      labels: {},
+      active: ['/Users/igor/Git-projects/codex-web-local'],
+      projectOrder: ['/Users/igor/Git-projects/codex-web-local'],
+    }
+
+    expect(filterGroupsByWorkspaceRoots(groups, rootsState).map((group) => [group.projectName, group.threads.map((row) => row.id)])).toEqual([
+      ['codex-web-local', ['main-chat', 'worktree-chat']],
+    ])
+  })
+
+  it('keeps unregistered managed worktrees under the main root when another managed worktree root is registered', () => {
+    const groups: UiProjectGroup[] = [
+      {
+        projectName: 'codex-web-local',
+        threads: [
+          thread('main-chat', '/Users/igor/Git-projects/codex-web-local'),
+          thread('registered-worktree-chat', '/Users/igor/.codex/worktrees/a77f/codex-web-local', { hasWorktree: true }),
+          thread('unregistered-worktree-chat', '/Users/igor/.codex/worktrees/53e7/codex-web-local', { hasWorktree: true }),
+        ],
+      },
+    ]
+    const rootsState: WorkspaceRootsState = {
+      order: [
+        '/Users/igor/Git-projects/codex-web-local',
+        '/Users/igor/.codex/worktrees/a77f/codex-web-local',
+      ],
+      labels: {
+        '/Users/igor/.codex/worktrees/a77f/codex-web-local': 'codex-web-local2',
+      },
+      active: ['/Users/igor/Git-projects/codex-web-local'],
+      projectOrder: ['/Users/igor/Git-projects/codex-web-local'],
+    }
+
+    expect(filterGroupsByWorkspaceRoots(groups, rootsState).map((group) => [group.projectName, group.threads.map((row) => row.id)])).toEqual([
+      ['/Users/igor/Git-projects/codex-web-local', ['main-chat', 'unregistered-worktree-chat']],
+      ['/Users/igor/.codex/worktrees/a77f/codex-web-local', ['registered-worktree-chat']],
+    ])
+  })
+
+  it('does not group unrelated git worktrees under a same-leaf workspace root project', () => {
+    const groups: UiProjectGroup[] = [
+      {
+        projectName: 'codex-web-local',
+        threads: [
+          thread('main-chat', '/Users/igor/Git-projects/codex-web-local'),
+          thread('other-git-worktree-chat', '/tmp/other/.git/worktrees/codex-web-local', { hasWorktree: true }),
+        ],
+      },
+    ]
+    const rootsState: WorkspaceRootsState = {
+      order: ['/Users/igor/Git-projects/codex-web-local'],
+      labels: {},
+      active: ['/Users/igor/Git-projects/codex-web-local'],
+      projectOrder: ['/Users/igor/Git-projects/codex-web-local'],
+    }
+
+    expect(filterGroupsByWorkspaceRoots(groups, rootsState).map((group) => [group.projectName, group.threads.map((row) => row.id)])).toEqual([
+      ['/Users/igor/Git-projects/codex-web-local', ['main-chat']],
+    ])
+  })
 })
 
 describe('workspace roots project persistence helpers', () => {

src/composables/useDesktopState.ts

@@ -1117,6 +1117,7 @@ function orderGroupsByWorkspaceProjectOrder(
 
 function collectDuplicateProjectLeafNames(groups: UiProjectGroup[], rootsState: WorkspaceRootsState | null): Set<string> {
   const rootByLeafName = new Map<string, Set<string>>()
+  const canonicalWorkspaceRootCountsByLeafName = new Map<string, number>()
   const addPath = (value: string): void => {
     const normalizedPath = normalizePathForUi(value).trim()
     if (!normalizedPath) return
@@ -1126,9 +1127,23 @@ function collectDuplicateProjectLeafNames(groups: UiProjectGroup[], rootsState:
     rootByLeafName.set(leafName, existing)
   }
 
-  for (const rootPath of rootsState?.order ?? []) addPath(rootPath)
+  for (const rootPath of rootsState?.order ?? []) {
+    const normalizedRootPath = normalizePathForUi(rootPath).trim()
+    if (!normalizedRootPath) continue
+    const leafName = toProjectName(normalizedRootPath)
+    if (!isManagedCodexWorktreePath(normalizedRootPath)) {
+      canonicalWorkspaceRootCountsByLeafName.set(leafName, (canonicalWorkspaceRootCountsByLeafName.get(leafName) ?? 0) + 1)
+    }
+    addPath(rootPath)
+  }
   for (const group of groups) {
-    for (const thread of group.threads) addPath(thread.cwd)
+    for (const thread of group.threads) {
+      const normalizedCwd = normalizePathForUi(thread.cwd).trim()
+      const leafName = toProjectName(normalizedCwd)
+      const isRegisteredRoot = rootsState?.order.some((rootPath) => normalizePathForUi(rootPath).trim() === normalizedCwd) === true
+      if (isManagedCodexWorktreePath(normalizedCwd) && !isRegisteredRoot && canonicalWorkspaceRootCountsByLeafName.get(leafName) === 1) continue
+      addPath(thread.cwd)
+    }
   }
 
   const duplicateLeafNames = new Set<string>()
@@ -1138,20 +1153,53 @@ function collectDuplicateProjectLeafNames(groups: UiProjectGroup[], rootsState:
   return duplicateLeafNames
 }
 
+function isManagedCodexWorktreePath(value: string): boolean {
+  return value.includes('/.codex/worktrees/')
+}
+
 function disambiguateProjectGroupsByCwd(
   groups: UiProjectGroup[],
   rootsState: WorkspaceRootsState | null,
 ): UiProjectGroup[] {
   const duplicateLeafNames = collectDuplicateProjectLeafNames(groups, rootsState)
   if (duplicateLeafNames.size === 0) return groups
 
+  const uniqueCanonicalWorkspaceRootLeafNames = new Set<string>()
+  const duplicateCanonicalWorkspaceRootLeafNames = new Set<string>()
+  const canonicalWorkspaceRootByLeafName = new Map<string, string>()
+  const registeredWorkspaceRoots = new Set<string>()
+  for (const rootPath of rootsState?.order ?? []) {
+    const normalizedRootPath = normalizePathForUi(rootPath).trim()
+    if (!normalizedRootPath) continue
+    registeredWorkspaceRoots.add(normalizedRootPath)
+    if (isManagedCodexWorktreePath(normalizedRootPath)) continue
+    const leafName = toProjectName(normalizedRootPath)
+    if (uniqueCanonicalWorkspaceRootLeafNames.has(leafName)) {
+      uniqueCanonicalWorkspaceRootLeafNames.delete(leafName)
+      duplicateCanonicalWorkspaceRootLeafNames.add(leafName)
+      canonicalWorkspaceRootByLeafName.delete(leafName)
+    } else if (!duplicateCanonicalWorkspaceRootLeafNames.has(leafName)) {
+      uniqueCanonicalWorkspaceRootLeafNames.add(leafName)
+      canonicalWorkspaceRootByLeafName.set(leafName, normalizedRootPath)
+    }
+  }
+
   const disambiguatedGroups: UiProjectGroup[] = []
   const groupsByProjectName = new Map<string, UiProjectGroup>()
   for (const group of groups) {
     for (const thread of group.threads) {
       const normalizedCwd = normalizePathForUi(thread.cwd).trim()
       const leafName = toProjectName(normalizedCwd)
-      const projectName = normalizedCwd && duplicateLeafNames.has(leafName) ? normalizedCwd : group.projectName
+      const isRegisteredRoot = registeredWorkspaceRoots.has(normalizedCwd)
+      const isCanonicalWorktreeThread = isManagedCodexWorktreePath(normalizedCwd)
+        && !isRegisteredRoot
+        && uniqueCanonicalWorkspaceRootLeafNames.has(leafName)
+      let projectName = group.projectName
+      if (isCanonicalWorktreeThread && duplicateLeafNames.has(leafName)) {
+        projectName = canonicalWorkspaceRootByLeafName.get(leafName) ?? group.projectName
+      } else if (normalizedCwd && duplicateLeafNames.has(leafName)) {
+        projectName = normalizedCwd
+      }
       const nextThread = thread.projectName === projectName ? thread : { ...thread, projectName }
       const existingGroup = groupsByProjectName.get(projectName)
       if (existingGroup) {

tests.md

@@ -4143,3 +4143,35 @@ Composer runtime options and project menu worktree actions are hidden when the s
 
 #### Rollback/Cleanup
 - Remove any disposable plain folder or test chats created for this validation.
+
+---
+
+### Project worktree threads under canonical project
+
+#### Feature/Change Name
+Managed worktree threads remain visible under their matching canonical workspace-root project, and path-like project tooltips expose the full path.
+
+#### Prerequisites/Setup
+1. Dev server running (`pnpm run dev`)
+2. Codex global workspace roots include `/Users/igor/Git-projects/codex-web-local`
+3. Thread history contains at least one thread whose cwd is under `/Users/igor/.codex/worktrees/*/codex-web-local`
+4. Light theme and dark theme both available from the appearance switcher
+
+#### Steps
+1. In light theme, open the sidebar Projects section.
+2. Scroll to the `codex-web-local` project.
+3. Confirm the project includes the main-root thread and managed worktree threads.
+4. Confirm worktree rows still show the worktree icon.
+5. Confirm unrelated `.git/worktrees` rows with the same leaf folder name are not grouped into this project.
+6. Hover any shortened path-like duplicate project title and confirm the tooltip shows the full project path, not only the friendly label.
+7. Switch to dark theme and repeat steps 1-6.
+
+#### Expected Results
+- Managed worktree threads with the same leaf folder name are not split into hidden path-like project groups.
+- Generic `.git/worktrees` rows are not treated as managed Codex worktrees for project-root grouping.
+- The canonical `codex-web-local` project shows both main-root and worktree threads.
+- Path-like project tooltips expose the full project path.
+- Project rows and worktree icons remain readable in light and dark themes.
+
+#### Rollback/Cleanup
+- None.