Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
feat(web): refresh workspace layouts and tool activity
mariad7abd7f3bb6f
diff --git a/apps/desktop/src/electron/ElectronMenu.test.ts b/apps/desktop/src/electron/ElectronMenu.test.tsindex 58870bbab..e3c5d5dd6 100644--- a/apps/desktop/src/electron/ElectronMenu.test.ts+++ b/apps/desktop/src/electron/ElectronMenu.test.ts@@ -98,7 +98,10 @@ describe("ElectronMenu", () => {const electronMenu = yield* ElectronMenu.ElectronMenu;const selectedItemId = yield* electronMenu.showContextMenu({window: makeWindow(2),- items: [{ id: "copy", label: "Copy" }],+ items: [+ { id: "copy", label: "Copy" },+ { id: "delete", label: "Delete", destructive: true, separatorBefore: true },+ ],position: Option.some({ x: 10.8, y: 20.2 }),});@@ -110,6 +113,12 @@ describe("ElectronMenu", () => {enabled: true,click: buildFromTemplateMock.mock.calls[0]?.[0][0].click,});+ assert.deepEqual(+ buildFromTemplateMock.mock.calls[0]?.[0].map(+ (item: Electron.MenuItemConstructorOptions) => item.type ?? item.label,+ ),+ ["Copy", "separator", "Delete"],+ );}).pipe(Effect.provide(TestLayer)),);diff --git a/apps/desktop/src/electron/ElectronMenu.ts b/apps/desktop/src/electron/ElectronMenu.tsindex 4d3e5a1c2..ca8cc246e 100644--- a/apps/desktop/src/electron/ElectronMenu.ts+++ b/apps/desktop/src/electron/ElectronMenu.ts@@ -78,6 +78,7 @@ function normalizeContextMenuItems(source: readonly ContextMenuItem[]): ContextMlabel: sourceItem.label,destructive: sourceItem.destructive === true,disabled: sourceItem.disabled === true,+ ...(sourceItem.separatorBefore === true ? { separatorBefore: true } : {}),};if (sourceItem.children) {@@ -141,10 +142,17 @@ export const make = Effect.gen(function* () {): Electron.MenuItemConstructorOptions[] => {const template: Electron.MenuItemConstructorOptions[] = [];let hasInsertedDestructiveSeparator = false;+ const appendSeparator = () => {+ if (template.length === 0 || template.at(-1)?.type === "separator") return;+ template.push({ type: "separator" });+ };for (const item of entries) {+ if (item.separatorBefore) {+ appendSeparator();+ }if (item.destructive && !hasInsertedDestructiveSeparator && template.length > 0) {- template.push({ type: "separator" });+ appendSeparator();hasInsertedDestructiveSeparator = true;}diff --git a/apps/server/src/orchestration/ActivityPayloadProjection.test.ts b/apps/server/src/orchestration/ActivityPayloadProjection.test.tsindex fc9ea4b62..047e40ccf 100644--- a/apps/server/src/orchestration/ActivityPayloadProjection.test.ts+++ b/apps/server/src/orchestration/ActivityPayloadProjection.test.ts@@ -20,7 +20,7 @@ function activity(payload: Record<string, unknown>): OrchestrationThreadActivity* If slimming ever moves to an allowlist over the whole payload, these* assertions are the tripwire.*/-describe("projectActivityPayload agent-field survival", () => {+describe("projectActivityPayload", () => {it("preserves tool attribution (agentId/parentToolUseId) through data slimming", () => {const projected = projectActivityPayload(activity({@@ -44,6 +44,45 @@ describe("projectActivityPayload agent-field survival", () => {expect(data.somethingClientNeverReads).toBeUndefined();});+ it("normalizes Claude and OpenCode command inputs before slimming provider data", () => {+ const claude = projectActivityPayload(+ activity({+ itemType: "command_execution",+ toolCallId: "claude-call-1",+ data: {+ toolName: "Bash",+ input: { command: "vp test run" },+ result: { content: "x".repeat(5_000) },+ },+ }),+ );+ const openCode = projectActivityPayload(+ activity({+ itemType: "command_execution",+ toolCallId: "opencode-call-1",+ data: {+ tool: "bash",+ state: {+ status: "running",+ input: { command: "vp lint" },+ output: "x".repeat(5_000),+ },+ },+ }),+ );++ expect(claude.payload).toMatchObject({+ toolCallId: "claude-call-1",+ data: { command: "vp test run" },+ });+ expect(openCode.payload).toMatchObject({+ toolCallId: "opencode-call-1",+ data: { command: "vp lint" },+ });+ expect(JSON.stringify(claude.payload).length).toBeLessThan(200);+ expect(JSON.stringify(openCode.payload).length).toBeLessThan(200);+ });+it("slims Codex-shaped mcp_tool_call items to rendered fields plus a result summary", () => {const projected = projectActivityPayload(activity({diff --git a/apps/server/src/orchestration/ActivityPayloadProjection.ts b/apps/server/src/orchestration/ActivityPayloadProjection.tsindex f68a3ee96..659760c04 100644--- a/apps/server/src/orchestration/ActivityPayloadProjection.ts+++ b/apps/server/src/orchestration/ActivityPayloadProjection.ts@@ -104,6 +104,24 @@ function projectCommandData(data: Record<string, unknown>): Record<string, unknoreturn Object.keys(projectedItem).length > 0 ? projectedItem : undefined;}+function projectCommandValue(data: Record<string, unknown>): unknown {+ if (data.command !== undefined) {+ return data.command;+ }++ const input = asRecord(data.input);+ if (input?.command !== undefined) {+ return input.command;+ }++ const stateInput = asRecord(asRecord(data.state)?.input);+ if (stateInput?.command !== undefined) {+ return stateInput.command;+ }++ return undefined;+}+function summarizeToolTextOutput(value: string): string | null {const lines: string[] = [];for (const rawLine of value.split(/\r?\n/u)) {@@ -287,8 +305,9 @@ export function projectActivityPayload(if (item) {projectedData.item = item;}- if ("command" in data) {- projectedData.command = data.command;+ const command = projectCommandValue(data);+ if (command !== undefined) {+ projectedData.command = command;}const changedFiles: string[] = [];@@ -368,10 +387,10 @@ function dropStaleContextWindowActivities(/*** Identity both clients use to fold a tool lifecycle row into the call it* belongs to (`deriveToolLifecycleCollapseKey` in web's `session-logic` and- * mobile's `threadActivity`): an explicit `data.toolCallId` when the adapter- * emits one, otherwise the itemType/title/detail triple. Returns null for rows- * with no identity at all — those never collapse on the client either, so they- * must not be dropped here.+ * mobile's `threadActivity`): the runtime item id ingestion stamps as+ * `toolCallId`, a legacy `data.toolCallId`, or the itemType/title/detail triple.+ * Returns null for rows with no identity at all — those never collapse on the+ * client either, so they must not be dropped here.*/function toolLifecycleIdentity(activity: OrchestrationThreadActivity): string | null {const payload = asRecord(activity.payload);@@ -379,7 +398,8 @@ function toolLifecycleIdentity(activity: OrchestrationThreadActivity): string |return null;}- const toolCallId = asTrimmedString(asRecord(payload.data)?.toolCallId);+ const toolCallId =+ asTrimmedString(payload.toolCallId) ?? asTrimmedString(asRecord(payload.data)?.toolCallId);if (toolCallId) {return `id:${toolCallId}`;}diff --git a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.tsindex 258aa010e..b5feda505 100644--- a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts+++ b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts@@ -2811,11 +2811,16 @@ describe("ProviderRuntimeIngestion", () => {createdAt: now,threadId: asThreadId("thread-1"),turnId: asTurnId("turn-9"),+ itemId: asItemId("tool-call-9"),payload: {itemType: "command_execution",- status: "in_progress",- title: "Read file",- detail: "/tmp/file.ts",+ status: "inProgress",+ title: "Command run",+ detail: "Bash: vp test run",+ data: {+ toolName: "Bash",+ input: { command: "vp test run" },+ },},});@@ -2830,11 +2835,20 @@ describe("ProviderRuntimeIngestion", () => {);expect(thread.session?.status).toBe("ready");- expect(- thread.activities.some(- (activity: ProviderRuntimeTestActivity) => activity.kind === "tool.started",- ),- ).toBe(true);+ const activity = thread.activities.find(+ (entry: ProviderRuntimeTestActivity) => entry.kind === "tool.started",+ );+ const payload = activity?.payload as Record<string, unknown> | undefined;+ expect(payload).toMatchObject({+ itemType: "command_execution",+ toolCallId: "tool-call-9",+ status: "inProgress",+ detail: "Bash: vp test run",+ data: {+ toolName: "Bash",+ input: { command: "vp test run" },+ },+ });});it("consumes P1 runtime events into thread metadata, diff checkpoints, and activities", async () => {diff --git a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.tsindex 032537972..1eb7e54b3 100644--- a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts+++ b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts@@ -794,6 +794,7 @@ export function runtimeEventToActivities(summary: event.payload.title ?? "Tool updated",payload: {itemType: event.payload.itemType,+ ...(event.itemId !== undefined ? { toolCallId: event.itemId } : {}),...(event.payload.status ? { status: event.payload.status } : {}),...(event.payload.detail ? { detail: truncateDetail(event.payload.detail) } : {}),...(event.payload.data !== undefined ? { data: event.payload.data } : {}),@@ -821,6 +822,8 @@ export function runtimeEventToActivities(summary: event.payload.title ?? "Tool",payload: {itemType: event.payload.itemType,+ ...(event.itemId !== undefined ? { toolCallId: event.itemId } : {}),+ ...(event.payload.status ? { status: event.payload.status } : {}),...(event.payload.detail ? { detail: truncateDetail(event.payload.detail) } : {}),...(event.payload.data !== undefined ? { data: event.payload.data } : {}),...(event.payload.agentId ? { agentId: event.payload.agentId } : {}),@@ -847,7 +850,10 @@ export function runtimeEventToActivities(summary: `${event.payload.title ?? "Tool"} started`,payload: {itemType: event.payload.itemType,+ ...(event.itemId !== undefined ? { toolCallId: event.itemId } : {}),+ ...(event.payload.status ? { status: event.payload.status } : {}),...(event.payload.detail ? { detail: truncateDetail(event.payload.detail) } : {}),+ ...(event.payload.data !== undefined ? { data: event.payload.data } : {}),...(event.payload.agentId ? { agentId: event.payload.agentId } : {}),...(event.payload.parentToolUseId? { parentToolUseId: event.payload.parentToolUseId }diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsxindex 6eab33aec..e7193a7d0 100644--- a/apps/web/src/components/ChatView.tsx+++ b/apps/web/src/components/ChatView.tsx@@ -167,7 +167,6 @@ import {WifiOffIcon,} from "lucide-react";import { cn, randomHex } from "~/lib/utils";-import { COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS } from "~/workspaceTitlebar";import { stackedThreadToast, toastManager } from "./ui/toast";import { decodeProjectScriptKeybindingRule } from "~/lib/projectScriptKeybindings";import { type NewProjectScriptInput } from "./ProjectScriptsControl";@@ -220,7 +219,11 @@ import {import { appendPreviewAnnotationPrompt } from "../lib/previewAnnotation";import { appendReviewCommentsToPrompt, type ReviewCommentContext } from "../reviewCommentContext";import { environmentCatalog } from "../connection/catalog";-import { selectThreadTerminalUiState, useTerminalUiStateStore } from "../terminalUiStateStore";+import {+ selectThreadTerminalCustomLabels,+ selectThreadTerminalUiState,+ useTerminalUiStateStore,+} from "../terminalUiStateStore";import { useKnownTerminalSessions, useThreadRunningTerminalIds } from "../state/terminalSessions";import { projectEnvironment } from "../state/projects";import { useEnvironmentQuery } from "../state/query";@@ -256,6 +259,7 @@ import { ChatHeader } from "./chat/ChatHeader";import { PanelLayoutControls, RightPanelMaximizeControl } from "./chat/PanelLayoutControls";import { type ExpandedImagePreview } from "./chat/ExpandedImagePreview";import { NoActiveThreadState } from "./NoActiveThreadState";+import { WorkspacePageHeader } from "./WorkspacePageContainer";import {resolveEffectiveEnvMode,resolveLocalCheckoutBranchMismatch,@@ -653,6 +657,7 @@ interface PersistentThreadTerminalDrawerProps {newShortcutLabel: string | undefined;closeShortcutLabel: string | undefined;keybindings: ResolvedKeybindingsConfig;+ onHide: () => void;onAddTerminalContext: (selection: TerminalContextSelection) => void;}@@ -667,6 +672,7 @@ const PersistentThreadTerminalDrawer = memo(function PersistentThreadTerminalDranewShortcutLabel,closeShortcutLabel,keybindings,+ onHide,onAddTerminalContext,}: PersistentThreadTerminalDrawerProps) {const openTerminal = useAtomCommand(terminalEnvironment.open, "terminal open");@@ -990,6 +996,7 @@ const PersistentThreadTerminalDrawer = memo(function PersistentThreadTerminalDraonSplitTerminal={splitTerminal}onSplitTerminalVertical={splitTerminalVertical}onNewTerminal={createNewTerminal}+ onHide={onHide}splitShortcutLabel={visible ? splitShortcutLabel : undefined}splitVerticalShortcutLabel={visible ? splitVerticalShortcutLabel : undefined}newShortcutLabel={visible ? newShortcutLabel : undefined}@@ -1540,6 +1547,16 @@ function ChatViewContent(props: ChatViewProps) {const canCheckoutPullRequestIntoThread = isLocalDraftThread;const activeThreadId = activeThread?.id ?? null;const activeThreadEnvironmentId = activeThread?.environmentId ?? null;+ const activeThreadRef = useMemo(+ () =>+ activeThreadEnvironmentId && activeThreadId+ ? scopeThreadRef(activeThreadEnvironmentId, activeThreadId)+ : null,+ [activeThreadEnvironmentId, activeThreadId],+ );+ const activeTerminalCustomLabels = useTerminalUiStateStore((state) =>+ selectThreadTerminalCustomLabels(state.terminalCustomLabelsByThreadKey, activeThreadRef),+ );const runningTerminalIds = useThreadRunningTerminalIds({environmentId: activeThread?.environmentId ?? null,threadId: activeThreadId,@@ -1569,18 +1586,15 @@ function ChatViewContent(props: ChatViewProps) {for (const session of activeThreadKnownSessions) {labels.set(session.target.terminalId,- resolveTerminalSessionLabel(session.target.terminalId, session.state.summary),+ activeTerminalCustomLabels[session.target.terminalId] ??+ resolveTerminalSessionLabel(session.target.terminalId, session.state.summary),);}+ for (const [terminalId, label] of Object.entries(activeTerminalCustomLabels)) {+ if (!labels.has(terminalId)) labels.set(terminalId, label);+ }return labels;- }, [activeThreadKnownSessions]);- const activeThreadRef = useMemo(- () =>- activeThreadEnvironmentId && activeThreadId- ? scopeThreadRef(activeThreadEnvironmentId, activeThreadId)- : null,- [activeThreadEnvironmentId, activeThreadId],- );+ }, [activeTerminalCustomLabels, activeThreadKnownSessions]);const activeThreadKey = activeThreadRef ? scopedThreadKey(activeThreadRef) : null;const [timelineAnchor, setTimelineAnchor] = useState<{readonly threadKey: string | null;@@ -2808,6 +2822,7 @@ function ChatViewContent(props: ChatViewProps) {},[activeThreadRef, storeSetTerminalOpen],);+ const hideTerminal = useCallback(() => setTerminalOpen(false), [setTerminalOpen]);const toggleTerminalVisibility = useCallback(() => {if (!activeThreadRef) return;const nextOpen = !terminalUiState.terminalOpen;@@ -6114,7 +6129,6 @@ function ChatViewContent(props: ChatViewProps) {? "thread": "page"}- chromeVariant="collapse"composerDraftTarget={composerDraftTarget}onStateChange={handlePullRequestTabStatusChange}/>@@ -6160,20 +6174,11 @@ function ChatViewContent(props: ChatViewProps) {data-chat-column-maximized-away={rightPanelMaximized ? "true" : "false"}>{/* Top bar */}- <header+ <WorkspacePageHeaderdata-chat-header- className={cn(- "bg-background transition-[padding-left] duration-200 ease-linear motion-reduce:transition-none",- isElectron- ? cn(- "drag-region relative flex h-[var(--workspace-topbar-height)] min-h-[var(--workspace-topbar-height)] shrink-0 items-center px-3 sm:px-5",- reserveTitleBarControlInset &&- !inlineRightPanelOwnsTitleBar &&- "wco:pr-[var(--workspace-native-controls-inset)]",- )- : "flex h-[var(--workspace-topbar-height)] min-h-[var(--workspace-topbar-height)] shrink-0 items-center pl-[calc(env(safe-area-inset-left)+0.75rem)] pr-[calc(env(safe-area-inset-right)+0.75rem)] sm:pl-[calc(env(safe-area-inset-left)+1.25rem)] sm:pr-[calc(env(safe-area-inset-right)+1.25rem)]",- COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS,- )}+ electron={isElectron}+ reserveNativeControls={reserveTitleBarControlInset && !inlineRightPanelOwnsTitleBar}+ className="relative bg-background">{!rightPanelOpen ? panelLayoutControls : null}<ChatHeader@@ -6204,7 +6209,7 @@ function ChatViewContent(props: ChatViewProps) {onUpdateProjectScript={updateProjectScript}onDeleteProjectScript={deleteProjectScript}/>- </header>+ </WorkspacePageHeader><ThreadErrorBannererror={visibleThreadError}@@ -6542,6 +6547,7 @@ function ChatViewContent(props: ChatViewProps) {newShortcutLabel={newTerminalShortcutLabel ?? undefined}closeShortcutLabel={closeTerminalShortcutLabel ?? undefined}keybindings={keybindings}+ onHide={hideTerminal}onAddTerminalContext={addTerminalContextToDraft}/>))}diff --git a/apps/web/src/components/NoActiveThreadState.tsx b/apps/web/src/components/NoActiveThreadState.tsxindex 82dddd8f4..cfc40f936 100644--- a/apps/web/src/components/NoActiveThreadState.tsx+++ b/apps/web/src/components/NoActiveThreadState.tsx@@ -1,26 +1,15 @@import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from "./ui/empty";import { SidebarInset } from "./ui/sidebar";import { isElectron } from "../env";-import { cn } from "~/lib/utils";-import { COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS } from "~/workspaceTitlebar";+import { WorkspacePageHeader } from "./WorkspacePageContainer";export function NoActiveThreadState() {return (<SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground"><div className="flex min-h-0 min-w-0 flex-1 flex-col overflow-x-hidden bg-background">- <header- className={cn(- "border-b border-border px-3 transition-[padding-left] duration-200 ease-linear motion-reduce:transition-none sm:px-5",- isElectron- ? "drag-region flex h-[var(--workspace-topbar-height)] min-h-[var(--workspace-topbar-height)] shrink-0 items-center"- : "flex h-[var(--workspace-topbar-height)] min-h-[var(--workspace-topbar-height)] shrink-0 items-center",- COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS,- )}- >+ <WorkspacePageHeader electron={isElectron} className="border-b border-border">{isElectron ? (- <span className="text-xs text-muted-foreground/50 wco:pr-[var(--workspace-native-controls-inset)]">- No active thread- </span>+ <span className="text-xs text-muted-foreground/50">No active thread</span>) : (<div className="flex items-center gap-2"><span className="text-sm font-medium text-foreground md:text-muted-foreground/60">@@ -28,7 +17,7 @@ export function NoActiveThreadState() {</span></div>)}- </header>+ </WorkspacePageHeader><Empty className="flex-1"><div className="w-full max-w-lg px-8 py-12">diff --git a/apps/web/src/components/Sidebar.logic.ts b/apps/web/src/components/Sidebar.logic.tsindex 9cb09219d..f43bd5ea6 100644--- a/apps/web/src/components/Sidebar.logic.ts+++ b/apps/web/src/components/Sidebar.logic.ts@@ -299,8 +299,9 @@ export function isSidebarNestedLinkClick(target: EventTarget | null): boolean {export function shouldCreateNewThreadInCurrentProject(shiftKey: boolean,projectGroupCount: number,+ hasProjectScope = false,): boolean {- return shiftKey || projectGroupCount <= 1;+ return hasProjectScope || shiftKey || projectGroupCount <= 1;}export function orderItemsByPreferredIds<TItem, TId>(input: {diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsxindex 2f0c5a221..010571b91 100644--- a/apps/web/src/components/Sidebar.tsx+++ b/apps/web/src/components/Sidebar.tsx@@ -184,6 +184,7 @@ const SETTLED_TAIL_PAGE_COUNT = 25;// Keep the v2 key so existing preferences survive the v2-to-default rename.const SETTLED_SHELF_EXPANDED_KEY = "t3code:sidebar-v2:settled-expanded";const SNOOZED_SHELF_EXPANDED_KEY = "t3code:sidebar-v2:snoozed-expanded";+const SIDEBAR_LIFECYCLE_ICON_CLASS = "size-3 shrink-0";function compactSidebarTimeLabel(label: string): string {if (label === "just now") return "now";@@ -366,26 +367,20 @@ function SnoozePopoverButton(props: {);return (<Popover open={open} onOpenChange={onOpenChange}>- <Tooltip>- <TooltipTrigger- render={- <PopoverTrigger- render={- <button- type="button"- aria-label="Snooze thread"- onClick={(event) => event.stopPropagation()}- onDoubleClick={(event) => event.stopPropagation()}- className="inline-flex h-full cursor-pointer items-center gap-0.5 rounded-md bg-transparent px-1.5 text-xs text-muted-foreground hover:text-foreground"- />- }- />- }- >- <ClockIcon className="size-3" />- </TooltipTrigger>- <TooltipPopup>Snooze thread</TooltipPopup>- </Tooltip>+ <PopoverTrigger+ render={+ <Button+ size="icon-micro"+ variant="ghost-muted"+ aria-label="Snooze thread"+ title="Snooze thread"+ onClick={(event) => event.stopPropagation()}+ onDoubleClick={(event) => event.stopPropagation()}+ />+ }+ >+ <ClockIcon aria-hidden className={SIDEBAR_LIFECYCLE_ICON_CLASS} />+ </PopoverTrigger><PopoverPopup side="bottom" align="end" className="w-56" viewportClassName="p-1">{presets.map((preset) => (<button@@ -1199,9 +1194,9 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {aria-label="Dismiss Woke notification"title="Dismiss Woke notification"onClick={handleAcknowledgeWokeClick}- className="inline-flex cursor-pointer items-center gap-1 rounded-sm text-xs font-medium text-amber-700 outline-none hover:underline focus-visible:ring-2 focus-visible:ring-ring dark:text-amber-300"+ className="inline-flex h-6 cursor-pointer items-center gap-1 rounded-sm text-xs font-medium text-amber-700 outline-none hover:underline focus-visible:ring-2 focus-visible:ring-ring dark:text-amber-300">- <AlarmClockIcon aria-hidden className="size-3" />+ <AlarmClockIcon aria-hidden className={SIDEBAR_LIFECYCLE_ICON_CLASS} /><span role="status">Woke</span></button>) : (@@ -1223,7 +1218,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {isWoke && "group-hover/sidebar-row:static",)}>- <AlarmClockOffIcon className="mb-px size-3" />+ <AlarmClockOffIcon aria-hidden className={SIDEBAR_LIFECYCLE_ICON_CLASS} /></button>)) : !props.settlementSupported ? null : variantAction === "unsettle" ? (@@ -1236,7 +1231,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {isWoke && "group-hover/sidebar-row:static",)}>- <Undo2Icon className="mb-px size-3.5" />+ <Undo2Icon aria-hidden className={SIDEBAR_LIFECYCLE_ICON_CLASS} /></button>) : (<button@@ -1248,7 +1243,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {isWoke && "group-hover/sidebar-row:static",)}>- <CheckIcon className="size-3" />+ <CheckIcon aria-hidden className={SIDEBAR_LIFECYCLE_ICON_CLASS} /></button>)}</span>@@ -1317,130 +1312,128 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {) : (<span className="flex-1" />)}- {props.isPinned ? (- props.pinningSupported ? (- <Tooltip>- <TooltipTrigger- render={- <button- type="button"- aria-label="Unpin thread"- onClick={handleUnpinClick}- className="inline-flex cursor-pointer items-center rounded-sm text-muted-foreground/65 outline-none transition-colors hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring"- />- }+ <span className="ml-auto flex h-5 shrink-0 items-center">+ {props.isPinned ? (+ props.pinningSupported ? (+ <Button+ size="icon-micro"+ variant="ghost-muted"+ aria-label="Unpin thread"+ title="Unpin thread"+ onClick={handleUnpinClick}>- <PinIcon aria-hidden className="size-3 shrink-0" />- </TooltipTrigger>- <TooltipPopup>Unpin thread</TooltipPopup>- </Tooltip>- ) : (- <PinIcon- aria-label="Pinned"- role="img"- className="size-3 shrink-0 text-muted-foreground/65"- />- )- ) : null}- {/* The visible state owns this slot's width: status at rest,- actions on hover/keyboard focus or while the popover is open. Keeping- the hidden state out of flow lets the project label reclaim- space without either state overlapping it. */}- <span className="group/sidebar-status-slot relative ml-auto flex h-5 min-w-8 shrink-0 items-stretch justify-end text-xs">- {/* Read-only status labels yield to the hover actions. Woke is- itself an action, so it stays pointer-enabled and visible- while the other controls appear beside it. */}+ <PinIcon aria-hidden className={SIDEBAR_LIFECYCLE_ICON_CLASS} />+ </Button>+ ) : (+ <span className="inline-flex size-5 shrink-0 items-center justify-center">+ <PinIcon+ aria-label="Pinned"+ role="img"+ className={cn(SIDEBAR_LIFECYCLE_ICON_CLASS, "text-muted-foreground")}+ />+ </span>+ )+ ) : null}+ {/* Only the visible state owns this slot's width: the pin stays+ directly beside the idle status and beside the first action+ when the hover controls replace it. */}<spanclassName={cn(- isWokeStatus- ? "pointer-events-auto"- : "pointer-events-none group-has-[:focus-visible]/sidebar-status-slot:absolute group-has-[:focus-visible]/sidebar-status-slot:right-0 group-has-[:focus-visible]/sidebar-status-slot:opacity-0 group-hover/sidebar-row:absolute group-hover/sidebar-row:right-0 group-hover/sidebar-row:opacity-0",- "self-center justify-self-end tabular-nums text-secondary-label transition-opacity",- snoozeMenuOpen && "pointer-events-none absolute right-0 opacity-0",+ "group/sidebar-status-slot relative flex h-5 shrink-0 items-stretch justify-end text-xs",+ props.isPinned ? "min-w-0" : "min-w-8",)}>- {topStatus ? (- isWokeStatus ? (- <button- type="button"- aria-label="Dismiss Woke notification"- title="Dismiss Woke notification"- onClick={handleAcknowledgeWokeClick}- className={cn(- "inline-flex cursor-pointer items-center gap-1 rounded-sm font-medium outline-none hover:underline focus-visible:ring-2 focus-visible:ring-ring",- topStatus.className,- )}- >- <AlarmClockIcon aria-hidden className="size-4 shrink-0" />- <span role="status">{topStatus.label}</span>- </button>- ) : (- <span- className={cn(- "inline-flex items-center gap-1 font-medium",- topStatus.className,- )}- >- {topStatus.icon === "working" ? (- <CircleDashedIcon aria-hidden className="size-4 shrink-0" />- ) : topStatus.icon === "done" ? (- <CircleCheckIcon aria-hidden className="size-4 shrink-0" />- ) : null}- {/* The label alone is the live region: a role="status"- wrapper around the ticking duration would make- screen readers announce every second. */}- <span role="status">{topStatus.label}</span>- {status === "working" ? (- <span aria-hidden>- <WorkingDuration startedAt={resolveWorkingStartedAt(thread)} />- </span>- ) : null}- </span>- )- ) : (- threadTimeLabel(thread)- )}- </span>- {props.settlementSupported || showSnoozeButton ? (+ {/* Read-only status labels yield to the hover actions. Woke is+ itself an action, so it stays pointer-enabled and visible+ while the other controls appear beside it. */}<spanclassName={cn(- // focus-visible, not focus-within: a mouse click leaves- // the Settle button focused, and a plain focus-within- // would keep the controls pinned over the status label- // once the pointer moves away (e.g. after a failed- // settle) instead of cross-fading back.- "pointer-events-none absolute inset-y-0 right-0 flex items-stretch opacity-0 transition-opacity has-[:focus-visible]:pointer-events-auto has-[:focus-visible]:static has-[:focus-visible]:opacity-100 group-hover/sidebar-row:pointer-events-auto group-hover/sidebar-row:static group-hover/sidebar-row:opacity-100",- snoozeMenuOpen && "pointer-events-auto static opacity-100",+ isWokeStatus+ ? "pointer-events-auto"+ : "pointer-events-none group-has-[:focus-visible]/sidebar-status-slot:absolute group-has-[:focus-visible]/sidebar-status-slot:right-0 group-has-[:focus-visible]/sidebar-status-slot:opacity-0 group-hover/sidebar-row:absolute group-hover/sidebar-row:right-0 group-hover/sidebar-row:opacity-0",+ "self-center tabular-nums text-secondary-label transition-opacity",+ snoozeMenuOpen && "pointer-events-none absolute right-0 opacity-0",)}>- {showSnoozeButton ? (- <SnoozePopoverButton- open={snoozeMenuOpen}- onOpenChange={setSnoozeMenuOpen}- onSnooze={handleSnoozePreset}- timestampFormat={props.timestampFormat}- />- ) : null}- {props.settlementSupported ? (- <Tooltip>- <TooltipTrigger- render={- <button- type="button"- aria-label="Settle thread"- onClick={handleSettleClick}- className="-mr-1 inline-flex cursor-pointer items-center gap-1 rounded-md bg-transparent px-1.5 text-xs text-muted-foreground hover:text-foreground"+ {topStatus ? (+ isWokeStatus ? (+ <button+ type="button"+ aria-label="Dismiss Woke notification"+ title="Dismiss Woke notification"+ onClick={handleAcknowledgeWokeClick}+ className={cn(+ "inline-flex h-5 cursor-pointer items-center gap-1 rounded-sm font-medium outline-none hover:underline focus-visible:ring-2 focus-visible:ring-ring",+ topStatus.className,+ )}+ >+ <AlarmClockIcon aria-hidden className={SIDEBAR_LIFECYCLE_ICON_CLASS} />+ <span role="status">{topStatus.label}</span>+ </button>+ ) : (+ <span+ className={cn(+ "inline-flex items-center gap-1 font-medium",+ topStatus.className,+ )}+ >+ {topStatus.icon === "working" ? (+ <CircleDashedIcon+ aria-hidden+ className={SIDEBAR_LIFECYCLE_ICON_CLASS}/>- }+ ) : topStatus.icon === "done" ? (+ <CircleCheckIcon aria-hidden className={SIDEBAR_LIFECYCLE_ICON_CLASS} />+ ) : null}+ {/* The label alone is the live region: a role="status"+ wrapper around the ticking duration would make+ screen readers announce every second. */}+ <span role="status">{topStatus.label}</span>+ {status === "working" ? (+ <span aria-hidden>+ <WorkingDuration startedAt={resolveWorkingStartedAt(thread)} />+ </span>+ ) : null}+ </span>+ )+ ) : (+ threadTimeLabel(thread)+ )}+ </span>+ {props.settlementSupported || showSnoozeButton ? (+ <span+ className={cn(+ // focus-visible, not focus-within: a mouse click leaves+ // the Settle button focused, and a plain focus-within+ // would keep the controls pinned over the status label+ // once the pointer moves away (e.g. after a failed+ // settle) instead of cross-fading back.+ "pointer-events-none absolute inset-y-0 right-0 flex items-stretch opacity-0 transition-opacity has-[:focus-visible]:pointer-events-auto has-[:focus-visible]:static has-[:focus-visible]:opacity-100 group-hover/sidebar-row:pointer-events-auto group-hover/sidebar-row:static group-hover/sidebar-row:opacity-100",+ snoozeMenuOpen && "pointer-events-auto static opacity-100",+ )}+ >+ {showSnoozeButton ? (+ <SnoozePopoverButton+ open={snoozeMenuOpen}+ onOpenChange={setSnoozeMenuOpen}+ onSnooze={handleSnoozePreset}+ timestampFormat={props.timestampFormat}+ />+ ) : null}+ {props.settlementSupported ? (+ <button+ type="button"+ aria-label="Settle thread"+ onClick={handleSettleClick}+ className="-mr-1 inline-flex h-full cursor-pointer items-center gap-1 rounded-md bg-transparent ps-1 pe-1.5 text-xs text-muted-foreground hover:text-foreground">- <CheckIcon className="size-3.5" />+ <CheckIcon aria-hidden className={SIDEBAR_LIFECYCLE_ICON_CLASS} />Settle- </TooltipTrigger>- <TooltipPopup>Settle thread</TooltipPopup>- </Tooltip>- ) : null}- </span>- ) : null}+ </button>+ ) : null}+ </span>+ ) : null}+ </span></span></div><div className="mt-1 flex min-w-0">@@ -3218,17 +3211,25 @@ export default function Sidebar() {autoAnimate(node, { duration: 150, easing: "ease-out" });}, []);- // New thread defaults to the project you're in (active thread's project,- // falling back to the top project) — same resolution the command palette- // uses. The command palette already offers a "New thread in..." submenu- // for multi-project setups.+ // A selected project scope owns creation: users should not have to choose+ // the same project twice. "All projects" keeps the picker in multi-project+ // setups, while Shift+click retains the direct-create shortcut.const handleNewThreadClick = useCallback((event?: ReactMouseEvent) => {- // One project: nothing to pick, create immediately. Shift+click creates- // directly in the current project even with several projects, skipping- // the palette picker.- if (shouldCreateNewThreadInCurrentProject(event?.shiftKey ?? false, projectGroups.length)) {+ if (+ shouldCreateNewThreadInCurrentProject(+ event?.shiftKey ?? false,+ projectGroups.length,+ scopedProjectGroup !== null,+ )+ ) {if (isMobile) setOpenMobile(false);+ if (scopedProjectGroup) {+ void newThreadContext.handleNewThread(+ scopeProjectRef(scopedProjectGroup.environmentId, scopedProjectGroup.id),+ );+ return;+ }void startNewThreadFromContext({activeDraftThread: newThreadContext.activeDraftThread,activeThread: newThreadContext.activeThread ?? undefined,@@ -3240,20 +3241,19 @@ export default function Sidebar() {if (isMobile) setOpenMobile(false);openCommandPalette({ open: "new-thread-in" });},- [isMobile, newThreadContext, projectGroups.length, setOpenMobile],+ [isMobile, newThreadContext, projectGroups.length, scopedProjectGroup, setOpenMobile],);- // The button mirrors chat.new: in multi-project setups both route through- // the command palette's "New thread in..." picker, and in single-project- // setups both create immediately. In multi-project setups the label is only- // the picker's shortcut: falling back to chat.newLocal would advertise the- // same shortcut for both the picker and direct create. In single-project- // setups both commands create directly, so chat.newLocal is a valid- // fallback. The second tooltip line (multi-project only) advertises- // shift+click and its keyboard twin chat.newLocal for direct create.+ // With no explicit scope the button mirrors chat.new. A scoped button has+ // intentionally more specific behavior, so it does not advertise the+ // broader command's shortcut.const newThreadShortcutLabel =- shortcutLabelForCommand(keybindings, "chat.new") ??- (projectGroups.length <= 1 ? shortcutLabelForCommand(keybindings, "chat.newLocal") : undefined);+ scopedProjectGroup === null+ ? (shortcutLabelForCommand(keybindings, "chat.new") ??+ (projectGroups.length <= 1+ ? shortcutLabelForCommand(keybindings, "chat.newLocal")+ : undefined))+ : undefined;const newThreadInProjectShortcutLabel = shortcutLabelForCommand(keybindings, "chat.newLocal");return (<>@@ -3332,7 +3332,9 @@ export default function Sidebar() {/></TooltipTrigger><TooltipPopup side="right">- {projectGroups.length > 1 ? (+ {scopedProjectGroup ? (+ `New thread in ${scopedProjectGroup.displayName}`+ ) : projectGroups.length > 1 ? (<span className="flex flex-col gap-0.5"><span>{newThreadShortcutLabeldiff --git a/apps/web/src/components/ThreadTerminalDrawer.tsx b/apps/web/src/components/ThreadTerminalDrawer.tsxindex 1266e5ed7..deec13ec3 100644--- a/apps/web/src/components/ThreadTerminalDrawer.tsx+++ b/apps/web/src/components/ThreadTerminalDrawer.tsx@@ -5,11 +5,11 @@ import {} from "@t3tools/client-runtime/state/runtime";import { type TerminalSessionState } from "@t3tools/client-runtime/state/terminal";import {+ PanelBottomCloseIcon,Plus,SquareSplitHorizontal,SquareSplitVertical,TerminalSquare,- Trash2,XIcon,} from "lucide-react";import {@@ -21,7 +21,6 @@ import { getTerminalLabel } from "@t3tools/shared/terminalLabels";import * as Schema from "effect/Schema";import {type PointerEvent as ReactPointerEvent,- type ReactNode,type SetStateAction,useCallback,useEffect,@@ -30,9 +29,9 @@ import {useRef,useState,} from "react";-import { Popover, PopoverPopup, PopoverTrigger } from "~/components/ui/popover";import { Button } from "~/components/ui/button";import { writeTextToClipboard } from "~/hooks/useCopyToClipboard";+import { useResizableWidth } from "~/hooks/useResizableWidth";import { cn } from "~/lib/utils";import { type TerminalContextSelection } from "~/lib/terminalContext";import {@@ -60,6 +59,7 @@ import {import { readLocalApi } from "~/localApi";import { useClientSettings } from "../hooks/useSettings";import { useLocalStorage } from "../hooks/useLocalStorage";+import { selectThreadTerminalCustomLabels, useTerminalUiStateStore } from "../terminalUiStateStore";import { useAttachedTerminalSession } from "../state/terminalSessions";import { serverEnvironment } from "../state/server";import { previewEnvironment } from "../state/preview";@@ -72,10 +72,15 @@ import {resolveTerminalFontSizePreference,TYPOGRAPHY_ADVANCED_STORAGE_KEY,} from "../appearanceFonts";+import { RightPanelResizeHandle } from "./preview/RightPanelResizeHandle";const MIN_DRAWER_HEIGHT = 180;const MAX_DRAWER_HEIGHT_RATIO = 0.75;const MULTI_CLICK_SELECTION_ACTION_DELAY_MS = 260;+const TERMINAL_SIDEBAR_DEFAULT_WIDTH = 144;+const TERMINAL_SIDEBAR_MIN_WIDTH = 144;+const TERMINAL_SIDEBAR_MAX_WIDTH = 320;+const TERMINAL_SIDEBAR_WIDTH_STORAGE_KEY = "t3code:terminal-sidebar-width";function maxDrawerHeight(): number {if (typeof window === "undefined") return DEFAULT_THREAD_TERMINAL_HEIGHT;@@ -244,6 +249,10 @@ export function shouldHandleTerminalSelectionMouseUp(return selectionGestureActive && button === 0;}+export function shouldShowTerminalSidebar(terminalCount: number): boolean {+ return terminalCount > 1;+}+export function terminalSelectionLineRange(position: {start: { y: number };end: { y: number };@@ -876,6 +885,7 @@ interface ThreadTerminalDrawerProps {onSplitTerminal: () => void;onSplitTerminalVertical: () => void;onNewTerminal: () => void;+ onHide?: () => void;splitShortcutLabel?: string | undefined;splitVerticalShortcutLabel?: string | undefined;newShortcutLabel?: string | undefined;@@ -891,35 +901,6 @@ interface ThreadTerminalDrawerProps {terminalLaunchLocationsById?: ReadonlyMap<string, TerminalLaunchLocation>;}-interface TerminalActionButtonProps {- label: string;- className: string;- onClick: () => void;- children: ReactNode;-}--function TerminalActionButton({ label, className, onClick, children }: TerminalActionButtonProps) {- return (- <Popover>- <PopoverTrigger- openOnHover- render={<button type="button" className={className} onClick={onClick} aria-label={label} />}- >- {children}- </PopoverTrigger>- <PopoverPopup- tooltipStyle- side="bottom"- sideOffset={6}- align="center"- className="pointer-events-none select-none"- >- {label}- </PopoverPopup>- </Popover>- );-}-export default function ThreadTerminalDrawer({mode = "drawer",threadRef,@@ -937,6 +918,7 @@ export default function ThreadTerminalDrawer({onSplitTerminal,onSplitTerminalVertical,onNewTerminal,+ onHide,splitShortcutLabel,splitVerticalShortcutLabel,newShortcutLabel,@@ -950,6 +932,21 @@ export default function ThreadTerminalDrawer({terminalLaunchLocationsById,}: ThreadTerminalDrawerProps) {const isPanel = mode === "panel";+ const { width: terminalSidebarWidth, handlers: terminalSidebarResizeHandlers } =+ useResizableWidth({+ storageKey: TERMINAL_SIDEBAR_WIDTH_STORAGE_KEY,+ defaultWidth: TERMINAL_SIDEBAR_DEFAULT_WIDTH,+ minWidth: TERMINAL_SIDEBAR_MIN_WIDTH,+ maxWidth: TERMINAL_SIDEBAR_MAX_WIDTH,+ edge: "left",+ });+ const terminalCustomLabels = useTerminalUiStateStore((state) =>+ selectThreadTerminalCustomLabels(state.terminalCustomLabelsByThreadKey, threadRef),+ );+ const setTerminalCustomLabel = useTerminalUiStateStore((state) => state.setTerminalCustomLabel);+ const [renamingTerminalId, setRenamingTerminalId] = useState<string | null>(null);+ const [terminalRenameDraft, setTerminalRenameDraft] = useState("");+ const cancelTerminalRenameRef = useRef(false);const [advancedTypography] = useLocalStorage(TYPOGRAPHY_ADVANCED_STORAGE_KEY,false,@@ -1098,19 +1095,28 @@ export default function ThreadTerminalDrawer({(normalizedTerminalIds.length > 0 ? [resolvedActiveTerminalId] : []);const splitDirection =resolvedTerminalGroups[resolvedActiveGroupIndex]?.splitDirection ?? "horizontal";- const hasTerminalSidebar = normalizedTerminalIds.length > 1;+ const hasTerminalSidebar = shouldShowTerminalSidebar(normalizedTerminalIds.length);const isSplitView = visibleTerminalIds.length > 1;- const showGroupHeaders =- resolvedTerminalGroups.length > 1 ||- resolvedTerminalGroups.some((terminalGroup) => terminalGroup.terminalIds.length > 1);const hasReachedSplitLimit = visibleTerminalIds.length >= MAX_TERMINALS_PER_GROUP;- const terminalLabelById = useMemo(() => {+ const automaticTerminalLabelById = useMemo(() => {const next = new Map<string, string>();for (const terminalId of normalizedTerminalIds) {next.set(terminalId, terminalLabelsById?.get(terminalId) ?? getTerminalLabel(terminalId));}return next;}, [normalizedTerminalIds, terminalLabelsById]);+ const terminalLabelById = useMemo(() => {+ const next = new Map<string, string>();+ for (const terminalId of normalizedTerminalIds) {+ next.set(+ terminalId,+ terminalCustomLabels[terminalId]?.trim() ||+ automaticTerminalLabelById.get(terminalId) ||+ getTerminalLabel(terminalId),+ );+ }+ return next;+ }, [automaticTerminalLabelById, normalizedTerminalIds, terminalCustomLabels]);const resolveTerminalLaunchLocation = useCallback((terminalId: string): TerminalLaunchLocation => {return (@@ -1123,6 +1129,9 @@ export default function ThreadTerminalDrawer({},[cwd, runtimeEnv, terminalLaunchLocationsById, worktreePath],);+ const newTerminalActionLabel = newShortcutLabel+ ? `New Terminal (${newShortcutLabel})`+ : "New Terminal";const splitTerminalActionLabel = hasReachedSplitLimit? `Split Terminal Horizontally (max ${MAX_TERMINALS_PER_GROUP} per group)`: splitShortcutLabel@@ -1133,9 +1142,6 @@ export default function ThreadTerminalDrawer({: splitVerticalShortcutLabel? `Split Terminal Vertically (${splitVerticalShortcutLabel})`: "Split Terminal Vertically";- const newTerminalActionLabel = newShortcutLabel- ? `New Terminal (${newShortcutLabel})`- : "New Terminal";const closeTerminalActionLabel = closeShortcutLabel? `Close Terminal (${closeShortcutLabel})`: "Close Terminal";@@ -1147,9 +1153,43 @@ export default function ThreadTerminalDrawer({if (hasReachedSplitLimit) return;onSplitTerminalVertical();}, [hasReachedSplitLimit, onSplitTerminalVertical]);- const onNewTerminalAction = useCallback(() => {- onNewTerminal();- }, [onNewTerminal]);+ const startTerminalRename = useCallback(+ (terminalId: string) => {+ cancelTerminalRenameRef.current = false;+ setRenamingTerminalId(terminalId);+ setTerminalRenameDraft(+ terminalCustomLabels[terminalId] ?? terminalLabelById.get(terminalId) ?? "",+ );+ },+ [terminalCustomLabels, terminalLabelById],+ );+ const finishTerminalRename = useCallback(() => {+ if (!renamingTerminalId) return;+ const nextLabel = terminalRenameDraft.trim();+ const automaticLabel = automaticTerminalLabelById.get(renamingTerminalId) ?? "";+ setTerminalCustomLabel(+ threadRef,+ renamingTerminalId,+ nextLabel.length === 0 || nextLabel === automaticLabel ? null : nextLabel,+ );+ setRenamingTerminalId(null);+ }, [+ automaticTerminalLabelById,+ renamingTerminalId,+ setTerminalCustomLabel,+ terminalRenameDraft,+ threadRef,+ ]);+ const cancelTerminalRename = useCallback(() => {+ cancelTerminalRenameRef.current = true;+ setRenamingTerminalId(null);+ }, []);++ useEffect(() => {+ cancelTerminalRenameRef.current = false;+ setRenamingTerminalId(null);+ setTerminalRenameDraft("");+ }, [threadRef.environmentId, threadRef.threadId]);useEffect(() => {onHeightChangeRef.current = onHeightChange;@@ -1274,7 +1314,7 @@ export default function ThreadTerminalDrawer({) : null}<div className="flex min-h-0 flex-1 flex-col items-center justify-center gap-3 px-4 py-6 text-center text-sm text-muted-foreground"><p>No terminal sessions for this thread yet.</p>- <Button size="xs" variant="outline" onClick={onNewTerminalAction}>+ <Button size="xs" variant="outline" onClick={onNewTerminal}>{newTerminalActionLabel}</Button></div>@@ -1283,7 +1323,72 @@ export default function ThreadTerminalDrawer({}const activeTerminalLaunchLocation = resolveTerminalLaunchLocation(resolvedActiveTerminalId);-+ const compactTerminalToolbar = (+ <>+ <Button+ type="button"+ size="icon-xs"+ variant="ghost"+ className="rounded-md"+ disabled={hasReachedSplitLimit}+ onClick={onSplitTerminalAction}+ aria-label={splitTerminalActionLabel}+ title={splitTerminalActionLabel}+ >+ <SquareSplitHorizontal className="size-3.5" />+ </Button>+ <Button+ type="button"+ size="icon-xs"+ variant="ghost"+ className="rounded-md"+ disabled={hasReachedSplitLimit}+ onClick={onSplitTerminalVerticalAction}+ aria-label={splitTerminalVerticalActionLabel}+ title={splitTerminalVerticalActionLabel}+ >+ <SquareSplitVertical className="size-3.5" />+ </Button>+ <Button+ type="button"+ size="icon-xs"+ variant="ghost"+ className="rounded-md"+ onClick={onNewTerminal}+ aria-label={newTerminalActionLabel}+ title={newTerminalActionLabel}+ >+ <Plus className="size-3.5" />+ </Button>+ <Button+ type="button"+ size="icon-xs"+ variant="ghost"+ className="rounded-md"+ onClick={() => onCloseTerminal(resolvedActiveTerminalId)}+ aria-label={closeTerminalActionLabel}+ title={closeTerminalActionLabel}+ >+ <XIcon className="size-3.5" />+ </Button>+ {!isPanel && onHide ? (+ <>+ <span aria-hidden className="mx-0.5 h-4 w-px bg-border/70" />+ <Button+ type="button"+ size="icon-xs"+ variant="ghost"+ className="rounded-md"+ onClick={onHide}+ aria-label="Hide terminal drawer"+ title="Hide terminal drawer"+ >+ <PanelBottomCloseIcon className="size-3.5" />+ </Button>+ </>+ ) : null}+ </>+ );return (<asidedata-terminal-owner={isPanel ? "right-panel" : "drawer"}@@ -1303,277 +1408,220 @@ export default function ThreadTerminalDrawer({/>) : null}- {!hasTerminalSidebar && (- <div className="pointer-events-none absolute right-2 top-2 z-20">- <div className="pointer-events-auto inline-flex items-center overflow-hidden rounded-md border border-border/80 bg-background shadow-xs">- <TerminalActionButton- className={`p-1 text-foreground/90 transition-colors ${- hasReachedSplitLimit- ? "cursor-not-allowed opacity-45 hover:bg-transparent"- : "hover:bg-accent"- }`}- onClick={onSplitTerminalAction}- label={splitTerminalActionLabel}- >- <SquareSplitHorizontal className="size-3.25" />- </TerminalActionButton>- <div className="h-4 w-px bg-border/80" />- <TerminalActionButton- className={`p-1 text-foreground/90 transition-colors ${- hasReachedSplitLimit- ? "cursor-not-allowed opacity-45 hover:bg-transparent"- : "hover:bg-accent"- }`}- onClick={onSplitTerminalVerticalAction}- label={splitTerminalVerticalActionLabel}- >- <SquareSplitVertical className="size-3.25" />- </TerminalActionButton>- <div className="h-4 w-px bg-border/80" />- <TerminalActionButton- className="p-1 text-foreground/90 transition-colors hover:bg-accent"- onClick={onNewTerminalAction}- label={newTerminalActionLabel}- >- <Plus className="size-3.25" />- </TerminalActionButton>- <div className="h-4 w-px bg-border/80" />- <TerminalActionButton- className="p-1 text-foreground/90 transition-colors hover:bg-accent"- onClick={() => onCloseTerminal(resolvedActiveTerminalId)}- label={closeTerminalActionLabel}- >- <Trash2 className="size-3.25" />- </TerminalActionButton>+ {!hasTerminalSidebar ? (+ <div className="pointer-events-none absolute top-2 right-2 z-20">+ <div className="pointer-events-auto flex h-8 items-center rounded-lg border border-border/70 bg-background p-0.5 shadow-xs">+ {compactTerminalToolbar}</div></div>- )}+ ) : null}- <div className="min-h-0 w-full flex-1">- <div className={`flex h-full min-h-0 ${hasTerminalSidebar ? "gap-1.5" : ""}`}>- <div className="min-w-0 flex-1">- {isSplitView ? (- <div- className="grid h-full w-full min-w-0 gap-0 overflow-hidden"- style={- splitDirection === "vertical"- ? {- gridTemplateRows: `repeat(${visibleTerminalIds.length}, minmax(0, 1fr))`,- }- : {- gridTemplateColumns: `repeat(${visibleTerminalIds.length}, minmax(0, 1fr))`,- }- }- >- {visibleTerminalIds.map((terminalId) => {- const terminalLaunchLocation = resolveTerminalLaunchLocation(terminalId);- return (- <div- key={terminalId}- className={`min-h-0 min-w-0 ${- splitDirection === "vertical"- ? "border-t first:border-t-0"- : "border-l first:border-l-0"- } ${- terminalId === resolvedActiveTerminalId- ? "border-border"- : "border-border/70"- }`}- onMouseDown={() => {- if (terminalId !== resolvedActiveTerminalId) {- onActiveTerminalChange(terminalId);- }- }}- >- <div className="h-full p-1">- <TerminalViewport- advancedTypography={advancedTypography}- threadRef={threadRef}- threadId={threadId}- terminalId={terminalId}- terminalLabel={terminalLabelById.get(terminalId) ?? "Terminal"}- cwd={terminalLaunchLocation.cwd}- {...(terminalLaunchLocation.worktreePath !== undefined- ? { worktreePath: terminalLaunchLocation.worktreePath }- : {})}- {...(terminalLaunchLocation.runtimeEnv- ? { runtimeEnv: terminalLaunchLocation.runtimeEnv }- : {})}- onSessionExited={() => onCloseTerminal(terminalId)}- onAddTerminalContext={onAddTerminalContext}- focusRequestId={focusRequestId}- autoFocus={terminalId === resolvedActiveTerminalId}- resizeEpoch={resizeEpoch}- drawerHeight={drawerHeight}- keybindings={keybindings}- />- </div>+ <div className="flex min-h-0 w-full flex-1">+ <div className="min-w-0 flex-1">+ {isSplitView ? (+ <div+ className="grid h-full w-full min-w-0 gap-0 overflow-hidden"+ style={+ splitDirection === "vertical"+ ? {+ gridTemplateRows: `repeat(${visibleTerminalIds.length}, minmax(0, 1fr))`,+ }+ : {+ gridTemplateColumns: `repeat(${visibleTerminalIds.length}, minmax(0, 1fr))`,+ }+ }+ >+ {visibleTerminalIds.map((terminalId) => {+ const terminalLaunchLocation = resolveTerminalLaunchLocation(terminalId);+ const isActive = terminalId === resolvedActiveTerminalId;+ return (+ <div+ key={terminalId}+ className={cn(+ "min-h-0 min-w-0",+ splitDirection === "vertical"+ ? "border-t first:border-t-0"+ : "border-l first:border-l-0",+ isActive ? "border-border" : "border-border/70",+ )}+ onMouseDown={() => {+ if (!isActive) onActiveTerminalChange(terminalId);+ }}+ >+ <div className="h-full p-1">+ <TerminalViewport+ advancedTypography={advancedTypography}+ threadRef={threadRef}+ threadId={threadId}+ terminalId={terminalId}+ terminalLabel={terminalLabelById.get(terminalId) ?? "Terminal"}+ cwd={terminalLaunchLocation.cwd}+ {...(terminalLaunchLocation.worktreePath !== undefined+ ? { worktreePath: terminalLaunchLocation.worktreePath }+ : {})}+ {...(terminalLaunchLocation.runtimeEnv+ ? { runtimeEnv: terminalLaunchLocation.runtimeEnv }+ : {})}+ onSessionExited={() => onCloseTerminal(terminalId)}+ onAddTerminalContext={onAddTerminalContext}+ focusRequestId={focusRequestId}+ autoFocus={isActive}+ resizeEpoch={resizeEpoch}+ drawerHeight={drawerHeight}+ keybindings={keybindings}+ /></div>- );- })}- </div>- ) : (- <div className="h-full p-1">- <TerminalViewport- advancedTypography={advancedTypography}- key={resolvedActiveTerminalId}- threadRef={threadRef}- threadId={threadId}- terminalId={resolvedActiveTerminalId}- terminalLabel={terminalLabelById.get(resolvedActiveTerminalId) ?? "Terminal"}- cwd={activeTerminalLaunchLocation.cwd}- {...(activeTerminalLaunchLocation.worktreePath !== undefined- ? { worktreePath: activeTerminalLaunchLocation.worktreePath }- : {})}- {...(activeTerminalLaunchLocation.runtimeEnv- ? { runtimeEnv: activeTerminalLaunchLocation.runtimeEnv }- : {})}- onSessionExited={() => onCloseTerminal(resolvedActiveTerminalId)}- onAddTerminalContext={onAddTerminalContext}- focusRequestId={focusRequestId}- autoFocus- resizeEpoch={resizeEpoch}- drawerHeight={drawerHeight}- keybindings={keybindings}- />- </div>- )}+ </div>+ );+ })}+ </div>+ ) : (+ <div className="h-full p-1">+ <TerminalViewport+ advancedTypography={advancedTypography}+ key={resolvedActiveTerminalId}+ threadRef={threadRef}+ threadId={threadId}+ terminalId={resolvedActiveTerminalId}+ terminalLabel={terminalLabelById.get(resolvedActiveTerminalId) ?? "Terminal"}+ cwd={activeTerminalLaunchLocation.cwd}+ {...(activeTerminalLaunchLocation.worktreePath !== undefined+ ? { worktreePath: activeTerminalLaunchLocation.worktreePath }+ : {})}+ {...(activeTerminalLaunchLocation.runtimeEnv+ ? { runtimeEnv: activeTerminalLaunchLocation.runtimeEnv }+ : {})}+ onSessionExited={() => onCloseTerminal(resolvedActiveTerminalId)}+ onAddTerminalContext={onAddTerminalContext}+ focusRequestId={focusRequestId}+ autoFocus+ resizeEpoch={resizeEpoch}+ drawerHeight={drawerHeight}+ keybindings={keybindings}+ />+ </div>+ )}+ </div>++ <aside+ className={cn(+ "relative flex shrink-0 flex-col border-l border-border/70 bg-muted/10",+ !hasTerminalSidebar && "hidden",+ )}+ style={{ width: `${terminalSidebarWidth}px` }}+ >+ <RightPanelResizeHandle handlers={terminalSidebarResizeHandlers} />+ <div className="flex h-9 shrink-0 items-center justify-center border-b border-border/70 px-2">+ {hasTerminalSidebar ? compactTerminalToolbar : null}</div>- {hasTerminalSidebar && (- <aside className="flex w-36 min-w-36 flex-col border border-border/70 bg-muted/10">- <div className="flex h-[22px] items-stretch justify-end border-b border-border/70">- <div className="inline-flex h-full items-stretch">- <TerminalActionButton- className={`inline-flex h-full items-center px-1 text-foreground/90 transition-colors ${- hasReachedSplitLimit- ? "cursor-not-allowed opacity-45 hover:bg-transparent"- : "hover:bg-accent/70"- }`}- onClick={onSplitTerminalAction}- label={splitTerminalActionLabel}- >- <SquareSplitHorizontal className="size-3.25" />- </TerminalActionButton>- <TerminalActionButton- className={`inline-flex h-full items-center border-l border-border/70 px-1 text-foreground/90 transition-colors ${- hasReachedSplitLimit- ? "cursor-not-allowed opacity-45 hover:bg-transparent"- : "hover:bg-accent/70"- }`}- onClick={onSplitTerminalVerticalAction}- label={splitTerminalVerticalActionLabel}- >- <SquareSplitVertical className="size-3.25" />- </TerminalActionButton>- <TerminalActionButton- className="inline-flex h-full items-center border-l border-border/70 px-1 text-foreground/90 transition-colors hover:bg-accent/70"- onClick={onNewTerminalAction}- label={newTerminalActionLabel}- >- <Plus className="size-3.25" />- </TerminalActionButton>- <TerminalActionButton- className="inline-flex h-full items-center border-l border-border/70 px-1 text-foreground/90 transition-colors hover:bg-accent/70"- onClick={() => onCloseTerminal(resolvedActiveTerminalId)}- label={closeTerminalActionLabel}- >- <Trash2 className="size-3.25" />- </TerminalActionButton>- </div>- </div>-- <div className="min-h-0 flex-1 overflow-y-auto px-1 py-1">- {resolvedTerminalGroups.map((terminalGroup, groupIndex) => {- const isGroupActive =- terminalGroup.terminalIds.includes(resolvedActiveTerminalId);- const groupActiveTerminalId = isGroupActive- ? resolvedActiveTerminalId- : (terminalGroup.terminalIds[0] ?? resolvedActiveTerminalId);-- return (- <div key={terminalGroup.id} className="pb-0.5">- {showGroupHeaders && (- <button- type="button"- className={`flex w-full items-center rounded px-1 py-0.5 text-[10px] uppercase tracking-[0.08em] ${- isGroupActive- ? "bg-accent/70 text-foreground"- : "text-muted-foreground hover:bg-accent/50 hover:text-foreground"- }`}- onClick={() => onActiveTerminalChange(groupActiveTerminalId)}+ <div className="min-h-0 flex-1 overflow-y-auto p-1">+ {resolvedTerminalGroups.map((terminalGroup, groupIndex) => {+ const isSplitGroup = terminalGroup.terminalIds.length > 1;+ const splitVertically = terminalGroup.splitDirection === "vertical";+ const SplitIcon = splitVertically ? SquareSplitVertical : SquareSplitHorizontal;+ return (+ <div+ key={terminalGroup.id}+ className={cn(+ groupIndex > 0 && "mt-1",+ isSplitGroup && "rounded-lg border border-border/80 bg-muted/20 p-1",+ )}+ >+ {isSplitGroup ? (+ <div className="flex h-5 items-center gap-1 px-1 text-[10px] font-medium text-muted-foreground">+ <SplitIcon className="size-3" />+ <span>{splitVertically ? "Split down" : "Split right"}</span>+ </div>+ ) : null}+ <div className={cn(isSplitGroup && "space-y-0.5")}>+ {terminalGroup.terminalIds.map((terminalId) => {+ const isActive = terminalId === resolvedActiveTerminalId;+ const automaticLabel =+ automaticTerminalLabelById.get(terminalId) ?? "Terminal";+ const customLabel = terminalCustomLabels[terminalId]?.trim() ?? "";+ const displayLabel = terminalLabelById.get(terminalId) ?? automaticLabel;+ const isRenaming = renamingTerminalId === terminalId;+ return (+ <div+ key={terminalId}+ className={cn(+ "group/tab flex h-6 items-center gap-0.5 rounded-md pr-2 text-xs",+ isSplitGroup ? "pl-0.5" : "pl-1.5",+ isActive+ ? "bg-accent text-foreground"+ : "text-muted-foreground hover:bg-accent/50 hover:text-foreground",+ )}>- Group {groupIndex + 1}- </button>- )}-- <div- className={showGroupHeaders ? "ml-1 border-l border-border/60 pl-1.5" : ""}- >- {terminalGroup.terminalIds.map((terminalId) => {- const isActive = terminalId === resolvedActiveTerminalId;- const closeTerminalLabel = `Close ${- terminalLabelById.get(terminalId) ?? "terminal"- }${isActive && closeShortcutLabel ? ` (${closeShortcutLabel})` : ""}`;- return (- <div- key={terminalId}- className={`group flex items-center gap-1 rounded px-1 py-0.5 text-[11px] ${- isActive- ? "bg-accent text-foreground"- : "text-muted-foreground hover:bg-accent/50 hover:text-foreground"- }`}+ <button+ type="button"+ className="group/close relative flex size-4 shrink-0 items-center justify-center rounded-sm hover:bg-muted"+ aria-label={`Close ${displayLabel}`}+ onClick={() => onCloseTerminal(terminalId)}+ >+ <TerminalSquare className="size-3 shrink-0 group-hover/tab:hidden group-focus-visible/close:hidden pointer-coarse:hidden" />+ <XIcon className="hidden size-3 group-hover/tab:block group-focus-visible/close:block pointer-coarse:block" />+ </button>+ {isRenaming ? (+ <input+ autoFocus+ value={terminalRenameDraft}+ aria-label="Rename terminal"+ className="h-6 min-w-0 flex-1 rounded border border-input bg-background px-1.5 text-xs text-foreground outline-none focus:ring-2 focus:ring-ring"+ onFocus={(event) => event.currentTarget.select()}+ onChange={(event) =>+ setTerminalRenameDraft(event.currentTarget.value)+ }+ onBlur={() => {+ if (cancelTerminalRenameRef.current) {+ cancelTerminalRenameRef.current = false;+ return;+ }+ finishTerminalRename();+ }}+ onKeyDown={(event) => {+ event.stopPropagation();+ if (event.nativeEvent.isComposing) return;+ if (event.key === "Enter") {+ event.preventDefault();+ finishTerminalRename();+ } else if (event.key === "Escape") {+ event.preventDefault();+ cancelTerminalRename();+ }+ }}+ />+ ) : (+ <button+ type="button"+ className="flex min-w-0 flex-1 items-center text-left outline-none focus-visible:ring-2 focus-visible:ring-ring"+ title={`${displayLabel}${customLabel && customLabel !== automaticLabel ? ` · ${automaticLabel}` : ""} — ${resolveTerminalLaunchLocation(terminalId).cwd}`}+ onClick={() => onActiveTerminalChange(terminalId)}+ onDoubleClick={(event) => {+ event.preventDefault();+ onActiveTerminalChange(terminalId);+ startTerminalRename(terminalId);+ }}>- {showGroupHeaders && (- <span className="text-[10px] text-muted-foreground/80">└</span>- )}- <button- type="button"- className="flex min-w-0 flex-1 items-center gap-1 text-left"- onClick={() => onActiveTerminalChange(terminalId)}- >- <TerminalSquare className="size-3 shrink-0" />- <span className="truncate">- {terminalLabelById.get(terminalId) ?? "Terminal"}- </span>- </button>- {normalizedTerminalIds.length > 1 && (- <Popover>- <PopoverTrigger- openOnHover- render={- <button- type="button"- className="inline-flex size-3.5 items-center justify-center rounded text-xs font-medium leading-none text-muted-foreground opacity-0 transition hover:bg-accent hover:text-foreground group-hover:opacity-100"- onClick={() => onCloseTerminal(terminalId)}- aria-label={closeTerminalLabel}- />- }- >- <XIcon className="size-2.5" />- </PopoverTrigger>- <PopoverPopup- tooltipStyle- side="bottom"- sideOffset={6}- align="center"- className="pointer-events-none select-none"- >- {closeTerminalLabel}- </PopoverPopup>- </Popover>- )}- </div>- );- })}- </div>- </div>- );- })}- </div>- </aside>- )}- </div>+ <span className="min-w-0 flex-1 truncate">+ {displayLabel}+ {customLabel && customLabel !== automaticLabel ? (+ <span className="font-normal text-muted-foreground/80">+ {` · ${automaticLabel}`}+ </span>+ ) : null}+ </span>+ </button>+ )}+ </div>+ );+ })}+ </div>+ </div>+ );+ })}+ </div>+ </aside></div></aside>);diff --git a/apps/web/src/components/WorkspacePageContainer.tsx b/apps/web/src/components/WorkspacePageContainer.tsxnew file mode 100644index 000000000..4613dd465--- /dev/null+++ b/apps/web/src/components/WorkspacePageContainer.tsx@@ -0,0 +1,62 @@+import type { ComponentPropsWithoutRef } from "react";++import { cn } from "../lib/utils";+import { COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS } from "../workspaceTitlebar";++export type WorkspacePageWidth = "readable" | "wide" | "expanded";++const WIDTH_CLASS: Record<WorkspacePageWidth, string> = {+ readable: "max-w-4xl",+ wide: "max-w-5xl",+ expanded: "max-w-6xl",+};++/** Shared full-page frame for workspace routes beneath their top bar. */+export function WorkspacePageContainer({+ width = "readable",+ className,+ ...props+}: ComponentPropsWithoutRef<"div"> & { readonly width?: WorkspacePageWidth }) {+ return (+ <div+ className={cn(+ "mx-auto flex w-full flex-col gap-6 px-5 pt-6 pb-12 sm:px-6",+ WIDTH_CLASS[width],+ className,+ )}+ {...props}+ />+ );+}++/** Shared top-bar geometry for every full-width workspace surface. */+export function WorkspacePageHeader({+ electron = false,+ reserveNativeControls = electron,+ className,+ ...props+}: ComponentPropsWithoutRef<"header"> & {+ readonly electron?: boolean;+ readonly reserveNativeControls?: boolean;+}) {+ return (+ <header+ className={cn(+ "flex h-[var(--workspace-topbar-height)] min-h-[var(--workspace-topbar-height)] shrink-0 items-center gap-3 pl-[calc(env(safe-area-inset-left)+0.75rem)] pr-[calc(env(safe-area-inset-right)+0.75rem)] transition-[padding-left] duration-200 ease-linear motion-reduce:transition-none sm:pl-[calc(env(safe-area-inset-left)+1.25rem)] sm:pr-[calc(env(safe-area-inset-right)+1.25rem)]",+ electron && "drag-region",+ reserveNativeControls && "wco:pr-[var(--workspace-native-controls-inset)]",+ COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS,+ className,+ )}+ {...props}+ />+ );+}++/** Keeps an icon glyph on the content edge while its larger hit target extends outward. */+export function WorkspacePageHeaderEdgeControl({+ className,+ ...props+}: ComponentPropsWithoutRef<"div">) {+ return <div className={cn("-me-[7px] flex shrink-0", className)} {...props} />;+}diff --git a/apps/web/src/components/chat/ChangedFilesTree.test.tsx b/apps/web/src/components/chat/ChangedFilesTree.test.tsxindex e9fa1895b..bc3c4fa80 100644--- a/apps/web/src/components/chat/ChangedFilesTree.test.tsx+++ b/apps/web/src/components/chat/ChangedFilesTree.test.tsx@@ -23,13 +23,9 @@ describe("ChangedFilesCard", () => {expect(markup).toContain('data-changed-files-state="expanded"');expect(markup).toContain('aria-expanded="true"');expect(markup).toContain("whitespace-nowrap");- expect(markup).toContain(- 'class="group flex min-w-0 flex-1 items-center gap-1.5 overflow-hidden',- );+ expect(markup).toContain('class="flex min-w-0 items-center gap-1.5 rounded-md px-1 py-1');expect(markup).toContain('class="flex shrink-0 items-center gap-1 whitespace-nowrap');- expect(markup).toContain('class="ml-1 hidden min-w-0 flex-1 truncate');- expect(markup).toContain("@[24rem]/changed-files:inline");- expect(markup).not.toContain("sm:inline");+ expect(markup).toContain('class="hidden @[24rem]/changed-files:inline">Open diff</span>');expect(markup).toContain('class="flex shrink-0 items-center gap-1.5"');expect(markup).toContain("!size-[22px]");expect(markup).toContain("size-3");@@ -38,9 +34,11 @@ describe("ChangedFilesCard", () => {expect(markup).toContain('role="group" aria-label="2 additions, 1 deletions"');expect(markup).toContain("1 changed file");expect(markup).not.toContain("1 changed files");+ expect(markup).not.toContain("Hide files");+ expect(markup).not.toContain("ml-auto");});- it("renders a scope and representative-file preview for a large latest change", () => {+ it("renders a clean representative-file preview for a large latest change", () => {const markup = renderToStaticMarkup(<ChangedFilesCardturnId={TurnId.make("turn-1")}@@ -67,14 +65,15 @@ describe("ChangedFilesCard", () => {expect(markup).toContain('data-changed-files-state="preview"');expect(markup).toContain('aria-expanded="false"');- expect(markup).toContain("apps");- expect(markup).toContain("2 files");- expect(markup).toContain("packages");- expect(markup).toContain("root");+ expect(markup).toContain("apps/web/src/");+ expect(markup).toContain("packages/shared/src/");expect(markup).toContain("App.tsx");expect(markup).toContain("git.ts");expect(markup).toContain("README.md");- expect(markup).toContain("Show all 4 files");+ expect(markup).not.toContain("basis-0");+ expect(markup).not.toContain("+1 more");+ expect(markup).not.toContain("Show files");+ expect(markup).toContain('aria-label="120 additions, 20 deletions"');expect(markup).not.toContain("App.test.tsx");});diff --git a/apps/web/src/components/chat/ChangedFilesTree.tsx b/apps/web/src/components/chat/ChangedFilesTree.tsxindex d29d8b7f2..a8bb461c0 100644--- a/apps/web/src/components/chat/ChangedFilesTree.tsx+++ b/apps/web/src/components/chat/ChangedFilesTree.tsx@@ -19,11 +19,7 @@ import { DiffStatLabel, hasNonZeroStat } from "./DiffStatLabel";import { PierreEntryIcon } from "./PierreEntryIcon";import { Button } from "../ui/button";import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";-import {- changedFileName,- selectChangedFilePreview,- summarizeChangedFileScopes,-} from "./changedFilesPresentation";+import { changedFileName, selectChangedFilePreview } from "./changedFilesPresentation";const EMPTY_DIRECTORY_OVERRIDES: Record<string, boolean> = {};@@ -50,13 +46,12 @@ export const ChangedFilesCard = memo(function ChangedFilesCard(props: {onOpenTurnDiff,} = props;const summaryStat = useMemo(() => summarizeTurnDiffStats(files), [files]);- const scopeSummary = useMemo(() => summarizeChangedFileScopes(files), [files]);const previewFiles = useMemo(() => selectChangedFilePreview(files), [files]);const compactPreviewVisible = showCompactPreview && !expanded;return (<div- className="@container/changed-files mt-4 rounded-2xl border border-border/70 bg-secondary p-2 dark:border-transparent dark:bg-input/32"+ className="@container/changed-files mt-4 rounded-xl border border-border/70 bg-secondary p-1.5 dark:border-transparent dark:bg-input/32"data-changed-files-state={expanded ? "expanded" : compactPreviewVisible ? "preview" : "collapsed"}@@ -64,7 +59,7 @@ export const ChangedFilesCard = memo(function ChangedFilesCard(props: {<divdata-changed-files-header=""className={cn(- "flex items-center justify-between gap-2 rounded-xl px-1",+ "flex items-center justify-between gap-2 rounded-lg px-1",expanded &&"sticky top-2 z-10 mb-2 bg-secondary dark:bg-[color-mix(in_srgb,var(--foreground)_2.5%,var(--background))]",)}@@ -73,7 +68,7 @@ export const ChangedFilesCard = memo(function ChangedFilesCard(props: {type="button"aria-expanded={expanded}data-scroll-anchor-ignore- className="group flex min-w-0 flex-1 items-center gap-1.5 overflow-hidden rounded-lg px-1 py-1.5 text-left transition-colors hover:bg-accent/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"+ className="flex min-w-0 items-center gap-1.5 rounded-md px-1 py-1 text-left transition-colors hover:bg-accent/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"onClick={() => onExpandedChange(!expanded)}><ChevronRightIcon@@ -96,9 +91,6 @@ export const ChangedFilesCard = memo(function ChangedFilesCard(props: {/>)}</span>- <span className="ml-1 hidden min-w-0 flex-1 truncate text-[11px] text-muted-foreground group-hover:text-foreground/80 @[24rem]/changed-files:inline">- {expanded ? "Hide files" : "Show files"}- </span></button><div className="flex shrink-0 items-center gap-1.5">{expanded ? (@@ -158,43 +150,35 @@ export const ChangedFilesCard = memo(function ChangedFilesCard(props: {onOpenTurnDiff={onOpenTurnDiff}/>) : compactPreviewVisible ? (- <div className="px-2 pb-1.5 pt-1">- <p className="flex flex-wrap items-center gap-x-1.5 gap-y-0.5 text-[11px] text-muted-foreground">- {scopeSummary.map((scope, index) => (- <span key={scope.label} className="inline-flex items-center gap-1">- {index > 0 ? <span aria-hidden="true">·</span> : null}- <span className="font-mono text-foreground/75">{scope.label}</span>- <span>- {scope.fileCount} file{scope.fileCount === 1 ? "" : "s"}- </span>- </span>- ))}- </p>- <div className="mt-2 flex flex-wrap items-center gap-1.5">+ <div className="px-1.5 pb-1 pt-0.5">+ <div className="flex min-w-0 items-center gap-x-3 overflow-hidden">{previewFiles.map((file) => (<buttonkey={file.path}type="button"title={file.path}- className="inline-flex max-w-48 items-center gap-1 rounded-md border border-border/70 bg-background/45 px-1.5 py-1 font-mono text-[10px] text-muted-foreground transition-colors hover:bg-accent/60 hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"+ className="group flex min-h-6 min-w-0 max-w-72 shrink items-center gap-1.5 rounded-md px-1 text-left transition-colors hover:bg-accent/45 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"onClick={() => onOpenTurnDiff(turnId, file.path)}><PierreEntryIconpathValue={file.path}kind="file"theme={resolvedTheme}- className="size-3 shrink-0 text-muted-foreground/70"+ className="size-3.5 shrink-0 text-muted-foreground/70"/>- <span className="truncate">{changedFileName(file.path)}</span>+ <span className="min-w-0 truncate font-mono text-xs text-foreground/75 group-hover:text-foreground">+ {changedFileName(file.path)}+ </span>+ {hasNonZeroStat(file) ? (+ <DiffStatLabel+ additions={file.additions}+ deletions={file.deletions}+ layout="inline"+ className="shrink-0 text-[10px]"+ />+ ) : null}</button>))}- <button- type="button"- className="rounded-md px-1.5 py-1 text-[11px] font-medium text-muted-foreground transition-colors hover:bg-accent/60 hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"- onClick={() => onExpandedChange(true)}- >- Show all {files.length} files- </button></div></div>) : null}@@ -270,11 +254,11 @@ export const ChangedFilesTree = memo(function ChangedFilesTree(props: {) : (<FolderClosedIcon className="size-3.5 shrink-0 text-muted-foreground/75" />)}- <span className="truncate font-mono text-[11px] text-muted-foreground/90 group-hover:text-foreground/90">+ <span className="min-w-0 truncate font-mono text-[11px] text-muted-foreground/90 group-hover:text-foreground/90">{node.name}</span>{hasNonZeroStat(node.stat) && (- <span className="ml-auto shrink-0 font-mono text-[10px] tabular-nums">+ <span className="ml-1 shrink-0 font-mono text-[10px] tabular-nums"><DiffStatLabel additions={node.stat.additions} deletions={node.stat.deletions} /></span>)}@@ -305,11 +289,11 @@ export const ChangedFilesTree = memo(function ChangedFilesTree(props: {theme={resolvedTheme}className="size-3.5 text-muted-foreground/70"/>- <span className="truncate font-mono text-[11px] text-muted-foreground/80 group-hover:text-foreground/90">+ <span className="min-w-0 truncate font-mono text-[11px] text-muted-foreground/80 group-hover:text-foreground/90">{node.name}</span>{node.stat && (- <span className="ml-auto shrink-0 font-mono text-[10px] tabular-nums">+ <span className="ml-1 shrink-0 font-mono text-[10px] tabular-nums"><DiffStatLabel additions={node.stat.additions} deletions={node.stat.deletions} /></span>)}diff --git a/apps/web/src/components/chat/MessagesTimeline.logic.test.ts b/apps/web/src/components/chat/MessagesTimeline.logic.test.tsindex 6d74204bc..82338dec2 100644--- a/apps/web/src/components/chat/MessagesTimeline.logic.test.ts+++ b/apps/web/src/components/chat/MessagesTimeline.logic.test.ts@@ -531,9 +531,9 @@ describe("deriveMessagesTimelineRows", () => {expect(expandedRows.map((row) => row.id)).toEqual(["user-entry",- "turn-fold:turn-1","assistant-thought-entry",- "work-entry-1",+ "work-toggle:work-entry-1",+ "turn-fold:turn-1","assistant-final-entry",]);expect(@@ -638,6 +638,84 @@ describe("deriveMessagesTimelineRows", () => {expect(foldRow?.label).toBe("Worked for 12s");});+ it("keeps a superseded turn fold beside the final response after a steer", () => {+ const rows = deriveMessagesTimelineRows({+ timelineEntries: [+ {+ id: "initial-user-entry",+ kind: "message",+ createdAt: "2026-01-01T00:00:00Z",+ message: {+ id: "initial-user" as never,+ role: "user",+ text: "Start the work",+ turnId: null,+ createdAt: "2026-01-01T00:00:00Z",+ updatedAt: "2026-01-01T00:00:00Z",+ streaming: false,+ },+ },+ {+ id: "superseded-work-entry",+ kind: "work",+ createdAt: "2026-01-01T00:00:10Z",+ entry: {+ id: "superseded-work",+ createdAt: "2026-01-01T00:00:10Z",+ turnId: "turn-1" as never,+ label: "Ran command",+ tone: "tool",+ },+ },+ {+ id: "steer-user-entry",+ kind: "message",+ createdAt: "2026-01-01T00:00:12Z",+ message: {+ id: "steer-user" as never,+ role: "user",+ text: "Change the approach",+ turnId: null,+ createdAt: "2026-01-01T00:00:12Z",+ updatedAt: "2026-01-01T00:00:12Z",+ streaming: false,+ },+ },+ {+ id: "assistant-final-entry",+ kind: "message",+ createdAt: "2026-01-01T00:00:20Z",+ message: {+ id: "assistant-final" as never,+ role: "assistant",+ text: "Implemented locally, uncommitted.",+ turnId: "turn-2" as never,+ createdAt: "2026-01-01T00:00:20Z",+ updatedAt: "2026-01-01T00:00:21Z",+ streaming: false,+ },+ },+ ],+ latestTurn: {+ turnId: "turn-2" as never,+ state: "completed",+ startedAt: "2026-01-01T00:00:12Z",+ completedAt: "2026-01-01T00:00:21Z",+ },+ isWorking: false,+ activeTurnStartedAt: null,+ turnDiffSummaryByAssistantMessageId: new Map(),+ revertTurnCountByUserMessageId: new Map(),+ });++ expect(rows.map((row) => row.id)).toEqual([+ "initial-user-entry",+ "steer-user-entry",+ "turn-fold:turn-1",+ "assistant-final-entry",+ ]);+ });+it("uses latest-turn timings and the stopped label for an interrupted latest turn", () => {const rows = deriveMessagesTimelineRows({timelineEntries: [@@ -771,6 +849,7 @@ describe("deriveMessagesTimelineRows", () => {turnId: "turn-1" as never,label: "Ran command",tone: "tool" as const,+ toolLifecycleStatus: "inProgress" as const,},},],@@ -788,10 +867,133 @@ describe("deriveMessagesTimelineRows", () => {expect(rows.some((row) => row.kind === "turn-fold")).toBe(false);expect(rows.map((row) => row.id)).toEqual([+ "working-indicator-row","assistant-thought-entry",- "work-entry-1",+ "work-live:work-entry-1",+ ]);+ });++ it("keeps the current tool batch expandable while live entries append", () => {+ const timelineEntries = [+ {+ id: "work-entry-1",+ kind: "work" as const,+ createdAt: "2026-01-01T00:00:01Z",+ entry: {+ id: "work-1",+ createdAt: "2026-01-01T00:00:01Z",+ turnId: "turn-1" as never,+ toolCallId: "call-1",+ label: "Read file",+ tone: "tool" as const,+ },+ },+ {+ id: "work-entry-2",+ kind: "work" as const,+ createdAt: "2026-01-01T00:00:02Z",+ entry: {+ id: "work-2",+ createdAt: "2026-01-01T00:00:02Z",+ turnId: "turn-1" as never,+ toolCallId: "call-2",+ label: "Run command",+ command: "vp test run",+ tone: "tool" as const,+ },+ },+ ];+ const baseInput = {+ timelineEntries,+ latestTurn: {+ turnId: "turn-1" as never,+ state: "running" as const,+ startedAt: "2026-01-01T00:00:00Z",+ completedAt: null,+ },+ isWorking: true,+ activeTurnStartedAt: "2026-01-01T00:00:00Z",+ turnDiffSummaryByAssistantMessageId: new Map(),+ revertTurnCountByUserMessageId: new Map(),+ };++ const collapsedRows = deriveMessagesTimelineRows(baseInput);+ const expandedRows = deriveMessagesTimelineRows({+ ...baseInput,+ expandedWorkGroupIds: new Set(["work-group:tool:call-1"]),+ });++ expect(collapsedRows.map((row) => row.id)).toEqual(["working-indicator-row",+ "work-live:tool:call-1",]);+ expect(collapsedRows.find((row) => row.kind === "work-live")).toMatchObject({+ groupId: "work-group:tool:call-1",+ expanded: false,+ groupedEntries: [{ id: "work-1" }, { id: "work-2" }],+ });+ expect(expandedRows.map((row) => row.id)).toEqual([+ "working-indicator-row",+ "work-live:tool:call-1",+ "work-1",+ "work-2",+ ]);+ expect(expandedRows.find((row) => row.kind === "work-live")).toMatchObject({+ groupId: "work-group:tool:call-1",+ expanded: true,+ });++ const appendedRows = deriveMessagesTimelineRows({+ ...baseInput,+ timelineEntries: [+ ...timelineEntries,+ {+ id: "work-entry-3",+ kind: "work" as const,+ createdAt: "2026-01-01T00:00:03Z",+ entry: {+ id: "work-3",+ createdAt: "2026-01-01T00:00:03Z",+ turnId: "turn-1" as never,+ toolCallId: "call-3",+ label: "Changed file",+ tone: "tool" as const,+ },+ },+ ],+ expandedWorkGroupIds: new Set(["work-group:tool:call-1"]),+ });++ expect(appendedRows.map((row) => row.id)).toEqual([+ "working-indicator-row",+ "work-live:tool:call-1",+ "work-1",+ "work-2",+ "work-3",+ ]);++ const rowsWithLaterPlan = deriveMessagesTimelineRows({+ ...baseInput,+ timelineEntries: [+ ...timelineEntries,+ {+ id: "plan:thread-1:turn:turn-1",+ kind: "proposed-plan" as const,+ createdAt: "2026-01-01T00:00:03Z",+ proposedPlan: {+ id: "plan:thread-1:turn:turn-1",+ turnId: "turn-1" as never,+ planMarkdown: "# Next steps",+ implementedAt: null,+ implementationThreadId: null,+ createdAt: "2026-01-01T00:00:03Z",+ updatedAt: "2026-01-01T00:00:03Z",+ },+ },+ ],+ });+ expect(rowsWithLaterPlan.some((row) => row.kind === "work-live")).toBe(false);+ expect(rowsWithLaterPlan.some((row) => row.kind === "proposed-plan")).toBe(true);});it("does not fold the session's running turn when latestTurn regresses", () => {@@ -852,7 +1054,7 @@ describe("deriveMessagesTimelineRows", () => {expect(rows.filter((row) => row.kind === "turn-fold").map((row) => row.turnId)).toEqual(["turn-1",]);- expect(rows.map((row) => row.id)).toContain("running-work-entry");+ expect(rows.map((row) => row.id)).toContain("work-live:running-work-entry");});it("only shows assistant metadata on the terminal assistant message", () => {@@ -994,18 +1196,18 @@ describe("deriveMessagesTimelineRows", () => {expandedWorkGroupIds: new Set(["work-group:work-entry-1"]),});- expect(collapsedRows.map((row) => row.id)).toEqual(["work-3", "work-toggle:work-entry-1"]);+ expect(collapsedRows.map((row) => row.id)).toEqual(["work-toggle:work-entry-1"]);expect(collapsedRows.find((row) => row.kind === "work-toggle")).toMatchObject({groupId: "work-group:work-entry-1",- hiddenCount: 2,+ hiddenCount: 3,expanded: false,onlyToolEntries: true,});expect(expandedRows.map((row) => row.id)).toEqual([+ "work-toggle:work-entry-1","work-1","work-2","work-3",- "work-toggle:work-entry-1",]);expect(expandedRows.find((row) => row.kind === "work-toggle")).toMatchObject({expanded: true,diff --git a/apps/web/src/components/chat/MessagesTimeline.logic.ts b/apps/web/src/components/chat/MessagesTimeline.logic.tsindex 6bc0a2a62..8d7fc52fd 100644--- a/apps/web/src/components/chat/MessagesTimeline.logic.ts+++ b/apps/web/src/components/chat/MessagesTimeline.logic.ts@@ -1,6 +1,7 @@import * as Equal from "effect/Equal";import {formatDuration,+ workEntryIndicatesToolFailure,workEntryIndicatesToolNeutralStatus,workLogEntryIsToolLike,type TimelineEntry,@@ -166,6 +167,17 @@ export type MessagesTimelineRow =id: string;createdAt: string;groupedEntries: WorkLogEntry[];+ isExpandedToolGroupEntry: boolean;+ isLastExpandedToolGroupEntry: boolean;+ }+ | {+ kind: "work-live";+ id: string;+ createdAt: string;+ entry: WorkLogEntry;+ groupedEntries: WorkLogEntry[];+ groupId: string;+ expanded: boolean;}| {kind: "work-toggle";@@ -175,6 +187,9 @@ export type MessagesTimelineRow =hiddenCount: number;expanded: boolean;onlyToolEntries: boolean;+ summary: string | null;+ summaryKind: ToolGroupAction | "mixed" | null;+ hasFailure: boolean;}| {kind: "turn-fold";@@ -208,7 +223,12 @@ export type MessagesTimelineRow =createdAt: string;turnPlan: TurnPlanEntry;}- | { kind: "working"; id: string; createdAt: string | null };+ | {+ kind: "working";+ id: string;+ createdAt: string | null;+ showThinking: boolean;+ };export interface StableMessagesTimelineRowsState {byId: Map<string, MessagesTimelineRow>;@@ -238,6 +258,90 @@ export function normalizeCompactToolLabel(value: string): string {return value.replace(/\s+(?:complete|completed)\s*$/i, "").trim();}+type ToolGroupAction = "read" | "edit" | "command" | "search" | "other";++function toolGroupAction(entry: WorkLogEntry): ToolGroupAction {+ if (entry.requestKind === "file-read" || entry.itemType === "image_view") return "read";+ if (+ entry.requestKind === "file-change" ||+ entry.itemType === "file_change" ||+ (entry.changedFiles?.length ?? 0) > 0+ ) {+ return "edit";+ }+ if (entry.requestKind === "command" || entry.itemType === "command_execution" || entry.command) {+ return "command";+ }+ if (entry.itemType === "web_search") return "search";+ return "other";+}++function toolGroupActionCount(+ action: ToolGroupAction,+ entries: ReadonlyArray<WorkLogEntry>,+): number {+ if (action !== "edit") return entries.length;++ const changedFiles = new Set<string>();+ let editsWithoutFileDetails = 0;+ for (const entry of entries) {+ if (!entry.changedFiles || entry.changedFiles.length === 0) {+ editsWithoutFileDetails += 1;+ continue;+ }+ for (const file of entry.changedFiles) changedFiles.add(file);+ }+ return changedFiles.size + editsWithoutFileDetails;+}++function toolGroupActionLabel(action: ToolGroupAction, count: number): string {+ switch (action) {+ case "read":+ return `Read ${count} ${count === 1 ? "file" : "files"}`;+ case "edit":+ return `Changed ${count} ${count === 1 ? "file" : "files"}`;+ case "command":+ return `Ran ${count} ${count === 1 ? "command" : "commands"}`;+ case "search":+ return `Searched the web ${count} ${count === 1 ? "time" : "times"}`;+ case "other":+ return `Used ${count} ${count === 1 ? "tool" : "tools"}`;+ }+}++/** Immediate, provider-neutral fallback while generated tool summaries are disabled or unavailable. */+export function summarizeToolGroup(entries: ReadonlyArray<WorkLogEntry>): string {+ const groupedEntries = new Map<ToolGroupAction, WorkLogEntry[]>();+ for (const entry of entries) {+ const action = toolGroupAction(entry);+ const group = groupedEntries.get(action);+ if (group) group.push(entry);+ else groupedEntries.set(action, [entry]);+ }+ const labels = [...groupedEntries].map(([action, actionEntries]) =>+ toolGroupActionLabel(action, toolGroupActionCount(action, actionEntries)),+ );+ const sentenceLabels = labels.map((label, index) =>+ index === 0 ? label : label.charAt(0).toLowerCase() + label.slice(1),+ );+ if (sentenceLabels.length < 2) return sentenceLabels[0] ?? "";+ if (sentenceLabels.length === 2) return sentenceLabels.join(" and ");+ return `${sentenceLabels.slice(0, -1).join(", ")}, and ${sentenceLabels.at(-1)}`;+}++function toolGroupSummaryKind(entries: ReadonlyArray<WorkLogEntry>): ToolGroupAction | "mixed" {+ const actions = new Set(entries.map(toolGroupAction));+ return actions.size === 1 ? actions.values().next().value! : "mixed";+}++function workGroupIdentity(timelineEntryId: string, entry: WorkLogEntry): string {+ return entry.toolCallId ? `tool:${entry.toolCallId}` : timelineEntryId;+}++function workGroupId(timelineEntryId: string, entry: WorkLogEntry): string {+ return `work-group:${workGroupIdentity(timelineEntryId, entry)}`;+}+export function resolveAssistantMessageCopyState({text,showCopyButton,@@ -310,17 +414,34 @@ function deriveUnsettledTurnId(return isSettled ? null : latestTurn.turnId;}+function lastUserMessageIndex(timelineEntries: ReadonlyArray<TimelineEntry>): number {+ return timelineEntries.findLastIndex(+ (entry) => entry.kind === "message" && entry.message.role === "user",+ );+}++function timelineEntryTurnId(entry: TimelineEntry): TurnId | null {+ if (entry.kind === "message") {+ return entry.message.role === "assistant" ? (entry.message.turnId ?? null) : null;+ }+ if (entry.kind === "turn-plan") {+ return entry.turnPlan.turnId;+ }+ return entry.kind === "work" ? (entry.entry.turnId ?? null) : null;+}+/*** Settled turns fold their commentary and tool activity behind a- * "Worked for ..." row anchored at the turn's first foldable entry; the- * terminal assistant message stays visible below the fold.+ * "Worked for ..." row placed immediately before the next terminal assistant+ * response. A steer can split one visible response across turn ids, so tying+ * the disclosure to the first hidden entry would strand it above the steer.*/function deriveTurnFolds(input: {timelineEntries: ReadonlyArray<TimelineEntry>;terminalAssistantMessageIds: ReadonlySet<string>;latestTurn: TimelineLatestTurn | null;unsettledTurnId: TurnId | null;-}): ReadonlyMap<string, TurnFold> {+}): ReadonlyMap<string, ReadonlyArray<TurnFold>> {interface TurnGroup {entries: Array<TimelineEntry>;terminalEntry: Extract<TimelineEntry, { kind: "message" }> | null;@@ -375,7 +496,7 @@ function deriveTurnFolds(input: {}}- const foldsByAnchorEntryId = new Map<string, TurnFold>();+ const foldsByAnchorEntryId = new Map<string, TurnFold[]>();for (const [turnId, group] of groupsByTurnId) {if (turnId === input.unsettledTurnId) {continue;@@ -405,6 +526,24 @@ function deriveTurnFolds(input: {if (!firstEntry || !lastEntry) {continue;}+ const lastHiddenEntryIndex = input.timelineEntries.findLastIndex((entry) =>+ hiddenEntryIds.has(entry.id),+ );+ if (lastHiddenEntryIndex < 0) {+ continue;+ }+ const nextTerminalAssistantEntry = input.timelineEntries+ .slice(lastHiddenEntryIndex + 1)+ .find(+ (entry) =>+ entry.kind === "message" &&+ entry.message.role === "assistant" &&+ input.terminalAssistantMessageIds.has(entry.message.id),+ );+ const anchorEntry = nextTerminalAssistantEntry ?? input.timelineEntries[lastHiddenEntryIndex];+ if (!anchorEntry) {+ continue;+ }const isLatestInterruptedTurn =input.latestTurn?.turnId === turnId && input.latestTurn.state === "interrupted";@@ -431,13 +570,16 @@ function deriveTurnFolds(input: {? `Worked for ${duration}`: "Worked";- foldsByAnchorEntryId.set(firstEntry.id, {+ const fold = {turnId,- anchorEntryId: firstEntry.id,- createdAt: firstEntry.createdAt,+ anchorEntryId: anchorEntry.id,+ createdAt: anchorEntry.createdAt,hiddenEntryIds,label,- });+ };+ const anchoredFolds = foldsByAnchorEntryId.get(anchorEntry.id);+ if (anchoredFolds) anchoredFolds.push(fold);+ else foldsByAnchorEntryId.set(anchorEntry.id, [fold]);}return foldsByAnchorEntryId;}@@ -469,36 +611,184 @@ export function deriveMessagesTimelineRows(input: {unsettledTurnId,});const collapsedEntryIds = new Set<string>();- for (const fold of foldsByAnchorEntryId.values()) {- if (!input.expandedTurnIds?.has(fold.turnId)) {- for (const entryId of fold.hiddenEntryIds) {- collapsedEntryIds.add(entryId);+ for (const folds of foldsByAnchorEntryId.values()) {+ for (const fold of folds) {+ if (!input.expandedTurnIds?.has(fold.turnId)) {+ for (const entryId of fold.hiddenEntryIds) {+ collapsedEntryIds.add(entryId);+ }}}}+ let activeTurnHeaderIndex = input.timelineEntries.length;+ if (input.isWorking) {+ const latestUserMessageIndex = lastUserMessageIndex(input.timelineEntries);+ const firstOwnedAfterUser =+ unsettledTurnId === null+ ? -1+ : input.timelineEntries.findIndex(+ (entry, index) =>+ index > latestUserMessageIndex && timelineEntryTurnId(entry) === unsettledTurnId,+ );+ activeTurnHeaderIndex =+ firstOwnedAfterUser >= 0 ? firstOwnedAfterUser : latestUserMessageIndex + 1;+ }+ const entryBelongsToActiveTurn = (entry: TimelineEntry, index: number) =>+ input.isWorking &&+ index >= activeTurnHeaderIndex &&+ (unsettledTurnId === null || timelineEntryTurnId(entry) === unsettledTurnId);+ const isVisibleActiveToolEntry = (entry: WorkLogEntry) =>+ workLogEntryIsToolLike(entry) &&+ (entry.toolLifecycleStatus === "inProgress" || !workEntryIndicatesToolNeutralStatus(entry));+ const activeEntries = input.isWorking+ ? input.timelineEntries.filter((entry, index) => entryBelongsToActiveTurn(entry, index))+ : [];+ const activeTurnHasVisibleContent =+ activeEntries.some((entry) => {+ if (entry.kind === "message") {+ return entry.message.role === "assistant" && (entry.message.text?.trim().length ?? 0) > 0;+ }+ if (entry.kind === "work") {+ return entry.entry.agentSpawn === undefined && isVisibleActiveToolEntry(entry.entry);+ }+ if (entry.kind === "turn-plan") return true;+ return false;+ }) ||+ input.timelineEntries+ .slice(activeTurnHeaderIndex)+ .some((entry) => entry.kind === "proposed-plan" || entry.kind === "turn-plan");++ const activeWorkEntryIds = new Set<string>();+ const activeWorkRowsByAnchorId = new Map<+ string,+ Extract<MessagesTimelineRow, { kind: "work-live" }>+ >();+ const hasLaterTurnContent = Array.from({ length: input.timelineEntries.length + 1 }, () => false);+ for (let index = input.timelineEntries.length - 1; index >= 0; index -= 1) {+ const entry = input.timelineEntries[index];+ if (!entry) continue;+ const isVisibleTurnContent =+ (entry.kind === "message" && entry.message.role === "user") ||+ entry.kind === "proposed-plan" ||+ (entryBelongsToActiveTurn(entry, index) &&+ ((entry.kind === "message" && entry.message.role === "assistant") ||+ entry.kind === "turn-plan" ||+ (entry.kind === "work" &&+ entry.entry.agentSpawn === undefined &&+ isVisibleActiveToolEntry(entry.entry))));+ hasLaterTurnContent[index] = isVisibleTurnContent || hasLaterTurnContent[index + 1] === true;+ }++ for (let index = 0; index < input.timelineEntries.length; index += 1) {+ const entry = input.timelineEntries[index];+ if (+ !entry ||+ entry.kind !== "work" ||+ entry.entry.agentSpawn !== undefined ||+ !entryBelongsToActiveTurn(entry, index)+ ) {+ continue;+ }+ if (!isVisibleActiveToolEntry(entry.entry)) {+ continue;+ }++ const anchorEntry = entry;+ let latestToolEntry = entry;+ const batchEntryIds = [entry.id];+ const visibleBatchEntries = [entry.entry];+ let cursor = index + 1;+ while (cursor < input.timelineEntries.length) {+ const nextEntry = input.timelineEntries[cursor];+ if (+ !nextEntry ||+ nextEntry.kind !== "work" ||+ nextEntry.entry.agentSpawn !== undefined ||+ !entryBelongsToActiveTurn(nextEntry, cursor)+ ) {+ break;+ }+ batchEntryIds.push(nextEntry.id);+ if (isVisibleActiveToolEntry(nextEntry.entry)) {+ latestToolEntry = nextEntry;+ visibleBatchEntries.push(nextEntry.entry);+ }+ cursor += 1;+ }++ // Once newer commentary, a plan, or another tool batch exists, this batch+ // is history. Let the regular work-group path turn it into an expandable+ // summary so none of its calls disappear behind the live one-line view.+ if (hasLaterTurnContent[cursor] !== true) {+ for (const entryId of batchEntryIds) activeWorkEntryIds.add(entryId);+ const groupId = workGroupId(anchorEntry.id, anchorEntry.entry);+ activeWorkRowsByAnchorId.set(anchorEntry.id, {+ kind: "work-live",+ id: `work-live:${workGroupIdentity(anchorEntry.id, anchorEntry.entry)}`,+ createdAt: anchorEntry.createdAt,+ entry: latestToolEntry.entry,+ groupedEntries: visibleBatchEntries,+ groupId,+ expanded: input.expandedWorkGroupIds?.has(groupId) ?? false,+ });+ }+ index = cursor - 1;+ }+for (let index = 0; index < input.timelineEntries.length; index += 1) {const timelineEntry = input.timelineEntries[index];if (!timelineEntry) {continue;}- const turnFold = foldsByAnchorEntryId.get(timelineEntry.id);- if (turnFold) {+ if (input.isWorking && index === activeTurnHeaderIndex) {nextRows.push({- kind: "turn-fold",- id: `turn-fold:${turnFold.turnId}`,- createdAt: turnFold.createdAt,- turnId: turnFold.turnId,- label: turnFold.label,- expanded: input.expandedTurnIds?.has(turnFold.turnId) ?? false,+ kind: "working",+ id: "working-indicator-row",+ createdAt: input.activeTurnStartedAt,+ showThinking: !activeTurnHasVisibleContent,});}+ const anchoredTurnFolds = foldsByAnchorEntryId.get(timelineEntry.id);+ if (anchoredTurnFolds) {+ for (const turnFold of anchoredTurnFolds) {+ nextRows.push({+ kind: "turn-fold",+ id: `turn-fold:${turnFold.turnId}`,+ createdAt: turnFold.createdAt,+ turnId: turnFold.turnId,+ label: turnFold.label,+ expanded: input.expandedTurnIds?.has(turnFold.turnId) ?? false,+ });+ }+ }+if (collapsedEntryIds.has(timelineEntry.id)) {continue;}+ if (activeWorkEntryIds.has(timelineEntry.id)) {+ const activeWorkRow = activeWorkRowsByAnchorId.get(timelineEntry.id);+ if (activeWorkRow) {+ nextRows.push(activeWorkRow);+ if (activeWorkRow.expanded) {+ for (const [entryIndex, workEntry] of activeWorkRow.groupedEntries.entries()) {+ nextRows.push({+ kind: "work",+ id: workEntry.id,+ createdAt: workEntry.createdAt,+ groupedEntries: [workEntry],+ isExpandedToolGroupEntry: true,+ isLastExpandedToolGroupEntry: entryIndex === activeWorkRow.groupedEntries.length - 1,+ });+ }+ }+ }+ continue;+ }+if (timelineEntry.kind === "work") {const groupedEntries = [timelineEntry.entry];let cursor = index + 1;@@ -507,6 +797,7 @@ export function deriveMessagesTimelineRows(input: {if (!nextEntry ||nextEntry.kind !== "work" ||+ activeWorkEntryIds.has(nextEntry.id) ||collapsedEntryIds.has(nextEntry.id) ||foldsByAnchorEntryId.has(nextEntry.id)) {@@ -519,15 +810,48 @@ export function deriveMessagesTimelineRows(input: {(entry) => !workEntryIndicatesToolNeutralStatus(entry),);if (visibleGroupedEntries.length > 0) {- if (visibleGroupedEntries.length <= MAX_VISIBLE_WORK_LOG_ENTRIES) {+ const onlyToolEntries = visibleGroupedEntries.every(+ (entry) => workLogEntryIsToolLike(entry) && entry.agentSpawn === undefined,+ );+ if (onlyToolEntries) {+ const groupId = workGroupId(timelineEntry.id, timelineEntry.entry);+ const expanded = input.expandedWorkGroupIds?.has(groupId) ?? false;+ const summaryKind = toolGroupSummaryKind(visibleGroupedEntries);+ nextRows.push({+ kind: "work-toggle",+ id: `work-toggle:${timelineEntry.id}`,+ createdAt: timelineEntry.createdAt,+ groupId,+ hiddenCount: visibleGroupedEntries.length,+ expanded,+ onlyToolEntries: true,+ summary: summarizeToolGroup(visibleGroupedEntries),+ summaryKind,+ hasFailure: visibleGroupedEntries.some((entry) => workEntryIndicatesToolFailure(entry)),+ });+ if (expanded) {+ for (const [entryIndex, workEntry] of visibleGroupedEntries.entries()) {+ nextRows.push({+ kind: "work",+ id: workEntry.id,+ createdAt: workEntry.createdAt,+ groupedEntries: [workEntry],+ isExpandedToolGroupEntry: true,+ isLastExpandedToolGroupEntry: entryIndex === visibleGroupedEntries.length - 1,+ });+ }+ }+ } else if (visibleGroupedEntries.length <= MAX_VISIBLE_WORK_LOG_ENTRIES) {nextRows.push({kind: "work",id: timelineEntry.id,createdAt: timelineEntry.createdAt,groupedEntries: visibleGroupedEntries,+ isExpandedToolGroupEntry: false,+ isLastExpandedToolGroupEntry: false,});} else {- const groupId = `work-group:${timelineEntry.id}`;+ const groupId = workGroupId(timelineEntry.id, timelineEntry.entry);const expanded = input.expandedWorkGroupIds?.has(groupId) ?? false;// Agent-spawn CTA rows are always visible: a running fleet must// never hide behind a "+N tool calls" toggle. Selection is by@@ -551,6 +875,8 @@ export function deriveMessagesTimelineRows(input: {id: workEntry.id,createdAt: workEntry.createdAt,groupedEntries: [workEntry],+ isExpandedToolGroupEntry: false,+ isLastExpandedToolGroupEntry: false,});}@@ -562,8 +888,11 @@ export function deriveMessagesTimelineRows(input: {groupId,hiddenCount: hiddenEntries.length,expanded,- onlyToolEntries: visibleGroupedEntries.every((entry) =>- workLogEntryIsToolLike(entry),+ onlyToolEntries,+ summary: null,+ summaryKind: null,+ hasFailure: visibleGroupedEntries.some((entry) =>+ workEntryIndicatesToolFailure(entry),),});}@@ -629,11 +958,12 @@ export function deriveMessagesTimelineRows(input: {});}- if (input.isWorking) {+ if (input.isWorking && activeTurnHeaderIndex === input.timelineEntries.length) {nextRows.push({kind: "working",id: "working-indicator-row",createdAt: input.activeTurnStartedAt,+ showThinking: !activeTurnHasVisibleContent,});}@@ -666,7 +996,9 @@ function isRowUnchanged(a: MessagesTimelineRow, b: MessagesTimelineRow): booleanswitch (a.kind) {case "working":- return a.createdAt === (b as typeof a).createdAt;+ return (+ a.createdAt === (b as typeof a).createdAt && a.showThinking === (b as typeof a).showThinking+ );case "turn-fold": {const bf = b as typeof a;@@ -683,8 +1015,25 @@ function isRowUnchanged(a: MessagesTimelineRow, b: MessagesTimelineRow): booleanreturn a.createdAt === bp.createdAt && a.turnPlan.plan === bp.turnPlan.plan;}- case "work":- return Equal.equals(a.groupedEntries, (b as typeof a).groupedEntries);+ case "work": {+ const bw = b as typeof a;+ return (+ a.isExpandedToolGroupEntry === bw.isExpandedToolGroupEntry &&+ a.isLastExpandedToolGroupEntry === bw.isLastExpandedToolGroupEntry &&+ Equal.equals(a.groupedEntries, bw.groupedEntries)+ );+ }++ case "work-live": {+ const bw = b as typeof a;+ return (+ a.createdAt === bw.createdAt &&+ a.groupId === bw.groupId &&+ a.expanded === bw.expanded &&+ Equal.equals(a.entry, bw.entry) &&+ Equal.equals(a.groupedEntries, bw.groupedEntries)+ );+ }case "work-toggle": {const bw = b as typeof a;@@ -693,7 +1042,10 @@ function isRowUnchanged(a: MessagesTimelineRow, b: MessagesTimelineRow): booleana.groupId === bw.groupId &&a.hiddenCount === bw.hiddenCount &&a.expanded === bw.expanded &&- a.onlyToolEntries === bw.onlyToolEntries+ a.onlyToolEntries === bw.onlyToolEntries &&+ a.summary === bw.summary &&+ a.summaryKind === bw.summaryKind &&+ a.hasFailure === bw.hasFailure);}diff --git a/apps/web/src/components/chat/MessagesTimeline.test.tsx b/apps/web/src/components/chat/MessagesTimeline.test.tsxindex 194edc0bd..3dcf6cf2a 100644--- a/apps/web/src/components/chat/MessagesTimeline.test.tsx+++ b/apps/web/src/components/chat/MessagesTimeline.test.tsx@@ -554,7 +554,49 @@ describe("MessagesTimeline", () => {expect(markup).toContain("Work Log");});- it("formats changed file paths from the workspace root", () => {+ it("makes the whole live tool row expandable without adding a chevron", () => {+ const turnId = TurnId.make("turn-live-tools");+ const markup = renderToStaticMarkup(+ <MessagesTimeline+ {...buildProps()}+ isWorking+ activeTurnInProgress+ activeTurnStartedAt="2026-03-17T19:12:28.000Z"+ latestTurn={{+ turnId,+ state: "running",+ startedAt: "2026-03-17T19:12:28.000Z",+ completedAt: null,+ }}+ runningTurnId={turnId}+ timelineEntries={[+ {+ id: "entry-live-tool",+ kind: "work",+ createdAt: "2026-03-17T19:12:29.000Z",+ entry: {+ id: "work-live-tool",+ createdAt: "2026-03-17T19:12:29.000Z",+ turnId,+ toolCallId: "call-live-tool",+ label: "Running tests",+ command: "env -C /tmp sudo -iu postgres psql",+ tone: "tool",+ toolLifecycleStatus: "inProgress",+ },+ },+ ]}+ />,+ );++ expect(markup).not.toContain('aria-label="Expand current tool calls"');+ expect(markup).toContain('aria-expanded="false"');+ expect(markup).toContain("Running psql");+ expect(markup).not.toContain("lucide-chevron-right");+ expect(markup).not.toContain("hover:bg-accent/20");+ });++ it("summarizes completed changed-file activity", () => {const markup = renderToStaticMarkup(<MessagesTimeline{...buildProps()}@@ -576,7 +618,7 @@ describe("MessagesTimeline", () => {/>,);- expect(markup).toContain("t3code/apps/web/src/session-logic.ts");+ expect(markup).toContain("Changed 1 file");expect(markup).not.toContain("C:/Users/mike/dev-stuff/t3code/apps/web/src/session-logic.ts");});diff --git a/apps/web/src/components/chat/MessagesTimeline.tsx b/apps/web/src/components/chat/MessagesTimeline.tsxindex e190f4756..3ccd4808d 100644--- a/apps/web/src/components/chat/MessagesTimeline.tsx+++ b/apps/web/src/components/chat/MessagesTimeline.tsx@@ -35,7 +35,6 @@ import {deriveTimelineEntries,workEntryIndicatesToolFailure,workEntryIndicatesToolNeutralStatus,- workEntryIndicatesToolSuccess,workLogEntryIsToolLike,} from "../../session-logic";import { type TurnDiffSummary } from "../../types";@@ -57,7 +56,6 @@ import {MessageCircleIcon,MousePointerClickIcon,PaintbrushIcon,- MinusIcon,SquarePenIcon,TerminalIcon,Undo2Icon,@@ -920,17 +918,34 @@ type TimelineWorkEntry = Extract<MessagesTimelineRow, { kind: "work" }>["groupedtype TimelineRow = MessagesTimelineRow;const TimelineRowContent = memo(function TimelineRowContent({ row }: { row: TimelineRow }) {+ const isExpandedToolGroupEntry = row.kind === "work" && row.isExpandedToolGroupEntry;+ const isLastExpandedToolGroupEntry = row.kind === "work" && row.isLastExpandedToolGroupEntry;+ const isExpandedToolGroupHeader =+ (row.kind === "work-toggle" && row.onlyToolEntries && row.expanded) ||+ (row.kind === "work-live" && row.expanded);+return (<divclassName={cn(// Commentary (non-terminal assistant) rows carry no metadata row, so// they sit closer to the work that follows them.- (row.kind === "message" && row.message.role === "assistant" && !row.showAssistantMeta) ||- row.kind === "work" ||- row.kind === "work-toggle" ||- row.kind === "turn-plan"- ? "pb-2"- : "pb-4",+ isExpandedToolGroupEntry+ ? isLastExpandedToolGroupEntry+ ? "pb-1"+ : "pb-0"+ : isExpandedToolGroupHeader+ ? "pb-0"+ : row.kind === "turn-fold"+ ? "pb-1.5"+ : (row.kind === "message" &&+ row.message.role === "assistant" &&+ !row.showAssistantMeta) ||+ row.kind === "work" ||+ row.kind === "work-live" ||+ row.kind === "work-toggle" ||+ row.kind === "turn-plan"+ ? "pb-2"+ : "pb-4",row.kind === "message" && row.message.role === "assistant" ? "group/assistant" : null,)}data-timeline-row-id={row.id}@@ -938,7 +953,13 @@ const TimelineRowContent = memo(function TimelineRowContent({ row }: { row: Timedata-message-id={row.kind === "message" ? row.message.id : undefined}data-message-role={row.kind === "message" ? row.message.role : undefined}>- {row.kind === "work" ? <WorkGroupSection groupedEntries={row.groupedEntries} /> : null}+ {row.kind === "work" ? (+ <WorkGroupSection+ groupedEntries={row.groupedEntries}+ isExpandedToolGroupEntry={row.isExpandedToolGroupEntry}+ />+ ) : null}+ {row.kind === "work-live" ? <LiveWorkEntryTimelineRow row={row} /> : null}{row.kind === "work-toggle" ? <WorkGroupToggleTimelineRow row={row} /> : null}{row.kind === "turn-fold" ? <TurnFoldTimelineRow row={row} /> : null}{row.kind === "message" && row.message.role === "user" ? <UserTimelineRow row={row} /> : null}@@ -1083,7 +1104,6 @@ function RevertUserMessageButton({ messageId }: { messageId: MessageId }) {function TurnFoldTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "turn-fold" }> }) {const ctx = use(TimelineRowCtx);- const Icon = row.expanded ? ChevronDownIcon : ChevronRightIcon;return (<div className="border-b border-border/60 pb-2 pt-1">@@ -1092,10 +1112,12 @@ function TurnFoldTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "turn-aria-expanded={row.expanded}data-scroll-anchor-ignoreonClick={() => ctx.onToggleTurnFold(row.turnId)}- className="flex cursor-pointer select-none items-center gap-1 rounded-md px-1 text-xs text-muted-foreground tabular-nums transition-colors hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring/70"+ className="flex cursor-pointer select-none items-center gap-1 rounded-md px-1 text-sm leading-relaxed text-muted-foreground tabular-nums transition-colors hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring/70"><span>{row.label}</span>- <Icon className="size-3.5" />+ <ChevronRightIcon+ className={cn("size-3.5 transition-transform", row.expanded && "-rotate-90")}+ /></button></div>);@@ -1278,16 +1300,10 @@ const TurnPlanTimelineRow = memo(function TurnPlanTimelineRow({});function WorkingTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "working" }> }) {- const { workingStepLabel } = use(TimelineRowActivityCtx);return (- <div className="py-0.5 pl-1.5">- <div className="flex min-w-0 items-center gap-2 pt-1 text-secondary-label text-[11px] tabular-nums">- <span className="inline-flex items-center gap-[3px]">- <span className="h-1 w-1 rounded-full bg-muted-foreground/30 animate-status-pulse" />- <span className="h-1 w-1 rounded-full bg-muted-foreground/30 animate-status-pulse [animation-delay:200ms]" />- <span className="h-1 w-1 rounded-full bg-muted-foreground/30 animate-status-pulse [animation-delay:400ms]" />- </span>- <span className="shrink-0">+ <div>+ <div className="border-b border-border/60 pb-2 pt-1">+ <div className="px-1 text-sm leading-relaxed text-muted-foreground tabular-nums">{row.createdAt ? (<>Working for <WorkingTimer createdAt={row.createdAt} />@@ -1295,11 +1311,13 @@ function WorkingTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "workin) : ("Working...")}- </span>- {workingStepLabel ? (- <span className="min-w-0 truncate text-muted-foreground/55">· {workingStepLabel}</span>- ) : null}+ </div></div>+ {row.showThinking ? (+ <div className="mt-2">+ <ThinkingActivityRow />+ </div>+ ) : null}</div>);}@@ -1340,8 +1358,10 @@ function WorkingTimer({ createdAt }: { createdAt: string }) {/** Renders one or more already-derived work log rows. Overflow expansion is modeled as LegendList data. */const WorkGroupSection = memo(function WorkGroupSection({groupedEntries,+ isExpandedToolGroupEntry,}: {groupedEntries: Extract<MessagesTimelineRow, { kind: "work" }>["groupedEntries"];+ isExpandedToolGroupEntry: boolean;}) {const { workspaceRoot } = use(TimelineRowCtx);const nonEmptyEntries = useMemo(@@ -1358,7 +1378,10 @@ const WorkGroupSection = memo(function WorkGroupSection({if (nonEmptyEntries.length === 0) return null;return (- <section className="-mx-1 space-y-0.5 px-1 py-0.5" aria-label={groupLabel}>+ <section+ className={cn("-mx-1 px-1", isExpandedToolGroupEntry ? "py-0" : "space-y-0.5 py-0.5")}+ aria-label={groupLabel}+ >{!onlyToolEntries && (<p className="px-0.5 pb-0.5 font-medium text-secondary-label text-[11px]">{groupLabel}</p>)}@@ -1368,6 +1391,7 @@ const WorkGroupSection = memo(function WorkGroupSection({key={workEntry.id}workEntry={workEntry}workspaceRoot={workspaceRoot}+ isExpandedToolGroupEntry={isExpandedToolGroupEntry}/>))}</div>@@ -1375,12 +1399,128 @@ const WorkGroupSection = memo(function WorkGroupSection({);});+function LiveActivityRow({ label, iconName }: { label: string; iconName?: WorkEntryIconName }) {+ return (+ <div className="relative min-h-6 w-fit max-w-full min-w-0 overflow-hidden rounded-md text-sm leading-relaxed">+ <LiveActivityContent label={label} iconName={iconName} />+ <div aria-hidden className="live-activity-focus pointer-events-none absolute inset-0">+ <div className="live-activity-focus-counter">+ <div className="live-activity-focus-aligned">+ <LiveActivityContent label={label} iconName={iconName} highlighted />+ </div>+ </div>+ </div>+ </div>+ );+}++function ThinkingActivityRow() {+ return <LiveActivityRow label="Thinking" />;+}++function LiveActivityContent({+ label,+ iconName,+ highlighted = false,+}: {+ label: string;+ iconName: WorkEntryIconName | undefined;+ highlighted?: boolean;+}) {+ return (+ <div+ className={cn(+ "flex min-h-6 min-w-0 items-center gap-1.5 px-1 py-0.5",+ highlighted ? "text-foreground" : "text-secondary-label",+ )}+ >+ {iconName ? (+ <span+ className={cn(+ "flex size-6 shrink-0 items-center justify-center",+ highlighted ? "text-foreground" : "text-icon-muted",+ )}+ >+ <WorkEntryIconSvg name={iconName} className="block size-4 shrink-0 stroke-[1.8]" />+ </span>+ ) : null}+ <span className="min-w-0 flex-1 truncate">{label}</span>+ </div>+ );+}++function LiveWorkEntryTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "work-live" }> }) {+ const ctx = use(TimelineRowCtx);++ return (+ <button+ type="button"+ className="group/live-work flex min-h-6 w-full max-w-full cursor-pointer items-center rounded-md text-left focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring/70"+ aria-expanded={row.expanded}+ onClick={() => ctx.onToggleWorkGroup(row.groupId, row.id)}+ >+ <LiveActivityRow+ label={liveWorkEntryLabel(row.entry, ctx.workspaceRoot)}+ iconName={workEntryIconName(row.entry)}+ />+ </button>+ );+}++function toolGroupSummaryIconName(+ kind: Extract<TimelineRow, { kind: "work-toggle" }>["summaryKind"],+): WorkEntryIconName {+ switch (kind) {+ case "read":+ return "eye";+ case "edit":+ return "square-pen";+ case "command":+ return "terminal";+ case "search":+ return "globe";+ case "other":+ return "wrench";+ case "mixed":+ case null:+ return "hammer";+ }+}+function WorkGroupToggleTimelineRow({row,}: {row: Extract<TimelineRow, { kind: "work-toggle" }>;}) {const ctx = use(TimelineRowCtx);+ if (row.onlyToolEntries && row.summary) {+ return (+ <button+ type="button"+ className="group/tool-group flex min-h-6 w-full cursor-pointer items-center gap-1.5 rounded-md px-0.5 py-0.5 text-left text-sm leading-relaxed transition-colors duration-150 hover:bg-accent/20 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring/70"+ aria-expanded={row.expanded}+ onClick={() => ctx.onToggleWorkGroup(row.groupId, row.id)}+ >+ <span+ className={cn(+ "flex size-6 shrink-0 items-center justify-center",+ row.hasFailure ? "text-destructive" : "text-icon-muted",+ )}+ aria-label={row.hasFailure ? "Tool call failed" : undefined}+ >+ {row.hasFailure ? (+ <XIcon className="size-4 shrink-0 stroke-[1.8]" aria-hidden />+ ) : (+ <WorkEntryIconSvg+ name={toolGroupSummaryIconName(row.summaryKind)}+ className="size-4 shrink-0 stroke-[1.8] opacity-70"+ />+ )}+ </span>+ <span className="min-w-0 flex-1 truncate text-secondary-label">{row.summary}</span>+ </button>+ );+ }const labelNoun = row.onlyToolEntries? row.hiddenCount === 1? "tool call"@@ -2019,32 +2159,101 @@ function workEntryPreview(: `${displayPath} +${workEntry.changedFiles!.length - 1} more`;}-function workEntryRawCommand(- workEntry: Pick<TimelineWorkEntry, "command" | "rawCommand">,-): string | null {- const rawCommand = workEntry.rawCommand?.trim();- if (!rawCommand || !workEntry.command) {- return null;+type CommandWrapper = "env" | "sudo";++const COMMAND_WRAPPER_OPTIONS_WITH_VALUE: Record<CommandWrapper, ReadonlySet<string>> = {+ env: new Set(["-C", "--chdir", "-S", "--split-string", "-u", "--unset"]),+ sudo: new Set(["-C", "--close-from", "-D", "--chdir", "-g", "--group", "-u", "--user"]),+};++const COMMAND_WRAPPER_FLAGS: Record<CommandWrapper, ReadonlySet<string>> = {+ env: new Set(["-0", "--null", "-i", "--ignore-environment", "--debug"]),+ sudo: new Set(["-A", "--askpass", "-b", "--background", "-E", "-H", "-i", "-n", "-S"]),+};++function commandProgramName(command: string): string | null {+ const tokens = command.trim().split(/\s+/);+ let index = 0;+ let wrapper: CommandWrapper | null = null;++ while (index < tokens.length) {+ const token = tokens[index]?.replace(/^["']|["']$/g, "");+ if (!token) return null;+ if (/^[A-Za-z_][A-Za-z0-9_]*=/.test(token)) {+ index += 1;+ continue;+ }+ if (token === "env" || token === "sudo") {+ wrapper = token;+ index += 1;+ continue;+ }+ if (wrapper !== null && token === "--") {+ wrapper = null;+ index += 1;+ continue;+ }+ if (wrapper !== null && token.startsWith("-")) {+ if (COMMAND_WRAPPER_OPTIONS_WITH_VALUE[wrapper].has(token)) {+ if (tokens[index + 1] === undefined) return null;+ index += 2;+ continue;+ }+ if (COMMAND_WRAPPER_FLAGS[wrapper].has(token) || /^--[^=]+=/.test(token)) {+ index += 1;+ continue;+ }+ if (/^-[A-Za-z].+/.test(token) && !token.startsWith("--")) {+ let consumesNextToken = false;+ for (const [optionIndex, option] of token.slice(1).split("").entries()) {+ const shortOption = `-${option}`;+ if (COMMAND_WRAPPER_OPTIONS_WITH_VALUE[wrapper].has(shortOption)) {+ consumesNextToken = optionIndex === token.length - 2;+ break;+ }+ if (!COMMAND_WRAPPER_FLAGS[wrapper].has(shortOption)) return null;+ }+ if (consumesNextToken && tokens[index + 1] === undefined) return null;+ index += consumesNextToken ? 2 : 1;+ continue;+ }+ return null;+ }+ return token.split(/[\\/]/).at(-1) || null;}- return rawCommand === workEntry.command.trim() ? null : rawCommand;++ return null;+}++function liveWorkEntryLabel(+ workEntry: TimelineWorkEntry,+ workspaceRoot: string | undefined,+): string {+ const command = workEntry.command?.trim();+ if (command) {+ const program = commandProgramName(command);+ if (program) return `Running ${program}`;+ return "Running command";+ }++ return workEntryPreview(workEntry, workspaceRoot) ?? toolWorkEntryHeading(workEntry);}function buildToolCallExpandedBody(workEntry: TimelineWorkEntry,workspaceRoot: string | undefined,): string | null {+ const command = workEntry.rawCommand?.trim() || workEntry.command?.trim();const blocks: string[] = [];+ if (command) {+ blocks.push(command);+ }if (workEntry.itemType === "mcp_tool_call" && workEntry.toolData !== undefined) {blocks.push(`MCP call\n${JSON.stringify(workEntry.toolData, null, 2)}`);}- const raw = workEntryRawCommand(workEntry);- if (raw?.trim()) {- blocks.push(raw.trim());- } else if (workEntry.command?.trim()) {- blocks.push(workEntry.command.trim());- }- if (workEntry.detail?.trim()) {- blocks.push(workEntry.detail.trim());+ const detail = workEntry.detail?.trim();+ if (detail && detail !== command) {+ blocks.push(detail);}const changedFiles = workEntry.changedFiles ?? [];if (changedFiles.length > 0) {@@ -2180,71 +2389,88 @@ const AgentSpawnCtaRow = memo(function AgentSpawnCtaRow(props: { workEntry: Time: "working": failed > 0? `${failed} failed`- : "✓ completed";+ : "Completed";return (- <button- type="button"- onClick={onOpenAgents}- className="-mx-1 flex w-full items-center gap-2 rounded-md border border-border/60 bg-card/50 px-2.5 py-1.5 text-left text-[13px] transition hover:bg-accent/50"- >- <span aria-hidden className={cn("size-1.5 shrink-0 rounded-full", dotClass)} />- <WorkEntryIconSvg name="bot" className="size-3.5 shrink-0 text-muted-foreground" />- <span className="min-w-0 truncate">- <span className="font-medium">{lead}</span>- {workflowName ? <span className="text-muted-foreground"> · {workflowName}</span> : null}- </span>- <span className="ml-auto flex shrink-0 items-center gap-2 font-mono text-[.7rem] text-muted-foreground">- <span>{status}</span>- {totalTokens > 0 ? (- <span className="tabular-nums">Σ {formatSubagentTokenCount(totalTokens)}</span>- ) : null}- <span className="text-info-foreground">{live ? "Open Agents ▸" : "View ▸"}</span>- </span>- </button>+ <div className="-mx-1 rounded-2xl border border-border/70 bg-secondary p-2 dark:border-transparent dark:bg-input/32">+ <div className="flex items-center justify-between gap-2 rounded-xl px-1">+ <div className="flex min-w-0 flex-1 items-center gap-1.5 rounded-lg px-1 py-1.5 text-left text-xs leading-4">+ <span aria-hidden className={cn("size-1.5 shrink-0 rounded-full", dotClass)} />+ <WorkEntryIconSvg name="bot" className="size-3.5 shrink-0 text-muted-foreground" />+ <span className="min-w-0 truncate font-medium text-foreground">{lead}</span>+ {workflowName ? (+ <span className="hidden min-w-0 truncate text-[11px] text-muted-foreground md:inline">+ {workflowName}+ </span>+ ) : null}+ <span className="ml-auto hidden shrink-0 items-center gap-2 text-[11px] text-muted-foreground sm:flex">+ <span>{status}</span>+ {totalTokens > 0 ? (+ <span className="font-mono tabular-nums">+ Σ {formatSubagentTokenCount(totalTokens)}+ </span>+ ) : null}+ </span>+ </div>+ <Button+ type="button"+ size="xs"+ variant="outline"+ aria-label={live ? "Open agents" : "View agents"}+ onClick={onOpenAgents}+ >+ <EyeIcon className="size-3" />+ <span className="hidden sm:inline">{live ? "Open agents" : "View agents"}</span>+ </Button>+ </div>+ </div>);});const SimpleWorkEntryRow = memo(function SimpleWorkEntryRow(props: {workEntry: TimelineWorkEntry;workspaceRoot: string | undefined;+ isExpandedToolGroupEntry: boolean;}) {- const { workEntry, workspaceRoot } = props;+ const { workEntry, workspaceRoot, isExpandedToolGroupEntry } = props;// Before any hooks: spawn CTA rows render their own component.if (workEntry.agentSpawn) {return <AgentSpawnCtaRow workEntry={workEntry} />;}- return <PlainWorkEntryRow workEntry={workEntry} workspaceRoot={workspaceRoot} />;+ return (+ <PlainWorkEntryRow+ workEntry={workEntry}+ workspaceRoot={workspaceRoot}+ isExpandedToolGroupEntry={isExpandedToolGroupEntry}+ />+ );});const PlainWorkEntryRow = memo(function PlainWorkEntryRow(props: {workEntry: TimelineWorkEntry;workspaceRoot: string | undefined;+ isExpandedToolGroupEntry: boolean;}) {- const { workEntry, workspaceRoot } = props;- const activity = use(TimelineRowActivityCtx);+ const { workEntry, workspaceRoot, isExpandedToolGroupEntry } = props;const [expanded, setExpanded] = useState(false);const iconConfig = workToneIcon(workEntry.tone);const showWarningIndicator = workEntry.sourceActivityKind === "runtime.warning";- const entryIconName = showWarningIndicator ? "x" : workEntryIconName(workEntry);- const heading = toolWorkEntryHeading(workEntry);- const rawPreview = workEntryPreview(workEntry, workspaceRoot);- const preview =- rawPreview &&- normalizeCompactToolLabel(rawPreview).toLowerCase() ===- normalizeCompactToolLabel(heading).toLowerCase()- ? null- : rawPreview;- const displayText = preview ? `${heading} - ${preview}` : heading;+ const showFailedIndicator = workEntryIndicatesToolFailure(workEntry);+ const entryIconName =+ showWarningIndicator || showFailedIndicator ? "x" : workEntryIconName(workEntry);+ const isCommandEntry =+ workEntry.requestKind === "command" ||+ workEntry.itemType === "command_execution" ||+ Boolean(workEntry.command);+ const displayText = workEntryPreview(workEntry, workspaceRoot) ?? toolWorkEntryHeading(workEntry);const expandedBody = buildToolCallExpandedBody(workEntry, workspaceRoot);const canExpand = expandedBody !== null;- const showFailedIndicator = workEntryIndicatesToolFailure(workEntry);const showDestructiveRowStyle =showFailedIndicator &&(workEntry.sourceActivityKind === "runtime.error" || !workLogEntryIsToolLike(workEntry));const iconWrapperClass = cn(- "flex size-5 shrink-0 items-center justify-center",- showWarningIndicator+ "flex size-6 shrink-0 items-center justify-center",+ showWarningIndicator || showFailedIndicator? "text-destructive": showDestructiveRowStyle? "text-destructive"@@ -2256,17 +2482,16 @@ const PlainWorkEntryRow = memo(function PlainWorkEntryRow(props: {? "font-medium text-warning": showDestructiveRowStyle? "font-medium text-destructive"- : "font-medium text-foreground";- const turnSettled = !activity.activeTurnInProgress;- const showNeutralIndicator = !turnSettled && workEntryIndicatesToolNeutralStatus(workEntry);- const showSuccessIndicator =- workEntryIndicatesToolSuccess(workEntry) ||- (turnSettled && workEntryIndicatesToolNeutralStatus(workEntry));+ : workLogEntryIsToolLike(workEntry)+ ? "text-secondary-label"+ : "text-foreground/80";+ const showEntryIcon = !isExpandedToolGroupEntry || showWarningIndicator || showFailedIndicator;const rowToggleProps = canExpand? {role: "button" as const,tabIndex: 0 as const,"aria-label": displayText,+ "aria-expanded": expanded,onClick: () => setExpanded((v) => !v),onKeyDown: (e: KeyboardEvent<HTMLDivElement>) => {if (e.key === "Enter" || e.key === " ") {@@ -2280,94 +2505,50 @@ const PlainWorkEntryRow = memo(function PlainWorkEntryRow(props: {return (<divclassName={cn(- "flex flex-col rounded-md px-0.5 py-0.5 transition-colors",+ "flex flex-col rounded-md px-0.5 transition-colors",+ isExpandedToolGroupEntry ? "py-0" : "py-0.5",canExpand &&- "cursor-pointer hover:bg-accent/20 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring/70",+ "cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring/70",)}{...rowToggleProps}><div className="flex select-none items-center gap-1.5 transition-[opacity,translate] duration-200">- <span className={iconWrapperClass}>- <WorkEntryIconSvg- name={entryIconName}- className="block size-3.5 shrink-0 stroke-[1.8] opacity-80"- />- </span>+ {showEntryIcon ? (+ <span+ className={iconWrapperClass}+ aria-label={showFailedIndicator ? "Tool call failed" : undefined}+ >+ <WorkEntryIconSvg+ name={entryIconName}+ className="block size-4 shrink-0 stroke-[1.8] opacity-70"+ />+ </span>+ ) : null}<div className="flex min-w-0 flex-1 items-center gap-1.5"><div className="min-w-0 flex-1 overflow-hidden">- <p className="flex min-w-0 w-full items-baseline gap-1.5 text-[12px] leading-5">- <span className={cn("min-w-0 shrink truncate", headingClass)}>{heading}</span>- {preview && (- <span className="min-w-0 flex-1 truncate text-secondary-label">{preview}</span>+ <p+ className={cn(+ "flex min-w-0 w-full items-baseline gap-1.5 leading-relaxed",+ isExpandedToolGroupEntry ? "text-[12px] leading-5" : "text-sm",)}- </p>- </div>- <div className="flex shrink-0 items-center gap-px text-icon-muted">- <span- className="flex size-4 shrink-0 items-center justify-center"- aria-hidden={!canExpand}>- {canExpand ? (- <ChevronDownIcon- className={cn(- "size-3 shrink-0 opacity-70 transition-transform duration-200",- expanded && "rotate-180",- )}- aria-hidden- />- ) : null}- </span>- <span className="flex size-4 shrink-0 items-center justify-center">- {showFailedIndicator ? (- <Tooltip>- <TooltipTrigger- render={- <span- className="flex size-4 items-center justify-center"- aria-label="Tool call failed"- />- }- >- <XIcon className="block size-3 shrink-0 text-destructive" aria-hidden />- </TooltipTrigger>- <TooltipPopup>Failed</TooltipPopup>- </Tooltip>- ) : showSuccessIndicator ? (- <Tooltip>- <TooltipTrigger- render={<span className="flex size-4 items-center justify-center" />}- >- <span className="inline-flex size-4 items-center justify-center">- <CheckIcon- className="block size-3 shrink-0 stroke-current"- stroke="currentColor"- aria-hidden- />- </span>- </TooltipTrigger>- <TooltipPopup>Completed</TooltipPopup>- </Tooltip>- ) : showNeutralIndicator ? (- <Tooltip>- <TooltipTrigger- render={<span className="flex size-4 items-center justify-center" />}- >- <MinusIcon className="block size-3 shrink-0 opacity-70" aria-hidden />- </TooltipTrigger>- <TooltipPopup>Empty</TooltipPopup>- </Tooltip>- ) : null}- </span>+ <span className={cn("min-w-0 flex-1 truncate", headingClass)}>{displayText}</span>+ </p></div></div></div>{expanded && canExpand && expandedBody ? (<div- className="mt-1 ms-7 cursor-default border-s border-border/45 ps-3 pt-0.5"+ className="mt-1 ms-[1.875rem] cursor-default pt-0.5"onClick={stopRowToggle}onPointerDown={stopRowToggle}>- <pre className="max-h-64 cursor-text overflow-auto whitespace-pre-wrap break-words font-mono text-secondary-label text-[11px] leading-relaxed select-text">+ <pre+ className={cn(+ "max-h-64 cursor-text overflow-auto whitespace-pre-wrap break-words font-mono text-secondary-label text-[11px] leading-relaxed",+ isCommandEntry ? "select-all" : "select-text",+ )}+ >{expandedBody}</pre></div>diff --git a/apps/web/src/components/chat/PanelLayoutControls.tsx b/apps/web/src/components/chat/PanelLayoutControls.tsxindex 6f281558f..c2fa204ff 100644--- a/apps/web/src/components/chat/PanelLayoutControls.tsx+++ b/apps/web/src/components/chat/PanelLayoutControls.tsx@@ -1,6 +1,7 @@import { Maximize2Icon, Minimize2Icon, PanelBottomIcon, PanelRightIcon } from "lucide-react";import { memo } from "react";+import { cn } from "../../lib/utils";import { Toggle } from "../ui/toggle";import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";@@ -12,6 +13,7 @@ interface PanelLayoutControlsProps {rightPanelAvailable: boolean;rightPanelOpen: boolean;rightPanelShortcutLabel: string | null;+ rightPanelUnavailableLabel?: string;/** Running + waiting subagents in this thread; badges the right panel toggle. */liveAgentCount: number;onToggleTerminal: () => void;@@ -26,6 +28,7 @@ export const PanelLayoutControls = memo(function PanelLayoutControls({rightPanelAvailable,rightPanelOpen,rightPanelShortcutLabel,+ rightPanelUnavailableLabel = "Right panel is unavailable",liveAgentCount,onToggleTerminal,onToggleRightPanel,@@ -40,7 +43,7 @@ export const PanelLayoutControls = memo(function PanelLayoutControls({<TooltipTriggerrender={<Toggle- className="shrink-0 [-webkit-app-region:no-drag]"+ className="shrink-0 text-foreground [--control-icon-color:currentColor] [-webkit-app-region:no-drag]"pressed={terminalOpen}onPressedChange={onToggleTerminal}aria-label="Toggle terminal drawer"@@ -63,7 +66,7 @@ export const PanelLayoutControls = memo(function PanelLayoutControls({<TooltipTriggerrender={<Toggle- className="shrink-0 [-webkit-app-region:no-drag]"+ className="shrink-0 text-foreground [--control-icon-color:currentColor] [-webkit-app-region:no-drag] disabled:opacity-100"pressed={rightPanelOpen}onPressedChange={onToggleRightPanel}aria-label={@@ -75,7 +78,12 @@ export const PanelLayoutControls = memo(function PanelLayoutControls({size="sm"disabled={!rightPanelAvailable}>- <PanelRightIcon className="size-4" />+ <PanelRightIcon+ className={cn(+ "size-4",+ !rightPanelAvailable && "text-muted-foreground opacity-100",+ )}+ />{liveAgentCount > 0 ? (<spanaria-hidden@@ -94,7 +102,7 @@ export const PanelLayoutControls = memo(function PanelLayoutControls({? ` · ${liveAgentCount} ${liveAgentCount === 1 ? "agent" : "agents"} working`: ""}`- : "Right panel is unavailable"}+ : rightPanelUnavailableLabel}</TooltipPopup></Tooltip></div>@@ -114,7 +122,7 @@ export const RightPanelMaximizeControl = memo(function RightPanelMaximizeControl<TooltipTriggerrender={<Toggle- className="shrink-0 [-webkit-app-region:no-drag]"+ className="shrink-0 text-foreground [--control-icon-color:currentColor] [-webkit-app-region:no-drag]"pressed={maximized}onPressedChange={onToggle}aria-label={label}diff --git a/apps/web/src/components/composerInlineChip.ts b/apps/web/src/components/composerInlineChip.tsindex 3f0e8ca1a..770fc4e32 100644--- a/apps/web/src/components/composerInlineChip.ts+++ b/apps/web/src/components/composerInlineChip.ts@@ -2,7 +2,7 @@// composer honors the prompt font-size preference). The chat variant pins the// original 12px, where every em value resolves to the same pixels as before.const INLINE_CHIP_CLASS_NAME =- "inline-flex max-w-full items-center gap-[0.33em] rounded-[0.5em] border border-border/70 bg-accent/40 px-[0.5em] py-[0.08em] font-medium leading-[1.1] text-foreground align-middle";+ "inline-flex h-[1.41em] max-w-full items-center gap-[0.33em] rounded-[0.5em] border border-border/70 bg-accent/40 px-[0.5em] font-medium leading-none text-foreground align-middle";export const CHAT_INLINE_CHIP_CLASS_NAME = `${INLINE_CHIP_CLASS_NAME} text-[12px]`;@@ -11,18 +11,18 @@ export const COMPOSER_INLINE_CHIP_CLASS_NAME = `${INLINE_CHIP_CLASS_NAME} text-[export const COMPOSER_INLINE_CHIP_DECORATOR_CLASS_NAME ="relative inline-flex align-[-0.125em] leading-none data-[composer-chip-selected]:after:pointer-events-none data-[composer-chip-selected]:after:absolute data-[composer-chip-selected]:after:inset-0 data-[composer-chip-selected]:after:rounded-[6px] data-[composer-chip-selected]:after:bg-[Highlight] data-[composer-chip-selected]:after:opacity-30 data-[composer-chip-selected]:after:content-['']";-export const COMPOSER_INLINE_CHIP_ICON_CLASS_NAME = "size-[1.17em] shrink-0 opacity-85";+export const COMPOSER_INLINE_CHIP_ICON_CLASS_NAME =+ "block size-[1.17em] shrink-0 self-center opacity-85 [&>svg]:block";export const CHAT_INLINE_CHIP_LABEL_CLASS_NAME = "truncate leading-tight";-export const COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME = `${CHAT_INLINE_CHIP_LABEL_CLASS_NAME} select-none`;+export const COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME =+ "block self-center truncate leading-none select-none";-// The skill label is smaller than the surrounding prompt text; offset its-// glyphs without moving the pill box or changing the editor's line height.-export const COMPOSER_INLINE_SKILL_CHIP_LABEL_CLASS_NAME = `${COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME} relative top-[0.15em]`;+export const COMPOSER_INLINE_SKILL_CHIP_LABEL_CLASS_NAME = COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME;export const COMPOSER_INLINE_SKILL_CHIP_CLASS_NAME =- "inline-flex max-w-full select-none items-center gap-[0.33em] rounded-[0.5em] border border-fuchsia-500/25 bg-fuchsia-500/12 px-[0.5em] py-[0.08em] font-medium text-[0.86em] leading-[1.1] text-fuchsia-700 align-middle dark:text-fuchsia-300";+ "inline-flex h-[1.41em] max-w-full select-none items-center gap-[0.33em] rounded-[0.5em] border border-fuchsia-500/25 bg-fuchsia-500/12 px-[0.5em] font-medium text-[0.86em] leading-none text-fuchsia-700 align-middle dark:text-fuchsia-300";export const SKILL_CHIP_ICON_SVG = `<svg width="100%" height="100%" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.85" stroke-linecap="round" stroke-linejoin="round"><path d="M21 8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16Z"/><path d="m3.3 7 8.7 5 8.7-5"/><path d="M12 22V12"/></svg>`;diff --git a/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx b/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsxindex 2f4e84dc3..7457d04d2 100644--- a/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx+++ b/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx@@ -25,6 +25,7 @@ import {GitPullRequestDraftIcon,GitPullRequestIcon,HammerIcon,+ LayersIcon,MessageCircleQuestionIcon,MessageSquareIcon,LinkIcon,@@ -50,6 +51,7 @@ import {import { type DraftId, useComposerDraftStore } from "~/composerDraftStore";import { useNewThreadHandler } from "~/hooks/useHandleNewThread";import { useCopyToClipboard, writeTextToClipboard } from "~/hooks/useCopyToClipboard";+import { changeRequestRepositoryUrl } from "~/lib/openPullRequestLink";import { usePreparePullRequestThreadAction } from "~/lib/sourceControlActions";import { cn } from "~/lib/utils";import { readLocalApi } from "~/localApi";@@ -60,6 +62,7 @@ import { useEnvironmentQuery } from "~/state/query";import { useLiveRefresh } from "~/hooks/useLiveRefresh";import { pullRequestEnvironment } from "~/state/pullRequests";import { useAtomCommand } from "~/state/use-atom-command";+import { vcsEnvironment } from "~/state/vcs";import { formatRelativeTimeLabel } from "~/timestampFormat";import {@@ -74,6 +77,7 @@ import {import { Badge } from "../ui/badge";import { Button } from "../ui/button";import { Input } from "../ui/input";+import { SegmentedTab, SegmentedTabList } from "../ui/segmented-tabs";import {Menu,MenuItem,@@ -116,6 +120,7 @@ import {} from "./pullRequestProjectAssignment.logic";import { PullRequestChecksPopover } from "./PullRequestChecksPopover";import {+ PullRequestActorAvatar,PullRequestActorLabel,PullRequestDiffStat,PullRequestMetaLine,@@ -349,7 +354,6 @@ export function PullRequestDetailPanel({onClose,onStateChange,context = "page",- chromeVariant = "full",composerDraftTarget,}: {environmentId: EnvironmentId;@@ -381,12 +385,6 @@ export function PullRequestDetailPanel({* again is at best a no-op and at worst git refusing a branch two checkouts.*/context?: "page" | "thread";- /**- * How the metadata above the content behaves: `full` keeps every row pinned; `collapse`- * folds the whole of it into the top row once the active tab scrolls, and unfolds at the- * top — the chrome spends its height on what is being read.- */- chromeVariant?: "full" | "collapse";/*** The open thread's composer. Beside the thread whose own pull request this is, hand-offs* land here instead of opening a new thread — the branch is already under the reader's feet.@@ -423,26 +421,13 @@ export function PullRequestDetailPanel({);}, [tab]);const [chromeCondensed, setChromeCondensed] = useState(false);- // Each tab remembers whether its chrome was condensed. Only the active tab can emit scroll- // events, so the capture handler always writes the active tab's entry — and a tab switch- // reads the destination's memory instead of inheriting the tab being left. A tab too short- // to scroll remembers "expanded", which is what keeps it from being stranded under a chrome- // it has no scrollbar to reopen.const chromeStateByTab = useRef<Partial<Record<DetailTab, boolean>>>({});useEffect(() => {setChromeCondensed(chromeStateByTab.current[tab] ?? false);}, [tab]);- const condensed = chromeVariant === "collapse" && chromeCondensed;- // Collapsing removes the fold's height from the chrome, which would otherwise hand that- // height to the scrollport and leap the content up by it mid-scroll. The cure is exact- // compensation: collapse only once the reader has scrolled at least the fold's height,- // then give that height back to `scrollTop` before the next paint — the content under- // their eyes does not move, and the collapse itself is the only thing that changes.+ const condensed = chromeCondensed;const scrollerRef = useRef<HTMLElement | null>(null);const foldRef = useRef<HTMLDivElement | null>(null);- // The condensed chrome's second row opens as the fold closes, so the height the scrollport- // gains is the fold's minus this row's. Measured the same way the fold is: `scrollHeight`- // through a zero track reads its natural height in either state.const condensedRowRef = useRef<HTMLDivElement | null>(null);const compensationRef = useRef<number | null>(null);useLayoutEffect(() => {@@ -463,7 +448,6 @@ export function PullRequestDetailPanel({target: "branch name",timeout: 1600,});-// The chunk is fetched as soon as the panel exists rather than waiting for the Code tab to be// clicked, so a reader who does click it lands on a chunk already in the module cache.useEffect(() => {@@ -502,6 +486,30 @@ export function PullRequestDetailPanel({},[activity, coreDetail],);+ const repositoryUrl = detail === null ? null : changeRequestRepositoryUrl(detail.url);+ const baseBranchRefQuery = useEnvironmentQuery(+ detail === null+ ? null+ : vcsEnvironment.listRefs({+ environmentId,+ input: {+ cwd: detail.workspaceRoot,+ query: detail.baseBranch,+ includeMatchingRemoteRefs: true,+ limit: 20,+ },+ }),+ );+ const matchingBaseBranchRefs =+ detail === null+ ? []+ : (baseBranchRefQuery.data?.refs.filter(+ (refName) =>+ refName.name === detail.baseBranch || refName.name.endsWith(`/${detail.baseBranch}`),+ ) ?? []);+ const isStackedPullRequest =+ matchingBaseBranchRefs.length > 0 &&+ !matchingBaseBranchRefs.some((refName) => refName.isDefault);const activityPending = activityQuery.isPending && activity === null;const activityError = activity === null ? activityQuery.error : null;const refreshDetail = useCallback(() => {@@ -1019,54 +1027,62 @@ export function PullRequestDetailPanel({const can = (action: PullRequestAction) =>detail?.capabilities.actions.includes(action) === true &&detail.viewerPermissions.actions.includes(action);- // One live action holds the slot. A conflicting change cannot be merged now, so the slot goes- // to the thing that would help instead of a Merge button that only ever says no.+ // One live action holds the slot. Conflicts take priority because every other completion action+ // depends on resolving them first, even for a reader who cannot merge on the host themselves.const primaryAction =detail === null || detail.state !== "open"? null- : detail.isDraft && can("ready")- ? "ready"- : !can("merge")- ? null- : conflicting- ? "resolve"+ : conflicting+ ? "resolve"+ : detail.isDraft && can("ready")+ ? "ready"+ : !can("merge")+ ? null: allowedMergeMethods.length > 0? "merge": null;// The pull request number carries this state in the overview and the right-panel tab mirrors- // it. Conflicts keep their own row below: an open pull request remains green there.+ // it. The conflict action is separate from this state: an open pull request remains green.const statePresentation = detail? resolvePullRequestState({ state: detail.state, isDraft: detail.isDraft }): null;const checksSummary = detail ? summarizePullRequestChecks(detail.checks) : null;const checksState = detail ? pullRequestChecksState(detail.checks) : null;+ if (detailQuery.isPending && !detail) {+ return <PullRequestDetailGhost />;+ }+return (<div className="flex h-full min-h-0 w-full flex-col bg-background">- {/* The top row's geometry never changes: both of its states occupy the same stacked- cell and crossfade, so the actions on the right have one home whatever the chrome- is doing below. The fold and this fade share one 200ms clock. */}<div className="grid shrink-0 grid-cols-[minmax(0,1fr)_auto] items-start gap-x-2 border-b border-border/60">- {/* The fixed height lives on the two top-row cells — not the grid, whose later rows- are the fold — so the actions have one immovable home in both states. */}- <div className="ml-4 grid h-11 min-w-0 items-center">+ <div className="ml-4 grid h-7 min-w-0 items-center"><divaria-hidden={condensed}inert={condensed}className={cn(- "col-start-1 row-start-1 flex min-w-0 items-center gap-1 text-sm text-muted-foreground transition-opacity sm:text-xs motion-reduce:transition-none",- // Sequenced, not simultaneous: the leaving layer clears quickly before the- // arriving one lands, so no frame shows both texts superimposed at half opacity.+ "col-start-1 row-start-1 flex min-w-0 items-center gap-1 text-sm text-muted-foreground transition-[opacity,transform] ease-out motion-reduce:transform-none motion-reduce:transition-none",condensed- ? "pointer-events-none opacity-0 duration-100"- : "opacity-100 delay-75 duration-150",+ ? "pointer-events-none -translate-y-1 opacity-0 duration-100"+ : "translate-y-0 opacity-100 delay-50 duration-150",)}>{detail && statePresentation ? (<>- <span className="min-w-0 truncate" title={detail.repository}>- {detail.repository}- </span>+ {repositoryUrl ? (+ <button+ type="button"+ onClick={() => void readLocalApi()?.shell.openExternal(repositoryUrl)}+ className="min-w-0 truncate text-left font-medium text-muted-foreground underline-offset-2 hover:text-foreground hover:underline"+ title={`Open ${detail.repository} repository`}+ >+ {detail.repository}+ </button>+ ) : (+ <span className="min-w-0 truncate font-medium text-muted-foreground">+ {detail.repository}+ </span>+ )}<buttontype="button"onClick={() => void readLocalApi()?.shell.openExternal(detail.url)}@@ -1087,10 +1103,10 @@ export function PullRequestDetailPanel({aria-hidden={!condensed}inert={!condensed}className={cn(- "col-start-1 row-start-1 flex min-w-0 items-center gap-1.5 text-sm transition-opacity sm:text-xs motion-reduce:transition-none",+ "col-start-1 row-start-1 flex min-w-0 items-center gap-1 text-sm text-muted-foreground transition-[opacity,transform] ease-out motion-reduce:transform-none motion-reduce:transition-none",condensed- ? "opacity-100 delay-75 duration-150"- : "pointer-events-none opacity-0 duration-100",+ ? "translate-y-0 opacity-100 delay-50 duration-150"+ : "pointer-events-none translate-y-1 opacity-0 duration-100",)}>{detail && statePresentation ? (@@ -1109,30 +1125,14 @@ export function PullRequestDetailPanel({>#{detail.number}</button>- <span className="min-w-0 truncate font-medium text-foreground" title={detail.title}>+ <h1 className="min-w-0 truncate font-medium text-foreground" title={detail.title}>{detail.title}- </span>- {conflicting ? (- <Badge- variant="error"- className="h-5 shrink-0 gap-1 rounded px-1.5 text-[10px] text-destructive"- >- <TriangleAlertIcon className="size-3" />- Conflicts- </Badge>- ) : checksSummary ? (- <span className="flex shrink-0 items-center gap-1 text-[10px] text-muted-foreground">- {detail && checksState !== null ? (- <PullRequestChecksPopover checks={detail.checks} checksState={checksState} />- ) : null}- {checksSummary}- </span>- ) : null}+ </h1></>) : null}</div></div>- <div className="mr-4 flex h-11 min-w-0 flex-nowrap items-center justify-end gap-1">+ <div className="mr-4 flex h-7 min-w-0 flex-nowrap items-center justify-end gap-1">{detail ? (<><Menu>@@ -1140,7 +1140,7 @@ export function PullRequestDetailPanel({render={<Buttonaria-label="More pull request actions"- className="size-6"+ className="order-last size-6"size="icon-xs"variant="ghost-muted"/>@@ -1312,16 +1312,15 @@ export function PullRequestDetailPanel({<MenuTriggerdisabled={handoff !== null}render={- <Button size="xs" variant="outline">- {handoff?.startsWith("checkout") ? (- "Checking out..."- ) : (- <>- <GitBranchIcon className="size-3" />- Check out- <ChevronDownIcon className="size-3 text-muted-foreground" />- </>- )}+ <Button size="xs" variant="outline" className="gap-0 p-0">+ <span className="inline-flex h-full items-center gap-1.5 ps-[8.5px] pe-2">+ <GitBranchIcon aria-hidden className="size-3.5" />+ {handoff?.startsWith("checkout") ? "Checking out..." : "Check out"}+ </span>+ <span aria-hidden className="h-4 w-px shrink-0 bg-input" />+ <span className="inline-flex h-full w-6 shrink-0 items-center justify-center">+ <ChevronDownIcon aria-hidden className="size-4 text-muted-foreground" />+ </span></Button>}/>@@ -1367,7 +1366,22 @@ export function PullRequestDetailPanel({Auto-merge</Badge>) : null}- {primaryAction === "ready" ? (+ {primaryAction === "resolve" ? (+ <Badge+ variant="error"+ className="h-5 shrink-0 gap-1 rounded px-1.5 text-[10px] text-destructive hover:bg-destructive/14"+ render={+ <button+ type="button"+ disabled={handoff !== null}+ onClick={startResolveConflicts}+ />+ }+ >+ <TriangleAlertIcon className="size-3" />+ {handoff === "conflicts" ? "Preparing..." : "Resolve conflicts"}+ </Badge>+ ) : primaryAction === "ready" ? (<Button size="xs" disabled={actionPending} onClick={() => void perform("ready")}>Ready for review</Button>@@ -1394,113 +1408,86 @@ export function PullRequestDetailPanel({) : null}</div>- {/* The condensed chrome's second row: the tabs that the closing fold takes with it,- and compact copies of the branch pair and diff stat so they stay in sight while- the full rows are folded away. Same zero-track mechanism as the fold, inverted. */}- <div- className={cn(- "col-span-2 grid",- // Inverse of the fold's track: closing eases while the fold above eases open,- // so the chrome trades rows in one motion instead of two jumps.- condensed- ? "grid-rows-[1fr]"- : "grid-rows-[0fr] transition-[grid-template-rows] duration-200 ease-out motion-reduce:transition-none",- )}- >+ <div className={cn("col-span-2 grid", condensed ? "grid-rows-[1fr]" : "grid-rows-[0fr]")}><divref={condensedRowRef}className={cn(- "min-h-0 overflow-hidden",+ "min-h-0 overflow-hidden transition-[opacity,transform] duration-150 ease-out motion-reduce:transform-none motion-reduce:transition-none",condensed- ? "opacity-100 transition-opacity duration-200 ease-out motion-reduce:transition-none"- : "opacity-0",+ ? "translate-y-0 opacity-100 delay-50"+ : "translate-y-1 opacity-0 duration-100",)}inert={!condensed}>{detail ? (- <div className="flex min-w-0 items-center gap-1 px-4 pb-2">- <nav aria-label="Pull request tabs" className="flex shrink-0 items-center gap-0.5">- {visibleTabs.map((item) => (- <button- key={item.value}- type="button"- tabIndex={condensed ? 0 : -1}- aria-pressed={tab === item.value}- onClick={() => setTab(item.value)}- className={cn(- "rounded-md px-2 py-1 text-[11px] transition-colors",- tab === item.value- ? "bg-accent text-foreground"- : "text-muted-foreground hover:text-foreground",- )}+ <div className="col-span-2 min-w-0 px-4 pb-2 pt-1">+ <div className="flex min-w-0 items-center gap-2 text-xs text-muted-foreground">+ <span className="flex min-w-0 shrink items-center gap-1.5 overflow-hidden text-xs text-muted-foreground">+ <PullRequestActorAvatar actor={detail.author} className="shrink-0" />+ <span className="sr-only">{detail.author?.login ?? "ghost"}</span>+ <span className="shrink-0">{formatRelativeTimeLabel(detail.updatedAt)}</span>+ </span>+ <span aria-hidden className="h-3 w-px shrink-0 bg-border/70" />+ <span+ className="flex min-w-0 flex-1 items-center gap-1.5 font-mono text-[11px] text-muted-foreground/65"+ title={`${detail.baseBranch} ← ${detail.headBranch}`}+ >+ <span className="inline-flex min-w-0 max-w-[40%] shrink-0 items-center gap-1">+ {isStackedPullRequest ? (+ <LayersIcon aria-label="Stacked pull request" className="size-3 shrink-0" />+ ) : null}+ <code className="min-w-0 truncate">{detail.baseBranch}</code>+ </span>+ {freshness ? (+ <PullRequestBaseFreshnessWarning+ baseBranch={detail.baseBranch}+ freshness={freshness}+ pending={actionPending}+ onUpdate={(method) => void perform("update-branch", undefined, method)}+ iconClassName="size-3"+ />+ ) : null}+ <ArrowLeftIcon+ aria-label="receives changes from"+ className="size-3 shrink-0 opacity-60"+ />+ <code className="min-w-0 flex-1 truncate">{detail.headBranch}</code>+ </span>+ <span className="ml-auto inline-flex shrink-0 items-center justify-end gap-2 text-[11px]">+ <span+ className="inline-flex items-center gap-1 tabular-nums"+ aria-label={`${detail.changedFiles.toLocaleString()} changed ${+ detail.changedFiles === 1 ? "file" : "files"+ }`}>- {item.label}- </button>- ))}- </nav>- <span- className="ml-auto inline-flex min-w-0 shrink items-center gap-1 font-mono text-[11px] text-muted-foreground"- title={`${detail.baseBranch} ← ${detail.headBranch}`}- >- <span className="truncate">{detail.baseBranch}</span>- {freshness ? (- <PullRequestBaseFreshnessWarning- baseBranch={detail.baseBranch}- freshness={freshness}- pending={actionPending}- onUpdate={(method) => void perform("update-branch", undefined, method)}- iconClassName="size-3"+ <FileDiffIcon aria-hidden className="size-3" />+ {detail.changedFiles.toLocaleString()}+ </span>+ <PullRequestDiffStat+ additions={detail.additions}+ deletions={detail.deletions}+ className="shrink-0 font-mono text-[11px]"/>- ) : null}- <ArrowLeftIcon aria-label="receives changes from" className="size-3 shrink-0" />- <span className="truncate">{detail.headBranch}</span>- </span>- <span className="ml-2 inline-flex shrink-0 items-center gap-2 text-[11px] text-muted-foreground">- <span className="inline-flex items-center gap-1 tabular-nums">- <FileDiffIcon className="size-3" />- {detail.changedFiles.toLocaleString()}</span>- <PullRequestDiffStat- additions={detail.additions}- deletions={detail.deletions}- className="shrink-0 font-mono text-[11px]"- />- </span>+ </div></div>) : null}</div></div>- {/* Folding is a grid track going to zero: the rows below stay mounted, the track- animates closed over them, and `inert` takes the hidden controls out of the tab- order for as long as the chrome is condensed. */}- <div- className={cn(- "col-span-2 grid",- // Collapse is instant: it happens mid-scroll, and the compensation that keeps the- // content pinned would fight an animated track frame by frame. Reopening happens- // at the top with no compensation, so the fold can ease back in instead of- // snapping the content down.- condensed- ? "grid-rows-[0fr]"- : "grid-rows-[1fr] transition-[grid-template-rows] duration-200 ease-out motion-reduce:transition-none",- )}- >+ <div className={cn("col-span-2 grid", condensed ? "grid-rows-[0fr]" : "grid-rows-[1fr]")}><divref={foldRef}- // One-way on purpose: appearing content eases in over ground the instant track- // already reserved; departing content cuts, because its ground is gone in the- // same frame and the scroll compensation reads it as scrolled past.className={cn(- "min-h-0 overflow-hidden",+ "min-h-0 overflow-hidden transition-[opacity,transform] duration-150 ease-out motion-reduce:transform-none motion-reduce:transition-none",condensed- ? "opacity-0"- : "opacity-100 transition-opacity duration-200 ease-out motion-reduce:transition-none",+ ? "-translate-y-1 opacity-0 duration-100"+ : "translate-y-0 opacity-100 delay-50",)}inert={condensed}>{detail ? (- <div className="col-span-2 mt-3 min-w-0 px-4 pb-4">+ <div className="col-span-2 mt-1 min-w-0 px-4 pb-4">{titleDraft === null ? (<div className="group flex min-w-0 items-start gap-1"><h1 className="min-w-0 flex-1 text-base font-semibold leading-snug">@@ -1567,47 +1554,56 @@ export function PullRequestDetailPanel({</PullRequestMetaLine><div className="mt-4 flex min-w-0 items-center gap-2 text-xs text-muted-foreground">- <code- className="min-w-0 max-w-48 shrink truncate rounded-md bg-muted px-2 py-1 font-mono text-xs text-foreground"- title={detail.baseBranch}+ <span+ className="flex min-w-0 flex-1 items-center gap-1.5 font-mono text-xs text-muted-foreground/70"+ title={`${detail.baseBranch} ← ${detail.headBranch}`}>- {detail.baseBranch}- </code>- {freshness ? (- <PullRequestBaseFreshnessWarning- baseBranch={detail.baseBranch}- freshness={freshness}- pending={actionPending}- onUpdate={(method) => void perform("update-branch", undefined, method)}+ <span className="inline-flex min-w-0 max-w-[40%] shrink-0 items-center gap-1">+ {isStackedPullRequest ? (+ <LayersIcon aria-label="Stacked pull request" className="size-3 shrink-0" />+ ) : null}+ <code className="min-w-0 truncate">{detail.baseBranch}</code>+ </span>+ {freshness ? (+ <PullRequestBaseFreshnessWarning+ baseBranch={detail.baseBranch}+ freshness={freshness}+ pending={actionPending}+ onUpdate={(method) => void perform("update-branch", undefined, method)}+ />+ ) : null}+ <ArrowLeftIcon+ aria-label="receives changes from"+ className="size-3.5 shrink-0 opacity-60"/>- ) : null}- <ArrowLeftIcon aria-label="receives changes from" className="size-4 shrink-0" />- <button- type="button"- className="grid min-w-0 max-w-64 shrink cursor-pointer rounded-md bg-muted px-2 py-1 font-mono text-xs text-foreground outline-none transition-colors hover:bg-accent focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background"- aria-label={isBranchCopied ? "Branch name copied" : "Copy pull request branch"}- title={isBranchCopied ? "Copied" : "Copy pull request branch"}- onClick={() => copyBranchToClipboard(detail.headBranch)}- >- <code- className={cn(- "col-start-1 row-start-1 min-w-0 truncate transition-opacity duration-150 motion-reduce:transition-none",- isBranchCopied ? "opacity-0" : "opacity-100",- )}- title={detail.headBranch}- >- {detail.headBranch}- </code>- <span- aria-hidden="true"- className={cn(- "col-start-1 row-start-1 truncate text-center transition-opacity duration-150 motion-reduce:transition-none",- isBranchCopied ? "opacity-100" : "opacity-0",- )}+ <button+ type="button"+ className="grid w-fit min-w-0 max-w-full shrink cursor-pointer rounded px-1 py-0.5 text-left outline-none transition-colors hover:bg-accent/45 hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring"+ aria-label={+ isBranchCopied ? "Branch name copied" : "Copy pull request branch"+ }+ title={isBranchCopied ? "Copied" : "Copy pull request branch"}+ onClick={() => copyBranchToClipboard(detail.headBranch)}>- Copied- </span>- </button>+ <code+ className={cn(+ "col-start-1 row-start-1 min-w-0 truncate transition-opacity duration-150 motion-reduce:transition-none",+ isBranchCopied ? "opacity-0" : "opacity-100",+ )}+ >+ {detail.headBranch}+ </code>+ <span+ aria-hidden="true"+ className={cn(+ "col-start-1 row-start-1 truncate text-center transition-opacity duration-150 motion-reduce:transition-none",+ isBranchCopied ? "opacity-100" : "opacity-0",+ )}+ >+ Copied+ </span>+ </button>+ </span><span className="ml-auto inline-flex shrink-0 items-center justify-end gap-2"><span className="inline-flex items-center gap-1.5 tabular-nums"><FileDiffIcon className="size-3.5" />@@ -1623,147 +1619,114 @@ export function PullRequestDetailPanel({</div></div>) : null}+ </div>+ </div>- {detail && conflicting ? (- <div className="col-span-2 flex items-center gap-1 px-4 pb-3">- <Badge- variant="error"- className="h-auto gap-1.5 rounded-md px-3 py-1.5 text-xs text-destructive"+ {detail ? (+ <nav+ className={cn(+ "col-span-2 flex min-w-0 items-center gap-1 overflow-x-auto border-t border-border/60 px-4 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden",+ condensed ? "py-1.5" : "py-2",+ )}+ aria-label="Pull request tabs"+ >+ <SegmentedTabList>+ {visibleTabs.map((item) => (+ <SegmentedTab+ key={item.value}+ selected={tab === item.value}+ onClick={() => setTab(item.value)}>- <TriangleAlertIcon className="size-3.5" />- Merge conflicts- </Badge>+ {item.label}+ </SegmentedTab>+ ))}+ </SegmentedTabList>+ {tab === "summary" ? (+ <span+ className="ml-auto inline-flex shrink-0 items-center gap-1.5 text-xs text-muted-foreground"+ aria-label={checksSummary ? `Checks: ${checksSummary}` : "Checks"}+ >+ {checksState !== null ? (+ <PullRequestChecksPopover checks={detail.checks} checksState={checksState} />+ ) : (+ <CircleDotIcon aria-hidden className="size-3.5" />+ )}+ {checksSummary}+ </span>+ ) : tab === "timeline" ? (+ <div className="ml-auto flex shrink-0 items-center gap-2 text-xs text-muted-foreground">+ <PullRequestMetaLine+ className={cn(+ "whitespace-nowrap text-[11px] transition-opacity",+ (activityPending || activityError) && "opacity-35",+ )}+ >+ <span+ className="inline-flex items-center gap-1"+ aria-label={+ activityError+ ? "Comments unavailable"+ : `${detail.commentCount.toLocaleString()} ${+ detail.commentCount === 1 ? "comment" : "comments"+ }`+ }+ >+ <MessageSquareIcon aria-hidden className="size-3" />+ {activityError+ ? "—"+ : activityPending+ ? "…"+ : detail.commentCount.toLocaleString()}+ </span>+ <span+ className="inline-flex items-center gap-1"+ aria-label={+ activityError+ ? "Commits unavailable"+ : `${detail.commits.length.toLocaleString()} ${+ detail.commits.length === 1 ? "commit" : "commits"+ }`+ }+ >+ <GitCommitHorizontalIcon aria-hidden className="size-3" />+ {activityError+ ? "—"+ : activityPending+ ? "…"+ : detail.commits.length.toLocaleString()}+ </span>+ </PullRequestMetaLine><Buttonsize="xs"variant="ghost"- className="ml-auto text-destructive hover:bg-destructive/8 hover:text-destructive"- disabled={handoff !== null}- onClick={startResolveConflicts}+ className="h-7 px-2 text-[10px] text-muted-foreground"+ aria-label={+ timelineOrder === "newest"+ ? "Show oldest activity first"+ : "Show newest activity first"+ }+ onClick={() =>+ setTimelineOrder((value) => (value === "newest" ? "oldest" : "newest"))+ }>- {handoff === "conflicts" ? "Preparing..." : handoffLabels.resolve}- <ArrowUpRightIcon className="size-3.5 text-destructive" />+ <ArrowDownUpIcon aria-hidden className="size-3" />+ {timelineOrder === "newest" ? "Newest first" : "Oldest first"}</Button></div>) : null}-- {detail ? (- <nav- className="col-span-2 flex min-w-0 items-center gap-1 overflow-x-auto border-t border-border/60 px-4 py-2 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden"- aria-label="Pull request tabs"- >- {visibleTabs.map((item) => (- <button- key={item.value}- type="button"- aria-pressed={tab === item.value}- onClick={() => setTab(item.value)}- className={cn(- "inline-flex items-center gap-1.5 rounded-md px-3 py-1.5 text-xs transition-colors",- tab === item.value- ? "bg-accent text-foreground"- : "text-muted-foreground hover:text-foreground",- )}- >- {item.label}- </button>- ))}- {tab === "summary" ? (- <span- className="ml-auto inline-flex shrink-0 items-center gap-1.5 text-xs text-muted-foreground"- aria-label={checksSummary ? `Checks: ${checksSummary}` : "Checks"}- >- {/* The rollup icon opens the checks behind the summary; with none reported- there is nothing to open, so the plain glyph stays. */}- {detail && checksState !== null ? (- <PullRequestChecksPopover checks={detail.checks} checksState={checksState} />- ) : (- <CircleDotIcon aria-hidden className="size-3.5" />- )}- {checksSummary}- </span>- ) : tab === "timeline" ? (- <div className="ml-auto flex shrink-0 items-center gap-2 text-xs text-muted-foreground">- <PullRequestMetaLine- className={cn(- "whitespace-nowrap text-[11px] transition-opacity",- (activityPending || activityError) && "opacity-35",- )}- >- <span- className="inline-flex items-center gap-1"- aria-label={- activityError- ? "Comments unavailable"- : `${detail.commentCount.toLocaleString()} ${- detail.commentCount === 1 ? "comment" : "comments"- }`- }- >- <MessageSquareIcon aria-hidden className="size-3" />- {activityError- ? "—"- : activityPending- ? "…"- : detail.commentCount.toLocaleString()}- </span>- <span- className="inline-flex items-center gap-1"- aria-label={- activityError- ? "Commits unavailable"- : `${detail.commits.length.toLocaleString()} ${- detail.commits.length === 1 ? "commit" : "commits"- }`- }- >- <GitCommitHorizontalIcon aria-hidden className="size-3" />- {activityError- ? "—"- : activityPending- ? "…"- : detail.commits.length.toLocaleString()}- </span>- </PullRequestMetaLine>- <Button- size="xs"- variant="ghost"- className="h-7 px-2 text-[10px] text-muted-foreground"- aria-label={- timelineOrder === "newest"- ? "Show oldest activity first"- : "Show newest activity first"- }- onClick={() =>- setTimelineOrder((value) => (value === "newest" ? "oldest" : "newest"))- }- >- <ArrowDownUpIcon aria-hidden className="size-3" />- {timelineOrder === "newest" ? "Newest first" : "Oldest first"}- </Button>- </div>- ) : null}- </nav>- ) : null}- </div>- </div>+ </nav>+ ) : null}</div><divclassName="relative min-h-0 flex-1 overflow-hidden"- // Scroll does not bubble, but it captures: one listener hears every tab's own scroll- // container. Collapse past two line-heights, expand only back at the very top, so the- // boundary row cannot flap the chrome open and shut.onScrollCapture={(event) => {- if (chromeVariant !== "collapse") return;const scroller = event.target as HTMLElement;scrollerRef.current = scroller;const top = scroller.scrollTop;setChromeCondensed((previous) => {let next = previous;- // `scrollHeight` reads the fold's natural height whichever state the track is in.const foldHeight = foldRef.current?.scrollHeight ?? 0;- // The chrome trades the fold for the condensed second row, so the height the- // scrollport actually gains is the difference between the two.const chromeDelta = foldHeight - (condensedRowRef.current?.scrollHeight ?? 0);if (previous) {// The hard top reopens the chrome with no refund: the reader asked for the top,@@ -1781,17 +1744,7 @@ export function PullRequestDetailPanel({});}}>- {detailQuery.isPending && !detail ? (- // The ghost wears the shape of the tab being waited on, so switching tabs mid-load- // does not flash a summary outline under a timeline heading.- tab === "timeline" ? (- <PullRequestTimelineGhost />- ) : tab === "code" ? (- <DiffPanelLoadingState label="Loading pull request diff..." />- ) : (- <PullRequestDetailGhost />- )- ) : detailQuery.error && !detail ? (+ {detailQuery.error && !detail ? (<PullRequestsUnavailableState error={detailQuery.error} onRetry={refreshDetail} />) : detail ? (<>diff --git a/apps/web/src/components/pullRequest/PullRequestGhosts.tsx b/apps/web/src/components/pullRequest/PullRequestGhosts.tsxindex 09b79cf34..38a3ab70d 100644--- a/apps/web/src/components/pullRequest/PullRequestGhosts.tsx+++ b/apps/web/src/components/pullRequest/PullRequestGhosts.tsx@@ -45,13 +45,11 @@ export function PullRequestListGhost({<GhostBar className="size-4 rounded-full" /><div className="min-w-0 space-y-1.5"><GhostBar className={cn("h-3.5", TITLE_WIDTHS[index % TITLE_WIDTHS.length])} />- <GhostBar- className={cn("bg-muted-foreground/10", META_WIDTHS[index % META_WIDTHS.length])}- />+ <GhostBar className={META_WIDTHS[index % META_WIDTHS.length]} /></div><div className="flex flex-col items-end gap-1.5"><GhostBar className="w-12" />- <GhostBar className="w-16 bg-muted-foreground/10" />+ <GhostBar className="w-16" /></div></div>))}@@ -59,32 +57,101 @@ export function PullRequestListGhost({);}-/** The summary's own shape: a title, a byline, the facts rows, the description. */+/**+ * The detail panel's current expanded shape. Keeping the chrome, summary facts, and description+ * boundaries in the ghost prevents the loaded pull request from replacing one layout with+ * another a moment later.+ */export function PullRequestDetailGhost() {return (<divrole="status"aria-label="Loading pull request"- className="animate-ghost-pulse space-y-6 px-4 py-5"+ className="animate-ghost-pulse flex h-full min-h-0 flex-col overflow-hidden bg-background">- <div className="space-y-2">- <GhostBar className="h-5 w-4/5" />- <GhostBar className="w-2/5 bg-muted-foreground/10" />+ <div className="shrink-0 border-b border-border/60">+ <div className="flex h-7 items-center justify-between gap-3 px-4">+ <div className="flex min-w-0 flex-1 items-center gap-1.5">+ <GhostBar className="w-24" />+ <GhostBar className="w-9" />+ </div>+ <div className="flex shrink-0 items-center gap-1">+ <GhostBar className="h-5 w-16 rounded-md" />+ <GhostBar className="size-5 rounded-md" />+ </div>+ </div>++ <div className="px-4 pb-4 pt-1">+ <GhostBar className="h-5 w-4/5 max-w-md" />+ <div className="mt-2 flex items-center gap-1.5">+ <GhostBar className="size-4 rounded-full" />+ <GhostBar className="w-24" />+ </div>+ <div className="mt-4 flex min-w-0 items-center gap-2">+ <GhostBar className="h-6 w-24 rounded-md" />+ <GhostBar className="size-3 rounded-full" />+ <GhostBar className="h-6 w-32 rounded-md" />+ <div className="ml-auto flex shrink-0 items-center gap-2">+ <GhostBar className="w-10" />+ <GhostBar className="w-20" />+ </div>+ </div>+ </div>++ <div className="flex min-h-10 items-center justify-between gap-3 border-t border-border/60 px-4 py-2">+ <div className="flex items-center gap-1 p-0.5">+ <GhostBar className="h-6 w-16 rounded-md" />+ <GhostBar className="h-6 w-16 rounded-md" />+ <GhostBar className="h-6 w-12 rounded-md" />+ </div>+ <GhostBar className="w-20" />+ </div></div>- <div className="space-y-3">- {Array.from({ length: 4 }, (_, index) => (- <div key={index} className="flex items-center gap-3">++ <div className="min-h-0 flex-1 overflow-hidden">+ <section className="px-4 py-3">+ <div className="grid min-h-8 grid-cols-[6rem_minmax(0,1fr)] items-center gap-2">+ <div className="flex items-center gap-1.5">+ <GhostBar className="size-3.5 rounded-full" />+ <GhostBar className="w-14" />+ </div>+ <div className="flex items-center gap-1">+ <GhostBar className="size-4 rounded-full" />+ <GhostBar className="size-4 rounded-full" />+ <GhostBar className="ml-1 size-5 rounded-md" />+ </div>+ </div>+ <div className="grid min-h-8 grid-cols-[6rem_minmax(0,1fr)] items-center gap-2">+ <div className="flex items-center gap-1.5">+ <GhostBar className="size-3.5 rounded-full" />+ <GhostBar className="w-10" />+ </div>+ <div className="flex items-center gap-1">+ <GhostBar className="h-5 w-24 rounded-full" />+ <GhostBar className="h-5 w-20 rounded-full" />+ </div>+ </div>+ <div className="grid min-h-8 grid-cols-[6rem_minmax(0,1fr)] items-center gap-2">+ <div className="flex items-center gap-1.5">+ <GhostBar className="size-3.5 rounded-full" />+ <GhostBar className="w-14" />+ </div>+ <GhostBar className="w-20" />+ </div>+ </section>++ <section className="border-t border-border/60">+ <div className="flex min-h-11 items-center gap-1.5 px-4 py-3">+ <GhostBar className="h-4 w-24" /><GhostBar className="size-3.5 rounded-full" />- <GhostBar className="w-20 bg-muted-foreground/10" />- <GhostBar className={TITLE_WIDTHS[(index + 1) % TITLE_WIDTHS.length]} /></div>- ))}- </div>- <div className="space-y-2 pt-1">- <GhostBar className="w-full bg-muted-foreground/10" />- <GhostBar className="w-11/12 bg-muted-foreground/10" />- <GhostBar className="w-4/5 bg-muted-foreground/10" />- <GhostBar className="w-2/3 bg-muted-foreground/10" />+ <div className="space-y-2 px-4 pb-4">+ <GhostBar className="w-full" />+ <GhostBar className="w-11/12" />+ <GhostBar className="w-4/5" />+ <GhostBar className="w-2/3" />+ </div>+ </section></div></div>);@@ -113,7 +180,7 @@ export function PullRequestTimelineGhost({ rows = 6 }: { rows?: number }) {<div key={index} className="relative pb-5"><GhostBar className="absolute -left-[1.55rem] top-1 size-2 rounded-full" /><GhostBar className={cn("h-3.5", TITLE_WIDTHS[index % TITLE_WIDTHS.length])} />- <GhostBar className="mt-1.5 w-16 bg-muted-foreground/10" />+ <GhostBar className="mt-1.5 w-16" /></div>))}</div>@@ -134,8 +201,8 @@ export function PullRequestConversationGhost({ rows = 3 }: { rows?: number }) {<GhostBar className="size-5 shrink-0 rounded-full" /><div className="flex-1 space-y-1.5"><GhostBar className={META_WIDTHS[index % META_WIDTHS.length]} />- <GhostBar className="w-full bg-muted-foreground/10" />- <GhostBar className="w-3/4 bg-muted-foreground/10" />+ <GhostBar className="w-full" />+ <GhostBar className="w-3/4" /></div></div>))}diff --git a/apps/web/src/components/pullRequest/PullRequestListFilters.tsx b/apps/web/src/components/pullRequest/PullRequestListFilters.tsxindex 3066eafc3..04fee465b 100644--- a/apps/web/src/components/pullRequest/PullRequestListFilters.tsx+++ b/apps/web/src/components/pullRequest/PullRequestListFilters.tsx@@ -25,6 +25,7 @@ import { cn } from "~/lib/utils";import { getSourceControlPresentationForKind } from "~/sourceControlPresentation";import { ProjectFavicon } from "../ProjectFavicon";import { InputGroup, InputGroupAddon, InputGroupInput } from "../ui/input-group";+import { Button } from "../ui/button";import {Menu,@@ -261,12 +262,14 @@ export function PullRequestFiltersMenu({return (<Menu><MenuTrigger- className={cn(- // The icon-button size that pairs with a full-height input, so the two read as one strip.- "relative inline-flex size-9 shrink-0 items-center justify-center rounded-lg border border-input text-muted-foreground transition-colors hover:bg-accent/50 hover:text-foreground sm:size-8",- filtered && "text-foreground",- )}- aria-label="Filter pull requests"+ render={+ <Button+ className={cn("relative", filtered && "[--control-icon-color:currentColor]")}+ size="icon"+ variant="outline"+ aria-label="Filter pull requests"+ />+ }><ListFilterIcon className="size-4" />{filtered ? (diff --git a/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx b/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsxindex a57f2a4d1..29566e048 100644--- a/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx+++ b/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx@@ -196,12 +196,12 @@ function MetaRow({children: ReactNode;}) {return (- <div className="flex items-center gap-2 py-1.5 text-xs">- <span className="flex w-24 shrink-0 items-center gap-1.5 text-muted-foreground">+ <div className="grid min-h-8 grid-cols-[6rem_minmax(0,1fr)] items-center gap-2 text-xs">+ <span className="flex min-w-0 items-center gap-1.5 text-muted-foreground">{icon}{label}</span>- <span className="min-w-0 flex-1 text-foreground">{children}</span>+ <span className="min-w-0 text-foreground">{children}</span></div>);}diff --git a/apps/web/src/components/settings/DiagnosticsSettings.tsx b/apps/web/src/components/settings/DiagnosticsSettings.tsxindex a472c6a8d..9c36d32ff 100644--- a/apps/web/src/components/settings/DiagnosticsSettings.tsx+++ b/apps/web/src/components/settings/DiagnosticsSettings.tsx@@ -992,7 +992,7 @@ export function DiagnosticsSettingsPanel() {: false;return (- <SettingsPageContainer className="max-w-6xl gap-10">+ <SettingsPageContainer width="expanded" className="gap-10"><ResourceTelemetryDiagnostics /><SettingsSectiondiff --git a/apps/web/src/components/settings/KeybindingsSettings.tsx b/apps/web/src/components/settings/KeybindingsSettings.tsxindex 9e7936715..ccbd1f065 100644--- a/apps/web/src/components/settings/KeybindingsSettings.tsx+++ b/apps/web/src/components/settings/KeybindingsSettings.tsx@@ -1195,7 +1195,7 @@ export function KeybindingsSettingsPanel() {);return (- <SettingsPageContainer className="max-w-5xl">+ <SettingsPageContainer width="wide"><SettingsSection{...searchableSetting("keybindings")}headerAction={diff --git a/apps/web/src/components/settings/ProjectSettingsPanel.tsx b/apps/web/src/components/settings/ProjectSettingsPanel.tsxindex b939e4d53..1fac1e27e 100644--- a/apps/web/src/components/settings/ProjectSettingsPanel.tsx+++ b/apps/web/src/components/settings/ProjectSettingsPanel.tsx@@ -81,8 +81,6 @@ import {type NewProjectScriptInput,type ProjectScriptEditorRequest,} from "../projectScriptEditor";-import { cn } from "../../lib/utils";-import { COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS } from "../../workspaceTitlebar";import { Button } from "../ui/button";import { Input } from "../ui/input";import {@@ -102,6 +100,7 @@ import {WorkspaceBreadcrumbItem,WorkspaceBreadcrumbSeparator,} from "../WorkspaceBreadcrumb";+import { WorkspacePageHeader } from "../WorkspacePageContainer";import {SettingResetButton,SettingsPageContainer,@@ -174,26 +173,9 @@ export function ProjectSettingsPage({ projectKey }: { projectKey: string }) {return (<SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground isolate"><div className="flex min-h-0 min-w-0 flex-1 flex-col bg-background text-foreground">- {!isElectron && (- <header- className={cn(- "flex h-[var(--workspace-topbar-height)] min-h-[var(--workspace-topbar-height)] shrink-0 items-center px-3 transition-[padding-left] duration-200 ease-linear motion-reduce:transition-none sm:px-5",- COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS,- )}- >- <ProjectSettingsBreadcrumb projectKey={projectKey} />- </header>- )}- {isElectron && (- <div- className={cn(- "drag-region flex h-[52px] shrink-0 items-center px-5 transition-[padding-left] duration-200 ease-linear motion-reduce:transition-none wco:h-[env(titlebar-area-height)] wco:pr-[calc(100vw-env(titlebar-area-width)-env(titlebar-area-x)+1em)]",- COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS,- )}- >- <ProjectSettingsBreadcrumb projectKey={projectKey} />- </div>- )}+ <WorkspacePageHeader electron={isElectron}>+ <ProjectSettingsBreadcrumb projectKey={projectKey} />+ </WorkspacePageHeader><ProjectSettingsPanel projectKey={projectKey} /></div></SidebarInset>diff --git a/apps/web/src/components/settings/SettingsSidebarNav.tsx b/apps/web/src/components/settings/SettingsSidebarNav.tsxindex 174c9e9fe..1618f5045 100644--- a/apps/web/src/components/settings/SettingsSidebarNav.tsx+++ b/apps/web/src/components/settings/SettingsSidebarNav.tsx@@ -9,7 +9,6 @@ import {} from "react";import {ArchiveIcon,- ArrowLeftIcon,BotIcon,GitBranchIcon,KeyboardIcon,@@ -19,7 +18,7 @@ import {Settings2Icon,XIcon,} from "lucide-react";-import { useCanGoBack, useLocation, useNavigate } from "@tanstack/react-router";+import { useLocation, useNavigate } from "@tanstack/react-router";import { Button } from "../ui/button";import { Input } from "../ui/input";@@ -34,6 +33,7 @@ import {useSidebar,} from "../ui/sidebar";import { T3ConnectSidebarAvatar, T3ConnectSidebarSignIn } from "../clerk/T3ConnectSidebarSignIn";+import { SidebarUtilityMenu } from "../sidebar/SidebarChrome";import { scrollToSettingsTarget } from "./settingsLayout";import {searchSettings,@@ -72,7 +72,6 @@ function SettingsSectionIcon({ to }: { to: SettingsPath }) {export function SettingsSidebarNav({ pathname }: { pathname: string }) {const navigate = useNavigate();const currentHash = useLocation({ select: (location) => location.hash });- const canGoBack = useCanGoBack();const { isMobile, setOpenMobile, open, setOpen } = useSidebar();const searchInputRef = useRef<HTMLInputElement>(null);const [query, setQuery] = useState("");@@ -176,17 +175,6 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {},[activeResultIndex, clearSearch, handleSearchResultClick, isSearching, results],);- const handleBackClick = useCallback(() => {- if (isMobile) {- setOpenMobile(false);- }- if (canGoBack) {- window.history.back();- return;- }- void navigate({ to: "/" });- }, [canGoBack, isMobile, navigate, setOpenMobile]);-return (<><SidebarContent className="overflow-x-hidden">@@ -296,14 +284,7 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {<SidebarFooter className="p-[var(--sidebar-content-inset)]"><T3ConnectSidebarSignIn /><div className="flex items-center gap-1">- <SidebarMenu className="min-w-0 flex-1">- <SidebarMenuItem>- <SidebarMenuButton onClick={handleBackClick}>- <ArrowLeftIcon />- <span>Back</span>- </SidebarMenuButton>- </SidebarMenuItem>- </SidebarMenu>+ <SidebarUtilityMenu /><T3ConnectSidebarAvatar /></div></SidebarFooter>diff --git a/apps/web/src/components/settings/ThemeSettings.tsx b/apps/web/src/components/settings/ThemeSettings.tsxindex 7e4b80d19..5399d071b 100644--- a/apps/web/src/components/settings/ThemeSettings.tsx+++ b/apps/web/src/components/settings/ThemeSettings.tsx@@ -768,7 +768,7 @@ export function ThemeLibrary({<TooltipProvider><divclassName="mx-auto grid w-full max-w-[56rem] gap-2 px-3 sm:px-4"- style={{ gridTemplateColumns: "repeat(auto-fit, minmax(min(100%, 17rem), 1fr))" }}+ style={{ gridTemplateColumns: "repeat(auto-fit, minmax(min(100%, 16rem), 1fr))" }}>{STANDARD_THEME_CARDS.map((standardTheme) => (<ThemeLibraryCarddiff --git a/apps/web/src/components/settings/settingsLayout.tsx b/apps/web/src/components/settings/settingsLayout.tsxindex 880e03e54..15540ff59 100644--- a/apps/web/src/components/settings/settingsLayout.tsx+++ b/apps/web/src/components/settings/settingsLayout.tsx@@ -12,6 +12,7 @@ import {} from "react";import { cn } from "../../lib/utils";+import { WorkspacePageContainer, type WorkspacePageWidth } from "../WorkspacePageContainer";import { Button } from "../ui/button";import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";@@ -233,9 +234,11 @@ export function SettingResetButton({export function SettingsPageContainer({children,className,+ width = "readable",}: {children: ReactNode;className?: string;+ width?: WorkspacePageWidth;}) {const navigate = useNavigate();const hash = useLocation({ select: (location) => location.hash });@@ -247,12 +250,12 @@ export function SettingsPageContainer({return (<SettingsSearchTargetProvider targetId={targetId} onTargetHandled={clearTargetHash}><div- className="topbar-scroll-fade scrollbar-gutter-both flex-1 overflow-y-auto px-4 pt-10 pb-7 sm:px-8 sm:pt-12 sm:pb-10"+ className="topbar-scroll-fade scrollbar-gutter-both flex-1 overflow-y-auto [--topbar-scroll-fade-height:1.5rem] sm:[--topbar-scroll-fade-height:1.5rem]"data-settings-page-scroll>- <div className={cn("mx-auto flex w-full max-w-4xl flex-col gap-12", className)}>+ <WorkspacePageContainer width={width} className={cn("gap-12", className)}>{children}- </div>+ </WorkspacePageContainer></div></SettingsSearchTargetProvider>);diff --git a/apps/web/src/components/sidebar/SidebarChrome.tsx b/apps/web/src/components/sidebar/SidebarChrome.tsxindex f4a98dec8..8fc6b835b 100644--- a/apps/web/src/components/sidebar/SidebarChrome.tsx+++ b/apps/web/src/components/sidebar/SidebarChrome.tsx@@ -4,8 +4,9 @@ import {GitPullRequestIcon,SettingsIcon,} from "lucide-react";+import type { ReactNode } from "react";import { memo, useCallback } from "react";-import { Link, useLocation, useNavigate } from "@tanstack/react-router";+import { Link, useCanGoBack, useLocation, useNavigate } from "@tanstack/react-router";import { useEnvironmentIdentificationMode } from "../../hooks/useSettings";import { cn } from "../../lib/utils";@@ -117,16 +118,44 @@ function T3Wordmark() {);}-export const SidebarChromeFooter = memo(function SidebarChromeFooter() {+function SidebarUtilityItem({+ icon,+ label,+ onClick,+}: {+ icon: ReactNode;+ label: string;+ onClick: () => void;+}) {+ return (+ <SidebarMenuItem className="shrink-0">+ <Tooltip>+ <TooltipTrigger+ render={+ <SidebarMenuButton aria-label={label} onClick={onClick} size="icon">+ {icon}+ </SidebarMenuButton>+ }+ />+ <TooltipPopup side="top">{label}</TooltipPopup>+ </Tooltip>+ </SidebarMenuItem>+ );+}++export const SidebarUtilityMenu = memo(function SidebarUtilityMenu() {const navigate = useNavigate();+ const canGoBack = useCanGoBack();const { isMobile, setOpenMobile } = useSidebar();const currentFooterPage = useLocation({select: (location) =>- location.pathname === "/usage"- ? "usage"- : location.pathname === "/pull-requests"- ? "pull-requests"- : null,+ /^\/settings(?:\/|$)/.test(location.pathname)+ ? "settings"+ : location.pathname === "/usage"+ ? "usage"+ : location.pathname === "/pull-requests"+ ? "pull-requests"+ : null,});const { environments } = useEnvironments();// The page reads every connected server, so one of them offering pull requests is enough for@@ -157,73 +186,54 @@ export const SidebarChromeFooter = memo(function SidebarChromeFooter() {const handleBackClick = useCallback(() => {closeMobileSidebar();+ if (canGoBack) {+ window.history.back();+ return;+ }void navigate({ to: "/" });- }, [closeMobileSidebar, navigate]);+ }, [canGoBack, closeMobileSidebar, navigate]);+ return (+ <SidebarMenu className="flex-row items-center">+ {currentFooterPage ? (+ <SidebarMenuItem className="min-w-0 flex-1">+ <SidebarMenuButton onClick={handleBackClick}>+ <ArrowLeftIcon />+ <span>Back</span>+ </SidebarMenuButton>+ </SidebarMenuItem>+ ) : (+ <>+ <SidebarUtilityItem+ icon={<SettingsIcon />}+ label="Settings"+ onClick={handleSettingsClick}+ />+ {pullRequestsSupported ? (+ <SidebarUtilityItem+ icon={<GitPullRequestIcon />}+ label="Pull Requests"+ onClick={handlePullRequestsClick}+ />+ ) : null}+ <SidebarUtilityItem+ icon={<ChartNoAxesColumnIcon />}+ label="Usage"+ onClick={handleUsageClick}+ />+ </>+ )}+ <SidebarUpdatePill />+ </SidebarMenu>+ );+});++export const SidebarChromeFooter = memo(function SidebarChromeFooter() {return (<SidebarFooter className="p-[var(--sidebar-content-inset)]"><SidebarProviderUpdatePill /><SidebarUpdateArchitectureWarning />- <SidebarMenu className="flex-row items-center">- {currentFooterPage ? (- <SidebarMenuItem className="min-w-0 flex-1">- <SidebarMenuButton onClick={handleBackClick}>- <ArrowLeftIcon />- <span>Back</span>- </SidebarMenuButton>- </SidebarMenuItem>- ) : (- <>- <SidebarMenuItem className="shrink-0">- <Tooltip>- <TooltipTrigger- render={- <SidebarMenuButton- aria-label="Settings"- onClick={handleSettingsClick}- size="icon"- >- <SettingsIcon />- </SidebarMenuButton>- }- />- <TooltipPopup side="top">Settings</TooltipPopup>- </Tooltip>- </SidebarMenuItem>- {pullRequestsSupported ? (- <SidebarMenuItem className="shrink-0">- <Tooltip>- <TooltipTrigger- render={- <SidebarMenuButton- aria-label="Pull Requests"- onClick={handlePullRequestsClick}- size="icon"- >- <GitPullRequestIcon />- </SidebarMenuButton>- }- />- <TooltipPopup side="top">Pull Requests</TooltipPopup>- </Tooltip>- </SidebarMenuItem>- ) : null}- <SidebarMenuItem className="shrink-0">- <Tooltip>- <TooltipTrigger- render={- <SidebarMenuButton aria-label="Usage" onClick={handleUsageClick} size="icon">- <ChartNoAxesColumnIcon />- </SidebarMenuButton>- }- />- <TooltipPopup side="top">Usage</TooltipPopup>- </Tooltip>- </SidebarMenuItem>- </>- )}- <SidebarUpdatePill />- </SidebarMenu>+ <SidebarUtilityMenu /></SidebarFooter>);});diff --git a/apps/web/src/components/threadActionMenu.logic.test.ts b/apps/web/src/components/threadActionMenu.logic.test.tsindex 93dc653e7..477bc9c02 100644--- a/apps/web/src/components/threadActionMenu.logic.test.ts+++ b/apps/web/src/components/threadActionMenu.logic.test.ts@@ -19,6 +19,12 @@ function ids(state: ThreadActionMenuState): string[] {return buildThreadActionMenuItems(state).map((item) => item.id);}+function allIds(state: ThreadActionMenuState): string[] {+ const flatten = (items: ReturnType<typeof buildThreadActionMenuItems>): string[] =>+ items.flatMap((item) => [item.id, ...(item.children ? flatten(item.children) : [])]);+ return flatten(buildThreadActionMenuItems(state));+}+describe("buildThreadActionMenuItems", () => {it("hides lifecycle items when the environment lacks the capabilities", () => {expect(@@ -26,15 +32,15 @@ describe("buildThreadActionMenuItems", () => {...baseState,supports: { settlement: false, snooze: false, pinning: false, titleRegeneration: false },}),- ).toEqual(["rename", "mark-unread", "copy-path", "copy-thread-id", "delete"]);+ ).toEqual(["rename", "mark-unread", "copy", "delete"]);});it("includes branch items only for threads with a branch", () => {- const withBranch = ids({ ...baseState, branch: "feat/menu" });+ const withBranch = allIds({ ...baseState, branch: "feat/menu" });expect(withBranch).toContain("new-thread-on-branch");expect(withBranch).toContain("copy-branch");- expect(ids(baseState)).not.toContain("new-thread-on-branch");- expect(ids(baseState)).not.toContain("copy-branch");+ expect(allIds(baseState)).not.toContain("new-thread-on-branch");+ expect(allIds(baseState)).not.toContain("copy-branch");});it("flips lifecycle labels with thread state", () => {diff --git a/apps/web/src/components/threadActionMenu.logic.ts b/apps/web/src/components/threadActionMenu.logic.tsindex ef4b38dcd..1218e2dd5 100644--- a/apps/web/src/components/threadActionMenu.logic.ts+++ b/apps/web/src/components/threadActionMenu.logic.ts@@ -18,6 +18,7 @@ export type ThreadActionMenuId =| "rename"| "regenerate-title"| "mark-unread"+ | "copy"| "copy-path"| "copy-branch"| "copy-thread-id"@@ -53,14 +54,15 @@ export function buildThreadActionMenuItems({id: "new-thread-on-branch" as const,label: `New thread on ${state.branch}`,+ icon: "message-square-plus",},]: []),...(state.supports.pinning? [state.isPinned- ? { id: "unpin" as const, label: "Unpin thread" }- : { id: "pin" as const, label: "Pin thread" },+ ? { id: "unpin" as const, label: "Unpin thread", icon: "pin-off" }+ : { id: "pin" as const, label: "Pin thread", icon: "pin" },]: []),// Both lifecycle actions stay available on pinned threads: settling@@ -69,17 +71,18 @@ export function buildThreadActionMenuItems(...(state.supports.settlement? [state.isSettled- ? { id: "unsettle" as const, label: "Un-settle thread" }- : { id: "settle" as const, label: "Settle thread" },+ ? { id: "unsettle" as const, label: "Un-settle thread", icon: "circle-check" }+ : { id: "settle" as const, label: "Settle thread", icon: "circle-check" },]: []),...(state.supports.snooze? [state.isSnoozed- ? { id: "unsnooze" as const, label: "Wake thread" }+ ? { id: "unsnooze" as const, label: "Wake thread", icon: "clock" }: {id: "snooze" as const,label: "Snooze",+ icon: "clock",disabled: !state.canSnoozeNow,children: state.snoozePresets.map((preset) => ({id: `snooze:${preset.id}` as const,@@ -88,20 +91,37 @@ export function buildThreadActionMenuItems(},]: []),- { id: "rename", label: "Rename thread" },+ { id: "rename", label: "Rename thread", icon: "pencil", separatorBefore: true },...(state.supports.titleRegeneration? [{id: "regenerate-title" as const,label: state.isRegeneratingTitle ? "Regenerating…" : "Regenerate title",+ icon: "refresh-cw",disabled: state.isRegeneratingTitle,},]: []),- { id: "mark-unread", label: "Mark unread" },- { id: "copy-path", label: "Copy path", icon: "copy" },- ...(state.branch ? [{ id: "copy-branch" as const, label: "Copy branch", icon: "copy" }] : []),- { id: "copy-thread-id", label: "Copy thread ID", icon: "copy" },- { id: "delete", label: "Delete", destructive: true, icon: "trash" },+ { id: "mark-unread", label: "Mark unread", icon: "mail-open" },+ {+ id: "copy",+ label: "Copy",+ icon: "copy",+ separatorBefore: true,+ children: [+ { id: "copy-path", label: "Path", icon: "folder" },+ ...(state.branch+ ? [{ id: "copy-branch" as const, label: "Branch", icon: "git-branch" }]+ : []),+ { id: "copy-thread-id", label: "Thread ID", icon: "hash" },+ ],+ },+ {+ id: "delete",+ label: "Delete",+ destructive: true,+ icon: "trash",+ separatorBefore: true,+ },];}diff --git a/apps/web/src/components/ui/segmented-tabs.tsx b/apps/web/src/components/ui/segmented-tabs.tsxnew file mode 100644index 000000000..29b91e18b--- /dev/null+++ b/apps/web/src/components/ui/segmented-tabs.tsx@@ -0,0 +1,40 @@+import type { ComponentProps, HTMLAttributes } from "react";++import { cn } from "~/lib/utils";+import { Toggle } from "~/components/ui/toggle";++function SegmentedTabList({ className, ...props }: HTMLAttributes<HTMLDivElement>) {+ return (+ <div+ className={cn(+ "inline-flex w-fit items-center gap-0.5 rounded-lg bg-muted/45 p-0.5",+ className,+ )}+ role="group"+ {...props}+ />+ );+}++function SegmentedTab({+ selected,+ density = "default",+ className,+ ...props+}: {+ selected: boolean;+ density?: "default" | "compact";+} & Omit<ComponentProps<typeof Toggle>, "aria-pressed" | "pressed" | "size" | "type" | "variant">) {+ return (+ <Toggle+ type="button"+ pressed={selected}+ size={density === "compact" ? "segmented-compact" : "segmented"}+ variant="segmented"+ className={className}+ {...props}+ />+ );+}++export { SegmentedTab, SegmentedTabList };diff --git a/apps/web/src/components/ui/toggle.tsx b/apps/web/src/components/ui/toggle.tsxindex 5bf04adf4..7173eab14 100644--- a/apps/web/src/components/ui/toggle.tsx+++ b/apps/web/src/components/ui/toggle.tsx@@ -18,6 +18,10 @@ const toggleVariants = cva("h-7 min-w-7 rounded-md px-[calc(--spacing(1)-1px)] text-xs before:rounded-[calc(var(--radius-md)-1px)] [&_svg:not([class*='size-'])]:size-3.5",default: "h-9 min-w-9 px-[calc(--spacing(2)-1px)] sm:h-8 sm:min-w-8",lg: "h-10 min-w-10 px-[calc(--spacing(2.5)-1px)] sm:h-9 sm:min-w-9",+ segmented:+ "h-6 min-w-0 rounded-md px-2.5 text-xs before:rounded-[calc(var(--radius-md)-1px)]",+ "segmented-compact":+ "h-5 min-w-0 rounded-md px-2 text-[11px] before:rounded-[calc(var(--radius-md)-1px)]",sm: "h-8 min-w-8 px-[calc(--spacing(1.5)-1px)] sm:h-7 sm:min-w-7",xs: "h-7 min-w-7 px-[calc(--spacing(1)-1px)] sm:h-6 sm:min-w-6 rounded-md",},@@ -27,6 +31,8 @@ const toggleVariants = cva("border-transparent text-foreground shadow-none [:disabled,:active,[data-pressed]]:shadow-none before:shadow-none data-pressed:bg-accent data-pressed:text-accent-foreground disabled:opacity-100 disabled:text-muted-foreground disabled:[&_svg]:opacity-100",outline:"border-input bg-background not-dark:bg-clip-padding shadow-xs/5 not-disabled:not-active:not-data-pressed:before:shadow-[0_1px_--theme(--color-black/4%)] dark:bg-input/32 dark:data-pressed:bg-input dark:hover:bg-input/64 dark:not-disabled:not-active:not-data-pressed:before:shadow-[0_-1px_--theme(--color-white/6%)] dark:not-disabled:not-data-pressed:before:shadow-[0_-1px_--theme(--color-white/2%)] [:disabled,:active,[data-pressed]]:shadow-none",+ segmented:+ "border-transparent text-muted-foreground shadow-none transition-colors before:shadow-none hover:bg-accent/45 hover:text-foreground data-pressed:bg-accent data-pressed:text-foreground data-pressed:shadow-xs/5",},},},diff --git a/apps/web/src/components/usage/UsagePage.tsx b/apps/web/src/components/usage/UsagePage.tsxindex 7a5cdd883..b9bebadc0 100644--- a/apps/web/src/components/usage/UsagePage.tsx+++ b/apps/web/src/components/usage/UsagePage.tsx@@ -19,13 +19,22 @@ import {formatUsd,makeWindow,} from "@t3tools/shared/usageFormat";-import { ScrollArea } from "../ui/scroll-area";import { Button } from "../ui/button";+import { ScrollArea } from "../ui/scroll-area";import { SidebarInset } from "../ui/sidebar";-import { WorkspaceBreadcrumb, WorkspaceBreadcrumbItem } from "../WorkspaceBreadcrumb";-import { COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS } from "../../workspaceTitlebar";-import { UsageChartLegend, UsageProviderChart, type UsageChartMetric } from "./UsageProviderChart";-import { PROVIDER_COLOR, PROVIDER_LABEL, PROVIDER_MARK, PROVIDER_ORDER } from "./usageProviders";+import { SegmentedTab, SegmentedTabList } from "../ui/segmented-tabs";+import {+ WorkspaceBreadcrumb,+ WorkspaceBreadcrumbItem,+ WorkspaceBreadcrumbSeparator,+} from "../WorkspaceBreadcrumb";+import {+ WorkspacePageContainer,+ WorkspacePageHeader,+ WorkspacePageHeaderEdgeControl,+} from "../WorkspacePageContainer";+import { UsageProviderChart, type UsageChartMetric } from "./UsageProviderChart";+import { PROVIDER_LABEL, PROVIDER_MARK, PROVIDER_ORDER } from "./usageProviders";const WINDOW_OPTIONS = [{ days: 1, label: "Past 24h" },@@ -66,21 +75,6 @@ export function UsagePage() {[isPast24Hours, merged.daily, merged.hourly],);- // Ranked by whatever the toggle is showing, so the bars always descend.- const orderedProviders = useMemo(- () =>- merged.providers.toSorted((a, b) =>- metric === "cost" ? b.costUsd - a.costUsd : b.totalTokens - a.totalTokens,- ),- [merged.providers, metric],- );-- const activePeriods = (isPast24Hours ? merged.hourly : merged.daily).filter(- (period) => period.totalTokens > 0,- ).length;- const periodAverage = activePeriods === 0 ? 0 : merged.totalTokens / activePeriods;- const observedInput = merged.uncachedInputTokens + merged.cachedInputTokens;- const cachedShare = observedInput === 0 ? 0 : merged.cachedInputTokens / observedInput;const selectWindow = (days: number) => {setWindowSelection({days,@@ -100,78 +94,66 @@ export function UsagePage() {setWindowSelection({ days: windowDays, window: nextWindow });}};+ const windowLabel =+ isPast24Hours && window.sinceTime !== undefined && window.untilTime !== undefined+ ? `${formatDateTimeShort(window.sinceTime, window.timeZone)} to ${formatDateTimeShort(window.untilTime, window.timeZone)}`+ : `${formatDayShort(window.sinceDay)} to ${formatDayShort(window.untilDay)}`;+ const topbarContent = (+ <div className="flex w-full min-w-0 flex-wrap items-center gap-x-3 gap-y-2">+ <WorkspaceBreadcrumb ariaLabel="Usage breadcrumb" className="min-w-0">+ <WorkspaceBreadcrumbItem current>+ <h1>Usage</h1>+ </WorkspaceBreadcrumbItem>+ <WorkspaceBreadcrumbSeparator />+ <WorkspaceBreadcrumbItem className="min-w-0 shrink">+ <span className="truncate">{windowLabel}</span>+ </WorkspaceBreadcrumbItem>+ </WorkspaceBreadcrumb>+ <div className="ms-auto flex min-w-0 basis-full flex-wrap items-center justify-end gap-2 sm:basis-auto">+ <SegmentedTabList aria-label="Usage metric">+ {(["cost", "tokens"] as const).map((option) => (+ <SegmentedTab+ key={option}+ selected={option === metric}+ onClick={() => setMetric(option)}+ >+ {option === "cost" ? "Cost" : "Tokens"}+ </SegmentedTab>+ ))}+ </SegmentedTabList>+ <SegmentedTabList aria-label="Usage period">+ {WINDOW_OPTIONS.map((option) => (+ <SegmentedTab+ key={option.days}+ selected={option.days === windowDays}+ onClick={() => selectWindow(option.days)}+ >+ {option.label}+ </SegmentedTab>+ ))}+ </SegmentedTabList>+ <WorkspacePageHeaderEdgeControl>+ <Button onClick={refreshWindow} aria-label="Refresh usage" size="icon-sm" variant="ghost">+ <RefreshCwIcon className="size-3.5" />+ </Button>+ </WorkspacePageHeaderEdgeControl>+ </div>+ </div>+ );return (<SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground isolate"><div className="flex min-h-0 min-w-0 flex-1 flex-col bg-background text-foreground">- {!isElectron && (- <header- className={cn(- "flex h-[var(--workspace-topbar-height)] min-h-[var(--workspace-topbar-height)] shrink-0 items-center px-3 transition-[padding-left] duration-200 ease-linear motion-reduce:transition-none sm:px-5",- COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS,- )}- >- <WorkspaceBreadcrumb ariaLabel="Usage breadcrumb">- <WorkspaceBreadcrumbItem current>Usage</WorkspaceBreadcrumbItem>- </WorkspaceBreadcrumb>- </header>- )}-- {isElectron && (- <div- className={cn(- "drag-region flex h-[52px] shrink-0 items-center px-5 transition-[padding-left] duration-200 ease-linear motion-reduce:transition-none wco:h-[env(titlebar-area-height)] wco:pr-[calc(100vw-env(titlebar-area-width)-env(titlebar-area-x)+1em)]",- COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS,- )}- >- <WorkspaceBreadcrumb ariaLabel="Usage breadcrumb">- <WorkspaceBreadcrumbItem current>Usage</WorkspaceBreadcrumbItem>- </WorkspaceBreadcrumb>- </div>- )}+ <WorkspacePageHeader electron={isElectron} className="h-auto py-2">+ {topbarContent}+ </WorkspacePageHeader><ScrollArea className="min-h-0 flex-1">- <div className="mx-auto flex w-full max-w-6xl flex-col gap-8 px-6 py-6">- <div className="flex flex-wrap items-center justify-between gap-4">- <p className="text-sm text-muted-foreground">- {isPast24Hours && window.sinceTime !== undefined && window.untilTime !== undefined- ? `${formatDateTimeShort(window.sinceTime, window.timeZone)} to ${formatDateTimeShort(window.untilTime, window.timeZone)}`- : `${formatDayShort(window.sinceDay)} to ${formatDayShort(window.untilDay)}`}- </p>- <div className="flex items-center gap-2">- <div className="flex rounded-md border border-border">- {WINDOW_OPTIONS.map((option) => (- <button- key={option.days}- type="button"- aria-pressed={option.days === windowDays}- onClick={() => selectWindow(option.days)}- className={cn(- "relative cursor-pointer px-3 py-1.5 text-xs outline-none first:rounded-s-[calc(var(--radius-md)-1px)] last:rounded-e-[calc(var(--radius-md)-1px)] focus-visible:z-10 focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background",- option.days === windowDays- ? "bg-muted text-foreground"- : "text-muted-foreground hover:text-foreground",- )}- >- {option.label}- </button>- ))}- </div>- <Button- size="icon"- variant="outline"- onClick={refreshWindow}- aria-label="Refresh usage"- >- <RefreshCwIcon className="size-3.5" />- </Button>- </div>- </div>-+ <WorkspacePageContainer width="wide">{settling ? (<>{environments.length > 1 ? <UsageDeviceStrip environments={environments} /> : null}- <UsageSkeleton resolution={isPast24Hours ? "hour" : "day"} />+ <UsageSkeleton /></>) : (<>@@ -181,88 +163,62 @@ export function UsagePage() {staleEnvironments={merged.staleEnvironments}/>- {/* Cost first: the financial answer, then the provider split. */}- <section className="grid gap-6 lg:grid-cols-[minmax(0,20rem)_minmax(0,1fr)]">- {/* The summary follows the chart toggle, so the headline and the- series are always reading the same units. */}- <div className="flex flex-col gap-5">+ <section className="grid gap-6 lg:grid-cols-[minmax(0,16rem)_minmax(0,1fr)]">+ <div className="flex min-w-0 flex-col gap-5"><div className="flex flex-col gap-1">- <span className="text-xs tracking-wide text-muted-foreground uppercase">- {metric === "cost" ? "Raw token cost" : "Processed tokens"}- </span><span className="text-4xl font-semibold text-foreground tabular-nums">{metric === "cost"- ? `${formatUsd(merged.costUsd)}*`+ ? formatUsd(merged.costUsd): formatTokens(merged.totalTokens)}</span><span className="text-xs text-muted-foreground">{metric === "cost"- ? "* if billed at full API rate"- : `Input, cache reads and output across ${formatCount(merged.sessions)} sessions.`}+ ? `${formatCount(merged.sessions)} sessions · API estimate`+ : `${formatCount(merged.sessions)} sessions`}</span></div>- {orderedProviders.map((provider) => {- const share = metric === "cost" ? provider.costShare : provider.tokenShare;+ {PROVIDER_ORDER.map((provider) => {+ const totals = merged.providers.find((entry) => entry.provider === provider);+ const share =+ metric === "cost" ? (totals?.costShare ?? 0) : (totals?.tokenShare ?? 0);+ const providerSessions = totals?.sessions ?? 0;+ const sessionLabel = `${formatCount(providerSessions)} ${+ providerSessions === 1 ? "session" : "sessions"+ }`;return (- <div key={provider.provider} className="flex flex-col gap-1.5">- <div className="flex items-baseline justify-between">- <span className="flex items-center gap-2 text-sm text-foreground">- <ProviderMark provider={provider.provider} className="size-4" />- {PROVIDER_LABEL[provider.provider]}+ <div key={provider} className="flex flex-col gap-1">+ <div className="flex items-baseline justify-between gap-4">+ <span className="flex min-w-0 items-center gap-2 text-sm text-foreground">+ <ProviderMark provider={provider} className="size-4" />+ <span className="flex min-w-0 items-baseline gap-1.5">+ <span className="truncate">{PROVIDER_LABEL[provider]}</span>+ <span className="shrink-0 whitespace-nowrap text-[11px] text-muted-foreground tabular-nums">+ {sessionLabel}+ </span>+ </span></span>- <span className="text-sm text-foreground tabular-nums">+ <span className="shrink-0 text-sm font-medium text-foreground tabular-nums">{metric === "cost"- ? formatUsd(provider.costUsd)- : formatTokens(provider.totalTokens)}+ ? formatUsd(totals?.costUsd ?? 0)+ : formatTokens(totals?.totalTokens ?? 0)}</span></div>- <div className="h-1 w-full overflow-hidden rounded-full bg-muted">- <div- className="h-full"- style={{- width: `${(share * 100).toFixed(1)}%`,- backgroundColor: PROVIDER_COLOR[provider.provider],- }}- />- </div><span className="text-xs text-muted-foreground">{metric === "cost"- ? `${formatPercent(share)} of cost · ${formatTokens(provider.totalTokens)} tokens`- : `${formatPercent(share)} of tokens · ${formatUsd(provider.costUsd)}`}+ ? `${formatPercent(share)} of cost · ${formatTokens(totals?.totalTokens ?? 0)} tokens`+ : `${formatPercent(share)} of tokens · ${formatUsd(totals?.costUsd ?? 0)}`}</span></div>);})}</div>- <div className="flex flex-col gap-3">- <div className="flex flex-wrap items-center justify-between gap-3">- <h2 className="text-sm font-medium text-foreground">- {isPast24Hours ? "Hourly" : "Daily"}{" "}- {metric === "tokens" ? "processed tokens" : "cost"}- </h2>- <div className="flex items-center gap-4">- <div className="flex overflow-hidden rounded-md border border-border">- {(["cost", "tokens"] as const).map((option) => (- <button- key={option}- type="button"- onClick={() => setMetric(option)}- className={cn(- "cursor-pointer px-2.5 py-1 text-[10px] tracking-wide uppercase",- option === metric- ? "bg-muted text-foreground"- : "text-muted-foreground hover:text-foreground",- )}- >- {option}- </button>- ))}- </div>- <UsageChartLegend />- </div>- </div>+ <div className="flex min-w-0 flex-col gap-3">+ <h2 className="text-sm font-medium text-foreground">+ {isPast24Hours ? "Hourly" : "Daily"}{" "}+ {metric === "tokens" ? "processed tokens" : "cost"}+ </h2><UsageProviderChartdays={days}daily={merged.daily}@@ -276,63 +232,42 @@ export function UsagePage() {</div></section>- <section className="grid grid-cols-2 gap-px border-y border-border bg-border md:grid-cols-5">- <Metric- label="Processed tokens"- value={formatTokens(merged.totalTokens)}- detail={`${formatTokens(periodAverage)} per active ${isPast24Hours ? "hour" : "day"}`}- />- <Metric- label="Cached input"- value={formatTokens(merged.cachedInputTokens)}- detail={`${formatPercent(cachedShare)} of observed input`}- />- <Metric- label="Uncached input"- value={formatTokens(merged.uncachedInputTokens)}- detail={`${formatTokens(merged.cacheCreationTokens)} cache writes`}- />- <Metric- label="Output"- value={formatTokens(merged.outputTokens)}- detail={`includes ${formatTokens(merged.reasoningTokens)} reasoning`}- />- <Metric- label="Cache savings"- value={formatUsd(merged.costQuality.cacheSavingsUsd)}- detail={- merged.costUsd > 0- ? `${(merged.costQuality.cacheSavingsUsd / merged.costUsd).toFixed(1)}x the raw token cost`- : "vs full input rates"- }- />+ <section className="flex flex-col gap-2">+ <h2 className="text-sm font-medium text-foreground">Totals</h2>+ <div className="grid grid-cols-2 gap-x-6 gap-y-4 py-1 md:grid-cols-5">+ <Metric label="Processed tokens" value={formatTokens(merged.totalTokens)} />+ <Metric label="Cached input" value={formatTokens(merged.cachedInputTokens)} />+ <Metric+ label="Uncached input"+ value={formatTokens(merged.uncachedInputTokens)}+ />+ <Metric label="Output" value={formatTokens(merged.outputTokens)} />+ <Metric+ label="Cache savings"+ value={formatUsd(merged.costQuality.cacheSavingsUsd)}+ />+ </div></section><section className="flex flex-col gap-3"><div className="flex items-center justify-between gap-3"><h2 className="text-sm font-medium text-foreground">Breakdown</h2>- <div className="flex overflow-hidden rounded-md border border-border">+ <SegmentedTabList aria-label="Usage breakdown">{([- { value: "model", label: "model" },- { value: "time", label: isPast24Hours ? "hour" : "day" },+ { value: "model", label: "Model" },+ { value: "time", label: isPast24Hours ? "Hour" : "Day" },] as const).map((option) => (- <button+ <SegmentedTabkey={option.value}- type="button"+ selected={option.value === breakdown}onClick={() => setBreakdown(option.value)}- className={cn(- "cursor-pointer px-2.5 py-1 text-[10px] tracking-wide uppercase",- option.value === breakdown- ? "bg-muted text-foreground"- : "text-muted-foreground hover:text-foreground",- )}>{option.label}- </button>+ </SegmentedTab>))}- </div>+ </SegmentedTabList></div>{breakdown === "model" ? (@@ -356,7 +291,7 @@ export function UsagePage() {merged.models.map((model) => (<trkey={`${model.provider}:${model.model}`}- className="border-b border-border/50"+ className="hover:bg-muted/20"><td className="py-2 text-foreground"><span className="flex items-center gap-2">@@ -403,7 +338,7 @@ export function UsagePage() {recentPeriods.map((period) => (<trkey={"hourStart" in period ? period.hourStart : period.day}- className="border-b border-border/50"+ className="hover:bg-muted/20"><td className="py-2 text-foreground">{"hourStart" in period@@ -433,7 +368,7 @@ export function UsagePage() {</section></>)}- </div>+ </WorkspacePageContainer></ScrollArea></div></SidebarInset>@@ -452,20 +387,11 @@ function ProviderMark({return <Mark className={cn("shrink-0", className)} aria-hidden />;}-function Metric({- label,- value,- detail,-}: {- readonly label: string;- readonly value: string;- readonly detail: string;-}) {+function Metric({ label, value }: { readonly label: string; readonly value: string }) {return (- <div className="flex flex-col gap-0.5 bg-background px-4 py-3">+ <div className="flex min-w-0 flex-col gap-0.5"><span className="text-xs text-muted-foreground">{label}</span>- <span className="text-lg text-foreground tabular-nums">{value}</span>- <span className="text-xs text-muted-foreground">{detail}</span>+ <span className="text-base font-medium text-foreground tabular-nums">{value}</span></div>);}@@ -569,70 +495,51 @@ function UsageDeviceStrip({);}-/** Deterministic bar heights (each unique: they double as keys). */-const SKELETON_BAR_HEIGHTS = [34, 58, 41, 72, 22, 12, 49, 63, 80, 38, 55, 26, 44, 67];-/**- * Static stand-in with the loaded page's shape: headline, provider split,- * chart and metrics strip. No shimmer; blocks fill in exactly once when the- * last device answers.+ * Static stand-in with the loaded page's shape. No shimmer; blocks fill in+ * exactly once when the last device answers.*/-function UsageSkeleton({ resolution }: { readonly resolution: "day" | "hour" }) {+function UsageSkeleton() {return (<>- <section className="grid gap-6 lg:grid-cols-[minmax(0,20rem)_minmax(0,1fr)]">+ <section className="grid gap-6 lg:grid-cols-[minmax(0,16rem)_minmax(0,1fr)]"><div className="flex flex-col gap-5"><div className="flex flex-col gap-1">- <span className="text-xs tracking-wide text-muted-foreground uppercase">- Raw token cost- </span>- <div className="my-1.5 h-8 w-36 rounded-sm bg-muted" />- <div className="h-3 w-28 rounded-sm bg-muted" />+ <div className="h-8 w-36 rounded-sm bg-muted" />+ <div className="h-3 w-32 rounded-sm bg-muted" /></div>-{PROVIDER_ORDER.map((provider) => (- <div key={provider} className="flex flex-col gap-1.5">- <div className="flex items-center justify-between">- <span className="flex items-center gap-2 text-sm text-foreground">+ <div key={provider} className="flex flex-col gap-1">+ <div className="flex items-center justify-between gap-4">+ <span className="flex items-center gap-2"><ProviderMark provider={provider} className="size-4" />- {PROVIDER_LABEL[provider]}+ <div className="h-3.5 w-20 rounded-sm bg-muted" /></span><div className="h-3.5 w-14 rounded-sm bg-muted" /></div>- <div className="h-1 w-full rounded-full bg-muted" /><div className="h-3 w-36 rounded-sm bg-muted" /></div>))}</div><div className="flex flex-col gap-3">- <h2 className="py-1 text-sm font-medium text-foreground">- {resolution === "hour" ? "Hourly" : "Daily"} cost- </h2>- {/* Mirrors the chart's h-56 body and w-14 axis gutter to avoid a- relayout when the real chart swaps in. */}- <div className="flex h-56 items-end gap-1 pl-16">- {SKELETON_BAR_HEIGHTS.map((height) => (- <div- key={height}- className="flex-1 rounded-sm bg-muted"- style={{ height: `${height}%` }}- />- ))}- </div>+ <div className="h-4 w-24 rounded-sm bg-muted" />+ <div className="h-56 rounded-sm bg-muted/35" /></div></section>- <section className="grid grid-cols-2 gap-px border-y border-border bg-border md:grid-cols-5">- {["Processed tokens", "Cached input", "Uncached input", "Output", "Cache savings"].map(- (label) => (- <div key={label} className="flex flex-col gap-0.5 bg-background px-4 py-3">- <span className="text-xs text-muted-foreground">{label}</span>- <div className="my-1 h-5 w-16 rounded-sm bg-muted" />- <div className="h-3 w-24 rounded-sm bg-muted" />- </div>- ),- )}+ <section className="flex flex-col gap-2">+ <h2 className="text-sm font-medium text-foreground">Totals</h2>+ <div className="grid grid-cols-2 gap-x-6 gap-y-4 py-1 md:grid-cols-5">+ {["Processed tokens", "Cached input", "Uncached input", "Output", "Cache savings"].map(+ (label) => (+ <div key={label} className="flex flex-col gap-0.5">+ <span className="text-xs text-muted-foreground">{label}</span>+ <div className="my-0.5 h-4 w-16 rounded-sm bg-muted" />+ </div>+ ),+ )}+ </div></section></>);diff --git a/apps/web/src/components/usage/UsageProviderChart.tsx b/apps/web/src/components/usage/UsageProviderChart.tsxindex f41945bfe..963c28fe6 100644--- a/apps/web/src/components/usage/UsageProviderChart.tsx+++ b/apps/web/src/components/usage/UsageProviderChart.tsx@@ -1,5 +1,5 @@import type { UsageProviderKind } from "@t3tools/contracts";-import { useCallback, useMemo, useRef, useState } from "react";+import { useCallback, useLayoutEffect, useMemo, useRef, useState } from "react";import type { DailyTotals, HourlyTotals } from "@t3tools/shared/usageMerge";import {@@ -68,13 +68,7 @@ function buildPeriodColumns(});}-/**- * Monotone cubic tangents (Fritsch-Carlson).- *- * Plain cubic smoothing overshoots on spiky daily data and would dip the area- * below zero between points, which reads as negative spend. This variant is- * shape-preserving, so a smoothed series never leaves the range of its samples.- */+/** Shape-preserving cubic tangents that cannot overshoot spiky usage data. */function monotoneTangents(points: readonly Point[]): readonly number[] {const count = points.length;if (count < 2) return [0];@@ -115,7 +109,6 @@ function monotoneTangents(points: readonly Point[]): readonly number[] {return tangents;}-/** One cubic segment of a smoothed boundary. */interface CurveSegment {readonly from: Point;readonly c1: Point;@@ -123,7 +116,6 @@ interface CurveSegment {readonly to: Point;}-/** Smoothed polyline through `points`, as explicit cubic control points. */function smoothCurve(points: readonly Point[]): readonly CurveSegment[] {if (points.length < 2) return [];const tangents = monotoneTangents(points);@@ -144,10 +136,10 @@ function smoothCurve(points: readonly Point[]): readonly CurveSegment[] {return segments;}-function curvePath(segments: readonly CurveSegment[], startCommand: "M" | "L"): string {+function curvePath(segments: readonly CurveSegment[]): string {const first = segments[0];if (first === undefined) return "";- let path = `${startCommand}${first.from.x.toFixed(2)},${first.from.y.toFixed(2)}`;+ let path = `M${first.from.x.toFixed(2)},${first.from.y.toFixed(2)}`;for (const segment of segments) {path += ` C${segment.c1.x.toFixed(2)},${segment.c1.y.toFixed(2)} ${segment.c2.x.toFixed(2)},${segment.c2.y.toFixed(2)} ${segment.to.x.toFixed(2)},${segment.to.y.toFixed(2)}`;}@@ -179,10 +171,8 @@ export function niceScale(peak: number, count: number): { max: number; ticks: re/*** Turns the merged daily totals into one column per day.*- * Values are absolute, not cumulative: the series are layered from a shared- * zero baseline rather than stacked. A stacked chart puts whichever provider is- * drawn last permanently above the other, which reads as "that one is bigger"- * even on days where it is not.+ * Values are absolute, not cumulative: each provider is drawn from the same+ * zero baseline so the chart never implies that one provider is always larger.** The chart paths and the hover readout both consume this, so the number under* the cursor is by construction the number that was plotted rather than a@@ -216,42 +206,39 @@ export function UsageProviderChart({);const [hoverIndex, setHoverIndex] = useState<number | null>(null);const plotRef = useRef<HTMLDivElement | null>(null);+ const tooltipRef = useRef<HTMLDivElement | null>(null);+ const hoverPositionRef = useRef<{ x: number; y: number } | null>(null);- const { paths, ticks, stepX, toY, series } = useMemo(() => {+ const { paths, series, stepX, ticks, toY } = useMemo(() => {if (periods.length === 0) {return {paths: [],- ticks: [0] as readonly number[],+ series: [] as readonly DayColumn[],stepX: 0,+ ticks: [0] as readonly number[],toY: () => VIEW_HEIGHT,- series: [] as readonly DayColumn[],};}const columns = buildPeriodColumns(periods, byPeriod, metric);-- // The scale tops out at the largest single provider-day, not the largest- // sum: layered series each measure from zero, so a combined peak would- // leave the plot permanently half empty.const peak = columns.reduce((max, column) => column.bands.reduce((inner, band) => Math.max(inner, band.value), max),0,);const { max, ticks: tickValues } = niceScale(peak, TICK_COUNT);const step = periods.length === 1 ? 0 : VIEW_WIDTH / (periods.length - 1);- // Reserve a sliver above the top gridline so the series stroke, which is- // drawn at constant screen width, is not shaved off at a peak.const toY = (value: number) =>max === 0 ? VIEW_HEIGHT : VIEW_HEIGHT - (value / max) * (VIEW_HEIGHT - PLOT_TOP);const built = PROVIDER_ORDER.map((provider, providerIndex) => {- const curve = smoothCurve(- columns.map((column, dayIndex) => ({- x: dayIndex * step,- y: toY(column.bands[providerIndex]?.value ?? 0),- })),+ const line = curvePath(+ smoothCurve(+ columns.map((column, periodIndex) => ({+ x: periodIndex * step,+ y: toY(column.bands[providerIndex]?.value ?? 0),+ })),+ ),);- const line = curvePath(curve, "M");return {provider,total: columns.reduce((sum, column) => sum + (column.bands[providerIndex]?.value ?? 0), 0),@@ -260,30 +247,65 @@ export function UsageProviderChart({};});- // Paint the heavier series first so the lighter one is never buried under- // it. The fills are faint enough that the order barely shows, but the- // strokes are drawn in a second pass regardless, so neither can be hidden.- const ordered = [...built].sort((a, b) => b.total - a.total);-- return { paths: ordered, ticks: tickValues, stepX: step, toY, series: columns };+ return {+ paths: built.toSorted((a, b) => b.total - a.total),+ series: columns,+ stepX: step,+ ticks: tickValues,+ toY,+ };}, [byPeriod, metric, periods]);const format = metric === "tokens" ? formatTokens : formatUsd;+ const positionTooltip = useCallback(() => {+ const plot = plotRef.current;+ const tooltip = tooltipRef.current;+ const hoverPosition = hoverPositionRef.current;+ if (plot === null || tooltip === null || hoverPosition === null) return;++ const gap = 12;+ const tooltipWidth = tooltip.offsetWidth;+ const tooltipHeight = tooltip.offsetHeight;+ const plotWidth = plot.clientWidth;+ const plotHeight = plot.clientHeight;+ const preferredLeft =+ hoverPosition.x + gap + tooltipWidth <= plotWidth+ ? hoverPosition.x + gap+ : hoverPosition.x - gap - tooltipWidth;+ const preferredTop =+ hoverPosition.y + gap + tooltipHeight <= plotHeight+ ? hoverPosition.y + gap+ : hoverPosition.y - gap - tooltipHeight;+ const left = Math.min(Math.max(0, preferredLeft), Math.max(0, plotWidth - tooltipWidth));+ const top = Math.min(Math.max(0, preferredTop), Math.max(0, plotHeight - tooltipHeight));+ plot.style.setProperty("--usage-tooltip-left", `${left}px`);+ plot.style.setProperty("--usage-tooltip-top", `${top}px`);+ }, []);++ useLayoutEffect(() => {+ if (hoverIndex !== null) positionTooltip();+ }, [hoverIndex, positionTooltip]);+const handleMove = useCallback((event: React.MouseEvent<HTMLDivElement>) => {- const bounds = plotRef.current?.getBoundingClientRect();- if (bounds === undefined || bounds.width === 0 || periods.length === 0) return;- const fraction = (event.clientX - bounds.left) / bounds.width;+ const plot = plotRef.current;+ if (plot === null || periods.length === 0) return;+ const bounds = plot.getBoundingClientRect();+ if (bounds.width === 0) return;+ const localX = Math.min(bounds.width, Math.max(0, event.clientX - bounds.left));+ const localY = Math.min(bounds.height, Math.max(0, event.clientY - bounds.top));+ const fraction = localX / bounds.width;const index = Math.round(fraction * (periods.length - 1));+ hoverPositionRef.current = { x: localX, y: localY };+ positionTooltip();setHoverIndex(Math.min(periods.length - 1, Math.max(0, index)));},- [periods.length],+ [periods.length, positionTooltip],);const hoveredPeriod = hoverIndex === null ? undefined : periods[hoverIndex];const hoveredColumn = hoverIndex === null ? undefined : series[hoverIndex];- const hoverLeft = periods.length <= 1 ? 0 : ((hoverIndex ?? 0) / (periods.length - 1)) * 100;const formatPeriod = (period: string) =>resolution === "hour" ? formatHourShort(period, timeZone) : formatDayShort(period);const formatTooltipPeriod = (period: string) =>@@ -311,7 +333,10 @@ export function UsageProviderChart({ref={plotRef}className="relative h-56 flex-1"onMouseMove={handleMove}- onMouseLeave={() => setHoverIndex(null)}+ onMouseLeave={() => {+ hoverPositionRef.current = null;+ setHoverIndex(null);+ }}><svgclassName="h-full w-full"@@ -337,7 +362,6 @@ export function UsageProviderChart({);})}- {/* Fills first, then every stroke, so no series covers another's line. */}{paths.map(({ provider, area }) => (<path key={provider} d={area} fill={PROVIDER_COLOR[provider]} fillOpacity={0.12} />))}@@ -368,10 +392,11 @@ export function UsageProviderChart({{hoveredPeriod === undefined ? null : (<div- className="pointer-events-none absolute top-0 z-10 min-w-36 border border-border bg-background/95 px-2 py-1.5 text-xs"+ ref={tooltipRef}+ className="pointer-events-none absolute z-10 min-w-36 max-w-full rounded-xl border border-border/50 bg-background/65 px-2.5 py-2 text-xs shadow-lg backdrop-blur-xl backdrop-saturate-150"style={{- left: `${hoverLeft}%`,- transform: hoverLeft > 60 ? "translateX(-100%)" : "translateX(0)",+ left: "var(--usage-tooltip-left, 0px)",+ top: "var(--usage-tooltip-top, 0px)",}}><div className="mb-1 text-muted-foreground">{formatTooltipPeriod(hoveredPeriod)}</div>@@ -418,21 +443,3 @@ export function UsageProviderChart({</div>);}--export function UsageChartLegend() {- return (- <div className="flex items-center gap-4">- {PROVIDER_ORDER.map((provider) => {- // The marks carry the same fills as the bands, so they key the chart- // just as a colour swatch would.- const Mark = PROVIDER_MARK[provider];- return (- <span key={provider} className="flex items-center gap-1.5 text-xs text-muted-foreground">- <Mark className="size-3.5 shrink-0" aria-hidden />- {PROVIDER_LABEL[provider]}- </span>- );- })}- </div>- );-}diff --git a/apps/web/src/components/usage/usageProviders.ts b/apps/web/src/components/usage/usageProviders.tsindex f8b65877d..3ec171859 100644--- a/apps/web/src/components/usage/usageProviders.ts+++ b/apps/web/src/components/usage/usageProviders.ts@@ -3,9 +3,7 @@ import type { UsageProviderKind } from "@t3tools/contracts";import { ClaudeAI, type Icon, OpenAI } from "../Icons";/**- * Series and table order. The chart layers both providers from a shared zero- * baseline, so this only fixes the reading order of legends, tables and hover- * rows; it does not decide which series sits above the other.+ * Stable provider reading order across summaries, tables, and hover rows.*/export const PROVIDER_ORDER: readonly UsageProviderKind[] = ["codex", "claude"];diff --git a/apps/web/src/contextMenuFallback.ts b/apps/web/src/contextMenuFallback.tsindex 769826e39..4bc3237d2 100644--- a/apps/web/src/contextMenuFallback.ts+++ b/apps/web/src/contextMenuFallback.ts@@ -4,6 +4,15 @@ const SVG_NS = "http://www.w3.org/2000/svg";// Inline Lucide-style icon paths (stroke-based, viewBox 0 0 24 24, strokeWidth 2).const ICON_PATHS: Record<string, ReadonlyArray<{ tag: string; attrs: Record<string, string> }>> = {+ "chevron-right": [{ tag: "path", attrs: { d: "m9 19 7-7-7-7" } }],+ "circle-check": [+ { tag: "circle", attrs: { cx: "12", cy: "12", r: "10" } },+ { tag: "path", attrs: { d: "m9 12 2 2 4-4" } },+ ],+ clock: [+ { tag: "path", attrs: { d: "M12 6v6l4 2" } },+ { tag: "circle", attrs: { cx: "12", cy: "12", r: "10" } },+ ],pencil: [{tag: "path",@@ -17,6 +26,71 @@ const ICON_PATHS: Record<string, ReadonlyArray<{ tag: string; attrs: Record<stri{ tag: "rect", attrs: { width: "14", height: "14", x: "8", y: "8", rx: "2", ry: "2" } },{ tag: "path", attrs: { d: "M4 16c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h10c1.1 0 2 .9 2 2" } },],+ folder: [+ {+ tag: "path",+ attrs: {+ d: "M20 20a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2h-7.9a2 2 0 0 1-1.69-.9L9.6 3.9A2 2 0 0 0 7.93 3H4a2 2 0 0 0-2 2v13a2 2 0 0 0 2 2Z",+ },+ },+ ],+ "git-branch": [+ { tag: "line", attrs: { x1: "6", x2: "6", y1: "3", y2: "15" } },+ { tag: "circle", attrs: { cx: "18", cy: "6", r: "3" } },+ { tag: "circle", attrs: { cx: "6", cy: "18", r: "3" } },+ { tag: "path", attrs: { d: "M18 9a9 9 0 0 1-9 9" } },+ ],+ hash: [+ { tag: "line", attrs: { x1: "4", x2: "20", y1: "9", y2: "9" } },+ { tag: "line", attrs: { x1: "4", x2: "20", y1: "15", y2: "15" } },+ { tag: "line", attrs: { x1: "10", x2: "8", y1: "3", y2: "21" } },+ { tag: "line", attrs: { x1: "16", x2: "14", y1: "3", y2: "21" } },+ ],+ "mail-open": [+ {+ tag: "path",+ attrs: {+ d: "M21.2 8.4c.5.38.8.97.8 1.6v10a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V10a2 2 0 0 1 .8-1.6l8-6a2 2 0 0 1 2.4 0l8 6Z",+ },+ },+ { tag: "path", attrs: { d: "m22 10-8.97 5.7a1.94 1.94 0 0 1-2.06 0L2 10" } },+ ],+ "message-square-plus": [+ {+ tag: "path",+ attrs: {+ d: "M22 17a2 2 0 0 1-2 2H6.828a2 2 0 0 0-1.414.586l-2.202 2.202A.71.71 0 0 1 2 21.286V5a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2z",+ },+ },+ { tag: "path", attrs: { d: "M12 8v6" } },+ { tag: "path", attrs: { d: "M9 11h6" } },+ ],+ pin: [+ { tag: "path", attrs: { d: "M12 17v5" } },+ {+ tag: "path",+ attrs: {+ d: "M9 10.76a2 2 0 0 1-1.11 1.79l-1.78.9A2 2 0 0 0 5 15.24V16a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-.76a2 2 0 0 0-1.11-1.79l-1.78-.9A2 2 0 0 1 15 10.76V7a1 1 0 0 1 1-1 2 2 0 0 0 0-4H8a2 2 0 0 0 0 4 1 1 0 0 1 1 1z",+ },+ },+ ],+ "pin-off": [+ { tag: "path", attrs: { d: "M12 17v5" } },+ { tag: "path", attrs: { d: "M15 9.34V7a1 1 0 0 1 1-1 2 2 0 0 0 0-4H7.89" } },+ { tag: "path", attrs: { d: "m2 2 20 20" } },+ {+ tag: "path",+ attrs: {+ d: "M9 9v1.76a2 2 0 0 1-1.11 1.79l-1.78.9A2 2 0 0 0 5 15.24V16a1 1 0 0 0 1 1h11",+ },+ },+ ],+ "refresh-cw": [+ { tag: "path", attrs: { d: "M3 12a9 9 0 0 1 9-9 9.75 9.75 0 0 1 6.74 2.74L21 8" } },+ { tag: "path", attrs: { d: "M21 3v5h-5" } },+ { tag: "path", attrs: { d: "M21 12a9 9 0 0 1-9 9 9.75 9.75 0 0 1-6.74-2.74L3 16" } },+ { tag: "path", attrs: { d: "M8 16H3v5" } },+ ],"folder-tree": [{tag: "path",@@ -44,7 +118,7 @@ const ICON_PATHS: Record<string, ReadonlyArray<{ tag: string; attrs: Record<strifunction createIconElement(name: string, tone: "neutral" | "destructive"): SVGSVGElement | null {const paths = ICON_PATHS[name];- if (!paths) {+ if (!paths || typeof document.createElementNS !== "function") {return null;}const svg = document.createElementNS(SVG_NS, "svg");@@ -57,7 +131,7 @@ function createIconElement(name: string, tone: "neutral" | "destructive"): SVGSVsvg.setAttribute("stroke-linejoin", "round");svg.setAttribute("class",- tone === "destructive" ? "size-3.5 shrink-0" : "size-3.5 shrink-0 text-muted-foreground",+ tone === "destructive" ? "size-4 shrink-0" : "size-4 shrink-0 text-muted-foreground",);for (const node of paths) {const child = document.createElementNS(SVG_NS, node.tag);@@ -200,6 +274,16 @@ export function showContextMenuFallback<T extends string>("max-height:min(24rem,70vh);min-width:0;max-width:24rem;overflow-x:hidden;overflow-y:auto;padding:0.25rem;";for (const item of entries) {+ if (item.separatorBefore === true && inner.childElementCount > 0) {+ const separator = document.createElement("div");+ separator.className = "my-1 h-px bg-border/70";+ separator.style.cssText =+ "height:1px;margin:0.25rem 0;background:var(--border);opacity:0.7;";+ separator.dataset.contextMenuSeparator = "true";+ separator.setAttribute("role", "separator");+ inner.appendChild(separator);+ }+if (item.header === true) {const header = document.createElement("div");header.className = "px-2 py-1.5 font-medium text-muted-foreground text-xs";@@ -247,10 +331,12 @@ export function showContextMenuFallback<T extends string>(button.appendChild(label);if (hasChildren) {- const chevron = document.createElement("span");- chevron.className = "ms-auto shrink-0 text-muted-foreground/80 text-sm leading-none";- chevron.textContent = ">";- button.appendChild(chevron);+ const chevron = createIconElement("chevron-right", "neutral");+ if (chevron) {+ chevron.setAttribute("class", "ms-auto size-4 shrink-0 text-muted-foreground/80");+ chevron.dataset.contextMenuChevron = "true";+ button.appendChild(chevron);+ }}if (!isDisabled) {diff --git a/apps/web/src/index.css b/apps/web/src/index.cssindex 4e636eb4f..bd49f5370 100644--- a/apps/web/src/index.css+++ b/apps/web/src/index.css@@ -241,6 +241,22 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobilopacity: 1;}}+ @keyframes live-activity-focus {+ 0% {+ transform: translateX(0);+ }+ 100% {+ transform: translateX(100%);+ }+ }+ @keyframes live-activity-focus-counter {+ 0% {+ transform: translateX(0);+ }+ 100% {+ transform: translateX(-100%);+ }+ }@keyframes status-ping {/* Burst first (immediate feedback for click ripples), then holdinvisible for the rest of the cycle. Mirrors animate-ping's@@ -431,6 +447,62 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil}}+@utility live-activity-focus {+ --live-activity-focus-width: 4.5rem;++ right: auto;+ left: calc(-1 * var(--live-activity-focus-width));+ width: calc(100% + var(--live-activity-focus-width) + var(--live-activity-focus-width));+ -webkit-mask-image: linear-gradient(+ to right,+ transparent 0,+ rgb(0 0 0 / 12%) 0.675rem,+ rgb(0 0 0 / 55%) 1.575rem,+ black 2.25rem,+ rgb(0 0 0 / 55%) 2.925rem,+ rgb(0 0 0 / 12%) 3.825rem,+ transparent var(--live-activity-focus-width),+ transparent 100%+ );+ -webkit-mask-repeat: no-repeat;+ mask-image: linear-gradient(+ to right,+ transparent 0,+ rgb(0 0 0 / 12%) 0.675rem,+ rgb(0 0 0 / 55%) 1.575rem,+ black 2.25rem,+ rgb(0 0 0 / 55%) 2.925rem,+ rgb(0 0 0 / 12%) 3.825rem,+ transparent var(--live-activity-focus-width),+ transparent 100%+ );+ mask-repeat: no-repeat;+ animation: live-activity-focus 2.2s linear infinite;+ will-change: transform;++ @media (prefers-reduced-motion: reduce) {+ animation: none;+ opacity: 0;+ will-change: auto;+ }+}++@utility live-activity-focus-counter {+ width: 100%;+ animation: live-activity-focus-counter 2.2s linear infinite;+ will-change: transform;++ @media (prefers-reduced-motion: reduce) {+ animation: none;+ will-change: auto;+ }+}++@utility live-activity-focus-aligned {+ width: calc(100% - var(--live-activity-focus-width) - var(--live-activity-focus-width));+ margin-left: var(--live-activity-focus-width);+}+@layer base {:root {/* Keep the original T3 Code artwork palettes as the defaults. Built-in@@ -1349,15 +1421,16 @@ html[data-theme-id] [data-chat-header] [data-toolbar-control] {/* The panel layout toggles stay ghost: they render both inside the header andin the titlebar strip, so filling them would make them change appearance as- the panel opens. They only take the themed foreground; hover and pressed- keep the base ghost accent. The tooltip trigger's data-slot wins over the- toggle's when the trigger renders the toggle, so match both. */+ the panel opens. Their icons use the same themed foreground as the toolbar+ action text; hover and pressed keep the base ghost accent. The tooltip+ trigger's data-slot wins over the toggle's when it renders the toggle, so+ match both. */html[data-theme-id] [data-panel-layout-controls] [data-slot="toggle"],html[data-theme-id] [data-panel-layout-controls] [data-slot="tooltip-trigger"],html[data-theme-id] [data-workspace-titlebar-controls] [data-slot="toggle"],html[data-theme-id] [data-workspace-titlebar-controls] [data-slot="tooltip-trigger"] {- --control-icon-color: var(--toolbar-foreground);- color: var(--toolbar-foreground);+ --control-icon-color: var(--toolbar-control-foreground);+ color: var(--toolbar-control-foreground);}html[data-theme-id] [data-chat-header] [data-slot="button"]:hover,diff --git a/apps/web/src/lib/openPullRequestLink.ts b/apps/web/src/lib/openPullRequestLink.tsindex 0b7e6bf0f..5bfb80bfe 100644--- a/apps/web/src/lib/openPullRequestLink.ts+++ b/apps/web/src/lib/openPullRequestLink.ts@@ -118,6 +118,17 @@ export function parseChangeRequestUrl(targetUrl: string): ChangeRequestLink | nureturn null;}+/** The repository root behind a recognised change-request URL, without PR-specific state. */+export function changeRequestRepositoryUrl(targetUrl: string): string | null {+ const changeRequest = parseChangeRequestUrl(targetUrl);+ if (changeRequest === null) return null;+ const url = new URL(targetUrl);+ url.pathname = `/${changeRequest.repository}`;+ url.search = "";+ url.hash = "";+ return url.toString();+}+function claim(host: string, match: RegExpExecArray | null): ChangeRequestLink | null {const repository = match?.[1];const number = Number(match?.[2]);diff --git a/apps/web/src/routes/-chatIndexTitlebar.test.ts b/apps/web/src/routes/-chatIndexTitlebar.test.tsindex 803ba7871..0e1fdc9f8 100644--- a/apps/web/src/routes/-chatIndexTitlebar.test.ts+++ b/apps/web/src/routes/-chatIndexTitlebar.test.ts@@ -15,9 +15,7 @@ describe("hosted static onboarding header", () => {const onboardingHeader = routeSource.slice(onboardingStart, onboardingEnd);- expect(onboardingHeader).toContain("h-[var(--workspace-topbar-height)]");- expect(onboardingHeader).toContain("min-h-[var(--workspace-topbar-height)]");- expect(onboardingHeader).toContain("COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS");+ expect(onboardingHeader).toContain('<WorkspacePageHeader className="border-b border-border">');expect(onboardingHeader).not.toMatch(/(?:^|\s)(?:[\w-]+:)*py-/);});});diff --git a/apps/web/src/routes/_chat.index.tsx b/apps/web/src/routes/_chat.index.tsxindex 4f4da0c75..271715be3 100644--- a/apps/web/src/routes/_chat.index.tsx+++ b/apps/web/src/routes/_chat.index.tsx@@ -8,6 +8,7 @@ import { sortScopedProjectsForSidebar } from "../components/Sidebar.logic";import { Button } from "../components/ui/button";import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from "../components/ui/empty";import { SidebarInset } from "../components/ui/sidebar";+import { WorkspacePageHeader } from "../components/WorkspacePageContainer";import { useNewThreadHandler } from "../hooks/useHandleNewThread";import {useAllEnvironmentShellsBootstrapped,@@ -17,8 +18,6 @@ import {import { useEnvironments } from "../state/environments";import { APP_DISPLAY_NAME } from "~/branding";import { hasCloudPublicConfig } from "~/cloud/publicConfig";-import { cn } from "~/lib/utils";-import { COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS } from "~/workspaceTitlebar";function ChatIndexRouteView() {const { authGateState } = Route.useRouteContext();@@ -143,18 +142,13 @@ function HostedStaticOnboardingState() {return (<SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground"><div className="flex min-h-0 min-w-0 flex-1 flex-col overflow-x-hidden bg-background">- <header- className={cn(- "flex h-[var(--workspace-topbar-height)] min-h-[var(--workspace-topbar-height)] shrink-0 items-center border-b border-border px-3 transition-[padding-left] duration-200 ease-linear motion-reduce:transition-none sm:px-5",- COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS,- )}- >+ <WorkspacePageHeader className="border-b border-border"><div className="flex items-center gap-2"><span className="text-sm font-medium text-foreground md:text-muted-foreground/60">{APP_DISPLAY_NAME}</span></div>- </header>+ </WorkspacePageHeader><Empty className="flex-1"><div className="w-full max-w-xl rounded-3xl border border-border/55 bg-card/20 px-8 py-12 shadow-sm/5">diff --git a/apps/web/src/routes/_chat.pull-requests.tsx b/apps/web/src/routes/_chat.pull-requests.tsxindex 66d9f0caa..7d73a225d 100644--- a/apps/web/src/routes/_chat.pull-requests.tsx+++ b/apps/web/src/routes/_chat.pull-requests.tsx@@ -74,6 +74,12 @@ import {WorkspaceBreadcrumbItem,WorkspaceBreadcrumbSeparator,} from "../components/WorkspaceBreadcrumb";+import {+ WorkspacePageContainer,+ WorkspacePageHeader,+ WorkspacePageHeaderEdgeControl,+} from "../components/WorkspacePageContainer";+import { isElectron } from "../env";import { PanelLayoutControls } from "../components/chat/PanelLayoutControls";import { Button } from "../components/ui/button";import { Menu, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "../components/ui/menu";@@ -99,7 +105,6 @@ import {import { useAtomCommand } from "../state/use-atom-command";import { cn } from "~/lib/utils";import { getSourceControlPresentationForKind } from "~/sourceControlPresentation";-import { COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS } from "~/workspaceTitlebar";export interface PullRequestsSearch {readonly involvement: PullRequestInvolvement;@@ -1181,6 +1186,17 @@ function PullRequestsRouteView() {: null,[search.number, search.repository, selectedProject],);+ const linkedSelectionMatchesSurface =+ linkedSelection !== null &&+ selectedPullRequestSurface !== null &&+ linkedSelection.environmentId === selectedPullRequestSurface.environmentId &&+ linkedSelection.projectId === selectedPullRequestSurface.projectId &&+ linkedSelection.repository === selectedPullRequestSurface.repository &&+ linkedSelection.number === selectedPullRequestSurface.number;+ // A closed panel keeps its tabs so reopening does not discard work. Those retained tabs are+ // history, though, not a current selection: without this check they leave the toggle looking+ // available after the selected pull request has been cleared.+ const rightPanelAvailable = activePullRequestSurface !== null || linkedSelectionMatchesSurface;useEffect(() => {if (!pullRequestsSupported || rightPanelRef === null || linkedSelection === null) return;useRightPanelStore.getState().openPullRequest(rightPanelRef, linkedSelection);@@ -1294,9 +1310,10 @@ function PullRequestsRouteView() {terminalAvailable={false}terminalOpen={false}terminalShortcutLabel={null}- rightPanelAvailable={rightPanelState.surfaces.length > 0}+ rightPanelAvailable={rightPanelAvailable}rightPanelOpen={rightPanelState.isOpen}rightPanelShortcutLabel={null}+ rightPanelUnavailableLabel="Select a pull request first"liveAgentCount={0}onToggleTerminal={() => undefined}onToggleRightPanel={toggleRightPanel}@@ -1603,7 +1620,6 @@ function PullRequestsRouteView() {reviewingQuery.refresh();}}onStateChange={handlePullRequestTabStatusChange}- chromeVariant="collapse"/></RightPanelTabs>) : null}@@ -1827,18 +1843,10 @@ function PullRequestsColumn({// Painted flat like the chat column: the inset underneath carries the chrome grain, and a// content surface that lets it show reads as a different background than every thread.<div className="flex min-h-0 min-w-0 flex-1 flex-col bg-background">- <header- className={cn(- "drag-region flex h-[var(--workspace-topbar-height)] min-h-[var(--workspace-topbar-height)] shrink-0 items-center gap-1.5 px-3 sm:px-5",- // A closed right panel leaves this column full-width, so its header runs- // underneath the native window controls on Windows; reserve the inset the- // way Settings and the chat view do. While the panel is open the column- // ends at the panel's left edge and the absolute controls strip (already- // WCO-aware) owns the top-right corner.- !rightPanelOpen && "wco:pr-[var(--workspace-native-controls-inset)]",- COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS,- )}- >+ {/* A closed right panel leaves this column full-width, so the shared header+ reserves native window controls. While the panel is open, the column ends+ at the panel and the absolute controls strip owns the top-right corner. */}+ <WorkspacePageHeader electron={isElectron} reserveNativeControls={!rightPanelOpen}>{condensed ? (<WorkspaceBreadcrumb ariaLabel="Pull request scope">{/* The page name remains the foreground anchor in both states; the live filters are@@ -1880,27 +1888,24 @@ function PullRequestsColumn({)}<div className="min-w-0 flex-1" />{condensed ? (- <ExpandableSearch- searchInput={searchInput}- searchValue={searchValue}- open={searchOpen}- onOpenChange={setSearchOpen}- focusToken={searchFocusToken}- onFocusWithin={(focused) => {- topbarSearchFocusedRef.current = focused;- }}- />+ <div className="flex shrink-0 items-center gap-1.5">+ <ExpandableSearch+ searchInput={searchInput}+ searchValue={searchValue}+ open={searchOpen}+ onOpenChange={setSearchOpen}+ focusToken={searchFocusToken}+ onFocusWithin={(focused) => {+ topbarSearchFocusedRef.current = focused;+ }}+ />+ <PullRequestRefreshControl compact refreshing={refreshing} onRefresh={onRefresh} />+ </div>+ ) : null}+ {rightPanelControl ? (+ <WorkspacePageHeaderEdgeControl>{rightPanelControl}</WorkspacePageHeaderEdgeControl>) : null}- <Button- size="icon-sm"- variant="ghost"- aria-label="Refresh pull requests"- onClick={onRefresh}- >- <RefreshCwIcon className={cn("size-4", refreshing && "animate-spin")} />- </Button>- {rightPanelControl}- </header>+ </WorkspacePageHeader><divref={scrollRef}@@ -1909,19 +1914,43 @@ function PullRequestsColumn({{/* The top padding is the fade band's own height (1.5rem here), the same pairing thesettings page makes: at rest the controls sit fully below the mask, and onlycontent actually passing under the chrome fades. */}- <div className="mx-auto flex w-full max-w-4xl flex-col gap-4 px-5 pt-6 pb-12">+ <WorkspacePageContainer className="gap-4"><div className="flex flex-col gap-3"><div ref={inFlowSearchRef} className="flex items-center gap-2">{searchInput}{filtersMenu}+ {!condensed ? (+ <PullRequestRefreshControl refreshing={refreshing} onRefresh={onRefresh} />+ ) : null}</div>{/* Scrolled past this marker, the controls are gone and the title takes over. */}<div ref={markerRef} aria-hidden className="-mt-3 h-px w-full" /></div>{listBody}- </div>+ </WorkspacePageContainer></div></div>);}++function PullRequestRefreshControl({+ compact = false,+ refreshing,+ onRefresh,+}: {+ compact?: boolean;+ refreshing: boolean;+ onRefresh: () => void;+}) {+ return (+ <Button+ size={compact ? "icon-sm" : "icon"}+ variant={compact ? "ghost" : "outline"}+ aria-label="Refresh pull requests"+ onClick={onRefresh}+ >+ <RefreshCwIcon className={cn("size-4", refreshing && "animate-spin")} />+ </Button>+ );+}diff --git a/apps/web/src/routes/settings.tsx b/apps/web/src/routes/settings.tsxindex a4b248c84..431e196de 100644--- a/apps/web/src/routes/settings.tsx+++ b/apps/web/src/routes/settings.tsx@@ -13,9 +13,8 @@ import { useSettingsRestore } from "../components/settings/SettingsPanels";import { SettingsBreadcrumb } from "../components/settings/SettingsBreadcrumb";import { Button } from "../components/ui/button";import { SidebarInset } from "../components/ui/sidebar";+import { WorkspacePageHeader } from "../components/WorkspacePageContainer";import { isElectron } from "../env";-import { cn } from "~/lib/utils";-import { COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS } from "~/workspaceTitlebar";function RestoreDefaultsButton({ onRestored }: { onRestored: () => void }) {const { changedSettingLabels, restoreDefaults } = useSettingsRestore(onRestored);@@ -72,41 +71,16 @@ function SettingsContentLayout() {return (<SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground isolate"><div className="flex min-h-0 min-w-0 flex-1 flex-col bg-background text-foreground">- {!isElectron && (- <header- className={cn(- "flex h-[var(--workspace-topbar-height)] min-h-[var(--workspace-topbar-height)] shrink-0 items-center px-3 transition-[padding-left] duration-200 ease-linear motion-reduce:transition-none sm:px-5",- COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS,- )}- >- <div className="flex w-full items-center gap-2">- <SettingsBreadcrumb pathname={location.pathname} />- {showRestoreDefaults ? (- <div className="ms-auto flex items-center gap-2">- <RestoreDefaultsButton onRestored={handleRestored} />- </div>- ) : null}- </div>- </header>- )}-- {isElectron && (- <div- className={cn(- "drag-region flex h-[52px] shrink-0 items-center px-5 transition-[padding-left] duration-200 ease-linear motion-reduce:transition-none wco:h-[env(titlebar-area-height)] wco:pr-[calc(100vw-env(titlebar-area-width)-env(titlebar-area-x)+1em)]",- COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS,- )}- >- <div className="flex w-full items-center gap-2">- <SettingsBreadcrumb pathname={location.pathname} />- {showRestoreDefaults ? (- <div className="ms-auto flex items-center gap-2">- <RestoreDefaultsButton onRestored={handleRestored} />- </div>- ) : null}- </div>+ <WorkspacePageHeader electron={isElectron}>+ <div className="flex w-full items-center gap-3">+ <SettingsBreadcrumb pathname={location.pathname} />+ {showRestoreDefaults ? (+ <div className="ms-auto flex items-center gap-2">+ <RestoreDefaultsButton onRestored={handleRestored} />+ </div>+ ) : null}</div>- )}+ </WorkspacePageHeader><div key={restoreSignal} className="min-h-0 flex flex-1 flex-col"><Outlet />diff --git a/apps/web/src/session-logic.test.ts b/apps/web/src/session-logic.test.tsindex f5effff66..2eadd1fc5 100644--- a/apps/web/src/session-logic.test.ts+++ b/apps/web/src/session-logic.test.ts@@ -722,24 +722,144 @@ describe("workEntryIndicatesToolFailure", () => {});describe("deriveWorkLogEntries", () => {- it("omits tool started entries and keeps completed entries", () => {+ it("shows a command from its start event while it is still running", () => {const activities: OrchestrationThreadActivity[] = [+ makeActivity({+ id: "tool-start",+ createdAt: "2026-02-23T00:00:02.000Z",+ summary: "Command run started",+ kind: "tool.started",+ payload: {+ itemType: "command_execution",+ toolCallId: "call-1",+ status: "inProgress",+ title: "Command run",+ detail: "Bash: vp test run",+ data: {+ toolName: "Bash",+ input: { command: "vp test run" },+ },+ },+ }),+ ];++ const [entry] = deriveWorkLogEntries(activities);+ expect(entry).toMatchObject({+ id: "tool-start",+ command: "vp test run",+ toolCallId: "call-1",+ toolLifecycleStatus: "inProgress",+ sourceActivityKind: "tool.started",+ });+ });++ it("retains the start command when the matching completion omits it", () => {+ const activities: OrchestrationThreadActivity[] = [+ makeActivity({+ id: "tool-start",+ createdAt: "2026-02-23T00:00:02.000Z",+ summary: "Command run started",+ kind: "tool.started",+ payload: {+ itemType: "command_execution",+ toolCallId: "call-1",+ status: "inProgress",+ title: "Command run",+ data: { input: { command: "vp test run" } },+ },+ }),+ makeActivity({+ id: "other-tool-start",+ createdAt: "2026-02-23T00:00:02.500Z",+ summary: "Other command started",+ kind: "tool.started",+ payload: {+ itemType: "command_execution",+ toolCallId: "call-2",+ status: "inProgress",+ title: "Other command",+ data: { input: { command: "vp lint" } },+ },+ }),makeActivity({id: "tool-complete",createdAt: "2026-02-23T00:00:03.000Z",- summary: "Tool call complete",+ summary: "Command run",kind: "tool.completed",+ payload: {+ itemType: "command_execution",+ toolCallId: "call-1",+ status: "completed",+ title: "Command run",+ },}),makeActivity({- id: "tool-start",+ id: "other-tool-complete",+ createdAt: "2026-02-23T00:00:04.000Z",+ summary: "Other command",+ kind: "tool.completed",+ payload: {+ itemType: "command_execution",+ toolCallId: "call-2",+ status: "completed",+ title: "Other command",+ },+ }),+ ];++ const entries = deriveWorkLogEntries(activities);+ expect(entries).toHaveLength(2);+ expect(entries[0]).toMatchObject({+ id: "tool-complete",+ command: "vp test run",+ toolCallId: "call-1",+ toolLifecycleStatus: "completed",+ sourceActivityKind: "tool.completed",+ });+ expect(entries[1]).toMatchObject({+ id: "other-tool-complete",+ command: "vp lint",+ toolCallId: "call-2",+ toolLifecycleStatus: "completed",+ sourceActivityKind: "tool.completed",+ });+ });++ it("does not merge non-adjacent tool starts without stable call ids", () => {+ const activities: OrchestrationThreadActivity[] = [+ makeActivity({+ id: "unkeyed-start-1",+ createdAt: "2026-02-23T00:00:01.000Z",+ summary: "Search started",+ kind: "tool.started",+ payload: { itemType: "search", title: "Search", status: "inProgress" },+ }),+ makeActivity({+ id: "keyed-start",createdAt: "2026-02-23T00:00:02.000Z",- summary: "Tool call",+ summary: "Command started",+ kind: "tool.started",+ payload: {+ itemType: "command_execution",+ toolCallId: "call-between",+ title: "Command",+ status: "inProgress",+ },+ }),+ makeActivity({+ id: "unkeyed-start-2",+ createdAt: "2026-02-23T00:00:03.000Z",+ summary: "Search started",kind: "tool.started",+ payload: { itemType: "search", title: "Search", status: "inProgress" },}),];- const entries = deriveWorkLogEntries(activities);- expect(entries.map((entry) => entry.id)).toEqual(["tool-complete"]);+ expect(deriveWorkLogEntries(activities).map((entry) => entry.id)).toEqual([+ "unkeyed-start-1",+ "keyed-start",+ "unkeyed-start-2",+ ]);});it("omits task.started but shows task.progress and task.completed", () => {@@ -1239,6 +1359,7 @@ describe("deriveWorkLogEntries", () => {expect(entries).toHaveLength(1);expect(entries[0]).toMatchObject({id: "grep-complete",+ toolCallId: "tool-grep-1",toolTitle: "grep",detail: "19 files",itemType: "web_search",diff --git a/apps/web/src/session-logic.ts b/apps/web/src/session-logic.tsindex 4d0a76cf1..efe1876df 100644--- a/apps/web/src/session-logic.ts+++ b/apps/web/src/session-logic.ts@@ -65,6 +65,8 @@ export interface WorkLogEntry {id: string;createdAt: string;turnId?: TurnId | null;+ /** Stable provider identity across in-progress and completed lifecycle updates. */+ toolCallId?: string;label: string;detail?: string;command?: string;@@ -748,7 +750,6 @@ export function deriveWorkLogEntries(const ordered = [...activities].toSorted(compareActivitiesByOrder);const entries: DerivedWorkLogEntry[] = [];for (const activity of ordered) {- if (activity.kind === "tool.started") continue;// Agent task.started rows are CTA seeds: they carry the true spawn turn,// which is the batch key (completions of background subagents arrive// under later synthetic turns and must not start new batches). They@@ -757,8 +758,13 @@ export function deriveWorkLogEntries(if (activity.kind === "task.updated") continue;if (activity.kind === "tool.progress") continue;if (activity.kind === "context-window.updated") continue;+ // Plan updates have a dedicated task row. Keeping the raw activity here+ // duplicates it as a legacy "Work Log / Plan updated" row when history+ // is expanded.+ if (activity.kind === "turn.plan.updated") continue;if (activity.summary === "Checkpoint captured") continue;if (isPlanBoundaryToolActivity(activity)) continue;+ if (isCodexTerminalInteractionActivity(activity)) continue;if (isAgentInternalActivity(activity)) continue;entries.push(toDerivedWorkLogEntry(activity));}@@ -769,7 +775,11 @@ export function deriveWorkLogEntries(}function isPlanBoundaryToolActivity(activity: OrchestrationThreadActivity): boolean {- if (activity.kind !== "tool.updated" && activity.kind !== "tool.completed") {+ if (+ activity.kind !== "tool.started" &&+ activity.kind !== "tool.updated" &&+ activity.kind !== "tool.completed"+ ) {return false;}@@ -780,6 +790,28 @@ function isPlanBoundaryToolActivity(activity: OrchestrationThreadActivity): boolreturn typeof payload?.detail === "string" && payload.detail.startsWith("ExitPlanMode:");}+/**+ * Codex terminal interactions report bytes written to an already-running PTY.+ * Some thread histories contain them as generic tool.updated rows, so filter+ * their exact wire shape from the presentation model. This repairs existing+ * history without deleting or rewriting persisted activities.+ */+function isCodexTerminalInteractionActivity(activity: OrchestrationThreadActivity): boolean {+ if (activity.kind !== "tool.updated") {+ return false;+ }+ const payload = asRecord(activity.payload);+ const data = asRecord(payload?.data);+ return (+ payload?.itemType === "command_execution" &&+ typeof data?.itemId === "string" &&+ typeof data.processId === "string" &&+ typeof data.stdin === "string" &&+ typeof data.threadId === "string" &&+ typeof data.turnId === "string"+ );+}+function extractWorkLogToolLifecycleStatus(payload: Record<string, unknown> | null,): WorkLogToolLifecycleStatus | undefined {@@ -878,6 +910,9 @@ function toDerivedWorkLogEntry(activity: OrchestrationThreadActivity): DerivedWoentry.toolCallId = toolCallId;}let toolLifecycleStatus = extractWorkLogToolLifecycleStatus(payload);+ if (!toolLifecycleStatus && activity.kind === "tool.started") {+ toolLifecycleStatus = "inProgress";+ }if (!toolLifecycleStatus && activity.kind === "tool.completed") {toolLifecycleStatus = "completed";}@@ -933,6 +968,17 @@ function agentSpawnGroupKey(entry: DerivedWorkLogEntry): string {return entry.turnId ? `direct:${entry.turnId}` : `direct:task:${taskId}`;}+function toolLifecycleCollapseMapKey(entry: DerivedWorkLogEntry): string | undefined {+ if (+ entry.activityKind !== "tool.started" &&+ entry.activityKind !== "tool.updated" &&+ entry.activityKind !== "tool.completed"+ ) {+ return undefined;+ }+ return entry.toolCallId ? `tool:${entry.toolCallId}` : undefined;+}+function collapseDerivedWorkLogEntries(entries: ReadonlyArray<DerivedWorkLogEntry>,): DerivedWorkLogEntry[] {@@ -949,6 +995,7 @@ function collapseDerivedWorkLogEntries(// own turn splintered one batch into a stream of "Kicked off N subagents"// rows (live-test finding, thread 7ac7ef05).const groupKeyByTaskId = new Map<string, string>();+ const toolLifecycleRowIndex = new Map<string, number>();for (const entry of entries) {const isTaskRow =entry.taskId !== undefined &&@@ -993,12 +1040,40 @@ function collapseDerivedWorkLogEntries(});continue;}+ const lifecycleKey = toolLifecycleCollapseMapKey(entry);+ if (lifecycleKey !== undefined) {+ const matchingLifecycleIndex = toolLifecycleRowIndex.get(lifecycleKey);+ if (matchingLifecycleIndex !== undefined) {+ const matchingEntry = collapsed[matchingLifecycleIndex];+ if (matchingEntry && shouldCollapseToolLifecycleEntries(matchingEntry, entry)) {+ toolLifecycleRowIndex.delete(lifecycleKey);+ const merged = mergeDerivedWorkLogEntries(matchingEntry, entry);+ collapsed[matchingLifecycleIndex] = merged;+ if (merged.activityKind !== "tool.completed") {+ toolLifecycleRowIndex.set(lifecycleKey, matchingLifecycleIndex);+ }+ continue;+ }+ toolLifecycleRowIndex.delete(lifecycleKey);+ }+ }const previous = collapsed.at(-1);if (previous && shouldCollapseToolLifecycleEntries(previous, entry)) {- collapsed[collapsed.length - 1] = mergeDerivedWorkLogEntries(previous, entry);+ const previousIndex = collapsed.length - 1;+ const previousKey = toolLifecycleCollapseMapKey(previous);+ if (previousKey !== undefined) toolLifecycleRowIndex.delete(previousKey);+ const merged = mergeDerivedWorkLogEntries(previous, entry);+ collapsed[previousIndex] = merged;+ const mergedKey = toolLifecycleCollapseMapKey(merged);+ if (mergedKey !== undefined && merged.activityKind !== "tool.completed") {+ toolLifecycleRowIndex.set(mergedKey, previousIndex);+ }continue;}collapsed.push(entry);+ if (lifecycleKey !== undefined && entry.activityKind !== "tool.completed") {+ toolLifecycleRowIndex.set(lifecycleKey, collapsed.length - 1);+ }}return collapsed;}@@ -1007,10 +1082,18 @@ function shouldCollapseToolLifecycleEntries(previous: DerivedWorkLogEntry,next: DerivedWorkLogEntry,): boolean {- if (previous.activityKind !== "tool.updated" && previous.activityKind !== "tool.completed") {+ if (+ previous.activityKind !== "tool.started" &&+ previous.activityKind !== "tool.updated" &&+ previous.activityKind !== "tool.completed"+ ) {return false;}- if (next.activityKind !== "tool.updated" && next.activityKind !== "tool.completed") {+ if (+ next.activityKind !== "tool.started" &&+ next.activityKind !== "tool.updated" &&+ next.activityKind !== "tool.completed"+ ) {return false;}if (previous.activityKind === "tool.completed") {@@ -1080,7 +1163,11 @@ function deriveToolLifecycleCollapseKey(entry: DerivedWorkLogEntry): string | un) {return `task${entry.taskId}`;}- if (entry.activityKind !== "tool.updated" && entry.activityKind !== "tool.completed") {+ if (+ entry.activityKind !== "tool.started" &&+ entry.activityKind !== "tool.updated" &&+ entry.activityKind !== "tool.completed"+ ) {return undefined;}if (entry.toolCallId) {@@ -1283,6 +1370,8 @@ function extractToolCommand(payload: Record<string, unknown> | null): {const item = asRecord(data?.item);const itemResult = asRecord(item?.result);const itemInput = asRecord(item?.input);+ const dataInput = asRecord(data?.input);+ const stateInput = asRecord(asRecord(data?.state)?.input);const itemType = asTrimmedString(payload?.itemType);const detail = asTrimmedString(payload?.detail);const candidates: unknown[] = [@@ -1290,6 +1379,8 @@ function extractToolCommand(payload: Record<string, unknown> | null): {itemInput?.command,itemResult?.command,data?.command,+ dataInput?.command,+ stateInput?.command,itemType === "command_execution" && detail ? stripTrailingExitCode(detail).output : null,];@@ -1316,7 +1407,7 @@ function extractToolTitle(payload: Record<string, unknown> | null): string | nulfunction extractToolCallId(payload: Record<string, unknown> | null): string | null {const data = asRecord(payload?.data);- return asTrimmedString(data?.toolCallId);+ return asTrimmedString(payload?.toolCallId) ?? asTrimmedString(data?.toolCallId);}function normalizeInlinePreview(value: string): string {diff --git a/apps/web/src/terminalUiStateStore.test.ts b/apps/web/src/terminalUiStateStore.test.tsindex b0b1df96e..f7a6412d5 100644--- a/apps/web/src/terminalUiStateStore.test.ts+++ b/apps/web/src/terminalUiStateStore.test.ts@@ -18,6 +18,7 @@ describe("terminalUiStateStore actions", () => {useTerminalUiStateStore.persist.clearStorage();useTerminalUiStateStore.setState({terminalUiStateByThreadKey: {},+ terminalCustomLabelsByThreadKey: {},suppressedTerminalIdsByThreadKey: {},});});@@ -248,6 +249,8 @@ describe("terminalUiStateStore actions", () => {it("reconciles terminal ids from an external ordered list", () => {const store = useTerminalUiStateStore.getState();store.setTerminalOpen(THREAD_REF, true);+ store.setTerminalCustomLabel(THREAD_REF, "term-a", "API server");+ store.setTerminalCustomLabel(THREAD_REF, "stale-term", "Old task");store.reconcileTerminalIds(THREAD_REF, ["term-a", "term-b"]);const terminalUiState = selectThreadTerminalUiState(@@ -260,6 +263,11 @@ describe("terminalUiStateStore actions", () => {{ id: "group-term-a", terminalIds: ["term-a"] },{ id: "group-term-b", terminalIds: ["term-b"] },]);+ expect(+ useTerminalUiStateStore.getState().terminalCustomLabelsByThreadKey[+ scopedThreadKey(THREAD_REF)+ ],+ ).toEqual({ "term-a": "API server" });});it("does not import a closed panel terminal from stale metadata", () => {diff --git a/apps/web/src/terminalUiStateStore.ts b/apps/web/src/terminalUiStateStore.tsindex 290ca8e59..545e195a1 100644--- a/apps/web/src/terminalUiStateStore.ts+++ b/apps/web/src/terminalUiStateStore.ts@@ -32,8 +32,11 @@ const TERMINAL_UI_STATE_STORAGE_KEY = "t3code:terminal-state:v1";interface PersistedTerminalUiStateStoreState {terminalUiStateByThreadKey?: Record<string, ThreadTerminalUiState>;terminalStateByThreadKey?: Record<string, ThreadTerminalUiState>;+ terminalCustomLabelsByThreadKey?: Record<string, Record<string, string>>;}+const EMPTY_TERMINAL_CUSTOM_LABELS: Readonly<Record<string, string>> = Object.freeze({});+export function migratePersistedTerminalUiStateStoreState(persistedState: unknown,_version: number,@@ -50,8 +53,32 @@ export function migratePersistedTerminalUiStateStoreState(parseScopedThreadKey(threadKey),),);+ const terminalCustomLabelsByThreadKey = Object.fromEntries(+ Object.entries(candidate.terminalCustomLabelsByThreadKey ?? {}).flatMap(+ ([threadKey, labels]) => {+ if (!parseScopedThreadKey(threadKey) || !labels || typeof labels !== "object") return [];+ const normalizedLabels = Object.fromEntries(+ Object.entries(labels).flatMap(([terminalId, label]) => {+ const normalizedTerminalId = terminalId.trim();+ const normalizedLabel = typeof label === "string" ? label.trim().slice(0, 80) : "";+ return normalizedTerminalId && normalizedLabel+ ? [[normalizedTerminalId, normalizedLabel] as const]+ : [];+ }),+ );+ return Object.keys(normalizedLabels).length > 0+ ? [[threadKey, normalizedLabels] as const]+ : [];+ },+ ),+ );- return { terminalUiStateByThreadKey };+ return {+ terminalUiStateByThreadKey,+ ...(Object.keys(terminalCustomLabelsByThreadKey).length > 0+ ? { terminalCustomLabelsByThreadKey }+ : {}),+ };}function createTerminalUiStateStorage() {@@ -489,6 +516,18 @@ export function selectThreadTerminalUiState();}+export function selectThreadTerminalCustomLabels(+ terminalCustomLabelsByThreadKey: Record<string, Record<string, string>>,+ threadRef: ScopedThreadRef | null | undefined,+): Readonly<Record<string, string>> {+ if (!threadRef || threadRef.threadId.length === 0) {+ return EMPTY_TERMINAL_CUSTOM_LABELS;+ }+ return (+ terminalCustomLabelsByThreadKey[terminalThreadKey(threadRef)] ?? EMPTY_TERMINAL_CUSTOM_LABELS+ );+}+function updateTerminalUiStateByThreadKey(terminalUiStateByThreadKey: Record<string, ThreadTerminalUiState>,threadRef: ScopedThreadRef,@@ -562,6 +601,7 @@ function removeRecordEntry<T>(record: Record<string, T>, key: string): Record<stinterface TerminalUiStateStoreState {terminalUiStateByThreadKey: Record<string, ThreadTerminalUiState>;+ terminalCustomLabelsByThreadKey: Record<string, Record<string, string>>;/** Closed ids hidden from stale server metadata until that id is explicitly opened again. */suppressedTerminalIdsByThreadKey: Record<string, string[]>;setTerminalOpen: (threadRef: ScopedThreadRef, open: boolean) => void;@@ -575,6 +615,11 @@ interface TerminalUiStateStoreState {options?: { open?: boolean; active?: boolean },) => void;setActiveTerminal: (threadRef: ScopedThreadRef, terminalId: string) => void;+ setTerminalCustomLabel: (+ threadRef: ScopedThreadRef,+ terminalId: string,+ label: string | null,+ ) => void;closeTerminal: (threadRef: ScopedThreadRef, terminalId: string) => void;reconcileTerminalIds: (threadRef: ScopedThreadRef, nextIds: string[]) => void;clearTerminalUiState: (threadRef: ScopedThreadRef) => void;@@ -591,7 +636,12 @@ export const useTerminalUiStateStore = create<TerminalUiStateStoreState>()(state: ThreadTerminalUiState,suppressedTerminalIds: readonly string[],) => ThreadTerminalUiState,- suppression?: { terminalId: string; suppressed: boolean },+ suppression?: {+ terminalId: string;+ suppressed: boolean;+ clearCustomLabel?: boolean;+ },+ pruneCustomLabels = false,) => {set((state) => {const threadKey = terminalThreadKey(threadRef);@@ -609,21 +659,57 @@ export const useTerminalUiStateStore = create<TerminalUiStateStoreState>()(suppression.suppressed,): state.suppressedTerminalIdsByThreadKey;+ const terminalIdToClear = suppression?.clearCustomLabel+ ? suppression.terminalId.trim()+ : "";+ const currentLabels = state.terminalCustomLabelsByThreadKey[threadKey] ?? {};+ let nextTerminalCustomLabelsByThreadKey =+ terminalIdToClear.length > 0 && currentLabels[terminalIdToClear] !== undefined+ ? Object.keys(currentLabels).length === 1+ ? removeRecordEntry(state.terminalCustomLabelsByThreadKey, threadKey)+ : {+ ...state.terminalCustomLabelsByThreadKey,+ [threadKey]: removeRecordEntry(currentLabels, terminalIdToClear),+ }+ : state.terminalCustomLabelsByThreadKey;+ if (pruneCustomLabels) {+ const survivingIds = new Set(+ selectThreadTerminalUiState(nextTerminalUiStateByThreadKey, threadRef).terminalIds,+ );+ const labelsForThread = nextTerminalCustomLabelsByThreadKey[threadKey] ?? {};+ const survivingLabels = Object.fromEntries(+ Object.entries(labelsForThread).filter(([terminalId]) =>+ survivingIds.has(terminalId),+ ),+ );+ if (Object.keys(survivingLabels).length !== Object.keys(labelsForThread).length) {+ nextTerminalCustomLabelsByThreadKey =+ Object.keys(survivingLabels).length > 0+ ? {+ ...nextTerminalCustomLabelsByThreadKey,+ [threadKey]: survivingLabels,+ }+ : removeRecordEntry(nextTerminalCustomLabelsByThreadKey, threadKey);+ }+ }if (nextTerminalUiStateByThreadKey === state.terminalUiStateByThreadKey &&- nextSuppressedTerminalIdsByThreadKey === state.suppressedTerminalIdsByThreadKey+ nextSuppressedTerminalIdsByThreadKey === state.suppressedTerminalIdsByThreadKey &&+ nextTerminalCustomLabelsByThreadKey === state.terminalCustomLabelsByThreadKey) {return state;}return {terminalUiStateByThreadKey: nextTerminalUiStateByThreadKey,suppressedTerminalIdsByThreadKey: nextSuppressedTerminalIdsByThreadKey,+ terminalCustomLabelsByThreadKey: nextTerminalCustomLabelsByThreadKey,};});};return {terminalUiStateByThreadKey: {},+ terminalCustomLabelsByThreadKey: {},suppressedTerminalIdsByThreadKey: {},setTerminalOpen: (threadRef, open) => {const terminalState = selectThreadTerminalUiState(@@ -682,22 +768,56 @@ export const useTerminalUiStateStore = create<TerminalUiStateStoreState>()(),setActiveTerminal: (threadRef, terminalId) =>updateTerminal(threadRef, (state) => setThreadActiveTerminal(state, terminalId)),+ setTerminalCustomLabel: (threadRef, terminalId, label) =>+ set((state) => {+ const normalizedTerminalId = terminalId.trim();+ if (normalizedTerminalId.length === 0) return state;+ const threadKey = terminalThreadKey(threadRef);+ const currentLabels = state.terminalCustomLabelsByThreadKey[threadKey] ?? {};+ const normalizedLabel = label?.trim().slice(0, 80) ?? "";+ if (normalizedLabel.length > 0) {+ if (currentLabels[normalizedTerminalId] === normalizedLabel) return state;+ return {+ terminalCustomLabelsByThreadKey: {+ ...state.terminalCustomLabelsByThreadKey,+ [threadKey]: { ...currentLabels, [normalizedTerminalId]: normalizedLabel },+ },+ };+ }+ if (currentLabels[normalizedTerminalId] === undefined) return state;+ const { [normalizedTerminalId]: _removed, ...remainingLabels } = currentLabels;+ return {+ terminalCustomLabelsByThreadKey:+ Object.keys(remainingLabels).length > 0+ ? {+ ...state.terminalCustomLabelsByThreadKey,+ [threadKey]: remainingLabels,+ }+ : removeRecordEntry(state.terminalCustomLabelsByThreadKey, threadKey),+ };+ }),closeTerminal: (threadRef, terminalId) =>updateTerminal(threadRef, (state) => closeThreadTerminal(state, terminalId), {terminalId,suppressed: true,+ clearCustomLabel: true,}),reconcileTerminalIds: (threadRef, nextIds) =>- updateTerminal(threadRef, (state, suppressedTerminalIds) => {- if (suppressedTerminalIds.length === 0) {- return reconcileThreadTerminalSessionIds(state, nextIds);- }- const suppressedIds = new Set(suppressedTerminalIds);- return reconcileThreadTerminalSessionIds(- state,- nextIds.filter((terminalId) => !suppressedIds.has(terminalId)),- );- }),+ updateTerminal(+ threadRef,+ (state, suppressedTerminalIds) => {+ if (suppressedTerminalIds.length === 0) {+ return reconcileThreadTerminalSessionIds(state, nextIds);+ }+ const suppressedIds = new Set(suppressedTerminalIds);+ return reconcileThreadTerminalSessionIds(+ state,+ nextIds.filter((terminalId) => !suppressedIds.has(terminalId)),+ );+ },+ undefined,+ true,+ ),clearTerminalUiState: (threadRef) =>set((state) => {const threadKey = terminalThreadKey(threadRef);@@ -708,14 +828,20 @@ export const useTerminalUiStateStore = create<TerminalUiStateStoreState>()();const hadSuppressedTerminalIds =state.suppressedTerminalIdsByThreadKey[threadKey] !== undefined;+ const hadCustomLabels = state.terminalCustomLabelsByThreadKey[threadKey] !== undefined;if (nextTerminalUiStateByThreadKey === state.terminalUiStateByThreadKey &&- !hadSuppressedTerminalIds+ !hadSuppressedTerminalIds &&+ !hadCustomLabels) {return state;}return {terminalUiStateByThreadKey: nextTerminalUiStateByThreadKey,+ terminalCustomLabelsByThreadKey: removeRecordEntry(+ state.terminalCustomLabelsByThreadKey,+ threadKey,+ ),suppressedTerminalIdsByThreadKey: removeRecordEntry(state.suppressedTerminalIdsByThreadKey,threadKey,@@ -728,7 +854,8 @@ export const useTerminalUiStateStore = create<TerminalUiStateStoreState>()(const hadTerminalUiState = state.terminalUiStateByThreadKey[threadKey] !== undefined;const hadSuppressedTerminalIds =state.suppressedTerminalIdsByThreadKey[threadKey] !== undefined;- if (!hadTerminalUiState && !hadSuppressedTerminalIds) {+ const hadCustomLabels = state.terminalCustomLabelsByThreadKey[threadKey] !== undefined;+ if (!hadTerminalUiState && !hadSuppressedTerminalIds && !hadCustomLabels) {return state;}return {@@ -736,6 +863,10 @@ export const useTerminalUiStateStore = create<TerminalUiStateStoreState>()(state.terminalUiStateByThreadKey,threadKey,),+ terminalCustomLabelsByThreadKey: removeRecordEntry(+ state.terminalCustomLabelsByThreadKey,+ threadKey,+ ),suppressedTerminalIdsByThreadKey: removeRecordEntry(state.suppressedTerminalIdsByThreadKey,threadKey,@@ -747,6 +878,7 @@ export const useTerminalUiStateStore = create<TerminalUiStateStoreState>()(const orphanedIds = new Set([...Object.keys(state.terminalUiStateByThreadKey),+ ...Object.keys(state.terminalCustomLabelsByThreadKey),...Object.keys(state.suppressedTerminalIdsByThreadKey),].filter((key) => !activeThreadKeys.has(key)),);@@ -757,12 +889,17 @@ export const useTerminalUiStateStore = create<TerminalUiStateStoreState>()(const nextSuppressedTerminalIdsByThreadKey = {...state.suppressedTerminalIdsByThreadKey,};+ const nextTerminalCustomLabelsByThreadKey = {+ ...state.terminalCustomLabelsByThreadKey,+ };for (const id of orphanedIds) {delete nextTerminalUiStateByThreadKey[id];+ delete nextTerminalCustomLabelsByThreadKey[id];delete nextSuppressedTerminalIdsByThreadKey[id];}return {terminalUiStateByThreadKey: nextTerminalUiStateByThreadKey,+ terminalCustomLabelsByThreadKey: nextTerminalCustomLabelsByThreadKey,suppressedTerminalIdsByThreadKey: nextSuppressedTerminalIdsByThreadKey,};}),@@ -770,11 +907,12 @@ export const useTerminalUiStateStore = create<TerminalUiStateStoreState>()(},{name: TERMINAL_UI_STATE_STORAGE_KEY,- version: 4,+ version: 5,storage: createJSONStorage(createTerminalUiStateStorage),migrate: migratePersistedTerminalUiStateStoreState,partialize: (state) => ({terminalUiStateByThreadKey: state.terminalUiStateByThreadKey,+ terminalCustomLabelsByThreadKey: state.terminalCustomLabelsByThreadKey,}),},),diff --git a/packages/contracts/src/ipc.ts b/packages/contracts/src/ipc.tsindex 09d7d7a46..03451cc7b 100644--- a/packages/contracts/src/ipc.ts+++ b/packages/contracts/src/ipc.ts@@ -111,6 +111,8 @@ export interface ContextMenuItem<T extends string = string> {header?: boolean;/** Icon keyword resolved by the web fallback. Stripped on desktop native menus. */icon?: string;+ /** Inserts a visual section divider immediately before this item. */+ separatorBefore?: boolean;children?: readonly ContextMenuItem<T>[];}@@ -121,6 +123,7 @@ export interface ContextMenuItemSchemaType {readonly disabled?: boolean;readonly header?: boolean;readonly icon?: string;+ readonly separatorBefore?: boolean;readonly children?: readonly ContextMenuItemSchemaType[];}@@ -131,6 +134,7 @@ export const ContextMenuItemSchema: Schema.Codec<ContextMenuItemSchemaType> = Scdisabled: Schema.optionalKey(Schema.Boolean),header: Schema.optionalKey(Schema.Boolean),icon: Schema.optionalKey(Schema.String),+ separatorBefore: Schema.optionalKey(Schema.Boolean),children: Schema.optionalKey(Schema.Array(Schema.suspend((): Schema.Codec<ContextMenuItemSchemaType> => ContextMenuItemSchema),diff --git a/packages/shared/src/usageMerge.test.ts b/packages/shared/src/usageMerge.test.tsindex c2fa9e2a8..81270ad32 100644--- a/packages/shared/src/usageMerge.test.ts+++ b/packages/shared/src/usageMerge.test.ts@@ -248,6 +248,7 @@ describe("mergeUsage", () => {);expect(merged.sessions).toBe(1);+ expect(merged.providers[0]?.sessions).toBe(1);});it("returns empty totals with no environments", () => {diff --git a/packages/shared/src/usageMerge.ts b/packages/shared/src/usageMerge.tsindex 886b21418..f5e54434f 100644--- a/packages/shared/src/usageMerge.ts+++ b/packages/shared/src/usageMerge.ts@@ -25,6 +25,7 @@ export interface ProviderTotals {readonly costUsd: number;readonly totalTokens: number;readonly records: number;+ readonly sessions: number;readonly costShare: number;readonly tokenShare: number;}@@ -135,22 +136,29 @@ function claimSources(environments: readonly EnvironmentUsage[]): {function ownedContribution(environment: EnvironmentUsage,ownerByFingerprint: ReadonlyMap<string, EnvironmentId>,-): { readonly buckets: readonly UsageBucket[]; readonly sessions: number } {+): {+ readonly buckets: readonly UsageBucket[];+ readonly sessionsByProvider: ReadonlyMap<UsageProviderKind, number>;+} {const ownedProviders = new Set<UsageProviderKind>();- let sessions = 0;+ const sessionsByProvider = new Map<UsageProviderKind, number>();for (const source of environment.summary.sources) {if (source.status === "missing") continue;const key = fingerprintKey(source.fingerprint);if (ownerByFingerprint.get(key) === environment.environmentId) {- ownedProviders.add(source.fingerprint.provider);+ const provider = source.fingerprint.provider;+ ownedProviders.add(provider);// Distinct within a directory. Summing per-bucket session counts instead// would count a session once per day and model it spans.- sessions += source.distinctSessions;+ sessionsByProvider.set(+ provider,+ (sessionsByProvider.get(provider) ?? 0) + source.distinctSessions,+ );}}return {buckets: environment.summary.buckets.filter((bucket) => ownedProviders.has(bucket.provider)),- sessions,+ sessionsByProvider,};}@@ -228,7 +236,7 @@ export function mergeUsage(const providerAccumulator = new Map<UsageProviderKind,- { costUsd: number; totalTokens: number; records: number }+ { costUsd: number; totalTokens: number; records: number; sessions: number }>();const modelAccumulator = new Map<string,@@ -255,12 +263,20 @@ export function mergeUsage(const contributingEnvironments: EnvironmentId[] = [];for (const environment of current) {- const { buckets, sessions: environmentSessions } = ownedContribution(- environment,- ownerByFingerprint,- );+ const { buckets, sessionsByProvider } = ownedContribution(environment, ownerByFingerprint);if (buckets.length > 0) contributingEnvironments.push(environment.environmentId);- sessions += environmentSessions;++ for (const [providerKind, providerSessions] of sessionsByProvider) {+ sessions += providerSessions;+ const provider = providerAccumulator.get(providerKind) ?? {+ costUsd: 0,+ totalTokens: 0,+ records: 0,+ sessions: 0,+ };+ provider.sessions += providerSessions;+ providerAccumulator.set(providerKind, provider);+ }for (const bucket of buckets) {const tokens = bucketTokens(bucket);@@ -280,6 +296,7 @@ export function mergeUsage(costUsd: 0,totalTokens: 0,records: 0,+ sessions: 0,};provider.costUsd += bucket.costUsd;provider.totalTokens += tokens;@@ -341,6 +358,7 @@ export function mergeUsage(costUsd: totals.costUsd,totalTokens: totals.totalTokens,records: totals.records,+ sessions: totals.sessions,costShare: costUsd === 0 ? 0 : totals.costUsd / costUsd,tokenShare: totalTokens === 0 ? 0 : totals.totalTokens / totalTokens,}))