diff --git a/src/renderer/src/components/sidebar/worktree-card-parent-content.tsx b/src/renderer/src/components/sidebar/worktree-card-parent-content.tsx
index d1b24cca2ad..4cf122b0519 100644
--- a/src/renderer/src/components/sidebar/worktree-card-parent-content.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-parent-content.tsx
@@ -3,6 +3,8 @@ import React from 'react'
import { cn } from '@/lib/utils'
import { WorktreeCardHeader } from './worktree-card-header'
import { WorktreeCardMetaRow } from './worktree-card-meta-row'
+import { WorktreeCardDetailsHover } from './WorktreeCardMeta'
+import { WorktreeCardPortsDetails } from './WorktreeCardPorts'
import type { WorktreeCardPresentation } from './worktree-card-presentation'
import { WorktreeCardSecondaryRows } from './worktree-card-secondary-rows'
import { WorktreeCardStatusSlot } from './WorktreeCardStatusSlot'
@@ -26,10 +28,91 @@ export function WorktreeCardParentContent({
handleToggleUnreadQuick,
statusLaneReview,
branchIdentityDisplay,
- showInlineAgentList
+ showInlineAgentList,
+ titleRenaming,
+ isDeleting,
+ hoverIssue,
+ hoverLinearIssue,
+ hoverJiraIssue,
+ hoverReview,
+ hoverComment,
+ metaAutomationProvenance,
+ metaCliProvenance,
+ workspacePorts,
+ detailsHoverControl,
+ handleRenameTitle,
+ handleEditIssue,
+ handleEditComment,
+ handleOpenGitHubIssueInOrca,
+ linearIssue,
+ handleOpenLinearIssueInOrca,
+ handleOpenReviewInOrca,
+ handleOpenAutomation,
+ handleOpenAutomationRun,
+ hasExplicitLinkedReview,
+ handleUnlinkReview
} = card
- const { titleOnlyCard, parentContentMarginLeft, showCombinedStatusSlot, showUnreadQuickAction } =
- presentation
+ const {
+ titleOnlyCard,
+ parentContentMarginLeft,
+ showCombinedStatusSlot,
+ showUnreadQuickAction,
+ hasHoverDetails,
+ hoverBranchName,
+ hoverWorkspaceTitle
+ } = presentation
+
+ const identityContent = (
+
+
+ {presentation.hasMetaRow && }
+
+ )
+ // Why: status glyphs and agent rows own their tooltips; only identity content should open the larger details card.
+ const identityContentWithHover =
+ hasHoverDetails && !titleRenaming ? (
+ 0 ? : null
+ }
+ openDelay={100}
+ hoverControl={detailsHoverControl}
+ onRenameWorkspaceTitle={affiliateListMode ? undefined : handleRenameTitle}
+ onEditIssue={affiliateListMode ? undefined : handleEditIssue}
+ onEditComment={affiliateListMode ? undefined : handleEditComment}
+ onOpenGitHubIssueInOrca={
+ hoverIssue && 'url' in hoverIssue && hoverIssue.url
+ ? handleOpenGitHubIssueInOrca
+ : undefined
+ }
+ onOpenLinearIssueInOrca={linearIssue?.url ? handleOpenLinearIssueInOrca : undefined}
+ onOpenReviewInOrca={
+ hoverReview?.url && hoverReview.provider === 'github' ? handleOpenReviewInOrca : undefined
+ }
+ onOpenAutomation={affiliateListMode ? undefined : handleOpenAutomation}
+ onOpenAutomationRun={affiliateListMode ? undefined : handleOpenAutomationRun}
+ onUnlinkReview={
+ !affiliateListMode && hasExplicitLinkedReview ? handleUnlinkReview : undefined
+ }
+ >
+ {identityContent}
+
+ ) : (
+ identityContent
+ )
return (
- {/* Header row: Title */}
-
- {presentation.hasMetaRow && }
+ {identityContentWithHover}
diff --git a/src/renderer/src/components/sidebar/worktree-card-surface.tsx b/src/renderer/src/components/sidebar/worktree-card-surface.tsx
index a9c91c78131..a045a7b2d32 100644
--- a/src/renderer/src/components/sidebar/worktree-card-surface.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-surface.tsx
@@ -4,8 +4,6 @@ import { LoaderCircle } from 'lucide-react'
import { cn } from '@/lib/utils'
import { AutoRenameFailedDialog } from './AutoRenameFailedDialog'
import WorktreeContextMenu from './WorktreeContextMenu'
-import { WorktreeCardDetailsHover } from './WorktreeCardMeta'
-import { WorktreeCardPortsDetails } from './WorktreeCardPorts'
import { WorktreeCardParentContent } from './worktree-card-parent-content'
import { buildWorktreeCardPresentation } from './worktree-card-presentation'
import type { WorktreeCardController } from './use-worktree-card-controller'
@@ -38,83 +36,13 @@ export function WorktreeCardSurface({ card }: { card: WorktreeCardController }):
handleDragStart,
handleDragEnd,
handleContextMenuSelect,
- hoverIssue,
- hoverLinearIssue,
- hoverJiraIssue,
- hoverReview,
- hoverComment,
- metaAutomationProvenance,
- metaCliProvenance,
- workspacePorts,
- detailsHoverControl,
- handleRenameTitle,
- handleEditIssue,
- handleEditComment,
- handleOpenGitHubIssueInOrca,
- linearIssue,
- handleOpenLinearIssueInOrca,
- handleOpenReviewInOrca,
- handleOpenAutomation,
- handleOpenAutomationRun,
- hasExplicitLinkedReview,
- handleUnlinkReview,
showRenameErrorDialog,
setShowRenameErrorDialog
} = card
- const { titleOnlyCard, hasHoverDetails, hoverBranchName, hoverWorkspaceTitle, cardStyle } =
- presentation
+ const { titleOnlyCard, cardStyle } = presentation
const parentCardContent =
- const parentHoverTriggerBody = (
-
- {parentCardContent}
-
- )
-
- const parentCardBodyWithHoverDetails =
- hasHoverDetails && !titleRenaming ? (
- 0 ? : null
- }
- openDelay={100}
- hoverControl={detailsHoverControl}
- onRenameWorkspaceTitle={affiliateListMode ? undefined : handleRenameTitle}
- onEditIssue={affiliateListMode ? undefined : handleEditIssue}
- onEditComment={affiliateListMode ? undefined : handleEditComment}
- onOpenGitHubIssueInOrca={
- hoverIssue && 'url' in hoverIssue && hoverIssue.url
- ? handleOpenGitHubIssueInOrca
- : undefined
- }
- onOpenLinearIssueInOrca={linearIssue?.url ? handleOpenLinearIssueInOrca : undefined}
- onOpenReviewInOrca={
- hoverReview?.url && hoverReview.provider === 'github' ? handleOpenReviewInOrca : undefined
- }
- onOpenAutomation={affiliateListMode ? undefined : handleOpenAutomation}
- onOpenAutomationRun={affiliateListMode ? undefined : handleOpenAutomationRun}
- // Why: branch lookup can surface a review without persisted metadata; only unlink when explicitly linked.
- onUnlinkReview={
- !affiliateListMode && hasExplicitLinkedReview ? handleUnlinkReview : undefined
- }
- >
- {parentHoverTriggerBody}
-
- ) : (
- parentHoverTriggerBody
- )
-
const cardBody = (
)}
- {parentCardBodyWithHoverDetails}
+ {parentCardContent}
{newCardStyle && lineageChildren ? (
{
expect(getWorktreeLineageDropTargetId({ container, target, pointerY: 150 })).toBeNull()
})
+
+ it.each(['status', 'agent'] as const)(
+ 'keeps the %s region in the lineage nesting hit zone',
+ (targetRole) => {
+ const { container, target } = makeTarget({
+ worktreeId: 'parent',
+ top: 100,
+ bottom: 200,
+ targetRole
+ })
+
+ expect(getWorktreeLineageDropTargetId({ container, target, pointerY: 150 })).toBe('parent')
+ }
+ )
})
describe('getReorderedWorktreeIdsToUnnest', () => {
@@ -168,24 +184,30 @@ function makeTarget(args: {
top: number
bottom: number
contained?: boolean
+ targetRole?: 'identity' | 'status' | 'agent'
}): {
container: HTMLElement
target: Element
} {
- const row = {
- getAttribute: (name: string) => (name === 'data-worktree-drag-id' ? args.worktreeId : null)
- } as HTMLElement
- const content = {
- getBoundingClientRect: () => ({ top: args.top, bottom: args.bottom }),
- closest: (selector: string) => (selector === '[data-worktree-drag-id]' ? row : null)
- } as HTMLElement
- const target = {
- closest: (selector: string) =>
- selector === '[data-worktree-card-hover-trigger]' ? content : null
- } as Element
+ const container = document.createElement('div')
+ const row = document.createElement('div')
+ row.setAttribute('data-worktree-drag-id', args.worktreeId)
+ const content = document.createElement('div')
+ content.setAttribute('data-worktree-card-parent-content', '')
+ content.getBoundingClientRect = () => ({ top: args.top, bottom: args.bottom }) as DOMRect
+ const status = document.createElement('div')
+ const identity = document.createElement('div')
+ identity.setAttribute('data-worktree-card-hover-trigger', '')
+ const agent = document.createElement('div')
+ content.append(status, identity, agent)
+ row.append(content)
+ container.append(row)
+
+ const targetByRole = { status, identity, agent }
+ const target = targetByRole[args.targetRole ?? 'identity']
const contained = args.contained ?? true
- const container = {
- contains: (element: Element) => contained && (element === content || element === row)
- } as HTMLElement
+ if (!contained) {
+ container.removeChild(row)
+ }
return { container, target }
}
diff --git a/src/renderer/src/components/sidebar/worktree-lineage-drag-drop.ts b/src/renderer/src/components/sidebar/worktree-lineage-drag-drop.ts
index 5f63768aac3..a67c7ab3e43 100644
--- a/src/renderer/src/components/sidebar/worktree-lineage-drag-drop.ts
+++ b/src/renderer/src/components/sidebar/worktree-lineage-drag-drop.ts
@@ -2,7 +2,7 @@ import type { WorktreeLineage } from '../../../../shared/worktree/lineage-types'
import type { Worktree } from '../../../../shared/worktree/types'
import { getLineageRenderInfo } from './worktree-lineage-projection'
-const WORKTREE_CARD_CONTENT_TARGET_SELECTOR = '[data-worktree-card-hover-trigger]'
+const WORKTREE_CARD_CONTENT_TARGET_SELECTOR = '[data-worktree-card-parent-content]'
const WORKTREE_DRAG_ROW_SELECTOR = '[data-worktree-drag-id]'
const LINEAGE_DROP_ZONE_RATIO = 0.4
diff --git a/src/renderer/src/components/tab-bar/TerminalTabLeadingIcon.test.tsx b/src/renderer/src/components/tab-bar/TerminalTabLeadingIcon.test.tsx
index 57095344384..ca755e18271 100644
--- a/src/renderer/src/components/tab-bar/TerminalTabLeadingIcon.test.tsx
+++ b/src/renderer/src/components/tab-bar/TerminalTabLeadingIcon.test.tsx
@@ -1,18 +1,21 @@
import { renderToStaticMarkup } from 'react-dom/server'
import { describe, expect, it } from 'vitest'
+import { TooltipProvider } from '@/components/ui/tooltip'
import { TerminalTabLeadingIcon } from './TerminalTabLeadingIcon'
import type { TerminalTabActivityStatus } from './terminal-tab-activity-status'
/** Render one activity status through the production leading-icon component. */
function renderStatus(status: TerminalTabActivityStatus): string {
return renderToStaticMarkup(
-
+
+
+
)
}