diff --git a/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx b/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx index 7dc87ff67cfc7..f74523706986e 100644 --- a/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx +++ b/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx @@ -2460,3 +2460,34 @@ it("keeps concurrent approvals actionable outside collapsed work and restores se .element(screen.getByRole("button", { name: "Open the current tab", exact: true })) .toBeVisible(); }); + +it("opens adjacent subagent previews without repeating the hover delay", async () => { + const entries = ["Review implementation", "Check edge cases"].map((title, index) => ({ + kind: "event" as const, + id: `hover-agent-${index}`, + createdAt: CREATED_AT, + projectedItem: v2Item("subagent", { + id: `hover-item-${index}`, + subagentId: `hover-agent-${index}`, + title, + providerInstanceId: "codex", + driver: "codex", + origin: "app_owned", + childThreadId: `child-${index}`, + result: `Result for ${title}`, + }), + })); + await using screen = await renderTimeline(entries); + await screen.getByRole("button", { name: /Worked for/ }).click(); + await screen.getByRole("button", { name: "2 subagents", exact: true }).click(); + using _timers = fakeTimers(); + const popup = () => document.querySelector('[data-slot="tooltip-popup"][data-open]'); + await userEvent.hover(screen.getByRole("button", { name: "Open Review implementation" })); + await act(() => vi.advanceTimersByTime(199)); + await expect.element(popup()).not.toBeInTheDocument(); + await act(() => vi.advanceTimersByTime(1)); + await expect.element(popup()).toMatchTextContent("Review implementation"); + await userEvent.hover(screen.getByRole("button", { name: "Open Check edge cases" })); + await act(() => vi.advanceTimersByTime(1)); + await expect.element(popup()).toMatchTextContent("Check edge cases"); +}); diff --git a/apps/web/src/components/chat/MessagesTimeline.tsx b/apps/web/src/components/chat/MessagesTimeline.tsx index e94c052e40b37..a5b7cc99680e3 100644 --- a/apps/web/src/components/chat/MessagesTimeline.tsx +++ b/apps/web/src/components/chat/MessagesTimeline.tsx @@ -94,7 +94,7 @@ import { } from "./MessagesTimeline.logic"; import { type ThreadFindMatch } from "./threadFind"; import { useThreadFindNavigation } from "./useThreadFindNavigation"; -import { TooltipScrollDismissArea } from "../ui/tooltip"; +import { TooltipProvider, TooltipScrollDismissArea } from "../ui/tooltip"; import { WorktreeSetupCard } from "./WorktreeSetupCard"; import { useOpenPrLink } from "~/lib/openPullRequestLink"; import { useMediaQuery } from "~/hooks/useMediaQuery"; @@ -1435,7 +1435,7 @@ const ConversationTimeline = memo(function ConversationTimeline({ } return ( - <> + {activityAnnouncer} @@ -1520,7 +1520,7 @@ const ConversationTimeline = memo(function ConversationTimeline({ - + ); }); diff --git a/apps/web/src/components/chat/ThreadRelationshipsControl.browser.test.tsx b/apps/web/src/components/chat/ThreadRelationshipsControl.browser.test.tsx index 1a0fb5bd406f8..b693a5a191129 100644 --- a/apps/web/src/components/chat/ThreadRelationshipsControl.browser.test.tsx +++ b/apps/web/src/components/chat/ThreadRelationshipsControl.browser.test.tsx @@ -57,7 +57,7 @@ vi.mock(import("../../state/use-atom-command"), () => ({ : AsyncResult.failure(Cause.fail(new Error("Connection lost")))) as never, })); -import { render } from "../../../test/render"; +import { act, fakeTimers, render } from "../../../test/render"; import { makeThreadProjectionFixture } from "../../test-fixtures"; import { ScrollArea } from "../ui/scroll-area"; import { ToastProvider } from "../ui/toast"; @@ -435,6 +435,34 @@ it("hides a deleted fork and keeps unloaded and archived forks with their curren await expect.element(screen.getByText("deleted-fork", { exact: true })).not.toBeInTheDocument(); }); +it("shares the hover delay between adjacent lineage rows", async () => { + setup(); + state.relatedShells = [ + { id: "source", title: "First agent", lineage: { parentThreadId: null } }, + { + id: "child", + title: "Second agent", + lineage: { parentThreadId: threadId, relationshipToParent: "fork", sideChat: false }, + }, + ]; + await using screen = await render( + , + ); + using _timers = fakeTimers(); + const popup = () => document.querySelector('[data-slot="tooltip-popup"][data-open]'); + await userEvent.hover(screen.getByText("First agent", { exact: true })); + await act(() => vi.advanceTimersByTime(200)); + await expect.element(popup()).toMatchTextContent("First agent"); + await userEvent.hover(screen.getByText("Second agent", { exact: true })); + await act(() => vi.advanceTimersByTime(1)); + await expect.element(popup()).toMatchTextContent("Second agent"); +}); + it.each([1, 18])("continues scrolling the panel past a list of %i subagents", async (count) => { setup(); const projection = makeThreadProjectionFixture(); diff --git a/apps/web/src/components/chat/ThreadRelationshipsControl.tsx b/apps/web/src/components/chat/ThreadRelationshipsControl.tsx index e8a5fc1fe60a0..70b328c4d76ab 100644 --- a/apps/web/src/components/chat/ThreadRelationshipsControl.tsx +++ b/apps/web/src/components/chat/ThreadRelationshipsControl.tsx @@ -87,7 +87,7 @@ import { ThreadLineageWorkflowRow } from "./ThreadLineageWorkflowRow"; import { resolveThreadOpenRoute } from "../../lib/sideChatPane"; import { Menu, MenuItem, MenuPopup, MenuTrigger } from "../ui/menu"; -import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip"; +import { Tooltip, TooltipPopup, TooltipProvider, TooltipTrigger } from "../ui/tooltip"; import { toastManager } from "../ui/toast"; import { Spinner } from "../ui/spinner"; import { cn } from "~/lib/utils"; @@ -1024,7 +1024,7 @@ export function ThreadRelationshipsPanel(props: { }; return ( - <> + {lineageVisible ? ( ) : null} - + ); }