@adecore/agents-react 0.21.2 → 0.22.0

package/src/chat/ui/Composer.tsx

@@ -1,4 +1,4 @@
-import { useContext, useEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react';
+import { useContext, useEffect, useId, useMemo, useRef, useState, useSyncExternalStore } from 'react';
 import { useTranslation } from 'react-i18next';
 import { indentLess, indentMore, insertNewline } from '@codemirror/commands';
 import { ensureSyntaxTree, syntaxTree } from '@codemirror/language';
@@ -52,13 +52,15 @@ import { PROMPT_MAX_CHARS, pasteBecomesAttachment, pastedTextName, promptGuard,
 import { withQuote } from '../quote';
 import { rememberChatAccount, rememberChatPreferences, rememberChatSelection } from '../preferences';
 import { STASH_SHORTCUT, stashDraft, type StashedPrompt, useStash } from '../stash';
-import { pageTimeline, scrollTimelineToEnd, subscribeTimelineEnd, timelineAtEnd } from '../timeline-scroll';
+import { jumpToTimelineItem, pageTimeline, scrollTimelineToEnd, subscribeTimelineEnd, timelineAtEnd } from '../timeline-scroll';
 import { ChatActivity } from './ChatActivity';
 import { ChatReferenceChip } from './ChatReferenceChip';
 import { chipDecorations } from './composer/chips';
+import { clampMenuIndex, composerMenuAria, optionIdOf } from './composer/menu-aria';
 import { enterAction, inCode, inFenceBody, inOpenFence, listItemAt, recallDirection, tabSpaces } from './composer/keys';
 import { ComposerInput, type ComposerInputHandle } from './ComposerInput';
-import { PromptComposer } from './PromptComposer';
+import { holdLiftsIn, type HoldRelease } from '../prompt-hold';
+import { PromptComposer, type PromptHold } from './PromptComposer';
 import { QuoteTakerContext } from './quote-selection';
 import { LimitDock } from './LimitState';
 import { ResumeCompactionDock } from './ResumeCompactionDock';
@@ -177,6 +179,59 @@ function splitPath(path: string): { name: string; dir: string } {
 }
 
 // Keep the editor mounted while a pending request takes over, so its selection and draft survive.
+/*
+ * Keeps a waiting prompt card behind the draft while the person types. Typing, pasting and dictating
+ * all change the draft, so `noteInput` is called from its change handler; the hold lifts after a pause.
+ */
+function usePromptHold(): PromptHold & { noteInput(): void; setComposing(composing: boolean): void } {
+    const typedAt = useRef<number | null>(null);
+    const composing = useRef(false);
+    const timer = useRef<ReturnType<typeof setTimeout> | null>(null);
+    const [state, setState] = useState<{ held: boolean; releasedBy: HoldRelease | null }>({ held: false, releasedBy: null });
+
+    const clearTimer = (): void => {
+        if (timer.current !== null) {
+            clearTimeout(timer.current);
+            timer.current = null;
+        }
+    };
+
+    const release = (reason: HoldRelease): void => {
+        clearTimer();
+        typedAt.current = null;
+        composing.current = false;
+        setState((current) => (current.held ? { held: false, releasedBy: reason } : current));
+    };
+
+    const schedule = (): void => {
+        clearTimer();
+        const wait = holdLiftsIn({ typedAt: typedAt.current, composing: composing.current }, Date.now());
+        if (wait !== null) {
+            timer.current = setTimeout(() => release('pause'), wait);
+        }
+    };
+
+    const noteInput = (): void => {
+        typedAt.current = Date.now();
+        setState({ held: true, releasedBy: null });
+        schedule();
+    };
+
+    const setComposing = (next: boolean): void => {
+        composing.current = next;
+        if (next) {
+            setState({ held: true, releasedBy: null });
+        } else {
+            typedAt.current = Date.now();
+        }
+        schedule();
+    };
+
+    useEffect(() => clearTimer, []);
+
+    return { held: state.held, releasedBy: state.releasedBy, release, noteInput, setComposing };
+}
+
 export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabled, readOnly = false, providerFixed, onSend, onRetarget }: ComposerProps) {
     const { t } = useTranslation('agent-chat');
     const sendDelivery = chatHost().useSendDelivery();
@@ -200,6 +255,7 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
     const { isApplePlatform, notify } = chatHost();
     const registerQuoteTaker = useContext(QuoteTakerContext);
     const inputRef = useRef<ComposerInputHandle>(null);
+    const hold = usePromptHold();
     // Taking a queued message back waits on the machine, and what was typed meanwhile is what it merges with.
     const draftRef = useRef(draft);
     const fileInputRef = useRef<HTMLInputElement>(null);
@@ -238,6 +294,7 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
     const queue = info.queue ?? [];
     const text = draft.text;
     const quote = draft.quote;
+    const quoteSource = draft.quoteSource;
     // The CLI announces its session on the first message, so anything before that is still a blank chat.
     const started = info.agentSessionId !== null || info.usage.turns > 0;
     const accountChoice = useAccountChoice(info.provider, info.account);
@@ -270,8 +327,8 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
 
     useEffect(
         () =>
-            registerQuoteTaker?.((selected) => {
-                setDraft((current) => ({ ...current, quote: selected }));
+            registerQuoteTaker?.((selected, itemId) => {
+                setDraft((current) => ({ ...current, quote: selected, quoteSource: itemId }));
                 inputRef.current?.focus();
             }),
         [registerQuoteTaker]
@@ -383,6 +440,26 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
         [chatId, chats, draft.chats, mention]
     );
     const mentionCount = chatMatches.length + files.length;
+    // One menu is open at a time, so they share an id.
+    const listId = useId();
+    const mentionsLabelId = `${listId}-chats`;
+    const filesLabelId = `${listId}-files`;
+    const filesLabelShown = mention !== null && (mention.query === '' || chatMatches.length > 0);
+    const menuOpen = commandMenuOpen || skillMenuOpen || mentionMenuOpen;
+    const menuCount = commandMenuOpen ? commands.length : skillMenuOpen ? skillMatches.length : mentionCount;
+    // The list can shrink under a stale index; every reader takes the one that still points at an option.
+    const activeIndex = clampMenuIndex(menuIndex, menuCount);
+    const inputAria = useMemo(
+        () =>
+            composerMenuAria({
+                label: t('composer.inputLabel'),
+                listId,
+                open: menuOpen,
+                activeIndex,
+                count: menuCount
+            }),
+        [t, listId, menuOpen, activeIndex, menuCount]
+    );
     const editorExtensions = useMemo(
         () => [chipDecorations({ mentions: draft.mentions, skills: draft.skills }), LEAVE_DROPS_TO_THE_CARD],
         [draft.mentions, draft.skills]
@@ -398,7 +475,7 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
     };
 
     const removeQuote = (): void => {
-        setDraft((current) => ({ ...current, quote: '' }));
+        setDraft((current) => ({ ...current, quote: '', quoteSource: null }));
         inputRef.current?.focus();
     };
 
@@ -618,7 +695,8 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
             setNotice(`${rejected.name}: ${rejected.reason}`);
             return;
         }
-        const chosen = commands[menuIndex];
+        hold.release('send');
+        const chosen = commands[activeIndex];
         if (commandQuery !== null && chosen?.local && runCommand(chosen.name)) {
             clearDraft();
             return;
@@ -639,6 +717,7 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
             mentions: presentMentions(trimmed, draft.mentions),
             skills: presentSkills(trimmed, draft.skills),
             chats: draft.chats,
+            quoteSource: quote !== '' && quoteSource !== null ? { itemId: quoteSource } : undefined,
             attachments: draft.attachments
         });
         clearDraft();
@@ -647,9 +726,20 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
         setHistoryIndex(null);
     };
 
