@adecore/agents-react 0.21.1 → 0.22.0

package/dist/chat/ui/Composer.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-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';
@@ -22,12 +22,14 @@ import { PROMPT_MAX_CHARS, pasteBecomesAttachment, pastedTextName, promptGuard,
 import { withQuote } from '../quote.js';
 import { rememberChatAccount, rememberChatPreferences, rememberChatSelection } from '../preferences.js';
 import { STASH_SHORTCUT, stashDraft, useStash } from '../stash.js';
-import { pageTimeline, scrollTimelineToEnd, subscribeTimelineEnd, timelineAtEnd } from '../timeline-scroll.js';
+import { jumpToTimelineItem, pageTimeline, scrollTimelineToEnd, subscribeTimelineEnd, timelineAtEnd } from '../timeline-scroll.js';
 import { ChatActivity } from './ChatActivity.js';
 import { ChatReferenceChip } from './ChatReferenceChip.js';
 import { chipDecorations } from './composer/chips.js';
+import { clampMenuIndex, composerMenuAria, optionIdOf } from './composer/menu-aria.js';
 import { enterAction, inCode, inFenceBody, inOpenFence, listItemAt, recallDirection, tabSpaces } from './composer/keys.js';
 import { ComposerInput } from './ComposerInput.js';
+import { holdLiftsIn } from '../prompt-hold.js';
 import { PromptComposer } from './PromptComposer.js';
 import { QuoteTakerContext } from './quote-selection.js';
 import { LimitDock } from './LimitState.js';
@@ -49,8 +51,7 @@ const NOTICE_MS = 4000;
 const PROMPT_HISTORY = 50;
 // Commands the composer handles itself; the CLI's own ones are sent through as text.
 const LOCAL_COMMANDS = ['model', 'compact', 'clear'];
-/* Files and paths dropped on the card become attachments and chips there. CodeMirror would paste a
-   file's text, or the drag's own text, at the drop point on top of that. */
+/* The card turns dropped files and paths into attachments and chips; CodeMirror would also paste their text at the drop point. */
 const LEAVE_DROPS_TO_THE_CARD = EditorView.domEventHandlers({
     drop: (event) => event.dataTransfer !== null && (event.dataTransfer.types.includes('Files') || carriesMentions(event.dataTransfer.types))
 });
@@ -88,11 +89,69 @@ function hintedPlaceholder(lead, joiner, hints) {
     root.append(lead, extra);
     return root;
 }
+function sendLabelKey(busy, canSteer, delivery) {
+    if (!busy) {
+        return 'composer.send';
+    }
+    if (!canSteer) {
+        return 'composer.queueButton';
+    }
+    return delivery === 'steer' ? 'composer.steerButton' : 'composer.queueWithSteerButton';
+}
+function sameQuery(left, right) {
+    return left?.start === right?.start && left?.query === right?.query;
+}
 function splitPath(path) {
     const slash = path.lastIndexOf('/');
     return slash < 0 ? { name: path, dir: '' } : { name: path.slice(slash + 1), dir: path.slice(0, slash) };
 }
 // 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() {
+    const typedAt = useRef(null);
+    const composing = useRef(false);
+    const timer = useRef(null);
+    const [state, setState] = useState({ held: false, releasedBy: null });
+    const clearTimer = () => {
+        if (timer.current !== null) {
+            clearTimeout(timer.current);
+            timer.current = null;
+        }
+    };
+    const release = (reason) => {
+        clearTimer();
+        typedAt.current = null;
+        composing.current = false;
+        setState((current) => (current.held ? { held: false, releasedBy: reason } : current));
+    };
+    const schedule = () => {
+        clearTimer();
+        const wait = holdLiftsIn({ typedAt: typedAt.current, composing: composing.current }, Date.now());
+        if (wait !== null) {
+            timer.current = setTimeout(() => release('pause'), wait);
+        }
+    };
+    const noteInput = () => {
+        typedAt.current = Date.now();
+        setState({ held: true, releasedBy: null });
+        schedule();
+    };
+    const setComposing = (next) => {
+        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 }) {
     const { t } = useTranslation('agent-chat');
     const sendDelivery = chatHost().useSendDelivery();
@@ -116,6 +175,7 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
     const { isApplePlatform, notify } = chatHost();
     const registerQuoteTaker = useContext(QuoteTakerContext);
     const inputRef = useRef(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(null);
@@ -125,7 +185,6 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
     const providers = useProviders((s) => s.providers);
     const { approvals, questions } = usePendingRequests(chatId);
     const order = useChatRow(chatId, (row) => row?.order);
-    // The structure, which a delta leaves alone. The prompts and the requests are items of their own.
     const items = useChatRow(chatId, (row) => row?.structure);
     const chats = chatHost().useReferableChats();
     const placeholderLead = chatHost().useComposerPlaceholder(scope.id, chatId);
@@ -136,7 +195,7 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
     const capabilities = provider?.capabilities;
     const compaction = capabilities?.compaction;
     const dismissedTurnId = useResumeCompactionDismissal(chatId);
-    /* The cheap half of the offer, so a chat that can never make one keeps no timer. */
+    // The cheap half of the offer, so a chat that can never make one keeps no timer.
     const couldOfferCompaction = compaction !== undefined && compaction !== 'none' && info.usage.contextTokens >= RESUME_COMPACTION_TOKENS;
     const now = useNow(60_000, couldOfferCompaction);
     const compactionOffer = !couldOfferCompaction
@@ -154,15 +213,12 @@ 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;
-    /*
-     * A chat that has started keeps its provider (the CLI holds the thread), and one opened for a
-     * named CLI was never going to change it. Either way the models stay switchable. The CLI takes
-     * the new one on the restart the next send does anyway. With one provider in the list the
-     * picker drops its group headers on its own, so it reads as that CLI's own catalog.
-     */
     const accountChoice = useAccountChoice(info.provider, info.account);
+    // A chat that has started keeps its provider (the CLI holds the thread), and so does one opened for a
+    // named CLI; its models stay switchable, since the CLI takes a new one on the restart the next send does.
     const pickable = started || providerFixed
         ? providers.filter((entry) => entry.kind === info.provider)
         : providers.filter((entry) => entry.installed && entry.capabilities.chat);
@@ -179,8 +235,8 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
         setDraft((current) => ({ ...current, text: joinDraftText(current.text, offered) }));
         inputRef.current?.focus();
     }), [chatId]);
