@agent-native/toolkit 0.209.0 → 0.209.1-nightly-20261015005848

package/dist/composer/TiptapComposer.js

@@ -656,14 +656,43 @@ function ComposerModeChip({ mode, onRemove, }) {
     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, "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/) : [""];
+function plainTextToDoc(text, chips = []) {
+    const ordered = [...chips].sort((a, b) => a.start - b.start);
+    const lines = [];
+    let lineStart = 0;
+    for (const separator of text.matchAll(/\r?\n/g)) {
+        lines.push({ start: lineStart, end: separator.index });
+        lineStart = separator.index + separator[0].length;
+    }
+    lines.push({ start: lineStart, end: text.length });
     return {
         type: "doc",
-        content: lines.map((line) => ({
-            type: "paragraph",
-            content: line ? [{ type: "text", text: line }] : [],
-        })),
+        content: lines.map((line) => {
+            const content = [];
+            let cursor = line.start;
+            const addText = (end) => {
+                if (end > cursor) {
+                    content.push({ type: "text", text: text.slice(cursor, end) });
+                }
+            };
+            for (const chip of ordered) {
+                if (chip.start < cursor ||
+                    line.end < chip.end ||
+                    chip.end <= chip.start)
+                    continue;
+                addText(chip.start);
+                content.push({ type: "mentionReference", attrs: chip.attrs });
+                cursor = chip.end;
+            }
+            addText(line.end);
+            // Drafts are reported trimmed, so a chip that ends one lost the space
+            // picking it added; without it the next word typed joins the chip's text.
+            if (cursor === text.length &&
+                content.at(-1)?.type === "mentionReference") {
+                content.push({ type: "text", text: " " });
+            }
+            return { type: "paragraph", content };
+        }),
     };
 }
 /** Tiptap keeps the Editor object truthy after destroy but clears commandManager. */
@@ -1376,12 +1405,20 @@ 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))) }))] }) }) })] }) })] }));
 }
-export function TiptapComposer({ placeholder, ariaLabel, disabled = false, isReferenceTarget, contextControlsDisabled = false, submissionDisabled = false, sendButtonDisabled = false, sendButtonBusy = false, submitting = false, maxDocumentAttachmentBytes = MAX_DOCUMENT_ATTACHMENT_BYTES, documentAttachmentLimitLabel = "PDFs", attachmentsEnabled = true, onAttachmentRequest, contextButtonTooltipDisabled = false, focusRef, initialText, initialTextKey, onSubmit, onEmptySubmit, onBeforeSubmit, onSubmissionPendingChange, 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, 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, isReferenceTarget, contextControlsDisabled = false, submissionDisabled = false, sendButtonDisabled = false, sendButtonBusy = false, submitting = false, maxDocumentAttachmentBytes = MAX_DOCUMENT_ATTACHMENT_BYTES, documentAttachmentLimitLabel = "PDFs", attachmentsEnabled = true, onAttachmentRequest, contextButtonTooltipDisabled = false, focusRef, initialText, initialTextKey, initialReferences, onSubmit, onEmptySubmit, onBeforeSubmit, onSubmissionPendingChange, 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, onRetryContextItem, contextMenuItems, plusMenuMode = "full", terminalModeControl, extensionTools = false, interceptBuildRequestsForBuilder = false, onAttachmentError, mentionItems: hostMentionItems = [], mentionItemsError, onRetryMentionItems, 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 initialReferencesRef = useRef(initialReferences);
+    initialReferencesRef.current = initialReferences;
+    const textChips = useCallback((references = []) => references.flatMap(({ start, end, reference }) => {
+        const normalized = adapters.agentChat.normalizeReference(reference);
+        return normalized
+            ? [{ start, end, attrs: mentionReferenceAttrs(normalized) }]
+            : [];
+    }), [adapters]);
     const sendButtonTooltip = t(getComposerSendTooltipKey(willQueue), {
         defaultValue: willQueue ? "Queue message" : "Send message",
     });
@@ -2023,6 +2060,12 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, isRef
                         popoverRef.current?.moveDown();
                         return true;
                     }
+                    if ((event.key === "Enter" ||
+                        (event.key === "Tab" && !event.shiftKey)) &&
+                        popoverRef.current?.activateRetry()) {
+                        event.preventDefault();
+                        return true;
+                    }
                     // A mention comes only from an explicit pick of a highlighted row. With
                     // nothing highlighted, even while a search is pending, the "@" is
                     // plain text: Enter submits it and a late result changes nothing.
@@ -2385,7 +2428,11 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, isRef
                 if (from > 1 && before !== "" && !/\s/.test(before))
                     inserted = ` @`;
             }