-    /* A stashed prompt comes back as text, mentions and skills; its files were never kept. */
+    /*
+     * A stashed prompt comes back as text, mentions and skills; its files were never kept. Its quote
+     * keeps leading to its reply in the chat it came from, and is plain text in any other.
+     */
     const restoreStashed = (prompt: StashedPrompt): void => {
-        setDraft((current) => ({ ...current, text: prompt.text, mentions: [...prompt.mentions], skills: [...prompt.skills] }));
+        const stashedQuote = prompt.quote;
+        const here = stashedQuote !== undefined && stashedQuote.chatId === chatId;
+        setDraft((current) => ({
+            ...current,
+            text: stashedQuote === undefined || here ? prompt.text : withQuote(stashedQuote.text, prompt.text),
+            mentions: [...prompt.mentions],
+            skills: [...prompt.skills],
+            ...(here ? { quote: stashedQuote.text, quoteSource: stashedQuote.itemId } : {})
+        }));
         setHistoryIndex(null);
         inputRef.current?.focus();
     };
@@ -682,7 +772,7 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
                 failed(e);
                 return;
             }
-            const taken: Omit<ChatDraft, 'quote'> = {
+            const taken: Omit<ChatDraft, 'quote' | 'quoteSource'> = {
                 text: message.text,
                 mentions: message.mentions ?? [],
                 skills: message.skills ?? [],
@@ -726,7 +816,7 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
             }
             return;
         }