-    useEffect(() => registerQuoteTaker?.((selected) => {
-        setDraft((current) => ({ ...current, quote: selected }));
+    useEffect(() => registerQuoteTaker?.((selected, itemId) => {
+        setDraft((current) => ({ ...current, quote: selected, quoteSource: itemId }));
         inputRef.current?.focus();
     }), [registerQuoteTaker]);
     useEffect(() => {
@@ -197,11 +253,11 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
         }
         let stale = false;
         const search = () => {
-            const search = chatHost().searchFiles;
-            if (search === null) {
+            const searchFiles = chatHost().searchFiles;
+            if (searchFiles === null) {
                 return;
             }
-            search(scope.id, info.cwd, mention.query, MENTION_RESULTS)
+            searchFiles(scope.id, info.cwd, mention.query, MENTION_RESULTS)
                 .then((files) => {
                 if (!stale) {
                     setSearched({ query: mention.query, files });
@@ -280,6 +336,22 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
     const files = mention === null ? [] : searched.files;
     const chatMatches = useMemo(() => (mention === null ? [] : chatSuggestions(chats, mention.query, [chatId, ...draft.chats], CHAT_RESULTS)), [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]);
     const guard = promptGuard(withQuote(quote, text));
     const setText = (next, mentions = draft.mentions, chosen = draft.skills) => {
@@ -289,18 +361,28 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
         setDraft(EMPTY_DRAFT);
     };
     const removeQuote = () => {
-        setDraft((current) => ({ ...current, quote: '' }));
+        setDraft((current) => ({ ...current, quote: '', quoteSource: null }));
         inputRef.current?.focus();
     };
-    const configure = (patch) => {
+    const showError = (error) => {
+        setNotice(error instanceof Error ? error.message : String(error));
+    };
+    /* One configuration at a time; a second pick while one is on its way is dropped. */
+    const runConfiguration = (work) => {
         if (configuring.current) {
             return;
         }
         configuring.current = true;
         setConfigurationPending(true);
-        void actions
-            .configure(chatId, patch)
-            .then(() => {
+        void work()
+            .catch(showError)
+            .finally(() => {
+            configuring.current = false;
+            setConfigurationPending(false);
+        });
+    };
+    const configure = (patch) => {
+        runConfiguration(() => actions.configure(chatId, patch).then(() => {
             if (patch.selection) {
                 rememberChatSelection(info.provider, patch.selection);
             }
@@ -310,40 +392,24 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
             if (patch.account) {
                 rememberChatAccount(scope.id, info.provider, patch.account);
             }
-        })
-            .catch((error) => setNotice(error instanceof Error ? error.message : String(error)))
-            .finally(() => {
-            configuring.current = false;
-            setConfigurationPending(false);
-        });
+        }));
     };
     const chooseAccount = (account) => configure({ account });
     /* A model of another CLI re-points the whole chat; one of this CLI's own is a configure. */
     const chooseModel = (provider, slug) => {
         const selection = { model: slug, options: {} };
         if (provider !== info.provider) {
-            if (configuring.current) {
-                return;
-            }
-            configuring.current = true;
-            setConfigurationPending(true);
-            void onRetarget(provider, selection)
-                .then(() => rememberChatSelection(provider, selection))
-                .catch((error) => setNotice(error instanceof Error ? error.message : String(error)))
-                .finally(() => {
-                configuring.current = false;
-                setConfigurationPending(false);
-            });
+            runConfiguration(() => onRetarget(provider, selection).then(() => rememberChatSelection(provider, selection)));
             return;
         }
         configure({ selection });
     };
     const stop = (shiftKey) => {
         if (composerStopOf(shiftKey) === 'turn') {
-            void actions.stopTurn(chatId, false).catch((error) => setNotice(error instanceof Error ? error.message : String(error)));
+            void actions.stopTurn(chatId, false).catch(showError);
             return;
         }
-        chatHost().confirm.stopSubagents(scope.id, chatId, () => void actions.stopTurn(chatId, true).catch((error) => setNotice(error instanceof Error ? error.message : String(error))));
+        chatHost().confirm.stopSubagents(scope.id, chatId, () => void actions.stopTurn(chatId, true).catch(showError));
     };
     /* The host decides whether a turn is in the way; only its refusal asks the person first. */
     const clearThread = async () => {
@@ -380,17 +446,16 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
                 return false;
         }
     };
-    const same = (a, b) => a?.start === b?.start && a?.query === b?.query;
     /* Which picker the caret opens: `@` for a file, `$` for a skill, or neither. In code a sigil is just text. */
     const trackTriggers = (value, selection, state) => {
         const empty = selection.from === selection.to;
         const tree = empty ? (ensureSyntaxTree(state, selection.from, 50) ?? syntaxTree(state)) : null;
         const caret = tree !== null && !inCode(tree, value, selection.from) ? selection.from : null;
         const skill = caret === null ? null : findSkillQuery(value, caret);
-        setSkillQuery((current) => (same(current, skill) ? current : skill));
+        setSkillQuery((current) => (sameQuery(current, skill) ? current : skill));
         // A CLI that does not expand `@path` gets the text as it is, so the picker stays out of the way.
         const next = caret === null || capabilities?.mentions === false ? null : findMentionQuery(value, caret);
-        setMention((current) => (same(current, next) ? current : next));
+        setMention((current) => (sameQuery(current, next) ? current : next));
     };
     // The inserted text reaches the editor with the render it causes, so the caret waits a frame for it.
     const moveCaret = (caret) => {
@@ -438,8 +503,7 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
         setSkillQuery(null);
         moveCaret(result.caret);
     };
-    /* Paths dragged in from a list of files. There is no mention query to insert into, so they land
-       at the end of the prompt and join the draft's mentions, which is what `chat.send` carries. */
+    /* Paths dragged in from a list of files. With no mention query to insert into, they land at the end of the prompt. */
     const addMentions = (paths) => {
         const fresh = paths.filter((path) => path !== '');
         if (fresh.length === 0 || capabilities?.mentions === false) {
@@ -488,7 +552,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;
@@ -509,6 +574,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();
@@ -516,9 +582,20 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
         setSkillQuery(null);
         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) => {
-        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();
     };
@@ -597,7 +674,7 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
             }
             return;
         }
-        if (stashDraft(draft)) {
+        if (stashDraft(draft, chatId)) {
             clearDraft();
             setMention(null);
             setSkillQuery(null);
@@ -620,6 +697,18 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
         setText(history[next].text, history[next].mentions);
         return true;
     };
+    /* The arrows walk an open picker round; true when the key was one of them. */
+    const moveInMenu = (key, count) => {
+        if (key === 'ArrowDown') {
+            setMenuIndex((i) => (i + 1) % count);
+            return true;
+        }
+        if (key === 'ArrowUp') {
+            setMenuIndex((i) => (i - 1 + count) % count);
+            return true;
+        }
+        return false;
+    };
     /* Runs before the editor's own keymap; true means the key is handled and its default prevented. */
     const onKeyDown = (e, view) => {
         // Shift with the paste shortcut pastes a large text inline after all; any other key forgets it.
@@ -634,8 +723,7 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
             setText('', [], []);
             return true;
         }
-        // The composer keeps the keyboard while you type, but the shortcuts that move between views,
-        // panels and the palette stay the app's, untouched: Mod+Shift+Enter would otherwise send as well.
+        // The app's own shortcuts stay the app's while you type: Mod+Shift+Enter would otherwise send as well.
         if (chatHost().isAppShortcut(e)) {
             return false;
         }
@@ -653,16 +741,11 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
             return true;
         }
         if (commandMenuOpen) {
-            if (e.key === 'ArrowDown') {
-                setMenuIndex((i) => (i + 1) % commands.length);
-                return true;
-            }
-            if (e.key === 'ArrowUp') {
-                setMenuIndex((i) => (i - 1 + commands.length) % commands.length);
+            if (moveInMenu(e.key, commands.length)) {
                 return true;
             }
             if (e.key === 'Tab') {
-                const chosen = commands[menuIndex];
+                const chosen = commands[activeIndex];
                 if (chosen.skill) {
                     chooseSkill(chosen.name);
                 }
@@ -673,30 +756,20 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
             }
         }
         if (skillMenuOpen) {
-            if (e.key === 'ArrowDown') {
-                setMenuIndex((i) => (i + 1) % skillMatches.length);
-                return true;
-            }
-            if (e.key === 'ArrowUp') {
-                setMenuIndex((i) => (i - 1 + skillMatches.length) % skillMatches.length);
+            if (moveInMenu(e.key, skillMatches.length)) {
                 return true;
             }
             if (e.key === 'Tab' || e.key === 'Enter') {
-                chooseSkill((skillMatches[menuIndex] ?? skillMatches[0]).name);
+                chooseSkill((skillMatches[activeIndex] ?? skillMatches[0]).name);
                 return true;
             }
         }
         if (mentionMenuOpen && mentionCount > 0) {
-            if (e.key === 'ArrowDown') {
-                setMenuIndex((i) => (i + 1) % mentionCount);
-                return true;
-            }
-            if (e.key === 'ArrowUp') {
-                setMenuIndex((i) => (i - 1 + mentionCount) % mentionCount);
+            if (moveInMenu(e.key, mentionCount)) {
                 return true;
             }
             if (e.key === 'Tab' || e.key === 'Enter') {
-                chooseMentionAt(menuIndex);
+                chooseMentionAt(activeIndex);
                 return true;
             }
         }
@@ -823,7 +896,7 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
                     addMentions(droppedMentions(e.dataTransfer));
                     addFiles(filesOf(e.dataTransfer));
                     inputRef.current?.focus();
-                }, children: _jsxs(PromptComposer, { chatId: chatId, pending: pending, focused: focused, onShowElsewhere: answerPromptsElsewhere, disabled: disabled, hasDraft: !isEmptyDraft(draft), denyReason: capabilities?.denyReason === true, onAllAnswered: () => inputRef.current?.focus(), children: [_jsx(LimitDock, { chatId: chatId, info: info }), compactionOffer && (_jsx(ResumeCompactionDock, { tokens: compactionOffer.tokens, onCompact: compact, onDismiss: () => dismissResumeCompaction(scope, chatId, compactionOffer.turnId) })), commandMenuOpen && (_jsx("div", { className: "border-b border-border px-1.5 py-1.5", children: commands.map((command, index) => (_jsxs("button", { "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: () => {
+                }, children: _jsxs(PromptComposer, { chatId: chatId, pending: pending, focused: focused, onShowElsewhere: answerPromptsElsewhere, disabled: disabled, hasDraft: !isEmptyDraft(draft), denyReason: capabilities?.denyReason === true, onAllAnswered: () => inputRef.current?.focus(), hold: hold, children: [_jsx(LimitDock, { chatId: chatId, info: info }), compactionOffer && (_jsx(ResumeCompactionDock, { tokens: compactionOffer.tokens, onCompact: compact, onDismiss: () => dismissResumeCompaction(scope, chatId, compactionOffer.turnId) })), commandMenuOpen && (_jsx("div", { id: listId, role: "listbox", "aria-label": t('composer.menu.commands'), className: "border-b border-border px-1.5 py-1.5", children: commands.map((command, index) => (_jsxs("button", { 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: () => {
                                     setMenuIndex(index);
                                     if (command.skill) {
                                         chooseSkill(command.name);
@@ -831,10 +904,10 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
                                     }
                                     setText(`/${command.name}`);
                                     inputRef.current?.focus();
-                                }, children: [_jsx(Icon, { icon: command.skill ? Zap : SquareSlash, size: 12, className: clsx('shrink-0', command.skill ? 'text-skill' : 'text-text-faint') }), _jsxs("span", { className: "font-mono text-text", children: ["/", command.name] }), _jsx("span", { className: "text-text-faint", children: command.hint })] }, command.name))) })), skillMenuOpen && (_jsx("div", { className: "border-b border-border px-1.5 py-1.5", children: skillMatches.map((skill, index) => (_jsxs("button", { "data-active": index === menuIndex, 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(), onClick: () => chooseSkill(skill.name), children: [_jsx(Icon, { icon: Zap, size: 12, className: "mt-0.5 shrink-0 text-skill" }), _jsxs("span", { className: "flex min-w-0 flex-col", children: [_jsxs("span", { className: "truncate font-mono text-text", children: ["$", skill.name] }), skill.description !== '' && _jsx("span", { className: "line-clamp-1 text-text-faint", children: skill.description })] })] }, skill.name))) })), mentionMenuOpen && (_jsxs("div", { className: "border-b border-border px-1.5 py-1.5", children: [chatMatches.length > 0 && _jsx(Menu.Label, { children: t('composer.mentions.chats') }), chatMatches.map((chat, index) => (_jsxs("button", { "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), children: [_jsx(Icon, { icon: MessageSquare, size: 14, className: "shrink-0 text-text-faint" }), _jsx("span", { className: "truncate text-text", children: chat.title || t('chatReference.untitled') })] }, chat.id))), files.length > 0 && (mention.query === '' || chatMatches.length > 0) && (_jsx(Menu.Label, { children: mention.query === '' ? t('composer.mentions.here') : t('composer.mentions.files') })), mentionCount === 0 && (_jsx("div", { className: "px-2 py-1 text-xs text-text-faint", children: mention.query ? t('composer.mentions.noMatch') : t('composer.mentions.empty') })), files.map((path, index) => {
-                                    const { name, dir } = splitPath(path);
-                                    return (_jsxs("button", { "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), children: [_jsx(FileIcon, { path: path, size: 14 }), _jsx("span", { className: "truncate font-mono text-text", children: name }), dir && _jsx("span", { className: "min-w-0 truncate text-text-faint", children: dir })] }, path));
-                                })] })), queue.length > 0 && (_jsxs("div", { className: "flex flex-col gap-1 border-b border-border px-2 py-1.5", children: [info.queuePaused === true && _jsx("p", { className: "px-1.5 text-xs text-text-muted", children: t('composer.queue.paused') }), queue.map((message) => {
+                                }, children: [_jsx(Icon, { icon: command.skill ? Zap : SquareSlash, size: 12, className: clsx('shrink-0', command.skill ? 'text-skill' : 'text-text-faint') }), _jsxs("span", { className: "font-mono text-text", children: ["/", command.name] }), _jsx("span", { className: "text-text-faint", children: command.hint })] }, command.name))) })), skillMenuOpen && (_jsx("div", { id: listId, role: "listbox", "aria-label": t('composer.menu.skills'), className: "border-b border-border px-1.5 py-1.5", children: skillMatches.map((skill, index) => (_jsxs("button", { 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(), onClick: () => chooseSkill(skill.name), children: [_jsx(Icon, { icon: Zap, size: 12, className: "mt-0.5 shrink-0 text-skill" }), _jsxs("span", { className: "flex min-w-0 flex-col", children: [_jsxs("span", { className: "truncate font-mono text-text", children: ["$", skill.name] }), skill.description !== '' && _jsx("span", { className: "line-clamp-1 text-text-faint", children: skill.description })] })] }, skill.name))) })), mentionMenuOpen && (_jsxs("div", { className: "border-b border-border px-1.5 py-1.5", children: [mentionCount > 0 && (_jsxs("div", { id: listId, role: "listbox", "aria-label": t('composer.menu.mentions'), children: [chatMatches.length > 0 && (_jsxs("div", { role: "group", "aria-labelledby": mentionsLabelId, children: [_jsx(Menu.Label, { id: mentionsLabelId, children: t('composer.mentions.chats') }), chatMatches.map((chat, index) => (_jsxs("button", { 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), children: [_jsx(Icon, { icon: MessageSquare, size: 14, className: "shrink-0 text-text-faint" }), _jsx("span", { className: "truncate text-text", children: chat.title || t('chatReference.untitled') })] }, chat.id)))] })), files.length > 0 && (_jsxs("div", { role: "group", ...(filesLabelShown ? { 'aria-labelledby': filesLabelId } : { 'aria-label': t('composer.mentions.files') }), children: [filesLabelShown && (_jsx(Menu.Label, { id: filesLabelId, children: mention.query === '' ? t('composer.mentions.here') : t('composer.mentions.files') })), files.map((path, index) => {
+                                                    const { name, dir } = splitPath(path);
+                                                    return (_jsxs("button", { 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), children: [_jsx(FileIcon, { path: path, size: 14 }), _jsx("span", { className: "truncate font-mono text-text", children: name }), dir && _jsx("span", { className: "min-w-0 truncate text-text-faint", children: dir })] }, path));
+                                                })] }))] })), mentionCount === 0 && (_jsx("div", { className: "px-2 py-1 text-xs text-text-faint", children: mention.query ? t('composer.mentions.noMatch') : t('composer.mentions.empty') }))] })), queue.length > 0 && (_jsxs("div", { className: "flex flex-col gap-1 border-b border-border px-2 py-1.5", children: [info.queuePaused === true && _jsx("p", { className: "px-1.5 text-xs text-text-muted", children: t('composer.queue.paused') }), queue.map((message) => {
                                     const sendNow = () => {
                                         scrollTimelineToEnd(chatId, 'instant');
                                         void actions.sendNow(chatId, message.id).catch(() => undefined);
@@ -842,7 +915,11 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
                                     const unqueue = () => void actions.unqueue(chatId, message.id).catch(() => undefined);
                                     const edit = () => void takeBack(message);
                                     return (_jsxs(ContextMenu.Root, { children: [_jsxs(ContextMenu.Trigger, { className: "group/queued flex items-center gap-2 rounded-md px-1.5 py-1 text-xs text-text-muted", children: [_jsx(Icon, { icon: Clock, size: 12, className: "shrink-0 text-text-faint" }), _jsx("span", { className: "min-w-0 grow truncate", children: message.text || t('composer.queue.attachments', { count: message.attachments?.length ?? 0 }) }), _jsxs(ButtonGroup, { render: _jsx("span", {}), className: "opacity-0 transition-opacity group-hover/queued:opacity-100 focus-within:opacity-100", children: [_jsx(IconButton, { icon: FastForward, size: "2xs", label: t('composer.queue.sendNow'), onClick: sendNow }), _jsx(IconButton, { icon: Pencil, size: "2xs", label: t('common.action.edit'), disabled: takingBack !== null, onClick: edit }), _jsx(IconButton, { icon: X, size: "2xs", label: t('common.action.remove'), onClick: unqueue })] })] }), _jsxs(ContextMenu.Popup, { children: [_jsxs(ContextMenu.Item, { onClick: sendNow, children: [_jsx(Icon, { icon: FastForward, size: 14 }), " ", t('composer.queue.sendNow')] }), _jsxs(ContextMenu.Item, { disabled: takingBack !== null, onClick: edit, children: [_jsx(Icon, { icon: Pencil, size: 14 }), " ", t('common.action.edit')] }), _jsxs(ContextMenu.Item, { disabled: message.text === '', onClick: () => copyText(message.text), children: [_jsx(Icon, { icon: Copy, size: 14 }), " ", t('common.action.copy')] }), _jsx(ContextMenu.Separator, {}), _jsxs(ContextMenu.Item, { className: "text-status-error", onClick: unqueue, children: [_jsx(Icon, { icon: X, size: 14 }), " ", t('common.action.remove')] })] })] }, message.id));
-                                })] })), quote !== '' && (_jsxs("div", { className: "flex items-center gap-2 px-5 pt-4 @max-md/composer:px-3.5 @max-md/composer:pt-3", children: [_jsx("span", { className: "min-w-0 grow truncate border-l-2 border-border-strong pl-2.5 text-xs text-text-muted", children: quote }), _jsx(IconButton, { icon: X, size: "2xs", label: t('composer.quote.remove'), onClick: removeQuote })] })), draft.chats.length > 0 && (_jsx("div", { className: "flex flex-wrap gap-1.5 px-5 pt-4 @max-md/composer:px-3.5 @max-md/composer:pt-3", children: draft.chats.map((id) => (_jsx(ChatReferenceChip, { chatId: id, onRemove: () => removeChat(id) }, id))) })), draft.attachments.length > 0 && (_jsx("div", { className: "flex flex-wrap gap-2 px-5 pt-4 @max-md/composer:px-3.5 @max-md/composer:pt-3", children: draft.attachments.map((attachment, index) => (_jsxs("div", { className: "group/thumb relative", children: [isImageAttachment(attachment.mime) ? (_jsx(UploadThumb, { upload: attachment })) : (_jsxs("span", { className: "flex h-14 w-36 flex-col justify-center gap-0.5 rounded-lg border border-border bg-surface-sunken px-2.5", children: [_jsxs("span", { className: "flex items-center gap-1.5 text-xs text-text", children: [_jsx(Icon, { icon: Paperclip, size: 12, className: "shrink-0 text-text-faint" }), _jsx("span", { className: "truncate", children: attachment.name })] }), _jsx("span", { className: "pl-5 text-xs text-text-faint", children: formatBytes(uploadBytes(attachment)) })] })), _jsx(IconButton, { icon: X, size: "2xs", label: t('composer.removeAttachment', { name: attachment.name }), className: "absolute -top-1.5 -right-1.5 border border-border bg-surface-raised opacity-0 transition-opacity group-hover/thumb:opacity-100 focus-visible:opacity-100", onClick: () => removeAttachment(index) })] }, `${attachment.name}-${index}`))) })), _jsx(ComposerInput, { ref: inputRef, dictationToolbar: dictationToolbar, className: "composer-input select-text text-sm leading-normal text-text", value: text, placeholder: placeholder, disabled: !writable, tabbable: focused, extensions: editorExtensions, onChange: (value, selection, state) => {
+                                })] })), quote !== '' && (_jsxs("div", { className: "flex items-center gap-2 px-5 pt-4 @max-md/composer:px-3.5 @max-md/composer:pt-3", children: [quoteSource === null ? (_jsx("span", { className: "min-w-0 grow truncate border-l-2 border-border-strong pl-2.5 text-xs text-text-muted", children: quote })) : (_jsx(Tooltip, { label: t('composer.quote.goToSource'), children: _jsx("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'))
+                                        }), children: quote }) })), _jsx(IconButton, { icon: X, size: "2xs", label: t('composer.quote.remove'), onClick: removeQuote })] })), draft.chats.length > 0 && (_jsx("div", { className: "flex flex-wrap gap-1.5 px-5 pt-4 @max-md/composer:px-3.5 @max-md/composer:pt-3", children: draft.chats.map((id) => (_jsx(ChatReferenceChip, { chatId: id, onRemove: () => removeChat(id) }, id))) })), draft.attachments.length > 0 && (_jsx("div", { className: "flex flex-wrap gap-2 px-5 pt-4 @max-md/composer:px-3.5 @max-md/composer:pt-3", children: draft.attachments.map((attachment, index) => (_jsxs("div", { className: "group/thumb relative", children: [isImageAttachment(attachment.mime) ? (_jsx(UploadThumb, { upload: attachment })) : (_jsxs("span", { className: "flex h-14 w-36 flex-col justify-center gap-0.5 rounded-lg border border-border bg-surface-sunken px-2.5", children: [_jsxs("span", { className: "flex items-center gap-1.5 text-xs text-text", children: [_jsx(Icon, { icon: Paperclip, size: 12, className: "shrink-0 text-text-faint" }), _jsx("span", { className: "truncate", children: attachment.name })] }), _jsx("span", { className: "pl-5 text-xs text-text-faint", children: formatBytes(uploadBytes(attachment)) })] })), _jsx(IconButton, { icon: X, size: "2xs", label: t('composer.removeAttachment', { name: attachment.name }), className: "absolute -top-1.5 -right-1.5 border border-border bg-surface-raised opacity-0 transition-opacity group-hover/thumb:opacity-100 focus-visible:opacity-100", onClick: () => removeAttachment(index) })] }, `${attachment.name}-${index}`))) })), _jsx(ComposerInput, { ref: inputRef, dictationToolbar: dictationToolbar, className: "composer-input select-text text-sm leading-normal text-text", value: text, placeholder: placeholder, disabled: !writable, tabbable: focused, extensions: editorExtensions, aria: inputAria, onChange: (value, selection, state) => {
+                                hold.noteInput();
                                 setText(value);
                                 setMenuIndex(0);
                                 trackTriggers(value, selection, state);
@@ -852,15 +929,10 @@ export function Composer({ chatId, info, focused, answerPromptsElsewhere, disabl
                             }, onSelectionChange: trackTriggers, onBlur: () => {
                                 setMention(null);
                                 setSkillQuery(null);
-                            }, onKeyDown: onKeyDown, onPaste: onPaste }), notice && (_jsx("div", { className: "px-5 pb-1 text-xs text-status-error @max-md/composer:px-3.5", role: "alert", children: notice })), guard.visible && (_jsxs("div", { className: clsx('px-5 pb-1 text-right text-xs tabular-nums @max-md/composer:px-3.5', guard.tooLong ? 'text-status-error' : 'text-text-faint'), children: [formatNumber(guard.count), " / ", formatNumber(PROMPT_MAX_CHARS), guard.tooLong && ` ${t('composer.tooLong')}`] })), _jsxs("div", { className: "flex items-center gap-2 pt-3 pr-3.5 pb-3.5 pl-5 @max-md/composer:gap-1.5 @max-md/composer:p-3 @max-md/composer:pt-2.5", children: [attachable && (_jsx(Tooltip, { label: t('composer.attach'), name: true, children: _jsx("button", { type: "button", className: "grid h-8 w-8 shrink-0 place-items-center rounded-full border border-border text-text-muted hover:bg-surface-hover hover:text-text disabled:opacity-50", disabled: !writable, onClick: () => fileInputRef.current?.click(), children: _jsx(Icon, { icon: Plus, size: 16 }) }) })), _jsx("input", { ref: fileInputRef, type: "file", multiple: true, hidden: true, onChange: (e) => {
+                                hold.release('blur');
+                            }, onComposing: hold.setComposing, onKeyDown: onKeyDown, onPaste: onPaste }), notice && (_jsx("div", { className: "px-5 pb-1 text-xs text-status-error @max-md/composer:px-3.5", role: "alert", children: notice })), guard.visible && (_jsxs("div", { className: clsx('px-5 pb-1 text-right text-xs tabular-nums @max-md/composer:px-3.5', guard.tooLong ? 'text-status-error' : 'text-text-faint'), children: [formatNumber(guard.count), " / ", formatNumber(PROMPT_MAX_CHARS), guard.tooLong && ` ${t('composer.tooLong')}`] })), _jsxs("div", { className: "flex items-center gap-2 pt-3 pr-3.5 pb-3.5 pl-5 @max-md/composer:gap-1.5 @max-md/composer:p-3 @max-md/composer:pt-2.5", children: [attachable && (_jsx(Tooltip, { label: t('composer.attach'), name: true, children: _jsx("button", { type: "button", className: "grid h-8 w-8 shrink-0 place-items-center rounded-full border border-border text-text-muted hover:bg-surface-hover hover:text-text disabled:opacity-50", disabled: !writable, onClick: () => fileInputRef.current?.click(), children: _jsx(Icon, { icon: Plus, size: 16 }) }) })), _jsx("input", { ref: fileInputRef, type: "file", multiple: true, hidden: true, onChange: (e) => {
                                         addFiles(Array.from(e.target.files ?? []));
                                         e.target.value = '';
                                         inputRef.current?.focus();
-                                    } }), _jsx(RunSettings, { disabled: configurationPending || !writable, providers: pickable, provider: info.provider, selection: info.selection, model: model, runtimeMode: info.runtimeMode, effectiveRuntimeMode: info.effectiveRuntimeMode, permissionMode: info.permissionMode, open: modelPickerOpen, onOpenChange: setModelPickerOpen, onModel: chooseModel, onOption: (id, value) => configure({ selection: { ...info.selection, options: { ...info.selection.options, [id]: value } } }), onMode: (runtimeMode) => configure({ runtimeMode }), usage: info.usage, compactDisabled: busy || !writable, onCompact: compact, account: accountChoice === null ? null : { choice: accountChoice, started, onPick: chooseAccount } }), _jsx(StashPicker, { onRestore: restoreStashed }), Slot !== null && (_jsx(ErrorBoundary, { label: t('composer.slotFailed'), resetKeys: [chatId], compact: true, className: "relative rounded-lg", children: _jsx(Slot, { scopeId: scope.id, chatId: chatId, disabled: !writable, insert: insertIntoDraft }) })), _jsx("span", { className: "grow" }), _jsxs("div", { className: "flex h-9 shrink-0 items-center gap-0.5 rounded-full bg-surface-hover", children: [_jsx("div", { ref: setDictationToolbar, className: "flex items-center pl-1 empty:hidden [&_.icon-btn]:rounded-full" }), busy && (_jsx(Tooltip, { label: composerStopLabel(), name: true, children: _jsx("button", { className: "flex h-9 w-9 shrink-0 items-center justify-center rounded-full bg-status-error text-accent-text", onClick: (event) => stop(event.shiftKey), children: _jsx(Icon, { icon: Square, size: 16 }) }) })), (!busy || !isEmptyDraft(draft)) && (_jsx(Tooltip, { label: busy
-                                                ? t(canSteer
-                                                    ? sendDelivery === 'steer'
-                                                        ? 'composer.steerButton'
-                                                        : 'composer.queueWithSteerButton'
-                                                    : 'composer.queueButton')
-                                                : t('composer.send'), kbd: KEY_SHORTCUTS.modEnter, name: true, children: _jsx("button", { className: "flex h-9 w-9 shrink-0 items-center justify-center rounded-full bg-accent text-accent-text hover:brightness-90 disabled:opacity-50 disabled:hover:brightness-100", disabled: isEmptyDraft(draft) || !writable || guard.tooLong, onClick: (event) => submit(event.altKey), children: _jsx(Icon, { icon: ArrowUp, size: 16 }) }) }))] })] })] }) }), _jsx(PromptDialog, { open: confirmClear, title: t('composer.clear.title'), description: t('composer.clear.description'), confirmLabel: t('composer.clear.confirm'), danger: true, fallbackMessage: t('composer.notice.clearFailed'), onConfirm: forceClearThread, onOpenChange: () => setConfirmClear(false) })] }));
+                                    } }), _jsx(RunSettings, { disabled: configurationPending || !writable, providers: pickable, provider: info.provider, selection: info.selection, model: model, runtimeMode: info.runtimeMode, effectiveRuntimeMode: info.effectiveRuntimeMode, permissionMode: info.permissionMode, open: modelPickerOpen, onOpenChange: setModelPickerOpen, onModel: chooseModel, onOption: (id, value) => configure({ selection: { ...info.selection, options: { ...info.selection.options, [id]: value } } }), onMode: (runtimeMode) => configure({ runtimeMode }), usage: info.usage, compactDisabled: busy || !writable, onCompact: compact, account: accountChoice === null ? null : { choice: accountChoice, started, onPick: chooseAccount } }), _jsx(StashPicker, { onRestore: restoreStashed }), Slot !== null && (_jsx(ErrorBoundary, { label: t('composer.slotFailed'), resetKeys: [chatId], compact: true, className: "relative rounded-lg", children: _jsx(Slot, { scopeId: scope.id, chatId: chatId, disabled: !writable, insert: insertIntoDraft }) })), _jsx("span", { className: "grow" }), _jsxs("div", { className: "flex h-9 shrink-0 items-center gap-0.5 rounded-full bg-surface-hover", children: [_jsx("div", { ref: setDictationToolbar, className: "flex items-center pl-1 empty:hidden [&_.icon-btn]:rounded-full" }), busy && (_jsx(Tooltip, { label: composerStopLabel(), name: true, children: _jsx("button", { className: "flex h-9 w-9 shrink-0 items-center justify-center rounded-full bg-status-error text-accent-text", onClick: (event) => stop(event.shiftKey), children: _jsx(Icon, { icon: Square, size: 16 }) }) })), (!busy || !isEmptyDraft(draft)) && (_jsx(Tooltip, { label: t(sendLabelKey(busy, canSteer, sendDelivery)), kbd: KEY_SHORTCUTS.modEnter, name: true, children: _jsx("button", { className: "flex h-9 w-9 shrink-0 items-center justify-center rounded-full bg-accent text-accent-text hover:brightness-90 disabled:opacity-50 disabled:hover:brightness-100", disabled: isEmptyDraft(draft) || !writable || guard.tooLong, onClick: (event) => submit(event.altKey), children: _jsx(Icon, { icon: ArrowUp, size: 16 }) }) }))] })] })] }) }), _jsx(PromptDialog, { open: confirmClear, title: t('composer.clear.title'), description: t('composer.clear.description'), confirmLabel: t('composer.clear.confirm'), danger: true, fallbackMessage: t('composer.notice.clearFailed'), onConfirm: forceClearThread, onOpenChange: () => setConfirmClear(false) })] }));
 }

