From 22c3eb1241fd97e55bcd81e74c01187b52e7a4a0 Mon Sep 17 00:00:00 2001 From: usrnk1 <7547651+usrnk1@users.noreply.github.com> Date: Tue, 20 Oct 2026 19:54:40 +0200 Subject: [PATCH] feat(session-ui): refine prompt styling and pending badges (#57463) --- .../session-message-projection.spec.ts | 82 ++++++++++++++ .../src/components/message-part.css | 50 +++++---- .../src/message/message-content.tsx | 9 +- .../src/message/prompt-message.stories.tsx | 104 ++++++++++++++++++ packages/ui/src/icons/catalog.ts | 8 ++ 5 files changed, 232 insertions(+), 21 deletions(-) create mode 100644 packages/session-ui/src/message/prompt-message.stories.tsx diff --git a/packages/session-ui/component-tests/session-message-projection.spec.ts b/packages/session-ui/component-tests/session-message-projection.spec.ts index c218c7ba09c..c51e6c08ad6 100644 --- a/packages/session-ui/component-tests/session-message-projection.spec.ts +++ b/packages/session-ui/component-tests/session-message-projection.spec.ts @@ -1,5 +1,68 @@ import { expect, story } from "../../storybook/playwright/story" +story("badges pending steers without marking delivered, starting, or queued prompts", async ({ mount }) => { + const timeline = await mount("current-prompt-message--pending") + const badge = timeline.getByRole("img", { name: "Pending", exact: true }) + const text = timeline.locator('[data-slot="user-message-text"]') + + for (const status of ["steering", "stranded", "starting", "queued", "delivered"]) { + await timeline.getByLabel("Delivery state").selectOption(status) + const pending = status === "steering" || status === "stranded" + await expect(badge).toHaveCount(pending ? 1 : 0) + + const colors = await timeline.evaluate((element, pending) => { + const probe = document.createElement("span") + probe.style.color = `var(--v2-text-text-${pending ? "muted" : "base"})` + probe.style.backgroundColor = `var(--v2-background-bg-layer-${pending ? "01" : "02"})` + element.append(probe) + const result = { color: getComputedStyle(probe).color, background: getComputedStyle(probe).backgroundColor } + probe.remove() + + return result + }, pending) + + await expect(text).toHaveCSS("color", colors.color) + await expect(text).toHaveCSS("background-color", colors.background) + } + + await timeline.getByLabel("Delivery state").selectOption("steering") + await timeline.getByLabel("Voice message", { exact: true }).check() + const voice = timeline.getByRole("img", { name: "Voice", exact: true }) + await expect(voice).toBeVisible() + await expect(badge).toBeVisible() + + await expect(voice.locator("use")).toHaveAttribute("href", "#opencode-v2-icon-outline-wave-audio") + await expect(badge.locator("use")).toHaveAttribute("href", "#opencode-v2-icon-outline-steer") + + for (const marker of [voice, badge]) { + await expect(marker).toHaveCSS("width", "20px") + await expect(marker).toHaveCSS("height", "20px") + await expect(marker.locator('[data-slot="icon-svg"]')).toHaveCSS("width", "14px") + await expect(marker.locator('[data-slot="icon-svg"]')).toHaveCSS("height", "14px") + } + + const badgeColors = await badge.evaluate((element) => { + const probe = document.createElement("span") + probe.style.color = "var(--v2-icon-icon-muted)" + probe.style.backgroundColor = "var(--v2-background-bg-layer-02)" + element.append(probe) + const colors = { color: getComputedStyle(probe).color, background: getComputedStyle(probe).backgroundColor } + probe.remove() + + return colors + }) + + await expect(badge).toHaveCSS("color", badgeColors.color) + await expect(badge).toHaveCSS("background-color", badgeColors.background) + const boxes = await Promise.all([voice.boundingBox(), badge.boundingBox()]) + expect(boxes[0]!.x + boxes[0]!.width).toBeLessThanOrEqual(boxes[1]!.x) + await timeline.getByLabel("Prompt text", { exact: true }).uncheck() + await expect(timeline.getByText("notes.json", { exact: true })).toBeVisible() + await expect(badge).toBeVisible() + await timeline.getByRole("button", { name: "Move to queue", exact: true }).click() + await expect(badge).toHaveCount(0) +}) + // Moved from packages/app/e2e/regression/session-timeline-collapse-state.spec.ts story("keeps a manually collapsed tool collapsed when later assistant content streams", async ({ mount }) => { const timeline = await mount("current-session-file-changes--changing-files", { args: { scenario: "streaming" } }) @@ -80,6 +143,25 @@ story("renders user image, file attachment, file reference, and agent reference" await expect(timeline.getByText("@src/a.ts", { exact: true })).toBeVisible() await expect(timeline.getByText("@explore", { exact: true })).toBeVisible() + const accent = await timeline.evaluate((element) => { + const probe = document.createElement("span") + probe.style.color = "var(--v2-text-text-accent)" + element.append(probe) + const color = getComputedStyle(probe).color + probe.remove() + + return color + }) + + for (const mention of await timeline.locator("[data-highlight]").all()) { + await expect(mention).toHaveCSS("color", accent) + await expect(mention).toHaveCSS("font-weight", "440") + } + + for (const prefix of await timeline.locator('[data-slot="user-message-mention-prefix"]').all()) { + await expect(prefix).toHaveCSS("color", accent) + } + const attachments = timeline.locator('[data-slot="user-message-attachments"]') const body = timeline.locator('[data-slot="user-message-body"]') const [attachmentsBox, bodyBox] = await Promise.all([attachments.boundingBox(), body.boundingBox()]) diff --git a/packages/session-ui/src/components/message-part.css b/packages/session-ui/src/components/message-part.css index 26ef7c21eee..5764b650803 100644 --- a/packages/session-ui/src/components/message-part.css +++ b/packages/session-ui/src/components/message-part.css @@ -139,7 +139,8 @@ margin-top: 8px; } - [data-slot="user-message-voice"] { + [data-slot="user-message-voice"], + [data-slot="user-message-pending"] { position: absolute; top: -8px; inset-inline-start: -8px; @@ -149,7 +150,6 @@ border-radius: 9999px; background: var(--v2-background-bg-layer-03); box-shadow: 0 0 0 2px var(--v2-background-bg-base); - color: var(--v2-icon-icon-muted); [data-component="tooltip-v2-trigger"] { width: 100%; @@ -160,8 +160,27 @@ } [data-slot="icon-svg"] { - width: 12px; - height: 12px; + width: 14px; + height: 14px; + } + } + + [data-slot="user-message-voice"] { + color: var(--v2-icon-icon-muted); + } + + [data-slot="user-message-pending"] { + color: var(--v2-icon-icon-muted); + background: var(--v2-background-bg-layer-02); + } + + &[data-pending] { + position: relative; + margin-block-start: 8px; + + [data-slot="user-message-pending"] { + inset-inline-start: auto; + inset-inline-end: -8px; } } @@ -185,14 +204,14 @@ [data-highlight="file"], [data-highlight="agent"] { - color: inherit; - font-weight: 600; + color: var(--v2-text-text-accent); + font-weight: 440; direction: ltr; unicode-bidi: isolate; } [data-slot="user-message-mention-prefix"] { - color: var(--v2-blue-500); + color: var(--v2-text-text-accent); } [data-slot="user-message-link"] { @@ -1477,8 +1496,8 @@ font-weight: 440; [data-slot="user-message-text"] { - background: var(--v2-blue-1200); - color: var(--v2-blue-300); + background: var(--v2-background-bg-layer-02); + color: var(--v2-text-text-base); } [data-slot="user-message-comments"] { @@ -1519,19 +1538,10 @@ } } -:root[data-color-scheme="light"] body [data-component="user-message"] [data-slot="user-message-text"] { - background: var(--v2-blue-100); - color: var(--v2-blue-700); -} - /* Only delivery animates. A steer can render once before its admission marks it pending, and must not fade from the delivered color. */ :root body [data-component="user-message"][data-pending] [data-slot="user-message-text"] { - background: var(--v2-background-bg-layer-02); - color: var(--v2-text-text-base); + background: var(--v2-background-bg-layer-01); + color: var(--v2-text-text-muted); transition: none; - - [data-slot="user-message-mention-prefix"] { - color: currentColor; - } } diff --git a/packages/session-ui/src/message/message-content.tsx b/packages/session-ui/src/message/message-content.tsx index 58fecf93fa6..2536063581f 100644 --- a/packages/session-ui/src/message/message-content.tsx +++ b/packages/session-ui/src/message/message-content.tsx @@ -384,6 +384,13 @@ export function CurrentUserMessageDisplay(props: { data-pending={waiting() ? "true" : undefined} data-timeline-part-id={props.text ? `${props.message.id}:text:0` : undefined} > + +
+ + + +
+
{renderAttachments()}
- +
diff --git a/packages/session-ui/src/message/prompt-message.stories.tsx b/packages/session-ui/src/message/prompt-message.stories.tsx new file mode 100644 index 00000000000..4765f804206 --- /dev/null +++ b/packages/session-ui/src/message/prompt-message.stories.tsx @@ -0,0 +1,104 @@ +import { createMemo, For } from "solid-js" +import { createStore } from "solid-js/store" +import type { SessionMessageUser } from "@opencode/client/promise" +import type { SessionUserActions } from "../actions" +import { CurrentUserMessageDisplay } from "./message-content" +import { CurrentSessionProviders } from "../storybook/current-session-story" +import { CURRENT_SESSION_ID, STORY_MODEL, STORY_TIME } from "../storybook/current-session-fixtures" + +export default { + title: "OpenCode/Conversation/Prompt message", + id: "current-prompt-message", + parameters: { layout: "fullscreen" }, +} + +export const Pending = { + render: () => { + const statuses = ["delivered", "starting", "steering", "stranded", "queued"] as const + + const [state, setState] = createStore<{ status: (typeof statuses)[number]; voice: boolean; text: boolean }>({ + status: "steering", + voice: false, + text: true, + }) + + const message = createMemo(() => ({ + id: "msg_pending_prompt_story", + type: "user", + text: state.text ? "Keep the prompt styling consistent with the rest of the timeline." : "", + time: { created: STORY_TIME }, + files: state.text + ? [] + : [{ name: "notes.json", mime: "application/json", data: "e30=", source: { type: "inline" } }], + })) + + const document = createMemo(() => ({ + sessionID: CURRENT_SESSION_ID, + messages: [message()], + status: { type: "idle" as const }, + diffs: [], + })) + + const actions = { + pending: { + status: () => (state.status === "delivered" ? undefined : state.status), + queue: async () => { + setState("status", "queued") + }, + remove: async () => { + setState("status", "delivered") + }, + }, + } satisfies SessionUserActions + + return ( +
+
+ + + +
+ + + +
+ ) + }, +} diff --git a/packages/ui/src/icons/catalog.ts b/packages/ui/src/icons/catalog.ts index f287f05a5ad..87b13beff66 100644 --- a/packages/ui/src/icons/catalog.ts +++ b/packages/ui/src/icons/catalog.ts @@ -274,6 +274,14 @@ const icons = { viewBox: "0 0 16 16", body: ``, }, + "outline-steer": { + viewBox: "0 0 16 16", + body: ``, + }, + "outline-wave-audio": { + viewBox: "0 0 16 16", + body: ``, + }, archive: { viewBox: "0 0 16 16", body: ``,