diff --git a/packages/app/e2e/regression/session-queue.spec.ts b/packages/app/e2e/regression/session-queue.spec.ts index 00eb4e9d4be..c67a87e5590 100644 --- a/packages/app/e2e/regression/session-queue.spec.ts +++ b/packages/app/e2e/regression/session-queue.spec.ts @@ -859,6 +859,45 @@ for (const delivery of ["steer", "queue"] as const) { await expect(pending).toContainText(followUp) await expect(thinking).toHaveCount(0) + const bubble = pending.locator('[data-slot="user-message-text"]') + + const colors = + delivery === "steer" + ? { + delivered: await userRow(page, userID) + .locator('[data-slot="user-message-text"]') + .evaluate((element) => ({ + background: getComputedStyle(element).backgroundColor, + text: getComputedStyle(element).color, + })), + pending: await bubble.evaluate((element) => { + const probe = document.createElement("span") + probe.style.backgroundColor = "var(--v2-background-bg-layer-02)" + probe.style.color = "var(--v2-text-text-base)" + element.appendChild(probe) + + const colors = { + background: getComputedStyle(probe).backgroundColor, + text: getComputedStyle(probe).color, + } + + probe.remove() + + return colors + }), + } + : undefined + + if (colors) { + await expect(bubble).toHaveCSS("background-color", colors.pending.background) + await expect(bubble).toHaveCSS("color", colors.pending.text) + await pending.hover() + await expect(pending.locator('[data-slot="user-message-meta"]')).toHaveText( + /^Pending\s*·\s*Build\s*·\s*Queue Model$/, + ) + await bubble.evaluate((element) => (element.dataset.deliveryMarker = "pending")) + } + // The next assistant step still belongs to U1: U2 has been admitted, not delivered. mock.emit("session.step.started", { sessionID, @@ -921,6 +960,18 @@ for (const delivery of ["steer", "queue"] as const) { mock.emit("session.inbox.delivered", { sessionID, inboxID }) await expect(thinking).toHaveCount(0) await expect(pending).toHaveCount(1) + + if (colors) { + await expect(bubble).toHaveAttribute("data-delivery-marker", "pending") + await expect(pending.locator('[data-slot="user-message-meta"]')).toHaveText(/^Build\s*·\s*Queue Model$/) + await expect(bubble).toHaveCSS("background-color", colors.delivered.background) + await expect(bubble).toHaveCSS("color", colors.delivered.text) + await expect(bubble).toHaveCSS("transition-property", "background-color, color") + await transcript.screenshot({ path: testInfo.outputPath("delivered-steer.png") }) + await page.emulateMedia({ reducedMotion: "reduce" }) + await expect(bubble).toHaveCSS("transition-duration", "0s") + } + await expect(transcript.locator('[data-timeline-row="UserMessage"]')).toHaveCount(2) await expect(transcript.locator('[data-timeline-row="AssistantPart"]').filter({ has: tools })).toHaveAttribute( "data-message-id", diff --git a/packages/app/src/session/composer/queue-panel.tsx b/packages/app/src/session/composer/queue-panel.tsx index 1f6b757bac7..650fdde5dff 100644 --- a/packages/app/src/session/composer/queue-panel.tsx +++ b/packages/app/src/session/composer/queue-panel.tsx @@ -186,7 +186,7 @@ function SessionQueueRow(props: { queue: SessionQueueView; id: string; index: nu type="button" size="small" variant="ghost-muted" - icon={} + icon={} disabled={props.queue.busy()} aria-label={language.t("session.queue.undo")} onClick={() => props.queue.undo(props.id)} diff --git a/packages/session-ui/src/components/message-part.css b/packages/session-ui/src/components/message-part.css index 75457c00863..ac6da664afa 100644 --- a/packages/session-ui/src/components/message-part.css +++ b/packages/session-ui/src/components/message-part.css @@ -145,6 +145,13 @@ border: none; padding: 8px 12px; border-radius: 10px; + transition: + background-color 200ms ease, + color 200ms ease; + + @media (prefers-reduced-motion: reduce) { + transition: none; + } [data-highlight="file"], [data-highlight="agent"] { @@ -156,6 +163,11 @@ [data-slot="user-message-mention-prefix"] { color: var(--user-message-mention-prefix-color); + transition: color 200ms ease; + + @media (prefers-reduced-motion: reduce) { + transition: none; + } } max-width: 100%; @@ -1573,29 +1585,41 @@ background: var(--v2-background-bg-layer-02); } -:root body [data-workspace-session] [data-component="user-message"] [data-slot="user-message-text"] { +:root body + [data-workspace-session] + [data-component="user-message"]:not([data-pending]) + [data-slot="user-message-text"] { --user-message-mention-prefix-color: var(--v2-blue-300); background: var(--v2-background-bg-accent); color: var(--v2-text-text-contrast); } +:root body [data-local-session] [data-component="user-message"] [data-slot="user-message-text"] { + border-radius: 8px; +} + :root[data-color-scheme="light"] body [data-local-session] - [data-component="user-message"] + [data-component="user-message"]:not([data-pending]) [data-slot="user-message-text"] { background: var(--v2-blue-100); color: var(--v2-blue-700); - border-radius: 8px; } :root[data-color-scheme="dark"] body [data-local-session] - [data-component="user-message"] + [data-component="user-message"]:not([data-pending]) [data-slot="user-message-text"] { background: var(--v2-blue-1200); color: var(--v2-blue-300); - border-radius: 8px; +} + +:root body [data-component="user-message"][data-pending] [data-slot="user-message-text"] { + --user-message-mention-prefix-color: currentColor; + + background: var(--v2-background-bg-layer-02); + color: var(--v2-text-text-base); } diff --git a/packages/session-ui/src/message/message-content.tsx b/packages/session-ui/src/message/message-content.tsx index 5eb1644d437..2a4de29c75f 100644 --- a/packages/session-ui/src/message/message-content.tsx +++ b/packages/session-ui/src/message/message-content.tsx @@ -74,7 +74,7 @@ function modelLabel( function MessageActionButton( props: Pick, "disabled" | "onMouseDown" | "onClick" | "aria-label"> & { - icon: "check" | "copy" | "reset" | "bullet-list" | "outline-trash" + icon: "check" | "copy" | "reset" | "arrow-down-to-line" | "outline-trash" label: JSX.Element }, ) { @@ -271,7 +271,9 @@ export function CurrentUserMessageDisplay(props: { const metaHead = createMemo(() => { const agent = props.agent - return [agent ? agent[0]?.toUpperCase() + agent.slice(1) : "", model()].filter(Boolean).join("\u00A0\u00B7\u00A0") + return [pending() ? i18n.t("ui.message.pending") : "", agent ? agent[0]?.toUpperCase() + agent.slice(1) : "", model()] + .filter(Boolean) + .join("\u00A0\u00B7\u00A0") }) const stamp = createMemo(() => timefmt().format(props.message.time.created)) @@ -349,7 +351,11 @@ export function CurrentUserMessageDisplay(props: { ) return ( -
+
event.preventDefault()} diff --git a/packages/ui/src/i18n/en.ts b/packages/ui/src/i18n/en.ts index bed9e6eac92..41f02bbe9f3 100644 --- a/packages/ui/src/i18n/en.ts +++ b/packages/ui/src/i18n/en.ts @@ -244,6 +244,7 @@ const source = { "ui.message.forkMessage": "Fork to new session", "ui.message.revertMessage": "Revert message", "ui.message.moveToQueue": "Move to queue", + "ui.message.pending": "Pending", "ui.message.deletePending": "Delete", "ui.message.copyResponse": "Copy response", "ui.message.copied": "Copied", diff --git a/packages/ui/src/icons/catalog.ts b/packages/ui/src/icons/catalog.ts index 38c49853c19..47895053744 100644 --- a/packages/ui/src/icons/catalog.ts +++ b/packages/ui/src/icons/catalog.ts @@ -222,6 +222,10 @@ const icons = { viewBox: "0 0 20 20", body: ``, }, + "outline-undo": { + viewBox: "0 0 16 16", + body: ``, + }, "outline-reset": { viewBox: "0 0 20 20", body: ``,