@agent-native/toolkit 0.23.1 → 0.198.1

package/dist/composer/TiptapComposer.js

@@ -1,5 +1,4 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Skeleton } from "@agent-native/toolkit/ui/skeleton";
 import { useComposer, useComposerRuntime } from "@assistant-ui/react";
 import { IconArrowUp, IconCheck, IconChevronDown, IconChevronRight, IconBulb, IconClock, IconBolt, IconTool, IconX, IconClipboardList, IconKey, IconPencil, IconPlugConnected, IconHelpCircle, IconRefresh, IconAlertCircle, IconLoader2, } from "@tabler/icons-react";
 import Placeholder from "@tiptap/extension-placeholder";
@@ -11,7 +10,6 @@ import { toast } from "sonner";
 import { Popover, PopoverAnchor, PopoverContent, PopoverTrigger, } from "../ui/popover.js";
 import { Tooltip, TooltipContent, TooltipTrigger } from "../ui/tooltip.js";
 import { formatAttachmentError } from "./attachment-accept.js";
-import { ComposerContextMenu, } from "./ComposerContextMenu.js";
 import { ComposerPlusMenu, } from "./ComposerPlusMenu.js";
 import { areComposerContextItemsReady, ComposerContextError, snapshotComposerContextItems, } from "./context-items.js";
 import { getComposerDraftKey } from "./draft-key.js";
@@ -275,6 +273,41 @@ function uniquifyComposerImageFile(file) {
     return new File([file], uniqueName, { type: file.type });
 }
 const COMPOSER_DRAFT_SAVE_DELAY_MS = 300;
+const COMPOSER_DRAFT_FORMAT = "agent-composer-draft-v1";
+function readComposerDraft(value) {
+    if (!value.startsWith(`{"format":"${COMPOSER_DRAFT_FORMAT}"`)) {
+        return { html: value, slotReferences: [] };
+    }
+    const parsed = JSON.parse(value);
+    if (parsed?.format !== COMPOSER_DRAFT_FORMAT ||
+        typeof parsed.html !== "string" ||
+        !Array.isArray(parsed.slotReferences)) {
+        throw new Error("Stored composer draft has an invalid format.");
+    }
+    return { html: parsed.html, slotReferences: parsed.slotReferences };
+}
+function writeComposerDraft(draftKey, html, slotReferences) {
+    if (!draftKey)
+        return;
+    try {
+        if (!html.trim() && slotReferences.length === 0) {
+            localStorage.removeItem(draftKey);
+        }
+        else if (slotReferences.length > 0) {
+            localStorage.setItem(draftKey, JSON.stringify({
+                format: COMPOSER_DRAFT_FORMAT,
+                html,
+                slotReferences,
+            }));
+        }
+        else {
+            localStorage.setItem(draftKey, html);
+        }
+    }
+    catch {
+        // coercion-ok: Browser storage is optional and can be unavailable or full.
+    }
+}
 function composerDocumentHasContent(doc) {
     if (doc.textContent.trim().length > 0)
         return true;
@@ -290,20 +323,12 @@ function composerDocumentHasContent(doc) {
     });
     return hasContent;
 }
