From bb5683d9d45877a0a745dc66111523a95bcffe48 Mon Sep 17 00:00:00 2001
From: brennanb2025 <brennankbenson@gmail.com>
Date: Sun, 17 May 2026 22:43:26 -0700
Subject: [PATCH] Share worktree status indicator UI

---
 .../src/components/sidebar/WorkspaceKanbanCard.tsx    |  8 ++------
 ...t.tsx => WorktreeActivityStatusIndicator.test.tsx} | 10 +++++-----
 ...icator.tsx => WorktreeActivityStatusIndicator.tsx} |  2 +-
 src/renderer/src/components/sidebar/WorktreeCard.tsx  | 11 ++---------
 src/renderer/src/components/sidebar/WorktreeList.tsx  |  4 ++--
 5 files changed, 12 insertions(+), 23 deletions(-)
 rename src/renderer/src/components/sidebar/{LineageChildStatusIndicator.test.tsx => WorktreeActivityStatusIndicator.test.tsx} (71%)
 rename src/renderer/src/components/sidebar/{LineageChildStatusIndicator.tsx => WorktreeActivityStatusIndicator.tsx} (91%)

diff --git a/src/renderer/src/components/sidebar/WorkspaceKanbanCard.tsx b/src/renderer/src/components/sidebar/WorkspaceKanbanCard.tsx
index 9d75b3df87f..63997f67d9f 100644
--- a/src/renderer/src/components/sidebar/WorkspaceKanbanCard.tsx
+++ b/src/renderer/src/components/sidebar/WorkspaceKanbanCard.tsx
@@ -5,13 +5,11 @@ import { Badge } from '@/components/ui/badge'
 import { HoverCard, HoverCardContent, HoverCardTrigger } from '@/components/ui/hover-card'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { activateAndRevealWorktree } from '@/lib/worktree-activation'
-import { getWorktreeStatusLabel } from '@/lib/worktree-status'
 import { cn } from '@/lib/utils'
 import type { Repo, Worktree } from '../../../../shared/types'
-import StatusIndicator from './StatusIndicator'
 import WorktreeCard from './WorktreeCard'
+import { WorktreeActivityStatusIndicator } from './WorktreeActivityStatusIndicator'
 import WorktreeContextMenu from './WorktreeContextMenu'