package/dist/chat/ui/ComposerInput.d.ts

@@ -19,11 +19,13 @@ interface ComposerInputProps {
     tabbable: boolean;
     className?: string;
     extensions?: Extension;
+    aria?: Readonly<Record<string, string>>;
     onChange(text: string, selection: InputSelection, state: EditorState): void;
     onSelectionChange?(text: string, selection: InputSelection, state: EditorState): void;
     onBlur?(): void;
+    onComposing?(composing: boolean): void;
     onKeyDown?(event: KeyboardEvent, view: EditorView): boolean;
     onPaste?(event: ClipboardEvent, view: EditorView): boolean;
 }
-export declare function ComposerInput({ ref, value, placeholder, disabled, tabbable, className, dictationToolbar, extensions, ...handlers }: ComposerInputProps): import("react").JSX.Element;
+export declare function ComposerInput({ ref, value, placeholder, disabled, tabbable, className, dictationToolbar, extensions, aria, ...handlers }: ComposerInputProps): import("react").JSX.Element;
 export {};

package/dist/chat/ui/ComposerInput.js

@@ -6,12 +6,13 @@ import { chatHost } from '../../host.js';
 import { composerEditorExtensions, externalChange } from './composer/editor.js';
 import { insertAtSelection } from './composer/insert.js';
 const NO_EXTENSIONS = [];
+const NO_ARIA = {};
 /*
  * 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
  * character, which a textarea with a painted layer behind it could not.
  */
-export function ComposerInput({ ref, value, placeholder, disabled, tabbable, className, dictationToolbar, extensions = NO_EXTENSIONS, ...handlers }) {
+export function ComposerInput({ ref, value, placeholder, disabled, tabbable, className, dictationToolbar, extensions = NO_EXTENSIONS, aria = NO_ARIA, ...handlers }) {
     const hostRef = useRef(null);
     const targetRef = useRef(null);
     const viewRef = useRef(null);
@@ -47,7 +48,15 @@ export function ComposerInput({ ref, value, placeholder, disabled, tabbable, cla
                     compartments.extensions.of([]),
                     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) => {
                         const current = latest.current.handlers;
@@ -80,13 +89,13 @@ export function ComposerInput({ ref, value, placeholder, disabled, tabbable, cla
         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;
         if (!view || value === reported.current) {