diff --git a/packages/app/src/session/timeline/message-menu.ts b/packages/app/src/session/timeline/message-menu.ts
new file mode 100644
index 00000000000..3d82e45f9c4
--- /dev/null
+++ b/packages/app/src/session/timeline/message-menu.ts
@@ -0,0 +1,18 @@
+import { motionTuning } from "@opencode/ui/motion-tuning"
+import { createSignal } from "solid-js"
+
+const toggle = motionTuning.toggle("session.messageMenu", {
+ label: "Message menu",
+ group: "Experiments",
+ card: "Experiments",
+ // Ahead of the card's other rows (order 1), so it sits at the top of the EXPERIMENTS card.
+ order: 0,
+ value: false,
+})
+
+const [enabled, setEnabled] = createSignal(toggle())
+
+motionTuning.subscribe(() => setEnabled(toggle()))
+
+/** Experiment: a ⋯ menu per message in a 28px trailing gutter replaces the hover info line, and turns sit 24px apart. */
+export const messageMenu = enabled
diff --git a/packages/app/src/session/timeline/message-timeline.tsx b/packages/app/src/session/timeline/message-timeline.tsx
index 3053e7e8d13..1663dbc24dd 100644
--- a/packages/app/src/session/timeline/message-timeline.tsx
+++ b/packages/app/src/session/timeline/message-timeline.tsx
@@ -35,6 +35,7 @@ import {
import { SessionHeaderSpacer } from "@/session/header/session-header"
import { SessionHeaderGap } from "@/session/header/drag-area"
import { SessionWorkingIndicator } from "@/session/header/session-working-indicator"
+import { messageMenu } from "@/session/timeline/message-menu"
type BlockingTask = { type: "shell" | "subagent"; partID: string; id?: string; label?: string }
@@ -170,7 +171,8 @@ function MessageTimelineView(
if (!directory) return
void data.location.vcs.sync({ directory }).catch(() => undefined)
})
- const turnPadding = () => "px-4 md:px-6"
+ // The message menu experiment reserves a 28px trailing gutter (24px button + 4px gap) for its ⋯ button.
+ const turnPadding = () => (messageMenu() ? "ps-4 pe-11 md:ps-6 md:pe-13" : "px-4 md:px-6")
const showHeader = createMemo(() => !props.hideHeader && (props.data.showHeader() || workspaceSession()))
const pinned = createMemo(() => props.pinned)
const messageByID = projection.messageByID
diff --git a/packages/app/src/shell/routes/session-ui-provider.tsx b/packages/app/src/shell/routes/session-ui-provider.tsx
index cb4b12a823c..5f4aea58461 100644
--- a/packages/app/src/shell/routes/session-ui-provider.tsx
+++ b/packages/app/src/shell/routes/session-ui-provider.tsx
@@ -1,5 +1,7 @@
import { DataProvider } from "@opencode/session-ui/context"
import { MarkdownProvider, type ReadMarkdownImage } from "@opencode/session-ui/context/markdown"
+import { MessageMenuProvider } from "@opencode/session-ui/context/message-menu"
+import { messageMenu } from "@/session/timeline/message-menu"
import { useNavigate, useParams } from "@solidjs/router"
import { createMemo, type ParentProps } from "solid-js"
import { useProviders } from "@/providers/catalog/providers"
@@ -140,7 +142,7 @@ export function SessionUIProvider(
}
>
- {props.children}
+ {props.children}
diff --git a/packages/session-ui/src/components/message-part.css b/packages/session-ui/src/components/message-part.css
index 2efbfdcf4d7..e353cd0f3df 100644
--- a/packages/session-ui/src/components/message-part.css
+++ b/packages/session-ui/src/components/message-part.css
@@ -1729,3 +1729,58 @@
color: var(--v2-text-text-muted);
transition: none;
}
+
+/* The message options button sits in the 28px gutter the timeline reserves on the trailing side. */
+[data-component="user-message"],
+[data-component="text-part"] {
+ position: relative;
+
+ [data-slot="message-options"] {
+ position: absolute;
+ top: calc(0.5lh - 12px);
+ inset-inline-end: -28px;
+ z-index: 1;
+ display: flex;
+ transition: opacity 150ms ease-out;
+
+ @media (hover: hover) {
+ opacity: 0;
+ }
+ }
+
+ &:hover [data-slot="message-options"],
+ &:focus-within [data-slot="message-options"],
+ [data-slot="message-options"]:has([data-expanded]) {
+ opacity: 1;
+ }
+
+ :root[data-motion="reduce"] & [data-slot="message-options"] {
+ transition: none;
+ }
+}
+
+/* Centered on the bubble's first line. */
+[data-component="user-message"] [data-slot="message-options"] {
+ top: calc(8px + 0.5lh - 12px);
+}
+
+[data-slot="message-options-info"] {
+ display: flex;
+ flex-direction: column;
+ gap: 2px;
+ max-width: 340px;
+ padding: 4px 8px;
+ font-family: var(--v2-font-family-sans);
+ font-size: 12px;
+ font-weight: 440;
+ line-height: var(--line-height-compact);
+ color: var(--v2-text-text-faint);
+ user-select: text;
+ cursor: default;
+
+ > span {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+}
diff --git a/packages/session-ui/src/context/message-menu.tsx b/packages/session-ui/src/context/message-menu.tsx
new file mode 100644
index 00000000000..3ae9e036bcb
--- /dev/null
+++ b/packages/session-ui/src/context/message-menu.tsx
@@ -0,0 +1,12 @@
+import { createContext, useContext, type ParentProps } from "solid-js"
+
+const context = createContext<() => boolean>(() => false)
+
+/** Experiment: a ⋯ menu per message in a trailing gutter replaces the hover info line, and turns sit further apart. */
+export function MessageMenuProvider(props: ParentProps<{ enabled: boolean }>) {
+ return props.enabled}>{props.children}
+}
+
+export function useMessageMenu() {
+ return useContext(context)
+}
diff --git a/packages/session-ui/src/message/message-content.tsx b/packages/session-ui/src/message/message-content.tsx
index 7212b2bd998..a2a5a961631 100644
--- a/packages/session-ui/src/message/message-content.tsx
+++ b/packages/session-ui/src/message/message-content.tsx
@@ -19,6 +19,7 @@ import { Markdown } from "../components/markdown"
import { linkSegments } from "../components/link-segments"
import { sessionReferenceText, setupSessionLinks } from "../components/markdown-session-links"
import { useMarkdown } from "../context/markdown"
+import { useMessageMenu } from "../context/message-menu"
import { ImagePreview } from "@opencode/ui/image-preview"
import { getFilename } from "@opencode/util/path"
import { AttachmentCard } from "./attachment-card"
@@ -115,6 +116,35 @@ function MessageActionButton(
)
}
+function MessageOptions(props: { info: string[]; children: JSX.Element }) {
+ const i18n = useI18n()
+
+ return (
+
+
+
+ )
+}
+
function UserMessageTransition(props: { active: boolean; children: JSX.Element }) {
return (
timefmt().format(props.message.time.created))
+ const info = createMemo(() =>
+ [
+ waiting() ? i18n.t("ui.message.pending") : "",
+ [agentLabel(props.agent, data.agents), model()].filter(Boolean).join(" \u00B7 "),
+ fulltimefmt().format(props.message.time.created),
+ ].filter(Boolean),
+ )
+
// In a run, only the last message keeps the meta line; the others offer their actions beside the bubble.
// Bubble corners tighten where two bubbles meet, as in the iOS app's grouped corners.
const folded = createMemo(() => !!props.run?.below && !!props.text)
@@ -539,6 +578,29 @@ export function CurrentUserMessageDisplay(props: {
}}
data-timeline-part-id={props.text ? `${props.message.id}:text:0` : undefined}
>
+ 0 || pending())}>
+
+
+ void updatePending("queue")}>
+ {i18n.t("ui.message.moveToQueue")}
+
+ void updatePending("remove")}>
+ {i18n.t("ui.message.deletePending")}
+
+
+
+ void revert()}>
+ {i18n.t("ui.message.revertMessage")}
+
+
+
+ void copy(props.text)}>{i18n.t("ui.message.copyMessage")}
+
+
+ void copy(props.message.text)}>{i18n.t("ui.message.copyFullMessage")}
+
+
+
{renderAttachments()}
-
+
{renderActions()}
{/* Like the TUI, a pending steer of only attachments still offers its actions. */}
- 0 || pending()}>
+ {/* With the message menu, a pending steer still keeps its Pending label and actions in view. */}
+ 0 || pending()}>
@@ -818,6 +881,7 @@ export function AssistantTextContent(props: {
}) {
const data = useData()
const i18n = useI18n()
+ const menu = useMessageMenu()
const numfmt = createMemo(() => new Intl.NumberFormat(i18n.locale()))
const interrupted = () => {
@@ -878,7 +942,17 @@ export function AssistantTextContent(props: {
-
+
+
+ void copy()}>{i18n.t("ui.message.copyResponse")}
+
+
+
()
const patchPartKeys = new WeakMap()
@@ -823,9 +825,10 @@ export function createSessionTimelineRowRenderer(input: {
function TurnGap(props: { messageID: string }) {
let element: HTMLDivElement | undefined
const joined = run(props.messageID)
+ const turn = () => (menu() ? 24 : 16)
springStyle(
() => element,
- () => ({ height: joined()?.above ? 4 : 16 }),
+ () => ({ height: joined()?.above ? 4 : turn() }),
(el, value) => {
el.style.height = `${value.height}px`
},
@@ -837,7 +840,7 @@ export function createSessionTimelineRowRenderer(input: {
ref={element}
data-timeline-row="TurnGap"
aria-hidden="true"
- style={{ height: untrack(joined)?.above ? "4px" : "16px" }}
+ style={{ height: untrack(joined)?.above ? "4px" : `${untrack(turn)}px` }}
/>
)
}
diff --git a/packages/ui/src/i18n/en.ts b/packages/ui/src/i18n/en.ts
index faa18282439..f9249b5a775 100644
--- a/packages/ui/src/i18n/en.ts
+++ b/packages/ui/src/i18n/en.ts
@@ -277,6 +277,7 @@ const source = {
"ui.message.expand": "Expand message",
"ui.message.collapse": "Collapse message",
"ui.message.copy": "Copy",
+ "ui.message.options": "Message options",
"ui.message.copyMessage": "Copy message",
"ui.message.copyFullMessage": "Copy full message",
"ui.message.forkMessage": "Fork to new session",