@ahggg/dsh-side-chat 0.7.3 → 1.0.1

package/lib/client/panel/SideChatModelSelect.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect, useId, useMemo, useRef, useState, useSyncExternalStore, } from 'react';
-import { IconCheckOutline16, IconChevronDownOutline14, IconChevronRightOutline14, IconWarningOutline16, Toast, } from '@deepseek-ai/dsh-client-ui-primitives';
+import { IconCheckOutlineRegular as IconCheckOutline16, IconChevronDownOutlineRegular as IconChevronDownOutline14, IconChevronRightOutlineRegular as IconChevronRightOutline14, IconWarningOutlineRegular as IconWarningOutline16, Toast, } from '@deepseek-ai/dsh-client-ui-primitives';
 const MODEL_MESSAGES = {
     en: {
         selectModel: 'Select model',
@@ -12,6 +12,7 @@ const MODEL_MESSAGES = {
         reload: 'Reload',
         emptyModels: 'No models available.',
         emptyEfforts: 'This model provides no reasoning effort levels.',
+        nextReply: 'Changes apply to the next reply and future Side Chats.',
         aria: (model, effort) => effort === undefined
             ? `Select model, current ${model}`
             : `Select model, current ${model}, reasoning effort ${effort}`,
@@ -28,6 +29,7 @@ const MODEL_MESSAGES = {
         reload: '重新加载',
         emptyModels: '没有可用的模型。',
         emptyEfforts: '当前模型未提供推理等级。',
+        nextReply: '修改将用于下一次回复及之后新开的侧边对话。',
         aria: (model, effort) => effort === undefined
             ? `选择模型，当前 ${model}`
             : `选择模型，当前 ${model}，推理等级 ${effort}`,
@@ -61,7 +63,7 @@ function repairSelection(selection, choices, fallback) {
     };
 }
 /** Side Chat projection of DSH Web's native composer model selector. */
-export function SideChatModelSelect({ directory, selection, locked, validateInitialSelection = true, locale = 'en', onInitialize, onSelect, }) {
+export function SideChatModelSelect({ directory, selection, locked, running = false, validateInitialSelection = true, locale = 'en', onInitialize, onSelect, }) {
     const messages = MODEL_MESSAGES[locale];
     const state = useSyncExternalStore(listener => directory.store.subscribe(listener), () => directory.store.getSnapshot(), () => directory.store.getSnapshot());
     const [open, setOpen] = useState(false);
@@ -74,6 +76,7 @@ export function SideChatModelSelect({ directory, selection, locked, validateInit
     const initialized = useRef(false);
     const operation = useRef(0);
     const toastSequence = useRef(0);
+    const selectionPending = useRef(false);
     const id = useId();
     const choices = useMemo(() => state.groups.flatMap(group => group.models.map(model => ({ group, model }))), [state.groups]);
     const current = selection ?? state.current ?? undefined;
@@ -98,14 +101,20 @@ export function SideChatModelSelect({ directory, selection, locked, validateInit
                 ...(effort.description === undefined ? {} : { description: effort.description }),
             })),
         ], [messages.providerDefault, reasoning]);
-    const modelLabel = currentChoice?.model.name ?? messages.selectModel;
+    const modelLabel = currentChoice?.model.name ?? current?.model ?? messages.selectModel;
     const triggerLabel = effortLabel === undefined ? modelLabel : `${modelLabel} · ${effortLabel}`;
     const reload = () => {
         void directory.load().catch(() => undefined);
     };
-    useEffect(() => { reload(); }, [directory]);
     useEffect(() => {
-        if (initialized.current)
+        initialized.current = false;
+        reload();
+        return () => { ++operation.current; };
+    }, [directory]);
+    useEffect(() => { if (locked)
+        setOpen(false); }, [locked]);
+    useEffect(() => {
+        if (initialized.current || locked)
             return;
         if (selection !== undefined && !validateInitialSelection) {
             initialized.current = true;
@@ -125,13 +134,13 @@ export function SideChatModelSelect({ directory, selection, locked, validateInit
             onInitialize(directoryCurrent, { remember: false });
             return;
         }
-        if (state.status !== 'ready')
+        if (state.status !== 'ready' || state.error !== null || state.failures.length > 0)
             return;
         initialized.current = true;
         const repaired = repairSelection(selection, choices, directoryCurrent);
         if (!sameSelection(selection, repaired))
             onInitialize(repaired, { remember: true });
-    }, [choices, onInitialize, selection, state.current, state.status, validateInitialSelection]);
+    }, [choices, locked, onInitialize, selection, state.current, state.status, state.error, state.failures, validateInitialSelection]);
     useEffect(() => {
         if (!open)
             return;
@@ -163,6 +172,7 @@ export function SideChatModelSelect({ directory, selection, locked, validateInit
     const onKeyDown = (event) => {
         if (event.key === 'Escape' && open) {
             event.preventDefault();
+            event.stopPropagation();
             if (pane !== 'root')
                 setPane('root');
             else
@@ -180,21 +190,32 @@ export function SideChatModelSelect({ directory, selection, locked, validateInit
         close();
     };
     const submitSelection = async (next) => {
+        if (locked || selectionPending.current)
+            return;
         const generation = ++operation.current;
+        selectionPending.current = true;
         setSelecting(true);
-        const result = await onSelect(next);
-        if (generation !== operation.current)
-            return;
-        setSelecting(false);
-        if (!result.ok) {
-            toastSequence.current += 1;
+        try {
+            const result = await onSelect(next);
+            if (generation !== operation.current)
+                return;
+            if (!result.ok)
+                throw new Error(result.error.message);
+            close(true);
+        }
+        catch (error) {
+            if (generation !== operation.current)
+                return;
             setToast({
-                seq: toastSequence.current,
-                text: messages.operationFailed(result.error.message),
+                seq: ++toastSequence.current,
+                text: messages.operationFailed(error instanceof Error ? error.message : 'Could not select the model.'),
             });
-            return;
         }
-        close(true);
+        finally {
+            selectionPending.current = false;
+            if (generation === operation.current)
+                setSelecting(false);
+        }
     };
     const chooseModel = (group, model) => {
         if (sameModel(current, group.id, model.id)) {
@@ -212,10 +233,8 @@ export function SideChatModelSelect({ directory, selection, locked, validateInit
     const chooseEffort = (effort) => {
         if (current === undefined)
             return;
-        if (effectiveEffort === effort) {
-            close(true);
-            return;
-        }
+        // Choosing the displayed default is still an explicit preference: persist
+        // it for future Side Chats instead of merely dismissing the menu.
         void submitSelection({
             provider: current.provider,
             model: current.model,
@@ -231,16 +250,16 @@ export function SideChatModelSelect({ directory, selection, locked, validateInit
     return (_jsxs("div", { ref: rootRef, className: "dsh-side-chat-model-root", "data-side-chat-model-select": "", onKeyDown: onKeyDown, onBlur: onBlur, children: [_jsxs("button", { ref: triggerRef, type: "button", className: "dsh-side-chat-model-trigger", "aria-label": messages.aria(modelLabel, effortLabel), "aria-haspopup": "menu", "aria-expanded": open, "aria-controls": open ? `${id}-menu` : undefined, title: triggerLabel, disabled: locked, onClick: () => { if (open)
                     close();
                 else
-                    show(); }, children: [_jsx("span", { className: "dsh-side-chat-model-trigger-label", children: modelLabel }), effortLabel !== undefined && (_jsx("span", { className: "dsh-side-chat-model-trigger-effort", children: effortLabel })), _jsx(IconChevronDownOutline14, { className: `dsh-side-chat-model-chevron${open ? ' dsh-side-chat-model-chevron-open' : ''}` })] }), open && (_jsxs("div", { id: `${id}-menu`, className: "dsh-side-chat-model-menu", role: "menu", "aria-label": messages.menu, "aria-busy": state.status === 'loading' || selecting, children: [pane === 'root' && (_jsxs(_Fragment, { children: [_jsxs("button", { ref: itemRef(), type: "button", role: "menuitem", className: "dsh-side-chat-model-cell", onClick: () => { setPane('model'); }, children: [_jsx("span", { className: "dsh-side-chat-model-cell-label", children: messages.model }), _jsx("span", { className: "dsh-side-chat-model-cell-value", children: modelLabel }), _jsx(IconChevronRightOutline14, { className: "dsh-side-chat-model-cell-chevron" })] }), reasoning !== undefined && (_jsxs("button", { ref: itemRef(), type: "button", role: "menuitem", className: "dsh-side-chat-model-cell", onClick: () => { setPane('effort'); }, children: [_jsx("span", { className: "dsh-side-chat-model-cell-label", children: messages.effort }), _jsx("span", { className: "dsh-side-chat-model-cell-value", children: effortLabel }), _jsx(IconChevronRightOutline14, { className: "dsh-side-chat-model-cell-chevron" })] }))] })), pane === 'model' && (_jsxs(_Fragment, { children: [state.status === 'loading' && (_jsx("div", { className: "dsh-side-chat-model-status", children: messages.loading })), state.error !== null && (_jsxs("div", { className: "dsh-side-chat-model-error", role: "alert", children: [_jsx("span", { children: messages.operationFailed(state.error) }), _jsx("button", { type: "button", className: "dsh-side-chat-model-retry", onClick: reload, children: messages.reload })] })), state.failures.map(failure => (_jsxs("div", { className: "dsh-side-chat-model-warning", children: [_jsx("span", { children: messages.groupFailed(failure.name, failure.message) }), _jsx("button", { type: "button", className: "dsh-side-chat-model-retry", onClick: reload, children: messages.reload })] }, failure.id))), _jsx("div", { className: "dsh-side-chat-model-groups scrollable", children: state.groups.map(group => {
+                    show(); }, children: [_jsx("span", { className: "dsh-side-chat-model-trigger-label", children: modelLabel }), effortLabel !== undefined && (_jsx("span", { className: "dsh-side-chat-model-trigger-effort", children: effortLabel })), _jsx(IconChevronDownOutline14, { className: `dsh-side-chat-model-chevron${open ? ' dsh-side-chat-model-chevron-open' : ''}` })] }), open && (_jsxs("div", { id: `${id}-menu`, className: "dsh-side-chat-model-menu", role: "menu", "aria-label": messages.menu, "aria-busy": state.status === 'loading' || selecting, children: [running && _jsx("div", { className: "dsh-side-chat-model-status", children: messages.nextReply }), pane === 'root' && (_jsxs(_Fragment, { children: [_jsxs("button", { ref: itemRef(), type: "button", role: "menuitem", className: "dsh-side-chat-model-cell", onClick: () => { setPane('model'); }, children: [_jsx("span", { className: "dsh-side-chat-model-cell-label", children: messages.model }), _jsx("span", { className: "dsh-side-chat-model-cell-value", children: modelLabel }), _jsx(IconChevronRightOutline14, { className: "dsh-side-chat-model-cell-chevron" })] }), reasoning !== undefined && (_jsxs("button", { ref: itemRef(), type: "button", role: "menuitem", className: "dsh-side-chat-model-cell", onClick: () => { setPane('effort'); }, children: [_jsx("span", { className: "dsh-side-chat-model-cell-label", children: messages.effort }), _jsx("span", { className: "dsh-side-chat-model-cell-value", children: effortLabel }), _jsx(IconChevronRightOutline14, { className: "dsh-side-chat-model-cell-chevron" })] }))] })), pane === 'model' && (_jsxs(_Fragment, { children: [state.status === 'loading' && (_jsx("div", { className: "dsh-side-chat-model-status", children: messages.loading })), state.error !== null && (_jsxs("div", { className: "dsh-side-chat-model-error", role: "alert", children: [_jsx("span", { children: messages.operationFailed(state.error) }), _jsx("button", { type: "button", className: "dsh-side-chat-model-retry", onClick: reload, children: messages.reload })] })), state.failures.map(failure => (_jsxs("div", { className: "dsh-side-chat-model-warning", children: [_jsx("span", { children: messages.groupFailed(failure.name, failure.message) }), _jsx("button", { type: "button", className: "dsh-side-chat-model-retry", onClick: reload, children: messages.reload })] }, failure.id))), _jsx("div", { className: "dsh-side-chat-model-groups scrollable", children: state.groups.map(group => {
                                     const headingId = `${id}-${group.id}`;
                                     return (_jsxs("section", { role: "group", "aria-labelledby": headingId, className: "dsh-side-chat-model-group", children: [_jsx("div", { id: headingId, className: "dsh-side-chat-model-group-title", children: group.name }), group.models.map(model => {
                                                 const selected = sameModel(current, group.id, model.id);
-                                                return (_jsxs("button", { ref: itemRef(), type: "button", role: "menuitemradio", "aria-checked": selected, className: `dsh-side-chat-model-option${selected ? ' dsh-side-chat-model-selected' : ''}`, title: model.name, disabled: selecting, onClick: () => { chooseModel(group, model); }, children: [_jsxs("span", { className: "dsh-side-chat-model-option-copy", children: [_jsx("span", { className: "dsh-side-chat-model-name", children: model.name }), model.description !== undefined && (_jsx("span", { className: "dsh-side-chat-model-description", children: model.description }))] }), _jsx("span", { className: "dsh-side-chat-model-check", children: selected ? _jsx(IconCheckOutline16, {}) : null })] }, model.id));
+                                                return (_jsxs("button", { ref: itemRef(), type: "button", role: "menuitemradio", "aria-checked": selected, className: `dsh-side-chat-model-option${selected ? ' dsh-side-chat-model-selected' : ''}`, title: model.name, disabled: locked || selecting, onClick: () => { chooseModel(group, model); }, children: [_jsxs("span", { className: "dsh-side-chat-model-option-copy", children: [_jsx("span", { className: "dsh-side-chat-model-name", children: model.name }), model.description !== undefined && (_jsx("span", { className: "dsh-side-chat-model-description", children: model.description }))] }), _jsx("span", { className: "dsh-side-chat-model-check", children: selected ? _jsx(IconCheckOutline16, {}) : null })] }, model.id));
                                             })] }, group.id));
                                 }) }), state.status === 'ready' && choices.length === 0 && (_jsx("div", { className: "dsh-side-chat-model-empty", children: messages.emptyModels }))] })), pane === 'effort' && (effortChoices.length === 0
                         ? _jsx("div", { className: "dsh-side-chat-model-empty", children: messages.emptyEfforts })
                         : effortChoices.map(level => {
                             const selected = effectiveEffort === level.effort;
-                            return (_jsxs("button", { ref: itemRef(), type: "button", role: "menuitemradio", "aria-checked": selected, className: `dsh-side-chat-model-option${selected ? ' dsh-side-chat-model-selected' : ''}`, disabled: selecting, onClick: () => { chooseEffort(level.effort); }, children: [_jsxs("span", { className: "dsh-side-chat-model-option-copy", children: [_jsx("span", { className: "dsh-side-chat-model-name", children: level.label }), level.description !== undefined && (_jsx("span", { className: "dsh-side-chat-model-description", children: level.description }))] }), _jsx("span", { className: "dsh-side-chat-model-check", children: selected ? _jsx(IconCheckOutline16, {}) : null })] }, level.key));
+                            return (_jsxs("button", { ref: itemRef(), type: "button", role: "menuitemradio", "aria-checked": selected, className: `dsh-side-chat-model-option${selected ? ' dsh-side-chat-model-selected' : ''}`, disabled: locked || selecting, onClick: () => { chooseEffort(level.effort); }, children: [_jsxs("span", { className: "dsh-side-chat-model-option-copy", children: [_jsx("span", { className: "dsh-side-chat-model-name", children: level.label }), level.description !== undefined && (_jsx("span", { className: "dsh-side-chat-model-description", children: level.description }))] }), _jsx("span", { className: "dsh-side-chat-model-check", children: selected ? _jsx(IconCheckOutline16, {}) : null })] }, level.key));
                         }))] })), toast !== null && (_jsx(Toast, { text: toast.text, icon: _jsx(IconWarningOutline16, {}), anchor: rootRef.current?.closest('[data-composer-card]') ?? null, onDone: () => { setToast(null); } }, toast.seq))] }));
 }

package/lib/client/panel/SideChatPanel.js

@@ -13,7 +13,7 @@ export function SideChatPanel({ state, locale = 'en', embeddedConversation, mode
     const draftRef = useAutoGrowingTextarea(state.draft);
     const submit = async (event) => {
         event.preventDefault();
-        if (submitting)
+        if (submitting || ['creating', 'running', 'closing'].includes(state.phase))
             return;
         setSubmitting(true);
         try {
@@ -23,12 +23,19 @@ export function SideChatPanel({ state, locale = 'en', embeddedConversation, mode
             setSubmitting(false);
         }
     };
-    return (_jsxs("aside", { className: "dsh-side-chat-panel", "data-side-chat-panel": "", "aria-label": messages.title, "aria-busy": ['creating', 'opening', 'closing'].includes(state.phase) || undefined, children: [_jsx(SideChatHeader, { phase: state.phase, messages: messages, ...onAddToConversation === undefined ? {} : { onAddToConversation }, ...addToConversationDisabled === undefined ? {} : { addToConversationDisabled }, onFocusParent: onFocusParent, onClose: () => { void onClose(); } }), state.error !== undefined && (_jsx(SideChatErrorState, { error: state.error, messages: messages, onRetry: () => { void onRetry(); } })), state.childSessionId !== undefined && embeddedConversation !== undefined
+    return (_jsxs("aside", { className: "dsh-side-chat-panel", "data-side-chat-panel": "", "aria-label": messages.title, "aria-busy": ['creating', 'closing'].includes(state.phase) || undefined, onKeyDown: (event) => {
+            if (event.key === 'Escape' && !event.defaultPrevented && !event.nativeEvent.isComposing) {
+                event.preventDefault();
+                event.stopPropagation();
+                void onClose();
+            }
+        }, children: [_jsx(SideChatHeader, { phase: state.phase, messages: messages, ...onAddToConversation === undefined ? {} : { onAddToConversation }, ...addToConversationDisabled === undefined ? {} : { addToConversationDisabled }, onFocusParent: onFocusParent, onClose: () => { void onClose(); } }), state.error !== undefined && (_jsx(SideChatErrorState, { error: state.error, messages: messages, onRetry: () => { void onRetry(); } })), state.messages.length > 0 && embeddedConversation !== undefined
                 ? _jsx(SideChatBody, { children: embeddedConversation })
-                : (_jsxs("form", { className: "dsh-side-chat-draft", "data-composer-card": "", onSubmit: (event) => { void submit(event); }, children: [state.selection !== undefined && (_jsx(SelectionQuote, { selections: [state.selection], messages: messages, ...onRemoveSelection === undefined ? {} : { onRemove: onRemoveSelection } })), _jsx("label", { htmlFor: "dsh-side-chat-draft-input", children: messages.placeholder }), _jsx("textarea", { id: "dsh-side-chat-draft-input", ref: draftRef, autoFocus: true, rows: 1, value: state.draft, disabled: ['creating', 'opening', 'closing'].includes(state.phase), placeholder: messages.placeholder, onChange: (event) => { onDraftChange(event.target.value); }, onKeyDown: (event) => {
-                                if (event.key === 'Enter' && !event.shiftKey) {
+                : (_jsxs("form", { className: "dsh-side-chat-draft", "data-composer-card": "", onSubmit: (event) => { void submit(event); }, children: [state.selection !== undefined && (_jsx(SelectionQuote, { selections: [state.selection], messages: messages, ...onRemoveSelection === undefined ? {} : { onRemove: onRemoveSelection } })), _jsx("label", { htmlFor: "dsh-side-chat-draft-input", children: messages.placeholder }), _jsx("textarea", { id: "dsh-side-chat-draft-input", ref: draftRef, autoFocus: true, rows: 1, value: state.draft, disabled: ['creating', 'running', 'closing'].includes(state.phase), placeholder: messages.placeholder, onChange: (event) => { onDraftChange(event.target.value); }, onKeyDown: (event) => {
+                                if (event.key === 'Enter' && !event.shiftKey && !event.nativeEvent.isComposing
+                                    && event.keyCode !== 229) {
                                     event.preventDefault();
                                     event.currentTarget.form?.requestSubmit();
                                 }
-                            } }), _jsxs("div", { className: "dsh-side-chat-draft-actions", children: [modelControl, _jsx("button", { type: "submit", className: "dsh-side-chat-send-button", "aria-label": messages.send, disabled: submitting || state.draft.trim().length === 0, children: _jsx(SendIcon, {}) })] })] })), _jsxs("footer", { className: "dsh-side-chat-footer", children: [_jsx("span", { children: messages.temporary }), _jsx("span", { children: messages.referenceOnly }), _jsx("span", { children: messages.cannotReopen }), _jsx("span", { children: messages.sharedWorkspace })] }), _jsx("div", { className: "dsh-side-chat-announcer", "aria-live": "polite", children: state.phase === 'running' ? 'Side Chat running' : `Side Chat ${state.phase}` })] }));
+                            } }), _jsxs("div", { className: "dsh-side-chat-draft-actions", children: [modelControl, _jsx("button", { type: "submit", className: "dsh-side-chat-send-button", "aria-label": messages.send, disabled: submitting || ['creating', 'running', 'closing'].includes(state.phase) || state.draft.trim().length === 0, children: _jsx(SendIcon, {}) })] })] })), _jsxs("footer", { className: "dsh-side-chat-footer", children: [_jsx("span", { children: messages.temporary }), _jsx("span", { children: messages.referenceOnly }), _jsx("span", { children: messages.cannotReopen }), _jsx("span", { children: messages.readOnly })] }), _jsx("div", { className: "dsh-side-chat-announcer", "aria-live": "polite", children: state.phase === 'running' ? 'Side Chat running' : `Side Chat ${state.phase}` })] }));
 }

package/lib/client/panel/messages.d.ts

@@ -14,7 +14,7 @@ export interface SideChatMessages {
     readonly temporary: string;
     readonly referenceOnly: string;
     readonly cannotReopen: string;
-    readonly sharedWorkspace: string;
+    readonly readOnly: string;
     readonly retry: string;
     readonly genericError: string;
     readonly closeError: string;

package/lib/client/panel/messages.js

@@ -12,10 +12,10 @@ export const SIDE_CHAT_MESSAGES = Object.freeze({
         removeSelection: 'Remove annotation',
         expand: 'Expand',
         collapse: 'Collapse',
-        temporary: 'Archived when closed; history remains on disk',
-        referenceOnly: 'Inherits the complete parent conversation prefix',
-        cannotReopen: 'No reopen action',
-        sharedWorkspace: 'Shares the parent workspace',
+        temporary: 'Temporary; discarded when closed or reloaded',
+        referenceOnly: 'Read-only parent context; no Session copy',
+        cannotReopen: 'Add to conversation to keep this discussion',
+        readOnly: 'No tools or file changes',
         retry: 'Retry',
         genericError: 'Side Chat error',
         closeError: 'Could not close the Side Chat',
@@ -33,10 +33,10 @@ export const SIDE_CHAT_MESSAGES = Object.freeze({
         removeSelection: '移除引用',
         expand: '展开',
         collapse: '收起',
-        temporary: '关闭时归档；历史仍保存在磁盘上',
-        referenceOnly: '完整继承父会话对话前缀',
-        cannotReopen: '不提供重新打开操作',
-        sharedWorkspace: '与父会话共享工作区',
+        temporary: '临时对话；关闭或刷新后丢弃',
+        referenceOnly: '只读父会话上下文；不复制 Session',
+        cannotReopen: '添加到主对话以保留讨论内容',
+        readOnly: '不使用工具，不修改文件',
         retry: '重试',
         genericError: '侧边对话错误',
         closeError: '无法关闭侧边对话',

package/lib/client/parent-composer/ParentConversationAnnotations.d.ts

@@ -1,5 +1,6 @@
 import { type ElementType, type ReactNode } from 'react';
-import type { Rc6ClientContext } from '../rc6/context.js';
+import type { DshClientContext } from '../dsh/context.js';
+import { SessionId } from '../../shared/contracts.js';
 import { SIDE_CHAT_MESSAGES } from '../panel/messages.js';
 import { type ParentComposerInputSnapshot } from './add-to-conversation.js';
 type Locale = keyof typeof SIDE_CHAT_MESSAGES;
@@ -24,5 +25,5 @@ export declare function ParentComposerAnnotations({ input, onRemove, locale, }:
 /** Wrap DSH's own user renderer only when this plugin's durable prefix exists. */
 export declare function annotatedUserMessageRenderer(Original: UserNodeRenderer): (props: UserNodeProps) => ReactNode;
 /** Mount the composer capsule and a thin wrapper around DSH's user renderers. */
-export declare function mountParentConversationAnnotations(ctx: Rc6ClientContext, removeAnnotations: () => void): () => void;
+export declare function mountParentConversationAnnotations(ctx: DshClientContext, removeAnnotations: (sessionId: SessionId) => void): () => void;
 export {};

package/lib/client/parent-composer/ParentConversationAnnotations.js

@@ -1,8 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { createElement, useLayoutEffect, useRef } from 'react';
+import { SessionId } from '../../shared/contracts.js';
 import { SIDE_CHAT_MESSAGES } from '../panel/messages.js';
 import { SelectionQuote } from '../panel/SelectionQuote.js';
-import { conversationAnnotations, parseAnnotatedConversationPrompt, } from './add-to-conversation.js';
+import { annotationMessageText, conversationAnnotations, parseAnnotatedConversationPrompt, } from './add-to-conversation.js';
 import { parseReferencedConversationPrompt, } from './referenced-conversation.js';
 function currentLocale() {
     return navigator.language.toLowerCase().startsWith('zh') ? 'zh-CN' : 'en';
@@ -16,24 +17,49 @@ export function ParentComposerAnnotations({ input, onRemove, locale = currentLoc
         const dock = dockRef.current;
         const seat = dock?.closest('[data-composer-seat]');
         const chip = dock?.querySelector('.dsh-side-chat-quote-chip');
-        if (seat === undefined || chip === undefined || seat === null || chip === null)
+        if (dock === null || seat === undefined || chip === undefined || seat === null || chip === null)
             return;
         // The durable host reference stays in Lexical's document flow. Match its
         // occupied width to this visible overlay so the caret starts at the edge
         // users see instead of after the longer internal serialization label.
-        const syncWidth = () => {
+        const syncPosition = () => {
             const width = chip.getBoundingClientRect().width;
             if (width > 0)
                 seat.style.setProperty(ANNOTATION_CHIP_WIDTH_PROPERTY, `${String(width)}px`);
+            const reference = seat.querySelector('[data-composer-chip="dsh-side-chat-selection"]');
+            if (reference === null)
+                return;
+            const referenceRect = reference.getBoundingClientRect();
+            const dockRect = dock.getBoundingClientRect();
+            if (Number.isFinite(referenceRect.left) && Number.isFinite(dockRect.left)) {
+                dock.style.setProperty('--annotation-left', `${referenceRect.left - dockRect.left}px`);
+                dock.style.setProperty('--annotation-top', `${referenceRect.top - dockRect.top}px`);
+            }
         };
-        syncWidth();
-        const observer = typeof ResizeObserver === 'undefined' ? undefined : new ResizeObserver(syncWidth);
+        let frame;
+        const schedule = () => {
+            if (frame !== undefined)
+                return;
+            frame = window.requestAnimationFrame(() => { frame = undefined; syncPosition(); });
+        };
+        syncPosition();
+        const observer = typeof ResizeObserver === 'undefined' ? undefined : new ResizeObserver(schedule);
         observer?.observe(chip);
+        observer?.observe(seat);
+        const mutations = new MutationObserver(schedule);
+        mutations.observe(seat, { childList: true, characterData: true, subtree: true });
+        seat.addEventListener('scroll', schedule, true);
+        window.addEventListener('resize', schedule);
         return () => {
+            if (frame !== undefined)
+                window.cancelAnimationFrame(frame);
             observer?.disconnect();
+            mutations.disconnect();
+            seat.removeEventListener('scroll', schedule, true);
+            window.removeEventListener('resize', schedule);
             seat.style.removeProperty(ANNOTATION_CHIP_WIDTH_PROPERTY);
         };
-    }, [annotations.length, locale]);
+    }, [input, locale]);
     if (annotations.length === 0)
         return null;
     return (_jsx("div", { ref: dockRef, className: "dsh-side-chat-parent-annotation-dock", children: _jsx(SelectionQuote, { selections: annotations, messages: SIDE_CHAT_MESSAGES[locale], onRemove: onRemove }) }));
@@ -46,10 +72,6 @@ function contentText(content) {
         return value.type === 'text' && typeof value.text === 'string' ? value.text : '';
     }).join('');
 }
-function visibleMessage(message) {
-    const wrapped = /^<user_question>\n?([\s\S]*?)\n?<\/user_question>$/u.exec(message);
-    return wrapped?.[1]?.trim() ?? message;
-}
 function replaceTextContent(content, message) {
     let replaced = false;
     const next = content.flatMap((block) => {
@@ -68,29 +90,25 @@ function replaceTextContent(content, message) {
 function parsePluginPrompt(text) {
     let message = text;
     let annotations;
-    let reference;
-    for (let index = 0; index < 2; index += 1) {
+    const references = [];
+    while (message.length > 0) {
         const annotated = annotations === undefined ? parseAnnotatedConversationPrompt(message) : undefined;
         if (annotated !== undefined) {
             annotations = annotated.annotations;
             message = annotated.message;
             continue;
         }
-        const referenced = reference === undefined ? parseReferencedConversationPrompt(message) : undefined;
+        const referenced = parseReferencedConversationPrompt(message);
         if (referenced !== undefined) {
-            reference = referenced.reference;
+            references.push(referenced.reference);
             message = referenced.message;
             continue;
         }
         break;
     }
-    if (annotations === undefined && reference === undefined)
+    if (annotations === undefined && references.length === 0)
         return;
-    return {
-        ...(annotations === undefined ? {} : { annotations }),
-        ...(reference === undefined ? {} : { reference }),
-        message,
-    };
+    return { ...(annotations === undefined ? {} : { annotations }), references, message };
 }
 /** Wrap DSH's own user renderer only when this plugin's durable prefix exists. */
 export function annotatedUserMessageRenderer(Original) {
@@ -98,19 +116,16 @@ export function annotatedUserMessageRenderer(Original) {
         const parsed = parsePluginPrompt(contentText(props.node.data.content));
         if (parsed === undefined)
             return createElement(Original, props);
-        const body = visibleMessage(parsed.message);
-        const visible = parsed.reference === undefined
-            ? body
-            : [`@${parsed.reference.title}`, body].filter(part => part.length > 0).join('\n\n');
+        const body = parsed.annotations === undefined ? parsed.message : annotationMessageText(parsed.message);
+        const visible = [...parsed.references.map(reference => `@${reference.title}`), body]
+            .filter(part => part.length > 0).join('\n\n');
         const existingLabels = props.node.data.referenceLabels ?? [];
         const node = {
             ...props.node,
             data: {
                 ...props.node.data,
                 content: replaceTextContent(props.node.data.content, visible),
-                ...(parsed.reference === undefined
-                    ? {}
-                    : { referenceLabels: [...new Set([parsed.reference.title, ...existingLabels])] }),
+                referenceLabels: [...new Set([...parsed.references.map(reference => reference.title), ...existingLabels])],
             },
         };
         const original = createElement(Original, { ...props, node });
@@ -128,8 +143,10 @@ export function mountParentConversationAnnotations(ctx, removeAnnotations) {
         // This zero-height projection must follow Todo (0), Goal (10), and Queue
         // (20), so its absolute child remains anchored to the input card below.
         order: 30,
-    }, ({ input }) => (_jsx(ParentComposerAnnotations, { input: input, onRemove: removeAnnotations }))));
+    }, ({ input, session }) => (_jsx(ParentComposerAnnotations, { input: input, onRemove: () => removeAnnotations(SessionId(session.sessionId)) }))));
     const shadow = (key) => slots.inject('conversation.chat.node', () => {
+        let cachedOriginal;
+        let CachedRenderer;
         const ShadowedUserMessage = (props) => {
             // Built-in keyed renderers can register after this declaration callback.
             // Resolve the next-priority renderer at render time so load order does
@@ -141,8 +158,11 @@ export function mountParentConversationAnnotations(ctx, removeAnnotations) {
                 ?.component;
             if (original === undefined)
                 return null;
-            const Renderer = annotatedUserMessageRenderer(original);
-            return createElement(Renderer, props);
+            if (original !== cachedOriginal || CachedRenderer === undefined) {
+                cachedOriginal = original;
+                CachedRenderer = annotatedUserMessageRenderer(cachedOriginal);
+            }
+            return createElement(CachedRenderer, props);
         };
         return slots.register({
             name: 'conversation.chat.node',

package/lib/client/parent-composer/add-to-conversation.d.ts

@@ -1,50 +1,36 @@
 import type { ConversationSelection, SideChatPromptPart } from '../../shared/contracts.js';
 import type { ParentComposerInput, ParentComposerInputSnapshot, SelectionReferenceSource } from './composer-reference.js';
 export type { ParentComposerInput, ParentComposerInputSnapshot, ParentComposerOccurrence, ParentConversationService, SelectionReferenceSource, } from './composer-reference.js';
+export declare const SELECTION_REFERENCE_SOURCE = "dsh-side-chat-selection";
 export declare const SELECTION_REFERENCE_LABEL = "__dsh_side_chat_annotations__";
 export interface ConversationAnnotation {
     readonly text: string;
     readonly comment?: string;
 }
-export interface ConversationSelectionAnnotation extends ConversationAnnotation {
-    /** Zero-based position in the aggregated composer annotation list. */
-    readonly annotationIndex: number;
+interface StoredConversationAnnotation extends ConversationAnnotation {
     readonly selection: ConversationSelection;
 }
+export interface ConversationSelectionAnnotation extends StoredConversationAnnotation {
+    readonly annotationIndex: number;
+}
+export declare function unescapeXmlText(value: string): string;
 export declare function decodeSelectionReference(ref: string): readonly ConversationAnnotation[];
-/** Read all plugin annotations represented by the current DSH input occurrence. */
 export declare function conversationAnnotations(snapshot: ParentComposerInputSnapshot): readonly ConversationAnnotation[];
-/** Read annotations that retain an exact source-selection anchor. */
 export declare function conversationSelectionAnnotations(snapshot: ParentComposerInputSnapshot): readonly ConversationSelectionAnnotation[];
-/** Remove every unsent plugin annotation while preserving the user's draft. */
-export declare function removeConversationAnnotations(input: ParentComposerInput): boolean;
-/** Reference codec used by DSH's native composer chip and submit pipeline. */
-export declare const selectionReferenceSource: SelectionReferenceSource;
-/** Add one passage to the parent composer's aggregated annotation occurrence. */
 export declare function addSelectionToConversation(input: ParentComposerInput, selection: ConversationSelection, comment?: string): boolean;
-/** Remove one unsent selected-passage annotation, retaining the aggregate when needed. */
+export declare function removeConversationAnnotations(input: ParentComposerInput): boolean;
 export declare function removeConversationAnnotation(input: ParentComposerInput, annotationIndex: number): boolean;
-/** Replace the optional comment on one unsent selected-passage annotation. */
 export declare function updateConversationAnnotation(input: ParentComposerInput, annotationIndex: number, comment?: string): boolean;
-export interface ConversationAnnotationRecoveryRecord {
-    readonly ref: string;
-    readonly displayDraft: string;
-    readonly mirrorDraft: string;
-    readonly baseDraft: string;
-}
-/** Describe both the display draft and DSH's persisted clipboard projection. */
-export declare function conversationAnnotationRecoveryRecord(snapshot: ParentComposerInputSnapshot): ConversationAnnotationRecoveryRecord | undefined;
-/** Return the valid aggregated reference currently occupying the leading draft slot. */
-export declare function conversationAnnotationReference(snapshot: ParentComposerInputSnapshot): string | undefined;
-/** Remove the plugin-owned prefix when rc.6 restored its draft without occurrences. */
-export declare function removeOrphanedConversationAnnotationPlaceholder(input: ParentComposerInput): boolean;
-/** Rehydrate a lost occurrence over either its display draft or exact mirror projection. */
-export declare function restoreConversationAnnotationReference(input: ParentComposerInput, ref: string, expectedMirrorDraft?: string, expectedBaseDraft?: string): boolean;
+export declare const selectionReferenceSource: SelectionReferenceSource;
 export interface AnnotatedConversationPrompt {
     readonly annotations: readonly ConversationAnnotation[];
     readonly message: string;
 }
-/** Parse the durable model form back into the user-facing annotation capsule. */
 export declare function parseAnnotatedConversationPrompt(text: string): AnnotatedConversationPrompt | undefined;
-/** Add the selected quote to the first child prompt. */
+/** The first prompt uses the same durable annotation format as the main composer. */
 export declare function buildSideChatPrompt(selection: ConversationSelection | undefined, question: string): readonly SideChatPromptPart[];
+/** Decode a question only after recognizing this plugin's annotation prefix. */
+export declare function annotationMessageText(message: string): string;
+/** One projection supplies both the annotation capsule and the visible question. */
+export declare function parseSideChatPrompt(text: string): AnnotatedConversationPrompt | undefined;
+export declare function sideChatQuestionText(text: string): string;