From 6216e2ee89de25a6475bb147b748a4a0f779ea4c Mon Sep 17 00:00:00 2001
From: Neil <4138956+nwparker@users.noreply.github.com>
Date: Tue, 3 Nov 2026 23:51:08 -0800
Subject: [PATCH] Restore type-to-search on the new-workspace agent picker and
skip the emoji button on Tab (#38073)
---
.../agent/AgentLaunchPicker.trigger.test.tsx | 42 +++++++++++++++++++
.../components/agent/AgentLaunchPicker.tsx | 31 ++++++++++++--
.../agent/AgentLaunchPickerMenu.tsx | 10 ++++-
.../smart-workspace-name-input-surface.tsx | 1 +
.../WorkspaceEmojiPickerButton.test.tsx | 16 +++++++
.../WorkspaceEmojiPickerButton.tsx | 6 ++-
6 files changed, 101 insertions(+), 5 deletions(-)
diff --git a/src/renderer/src/components/agent/AgentLaunchPicker.trigger.test.tsx b/src/renderer/src/components/agent/AgentLaunchPicker.trigger.test.tsx
index 32edbad5893..8b1d46e31ea 100644
--- a/src/renderer/src/components/agent/AgentLaunchPicker.trigger.test.tsx
+++ b/src/renderer/src/components/agent/AgentLaunchPicker.trigger.test.tsx
@@ -238,3 +238,45 @@ it.each(['button', 'enter'] as const)(
)
}
)
+
+it('opens from a printable key on the focused trigger and seeds the search', () => {
+ const claude: AgentPickerEntry = {
+ ...entry,
+ agent: 'claude',
+ label: 'Claude',
+ rows: [{ agent: 'claude', kind: 'cli' }]
+ }
+ const entries = [entry, claude]
+ vi.spyOn(inventoryModule, 'useAgentLaunchPickerInventory').mockReturnValue([])
+ const model = {
+ state: 'settled' as const,
+ rows: entries.flatMap((entry) => entry.rows),
+ detection: {
+ detectedIds: entries.map((entry) => entry.agent),
+ isLoading: false,
+ isRefreshing: false,
+ detectionFailed: false,
+ needsServerUpdate: false,
+ refresh: async () => entries.map((entry) => entry.agent)
+ }
+ }
+ act(() =>
+ root.render(
+
+
+
+ )
+ )
+ const trigger = getByRole(document.body, 'button', { name: 'Select agent' })
+ const search = () =>
+ document.querySelector('input[placeholder="Search agents and setups…"]')
+ fireEvent.keyDown(trigger, { key: 'c', metaKey: true })
+ expect(search()).toBeNull()
+ fireEvent.keyDown(trigger, { key: 'l' })
+ expect(search()?.value).toBe('l')
+ expect(getByRole(document.body, 'button', { name: 'Configure Claude' })).toBeTruthy()
+ expect(document.querySelector('[aria-label="Configure Codex"]')).toBeNull()
+ fireEvent.keyDown(getByRole(document.body, 'menu'), { key: 'Escape' })
+ fireEvent.pointerDown(trigger, { button: 0, ctrlKey: false })
+ expect(search()?.value).toBe('')
+})
diff --git a/src/renderer/src/components/agent/AgentLaunchPicker.tsx b/src/renderer/src/components/agent/AgentLaunchPicker.tsx
index 6da90cbb671..5f7be44b4cb 100644
--- a/src/renderer/src/components/agent/AgentLaunchPicker.tsx
+++ b/src/renderer/src/components/agent/AgentLaunchPicker.tsx
@@ -79,6 +79,15 @@ export const AgentLaunchPicker = memo(
const ownDraftScope = useAgentPickerDraftScope()
const [settingsOpen, setSettingsOpen] = useState(false)
const trigger = useRef(null)
+ const [open, setOpenState] = useState(false)
+ // Why: typing on the closed trigger opens the menu with that key already in the search field.
+ const [initialQuery, setInitialQuery] = useState('')
+ const setOpen = useCallback((next: boolean) => {
+ if (!next) {
+ setInitialQuery('')
+ }
+ setOpenState(next)
+ }, [])
const openAgentSettings = useCallback(() => {
setOpen(false)
if (onOpenAgentSettings) {
@@ -86,8 +95,7 @@ export const AgentLaunchPicker = memo(
} else {
setSettingsOpen(true)
}
- }, [onOpenAgentSettings])
- const [open, setOpen] = useState(false)
+ }, [onOpenAgentSettings, setOpen])
const [selected, setSelected] = useState()
const observedEntries = useAgentLaunchPickerInventory(
worktreeId,
@@ -131,10 +139,26 @@ export const AgentLaunchPicker = memo(
className="w-full min-w-0"
disabled={disabled || model.state !== 'settled'}
onKeyDown={(event) => {
- if (!open && event.key === 'Enter' && onTriggerEnter) {
+ if (open) {
+ return
+ }
+ if (event.key === 'Enter' && onTriggerEnter) {
event.preventDefault()
event.stopPropagation()
onTriggerEnter()
+ return
+ }
+ if (
+ model.state === 'settled' &&
+ !event.metaKey &&
+ !event.ctrlKey &&
+ !event.altKey &&
+ event.key.length === 1 &&
+ /\S/.test(event.key)
+ ) {
+ event.preventDefault()
+ setInitialQuery(event.key)
+ setOpen(true)
}
}}
>
@@ -162,6 +186,7 @@ export const AgentLaunchPicker = memo(
draftScope={draftScope ?? ownDraftScope}
model={model}
entries={entries}
+ initialQuery={initialQuery}
value={value}
draftForEntry={draftForEntry}
mode="select"
diff --git a/src/renderer/src/components/agent/AgentLaunchPickerMenu.tsx b/src/renderer/src/components/agent/AgentLaunchPickerMenu.tsx
index 9b876dd4e67..70665203126 100644
--- a/src/renderer/src/components/agent/AgentLaunchPickerMenu.tsx
+++ b/src/renderer/src/components/agent/AgentLaunchPickerMenu.tsx
@@ -63,6 +63,7 @@ export function AgentLaunchPickerMenu({
runLaunch,
entries,
hideSearch,
+ initialQuery = '',
onSelectAgent
}: {
model?: NewTabAgentMenuModel
@@ -76,6 +77,8 @@ export function AgentLaunchPickerMenu({
runLaunch: Launch
entries: AgentPickerEntry[]
hideSearch?: boolean
+ /** Seeds the search field; read once when the menu mounts. */
+ initialQuery?: string
onSelectAgent?: (agent: AgentPickerEntry['agent']) => void
}) {
useEffect(() => {
@@ -103,7 +106,7 @@ export function AgentLaunchPickerMenu({
mode
)
}, [entries, draftScope, mode])
- const [query, setQuery] = useState('')
+ const [query, setQuery] = useState(initialQuery)
const [activeSetup, setActiveSetup] = useState<{
id: string
agent: AgentPickerEntry['agent']
@@ -156,6 +159,11 @@ export function AgentLaunchPickerMenu({
value={query}
density="compact"
autoFocus
+ onFocus={(event) => {
+ // Why: a seeded query must keep the caret after the typed key.
+ const end = event.currentTarget.value.length
+ event.currentTarget.setSelectionRange(end, end)
+ }}
placeholder={translate('agentPicker.search', 'Search agents and setups…')}
onChange={(event) => setQuery(event.target.value)}
onKeyDown={(event) => {
diff --git a/src/renderer/src/components/new-workspace/smart-workspace-name-input-surface.tsx b/src/renderer/src/components/new-workspace/smart-workspace-name-input-surface.tsx
index dd7714872ea..6d60cfe1f61 100644
--- a/src/renderer/src/components/new-workspace/smart-workspace-name-input-surface.tsx
+++ b/src/renderer/src/components/new-workspace/smart-workspace-name-input-surface.tsx
@@ -312,6 +312,7 @@ export function renderSmartWorkspaceNameInput(
{
expect(screen.getByRole('textbox', { name: 'Name' })).toHaveProperty('value', 'release')
expect(buttonRenderCount()).toBe(rendersAfterMount)
})
+
+it('stays out of the Tab order when skipTabStop is set', async () => {
+ const user = userEvent.setup()
+ const inputRef = createRef()
+ render(
+
+
+
+
+
+ )
+ await user.tab()
+ expect(document.activeElement).toBe(inputRef.current)
+ await user.tab()
+ expect(document.activeElement).toBe(screen.getByRole('button', { name: 'Next' }))
+})
diff --git a/src/renderer/src/components/workspace-emoji/WorkspaceEmojiPickerButton.tsx b/src/renderer/src/components/workspace-emoji/WorkspaceEmojiPickerButton.tsx
index b5a1d266217..f4b098e323c 100644
--- a/src/renderer/src/components/workspace-emoji/WorkspaceEmojiPickerButton.tsx
+++ b/src/renderer/src/components/workspace-emoji/WorkspaceEmojiPickerButton.tsx
@@ -24,6 +24,8 @@ type WorkspaceEmojiPickerButtonProps = {
onOpenChange?: (open: boolean) => void
onValueChange: (value: string) => void
portalContainer?: HTMLElement | null
+ /** Keep the button out of the Tab order when the field already supports `:` shortcodes. */
+ skipTabStop?: boolean
}
/**
@@ -36,7 +38,8 @@ export const WorkspaceEmojiPickerButton = memo(function WorkspaceEmojiPickerButt
inputRef,
onOpenChange,
onValueChange,
- portalContainer
+ portalContainer,
+ skipTabStop = false
}: WorkspaceEmojiPickerButtonProps): React.JSX.Element {
// Why: memo would otherwise keep the label and tooltip in the previous UI language.
useUiLanguageRevision()
@@ -85,6 +88,7 @@ export const WorkspaceEmojiPickerButton = memo(function WorkspaceEmojiPickerButt
type="button"
aria-label={label}
disabled={disabled}
+ tabIndex={skipTabStop ? -1 : undefined}
onPointerEnter={WorkspaceEmojiPickerPanel.preload}
onFocus={WorkspaceEmojiPickerPanel.preload}
onKeyDown={(event) => event.stopPropagation()}