{
// Why: a seeded query must keep the caret after the typed key.
const end = event.currentTarget.value.length
@@ -253,159 +226,3 @@ export function SubscribedAgentLaunchPickerMenu({
const entries = useAgentPickerInventoryEntries(inventory)
return
}
-
-// Why: catalog and seed reads land one agent at a time after the menu opens; only that row re-renders.
-const AgentPickerMenuRow = memo(function AgentPickerMenuRow({
- entry,
- draftScope,
- draftId,
- initialModel,
- initialEffort,
- openSetup,
- onSetupOpenChange,
- label = entry.label,
- source,
- selected,
- mode,
- setupDisabled,
- disabled,
- runLaunch,
- shortcut,
- onSelectAgent
-}: {
- entry: AgentPickerEntry
- draftScope?: object
- draftId?: string
- initialModel?: string
- initialEffort?: string
- openSetup: string | null
- onSetupOpenChange: (
- setup: {
- id: string
- agent: AgentPickerEntry['agent']
- preset?: AgentPickerSetupIdentity
- label: string
- } | null
- ) => void
- label?: string
- source?: AgentPickerDraft
- selected?: AgentPickerDraft
- mode?: 'launch' | 'select'
- setupDisabled?: boolean
- disabled?: boolean
- runLaunch: Launch
- shortcut?: string
- onSelectAgent?: (agent: AgentPickerEntry['agent']) => void
-}) {
- useUiLanguageRevision()
- const setupId = useId()
- const preset = initialModel ? { model: initialModel, effort: initialEffort } : undefined
- const initial = preset
- ? applyAgentPickerEdit(entry, selected ?? source ?? agentPickerDraft(entry), {
- kind: 'choice',
- patch: {
- model: preset.model,
- ...(preset.effort ? { options: { effort: preset.effort } } : {})
- }
- })
- : undefined
- const closeMenu = useDropdownMenuClose()
- const unavailable = entry.rows.find((row) => row.kind === 'chat-unavailable')
- if (setupDisabled) {
- return (
-
{
- onSelectAgent?.(entry.agent)
- runLaunch(pickerLaunchRow(entry, selected?.surface ?? entry.defaultSurface))
- }}
- >
-
- {label}
- {shortcut ? {shortcut} : null}
-
- )
- }
- return (
-
{
- if (next || openSetup === setupId) {
- onSetupOpenChange(next ? { id: setupId, agent: entry.agent, preset, label } : null)
- }
- if (next && openSetup !== setupId) {
- onSelectAgent?.(entry.agent)
- }
- }}
- onUse={(draft) => {
- const chosen = mode === 'select' ? draft.surface : undefined
- const result =
- chosen === undefined
- ? runLaunch(pickerLaunchRow(entry, draft.surface), draft, entry)
- : runLaunch(pickerLaunchRow(entry, draft.surface), draft, entry, chosen)
- if (result !== false) {
- closeMenu()
- }
- return result
- }}
- renderAnchor={(trigger) => (
- {
- event.preventDefault()
- if (disabled || !entry.surfaces.length) {
- return
- }
- const draft = initial ?? (mode === 'select' ? selected : undefined)
- const surface = draft?.surface ?? entry.defaultSurface
- const row = draft
- ? pickerLaunchRow(entry, surface)
- : (entry.rows.find((row) =>
- surface === 'chat'
- ? row.kind === 'chat'
- : row.kind === 'terminal' || row.kind === 'cli'
- ) ?? pickerLaunchRow(entry, surface))
- const result = draft ? runLaunch(row, draft, entry) : runLaunch(row, undefined)
- if (result !== false) {
- closeMenu()
- }
- }}
- onKeyDown={(event) => {
- if (
- event.target === event.currentTarget &&
- (event.key === 'Enter' || event.key === ' ')
- ) {
- event.preventDefault()
- event.currentTarget.click()
- }
- }}
- >
-
- {trigger}
-
{
+ event.preventDefault()
+ if (disabled || !entry.surfaces.length) {
+ return
+ }
+ const draft = initial ?? (mode === 'select' ? selected : undefined)
+ const surface = draft?.surface ?? entry.defaultSurface
+ const row = draft
+ ? pickerLaunchRow(entry, surface)
+ : (entry.rows.find((row) =>
+ surface === 'chat'
+ ? row.kind === 'chat'
+ : row.kind === 'terminal' || row.kind === 'cli'
+ ) ?? pickerLaunchRow(entry, surface))
+ const result = draft ? runLaunch(row, draft, entry) : runLaunch(row, undefined)
+ if (result !== false) {
+ closeMenu()
+ }
+ }}
+ onKeyDown={(event) => {
+ if (
+ event.target === event.currentTarget &&
+ (event.key === 'Enter' || event.key === ' ')
+ ) {
+ event.preventDefault()
+ event.currentTarget.click()
+ }
+ }}
+ >
+
+ {trigger}
+
diff --git a/src/renderer/src/components/terminal-quick-commands/TerminalQuickCommandDialog.test.tsx b/src/renderer/src/components/terminal-quick-commands/TerminalQuickCommandDialog.test.tsx
index 6f27d439ff7..61b1e119d3a 100644
--- a/src/renderer/src/components/terminal-quick-commands/TerminalQuickCommandDialog.test.tsx
+++ b/src/renderer/src/components/terminal-quick-commands/TerminalQuickCommandDialog.test.tsx
@@ -2,10 +2,18 @@
import { act } from 'react'
import { createRoot, type Root } from 'react-dom/client'
+import { fireEvent, getByRole } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import type { TerminalQuickCommand } from '../../../../shared/terminal/quick-commands/terminal-quick-command-types'
import { LEGACY_MAX_QUICK_COMMAND_AGENT_PROMPT_LENGTH } from '../../../../shared/terminal/quick-commands/terminal-quick-command-prompt-limit'
import { TerminalQuickCommandDialog } from './TerminalQuickCommandDialog'
+import { useAppStore } from '@/store'
+import {
+ makeFolderWorkspace,
+ makeWorktree,
+ TEST_REPO
+} from '@/store/slices/worktrees-slice-test-fixtures'
const mountedRoots: Root[] = []
@@ -192,13 +200,13 @@ describe('TerminalQuickCommandDialog animation structure', () => {
})
}
- const agentSelect = document.body.querySelector