From 8062b5455ac9c43ff6d97b52d5fe082f36e6c38b Mon Sep 17 00:00:00 2001 From: Luke Parker <10430890+Hona@users.noreply.github.com> Date: Sat, 22 Aug 2026 17:30:42 +1000 Subject: [PATCH] feat(app): align moved location notice (#44085) --- .../session-timeline-notices.spec.ts | 51 ++++++++ .../src/timeline/session-timeline-row.tsx | 116 +++++++++++------- packages/ui/src/i18n/en.ts | 2 + packages/ui/src/overlays/tooltip/tooltip.tsx | 3 + 4 files changed, 130 insertions(+), 42 deletions(-) diff --git a/packages/app/e2e/regression/session-timeline-notices.spec.ts b/packages/app/e2e/regression/session-timeline-notices.spec.ts index 48119a6ce6d..ae1e9ffdc3d 100644 --- a/packages/app/e2e/regression/session-timeline-notices.spec.ts +++ b/packages/app/e2e/regression/session-timeline-notices.spec.ts @@ -97,6 +97,57 @@ test("shows a delegating row while subagent input streams", async ({ page }) => await expect(page.locator('[data-timeline-row="Thinking"]')).toHaveCount(0) }) +test("renders the moved location notice in its compact timeline style", async ({ page }) => { + const directory = `/Users/usrnk1/Developer/opencode/${"nested-directory/".repeat(24)}session` + await page.setViewportSize({ width: 480, height: 720 }) + await setupTimeline(page, { + sessionMessages: [ + user, + { + id: "msg_location", + type: "location-switched", + location: { directory }, + time: { created: 2 }, + }, + ], + }) + + const notice = page.locator('[data-slot="session-timeline-notice"][data-type="location-switched"]') + const label = notice.locator('[data-slot="session-timeline-notice-label"]') + const value = notice.locator('[data-slot="session-timeline-notice-value"]') + const tooltipTrigger = notice.locator('[data-component="tooltip-v2-trigger"]') + + await expect(label).toHaveText("Moved to") + await expect(value).toHaveText(directory) + await expect(notice).not.toContainText("·") + await expect(notice.locator("svg")).toHaveCount(0) + await expect(notice).toHaveCSS("height", "28px") + await expect(notice).toHaveCSS("gap", "8px") + await expect(notice).toHaveCSS("padding-top", "4px") + await expect(notice).toHaveCSS("padding-bottom", "4px") + await expect(label).toHaveCSS("font-size", "13px") + await expect(label).toHaveCSS("font-weight", "530") + await expect(label).toHaveCSS("line-height", "13px") + await expect(label).toHaveCSS("color", "rgb(128, 128, 128)") + await expect(value).toHaveCSS("font-size", "13px") + await expect(value).toHaveCSS("font-weight", "440") + await expect(value).toHaveCSS("line-height", "13px") + await expect(value).toHaveCSS("color", "rgb(128, 128, 128)") + await expect(value).toHaveCSS("text-overflow", "ellipsis") + await expect(value).toHaveCSS("white-space", "nowrap") + await expect(value).toHaveAttribute("dir", "ltr") + await expect.poll(() => value.evaluate((element) => element.scrollWidth > element.clientWidth)).toBe(true) + + const tooltip = page.getByText("Session working directory changed", { exact: true }) + await label.hover() + await expect(tooltip).toBeVisible() + await page.mouse.move(0, 0) + await expect(tooltip).toBeHidden() + await tooltipTrigger.focus() + await expect(tooltipTrigger).toBeFocused() + await expect(tooltip).toBeVisible() +}) + test("moves blocking work to the background with Ctrl+B", async ({ page }) => { await setupTimeline(page, { sessionMessages: [user, assistant(false, true)] }) const card = page.locator('[data-component="task-tool-card"]') diff --git a/packages/session-ui/src/timeline/session-timeline-row.tsx b/packages/session-ui/src/timeline/session-timeline-row.tsx index 1e33851a99a..32a59c319bc 100644 --- a/packages/session-ui/src/timeline/session-timeline-row.tsx +++ b/packages/session-ui/src/timeline/session-timeline-row.tsx @@ -8,6 +8,7 @@ import { Card } from "@opencode-ai/ui/card" import { useI18n } from "@opencode-ai/ui/context/i18n" import { TextReveal } from "@opencode-ai/ui/text-reveal" import { TextShimmer } from "@opencode-ai/ui/text-shimmer" +import { Tooltip } from "@opencode-ai/ui/tooltip" import { For, Show, createMemo, type Accessor, type JSX } from "solid-js" import type { SessionUserActions, SessionUserComment } from "../actions" import { @@ -168,8 +169,6 @@ export function createSessionTimelineRowRenderer(input: { label: i18n.t("ui.sessionTimeline.notice.model"), data: `${message.model.providerID}/${message.model.id}`, } - if (message.type === "location-switched") - return { label: i18n.t("ui.patch.action.moved"), data: message.location.directory } if (message.type === "skill") return { label: i18n.t("ui.tool.skill"), data: message.name } if (message.type === "system") { const prefix = "Instructions updated: " @@ -293,56 +292,89 @@ export function createSessionTimelineRowRenderer(input: { if (value._tag !== "Notice") throw new Error("Expected a notice timeline row") return value } + const message = createMemo(() => input.projection.messageByID().get(current().messageID)) + const moved = createMemo(() => { + const value = message() + return value?.type === "location-switched" ? value : undefined + }) const content = createMemo(() => { - const message = input.projection.messageByID().get(current().messageID) - return message ? notice(message) : undefined + const value = message() + return value ? notice(value) : undefined }) return ( - - {(content) => ( - + {(content) => ( + + + {content().label} + + + {(data) => ( + + {" "} + · {data()} + + )} + + + } > - - {content().label} - - - {(data) => ( - - {" "} - · {data()} - - )} - - - } - > - - - - {content().label} - - - {(item) => ( + + - {item} + {content().label} - )} - - - + + {(item) => ( + + {item} + + )} + + + + + )} + } + > + {(message) => ( + + + + {i18n.t("ui.sessionTimeline.notice.movedTo")} + + {" "} + + {message().location.directory} + + )} diff --git a/packages/ui/src/i18n/en.ts b/packages/ui/src/i18n/en.ts index a279ec9d3f8..1cc0c9edf6b 100644 --- a/packages/ui/src/i18n/en.ts +++ b/packages/ui/src/i18n/en.ts @@ -210,6 +210,8 @@ const source = { "ui.message.duration.minutesSeconds": "{{minutes}}m {{seconds}}s", "ui.message.interrupted": "Interrupted", "ui.sessionTimeline.notice.model": "Model", + "ui.sessionTimeline.notice.movedTo": "Moved to", + "ui.sessionTimeline.notice.movedTooltip": "Session working directory changed", "ui.sessionTimeline.notice.failed": "{{actor}} failed", "ui.sessionTimeline.notice.cancelled": "{{actor}} cancelled", "ui.sessionTimeline.notice.finished": "{{actor}} finished", diff --git a/packages/ui/src/overlays/tooltip/tooltip.tsx b/packages/ui/src/overlays/tooltip/tooltip.tsx index a203b9676fa..43e0d19dbcf 100644 --- a/packages/ui/src/overlays/tooltip/tooltip.tsx +++ b/packages/ui/src/overlays/tooltip/tooltip.tsx @@ -12,6 +12,7 @@ export interface TooltipProps extends ComponentProps { contentStyle?: JSX.CSSProperties inactive?: boolean forceOpen?: boolean + triggerTabIndex?: number } export function Tooltip(props: TooltipProps) { @@ -29,6 +30,7 @@ export function Tooltip(props: TooltipProps) { "contentStyle", "inactive", "forceOpen", + "triggerTabIndex", "ignoreSafeArea", "value", ]) @@ -110,6 +112,7 @@ export function Tooltip(props: TooltipProps) {