@ahggg/dsh-side-chat 0.7.2 → 1.0.0

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,13 +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}` })] }));
 }
-//# sourceMappingURL=SideChatPanel.js.map

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

@@ -1,3 +1,2 @@
 /** Rounded-square stop glyph used by DSH's native primary action button. */
 export declare function StopIcon(): import("react/jsx-runtime").JSX.Element;
-//# sourceMappingURL=StopIcon.d.ts.map

package/lib/client/panel/StopIcon.js

@@ -3,4 +3,3 @@ import { jsx as _jsx } from "react/jsx-runtime";
 export function StopIcon() {
     return (_jsx("svg", { viewBox: "0 0 16 16", width: "16", height: "16", "aria-hidden": "true", children: _jsx("rect", { x: "3", y: "3", width: "10", height: "10", rx: "3", fill: "currentColor" }) }));
 }
-//# sourceMappingURL=StopIcon.js.map

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

@@ -14,10 +14,9 @@ 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;
 }
 export declare const SIDE_CHAT_MESSAGES: Readonly<Record<'en' | 'zh-CN', SideChatMessages>>;
-//# sourceMappingURL=messages.d.ts.map

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,13 +33,12 @@ export const SIDE_CHAT_MESSAGES = Object.freeze({
         removeSelection: '移除引用',
         expand: '展开',
         collapse: '收起',
-        temporary: '关闭时归档；历史仍保存在磁盘上',
-        referenceOnly: '完整继承父会话对话前缀',
-        cannotReopen: '不提供重新打开操作',
-        sharedWorkspace: '与父会话共享工作区',
+        temporary: '临时对话；关闭或刷新后丢弃',
+        referenceOnly: '只读父会话上下文；不复制 Session',
+        cannotReopen: '添加到主对话以保留讨论内容',
+        readOnly: '不使用工具，不修改文件',
         retry: '重试',
         genericError: '侧边对话错误',
         closeError: '无法关闭侧边对话',
     }),
 });
-//# sourceMappingURL=messages.js.map

package/lib/client/panel/use-auto-growing-textarea.d.ts

@@ -1,3 +1,2 @@
 /** Keep a textarea one line tall until its content reaches the CSS max-height. */
 export declare function useAutoGrowingTextarea(value: string): import("react").RefObject<HTMLTextAreaElement>;
-//# sourceMappingURL=use-auto-growing-textarea.d.ts.map

package/lib/client/panel/use-auto-growing-textarea.js

@@ -18,4 +18,3 @@ export function useAutoGrowingTextarea(value) {
     }, [value]);
     return ref;
 }
-//# sourceMappingURL=use-auto-growing-textarea.js.map

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,6 +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 {};
-//# sourceMappingURL=ParentConversationAnnotations.d.ts.map

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

@@ -1,18 +1,68 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { createElement } from 'react';
+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';
 }
+const ANNOTATION_CHIP_WIDTH_PROPERTY = '--dsh-side-chat-parent-annotation-width';
 /** The interactive annotation capsule occupying the reserved first composer row. */
 export function ParentComposerAnnotations({ input, onRemove, locale = currentLocale(), }) {
     const annotations = conversationAnnotations(input);
+    const dockRef = useRef(null);
+    useLayoutEffect(() => {
+        const dock = dockRef.current;
+        const seat = dock?.closest('[data-composer-seat]');
+        const chip = dock?.querySelector('.dsh-side-chat-quote-chip');
+        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 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`);
+            }
+        };
+        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);
+        };
+    }, [input, locale]);
     if (annotations.length === 0)
         return null;
-    return (_jsx("div", { className: "dsh-side-chat-parent-annotation-dock", children: _jsx(SelectionQuote, { selections: annotations, messages: SIDE_CHAT_MESSAGES[locale], onRemove: onRemove }) }));
+    return (_jsx("div", { ref: dockRef, className: "dsh-side-chat-parent-annotation-dock", children: _jsx(SelectionQuote, { selections: annotations, messages: SIDE_CHAT_MESSAGES[locale], onRemove: onRemove }) }));
 }
 function contentText(content) {
     return content.map((block) => {
@@ -22,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) => {
@@ -44,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) {
@@ -74,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 });
@@ -104,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
@@ -117,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',
@@ -135,4 +179,3 @@ export function mountParentConversationAnnotations(ctx, removeAnnotations) {
         removeDock();
     };
 }
-//# sourceMappingURL=ParentConversationAnnotations.js.map

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

@@ -1,51 +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[];
-//# sourceMappingURL=add-to-conversation.d.ts.map
+/** 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;