-import { useWorktreeActivityStatus } from './use-worktree-activity-status'
 import { writeWorkspaceDragData } from './workspace-status'
 
 type WorkspaceKanbanCardProps = {
@@ -108,7 +106,6 @@ function WorkspaceKanbanCompactCard({
 }: Omit<WorkspaceKanbanCardProps, 'compact'>): React.JSX.Element {
   const deleteState = useAppStore((s) => s.deleteStateByWorktreeId[worktree.id])
   const isDeleting = deleteState?.isDeleting ?? false
-  const status = useWorktreeActivityStatus(worktree.id)
   const contextWorktrees = useMemo(
     () =>
       isSelected && selectedWorktrees && selectedWorktrees.length > 0
@@ -187,8 +184,7 @@ function WorkspaceKanbanCompactCard({
             aria-label={`Open ${worktree.displayName}`}
             aria-busy={isDeleting}
           >
-            <StatusIndicator status={status} aria-hidden="true" className="mr-1" />
-            <span className="sr-only">{getWorktreeStatusLabel(status)}</span>
+            <WorktreeActivityStatusIndicator worktreeId={worktree.id} className="mr-1" />
             <span className="min-w-0 flex-1 truncate">{worktree.displayName}</span>
             {repo ? (
               <Tooltip>
diff --git a/src/renderer/src/components/sidebar/LineageChildStatusIndicator.test.tsx b/src/renderer/src/components/sidebar/WorktreeActivityStatusIndicator.test.tsx
similarity index 71%
rename from src/renderer/src/components/sidebar/LineageChildStatusIndicator.test.tsx
rename to src/renderer/src/components/sidebar/WorktreeActivityStatusIndicator.test.tsx
index 8ebc3b7366a..633dce8a46e 100644
--- a/src/renderer/src/components/sidebar/LineageChildStatusIndicator.test.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeActivityStatusIndicator.test.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { renderToStaticMarkup } from 'react-dom/server'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { WorktreeStatus } from '@/lib/worktree-status'
-import { LineageChildStatusIndicator } from './LineageChildStatusIndicator'
+import { WorktreeActivityStatusIndicator } from './WorktreeActivityStatusIndicator'
 
 const mocks = vi.hoisted(() => ({
   status: 'inactive' as WorktreeStatus
@@ -15,16 +15,16 @@ vi.mock('./use-worktree-activity-status', () => ({
 function renderMarkup(status: WorktreeStatus): string {
   mocks.status = status
   return renderToStaticMarkup(
-    React.createElement(LineageChildStatusIndicator, { worktreeId: 'wt-child' })
+    React.createElement(WorktreeActivityStatusIndicator, { worktreeId: 'wt-child' })
   )
 }
 
-describe('LineageChildStatusIndicator', () => {
+describe('WorktreeActivityStatusIndicator', () => {
   beforeEach(() => {
     mocks.status = 'inactive'
   })
 
-  it('renders the shared inactive status for slept child previews', () => {
+  it('renders the shared inactive status for slept worktrees', () => {
     const markup = renderMarkup('inactive')
 
     expect(markup).toContain('Inactive')
@@ -32,7 +32,7 @@ describe('LineageChildStatusIndicator', () => {
     expect(markup).not.toContain('bg-emerald-500')
   })
 
-  it('renders the shared active status when the child workspace is live', () => {
+  it('renders the shared active status when the worktree is live', () => {
     const markup = renderMarkup('active')
 
     expect(markup).toContain('Active')
diff --git a/src/renderer/src/components/sidebar/LineageChildStatusIndicator.tsx b/src/renderer/src/components/sidebar/WorktreeActivityStatusIndicator.tsx
similarity index 91%
rename from src/renderer/src/components/sidebar/LineageChildStatusIndicator.tsx
rename to src/renderer/src/components/sidebar/WorktreeActivityStatusIndicator.tsx
index d1680020677..be187336da8 100644
--- a/src/renderer/src/components/sidebar/LineageChildStatusIndicator.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeActivityStatusIndicator.tsx
@@ -3,7 +3,7 @@ import { getWorktreeStatusLabel } from '@/lib/worktree-status'
 import StatusIndicator from './StatusIndicator'
 import { useWorktreeActivityStatus } from './use-worktree-activity-status'
 
-export function LineageChildStatusIndicator({
+export function WorktreeActivityStatusIndicator({
   worktreeId,
   className
 }: {
diff --git a/src/renderer/src/components/sidebar/WorktreeCard.tsx b/src/renderer/src/components/sidebar/WorktreeCard.tsx
index 350343595eb..3beec9a670a 100644
--- a/src/renderer/src/components/sidebar/WorktreeCard.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCard.tsx
@@ -15,14 +15,13 @@ import {
   ServerOff,
   Workflow
 } from 'lucide-react'
-import StatusIndicator from './StatusIndicator'
 import CacheTimer from './CacheTimer'
 import WorktreeContextMenu from './WorktreeContextMenu'
 import { SshDisconnectedDialog } from './SshDisconnectedDialog'
 import WorktreeCardAgents from './WorktreeCardAgents'
+import { WorktreeActivityStatusIndicator } from './WorktreeActivityStatusIndicator'
 import { cn } from '@/lib/utils'
 import { activateAndRevealWorktree } from '@/lib/worktree-activation'
-import { getWorktreeStatusLabel } from '@/lib/worktree-status'
 import { getRepoKindLabel, isFolderRepo } from '../../../../shared/repo-kind'
 import type { HostedReviewInfo } from '../../../../shared/hosted-review'
 import type { Worktree, Repo, IssueInfo, LinearIssue } from '../../../../shared/types'
@@ -33,7 +32,6 @@ import {
   hasWorktreeCardDetails
 } from './WorktreeCardMeta'
 import { writeWorkspaceDragData } from './workspace-status'
-import { useWorktreeActivityStatus } from './use-worktree-activity-status'
 import { getWorktreeCardPrDisplay } from './worktree-card-pr-display'
 
 type WorktreeCardProps = {
@@ -212,8 +210,6 @@ const WorktreeCard = React.memo(function WorktreeCard({
     : null
   const isDeleting = deleteState?.isDeleting ?? false
 
-  const status = useWorktreeActivityStatus(worktree.id)
-
   const showPR = cardProps.includes('pr')
   const showIssue = cardProps.includes('issue')
   const showComment = cardProps.includes('comment')
@@ -431,10 +427,7 @@ const WorktreeCard = React.memo(function WorktreeCard({
       {(cardProps.includes('status') || cardProps.includes('unread')) && (
         <div className="flex flex-col items-center justify-start pt-[2px] gap-2 shrink-0">
           {cardProps.includes('status') && (
-            <>
-              <StatusIndicator status={status} aria-hidden="true" />
-              <span className="sr-only">{getWorktreeStatusLabel(status)}</span>
-            </>
+            <WorktreeActivityStatusIndicator worktreeId={worktree.id} />
           )}
 
           {cardProps.includes('unread') && (
diff --git a/src/renderer/src/components/sidebar/WorktreeList.tsx b/src/renderer/src/components/sidebar/WorktreeList.tsx
index 70aa1cd18e6..2988f5018c7 100644
--- a/src/renderer/src/components/sidebar/WorktreeList.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeList.tsx
@@ -14,8 +14,8 @@ import {
 } from '@/store/selectors'
 import WorktreeCard from './WorktreeCard'
 import WorktreeCardAgents from './WorktreeCardAgents'
-import { LineageChildStatusIndicator } from './LineageChildStatusIndicator'
 import { SshDisconnectedDialog } from './SshDisconnectedDialog'
+import { WorktreeActivityStatusIndicator } from './WorktreeActivityStatusIndicator'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import {
@@ -1136,7 +1136,7 @@ const VirtualizedWorktreeViewport = React.memo(function VirtualizedWorktreeViewp
                     onDoubleClick={(event) => event.stopPropagation()}
                   >
                     <span className="mt-[2px] flex w-4 shrink-0 justify-center pt-[2px]">
-                      <LineageChildStatusIndicator worktreeId={child.worktree.id} />
+                      <WorktreeActivityStatusIndicator worktreeId={child.worktree.id} />
                     </span>
                     <div className="min-w-0 flex-1">
                       <div className="truncate text-[12px] leading-tight text-foreground">