Beautiful, AI-native markdown IDE and LLM wiki
TypeScript 2nd-brainagent-skillsclaudecodexcompany-braindocsknowledge-knowledge-baseknowledge-managementllmllm-wikillm-wiki-karpathymarkdownmarkdown-editormdmdxnotespkmsecond-brainskills
Stop chat input tooltips from covering the chat (PRD-8897) (#5163)
sarahe2f1d69f5ef3
diff --git a/.changeset/chat-input-tooltips.md b/.changeset/chat-input-tooltips.mdnew file mode 100644index 000000000..cad3657bc--- /dev/null+++ b/.changeset/chat-input-tooltips.md@@ -0,0 +1,6 @@+---+"@inkeep/open-knowledge": patch+"@inkeep/open-knowledge-desktop": patch+---++Tooltips in the agent chat and Ask AI inputs now open after a short delay and no longer stay open over the content, the agent settings button no longer shows a model summary tooltip, and the selected-option dot in menus is centered and uses the primary color.diff --git a/packages/app/src/components/BottomComposer.dom.test.tsx b/packages/app/src/components/BottomComposer.dom.test.tsxindex a24143046..4d0de8d1d 100644--- a/packages/app/src/components/BottomComposer.dom.test.tsx+++ b/packages/app/src/components/BottomComposer.dom.test.tsx@@ -496,6 +496,19 @@ describe('BottomComposer (shell behavior)', () => {restore();}});+ test('the Add to prompt tooltip closes once the pointer leaves the button, even toward the tooltip', async () => {+ const user = userEvent.setup();+ await renderComposer();+ const addToPrompt = screen.getByTestId('ask-ai-add-to-prompt');++ await user.hover(addToPrompt);+ await new Promise((resolve) => setTimeout(resolve, 300));+ expect(screen.queryByRole('tooltip')).toBeNull();+ await screen.findByRole('tooltip');+ await user.unhover(addToPrompt);++ await waitFor(() => expect(screen.queryByRole('tooltip')).toBeNull(), { timeout: 200 });+ });});describe('BottomComposer (dispatch + picker + sticky default)', () => {diff --git a/packages/app/src/components/BottomComposer.tsx b/packages/app/src/components/BottomComposer.tsxindex e4365be67..b3675f3c5 100644--- a/packages/app/src/components/BottomComposer.tsx+++ b/packages/app/src/components/BottomComposer.tsx@@ -20,6 +20,7 @@ import {ComposerCommentsMenuItem,ComposerFilesMenuItem,ComposerMentionMenuItem,+ ComposerTooltipProvider,} from '@/components/ComposerAddMenu';import { ComposerContextChips } from '@/components/ComposerContextChips';import { isExternalFileDrag } from '@/components/file-tree-adapter';@@ -648,7 +649,7 @@ export function BottomComposer({pinnedPreview = lightRenderMarkdownPreview(pinnedSelection.markdown);}- const card = (+ const cardContent = (// biome-ignore lint/a11y/noStaticElementInteractions: pointer clicks only delegate focus to the composer's editable; keyboard users focus it directly (Tab / ⇧⌘L).<divref={cardRef}@@ -837,7 +838,7 @@ export function BottomComposer({) : null}</div><div className="flex items-end gap-2">- <ComposerAddMenu testId="ask-ai-add-to-prompt" size="icon">+ <ComposerAddMenu composerRef={inputRef} testId="ask-ai-add-to-prompt" size="icon">{attachmentsAccepted ? <ComposerFilesMenuItem onFiles={ingestFiles} /> : null}{selectedCommentCount > 0 && !hasQueuedComments ? (<ComposerCommentsMenuItem@@ -957,6 +958,7 @@ export function BottomComposer({</div></div>);+ const card = <ComposerTooltipProvider>{cardContent}</ComposerTooltipProvider>;if (folderMode) {return (diff --git a/packages/app/src/components/ComposerAddMenu.dom.test.tsx b/packages/app/src/components/ComposerAddMenu.dom.test.tsxindex e23ee8c5f..8c45975c6 100644--- a/packages/app/src/components/ComposerAddMenu.dom.test.tsx+++ b/packages/app/src/components/ComposerAddMenu.dom.test.tsx@@ -34,7 +34,7 @@ describe('ComposerAddMenu', () => {render(<TooltipProvider>- <ComposerAddMenu testId="composer-add">+ <ComposerAddMenu composerRef={createRef()} testId="composer-add"><ComposerFilesMenuItem onFiles={() => {}} /><ComposerCommentsMenuItem count={3} onSelect={onComments} /><ComposerMentionMenuItem onSelect={onMention} />@@ -77,7 +77,7 @@ describe('ComposerAddMenu', () => {onSubmit={() => {}}slashCommands={[{ name: 'review', description: 'Review the current diff' }]}/>- <ComposerAddMenu testId="composer-add">+ <ComposerAddMenu composerRef={createRef()} testId="composer-add"><ComposerFilesMenuItem onFiles={() => {}} attachmentMode="reference" /><ComposerCommandsMenuItemonSelect={() => composerRef.current?.openSlashCommandPicker()}@@ -117,7 +117,7 @@ describe('ComposerAddMenu', () => {render(<TooltipProvider>- <ComposerAddMenu testId="composer-add">+ <ComposerAddMenu composerRef={createRef()} testId="composer-add"><ComposerFilesMenuItem onFiles={onFiles} /></ComposerAddMenu></TooltipProvider>,@@ -126,10 +126,48 @@ describe('ComposerAddMenu', () => {await user.click(screen.getByRole('button', { name: 'Add to prompt' }));await user.click(screen.getByRole('menuitem', { name: 'Attach files' }));- expect(onFiles).toHaveBeenCalledWith([notesFile, imageFile]);+ await waitFor(() => expect(onFiles).toHaveBeenCalledWith([notesFile, imageFile]));clickSpy.mockRestore();});+ test.each(['Attach files', 'Attach comments: 1'])(+ 'choosing %s puts focus back in the composer, not on the Add to prompt button',+ async (item) => {+ const user = userEvent.setup();+ const composerRef = createRef<ComposerMentionInputHandle>();+ const clickSpy = vi.spyOn(HTMLInputElement.prototype, 'click').mockImplementation(() => {});+ const { ComposerAddMenu, ComposerCommentsMenuItem, ComposerFilesMenuItem } = await import(+ './ComposerAddMenu'+ );+ const { ComposerMentionInput } = await import('@/editor/ComposerMentionInput');++ render(+ <TooltipProvider>+ <ComposerMentionInput+ ref={composerRef}+ ariaLabel="Prompt"+ attachmentDrop={{ kind: 'host' }}+ onEmptyChange={() => {}}+ onSubmit={() => {}}+ />+ <ComposerAddMenu composerRef={composerRef} testId="composer-add">+ <ComposerFilesMenuItem onFiles={() => {}} />+ <ComposerCommentsMenuItem count={1} onSelect={() => {}} />+ </ComposerAddMenu>+ </TooltipProvider>,+ );++ await user.click(screen.getByRole('button', { name: 'Add to prompt' }));+ await user.click(screen.getByRole('menuitem', { name: item }));++ await waitFor(() => {+ expect(document.activeElement).toBe(screen.getByRole('textbox', { name: 'Prompt' }));+ });+ expect(screen.queryByRole('tooltip')).toBeNull();+ clickSpy.mockRestore();+ },+ );+test('choosing Mention a page leaves keyboard focus in the composer', async () => {const user = userEvent.setup();const composerRef = createRef<ComposerMentionInputHandle>();@@ -145,7 +183,7 @@ describe('ComposerAddMenu', () => {onEmptyChange={() => {}}onSubmit={() => {}}/>- <ComposerAddMenu testId="composer-add">+ <ComposerAddMenu composerRef={createRef()} testId="composer-add"><ComposerMentionMenuItem onSelect={() => composerRef.current?.openMentionPicker()} /></ComposerAddMenu></TooltipProvider>,@@ -166,7 +204,7 @@ describe('ComposerAddMenu', () => {render(<TooltipProvider>- <ComposerAddMenu testId="composer-add">+ <ComposerAddMenu composerRef={createRef()} testId="composer-add"><ComposerMentionMenuItem onSelect={() => {}} /></ComposerAddMenu></TooltipProvider>,diff --git a/packages/app/src/components/ComposerAddMenu.tsx b/packages/app/src/components/ComposerAddMenu.tsxindex 3ff6d302c..a2552712f 100644--- a/packages/app/src/components/ComposerAddMenu.tsx+++ b/packages/app/src/components/ComposerAddMenu.tsx@@ -18,7 +18,7 @@ import {DropdownMenuShortcut,DropdownMenuTrigger,} from '@/components/ui/dropdown-menu';-import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';import { openFilePicker } from '@/lib/file-picker';const ComposerFocusActionContext = createContext<((action: () => void) => void) | null>(null);@@ -31,8 +31,17 @@ function useComposerFocusAction(): (action: () => void) => void {return scheduleComposerFocusAction;}+export function ComposerTooltipProvider({ children }: { children: ReactNode }): ReactNode {+ return (+ <TooltipProvider delayDuration={400} disableHoverableContent>+ {children}+ </TooltipProvider>+ );+}+type ComposerAddMenuProps = {children: ReactNode;+ composerRef: RefObject<{ focus: () => void } | null>;testId: string;size?: Extract<ComponentProps<typeof Button>['size'], 'icon-sm' | 'icon'>;} & (@@ -48,6 +57,7 @@ type ComposerAddMenuProps = {export function ComposerAddMenu({children,+ composerRef,disabled = false,disabledFocusTargetRef,testId,@@ -106,6 +116,7 @@ export function ComposerAddMenu({if (action !== null) {event.preventDefault();composerFocusActionRef.current = null;+ composerRef.current?.focus();action();}}}@@ -125,8 +136,13 @@ export function ComposerFilesMenuItem({attachmentMode?: 'embedded' | 'reference';}): ReactNode {const { t } = useLingui();+ const scheduleComposerFocusAction = useComposerFocusAction();return (- <DropdownMenuItem onSelect={() => openFilePicker({ multiple: true, onFiles })}>+ <DropdownMenuItem+ onSelect={() =>+ scheduleComposerFocusAction(() => openFilePicker({ multiple: true, onFiles }))+ }+ ><Paperclip className="size-3.5 text-muted-foreground" aria-hidden="true" /><span>{t`Attach files`}@@ -144,8 +160,12 @@ export function ComposerCommentsMenuItem({onSelect: () => void;}): ReactNode {const { t } = useLingui();+ const scheduleComposerFocusAction = useComposerFocusAction();return (- <DropdownMenuItem aria-label={t`Attach comments: ${count}`} onSelect={onSelect}>+ <DropdownMenuItem+ aria-label={t`Attach comments: ${count}`}+ onSelect={() => scheduleComposerFocusAction(onSelect)}+ ><MessageSquare className="size-3.5 text-muted-foreground" aria-hidden="true" /><span>{t`Attach comments`}</span><Badgediff --git a/packages/app/src/components/acp/ThreadView.dom.test.tsx b/packages/app/src/components/acp/ThreadView.dom.test.tsxindex 52641e343..7846b3366 100644--- a/packages/app/src/components/acp/ThreadView.dom.test.tsx+++ b/packages/app/src/components/acp/ThreadView.dom.test.tsx@@ -969,41 +969,28 @@ describe('ThreadView chat header', () => {);});- test('the hover text carries the state the accessible name carries', async () => {+ test('hovering the settings trigger opens no tooltip over the chat', async () => {const user = userEvent.setup();render(<ThreadView info={headerInfo({ effort: 'max', fast: true })} />);- const trigger = screen.getByRole('button', { name: /^Agent settings/ });-- await user.hover(trigger);-- await screen.findByRole('tooltip');- const hover = screen.getByTestId('agent-thread-settings-tooltip');- expect(hover.textContent).toBe(trigger.getAttribute('aria-label'));- });- test('the state is described once, so it is not announced twice', async () => {- const user = userEvent.setup();- render(<ThreadView info={headerInfo({ effort: 'max', fast: true })} />);- const trigger = screen.getByRole('button', { name: /^Agent settings/ });+ await user.hover(screen.getByRole('button', { name: /^Agent settings/ }));- await user.hover(trigger);-- const described = await screen.findByRole('tooltip');- expect(trigger.getAttribute('aria-label')).toContain('Opus 5');- expect(described.textContent).toBe('Agent settings');+ await new Promise((resolve) => setTimeout(resolve, 600));+ expect(screen.queryByRole('tooltip')).toBeNull();});- test('the archived hover text carries the resume hint too', async () => {+ test('composer tooltips close once the pointer leaves the trigger, even toward the tooltip', async () => {const user = userEvent.setup();- render(<ThreadView info={{ ...headerInfo({ effort: 'max', fast: true }), archived: true }} />);- const trigger = screen.getByRole('button', { name: /^Agent settings/ });-- await user.hover(trigger);+ render(<ThreadView info={headerInfo()} />);+ const addToPrompt = screen.getByTestId('agent-thread-add-to-prompt');+ await user.hover(addToPrompt);+ await new Promise((resolve) => setTimeout(resolve, 300));+ expect(screen.queryByRole('tooltip')).toBeNull();await screen.findByRole('tooltip');- const hover = screen.getByTestId('agent-thread-settings-tooltip');- expect(hover.textContent).toBe(trigger.getAttribute('aria-label'));- expect(hover.textContent).toContain('changes apply when you pick this conversation back up');+ await user.unhover(addToPrompt);++ await waitFor(() => expect(screen.queryByRole('tooltip')).toBeNull(), { timeout: 200 });});test('an archived thread announces the same state it shows', () => {diff --git a/packages/app/src/components/acp/ThreadView.tsx b/packages/app/src/components/acp/ThreadView.tsxindex 859649200..baa68304f 100644--- a/packages/app/src/components/acp/ThreadView.tsx+++ b/packages/app/src/components/acp/ThreadView.tsx@@ -73,6 +73,7 @@ import {ComposerCommentsMenuItem,ComposerFilesMenuItem,ComposerMentionMenuItem,+ ComposerTooltipProvider,} from '@/components/ComposerAddMenu';import { ComposerContextChips } from '@/components/ComposerContextChips';import { CopyButton } from '@/components/CopyButton';@@ -1852,40 +1853,33 @@ function AgentSettingsPopover({return (<DropdownMenu>- <Tooltip>- <TooltipTrigger asChild>- <DropdownMenuTrigger asChild>- <AgentSettingsTrigger- ref={triggerRef}- label={settingsLabel}- className="min-w-0 max-w-sm shrink gap-1.5"+ <DropdownMenuTrigger asChild>+ <AgentSettingsTrigger+ ref={triggerRef}+ label={settingsLabel}+ className="min-w-0 max-w-sm shrink gap-1.5"+ >+ <span className="min-w-0 truncate">{triggerText}</span>+ {fastOn ? (+ <span className="shrink-0 text-muted-foreground" data-testid="agent-thread-fast">+ {t`Fast`}+ </span>+ ) : null}+ {effortText !== null ? (+ <span className="shrink-0 text-muted-foreground" data-testid="agent-thread-effort">+ {effortText}+ </span>+ ) : null}+ {readOnlyShellOn ? (+ <span+ className="shrink-0 text-muted-foreground"+ data-testid="agent-thread-read-only-shell">- <span className="min-w-0 truncate">{triggerText}</span>- {fastOn ? (- <span className="shrink-0 text-muted-foreground" data-testid="agent-thread-fast">- {t`Fast`}- </span>- ) : null}- {effortText !== null ? (- <span className="shrink-0 text-muted-foreground" data-testid="agent-thread-effort">- {effortText}- </span>- ) : null}- {readOnlyShellOn ? (- <span- className="shrink-0 text-muted-foreground"- data-testid="agent-thread-read-only-shell"- >- {t`Read-only allowed`}- </span>- ) : null}- </AgentSettingsTrigger>- </DropdownMenuTrigger>- </TooltipTrigger>- <TooltipContent side="bottom" aria-label={t`Agent settings`}>- <span data-testid="agent-thread-settings-tooltip">{settingsLabel}</span>- </TooltipContent>- </Tooltip>+ {t`Read-only allowed`}+ </span>+ ) : null}+ </AgentSettingsTrigger>+ </DropdownMenuTrigger>{}<DropdownMenuContent align="end" className="w-60" data-testid="agent-thread-settings-popover">{}@@ -4451,183 +4445,189 @@ function ThreadComposer({);return (- <div className="p-2">- {queue.length > 0 && !archived ? (- <QueuedMessageList threadId={info.threadId} queue={queue} turnActive={turnActive} />- ) : null}- {}- {/* biome-ignore lint/a11y/noStaticElementInteractions: pointer-only affordance — pressing the card's whitespace focuses the composer input; keyboard/AT users reach it via Tab. See focus-composer-on-card-pointer.ts. */}- <div- onMouseDown={(event) => focusComposerInputOnCardPointer(event, composerRef)}- onPaste={(event) => {- const files = collectImageFiles(event.clipboardData);- if (files.length === 0) return;- event.preventDefault();- if (!imagesAccepted) {- toast.error(t`${agentName} doesn't accept image attachments.`);- return;- }- void onIngestImageFiles(files);- }}- className="relative cursor-text rounded-lg border border-input bg-transparent transition-colors focus-within:border-ring focus-within:ring-3 focus-within:ring-ring/50 dark:bg-input/30"- >- {}- {}- {hasQueuedComments ? (- <ComposerContextChips className="px-3 pt-2 pb-1">- <QueuedCommentsChip- count={selectedCommentCount}- docs={selectedCommentDocs}- onDismiss={onDismissComments}- />- </ComposerContextChips>- ) : null}- {pendingAttachments.length > 0 || pendingUploads.length > 0 ? (- <PendingImageStrip- testIdPrefix="agent-thread"- images={pendingAttachments}- uploads={pendingUploads}- onRemove={onRemovePendingAttachment}- />+ <ComposerTooltipProvider>+ <div className="p-2">+ {queue.length > 0 && !archived ? (+ <QueuedMessageList threadId={info.threadId} queue={queue} turnActive={turnActive} />) : null}- <div className="relative">- <ComposerMentionInput- ref={composerRef}- ariaLabel={t`Message ${agentName}`}- ariaDescribedBy={placeholderRotating ? composerHintId : undefined}- onEmptyChange={setIsEmpty}- onSubmit={onSubmit}- attachmentDrop={{ kind: 'host' }}- onEscape={() => {- if (turnActive && !cancelPending) onCancel();- }}- disabled={composerDisabled}- slashCommands={info.availableCommands ?? null}- mentionRecency={mentionRecency}- className={cn(- 'max-h-40 overflow-y-auto px-2.5 pt-1 text-base md:text-sm',- composerDisabled && 'opacity-50',- )}- testId="agent-thread-composer"- />- {placeholderRotating ? (- <span id={composerHintId} className="sr-only">- {composerHint}- </span>+ {}+ {/* biome-ignore lint/a11y/noStaticElementInteractions: pointer-only affordance — pressing the card's whitespace focuses the composer input; keyboard/AT users reach it via Tab. See focus-composer-on-card-pointer.ts. */}+ <div+ onMouseDown={(event) => focusComposerInputOnCardPointer(event, composerRef)}+ onPaste={(event) => {+ const files = collectImageFiles(event.clipboardData);+ if (files.length === 0) return;+ event.preventDefault();+ if (!imagesAccepted) {+ toast.error(t`${agentName} doesn't accept image attachments.`);+ return;+ }+ void onIngestImageFiles(files);+ }}+ className="relative cursor-text rounded-lg border border-input bg-transparent transition-colors focus-within:border-ring focus-within:ring-3 focus-within:ring-ring/50 dark:bg-input/30"+ >+ {}+ {}+ {hasQueuedComments ? (+ <ComposerContextChips className="px-3 pt-2 pb-1">+ <QueuedCommentsChip+ count={selectedCommentCount}+ docs={selectedCommentDocs}+ onDismiss={onDismissComments}+ />+ </ComposerContextChips>) : null}- {isEmpty ? (- <RotatingComposerPlaceholder- phrases={placeholderPhrases}- rotating={placeholderRotating}- className={cn('px-2.5 pt-2', composerDisabled && 'opacity-50')}- testId="agent-thread-composer-placeholder"+ {pendingAttachments.length > 0 || pendingUploads.length > 0 ? (+ <PendingImageStrip+ testIdPrefix="agent-thread"+ images={pendingAttachments}+ uploads={pendingUploads}+ onRemove={onRemovePendingAttachment}/>) : null}- </div>- {}- <div className="flex items-center gap-0.5 px-1.5 pt-1 pb-1.5">- <ComposerAddMenu- disabled={composerDisabled}- disabledFocusTargetRef={settingsTriggerRef}- testId="agent-thread-add-to-prompt"- >- <ComposerFilesMenuItem- onFiles={onIngestAllFiles}- attachmentMode={- info.promptCapabilities !== null &&- info.promptCapabilities !== undefined &&- info.promptCapabilities.embeddedContext !== true- ? 'reference'- : 'embedded'- }+ <div className="relative">+ <ComposerMentionInput+ ref={composerRef}+ ariaLabel={t`Message ${agentName}`}+ ariaDescribedBy={placeholderRotating ? composerHintId : undefined}+ onEmptyChange={setIsEmpty}+ onSubmit={onSubmit}+ attachmentDrop={{ kind: 'host' }}+ onEscape={() => {+ if (turnActive && !cancelPending) onCancel();+ }}+ disabled={composerDisabled}+ slashCommands={info.availableCommands ?? null}+ mentionRecency={mentionRecency}+ className={cn(+ 'max-h-40 overflow-y-auto px-2.5 pt-1 text-base md:text-sm',+ composerDisabled && 'opacity-50',+ )}+ testId="agent-thread-composer"/>- {selectedCommentCount > 0 && !hasQueuedComments ? (- <ComposerCommentsMenuItem count={selectedCommentCount} onSelect={onAttachComments} />+ {placeholderRotating ? (+ <span id={composerHintId} className="sr-only">+ {composerHint}+ </span>) : null}- <ComposerMentionMenuItem onSelect={() => composerRef.current?.openMentionPicker()} />- {agentHasCommands && isEmpty ? (- <ComposerCommandsMenuItem- onSelect={() => composerRef.current?.openSlashCommandPicker()}+ {isEmpty ? (+ <RotatingComposerPlaceholder+ phrases={placeholderPhrases}+ rotating={placeholderRotating}+ className={cn('px-2.5 pt-2', composerDisabled && 'opacity-50')}+ testId="agent-thread-composer-placeholder"/>) : null}- </ComposerAddMenu>- <AgentSettingsPopover- info={info}- hasStartedWork={hasStartedWork}- onNewChat={onNewChat}- {...(canReportProblem ? { onReportProblem: () => setReportOpen(true) } : {})}- triggerRef={settingsTriggerRef}- />- {canReportProblem ? (- <ReportBugDialog- open={reportOpen}- onOpenChange={setReportOpen}- agentChat={{ threadId: info.threadId }}- launcherBorne+ </div>+ {}+ <div className="flex items-center gap-0.5 px-1.5 pt-1 pb-1.5">+ <ComposerAddMenu+ composerRef={composerRef}+ disabled={composerDisabled}+ disabledFocusTargetRef={settingsTriggerRef}+ testId="agent-thread-add-to-prompt"+ >+ <ComposerFilesMenuItem+ onFiles={onIngestAllFiles}+ attachmentMode={+ info.promptCapabilities !== null &&+ info.promptCapabilities !== undefined &&+ info.promptCapabilities.embeddedContext !== true+ ? 'reference'+ : 'embedded'+ }+ />+ {selectedCommentCount > 0 && !hasQueuedComments ? (+ <ComposerCommentsMenuItem+ count={selectedCommentCount}+ onSelect={onAttachComments}+ />+ ) : null}+ <ComposerMentionMenuItem onSelect={() => composerRef.current?.openMentionPicker()} />+ {agentHasCommands && isEmpty ? (+ <ComposerCommandsMenuItem+ onSelect={() => composerRef.current?.openSlashCommandPicker()}+ />+ ) : null}+ </ComposerAddMenu>+ <AgentSettingsPopover+ info={info}+ hasStartedWork={hasStartedWork}+ onNewChat={onNewChat}+ {...(canReportProblem ? { onReportProblem: () => setReportOpen(true) } : {})}+ triggerRef={settingsTriggerRef}/>- ) : null}- <div className="ml-auto flex items-center gap-1.5">- {usagePercent !== null && usage?.used !== undefined && usage?.size !== undefined ? (- <ContextUsageRing used={usage.used} size={usage.size} percent={usagePercent} />+ {canReportProblem ? (+ <ReportBugDialog+ open={reportOpen}+ onOpenChange={setReportOpen}+ agentChat={{ threadId: info.threadId }}+ launcherBorne+ />) : null}- {}- {turnActive && (cancelPending || !hasSendableContent) ? (- <Tooltip>- <TooltipTrigger asChild>- <Button- type="button"- size="icon-sm"- className="rounded-lg"- disabled={cancelPending}- onClick={onCancel}- aria-label={cancelPending ? t`Stopping` : t`Stop`}- data-testid="agent-thread-cancel"- >- {cancelPending ? (- <Spinner className="size-3.5" aria-hidden="true" />- ) : (- <Square className="size-3 fill-current" aria-hidden="true" />- )}- </Button>- </TooltipTrigger>- {}- <TooltipContent side="top">{t`Stop (Esc)`}</TooltipContent>- </Tooltip>- ) : canQueue ? (- <>- {}- {!isEmpty ? (- <Tooltip>- <TooltipTrigger asChild>- <Button- type="button"- size="icon-sm"- variant="outline"- className="rounded-lg"- disabled={pendingUploads.length > 0}- onClick={onSteer}- aria-label={t`Steer now`}- data-testid="agent-thread-steer"- >- <Zap className="size-4" aria-hidden="true" />- </Button>- </TooltipTrigger>- <TooltipContent side="top">{t`Stops the current run and sends this instead`}</TooltipContent>- </Tooltip>- ) : null}+ <div className="ml-auto flex items-center gap-1.5">+ {usagePercent !== null && usage?.used !== undefined && usage?.size !== undefined ? (+ <ContextUsageRing used={usage.used} size={usage.size} percent={usagePercent} />+ ) : null}+ {}+ {turnActive && (cancelPending || !hasSendableContent) ? (<Tooltip>- <TooltipTrigger asChild>{sendButton}</TooltipTrigger>+ <TooltipTrigger asChild>+ <Button+ type="button"+ size="icon-sm"+ className="rounded-lg"+ disabled={cancelPending}+ onClick={onCancel}+ aria-label={cancelPending ? t`Stopping` : t`Stop`}+ data-testid="agent-thread-cancel"+ >+ {cancelPending ? (+ <Spinner className="size-3.5" aria-hidden="true" />+ ) : (+ <Square className="size-3 fill-current" aria-hidden="true" />+ )}+ </Button>+ </TooltipTrigger>{}- <TooltipContent side="top">{t`Queues behind the running turn`}</TooltipContent>+ <TooltipContent side="top">{t`Stop (Esc)`}</TooltipContent></Tooltip>- </>- ) : (- sendButton- )}+ ) : canQueue ? (+ <>+ {}+ {!isEmpty ? (+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ type="button"+ size="icon-sm"+ variant="outline"+ className="rounded-lg"+ disabled={pendingUploads.length > 0}+ onClick={onSteer}+ aria-label={t`Steer now`}+ data-testid="agent-thread-steer"+ >+ <Zap className="size-4" aria-hidden="true" />+ </Button>+ </TooltipTrigger>+ <TooltipContent side="top">{t`Stops the current run and sends this instead`}</TooltipContent>+ </Tooltip>+ ) : null}+ <Tooltip>+ <TooltipTrigger asChild>{sendButton}</TooltipTrigger>+ {}+ <TooltipContent side="top">{t`Queues behind the running turn`}</TooltipContent>+ </Tooltip>+ </>+ ) : (+ sendButton+ )}+ </div></div></div></div>- </div>+ </ComposerTooltipProvider>);}diff --git a/packages/app/src/components/composer-dropdown-menu.test-helper.tsx b/packages/app/src/components/composer-dropdown-menu.test-helper.tsxindex 6b392e6cc..8d6f69e58 100644--- a/packages/app/src/components/composer-dropdown-menu.test-helper.tsx+++ b/packages/app/src/components/composer-dropdown-menu.test-helper.tsx@@ -1,4 +1,11 @@-import type { ComponentProps } from 'react';+import {+ type ComponentProps,+ cloneElement,+ createContext,+ isValidElement,+ type ReactNode,+ use,+} from 'react';import type * as DropdownMenuModule from '@/components/ui/dropdown-menu';type DropdownMenuProps<Name extends keyof typeof DropdownMenuModule> = ComponentProps<@@ -25,17 +32,56 @@ function invokeSelection(onSelect: unknown): void {if (typeof onSelect === 'function') Reflect.apply(onSelect, undefined, [new Event('select')]);}+const CloseAutoFocusContext = createContext<((event: Event) => void) | undefined>(undefined);++function MockMenuItem({+ children,+ disabled,+ onSelect,+ props,+}: {+ children: ReactNode;+ disabled: boolean | undefined;+ onSelect: unknown;+ props: object;+}) {+ const onCloseAutoFocus = use(CloseAutoFocusContext);+ return (+ <button+ type="button"+ role="menuitem"+ {...asButtonProps(props)}+ disabled={disabled}+ onClick={() => {+ invokeSelection(onSelect);+ onCloseAutoFocus?.(new Event('focus', { cancelable: true }));+ }}+ >+ {children}+ </button>+ );+}+export function createComposerDropdownMenuMock() {return {DropdownMenu: ({ children }: DropdownMenuProps<'DropdownMenu'>) => <div>{children}</div>,DropdownMenuPortal: ({ children }: DropdownMenuProps<'DropdownMenuPortal'>) => <>{children}</>,- DropdownMenuTrigger: ({ children }: DropdownMenuProps<'DropdownMenuTrigger'>) => (- <>{children}</>- ),- DropdownMenuContent: ({ children, ...props }: DropdownMenuProps<'DropdownMenuContent'>) => (- <div role="menu" {...asDivProps(props)}>- {children}- </div>+ DropdownMenuTrigger: ({+ children,+ asChild: _asChild,+ ...props+ }: DropdownMenuProps<'DropdownMenuTrigger'>) =>+ isValidElement(children) ? cloneElement(children, props) : <>{children}</>,+ DropdownMenuContent: ({+ children,+ onCloseAutoFocus,+ ...props+ }: DropdownMenuProps<'DropdownMenuContent'>) => (+ <CloseAutoFocusContext value={onCloseAutoFocus}>+ <div role="menu" {...asDivProps(props)}>+ {children}+ </div>+ </CloseAutoFocusContext>),DropdownMenuGroup: ({ children }: DropdownMenuProps<'DropdownMenuGroup'>) => <>{children}</>,DropdownMenuItem: ({@@ -44,15 +90,7 @@ export function createComposerDropdownMenuMock() {onSelect,...props}: DropdownMenuProps<'DropdownMenuItem'>) => (- <button- type="button"- role="menuitem"- {...asButtonProps(props)}- disabled={disabled}- onClick={() => invokeSelection(onSelect)}- >- {children}- </button>+ <MockMenuItem {...{ children, disabled, onSelect, props }} />),DropdownMenuCheckboxItem: ({children,diff --git a/packages/app/src/components/ui/dropdown-menu.tsx b/packages/app/src/components/ui/dropdown-menu.tsxindex 1488faf1d..cff5dde9d 100644--- a/packages/app/src/components/ui/dropdown-menu.tsx+++ b/packages/app/src/components/ui/dropdown-menu.tsx@@ -127,12 +127,12 @@ function DropdownMenuRadioItem({{...props}><span- className="pointer-events-none absolute end-2 flex items-center justify-center"+ className="pointer-events-none absolute inset-y-0 end-2 flex items-center justify-center"data-slot="dropdown-menu-radio-item-indicator"><DropdownMenuPrimitive.ItemIndicator>{}- <CircleIcon className="size-2 fill-current" />+ <CircleIcon className="size-2 fill-primary stroke-primary" /></DropdownMenuPrimitive.ItemIndicator></span>{children}