-        if (stashDraft(draft)) {
+        if (stashDraft(draft, chatId)) {
             clearDraft();
             setMention(null);
             setSkillQuery(null);
@@ -800,7 +890,7 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
                 return true;
             }
             if (e.key === 'Tab') {
-                const chosen = commands[menuIndex]!;
+                const chosen = commands[activeIndex]!;
                 if (chosen.skill) {
                     chooseSkill(chosen.name);
                 } else {
@@ -814,7 +904,7 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
                 return true;
             }
             if (e.key === 'Tab' || e.key === 'Enter') {
-                chooseSkill((skillMatches[menuIndex] ?? skillMatches[0]!).name);
+                chooseSkill((skillMatches[activeIndex] ?? skillMatches[0]!).name);
                 return true;
             }
         }
@@ -823,7 +913,7 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
                 return true;
             }
             if (e.key === 'Tab' || e.key === 'Enter') {
-                chooseMentionAt(menuIndex);
+                chooseMentionAt(activeIndex);
                 return true;
             }
         }
@@ -996,6 +1086,7 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
                     hasDraft={!isEmptyDraft(draft)}
                     denyReason={capabilities?.denyReason === true}
                     onAllAnswered={() => inputRef.current?.focus()}
+                    hold={hold}
                 >
                     <LimitDock chatId={chatId} info={info} />
                     {compactionOffer && (
@@ -1006,11 +1097,15 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
                         />
                     )}
                     {commandMenuOpen && (
-                        <div className="border-b border-border px-1.5 py-1.5">
+                        <div id={listId} role="listbox" aria-label={t('composer.menu.commands')} className="border-b border-border px-1.5 py-1.5">
                             {commands.map((command, index) => (
                                 <button
                                     key={command.name}
-                                    data-active={index === menuIndex}
+                                    id={optionIdOf(listId, index)}
+                                    role="option"
+                                    aria-selected={index === activeIndex}
+                                    tabIndex={-1}
+                                    data-active={index === activeIndex}
                                     className="cursor-row flex w-full items-center gap-2 rounded-md px-2 py-1 text-left text-xs text-text-muted"
                                     onMouseEnter={() => setMenuIndex(index)}
                                     onMouseDown={(e) => e.preventDefault()}
@@ -1036,11 +1131,15 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
                         </div>
                     )}
                     {skillMenuOpen && (
-                        <div className="border-b border-border px-1.5 py-1.5">
+                        <div id={listId} role="listbox" aria-label={t('composer.menu.skills')} className="border-b border-border px-1.5 py-1.5">
                             {skillMatches.map((skill, index) => (
                                 <button
                                     key={skill.name}
-                                    data-active={index === menuIndex}
+                                    id={optionIdOf(listId, index)}
+                                    role="option"
+                                    aria-selected={index === activeIndex}
+                                    tabIndex={-1}
+                                    data-active={index === activeIndex}
                                     className="cursor-row flex w-full items-start gap-2 rounded-md px-2 py-1 text-left text-xs text-text-muted"
                                     onMouseEnter={() => setMenuIndex(index)}
                                     onMouseDown={(e) => e.preventDefault()}
@@ -1057,45 +1156,70 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
                     )}
                     {mentionMenuOpen && (
                         <div className="border-b border-border px-1.5 py-1.5">
-                            {chatMatches.length > 0 && <Menu.Label>{t('composer.mentions.chats')}</Menu.Label>}
-                            {chatMatches.map((chat, index) => (
-                                <button
-                                    key={chat.id}
-                                    data-active={index === menuIndex}
-                                    className="cursor-row flex w-full items-center gap-2 rounded-md px-2 py-1 text-left text-xs text-text-muted"
-                                    onMouseEnter={() => setMenuIndex(index)}
-                                    onMouseDown={(e) => e.preventDefault()}
-                                    onClick={() => chooseChat(chat.id)}
-                                >
-                                    <Icon icon={MessageSquare} size={14} className="shrink-0 text-text-faint" />
-                                    <span className="truncate text-text">{chat.title || t('chatReference.untitled')}</span>
-                                </button>
-                            ))}
-                            {files.length > 0 && (mention.query === '' || chatMatches.length > 0) && (
-                                <Menu.Label>{mention.query === '' ? t('composer.mentions.here') : t('composer.mentions.files')}</Menu.Label>
+                            {mentionCount > 0 && (
+                                <div id={listId} role="listbox" aria-label={t('composer.menu.mentions')}>
+                                    {chatMatches.length > 0 && (
+                                        <div role="group" aria-labelledby={mentionsLabelId}>
+                                            <Menu.Label id={mentionsLabelId}>{t('composer.mentions.chats')}</Menu.Label>
+                                            {chatMatches.map((chat, index) => (
+                                                <button
+                                                    key={chat.id}
+                                                    id={optionIdOf(listId, index)}
+                                                    role="option"
+                                                    aria-selected={index === activeIndex}
+                                                    tabIndex={-1}
+                                                    data-active={index === activeIndex}
+                                                    className="cursor-row flex w-full items-center gap-2 rounded-md px-2 py-1 text-left text-xs text-text-muted"
+                                                    onMouseEnter={() => setMenuIndex(index)}
+                                                    onMouseDown={(e) => e.preventDefault()}
+                                                    onClick={() => chooseChat(chat.id)}
+                                                >
+                                                    <Icon icon={MessageSquare} size={14} className="shrink-0 text-text-faint" />
+                                                    <span className="truncate text-text">{chat.title || t('chatReference.untitled')}</span>
+                                                </button>
+                                            ))}
+                                        </div>
+                                    )}
+                                    {files.length > 0 && (
+                                        <div
+                                            role="group"
+                                            {...(filesLabelShown ? { 'aria-labelledby': filesLabelId } : { 'aria-label': t('composer.mentions.files') })}
+                                        >
+                                            {filesLabelShown && (
+                                                <Menu.Label id={filesLabelId}>
+                                                    {mention.query === '' ? t('composer.mentions.here') : t('composer.mentions.files')}
+                                                </Menu.Label>
+                                            )}
+                                            {files.map((path, index) => {
+                                                const { name, dir } = splitPath(path);
+                                                return (
+                                                    <button
+                                                        key={path}
+                                                        id={optionIdOf(listId, chatMatches.length + index)}
+                                                        role="option"
+                                                        aria-selected={chatMatches.length + index === activeIndex}
+                                                        tabIndex={-1}
+                                                        data-active={chatMatches.length + index === activeIndex}
+                                                        className="cursor-row flex w-full items-center gap-2 rounded-md px-2 py-1 text-left text-xs text-text-muted"
+                                                        onMouseEnter={() => setMenuIndex(chatMatches.length + index)}
+                                                        onMouseDown={(e) => e.preventDefault()}
+                                                        onClick={() => chooseMention(path)}
+                                                    >
+                                                        <FileIcon path={path} size={14} />
+                                                        <span className="truncate font-mono text-text">{name}</span>
+                                                        {dir && <span className="min-w-0 truncate text-text-faint">{dir}</span>}
+                                                    </button>
+                                                );
+                                            })}
+                                        </div>
+                                    )}
+                                </div>
                             )}
                             {mentionCount === 0 && (
                                 <div className="px-2 py-1 text-xs text-text-faint">
                                     {mention.query ? t('composer.mentions.noMatch') : t('composer.mentions.empty')}
                                 </div>
                             )}
-                            {files.map((path, index) => {
-                                const { name, dir } = splitPath(path);
-                                return (
-                                    <button
-                                        key={path}
-                                        data-active={chatMatches.length + index === menuIndex}
-                                        className="cursor-row flex w-full items-center gap-2 rounded-md px-2 py-1 text-left text-xs text-text-muted"
-                                        onMouseEnter={() => setMenuIndex(chatMatches.length + index)}
-                                        onMouseDown={(e) => e.preventDefault()}
-                                        onClick={() => chooseMention(path)}
-                                    >
-                                        <FileIcon path={path} size={14} />
-                                        <span className="truncate font-mono text-text">{name}</span>
-                                        {dir && <span className="min-w-0 truncate text-text-faint">{dir}</span>}
-                                    </button>
-                                );
-                            })}
                         </div>
                     )}
                     {queue.length > 0 && (
@@ -1152,7 +1276,24 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
                     )}
                     {quote !== '' && (
                         <div className="flex items-center gap-2 px-5 pt-4 @max-md/composer:px-3.5 @max-md/composer:pt-3">
-                            <span className="min-w-0 grow truncate border-l-2 border-border-strong pl-2.5 text-xs text-text-muted">{quote}</span>
+                            {quoteSource === null ? (
+                                <span className="min-w-0 grow truncate border-l-2 border-border-strong pl-2.5 text-xs text-text-muted">{quote}</span>
+                            ) : (
+                                <Tooltip label={t('composer.quote.goToSource')}>
+                                    <button
+                                        type="button"
+                                        className="min-w-0 grow truncate border-l-2 border-border-strong pl-2.5 text-left text-xs text-text-muted hover:text-text"
+                                        onClick={() =>
+                                            jumpToTimelineItem(scope.keyOf(chatId), quoteSource, {
+                                                flash: true,
+                                                onMissing: () => setNotice(t('rows.user.quoteGone'))
+                                            })
+                                        }
+                                    >
+                                        {quote}
+                                    </button>
+                                </Tooltip>
+                            )}
                             <IconButton icon={X} size="2xs" label={t('composer.quote.remove')} onClick={removeQuote} />
                         </div>
                     )}
@@ -1198,7 +1339,9 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
                         disabled={!writable}
                         tabbable={focused}
                         extensions={editorExtensions}
+                        aria={inputAria}
                         onChange={(value, selection, state) => {
+                            hold.noteInput();
                             setText(value);
                             setMenuIndex(0);
                             trackTriggers(value, selection, state);
@@ -1210,7 +1353,9 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
                         onBlur={() => {
                             setMention(null);
                             setSkillQuery(null);
+                            hold.release('blur');
                         }}
+                        onComposing={hold.setComposing}
                         onKeyDown={onKeyDown}
                         onPaste={onPaste}
                     />

package/src/chat/ui/ComposerInput.tsx

@@ -29,9 +29,13 @@ interface ComposerInputProps {
     className?: string;
     /* Keep the reference stable. A new one reconfigures the editor. */
     extensions?: Extension;
+    /* Attributes for the editable element, such as its label and the option a menu points at; keep the reference stable. */
+    aria?: Readonly<Record<string, string>>;
     onChange(text: string, selection: InputSelection, state: EditorState): void;
     onSelectionChange?(text: string, selection: InputSelection, state: EditorState): void;
     onBlur?(): void;
+    /* An IME composition starts or ends; the text it builds is not in the document until it ends. */
+    onComposing?(composing: boolean): void;
     /* Runs before the editor's own keymap; true means the key is handled and its default prevented. */
     onKeyDown?(event: KeyboardEvent, view: EditorView): boolean;
     /* Runs before the editor pastes the plain text itself; true means the paste is handled. */
@@ -40,6 +44,8 @@ interface ComposerInputProps {
 
 const NO_EXTENSIONS: Extension = [];
 
+const NO_ARIA: Readonly<Record<string, string>> = {};
+
 /*
  * A multi-line text field on CodeMirror, controlled by a plain string. The editor draws the text
  * itself, so a decoration may change a font or add padding without walking the caret off its
@@ -54,6 +60,7 @@ export function ComposerInput({
     className,
     dictationToolbar,
     extensions = NO_EXTENSIONS,
+    aria = NO_ARIA,
     ...handlers
 }: ComposerInputProps) {
     const hostRef = useRef<HTMLDivElement>(null);
@@ -94,7 +101,15 @@ export function ComposerInput({
                     Prec.highest(
                         EditorView.domEventHandlers({
                             keydown: (event, target) => latest.current.handlers.onKeyDown?.(event, target) ?? false,
-                            paste: (event, target) => latest.current.handlers.onPaste?.(event, target) ?? false
+                            paste: (event, target) => latest.current.handlers.onPaste?.(event, target) ?? false,
+                            compositionstart: () => {
+                                latest.current.handlers.onComposing?.(true);
+                                return false;
+                            },
+                            compositionend: () => {
+                                latest.current.handlers.onComposing?.(false);
+                                return false;
+                            }
                         })
                     ),
                     EditorView.updateListener.of((update) => {
@@ -128,13 +143,13 @@ export function ComposerInput({
         viewRef.current?.dispatch({
             effects: [
                 // Spellcheck stays on, as it was on the textarea this editor replaced.
-                compartments.attributes.reconfigure(EditorView.contentAttributes.of({ spellcheck: 'true', tabindex: tabbable ? '0' : '-1' })),
+                compartments.attributes.reconfigure(EditorView.contentAttributes.of({ ...aria, spellcheck: 'true', tabindex: tabbable ? '0' : '-1' })),
                 compartments.editable.reconfigure([EditorView.editable.of(!disabled), EditorState.readOnly.of(disabled)]),
                 compartments.placeholder.reconfigure(placeholderText(placeholder)),
                 compartments.extensions.reconfigure(extensions)
             ]
         });
-    }, [compartments, tabbable, disabled, placeholder, extensions]);
+    }, [compartments, tabbable, disabled, placeholder, extensions, aria]);
 
     useLayoutEffect(() => {
         const view = viewRef.current;

package/src/chat/ui/Pickers.tsx

@@ -1,10 +1,15 @@
-import { useEffect, useMemo, useRef, useState, type ReactNode, type RefObject } from 'react';
+import { useContext, useEffect, useMemo, useRef, useState, type ReactNode, type RefObject } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Bookmark, ChevronDown, ChevronRight, Search, Trash2 } from 'lucide-react';
-import type { AgentKind, ModelInfo, ModelSelection, ProviderInfo, UsageProvider } from '@adecore/agent-contracts';
+import type { AgentKind, ModelSelection, ProviderInfo, UsageProvider } from '@adecore/agent-contracts';
 import { AgentIcon } from '../../agents/AgentIcon';
 import { ProviderLogo } from '../../agents/ProviderLogo';
 import { agentChipOf, modelName } from '../../agents/model-name';
+import { modelRequirementOf } from '../../agents/model-requirement';
+import { chatHost } from '../../host';
+import { ChatScopeContext } from '../../scope';
+import { useReportedModels } from '../../state/chats';
+import { pickerEntriesOf, type PickerEntry } from '../logic/picker-entries';
 import { forgetStashed, STASH_SHORTCUT, useStash, type StashedPrompt } from '../stash';
 import { Icon, IconButton, Menu, Popover, Tooltip } from '@adecore/ui';
 
@@ -14,13 +19,6 @@ const triggerClass =
 const chipClass =
     'flex h-6 min-w-0 shrink items-center gap-1.5 whitespace-nowrap rounded-md bg-surface-hover px-2 text-xs text-text hover:bg-surface-active data-[popup-open]:bg-surface-active';
 
-/* A model row, or the one row that folds the legacy models open. Both take a turn in the arrow keys. */
-type PickerEntry = { kind: 'model'; provider: ProviderInfo; model: ModelInfo } | { kind: 'legacy'; count: number };
-
-function matches(model: ModelInfo, query: string): boolean {
-    return model.name.toLowerCase().includes(query) || model.slug.toLowerCase().includes(query);
-}
-
 interface ModelPickerProps {
     /* Whose models may be picked: every installed chat CLI before the first message, the chat's own after it. */
     providers: ProviderInfo[];
@@ -73,18 +71,13 @@ export function ModelPicker({
     const grouped = providers.length > 1;
     const trimmed = query.trim().toLowerCase();
 
-    const entries = useMemo((): PickerEntry[] => {
-        const rows = providers.flatMap((entry) => entry.models.map((model) => ({ kind: 'model' as const, provider: entry, model })));
-        if (trimmed !== '') {
-            return rows.filter((row) => matches(row.model, trimmed));
-        }
-        const live = rows.filter((row) => !row.model.legacy);
-        const legacy = rows.filter((row) => row.model.legacy);
-        if (legacy.length === 0) {
-            return live;
-        }
-        return legacyOpen ? [...live, { kind: 'legacy', count: legacy.length }, ...legacy] : [...live, { kind: 'legacy', count: legacy.length }];
-    }, [providers, trimmed, legacyOpen]);
+    const entries = useMemo(() => pickerEntriesOf(providers, trimmed, legacyOpen), [providers, trimmed, legacyOpen]);
+    const scope = useContext(ChatScopeContext);
+    const machine = chatHost().useMachineLabel(scope?.id ?? '');
+    const reported = useReportedModels(provider);
+    const requirementOf = (entry: PickerEntry & { kind: 'model' }) => modelRequirementOf(entry.model, entry.provider, reported);
+    // A CLI that is too old blocks all its models; one way to its settings under the group says it once.
+    const blockedKinds = new Set(entries.flatMap((entry) => (entry.kind === 'model' && requirementOf(entry) !== null ? [entry.provider.kind] : [])));
 
     /* Closing forgets the search, so the next open (a click or `/model`) starts on the whole list. */
     const setOpen = (next: boolean): void => {
@@ -110,6 +103,9 @@ export function ModelPicker({
             inputRef.current?.focus();
             return;
         }
+        if (requirementOf(entry) !== null) {
+            return;
+        }
         onChange(entry.provider.kind, entry.model.slug);
         setOpen(false);
     };
@@ -184,6 +180,9 @@ export function ModelPicker({
                         }
                         const previous = entries[i - 1];
                         const first = grouped && (previous === undefined || previous.kind !== 'model' || previous.provider.kind !== entry.provider.kind);
+                        const requirement = requirementOf(entry);
+                        const next = entries[i + 1];
+                        const lastOfGroup = next === undefined || next.kind !== 'model' || next.provider.kind !== entry.provider.kind;
                         const chosen = entry.provider.kind === provider && entry.model.slug === selection.model;
                         return (
                             <div key={`${entry.provider.kind}/${entry.model.slug}`}>
@@ -196,21 +195,43 @@ export function ModelPicker({
                                 <button
                                     role="option"
                                     aria-selected={chosen}
+                                    aria-disabled={requirement !== null || undefined}
                                     data-active={i === index}
-                                    className="cursor-row flex w-full items-center gap-2 rounded-md px-2.5 py-1.5 text-left text-sm text-text-muted"
+                                    className={`cursor-row flex w-full flex-col items-stretch gap-0.5 rounded-md px-2.5 py-1.5 text-left text-sm ${requirement === null ? 'text-text-muted' : 'text-text-faint'}`}
                                     onMouseEnter={() => setIndex(i)}
                                     onClick={() => choose(entry)}
                                 >
-                                    <Menu.Check kind="radio" checked={chosen} />
-                                    <span className="min-w-0 truncate">{entry.model.name}</span>
-                                    {entry.model.badge && (
-                                        <span className="rounded bg-accent-soft px-1 text-[11px] leading-5 font-medium uppercase text-accent">
-                                            {entry.model.badge}
+                                    <span className="flex w-full items-center gap-2">
+                                        <Menu.Check kind="radio" checked={chosen} />
+                                        <span className="min-w-0 truncate">{entry.model.name}</span>
+                                        {entry.model.badge && (
+                                            <span className="rounded bg-accent-soft px-1 text-[11px] leading-5 font-medium uppercase text-accent">
+                                                {entry.model.badge}
+                                            </span>
+                                        )}
+                                        <span className="grow" />
+                                        {entry.model.legacy && <span className="text-xs text-text-faint">{t('pickers.model.legacy')}</span>}
+                                    </span>
+                                    {requirement !== null && (
+                                        <span className="pl-6 text-xs text-text-faint">
+                                            {machine === null
+                                                ? t('pickers.model.requiresHere', { cli: requirement.cli, version: requirement.minVersion })
+                                                : t('pickers.model.requires', { cli: requirement.cli, version: requirement.minVersion, machine })}
                                         </span>
                                     )}
-                                    <span className="grow" />
-                                    {entry.model.legacy && <span className="text-xs text-text-faint">{t('pickers.model.legacy')}</span>}
                                 </button>
+                                {lastOfGroup && blockedKinds.has(entry.provider.kind) && (
+                                    <button
+                                        type="button"
+                                        className="cursor-row flex w-full items-center rounded-md px-2.5 py-1.5 text-left text-xs text-text-muted"
+                                        onClick={() => {
+                                            setOpen(false);
+                                            chatHost().openSettings('providers');
+                                        }}
+                                    >
+                                        {t('pickers.model.providerSettings')}
+                                    </button>
+                                )}
                             </div>
                         );
                     })}
@@ -247,7 +268,7 @@ export function StashPicker({ onRestore }: { onRestore(prompt: StashedPrompt): v
                                 className="flex min-w-0 grow flex-col gap-0.5 rounded-md px-2 py-1.5 text-left text-xs text-text-muted hover:bg-surface-hover hover:text-text"
                                 onClick={() => onRestore(prompt)}
                             >
-                                <span className="line-clamp-2 whitespace-pre-wrap">{prompt.text || t('pickers.stash.noText')}</span>
+                                <span className="line-clamp-2 whitespace-pre-wrap">{prompt.text || prompt.quote?.text || t('pickers.stash.noText')}</span>
                                 {prompt.attachments.length > 0 && (
                                     <span className="text-text-faint">{t('pickers.stash.files', { count: prompt.attachments.length })}</span>
                                 )}