fix(activity): surface worktree sessions in active work, the sidebar and repo badges

frontend/src/App.tsx

@@ -26,6 +26,7 @@ import { ThemeProvider, useThemeMode } from './contexts/ThemeContext'
 import { AuthProvider } from './contexts/AuthContext'
 import { KeyboardShortcutsProvider } from './contexts/KeyboardShortcutsContext'
 import { EventProvider, usePermissions, useEventContext } from '@/contexts/EventContext'
+import { RepoWorktreesProvider } from '@/contexts/RepoWorktreesContext'
 import { SwipeNavigationProvider, useSwipeNavigation } from '@/contexts/SwipeNavigationContext'
 import { PermissionRequestDialog } from './components/session/PermissionRequestDialog'
 import { SSHHostKeyDialog } from './components/ssh/SSHHostKeyDialog'
@@ -208,26 +209,28 @@ function AppShell() {
     <ThemeProvider>
       <AuthProvider>
         <EventProvider>
-          <KeyboardShortcutsProvider>
-            <GlobalShortcuts />
-            <div className="flex h-dvh w-full min-w-0 flex-col">
-              <PwaUpdatePrompt />
-              <div ref={rootRef} className="flex flex-1 min-h-0 w-full min-w-0">
-                <DesktopSidebar />
-                <main className="flex-1 min-w-0 min-h-0 flex flex-col">
-                  <Outlet />
-                </main>
+          <RepoWorktreesProvider>
+            <KeyboardShortcutsProvider>
+              <GlobalShortcuts />
+              <div className="flex h-dvh w-full min-w-0 flex-col">
+                <PwaUpdatePrompt />
+                <div ref={rootRef} className="flex flex-1 min-h-0 w-full min-w-0">
+                  <DesktopSidebar />
+                  <main className="flex-1 min-w-0 min-h-0 flex flex-col">
+                    <Outlet />
+                  </main>
+                </div>
               </div>
-            </div>
-            <MobileTabBar />
-            <MobileSheetHost />
-            <PermissionDialogWrapper />
-            <SSHHostKeyDialogWrapper />
-            <SettingsDialog />
-            <HealthMonitor />
-            <VersionNotifier />
-            <ThemedToaster />
-          </KeyboardShortcutsProvider>
+              <MobileTabBar />
+              <MobileSheetHost />
+              <PermissionDialogWrapper />
+              <SSHHostKeyDialogWrapper />
+              <SettingsDialog />
+              <HealthMonitor />
+              <VersionNotifier />
+              <ThemedToaster />
+            </KeyboardShortcutsProvider>
+          </RepoWorktreesProvider>
         </EventProvider>
       </AuthProvider>
     </ThemeProvider>

frontend/src/components/activity/ActivityList.test.tsx

@@ -144,6 +144,23 @@ describe('ActivityList', () => {
     expect(onNavigate).toHaveBeenCalledWith(item)
   })
 
+  it('labels a worktree session with its worktree branch', () => {
+    setGroups({
+      recent: [
+        createItem({
+          state: 'recent',
+          session: createSession('c1', 'Worktree'),
+          repo: createRepo(3, 'Gamma'),
+          worktreeBranch: 'feature/wt',
+        }),
+      ],
+    })
+
+    renderList()
+
+    expect(screen.getByRole('button', { name: /Worktree/ })).toHaveTextContent('Gamma · feature/wt')
+  })
+
   it('marks the currently open session with aria-current', () => {
     setGroups({
       recent: [

frontend/src/components/activity/ActivityList.tsx

@@ -63,7 +63,7 @@ interface ActivityRowProps {
 }
 
 function ActivityRow({ item, isCurrent, onSelect }: ActivityRowProps) {
-  const branch = getRepoBranchLabel(item.repo)
+  const branch = item.worktreeBranch ?? getRepoBranchLabel(item.repo)
   const repoLine = branch
     ? `${getRepoDisplayName(item.repo)} · ${branch}`
     : getRepoDisplayName(item.repo)

frontend/src/components/navigation/DesktopSessionTree.test.tsx

@@ -25,6 +25,7 @@ type SessionPinFixture = { sessionId: string; directory: string; pinnedAt: numbe
 
 const {
   listReposMock,
+  getRepoSiblingsMock,
   sessionsData,
   sessionsHookCalls,
   createSessionCalls,
@@ -37,6 +38,7 @@ const {
   searchError,
 } = vi.hoisted(() => ({
   listReposMock: vi.fn(),
+  getRepoSiblingsMock: vi.fn(),
   sessionsData: [] as SessionFixture[],
   sessionsHookCalls: [] as SessionsHookCall[],
   createSessionCalls: [] as Array<{ directory?: string; vars?: unknown }>,
@@ -51,7 +53,7 @@ const {
 
 vi.mock('@/api/repos', async (importOriginal) => {
   const actual = await importOriginal<typeof import('@/api/repos')>()
-  return { ...actual, listRepos: listReposMock }
+  return { ...actual, listRepos: listReposMock, getRepoSiblings: getRepoSiblingsMock }
 })
 
 vi.mock('@/api/opencode', async (importOriginal) => {
@@ -156,6 +158,8 @@ describe('DesktopSessionTree', () => {
   beforeEach(() => {
     listReposMock.mockReset()
     listReposMock.mockResolvedValue([repoA, repoB, repoC])
+    getRepoSiblingsMock.mockReset()
+    getRepoSiblingsMock.mockResolvedValue([])
     sessionsData.splice(
       0,
       sessionsData.length,
@@ -197,6 +201,18 @@ describe('DesktopSessionTree', () => {
     expect(fetchedDirectories()).toEqual(new Set(['/repos/a']))
   })
 
+  it('shows a worktree session under its repo with the worktree branch tag', async () => {
+    getRepoSiblingsMock.mockResolvedValue([
+      { fullPath: '/repos/a/.worktrees/feat', currentBranch: 'feat/x', worktreeSource: 'git' },
+    ])
+    sessionsData.push(createSession('w1', '/repos/a/.worktrees/feat', Date.now() - 1000))
+
+    render(<DesktopSessionTree />, { wrapper: createWrapper(['/repos/1']) })
+
+    const row = await screen.findByRole('button', { name: /^Session w1/ })
+    expect(row).toHaveTextContent('feat/x')
+  })
+
   it('opens nothing outside a repo', async () => {
     render(<DesktopSessionTree />, { wrapper: createWrapper(['/']) })
 
@@ -409,6 +425,14 @@ describe('DesktopSessionTree', () => {
     expect(await screen.findByText('Failed to load sessions')).toBeTruthy()
   })
 
+  it('shows the error state when the worktree siblings lookup fails', async () => {
+    getRepoSiblingsMock.mockRejectedValue(new Error('siblings failed'))
+
+    render(<DesktopSessionTree />, { wrapper: createWrapper(['/repos/1']) })
+
+    expect(await screen.findByText('Failed to load sessions')).toBeTruthy()
+  })
+
   it('creates a session in the repo full path', async () => {
     const user = userEvent.setup()
     render(<DesktopSessionTree />, { wrapper: createWrapper(['/']) })

frontend/src/components/navigation/RepoQuickSwitchSheet.test.tsx

@@ -3,7 +3,7 @@ import { beforeEach, describe, it, expect, vi } from 'vitest'
 import { MemoryRouter, Route, Routes, useLocation } from 'react-router-dom'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { RepoQuickSwitchSheet } from './RepoQuickSwitchSheet'
-import { listRepos } from '@/api/repos'
+import { getRepoSiblings, listRepos } from '@/api/repos'
 import { useMobileTabBar } from '@/hooks/useMobileTabBar'
 import { ASSISTANT_REPO_ID } from '@opencode-manager/shared/utils'
 import type { ActiveWorkItem } from '@/lib/activeWork'
@@ -167,6 +167,7 @@ function MobileSheetHarness() {
 describe('RepoQuickSwitchSheet', () => {
   beforeEach(() => {
     vi.clearAllMocks()
+    vi.mocked(getRepoSiblings).mockResolvedValue([])
     sessionsData.splice(0, sessionsData.length)
     sessionsHookCalls.splice(0, sessionsHookCalls.length)
     permissionSessions.current.clear()

frontend/src/components/navigation/RepoSessionNav.tsx

@@ -5,7 +5,9 @@ import { SessionStatusIndicator } from '@/components/ui/session-status-indicator
 import { RepoActivityIndicator } from '@/components/activity/RepoActivityIndicator'
 import { useForms, usePermissions } from '@/contexts/EventContext'
 import { useCreateSession } from '@/hooks/useOpenCode'
+import { useRepoSiblings } from '@/hooks/useRepoSiblings'
 import { useSidebarRepoGroups } from '@/hooks/useSidebarRepoGroups'
+import { buildWorktreeActivity, type ActiveWorktree } from '@/lib/activeWork'
 import { cn, formatShortRelativeTime, getRepoBranchLabel, getRepoDisplayName } from '@/lib/utils'
 import { getRepoPath, getSessionPath } from '@/lib/navigation'
 import {
@@ -118,13 +120,14 @@ interface SessionNavRowProps {
 export function SessionNavRow({ item, isCurrent, onSelect, repoLabel }: SessionNavRowProps) {
   const { hasForSession: hasPermission } = usePermissions()
   const { hasForSession: hasForm } = useForms()
+  const branchLabel = item.worktreeBranch ?? item.branchLabel
 
   return (
     <button
       type="button"
       onClick={() => onSelect(item.path)}
       aria-current={isCurrent ? 'page' : undefined}
-      title={item.branchLabel ? `${item.repoLabel} · ${item.branchLabel}` : item.repoLabel}
+      title={branchLabel ? `${item.repoLabel} · ${branchLabel}` : item.repoLabel}
       className={cn(
         'flex h-9 w-full items-center gap-2 pl-4 pr-3.5 text-left text-[13.5px] text-foreground hover:bg-accent/50',
         isCurrent && 'bg-primary/25 font-semibold',
@@ -137,6 +140,11 @@ export function SessionNavRow({ item, isCurrent, onSelect, repoLabel }: SessionN
       {repoLabel && (
         <span className="max-w-24 shrink-0 truncate text-xs text-highlight">{repoLabel}</span>
       )}
+      {item.worktreeBranch && (
+        <span className="max-w-24 shrink-0 truncate font-mono text-[11px] text-primary">
+          {item.worktreeBranch}
+        </span>
+      )}
       <SessionStatusIndicator sessionID={item.session.id} size="sm" />
       {hasPermission(item.session.id) && (
         <Bell className="h-3 w-3 shrink-0 text-highlight" aria-label="Pending permission" />
@@ -186,9 +194,34 @@ interface RepoSessionListProps {
 }
 
 function RepoSessionList({ repo, onSelectSession }: RepoSessionListProps) {
+  const siblings = useRepoSiblings(repo.isWorktree ? undefined : repo.id)
+  const worktrees = useMemo(
+    () =>
+      repo.isWorktree
+        ? undefined
+        : buildWorktreeActivity([repo], [{ data: siblings.data }]).filter(
+            (worktree) => !worktree.isSchedule,
+          ),
+    [repo, siblings.data],
+  )
+
+  if (siblings.isLoading) return <SessionNavStatus>Loading sessions...</SessionNavStatus>
+  if (siblings.isError && siblings.data === undefined)
+    return <SessionNavStatus>Failed to load sessions</SessionNavStatus>
+
+  return <RepoSessionListItems repo={repo} worktrees={worktrees} onSelectSession={onSelectSession} />
+}
+
+interface RepoSessionListItemsProps {
+  repo: Repo
+  worktrees?: ActiveWorktree[]
+  onSelectSession: (path: string) => void
+}
+
+function RepoSessionListItems({ repo, worktrees, onSelectSession }: RepoSessionListItemsProps) {
   const location = useLocation()
   const repos = useMemo(() => [repo], [repo])
-  const { groups, isLoading, isError, hasMore } = useSidebarRepoGroups({ repos })
+  const { groups, isLoading, isError, hasMore } = useSidebarRepoGroups({ repos, worktrees })
   const items = groups[0]?.items ?? []
 
   if (isLoading) return <SessionNavStatus>Loading sessions...</SessionNavStatus>

frontend/src/components/navigation/ToolSidePanel.test.tsx

@@ -355,6 +355,24 @@ describe('ToolSidePanel', () => {
     expect(search().get('panel')).toBe('activity')
   })
 
+  it('keeps a worktree session tab when navigating from the Activity panel', async () => {
+    const user = userEvent.setup()
+    setActivityGroups([
+      {
+        ...createActivityItem('wt', 'Worktree Session', 2, 'Beta'),
+        path: '/repos/2/sessions/wt?repoTab=workspaces',
+      },
+    ])
+    renderAt('')
+
+    await user.click(screen.getByRole('button', { name: 'Activity' }))
+    await user.click(await screen.findByRole('button', { name: /Worktree Session/ }))
+
+    await waitFor(() => expect(screen.getByTestId('pathname').textContent).toBe('/repos/2/sessions/wt'))
+    expect(search().get('repoTab')).toBe('workspaces')
+    expect(search().get('panel')).toBe('activity')
+  })
+
   it('shows an Activity count pill and extends the accessible name', () => {
     activityMocks.useActiveWorkCounts.mockReturnValue({ needsInput: 1, running: 2 })
     renderAt('')

frontend/src/components/navigation/ToolSidePanel.tsx

@@ -25,6 +25,7 @@ import { isPanelTool, type ToolPanelState, type PanelTool } from '@/hooks/useToo
 import { useOpenNavItem } from '@/hooks/useOpenNavItem'
 import { ActivityList } from '@/components/activity/ActivityList'
 import { ActivityCountPill } from '@/components/activity/ActivityCountPill'
+import { withQueryParam } from '@/lib/navigation'
 import { useActiveWorkCounts, useActivityWindowMinutes } from '@/hooks/useActiveWork'
 import { formatActivityWindow } from '@/lib/activeWork'
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
@@ -52,7 +53,7 @@ function ActivityPanelBody() {
     <div className="min-h-0 flex-1 overflow-y-auto">
       <ActivityList
         minutes={minutes}
-        onNavigate={(item) => navigate({ pathname: item.path, search: '?panel=activity' })}
+        onNavigate={(item) => navigate(withQueryParam(item.path, 'panel', 'activity'))}
       />
     </div>
   )

frontend/src/components/navigation/sidebar-session-tree.test.ts

@@ -191,6 +191,60 @@ describe('buildSidebarRepoGroups', () => {
     expect(item.path).toBe('/repos/3/sessions/w1')
   })
 
+  it('groups a session in a worktree of a repo under that repo with the worktree branch', () => {
+    const worktree = {
+      directory: '/repos/a/.worktrees/feat',
+      ownerRepo: repoA,
+      branch: 'feat/x',
+      isSchedule: false,
+    }
+    const sessions = [createSession('w1', atStartOfDay(2000), '/repos/a/.worktrees/feat')]
+
+    const groups = buildSidebarRepoGroups({
+      repos: [repoA],
+      sessions,
+      pinnedKeys: new Set(),
+      now: NOW,
+      worktrees: [worktree],
+    })
+
+    expect(groups).toHaveLength(1)
+    const item = groups[0].items[0]
+    expect(item.session.id).toBe('w1')
+    expect(item.repoId).toBe(1)
+    expect(item.worktreeBranch).toBe('feat/x')
+    expect(item.path).toBe('/repos/1/sessions/w1?repoTab=workspaces')
+  })
+
+  it('matches a worktree session directory with a trailing slash', () => {
+    const worktree = {
+      directory: '/repos/a/.worktrees/feat',
+      ownerRepo: repoA,
+      branch: 'feat/x',
+      isSchedule: false,
+    }
+    const sessions = [createSession('w1', atStartOfDay(2000), '/repos/a/.worktrees/feat/')]
+
+    const groups = buildSidebarRepoGroups({
+      repos: [repoA],
+      sessions,
+      pinnedKeys: new Set(),
+      now: NOW,
+      worktrees: [worktree],
+    })
+
+    expect(groups[0].items.map((item) => item.session.id)).toEqual(['w1'])
+    expect(groups[0].items[0].worktreeBranch).toBe('feat/x')
+  })
+
+  it('excludes a worktree session when no worktrees are provided', () => {
+    const sessions = [createSession('w1', atStartOfDay(2000), '/repos/a/.worktrees/feat')]
+
+    const groups = buildSidebarRepoGroups({ repos: [repoA], sessions, pinnedKeys: new Set(), now: NOW })
+
+    expect(groups[0].items).toEqual([])
+  })
+
   it('labels assistant sessions and links them in assistant mode', () => {
     const assistant = createRepo({ id: 0, fullPath: '/assistant', localPath: 'assistant' })
     const sessions = [createSession('s1', atStartOfDay(1000), '/assistant')]