-            if (typeof document.execCommand !== "function" ||
+            // The popover anchors on the selection right after this insert, but an
+            // execCommand edit reaches the editor state only once ProseMirror reads
+            // the DOM back, so an @ goes through the editor directly.
+            if (mention ||
+                typeof document.execCommand !== "function" ||
                 !document.execCommand("insertText", false, inserted)) {
                 editor.commands.insertContent(inserted);
             }
@@ -2405,10 +2452,10 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, isRef
             popoverStateRef.current = state;
             setPopover(state);
         },
-        setText(text) {
+        setText(text, references) {
             if (!isComposerEditorUsable(editor))
                 return;
-            editor.commands.setContent(plainTextToDoc(text));
+            editor.commands.setContent(plainTextToDoc(text, textChips(references)));
             editor.commands.focus("end");
             const trimmed = editor.getText({ blockSeparator: "\n" }).trim();
             setEditorHasText(trimmed.length > 0);
@@ -3861,7 +3908,7 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, isRef
             }
             else if (initialTextKeyRef.current !== key) {
                 initialTextKeyRef.current = key;
-                editor.commands.setContent(plainTextToDoc(initialText));
+                editor.commands.setContent(plainTextToDoc(initialText, textChips(initialReferencesRef.current)));
             }
             else {
                 return;
@@ -3883,6 +3930,7 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, isRef
         initialText,
         initialTextKey,
         scheduleComposerDraftPersist,
+        textChips,
         updateSlotReferences,
     ]);
     // Tiptap only reads `editable` at init; prop changes need setEditable.
@@ -4015,6 +4063,6 @@ export function TiptapComposer({ placeholder, ariaLabel, disabled = false, isRef
                             }
                             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: 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: (event) => void submitComposer("immediate", undefined, event.metaKey || event.ctrlKey), disabled: !canSend || sendButtonDisabled, "aria-label": sendButtonTooltip, "aria-busy": sendButtonBusy || 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: sendButtonBusy ? (_jsx(IconLoader2, { className: "h-3.5 w-3.5 animate-spin motion-reduce:animate-none" })) : (_jsx(IconArrowUp, { className: "h-3.5 w-3.5" })) }) }), _jsx(TooltipContent, { children: sendButtonTooltip })] }))] }))] }), _jsx(MentionPopover, { ref: popoverRef, density: mentionPopoverDensity, type: popover?.type ?? "@", position: popover?.position ?? null, mentionItems: inlineMentionItems, 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: (event) => void submitComposer("immediate", undefined, event.metaKey || event.ctrlKey), disabled: !canSend || sendButtonDisabled, "aria-label": sendButtonTooltip, "aria-busy": sendButtonBusy || 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: sendButtonBusy ? (_jsx(IconLoader2, { className: "h-3.5 w-3.5 animate-spin motion-reduce:animate-none" })) : (_jsx(IconArrowUp, { className: "h-3.5 w-3.5" })) }) }), _jsx(TooltipContent, { children: sendButtonTooltip })] }))] }))] }), _jsx(MentionPopover, { ref: popoverRef, density: mentionPopoverDensity, type: popover?.type ?? "@", position: popover?.position ?? null, mentionItems: inlineMentionItems, skills: filteredSkills, commands: filteredCommands, hint: hint, isLoading: popover?.type === "@" ? mentionsLoading : skillsLoading, error: mentionItemsError, onRetry: onRetryMentionItems, query: popover?.query ?? "", onSelectMention: handleSelectMention, onSelectSkill: handleSelectSkill, onSelectCommand: handleSelectCommand, onClose: closePopover })] }));
 }
 //# sourceMappingURL=TiptapComposer.js.map