[TheGreatAxios]

Summary

• New ToolPicker component (src/ui/tool-picker.tsx): browses, searches and selects tools from a caller-supplied catalog, grouped by package
• Controlled value/onChange supports single-select (default) and multi-select via multiple
• Handles loading, empty, and per-item pending/disabled status states; keyboard navigation reuses useCommandPaletteNavigation
• Exported via generated barrel/exports (bun run build)

Test plan

• bun run typecheck
• bun run lint
• bun test (344 pass, including new tool-picker.test.tsx)
• bun run build (contrast gate passes)
• bun run dep-guard
• Story: stories/primitives/tool-picker.stories.tsx — single select, multi select, loading, empty

[TheGreatAxios]

Review

Verdict: approve. Controlled ToolPicker with tests for group/select/multi/disabled/search/loading/empty. No CI. No prior reviews. Nit: no keyboard tests; disabled items stay in the nav list and Enter no-ops via toggle.

[TheGreatAxios]

Review (Draper + Emil)

Verdict: request changes (empty copy + Escape).

Grouping and controlled select are right.

• Empty catalog and failed search share “No tools match.” Split like CommandPalette (no catalog vs no matches). Don’t render group.id as the visible title if a display name exists.
• Combobox that swallows Escape should not; Escape ought to clear search or close the way CommandPalette does.

Empty-copy split in flight if the default is still that string.

[TheGreatAxios]

Re-review

Empty catalog vs no matches; Escape clears query (c8a6e1b). bun test 346 pass. Group headings still use group.id.

[TheGreatAxios]

Solid. Reusing useCommandPaletteNavigation instead of a second keyboard implementation is the right move, the combobox → aria-activedescendant → option-id wiring is correct, and keeping disabled items visible is documented and defensible.

Two notes:

1. ToolPicker does its own substring filtering while CommandPalette deliberately leaves matching/ranking to the caller. Defensible for a bounded local catalog — worth one line in the doc comment so the deviation reads as chosen, not missed.
2. onKeyDown on the listbox div is dead — options aren't focusable, so it can't fire there. Harmless; can drop.

Merge.

[TheGreatAxios]

Re-review

Group headings humanize slugs (slack → Slack). SHA 04fb3ed. bun test 347 pass.

[TheGreatAxios]

Review pass — rebased onto post-prune main + fixes applied

Rebased after the prune (#55) and test co-location (#50): generated exports regenerated, removed a dead onKeyDown on the non-focusable listbox (navigation lives in the input).

Persona review findings — all resolved

• Keyboard nav could strand the active row (greybeard, emil): useEffect now scrolls [data-active] into view (block: "nearest") on every activeId change; active rows that are disabled keep the visual highlight so aria-activedescendant and the screen agree.
• Incomplete combobox semantics (emil): added aria-autocomplete="list", aria-busy={loading}, spellCheck={false}, and a configurable searchLabel; loading/empty/no-match wrappers carry role="presentation".
• Heavy no-match state (draper): EmptyState replaced with a compact muted message — empty-catalog still gets the full EmptyState.
• Orange pending badges (draper): orange is a scarce action accent; a pending tool is not actionable. All status badges now tone="neutral"; selected cards keep border-primary-emphasis bg-primary/10.
• Craft: group headings get tracked uppercase micro-label styling; rows get active:brightness-95 press feedback.
• Architecture note: ARCHITECTURE.md now documents why ToolPicker self-filters (bounded, already-fetched catalog; must distinguish empty catalog from no match) while CommandPalette delegates matching to its caller (possibly unbounded/server-backed space).

Validation

236 tests, typecheck, lint, dep-guard, full build, contrast gate — all green at 959c05c.