(host, 'button', { name: way }))
const input = agentPickerLaunchInputs(onUse.mock.calls[0][0], own)
expect(input.sessionOptions?.fastMode).toBeUndefined()
expect(input).not.toHaveProperty('agentArgs')
diff --git a/src/renderer/src/components/agent/AgentLaunchSetupPanel.tsx b/src/renderer/src/components/agent/AgentLaunchSetupPanel.tsx
index c067c2d1969e..c2067c8ac5cc 100644
--- a/src/renderer/src/components/agent/AgentLaunchSetupPanel.tsx
+++ b/src/renderer/src/components/agent/AgentLaunchSetupPanel.tsx
@@ -10,6 +10,8 @@ import {
CommandItem
} from '@/components/ui/command'
import { translate } from '@/i18n/i18n'
+import { isScreenSubmitShortcut } from '@/lib/screen-submit-shortcut'
+import { isImeOwnedKeyboardEvent } from '@/lib/ime-composition-keyboard-event'
import { AgentDefaultArgsInput } from '../settings/AgentLaunchDefaultsEditor'
import { NativeChatSessionOptionRows } from '../native-chat/NativeChatSessionOptionRows'
import { Collapsible, CollapsibleTrigger, CollapsibleContent } from '@/components/ui/collapsible'
@@ -172,10 +174,21 @@ export function AgentLaunchSetupPanel({
return (
{
+ if (isScreenSubmitShortcut(event)) {
+ event.preventDefault()
+ event.stopPropagation()
+ const alternate = entry.surfaces.find((surface) => surface !== entry.defaultSurface)
+ if (alternate && !disabled && !event.repeat) {
+ use(alternate)
+ }
+ }
+ }}
onKeyDown={(event) => {
event.stopPropagation()
if (
!disabled &&
+ !isImeOwnedKeyboardEvent(event) &&
event.key === 'Enter' &&
(event.target instanceof HTMLInputElement || event.target instanceof HTMLTextAreaElement)
) {
@@ -190,6 +203,7 @@ export function AgentLaunchSetupPanel({
onKeyDownCapture={(event) => {
if (
!disabled &&
+ !isImeOwnedKeyboardEvent(event) &&
event.key === 'Enter' &&
event.currentTarget.querySelector(
'[cmdk-item][data-selected="true"][data-current="true"]'
@@ -207,6 +221,7 @@ export function AgentLaunchSetupPanel({
}}
>
void
+ renderAnchor: (trigger: ReactElement) => ReactElement
+ disabled?: boolean
+ label: string
+ children: ReactNode
+}) {
+ const trigger = useRef(null)
+ const content = useRef(null)
+ const segmentRelease = useRef(false)
+ const focusSearch = () =>
+ content.current?.querySelector('[cmdk-input]:not(:disabled)')?.focus({
+ preventScroll: true
+ })
+ const close = (returnFocus: 'row' | 'segment') => {
+ onOpenChange(false)
+ const target =
+ returnFocus === 'row'
+ ? trigger.current
+ : trigger.current?.querySelector('button')
+ target?.focus()
+ }
+ return (
+ {
+ // Opening is explicit; Radix still owns pointer grace, focus, and dismissal.
+ if (!next) {
+ onOpenChange(false)
+ }
+ }}
+ >
+ {
+ const segment = event.currentTarget.querySelector('button')
+ if (event.target instanceof Node && segment?.contains(event.target)) {
+ event.preventDefault()
+ }
+ }}
+ onPointerDownCapture={() => {
+ segmentRelease.current = false
+ }}
+ onPointerUpCapture={(event) => {
+ segmentRelease.current =
+ event.target instanceof Node &&
+ !!event.currentTarget.querySelector('button')?.contains(event.target)
+ }}
+ onClickCapture={(event) => {
+ if (segmentRelease.current && event.target === event.currentTarget) {
+ event.preventDefault()
+ event.stopPropagation()
+ }
+ segmentRelease.current = false
+ }}
+ onKeyDownCapture={() => {
+ segmentRelease.current = false
+ }}
+ onKeyDown={(event) => {
+ if (!disabled && event.target === event.currentTarget && event.key === 'ArrowRight') {
+ event.preventDefault()
+ onOpenChange(true)
+ focusSearch()
+ }
+ }}
+ >
+ {renderAnchor(
+
+ )}
+
+ {
+ if (event.target === event.currentTarget) {
+ focusSearch()
+ }
+ }}
+ onClick={(event) => event.stopPropagation()}
+ onFocusOutside={(event) => {
+ const row = trigger.current?.closest('[data-agent-launch-row]')
+ const menu = trigger.current?.closest('[data-slot="dropdown-menu-content"]')
+ // Nested option menus and pointer grace may move focus outside this portal.
+ if (
+ !(
+ event.target instanceof Element &&
+ event.target.closest('[role="menuitem"]') &&
+ menu?.contains(event.target) &&
+ !row?.contains(event.target)
+ )
+ ) {
+ event.preventDefault()
+ }
+ }}
+ onKeyDownCapture={(event) => {
+ const target = event.target
+ const emptySearch =
+ target instanceof HTMLInputElement && target.matches('[cmdk-input]') && !target.value
+ const editing =
+ target instanceof HTMLInputElement ||
+ target instanceof HTMLTextAreaElement ||
+ (target instanceof HTMLElement && target.isContentEditable)
+ if (
+ event.key === 'ArrowLeft' &&
+ !event.nativeEvent.isComposing &&
+ !event.altKey &&
+ !event.ctrlKey &&
+ !event.metaKey &&
+ !event.shiftKey &&
+ target instanceof Element &&
+ target.closest('[role="menu"]') === event.currentTarget &&
+ (emptySearch || !editing)
+ ) {
+ event.preventDefault()
+ event.stopPropagation()
+ close('row')
+ }
+ }}
+ onEscapeKeyDown={(event) => {
+ event.preventDefault()
+ if (!content.current?.querySelector('[contenteditable][aria-expanded="true"]')) {
+ close('segment')
+ }
+ }}
+ >
+ {children}
+
+
+ )
+}
diff --git a/src/renderer/src/components/agent/agent-launch-picker-freshness-test-fixture.tsx b/src/renderer/src/components/agent/agent-launch-picker-freshness-test-fixture.tsx
index 65186c01aefe..9c5716e5badf 100644
--- a/src/renderer/src/components/agent/agent-launch-picker-freshness-test-fixture.tsx
+++ b/src/renderer/src/components/agent/agent-launch-picker-freshness-test-fixture.tsx
@@ -81,7 +81,9 @@ export async function exerciseAgentPickerFreshness({
view.container.querySelector('[data-option-id="effort"] [data-state="on"]')?.textContent
const launch = () => {
fireEvent.click(
- [...view.container.querySelectorAll('button')].find((b) => b.textContent === 'Launch chat')!
+ [...view.container.querySelectorAll('button')].find(
+ (b) => b.getAttribute('aria-label') === 'Launch chat'
+ )!
)
expect(launches.mock.lastCall).toEqual([{}])
}
diff --git a/src/renderer/src/components/agent/use-agent-launch-picker-inventory.test.tsx b/src/renderer/src/components/agent/use-agent-launch-picker-inventory.test.tsx
index e308d5c7bedc..a9af01671b40 100644
--- a/src/renderer/src/components/agent/use-agent-launch-picker-inventory.test.tsx
+++ b/src/renderer/src/components/agent/use-agent-launch-picker-inventory.test.tsx
@@ -648,7 +648,7 @@ it('updates a mounted setup from current host rows without making ordinary actio
expect(document.querySelector('textarea')).toHaveProperty('disabled', true)
expect(
[...document.querySelectorAll('button')].find(
- (button) => button.textContent === 'Launch terminal'
+ (button) => button.getAttribute('aria-label') === 'Launch terminal'
)
).toHaveProperty('disabled', false)
}
diff --git a/src/renderer/src/components/tab-bar/TabBarCreateEntry.search.test.tsx b/src/renderer/src/components/tab-bar/TabBarCreateEntry.search.test.tsx
index 5db51f5edd15..cc568e0961e0 100644
--- a/src/renderer/src/components/tab-bar/TabBarCreateEntry.search.test.tsx
+++ b/src/renderer/src/components/tab-bar/TabBarCreateEntry.search.test.tsx
@@ -595,7 +595,7 @@ it('launches searched defaults on Enter and reaches the alternate only through C
expect(launched).not.toHaveBeenCalled()
act(() =>
[...document.querySelectorAll('button')]
- .find((button) => button.textContent === 'Launch terminal')
+ .find((button) => button.getAttribute('aria-label') === 'Launch terminal')
?.click()
)
expect(launched).toHaveBeenCalledOnce()
diff --git a/src/renderer/src/components/ui/button.tsx b/src/renderer/src/components/ui/button.tsx
index bfcd65aa90e7..c1684ca7fc31 100644
--- a/src/renderer/src/components/ui/button.tsx
+++ b/src/renderer/src/components/ui/button.tsx
@@ -17,6 +17,10 @@ const buttonVariants = cva(
secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80',
ghost: 'hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50',
link: 'text-primary underline-offset-4 hover:underline',
+ 'menu-launch':
+ 'min-w-0 flex-1 justify-start rounded-l-[7px] rounded-r-none text-foreground',
+ 'menu-segment':
+ 'rounded-l-none border-l border-border bg-muted/40 text-muted-foreground hover:bg-primary hover:text-primary-foreground focus-visible:bg-primary focus-visible:text-primary-foreground aria-expanded:bg-primary aria-expanded:text-primary-foreground',
'pane-title': 'pane-title-split-trigger',
'pane-title-close': 'pane-title-close',
// The worktree card's "rename failed" chip, for a failure the user can open.
@@ -27,6 +31,7 @@ const buttonVariants = cva(
default: 'h-9 px-4 py-2 has-[>svg]:px-3',
xs: "h-6 gap-1 rounded-md px-2 text-xs has-[>svg]:px-1.5 [&_svg:not([class*='size-'])]:size-3",
sm: 'h-8 gap-1.5 rounded-md px-3 has-[>svg]:px-2.5',
+ menu: 'h-8 gap-2 px-2 py-1.5 text-xs leading-5',
lg: 'h-10 rounded-md px-6 has-[>svg]:px-4',
icon: 'size-9',
'icon-xs': "size-6 rounded-md [&_svg:not([class*='size-'])]:size-3",
diff --git a/src/renderer/src/components/ui/dropdown-menu.tsx b/src/renderer/src/components/ui/dropdown-menu.tsx
index 2db04acabcd0..0c2bd5111bca 100644
--- a/src/renderer/src/components/ui/dropdown-menu.tsx
+++ b/src/renderer/src/components/ui/dropdown-menu.tsx
@@ -1,6 +1,8 @@
import * as React from 'react'
+import { cva } from 'class-variance-authority'
import { CheckIcon, ChevronRightIcon, CircleIcon } from 'lucide-react'
import * as DropdownMenuPrimitive from 'radix-ui/dropdown-menu'
+import { useControllableState } from 'radix-ui/internal'
import { cn } from '@/lib/utils'
import { handleOverlayCloseAutoFocus } from '@/lib/overlay-focus-ownership'
@@ -9,8 +11,35 @@ import { handleImeOverlayEscape } from '@/lib/ime-overlay-escape'
import { keepFocusWhileMenuCloses } from './menu-item-closing-focus'
import { useMenuPointerHighlight } from './menu-pointer-highlight'
-function DropdownMenu({ ...props }: React.ComponentProps) {
- return
+const DropdownMenuCloseContext = React.createContext<() => void>(() => {})
+
+function useDropdownMenuClose() {
+ return React.useContext(DropdownMenuCloseContext)
+}
+
+function DropdownMenu({
+ open: controlledOpen,
+ defaultOpen,
+ onOpenChange,
+ ...props
+}: React.ComponentProps) {
+ const [open, setOpen] = useControllableState({
+ prop: controlledOpen,
+ defaultProp: defaultOpen ?? false,
+ onChange: onOpenChange,
+ caller: 'DropdownMenu'
+ })
+ const close = React.useCallback(() => setOpen(false), [setOpen])
+ return (
+
+
+
+ )
}
function DropdownMenuPortal({
@@ -190,42 +219,70 @@ function DropdownMenuSub({ ...props }: React.ComponentProps
}
+const dropdownMenuSubTriggerVariants = cva(
+ "flex cursor-default items-center gap-2 rounded-md px-2.5 py-1 text-[13px] leading-4 font-normal outline-hidden select-none data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5 [&_svg:not([class*='text-'])]:text-muted-foreground",
+ {
+ variants: {
+ variant: {
+ default:
+ 'focus:bg-black/8 dark:focus:bg-white/14 focus:text-accent-foreground data-[state=open]:bg-black/8 dark:data-[state=open]:bg-white/14 data-[state=open]:text-accent-foreground',
+ 'launch-row':
+ 'gap-0 rounded-[7px] p-0 text-xs leading-5 font-medium hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground focus-within:bg-accent focus-within:text-accent-foreground data-[state=open]:bg-accent data-[state=open]:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-40'
+ }
+ },
+ defaultVariants: { variant: 'default' }
+ }
+)
+
function DropdownMenuSubTrigger({
className,
inset,
children,
hideChevron,
+ variant = 'default',
...props
}: React.ComponentProps & {
inset?: boolean
// Why: collision-flipped submenus open leftward, where a right-pointing chevron misleads.
hideChevron?: boolean
+ variant?: 'default' | 'launch-row'
}) {
return (
- {children}
- {hideChevron ? null : (
-
+ {hideChevron ? (
+ children
+ ) : (
+ <>
+ {children}
+
+ >
)}
)
}
+const dropdownMenuSubContentVariants = cva('', {
+ variants: { variant: { default: '', picker: 'p-0' } },
+ defaultVariants: { variant: 'default' }
+})
+
function DropdownMenuSubContent({
className,
style,
alignOffset = -5,
scrollable = false,
+ variant = 'default',
...props
-}: React.ComponentProps & { scrollable?: boolean }) {
+}: React.ComponentProps & {
+ scrollable?: boolean
+ variant?: 'default' | 'picker'
+}) {
const pointerHighlight = useMenuPointerHighlight(props)
const { ref: focusScopeRef, scope } = useOverlayFocusScope(pointerHighlight.ref)
return (
@@ -233,10 +290,12 @@ function DropdownMenuSubContent({
('[contenteditable][aria-multiline="true"]')!
}
function button(name: string): HTMLButtonElement {
- return [...document.querySelectorAll('button')].find((button) => button.textContent === name)!
+ return screen.getByRole('button', { name })
}
it.each(