@ahggg/dsh-side-chat 0.7.3 → 1.0.0

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;