-function persistComposerDraft(draftKey, editor) {
-    if (!draftKey)
+function persistComposerDraft(draftKey, editor, slotReferences) {
+    if (!composerDocumentHasContent(editor.state.doc) && !slotReferences.length) {
+        writeComposerDraft(draftKey, "", []);
         return;
-    try {
-        if (!composerDocumentHasContent(editor.state.doc)) {
-            localStorage.removeItem(draftKey);
-        }
-        else {
-            localStorage.setItem(draftKey, editor.getHTML());
-        }
-    }
-    catch {
-        // coercion-ok: browser storage is optional and can be unavailable or full.
     }
+    writeComposerDraft(draftKey, editor.getHTML(), slotReferences);
 }
 function clearComposerDraft(draftKey, expectedValue) {
     if (!draftKey)
@@ -533,7 +558,7 @@ function ComposerModeChip({ mode, onRemove, }) {
     const t = useComposerRuntimeAdapters().translate;
     const config = localizedComposerModeConfig(mode, t);
     const Icon = config.icon;
-    return (_jsxs("span", { className: "inline-flex items-center gap-1 rounded-md border border-border bg-muted/50 px-1.5 py-0.5 text-xs font-medium text-foreground", children: [_jsx(Icon, { className: "h-3 w-3 text-muted-foreground" }), config.label, _jsx("button", { type: "button", onClick: onRemove, className: "ms-0.5 rounded-sm text-muted-foreground hover:text-foreground cursor-pointer", children: _jsx(IconX, { className: "h-3 w-3" }) })] }));
+    return (_jsxs("span", { className: "inline-flex items-center gap-1 rounded-md border border-border bg-muted/50 px-1.5 py-0.5 text-xs font-medium text-foreground", children: [_jsx(Icon, { className: "h-3 w-3 text-muted-foreground" }), config.label, _jsx("button", { type: "button", onClick: onRemove, "aria-label": t("agentChat.common.cancel", { defaultValue: "Cancel" }), className: "ms-0.5 rounded-sm text-muted-foreground hover:text-foreground cursor-pointer", children: _jsx(IconX, { className: "h-3 w-3" }) })] }));
 }
 function plainTextToDoc(text) {
     const lines = text.length > 0 ? text.split(/\r?\n/) : [""];
@@ -678,9 +703,6 @@ export const MODEL_SELECTOR_POPOVER_STYLE = {
 const MODEL_SELECTOR_POPOVER_CLASS = "box-border w-64 rounded-lg border border-border bg-popover p-1 text-popover-foreground shadow-lg outline-none";
 const PICKER_HELP_BUTTON_CLASS = "flex size-3 shrink-0 items-center justify-center rounded text-muted-foreground/60 hover:text-foreground";
 const PICKER_HELP_ICON_CLASS = "size-2";
-export function shouldShowModelSelectorSkeleton(isLoading, engineCount) {
-    return isLoading && engineCount === 0;
-}
 /**
  * With nothing connected, every family is a dead "needs API key" row, so the
  * picker shows only the connect CTAs. Never hide the list unless a CTA is
@@ -981,7 +1003,6 @@ function ModelSelector({ model, effort, engines, agents, selectedAgent, selected
         onModelSelectorOpenChange?.(nextOpen);
     }, [agentOnly, controlledOpen, onModelSelectorOpenChange]);
     const visibleProviderGroups = modelProviderGroups;
-    const showModelListSkeleton = shouldShowModelSelectorSkeleton(modelListLoading, engines.length);
     // Keep setup actions visible, but do not show unusable model rows until one
     // provider or local agent is ready.
     const builderFlow = adapters.builder.useConnectFlow({
@@ -1134,9 +1155,9 @@ function ModelSelector({ model, effort, engines, agents, selectedAgent, selected
                                                                 setPickerOpen(false);
                                                             }, className: "flex w-full items-center gap-3 rounded-md px-2 py-2 text-start hover:bg-accent/50", children: [_jsx("span", { className: `min-w-0 flex-1 truncate text-[12px] ${option.value === imageModel.value
                                                                         ? "text-foreground"
-                                                                        : "text-muted-foreground"}`, children: option.label }), option.value === imageModel.value && (_jsx(IconCheck, { className: "size-4 shrink-0 text-primary" }))] }, option.value)))] })), hasConfiguredProvider && showModelListSkeleton && (_jsx(ModelSelectorSkeleton, {})), hasConfiguredProvider &&
+                                                                        : "text-muted-foreground"}`, children: option.label }), option.value === imageModel.value && (_jsx(IconCheck, { className: "size-4 shrink-0 text-primary" }))] }, option.value)))] })), hasConfiguredProvider &&
                                                     isCodexAgent &&
-                                                    !showModelListSkeleton &&
+                                                    !modelListLoading &&
                                                     !onlyConnectPathAvailable &&
                                                     modelProviderGroups.length === 0 && (_jsxs("button", { type: "button", onClick: openLlmSettings, className: "flex w-full items-center rounded-md px-2 py-2 text-start hover:bg-accent/50", children: [_jsx("span", { className: "min-w-0 flex-1 truncate text-[12px] text-muted-foreground", children: t("agentChat.composer.noOpenAiModels", {
                                                                 defaultValue: "No OpenAI models configured",
@@ -1214,26 +1235,30 @@ function ModelSelector({ model, effort, engines, agents, selectedAgent, selected
                                                             ? "text-foreground"
                                                             : "text-muted-foreground"}`, children: option.label }), option.enabled === terminalModeControl.enabled && (_jsx(IconCheck, { className: "size-4 shrink-0 text-primary" }))] }, option.label))) }))] }) }) })] }) })] }));
 }
-function ModelSelectorSkeleton() {
-    const t = useComposerRuntimeAdapters().translate;
-    return (_jsxs("div", { className: "space-y-1 px-2 py-2", role: "status", "aria-label": t("agentChat.composer.loadingModels", {
-            defaultValue: "Loading models",
-        }), children: [_jsx("span", { className: "sr-only", children: t("agentChat.composer.loadingModelsProgress", {
-                    defaultValue: "Loading models…",
-                }) }), ["w-24", "w-32", "w-20", "w-28"].map((width, index) => (_jsxs("div", { className: "flex items-center gap-1.5 px-1 py-1.5", children: [_jsx(Skeleton, { className: "size-3 rounded-sm" }), _jsx(Skeleton, { className: `h-3 ${width}` })] }, index)))] }));
-}
-export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submissionDisabled = false, submitting = false, maxDocumentAttachmentBytes = MAX_DOCUMENT_ATTACHMENT_BYTES, documentAttachmentLimitLabel = "PDFs", attachmentsEnabled = true, onAttachmentRequest, contextButtonTooltipDisabled = false, focusRef, initialText, initialTextKey, onSubmit, onBeforeSubmit, clearOnSubmit = true, onTextChange, actionButton, willQueue = false, extraActionButton, stopButton, attachButton, modeControl, toolbarSlot, layoutVariant = "default", slashCommands = [], slashSkills = [], includeDefaultSlashCommands = true, includeDefaultSlashSkills = true, onSlashCommand, execMode, onExecModeChange, planModeDisabled = false, planModeDisabledReason, voiceEnabled = DEFAULT_VOICE_DICTATION_ENABLED, selectedModel, selectedEngine, selectedEffort, showAutoModelOption = true, modelSelectorOpen, availableModels, modelListLoading, onModelChange, onEffortChange, availableAgents, selectedAgent, agentOnly = false, hostedHarness, onAgentChange, onModelSelectorOpenChange, providerConnectStatusEnabled, onConnectProvider, onConnectLocalRuntime, imageModelMenu, draftScope, contextItems: providedContextItems, onRemoveContextItem, onInspectContextItem, onRetryContextItem, contextMenuItems, plusMenuMode = "full", terminalModeControl, extensionTools = false, interceptBuildRequestsForBuilder = false, onAttachmentError, mentionItems: hostMentionItems = [], mentionPopoverDensity = "default", includeDefaultMentionSearch = true, onReferencesChange, onEscape, onFocus, onBlur, onSelectionChange, }) {
+export function TiptapComposer({ placeholder, ariaLabel, disabled = false, contextControlsDisabled = false, submissionDisabled = false, submitting = false, maxDocumentAttachmentBytes = MAX_DOCUMENT_ATTACHMENT_BYTES, documentAttachmentLimitLabel = "PDFs", attachmentsEnabled = true, onAttachmentRequest, contextButtonTooltipDisabled = false, focusRef, initialText, initialTextKey, onSubmit, onBeforeSubmit, getSubmitFailureDraftScope, clearOnSubmit = true, clearOnSubmitImmediately = false, onTextChange, actionButton, willQueue = false, extraActionButton, stopButton, attachButton, modeControl, toolbarSlot, layoutVariant = "default", slashCommands = [], slashSkills = [], includeDefaultSlashCommands = true, includeDefaultSlashSkills = true, onSlashCommand, execMode, onExecModeChange, planModeDisabled = false, planModeDisabledReason, voiceEnabled = DEFAULT_VOICE_DICTATION_ENABLED, selectedModel, selectedEngine, selectedEffort, showAutoModelOption = true, modelSelectorOpen, availableModels, modelListLoading, onModelChange, onEffortChange, availableAgents, selectedAgent, agentOnly = false, hostedHarness, onAgentChange, onModelSelectorOpenChange, providerConnectStatusEnabled, onConnectProvider, onConnectLocalRuntime, imageModelMenu, draftScope, contextItems: providedContextItems, onRemoveContextItem, onInspectContextItem, onRetryContextItem, contextMenuItems, plusMenuMode = "full", terminalModeControl, extensionTools = false, interceptBuildRequestsForBuilder = false, onAttachmentError, mentionItems: hostMentionItems = [], mentionPopoverDensity = "default", includeDefaultMentionSearch = true, onReferencesChange, onEscape, onFocus, onBlur, onSelectionChange, }) {
     const contextItems = providedContextItems ?? [];
+    const hasContextMenu = (contextMenuItems !== undefined || plusMenuMode !== "hidden") &&
+        !(attachmentsEnabled && attachButton);
     const adapters = useComposerRuntimeAdapters();
     const t = adapters.translate;
     const sendButtonTooltip = t(getComposerSendTooltipKey(willQueue), {
         defaultValue: willQueue ? "Queue message" : "Send message",
     });
     const [popover, setPopover] = useState(null);
+    const [contextMenuOpen, setContextMenuOpen] = useState(false);
+    const [contextMenuSearch, setContextMenuSearch] = useState("");
     const popoverRef = useRef(null);
     const composerRuntime = useComposerRuntime();
     const lastComposerRuntimeSyncRef = useRef(null);
     const submitInFlightRef = useRef(false);
+    const attachmentCleanupPendingRef = useRef(0);
+    const mountedRef = useRef(false);
+    useLayoutEffect(() => {
+        mountedRef.current = true;
+        return () => {
+            mountedRef.current = false;
+        };
+    }, []);
     const [editorHasText, setEditorHasText] = useState(false);
     const [referenceRevision, setReferenceRevision] = useState(0);
     const [slotReferences, setSlotReferences] = useState([]);
@@ -1300,8 +1325,16 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
     onExecModeChangeRef.current = onExecModeChange;
     const planModeDisabledRef = useRef(planModeDisabled);
     planModeDisabledRef.current = planModeDisabled;
-    const { items: mentionItems, isLoading: mentionsLoading } = useMentionSearch(popover?.type === "@" ? popover.query : "", includeDefaultMentionSearch && popover?.type === "@");
-    const mentionQuery = popover?.type === "@" ? popover.query : "";
+    const { items: mentionItems, isLoading: mentionsLoading, error: mentionsError, retry: retryMentions, } = useMentionSearch(contextMenuOpen
+        ? contextMenuSearch
+        : popover?.type === "@"
+            ? popover.query
+            : "", includeDefaultMentionSearch && (contextMenuOpen || popover?.type === "@"));
+    const mentionQuery = contextMenuOpen
+        ? contextMenuSearch
+        : popover?.type === "@"
+            ? popover.query
+            : "";
     const filteredMentionItems = useMemo(() => filterMentionItemsForSlots([
         // Host items arrive unfiltered; the default search filters itself.
         ...hostMentionItems.filter((item) => mentionItemMatchesQuery(item, mentionQuery)),
@@ -1346,6 +1379,10 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
     filteredCommandsRef.current = filteredCommands;
     const filteredSkillsRef = useRef(filteredSkills);
     filteredSkillsRef.current = filteredSkills;
+    const hasContextMenuRef = useRef(hasContextMenu);
+    hasContextMenuRef.current = hasContextMenu;
+    const launchersDisabledRef = useRef(disabled || contextControlsDisabled);
+    launchersDisabledRef.current = disabled || contextControlsDisabled;
     const onSlashCommandRef = useRef(onSlashCommand);
     onSlashCommandRef.current = onSlashCommand;
     const announceSlashCommand = useCallback((command) => {
@@ -1373,6 +1410,10 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
     const initialTextKeyRef = useRef(undefined);
     const hasCheckedInitialDraftRef = useRef(false);
     const seenReferenceInsertIdsRef = useRef(new Set());
+    useEffect(() => {
+        if (!hasContextMenu)
+            setContextMenuOpen(false);
+    }, [hasContextMenu]);
     useEffect(() => {
         if (selectedContextItemKey &&
             !contextItems.some((item) => item.key === selectedContextItemKey)) {
@@ -1418,7 +1459,7 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
         const ed = draftEditorRef.current;
         if (!ed || !isComposerEditorUsable(ed))
             return;
-        persistComposerDraft(draftKeyRef.current, ed);
+        persistComposerDraft(draftKeyRef.current, ed, slotReferencesRef.current);
     }, [cancelScheduledDraftPersist]);
     const scheduleComposerDraftPersist = useCallback((ed) => {
         draftEditorRef.current = ed;
@@ -1431,7 +1472,7 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
             if (draftKeyRef.current !== key || draftEditorRef.current !== ed) {
                 return;
             }
-            persistComposerDraft(key, ed);
+            persistComposerDraft(key, ed, slotReferencesRef.current);
         }, COMPOSER_DRAFT_SAVE_DELAY_MS);
     }, [cancelScheduledDraftPersist]);
     const previousDraftKeyRef = useRef(draftKey);
@@ -1478,6 +1519,7 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
             attributes: {
                 "aria-label": ariaLabel ?? resolvedPlaceholder,
                 "aria-multiline": "true",
+                "aria-disabled": String(disabled || contextControlsDisabled),
                 role: "textbox",
                 "data-agent-composer-variant": layoutVariant,
                 "data-agent-composer-slot": "editor-input",
@@ -1738,6 +1780,15 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
                     const { from } = view.state.selection;
                     const textBefore = view.state.doc.textBetween(Math.max(0, from - 1), from);
                     if (from === 1 || textBefore === "" || /\s/.test(textBefore)) {
+                        if (hasContextMenuRef.current) {
+                            if (launchersDisabledRef.current)
+                                return false;
+                            event.preventDefault();
+                            popoverStateRef.current = null;
+                            setPopover(null);
+                            setContextMenuOpen(true);
+                            return true;
+                        }
                         const position = getComposerPopoverAnchorPosition(view, from);
                         if (!position)
                             return false;
@@ -1785,7 +1836,7 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
         draftEditorRef.current = editor;
         const flush = () => {
             cancelScheduledDraftPersist();
-            persistComposerDraft(draftKey, editor);
+            persistComposerDraft(draftKey, editor, slotReferencesRef.current);
         };
         window.addEventListener("pagehide", flush);
         window.addEventListener("beforeunload", flush);
@@ -1793,7 +1844,7 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
             window.removeEventListener("pagehide", flush);
             window.removeEventListener("beforeunload", flush);
             cancelScheduledDraftPersist();
-            persistComposerDraft(draftKey, editor);
+            persistComposerDraft(draftKey, editor, slotReferencesRef.current);
             if (draftEditorRef.current === editor)
                 draftEditorRef.current = null;
         };
@@ -1923,9 +1974,16 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
             if (!isComposerEditorUsable(editor))
                 return;
             editor.commands.focus();
-            // An inserted "@" (an @ toolbar button) opens the mention menu just as
-            // typing it does; after a word it needs a space to count as a trigger.
+            // An inserted "@" opens the shared Add menu when the host provides one.
             const mention = text === "@";
+            if (mention && hasContextMenuRef.current) {
+                if (launchersDisabledRef.current)
+                    return;
+                popoverStateRef.current = null;
+                setPopover(null);
+                setContextMenuOpen(true);
+                return;
+            }
             let inserted = text;
             if (mention) {
                 const { from } = editor.state.selection;
@@ -2402,7 +2460,7 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
         const ed = editor;
         if (!isComposerEditorUsable(ed))
             return false;
-        if (submitInFlightRef.current)
+        if (submitInFlightRef.current || attachmentCleanupPendingRef.current > 0)
             return false;
         if (submissionDisabledRef.current ||
             !areComposerContextItemsReady(contextItemsRef.current))
@@ -2442,6 +2500,7 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
         let attachments = composerRuntime.getState().attachments;
         let submittedSlotReferences = slotReferencesRef.current;
         let submittedEditorDocument = ed.state.doc;
+        let submittedDraftHtml = ed.getHTML();
         if (!text.trim() && references.length === 0 && attachments.length === 0)
             return false;
         const oversizedDocumentError = getOversizedDocumentAttachmentError(attachments, {
@@ -2525,28 +2584,127 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
             }
             return false;
         };
+        const clearImmediately = clearOnSubmitImmediately && clearOnSubmit;
+        const clearedBeforePreflight = clearImmediately && Boolean(onBeforeSubmit);
+        const restoreSubmittedDraft = (preserveFollowUp = false) => {
+            const forkScope = getSubmitFailureDraftScope?.();
+            if (!clearImmediately && !forkScope)
+                return;
+            const recoveryKey = forkScope
+                ? getComposerDraftKey(forkScope)
+                : submittingDraftKey;
+            const isForkRecovery = recoveryKey !== submittingDraftKey;
+            if (isForkRecovery) {
+                clearComposerDraft(submittingDraftKey, submittingDraftSnapshot);
+            }
+            let currentDraft = null;
+            try {
+                currentDraft = recoveryKey ? localStorage.getItem(recoveryKey) : null;
+            }
+            catch {
+                // coercion-ok: Browser storage is optional and can be unavailable or full.
+            }
+            const editorIsCurrentScope = isComposerEditorUsable(ed) && draftKeyRef.current === recoveryKey;
+            const hasFollowUp = editorIsCurrentScope &&
+                (composerDocumentHasContent(ed.state.doc) ||
+                    slotReferencesRef.current.length > 0);
+            const canPreserveFollowUp = preserveFollowUp &&
+                clearedBeforePreflight &&
+                !isForkRecovery &&
+                hasFollowUp &&
+                (currentDraft === null ||
+                    currentDraft === submittingDraftSnapshot ||
+                    (() => {
+                        try {
+                            const savedDraft = readComposerDraft(currentDraft);
+                            return (savedDraft.html === ed.getHTML() &&
+                                JSON.stringify(savedDraft.slotReferences) ===
+                                    JSON.stringify(slotReferencesRef.current));
+                        }
+                        catch {
+                            // coercion-ok: Never overwrite an unreadable stored draft.
+                            return false;
+                        }
+                    })());
+            if (currentDraft !== null &&
+                (isForkRecovery || currentDraft !== submittingDraftSnapshot) &&
+                !canPreserveFollowUp) {
+                return;
+            }
+            if (editorIsCurrentScope) {
+                if (hasFollowUp && !canPreserveFollowUp) {
+                    return;
+                }
+                if (canPreserveFollowUp) {
+                    ed.commands.setContent({
+                        type: "doc",
+                        content: [
+                            ...(composerDocumentHasContent(submittedEditorDocument)
+                                ? submittedEditorDocument.content.content.map((node) => node.toJSON())
+                                : []),
+                            ...(composerDocumentHasContent(ed.state.doc)
+                                ? ed.state.doc.content.content.map((node) => node.toJSON())
+                                : []),
+                        ],
+                    });
+                    updateSlotReferences(applySlotReferenceChanges(submittedSlotReferences, slotReferencesRef.current));
+                }
+                else {
+                    ed.commands.setContent(submittedEditorDocument.toJSON());
+                    updateSlotReferences(submittedSlotReferences);
+                }
+                const restored = syncComposerState();
+                setEditorHasText(restored.text.trim().length > 0 || restored.references.length > 0);
+                onTextChangeRef.current?.(restored.text);
+                flushComposerDraft();
+                return;
+            }
+            if (composerDocumentHasContent(submittedEditorDocument) ||
+                submittedSlotReferences.length > 0) {
+                writeComposerDraft(recoveryKey, submittedDraftHtml, submittedSlotReferences);
+            }
+        };
         if (handleLocalSubmission())
             return true;
+        if (clearedBeforePreflight) {
+            cancelActiveVoice();
+            clearEditorAfterSubmit(submittingDraftSnapshot, submittedSlotReferences);
+        }
         if (onBeforeSubmit) {
             submitInFlightRef.current = true;
             try {
                 const shouldSubmit = await onBeforeSubmit();
-                if (!shouldSubmit)
+                if (!shouldSubmit) {
+                    restoreSubmittedDraft(true);
                     return false;
+                }
+            }
+            catch (error) {
+                restoreSubmittedDraft(true);
+                if (mountedRef.current && isCurrentDraftScope()) {
+                    setContextSubmissionError(formatAttachmentError(error, t("agentChat.composer.submitFailed", {
+                        defaultValue: "Could not submit. Try again.",
+                    })));
+                }
+                return false;
             }
             finally {
                 submitInFlightRef.current = false;
             }
         }
-        if (!isComposerEditorUsable(ed))
-            return false;
-        if (!isCurrentDraftScope())
+        if (!isComposerEditorUsable(ed) ||
+            !isCurrentDraftScope() ||
+            submissionDisabledRef.current ||
+            !areComposerContextItemsReady(contextItemsRef.current)) {
+            restoreSubmittedDraft(true);
             return false;
-        if (onBeforeSubmit) {
+        }
+        if (onBeforeSubmit && !clearedBeforePreflight) {
             const current = syncComposerState();
             if (textOverride === undefined) {
                 text = current.text;
                 submittedEditorDocument = ed.state.doc;
+                submittedDraftHtml = ed.getHTML();
             }
             references = current.references;
             submittedSlotReferences = slotReferencesRef.current;
@@ -2585,47 +2743,56 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
             contextSnapshot = snapshotComposerContextItems(contextItemsProvidedRef.current ? contextItemsRef.current : undefined);
         }
         catch (error) {
-            if (!(error instanceof ComposerContextError))
+            if (!(error instanceof ComposerContextError)) {
+                restoreSubmittedDraft(true);
                 throw error;
-            if (error.code === "not-ready")
+            }
+            if (error.code === "not-ready") {
+                restoreSubmittedDraft(true);
                 return false;
+            }
             setContextSubmissionError(t("agentChat.composer.contextLimitExceeded", {
                 defaultValue: "Context is too large. Remove an item or attach a smaller selection.",
             }));
+            restoreSubmittedDraft(true);
             return false;
         }
-        // Composer mode: send with context via agent chat bridge
-        if (composerMode) {
-            const config = localizedComposerModeConfig(composerMode, t);
-            config.beforeSend?.();
-            const message = displayableComposerModeMessage({
-                messagePrefix: config.messagePrefix,
+        const modeConfig = composerMode
+            ? localizedComposerModeConfig(composerMode, t)
+            : undefined;
+        const modePrompt = trimmed ||
+            (attachments.length > 0
+                ? t("agentChat.composer.useAttachedContext", {
+                    defaultValue: "Use the attached context.",
+                })
+                : "");
+        const composerModeContext = modeConfig?.getContext(modePrompt);
+        const submissionText = modeConfig
+            ? displayableComposerModeMessage({
+                messagePrefix: modeConfig.messagePrefix,
                 trimmedText: trimmed,
                 attachmentCount: attachments.length,
                 attachedContextFallback: t("agentChat.composer.useAttachedContext", {
                     defaultValue: "Use the attached context.",
                 }),
-            });
-            const modePrompt = trimmed ||
-                (attachments.length > 0
-                    ? t("agentChat.composer.useAttachedContext", {
-                        defaultValue: "Use the attached context.",
-                    })
-                    : "");
-            const modeContext = config.getContext(modePrompt);
+            })
+            : text;
+        // Raw Tiptap hosts without a submit handler retain the legacy bridge.
+        if (modeConfig && !onSubmit) {
+            modeConfig.beforeSend?.();
             const contextItemsText = contextSnapshot?.length
                 ? formatPromptContextItems(contextSnapshot)
                 : "";
             const context = contextItemsText
-                ? `${modeContext}\n\n${contextItemsText}`
-                : modeContext;
+                ? `${composerModeContext}\n\n${contextItemsText}`
+                : composerModeContext;
             if (attachments.length > 0) {
-                composerRuntime.setText(`${message}\n\n<context>\n${context}\n</context>`);
+                composerRuntime.setText(`${submissionText}\n\n<context>\n${context}\n</context>`);
                 composerRuntime.send();
             }
             else {
                 adapters.agentChat.sendToAgentChat({
-                    message,
+                    message: submissionText,
                     context,
                     ...(contextSnapshot === undefined
                         ? {}
@@ -2639,7 +2806,7 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
                 });
             }
             cancelActiveVoice();
-            if (clearSubmittedDraft()) {
+            if (clearedBeforePreflight || clearSubmittedDraft()) {
                 setComposerMode(null);
                 composerModeRef.current = null;
             }
@@ -2651,26 +2818,99 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
                 return false;
             const submittedAttachments = [...attachments];
             submitInFlightRef.current = true;
+            let locallySubmitted = false;
+            let settled = false;
+            const clearSubmittedComposer = () => {
+                if (clearOnSubmit) {
+                    clearComposerDraft(submittingDraftKey, submittingDraftSnapshot);
+                }
+                if (!mountedRef.current || !isCurrentDraftScope())
+                    return;
+                // Remove by captured identity; later uploads belong to the next draft.
+                void Promise.all(attachments.map(async (attachment) => {
+                    const index = composerRuntime
+                        .getState()
+                        .attachments.findIndex((item) => item.id === attachment.id);
+                    return index < 0
+                        ? undefined
+                        : composerRuntime.getAttachmentByIndex(index).remove();
+                })).catch((error) => {
+                    if (mountedRef.current && isCurrentDraftScope()) {
+                        onAttachmentErrorRef.current?.(error);
+                    }
+                    console.error("Could not clear submitted attachments", error);
+                });
+                if (!isComposerEditorUsable(ed))
+                    return;
+                if (!clearOnSubmit) {
+                    closePopover();
+                    return;
+                }
+                if (ed.state.doc !== submittedEditorDocument) {
+                    flushComposerDraft();
+                    return;
+                }
+                cancelActiveVoice();
+                cancelScheduledDraftPersist();
+                ed.commands.clearContent();
+                ed.commands.focus("end");
+                setEditorHasText(false);
+                setSlotReferences((current) => current.filter((reference) => !submittedSlotReferences.includes(reference)));
+                if (composerModeRef.current === composerMode) {
+                    setComposerMode(null);
+                    composerModeRef.current = null;
+                }
+                resetComposerRuntimeState();
+                closePopover();
+            };
+            const onLocalSubmit = () => {
+                if (settled || locallySubmitted || !clearOnSubmit)
+                    return;
+                // A suggested prompt does not transfer ownership of an unrelated draft.
+                if (draftText && text !== draftText)
+                    return;
+                locallySubmitted = true;
+                clearSubmittedComposer();
+            };
             try {
                 setContextSubmissionError(null);
-                try {
-                    await currentOnSubmit(text, references, submittedAttachments, {
-                        intent,
-                        ...(contextSnapshot === undefined
-                            ? {}
-                            : { contextItems: contextSnapshot }),
-                    });
+                if (clearImmediately && !clearedBeforePreflight) {
+                    cancelActiveVoice();
+                    clearSubmittedDraft();
+                }
+                await currentOnSubmit(submissionText, references, submittedAttachments, {
+                    intent,
+                    onLocalSubmit,
+                    ...(composerModeContext === undefined
+                        ? {}
+                        : { composerModeContext }),
+                    ...(contextSnapshot === undefined
+                        ? {}
+                        : { contextItems: contextSnapshot }),
+                });
+            }
+            catch (error) {
+                if (locallySubmitted) {
+                    restoreSubmittedDraft();
+                    return true;
                 }
-                catch (error) {
+                restoreSubmittedDraft(true);
+                if (mountedRef.current && isCurrentDraftScope()) {
                     setContextSubmissionError(formatAttachmentError(error, t("agentChat.composer.submitFailed", {
                         defaultValue: "Could not submit. Try again.",
                     })));
-                    return false;
-                }
-                if (!isCurrentDraftScope()) {
-                    clearComposerDraft(submittingDraftKey, submittingDraftSnapshot);
-                    return true;
                 }
+                return false;
+            }
+            finally {
+                settled = true;
+                submitInFlightRef.current = false;
+            }
+            if (!isCurrentDraftScope()) {
+                clearComposerDraft(submittingDraftKey, submittingDraftSnapshot);
+                return true;
+            }
+            if (!locallySubmitted) {
                 const clearSubmittedAttachments = attachmentCleanupRef.current.then(async () => {
                     for (const attachment of submittedAttachments) {
                         const index = composerRuntime
@@ -2684,10 +2924,15 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
                 attachmentCleanupRef.current = clearSubmittedAttachments.catch((error) => {
                     console.error("Could not clear submitted composer attachments", error);
                 });
-                if (clearOnSubmit) {
+                if (clearOnSubmit && !clearOnSubmitImmediately) {
                     cancelActiveVoice();
-                    clearSubmittedDraft();
+                    if (clearSubmittedDraft() &&
+                        composerModeRef.current === composerMode) {
+                        setComposerMode(null);
+                        composerModeRef.current = null;
+                    }
                 }
+                attachmentCleanupPendingRef.current += 1;
                 try {
                     await clearSubmittedAttachments;
                 }
@@ -2702,15 +2947,17 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
                     }));
                     return true;
                 }
-                if (!clearOnSubmit) {
-                    closePopover();
-                    return true;
+                finally {
+                    attachmentCleanupPendingRef.current -= 1;
                 }
-                return true;
             }
-            finally {
-                submitInFlightRef.current = false;
+            if (!clearOnSubmit) {
+                closePopover();
+                return true;
             }
+            if (mountedRef.current && isCurrentDraftScope())
+                modeConfig?.beforeSend?.();
+            return true;
         }
         else {
             if (textOverride !== undefined)
@@ -2718,7 +2965,8 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
             composerRuntime.send();
         }
         cancelActiveVoice();
-        clearSubmittedDraft();
+        if (!clearedBeforePreflight)
+            clearSubmittedDraft();
         return true;
     }, [
         closePopover,
@@ -2732,9 +2980,14 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
         flushComposerDraft,
         interceptBuildRequestsForBuilder,
         clearOnSubmit,
+        clearOnSubmitImmediately,
+        getSubmitFailureDraftScope,
         onBeforeSubmit,
         extractComposerPayload,
         syncComposerState,
+        updateSlotReferences,
+        slotReferences,
+        resetComposerRuntimeState,
         voice,
         allSlashCommands,
         announceSlashCommand,
@@ -2870,6 +3123,33 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
             .run();
         closePopover();
     }, [editor, popover, closePopover]);
+    const popoverOpen = popover !== null;
+    useLayoutEffect(() => {
+        if (!popoverOpen || !isComposerEditorUsable(editor))
+            return;
+        const frame = editor.view.dom.closest('[data-agent-composer-slot="root"]') ?? editor.view.dom;
+        const measure = () => {
+            const current = popoverStateRef.current;
+            if (!current || !isComposerEditorUsable(editor))
+                return;
+            const position = getComposerPopoverAnchorPosition(editor.view, editor.state.selection.from);
+            if (!position)
+                return;
+            const updated = { ...current, position };
+            popoverStateRef.current = updated;
+            setPopover(updated);
+        };
+        measure();
+        const observer = new ResizeObserver(measure);
+        observer.observe(frame);
+        window.addEventListener("resize", measure);
+        window.addEventListener("scroll", measure, true);
+        return () => {
+            observer.disconnect();
+            window.removeEventListener("resize", measure);
+            window.removeEventListener("scroll", measure, true);
+        };
+    }, [editor, popoverOpen]);
     // Track query text as user types after trigger
     useEffect(() => {
         if (!isComposerEditorUsable(editor) || !popover)
@@ -2964,9 +3244,11 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
         }
         const shouldRestoreSavedDraft = !hasCheckedInitialDraftRef.current;
         hasCheckedInitialDraftRef.current = true;
+        const savedDraft = saved ? readComposerDraft(saved) : null;
         try {
-            if (saved && editor.isEmpty && shouldRestoreSavedDraft) {
-                editor.commands.setContent(saved);
+            if (savedDraft && editor.isEmpty && shouldRestoreSavedDraft) {
+                editor.commands.setContent(savedDraft.html);
+                updateSlotReferences(savedDraft.slotReferences);
                 editor.commands.focus("end");
                 if (initialText !== undefined)
                     initialTextKeyRef.current = key;
@@ -2983,7 +3265,8 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
                 return;
             }
             const trimmed = editor.getText({ blockSeparator: "\n" }).trim();
-            setEditorHasText(composerDocumentHasContent(editor.state.doc));
+            setEditorHasText(composerDocumentHasContent(editor.state.doc) ||
+                slotReferencesRef.current.length > 0);
             composerRuntime.setText(trimmed);
             onTextChangeRef.current?.(trimmed);
             scheduleComposerDraftPersist(editor);
@@ -2998,6 +3281,7 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
         initialText,
         initialTextKey,
         scheduleComposerDraftPersist,
+        updateSlotReferences,
     ]);
     // Tiptap only reads `editable` at init; prop changes need setEditable.
     useEffect(() => {
@@ -3007,6 +3291,65 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
         if (disabled)
             editor.commands.blur();
     }, [editor, disabled]);
+    useEffect(() => {
+        if (!isComposerEditorUsable(editor))
+            return;
+        editor.setOptions({
+            editorProps: {
+                ...editor.options.editorProps,
+                attributes: {
+                    ...editor.options.editorProps?.attributes,
+                    "aria-disabled": String(disabled || contextControlsDisabled),
+                },
+            },
+        });
+    }, [editor, disabled, contextControlsDisabled]);
+    const launchersDisabled = disabled || contextControlsDisabled;
+    const contextLauncherItems = useMemo(() => {
+        const sections = new Map();
+        for (const item of filteredMentionItems) {
+            const section = item.section || "Other";
+            const entries = sections.get(section) ?? [];
+            entries.push({
+                id: `mention:${item.id}`,
+                label: item.label,
+                description: item.description,
+                onSelect: () => insertReference(composerReferenceFromMentionItem(item)),
+            });
+            sections.set(section, entries);
+        }
+        const sectionKeys = {
+            Agents: "agents",
+            "Connected Agents": "connectedAgents",
+            Files: "files",
+            Other: "other",
+        };
+        return [
+            ...(contextMenuItems ?? []),
+            ...Array.from(sections)
+                .sort(([left], [right]) => {
+                const order = (section) => section === "Agents"
+                    ? 0
+                    : section === "Connected Agents"
+                        ? 1
+                        : section === "Files"
+                            ? 3
+                            : section === "Other"
+                                ? 4
+                                : 2;
+                return order(left) - order(right) || left.localeCompare(right);
+            })
+                .map(([section, children]) => ({
+                id: `mentions:${section}`,
+                label: sectionKeys[section]
+                    ? t(`agentChat.mentions.sections.${sectionKeys[section]}`, {
+                        defaultValue: section,
+                    })
+                    : section,
+                children,
+            })),
+        ];
+    }, [contextMenuItems, filteredMentionItems, insertReference, t]);
     return (_jsxs(RealtimeVoiceModeBoundary, { children: [_jsx("style", { children: `
         .aui-composer .ProseMirror p.is-editor-empty:first-child::before,
         .aui-composer .ProseMirror p.is-empty:first-child:last-child::before {
@@ -3047,7 +3390,18 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
                                 }, "aria-label": t("agentChat.composer.removeContext", {
                                     defaultValue: "Remove {{name}} context",
                                     name: item.title,
-                                }), className: "ms-0.5 flex h-4 w-4 shrink-0 items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground", children: _jsx(IconX, { className: "h-3 w-3" }) })) : null] }, item.key)))] })), contextSubmissionError ? (_jsx("p", { role: "alert", className: "px-2 text-xs text-destructive", children: contextSubmissionError })) : null, _jsx("div", { "data-agent-composer-variant": layoutVariant, "data-agent-composer-slot": "editor-wrap", className: `agent-composer-editor-wrap ${composerMode || hasContextRows ? "px-2 pt-1 pb-1" : "px-2 pt-2 pb-1"}`, children: _jsx(EditorContent, { editor: editor, "data-agent-composer-variant": layoutVariant, "data-agent-composer-slot": "editor", className: "agent-composer-editor aui-composer flex-1 min-w-0 [&_.ProseMirror]:outline-none [&_.ProseMirror_p]:m-0 px-0.5" }) }), voiceEnabled && _jsx(VoiceRecordingOverlay, { voice: voice }), _jsxs("div", { "data-agent-composer-variant": layoutVariant, "data-agent-composer-slot": "toolbar", className: "agent-composer-toolbar flex items-center gap-1 px-2 py-1.5", children: [!disabled && attachmentsEnabled && attachButton ? (attachButton) : contextMenuItems !== undefined || plusMenuMode === "upload-only" ? (_jsx(ComposerContextMenu, { items: contextMenuItems ?? [], addAttachment: attachmentsEnabled ? addAttachmentForCurrentScope : undefined, onAttachmentRequest: onAttachmentRequest, contextButtonTooltipDisabled: contextButtonTooltipDisabled, attachmentAccept: composerRuntime.getState().attachmentAccept, onAttachmentError: onAttachmentError, onDisabledFocus: () => {
+                                }), className: "ms-0.5 flex h-4 w-4 shrink-0 items-center justify-center rounded text-muted-foreground hover:bg-accent hover:text-foreground", children: _jsx(IconX, { className: "h-3 w-3" }) })) : null] }, item.key)))] })), contextSubmissionError ? (_jsx("p", { role: "alert", className: "px-2 text-xs text-destructive", children: contextSubmissionError })) : null, _jsx("div", { "data-agent-composer-variant": layoutVariant, "data-agent-composer-slot": "editor-wrap", className: `agent-composer-editor-wrap ${composerMode || hasContextRows ? "px-2 pt-1 pb-1" : "px-2 pt-2 pb-1"}`, children: _jsx(EditorContent, { editor: editor, "data-agent-composer-variant": layoutVariant, "data-agent-composer-slot": "editor", className: "agent-composer-editor aui-composer flex-1 min-w-0 [&_.ProseMirror]:outline-none [&_.ProseMirror_p]:m-0 px-0.5" }) }), voiceEnabled && _jsx(VoiceRecordingOverlay, { voice: voice }), _jsxs("div", { "data-agent-composer-variant": layoutVariant, "data-agent-composer-slot": "toolbar", className: "agent-composer-toolbar flex items-center gap-1 px-2 py-1.5", children: [!launchersDisabled && attachmentsEnabled && attachButton ? (attachButton) : hasContextMenu ? (_jsx(ComposerPlusMenu, { contextMenuItems: launchersDisabled ? [] : contextLauncherItems, mode: launchersDisabled || plusMenuMode === "hidden"
+                            ? "upload-only"
+                            : plusMenuMode, onSelectMode: handleSelectMode, terminalModeControl: terminalModeControl, extensionTools: extensionTools, attachmentsEnabled: attachmentsEnabled, open: contextMenuOpen, onOpenChange: setContextMenuOpen, onSearchChange: setContextMenuSearch, loading: mentionsLoading, error: mentionsError
+                            ? t("agentChat.composer.contextLoadFailed", {
+                                defaultValue: "Could not load context.",
+                            })
+                            : undefined, onRetry: retryMentions, onRestoreFocus: launchersDisabled
+                            ? undefined
+                            : () => {
+                                if (isComposerEditorUsable(editor))
+                                    editor.commands.focus();
+                            }, addAttachment: attachmentsEnabled ? addAttachmentForCurrentScope : undefined, onAttachmentRequest: onAttachmentRequest, contextButtonTooltipDisabled: contextButtonTooltipDisabled, attachmentAccept: composerRuntime.getState().attachmentAccept, onAttachmentError: onAttachmentError, onDisabledFocus: () => {
                             const root = editor?.view.dom.closest('[data-agent-composer-slot="root"]');
                             const localTarget = Array.from(root?.querySelectorAll('[data-agent-composer-slot="stop-button"]:not(:disabled), button:not(:disabled)') ?? []).find((element) => !element.closest("[hidden]"));
                             if (localTarget) {
@@ -3056,6 +3410,6 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, submi
                             }
                             const pageTarget = Array.from(document.querySelectorAll('button:not(:disabled), a[href], input:not([type="hidden"]):not(:disabled), textarea:not(:disabled)')).find((element) => !root?.contains(element) && !element.closest("[hidden]"));
                             pageTarget?.focus();
-                        }, disabled: disabled && !onAttachmentRequest })) : disabled || plusMenuMode === "hidden" ? null : (_jsx(ComposerPlusMenu, { addAttachment: addAttachmentForCurrentScope, attachmentsEnabled: attachmentsEnabled, onAttachmentRequest: onAttachmentRequest, attachmentAccept: composerRuntime.getState().attachmentAccept, onSelectMode: handleSelectMode, mode: plusMenuMode, terminalModeControl: terminalModeControl, extensionTools: extensionTools, onAttachmentError: onAttachmentError })), toolbarSlot ?? modeControl, _jsx("div", { "data-agent-composer-slot": "toolbar-spacer", className: "flex-1" }), shouldRenderModelSelector(availableModels, onModelChange) && (_jsx(ModelSelector, { model: selectedModel ?? "", selectedEngine: selectedEngine, open: modelSelectorOpen, effort: selectedEffort, engines: availableModels, agents: availableAgents, selectedAgent: selectedAgent, agentOnly: agentOnly, hostedHarness: hostedHarness, showAutoModelOption: showAutoModelOption, modelListLoading: modelListLoading, onChange: onModelChange, onEffortChange: onEffortChange, onAgentChange: onAgentChange, onModelSelectorOpenChange: onModelSelectorOpenChange, providerConnectStatusEnabled: providerConnectStatusEnabled, onConnectProvider: onConnectProvider, onConnectLocalRuntime: onConnectLocalRuntime, terminalModeControl: terminalModeControl, imageModel: imageModelMenu })), execMode && onExecModeChange && (_jsx(ModeSelector, { mode: execMode, onChange: onExecModeChange, planModeDisabled: planModeDisabled, planModeDisabledReason: planModeDisabledReason })), actionButton ?? (_jsxs(_Fragment, { children: [extraActionButton, voiceEnabled && (_jsx(VoiceButton, { voice: voice, isMac: isMac, disabled: disabled })), primaryAction === "stop" ? (stopButton) : (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("button", { type: "button", onClick: () => void submitComposer("immediate"), disabled: !canSend, "aria-label": submitting ? t("common.loading") : sendButtonTooltip, "aria-busy": submitting || undefined, "data-agent-composer-slot": "send-button", className: "agent-composer-send-button shrink-0 flex h-7 w-7 items-center justify-center rounded-full bg-primary text-primary-foreground hover:opacity-90 transition-[opacity,transform] duration-150 active:scale-[0.97] disabled:opacity-30 disabled:cursor-not-allowed", children: submitting ? (_jsx(IconLoader2, { className: "size-3.5 animate-spin motion-reduce:animate-none" })) : (_jsx(IconArrowUp, { className: "h-3.5 w-3.5" })) }) }), _jsx(TooltipContent, { children: submitting ? t("common.loading") : sendButtonTooltip })] }))] }))] }), _jsx(MentionPopover, { ref: popoverRef, density: mentionPopoverDensity, type: popover?.type ?? "@", position: popover?.position ?? null, mentionItems: filteredMentionItems, skills: filteredSkills, commands: filteredCommands, hint: hint, isLoading: popover?.type === "@" ? mentionsLoading : skillsLoading, query: popover?.query ?? "", onSelectMention: handleSelectMention, onSelectSkill: handleSelectSkill, onSelectCommand: handleSelectCommand, onClose: closePopover })] }));
+                        }, disabled: launchersDisabled })) : null, toolbarSlot ?? modeControl, _jsx("div", { "data-agent-composer-slot": "toolbar-spacer", className: "flex-1" }), shouldRenderModelSelector(availableModels, onModelChange) && (_jsx(ModelSelector, { model: selectedModel ?? "", selectedEngine: selectedEngine, open: modelSelectorOpen, effort: selectedEffort, engines: availableModels, agents: availableAgents, selectedAgent: selectedAgent, agentOnly: agentOnly, hostedHarness: hostedHarness, showAutoModelOption: showAutoModelOption, modelListLoading: modelListLoading, onChange: onModelChange, onEffortChange: onEffortChange, onAgentChange: onAgentChange, onModelSelectorOpenChange: onModelSelectorOpenChange, providerConnectStatusEnabled: providerConnectStatusEnabled, onConnectProvider: onConnectProvider, onConnectLocalRuntime: onConnectLocalRuntime, terminalModeControl: terminalModeControl, imageModel: imageModelMenu })), execMode && onExecModeChange && (_jsx(ModeSelector, { mode: execMode, onChange: onExecModeChange, planModeDisabled: planModeDisabled, planModeDisabledReason: planModeDisabledReason })), actionButton ?? (_jsxs(_Fragment, { children: [extraActionButton, voiceEnabled && (_jsx(VoiceButton, { voice: voice, isMac: isMac, disabled: disabled })), primaryAction === "stop" ? (stopButton) : (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx("button", { type: "button", onClick: () => void submitComposer("immediate"), disabled: !canSend, "aria-label": submitting ? t("common.loading") : sendButtonTooltip, "aria-busy": submitting || undefined, "data-agent-composer-slot": "send-button", className: "agent-composer-send-button shrink-0 flex h-7 w-7 items-center justify-center rounded-full bg-primary text-primary-foreground hover:opacity-90 transition-[opacity,transform] duration-150 active:scale-[0.97] disabled:opacity-30 disabled:cursor-not-allowed", children: submitting ? (_jsx(IconLoader2, { className: "size-3.5 animate-spin motion-reduce:animate-none" })) : (_jsx(IconArrowUp, { className: "h-3.5 w-3.5" })) }) }), _jsx(TooltipContent, { children: submitting ? t("common.loading") : sendButtonTooltip })] }))] }))] }), _jsx(MentionPopover, { ref: popoverRef, density: mentionPopoverDensity, type: popover?.type ?? "@", position: popover?.position ?? null, mentionItems: filteredMentionItems, skills: filteredSkills, commands: filteredCommands, hint: hint, isLoading: popover?.type === "@" ? mentionsLoading : skillsLoading, query: popover?.query ?? "", onSelectMention: handleSelectMention, onSelectSkill: handleSelectSkill, onSelectCommand: handleSelectCommand, onClose: closePopover })] }));
 }
 //# sourceMappingURL=TiptapComposer.js.map