diff --git a/packages/app/component-tests/timeline-virtualizer.spec.ts b/packages/app/component-tests/timeline-virtualizer.spec.ts index b145ead3ee7..994570d6946 100644 --- a/packages/app/component-tests/timeline-virtualizer.spec.ts +++ b/packages/app/component-tests/timeline-virtualizer.spec.ts @@ -62,7 +62,7 @@ story("treats the reachable end as the end under page zoom", async ({ page }) => await page.evaluate(async (fixture) => { document.documentElement.style.zoom = "1.1" const { mountTimelineVirtualizer } = await import(fixture) - mountTimelineVirtualizer({ count: 4, rowHeight: 60.3, immediate: true, viewportHeight: 200.5 }) + mountTimelineVirtualizer({ count: 4, rowHeight: 59.3, immediate: true, viewportHeight: 200.5 }) }, fixture) const root = page.getByTestId("timeline-virtualizer-fixture") const content = root.locator("[data-timeline-virtual-content]") @@ -108,8 +108,8 @@ for (const input of [ await expect(content.locator("[data-timeline-key]")).toHaveCount(1) if (input.name === "offset-only") { - // Pinned to the end: the 600px row and the virtualizer's 82px tail, less the 180px viewport. - await expect(root).toHaveAttribute("data-last-scroll-top", "502") + // Pinned to the end: the 600px row and the virtualizer's 86px tail, less the 180px viewport. + await expect(root).toHaveAttribute("data-last-scroll-top", "506") await root.locator("[data-scrollable]").dispatchEvent("wheel", { deltaY: -1 }) await expect(root.getByTestId("timeline-controls")).toHaveAttribute("data-pinned", "false") } diff --git a/packages/app/e2e/regression/timeline-cache.spec.ts b/packages/app/e2e/regression/timeline-cache.spec.ts index 54655b06802..1c1d348a7ce 100644 --- a/packages/app/e2e/regression/timeline-cache.spec.ts +++ b/packages/app/e2e/regression/timeline-cache.spec.ts @@ -66,7 +66,7 @@ for (const width of [1440, 390]) { // The gap above the composer is part of the tail: the status lane, then the activity pill and its gap. const spacer = page.locator('[data-timeline-row="bottom-spacer"]') await expect(spacer).toBeVisible() - expect(await spacer.evaluate((element) => element.getBoundingClientRect().height)).toBe(82) + expect(await spacer.evaluate((element) => element.getBoundingClientRect().height)).toBe(86) } finally { release.resolve() } diff --git a/packages/app/src/runtime/i18n/en.ts b/packages/app/src/runtime/i18n/en.ts index 48e2d960af8..6e4d6c5cc76 100644 --- a/packages/app/src/runtime/i18n/en.ts +++ b/packages/app/src/runtime/i18n/en.ts @@ -614,8 +614,7 @@ export const dict = { "session.queue.reverted": "Redo the revert before you reorder or edit queued prompts", "session.queue.attachments.one": "{{count}} attachment", "session.queue.attachments.other": "{{count}} attachments", - "session.todo.title": "Todos", - "session.todo.progress": "{{done}}/{{total}}", + "session.todo.moreInProgress": "+{{count}}", "session.todo.label.one": "{{done}} of {{count}} todo done", "session.todo.label.other": "{{done}} of {{count}} todos done", "session.timeline.working": "Working", diff --git a/packages/app/src/session/composer/activity-chips.css b/packages/app/src/session/composer/activity-chips.css index 21e0f79e828..82764db5f85 100644 --- a/packages/app/src/session/composer/activity-chips.css +++ b/packages/app/src/session/composer/activity-chips.css @@ -1,28 +1,3 @@ -[data-color-scheme="dark"] [data-slot="session-activity-chip"] { - background: var(--v2-background-bg-layer-01); -} - -/* The composer buttons' overlays and focus ring, with overlays layered over the capsule's own surface. */ -[data-slot="session-activity-chip"] { - &:focus-visible { - outline: 2px solid var(--v2-border-border-focus); - outline-offset: 2.5px; - } - - @media (hover: hover) { - &:hover:not(:active, [data-expanded]) { - background-image: linear-gradient(var(--v2-overlay-simple-overlay-hover), var(--v2-overlay-simple-overlay-hover)); - } - } - - &:is(:active, [data-expanded]) { - background-image: linear-gradient( - var(--v2-overlay-simple-overlay-pressed), - var(--v2-overlay-simple-overlay-pressed) - ); - } -} - [data-slot="session-activity-summary"] { color: var(--v2-text-text-faint); @@ -251,9 +226,3 @@ animation: none; } } - -@media (hover: none) { - [data-slot="session-activity-chip"] { - min-height: 44px; - } -} diff --git a/packages/app/src/session/composer/activity-chips.tsx b/packages/app/src/session/composer/activity-chips.tsx index 4d830826f8b..e6b67ffa083 100644 --- a/packages/app/src/session/composer/activity-chips.tsx +++ b/packages/app/src/session/composer/activity-chips.tsx @@ -7,7 +7,7 @@ import { stripAnsi } from "@opencode/session-ui/tools/ansi" import { createEffect, createMemo, createSignal, For, on, onCleanup, Show } from "solid-js" import { useLanguage } from "@/runtime/i18n/language" import { useSettings } from "@/settings/model" -import { useComposerLaneAlignment } from "./composer-lane" +import { composerLanePlacement, useComposerLaneAlignment } from "./composer-lane" import { createShellPanel, createShellTail, type ShellEnd } from "./shell-panel" import "./activity-chips.css" @@ -80,7 +80,6 @@ export function SessionActivityChips(props: { const alignment = useComposerLaneAlignment() - const placement = () => (({ center: "top", start: "top-start", end: "top-end" }) as const)[alignment()] // A subagent can only be interrupted once its child session exists. const stoppable = (item: SessionActivityItem) => item.type === "shell" || !!item.sessionID @@ -229,13 +228,14 @@ export function SessionActivityChips(props: { return (
- + diff --git a/packages/app/src/session/composer/composer-lane.css b/packages/app/src/session/composer/composer-lane.css new file mode 100644 index 00000000000..43e5c5c163a --- /dev/null +++ b/packages/app/src/session/composer/composer-lane.css @@ -0,0 +1,86 @@ +/* Every pill in the composer lane shares one capsule: its surface, overlays, focus ring and touch size. */ +[data-composer-pill] { + pointer-events: auto; + display: flex; + align-items: center; + gap: 8px; + height: 32px; + min-width: 0; + max-width: 100%; + padding-inline: 10px; + /* The elevation draws the hairline; a second border would double it. */ + border: 0.5px solid transparent; + border-radius: 8px; + background: var(--v2-background-bg-base); + box-shadow: var(--v2-elevation-raised); + font-size: 13px; + font-weight: 440; + line-height: var(--line-height-compact); + letter-spacing: -0.04px; + white-space: nowrap; + color: var(--v2-text-text-base); + outline: none; + + [data-color-scheme="dark"] & { + background: var(--v2-background-bg-layer-01); + } + + &:focus-visible { + outline: 2px solid var(--v2-border-border-focus); + outline-offset: 2.5px; + } + + /* Overlays layer over the capsule's own surface. */ + @media (hover: hover) { + &:hover:not(:active, [data-expanded]) { + background-image: linear-gradient(var(--v2-overlay-simple-overlay-hover), var(--v2-overlay-simple-overlay-hover)); + } + } + + &:active:not([data-expanded]) { + background-image: linear-gradient( + var(--v2-overlay-simple-overlay-pressed), + var(--v2-overlay-simple-overlay-pressed) + ); + } + + /* While its popover is open, the pill steps onto the popover's layer. */ + &[data-expanded] { + background: var(--v2-background-bg-layer-01); + + [data-color-scheme="dark"] & { + background: var(--v2-background-bg-layer-02); + } + } + + @media (hover: none) { + min-height: 44px; + } +} + +/* The popover a pill opens, just above it. */ +[data-composer-pill-panel] { + max-width: calc(100vw - 56px); + border: 0.5px solid transparent; + border-radius: 10px; + background: var(--v2-background-bg-layer-01); + box-shadow: var(--v2-elevation-floating); + outline: none; + transform-origin: var(--kb-popover-content-transform-origin); + animation: composer-pill-panel-in 150ms ease-out; + + :root[data-motion="reduce"] & { + animation: none; + } + + @media (prefers-reduced-motion: reduce) { + animation: none; + } +} + +@keyframes composer-pill-panel-in { + from { + opacity: 0; + transform: translateY(4px) scale(0.98); + } +} diff --git a/packages/app/src/session/composer/composer-lane.tsx b/packages/app/src/session/composer/composer-lane.tsx index 820baa2c718..540b6224764 100644 --- a/packages/app/src/session/composer/composer-lane.tsx +++ b/packages/app/src/session/composer/composer-lane.tsx @@ -1,6 +1,7 @@ import { createMemo, type ParentProps } from "solid-js" import { useLanguage } from "@/runtime/i18n/language" import { useSettings } from "@/settings/model" +import "./composer-lane.css" /** Where the floating pills above the composer sit, in logical terms, following the background activity setting. */ export function useComposerLaneAlignment() { @@ -17,6 +18,11 @@ export function useComposerLaneAlignment() { }) } +/** Where a pill's popover opens: above it, from the lane's aligned edge. */ +export function composerLanePlacement(alignment: "center" | "start" | "end") { + return ({ center: "top", start: "top-start", end: "top-end" } as const)[alignment] +} + // The pills float out of flow in a lane the timeline reserves at its tail, so coming and going never resizes the // composer region or moves the timeline. Every pill shares the lane's one row. export function SessionComposerLane(props: ParentProps) { diff --git a/packages/app/src/session/composer/plugin-pills.tsx b/packages/app/src/session/composer/plugin-pills.tsx index eb2a522c7a1..86f71ce023a 100644 --- a/packages/app/src/session/composer/plugin-pills.tsx +++ b/packages/app/src/session/composer/plugin-pills.tsx @@ -14,10 +14,8 @@ import { } from "@opencode/plugin/gui" import { usePluginHost } from "@/runtime/plugin/host" import { Contribution } from "@/runtime/plugin/render" -import type { useComposerLaneAlignment } from "./composer-lane" +import { composerLanePlacement, type useComposerLaneAlignment } from "./composer-lane" -const capsule = - "pointer-events-auto flex h-7 min-w-0 max-w-full items-center gap-2 rounded-[12px] border-[0.5px] border-v2-border-border-muted bg-v2-background-bg-base ps-2.5 pe-2.5 text-[13px] font-[440] leading-text-compact tracking-[-0.04px] whitespace-nowrap text-v2-text-text-base shadow-[var(--v2-elevation-raised)] outline-none" type Alignment = ReturnType> @@ -73,7 +71,6 @@ export function SessionPluginPills(props: { function PluginPill(props: { pill: ComposerPill; input: ComposerPillProps; alignment: Accessor }) { const alignment = props.alignment const view = createMemo(() => props.pill.show(props.input)) - const placement = () => (({ center: "top", start: "top-start", end: "top-end" }) as const)[alignment()] const [state, setState] = createStore({ open: false }) return ( @@ -85,7 +82,7 @@ function PluginPill(props: { pill: ComposerPill; input: ComposerPillProps; align type="button" data-slot="session-plugin-pill" aria-label={current().title} - class={capsule} + data-composer-pill onClick={() => current().run?.()} > @@ -97,7 +94,7 @@ function PluginPill(props: { pill: ComposerPill; input: ComposerPillProps; align setState("open", open)} - placement={placement()} + placement={composerLanePlacement(alignment())} gutter={8} > @@ -113,7 +110,8 @@ function PluginPill(props: { pill: ComposerPill; input: ComposerPillProps; align
@@ -139,13 +137,13 @@ function PluginPill(props: { pill: ComposerPill; input: ComposerPillProps; align {(rows) => ( - + diff --git a/packages/app/src/session/composer/todo-pill.css b/packages/app/src/session/composer/todo-pill.css index 24e30212dc9..3b17a05e586 100644 --- a/packages/app/src/session/composer/todo-pill.css +++ b/packages/app/src/session/composer/todo-pill.css @@ -1,52 +1,19 @@ -[data-color-scheme="dark"] [data-slot="session-todo-pill"] { - background: var(--v2-background-bg-layer-01); +[data-composer-pill][data-slot="session-todo-pill"] { + gap: 6px; + padding-inline-start: 8px; } -/* The activity capsule's overlays and focus ring. */ -[data-slot="session-todo-pill"] { - &:focus-visible { - outline: 2px solid var(--v2-border-border-focus); - outline-offset: 2.5px; - } - - @media (hover: hover) { - &:hover:not(:active, [data-expanded]) { - background-image: linear-gradient(var(--v2-overlay-simple-overlay-hover), var(--v2-overlay-simple-overlay-hover)); - } - } - - &:is(:active, [data-expanded]) { - background-image: linear-gradient( - var(--v2-overlay-simple-overlay-pressed), - var(--v2-overlay-simple-overlay-pressed) - ); - } -} - -[data-slot="session-todo-panel"] { - width: 320px; - max-width: calc(100vw - 56px); - padding-top: 6px; - border: 0.5px solid var(--v2-border-border-muted); - border-radius: 10px; - background: var(--v2-background-bg-layer-01); - box-shadow: var(--v2-elevation-floating); - transform-origin: var(--kb-popover-content-transform-origin); - animation: session-todo-panel-in 150ms ease-out; -} - -@keyframes session-todo-panel-in { - from { - opacity: 0; - transform: translateY(4px) scale(0.98); - } +[data-composer-pill-panel][data-slot="session-todo-panel"] { + width: max-content; + min-width: max(var(--kb-popper-anchor-width, 0px), 240px); + max-width: min(400px, calc(100vw - 56px)); } [data-slot="session-todo-glyph"] { color: var(--v2-icon-icon-faint); &[data-status="in_progress"] { - color: var(--v2-icon-icon-accent); + color: var(--v2-state-fg-warning); } &[data-status="completed"] { @@ -54,50 +21,17 @@ } } -[data-slot="session-todo-pulse"] { - transform-box: fill-box; - transform-origin: center; - animation: session-todo-pulse 1.6s ease-in-out infinite; -} - -@keyframes session-todo-pulse { - 50% { - transform: scale(0.6); - opacity: 0.55; - } -} - [data-slot="session-todo-row"] { - &[data-status="in_progress"] { - background: var(--v2-overlay-simple-overlay-hover); + [data-slot="session-todo-text"] { + color: var(--v2-text-text-muted); + } - [data-slot="session-todo-text"] { - font-weight: 530; - } + &[data-status="in_progress"] [data-slot="session-todo-text"] { + color: var(--v2-text-text-base); } &:is([data-status="completed"], [data-status="cancelled"]) [data-slot="session-todo-text"] { color: var(--v2-text-text-faint); - } - - &[data-status="cancelled"] [data-slot="session-todo-text"] { text-decoration: line-through; } } - -:root[data-motion="reduce"] :is([data-slot="session-todo-pulse"], [data-slot="session-todo-panel"]) { - animation: none; -} - -@media (prefers-reduced-motion: reduce) { - [data-slot="session-todo-pulse"], - [data-slot="session-todo-panel"] { - animation: none; - } -} - -@media (hover: none) { - [data-slot="session-todo-pill"] { - min-height: 44px; - } -} diff --git a/packages/app/src/session/composer/todo-pill.stories.tsx b/packages/app/src/session/composer/todo-pill.stories.tsx index d86fac1eb10..88b3067bd1f 100644 --- a/packages/app/src/session/composer/todo-pill.stories.tsx +++ b/packages/app/src/session/composer/todo-pill.stories.tsx @@ -19,14 +19,24 @@ const plan = [ "Run the app typecheck", ] -// `progress` todos are done, the next one is in progress and the rest are pending. -const todosAt = (progress: number): Todo[] => +type Scenario = "plan" | "cancelled" | "parallel" + +// `progress` todos are done, the next one is in progress and the rest are pending. `cancelled` drops the last todo, +// and `parallel` runs the two after `progress` at once. +const todosAt = (progress: number, scenario: Scenario): Todo[] => plan.map((content, index) => ({ content, - status: index < progress ? "completed" : index === progress ? "in_progress" : "pending", + status: + index < progress + ? "completed" + : index === progress || (scenario === "parallel" && index === progress + 1) + ? "in_progress" + : scenario === "cancelled" && index === plan.length - 1 + ? "cancelled" + : "pending", })) -const activity: { subagents: SessionActivityItem[]; shells: SessionActivityItem[] } = { +const activity = { subagents: [ { key: "ses_child_audit", @@ -47,7 +57,7 @@ const activity: { subagents: SessionActivityItem[]; shells: SessionActivityItem[ started: Date.now() - 341_000, }, ], -} +} satisfies { subagents: SessionActivityItem[]; shells: SessionActivityItem[] } function document(todos: Todo[]): SessionDocument { const messages: SessionMessageInfo[] = [ @@ -86,10 +96,10 @@ function document(todos: Todo[]): SessionDocument { return { sessionID: CURRENT_SESSION_ID, messages, status: { type: "busy" }, diffs: [] } } -type PreviewArgs = { progress: number; open: boolean; activity: boolean } +type PreviewArgs = { progress: number; scenario: Scenario; open: boolean; activity: boolean } function Preview(props: PreviewArgs) { - const value = createMemo(() => document(todosAt(props.progress))) + const value = createMemo(() => document(todosAt(props.progress, props.scenario))) onMount(() => setTimeout(() => { @@ -114,9 +124,10 @@ export default { title: "OpenCode/Session/Todo pill", id: "session-todo-pill", render: (args: PreviewArgs) => , - args: { progress: 3, open: false, activity: true }, + args: { progress: 3, scenario: "plan", open: false, activity: true }, argTypes: { progress: { control: { type: "range", min: 0, max: 7, step: 1 } }, + scenario: { control: { type: "select" }, options: ["plan", "cancelled", "parallel"] }, open: { control: { type: "boolean" } }, activity: { control: { type: "boolean" } }, }, @@ -136,3 +147,7 @@ export const Collapsed = {} export const Open = { args: { open: true } } export const WithoutActivity = { args: { activity: false } } + +export const Cancelled = { args: { scenario: "cancelled", open: true } } + +export const SeveralInProgress = { args: { scenario: "parallel", open: true } } diff --git a/packages/app/src/session/composer/todo-pill.tsx b/packages/app/src/session/composer/todo-pill.tsx index 75106e15e89..8b5db73e95b 100644 --- a/packages/app/src/session/composer/todo-pill.tsx +++ b/packages/app/src/session/composer/todo-pill.tsx @@ -1,25 +1,24 @@ import { Popover } from "@kobalte/core/popover" -import { AnimatedNumber } from "@opencode/ui/animated-number" -import { ProgressCircle } from "@opencode/ui/progress-circle" -import { createEffect, createMemo, For, on, Show } from "solid-js" +import { Badge } from "@opencode/ui/badge" +import { createEffect, createMemo, For, Match, on, Show, Switch } from "solid-js" import { createStore } from "solid-js/store" import { useLanguage } from "@/runtime/i18n/language" -import { useComposerLaneAlignment } from "./composer-lane" -import { currentTodo, todoFinished, type Todo, type TodoStatus } from "./todos" +import { composerLanePlacement, useComposerLaneAlignment } from "./composer-lane" +import { currentTodo, type Todo, type TodoStatus } from "./todos" import "./todo-pill.css" -// The agent's plan as one capsule in the composer lane, beside the background activity capsule: progress and the todo -// in hand, opening a popover with the whole list. +// The agent's plan as one capsule in the composer lane, beside the background activity capsule: the todo in hand, +// opening a popover with the whole list. export function SessionTodoPill(props: { todos: readonly Todo[]; defaultOpen?: boolean }) { const language = useLanguage() const alignment = useComposerLaneAlignment() const [state, setState] = createStore({ open: props.defaultOpen ?? false }) const done = createMemo(() => props.todos.filter((todo) => todo.status === "completed").length) - const finished = createMemo(() => props.todos.filter(todoFinished).length) const current = createMemo(() => currentTodo(props.todos)) + // The pill names the first todo in progress and counts the others running beside it. + const more = createMemo(() => Math.max(0, props.todos.filter((todo) => todo.status === "in_progress").length - 1)) const label = () => language.plural("session.todo.label", props.todos.length, { done: String(done()) }) - const placement = () => (({ center: "top", start: "top-start", end: "top-end" }) as const)[alignment()] return ( // Sits beside the activity capsule, on the side away from the lane's aligned edge. @@ -28,44 +27,37 @@ export function SessionTodoPill(props: { todos: readonly Todo[]; defaultOpen?: b class="flex min-w-0 shrink" classList={{ "-order-1": alignment() === "end", "order-1": alignment() !== "end" }} > - setState("open", open)} placement={placement()} gutter={8}> + setState("open", open)} + placement={composerLanePlacement(alignment())} + gutter={8} + > - - - {language - .t("session.todo.progress", { done: "\u0000", total: String(props.todos.length) }) - .split("\u0000") - .flatMap((part, index) => (index === 0 ? [part] : [, part]))} - {(todo) => ( - - {todo().content} - + <> + + + {todo().content} + + )} + 0}> + + {language.t("session.todo.moreInProgress", { count: String(more()) })} + + - -
- - {language.t("session.todo.title")} - - - {language.t("session.todo.progress", { done: String(done()), total: String(props.todos.length) })} - -
+
@@ -93,20 +85,22 @@ function TodoList(props: { todos: readonly Todo[] }) { ref={list} data-slot="session-todo-list" data-scrollable - class="flex max-h-[232px] flex-col overflow-y-auto px-1 pb-1" + class="flex max-h-[232px] flex-col overflow-y-auto p-1" > {(todo) => (
- + + + {todo.content} @@ -129,31 +123,18 @@ function TodoGlyph(props: { status: TodoStatus }) { aria-hidden="true" class="shrink-0" > - - - - - - - - - - - - - + + + + + + + + + + + + ) } diff --git a/packages/app/src/session/timeline/virtualizer.tsx b/packages/app/src/session/timeline/virtualizer.tsx index 4778d25dffb..4574b78a1f7 100644 --- a/packages/app/src/session/timeline/virtualizer.tsx +++ b/packages/app/src/session/timeline/virtualizer.tsx @@ -33,9 +33,9 @@ import { holdLandingWidth } from "@/shell/panel-motion" const fallbackItemSize = 60 -// Reserved below the last row: a 36px lane for the live status row and its background hint, an 8px gap, then a 28px +// Reserved below the last row: a 36px lane for the live status row and its background hint, an 8px gap, then a 32px // activity pill and its 10px composer gap. Both come and go inside it, so neither moves the rows above. -const tailSize = 82 +const tailSize = 86 const pendingMarkdown = '[data-component="markdown"]:not([data-markdown-ready])'