@ahggg/dsh-side-chat 0.7.3 → 1.0.1

package/lib/client/{rc6/Rc6SideChatOverlay.js → dsh/SideChatOverlay.js}

@@ -7,8 +7,9 @@ import { SideChatPanel } from '../panel/SideChatPanel.js';
 import { ConversationAnnotationMarkers } from '../selection/ConversationAnnotationMarkers.js';
 import { captureDomConversationSelection } from '../selection/selection-controller.js';
 import { SelectionActions } from '../selection/SelectionActions.js';
-import { ArchivedConversation } from './ArchivedConversation.js';
-import { Rc6SideChatSessions, selectionDescriptor } from './sessions-adapter.js';
+import { conversationChatRoot, focusConversationComposer } from '../selection/conversation-dom.js';
+import { ReadOnlyConversation } from './ReadOnlyConversation.js';
+import { DshSideChatSessions, selectionDescriptor } from './sessions-adapter.js';
 const MORE_DETAILS_PROMPT = 'Please explain the selected passage in more detail.';
 const TOUCH_SELECTION_SETTLE_MS = 300;
 const TOUCH_ACTIVATION_SUPPRESS_MS = 750;
@@ -24,28 +25,8 @@ function captureEvent(event) {
             '.dsh-side-chat-annotation-marker',
         ].join(', ')) !== null);
 }
-function focusParentComposer() {
-    const input = document.querySelector([
-        '[data-composer-seat] textarea',
-        '[data-composer-seat] [role="textbox"]',
-        '[data-composer-seat] [contenteditable="true"]',
-    ].join(', '));
-    if (input === null)
-        return;
-    input.focus();
-    if (input instanceof HTMLTextAreaElement) {
-        input.setSelectionRange(input.value.length, input.value.length);
-        return;
-    }
-    const range = document.createRange();
-    range.selectNodeContents(input);
-    range.collapse(false);
-    const selection = window.getSelection();
-    selection?.removeAllRanges();
-    selection?.addRange(range);
-}
-/** rc.6 compatibility surface: selection toolbar plus a non-current child conversation panel. */
-export function Rc6SideChatOverlay({ controller, sessions, }) {
+/** Selection toolbar and plugin-owned read-only discussion panel. */
+export function SideChatOverlay({ controller, sessions, }) {
     const state = useSyncExternalStore(controller.subscribe, controller.getSnapshot, controller.getSnapshot);
     const currentSessionId = useSyncExternalStore(sessions.subscribeList, () => sessions.currentSessionId(), () => sessions.currentSessionId());
     const composerInput = useSyncExternalStore(sessions.subscribeConversationInput, sessions.currentConversationInputSnapshot, sessions.currentConversationInputSnapshot);
@@ -62,11 +43,11 @@ export function Rc6SideChatOverlay({ controller, sessions, }) {
         const generation = ++captureGeneration.current;
         const parentSessionId = sessions.currentSessionId();
         const face = parentSessionId === undefined ? undefined : sessions.face(parentSessionId);
-        const conversationRoot = document.querySelector('[data-chat-flow]');
+        const conversationRoot = parentSessionId === undefined ? undefined : conversationChatRoot(parentSessionId);
         const browserSelection = window.getSelection();
         if (parentSessionId === undefined
             || face === undefined
-            || conversationRoot === null
+            || conversationRoot === undefined
             || browserSelection === null
             || browserSelection.isCollapsed) {
             if (generation === captureGeneration.current)
@@ -86,7 +67,7 @@ export function Rc6SideChatOverlay({ controller, sessions, }) {
                     },
                 },
             });
-            if (generation === captureGeneration.current) {
+            if (generation === captureGeneration.current && sessions.currentSessionId() === parentSessionId) {
                 setActiveSelection({ value: captured, touch });
             }
         }
@@ -193,11 +174,13 @@ export function Rc6SideChatOverlay({ controller, sessions, }) {
             touchInteraction.current = false;
             cancelScheduledCapture();
             if (event.key === 'Escape') {
+                // Escape in a menu, annotation editor, or main composer belongs to
+                // that control. Closing discards the temporary discussion, so it must
+                // not fire from every keyup in the document.
                 ++captureGeneration.current;
                 annotationEditing.current = false;
                 setActiveSelection(null);
                 setEditingAnnotation(null);
-                void controller.close();
                 return;
             }
             if (captureEvent(event))
@@ -253,34 +236,25 @@ export function Rc6SideChatOverlay({ controller, sessions, }) {
     const askDisabledReason = state.phase === 'closed'
         ? undefined
         : 'Close the current Side Chat before starting another one.';
-    const childFace = state.childSessionId === undefined ? undefined : sessions.face(state.childSessionId);
-    const childCwd = state.childSessionId === undefined ? undefined : sessions.cwd(state.childSessionId);
-    const inheritedThroughSeq = state.inheritedThroughSeq;
     const locale = navigator.language.toLowerCase().startsWith('zh') ? 'zh-CN' : 'en';
     const modelDirectory = state.parentSessionId === undefined
         ? undefined
         : sessions.modelDirectory?.(state.parentSessionId);
-    const addToConversationDisabled = childFace === undefined
-        || inheritedThroughSeq === undefined
-        || state.parentSessionId === undefined
-        || state.childSessionId === undefined
-        || state.phase !== 'ready';
+    const addToConversationDisabled = state.parentSessionId === undefined
+        || state.chatId === undefined || state.phase !== 'ready'
+        || !state.messages.some(message => message.role === 'assistant' && message.text.trim().length > 0);
     const addToConversation = () => {
         const parentSessionId = state.parentSessionId;
-        const childSessionId = state.childSessionId;
-        const face = childSessionId === undefined ? undefined : sessions.face(childSessionId);
-        if (parentSessionId === undefined
-            || childSessionId === undefined
-            || inheritedThroughSeq === undefined
-            || face === undefined) {
+        const chatId = state.chatId;
+        if (parentSessionId === undefined || chatId === undefined || state.phase !== 'ready') {
             sessions.notify({ kind: 'warning', text: 'The Side Chat conversation is not ready to add yet.' });
             return;
         }
+        const parentTitle = sessions.title(parentSessionId);
         const reference = referencedSideChatConversation({
-            conversationId: childSessionId,
-            title: sessions.title(childSessionId) ?? (locale === 'zh-CN' ? '侧边对话' : 'Side Chat'),
-            nodes: face.getSnapshot().nodes,
-            inheritedThroughSeq,
+            conversationId: chatId,
+            title: [locale === 'zh-CN' ? '侧边对话' : 'Side Chat', parentTitle].filter(Boolean).join(' · '),
+            messages: state.messages,
         });
         if (reference.conversation.length === 0) {
             sessions.notify({ kind: 'warning', text: 'The Side Chat does not have any conversation history to add yet.' });
@@ -291,7 +265,7 @@ export function Rc6SideChatOverlay({ controller, sessions, }) {
                 sessions.notify({ kind: 'warning', text: 'Could not add the Side Chat to the main conversation.' });
                 return;
             }
-            void sessions.openSession(parentSessionId).then(focusParentComposer, () => {
+            void sessions.openSession(parentSessionId).then(() => focusConversationComposer(parentSessionId), () => {
                 sessions.notify({ kind: 'warning', text: 'The Side Chat was added, but its parent conversation could not be opened.' });
             });
         }
@@ -301,12 +275,12 @@ export function Rc6SideChatOverlay({ controller, sessions, }) {
     };
     const modelControl = modelDirectory === undefined
         ? undefined
-        : (_jsx(SideChatModelSelect, { directory: modelDirectory, selection: state.modelSelection, locked: ['creating', 'opening', 'closing'].includes(state.phase) || state.error?.operation === 'close', validateInitialSelection: state.childSessionId === undefined, locale: locale, onInitialize: (selection, options) => {
+        : (_jsx(SideChatModelSelect, { directory: modelDirectory, selection: state.modelSelection, locked: ['creating', 'closing'].includes(state.phase) || state.error?.operation === 'close', running: state.phase === 'running', validateInitialSelection: state.chatId === undefined, locale: locale, onInitialize: (selection, options) => {
                 if (options.remember)
                     void controller.selectModel(selection);
                 else
                     controller.initializeModel(selection);
-            }, onSelect: (selection) => controller.selectModel(selection) }, `${state.parentSessionId}:${state.childSessionId ?? 'draft'}`));
+            }, onSelect: (selection) => controller.selectModel(selection) }, `${state.parentSessionId}:${state.chatId ?? 'draft'}`));
     return (_jsxs("div", { className: "dsh-side-chat-overlay", children: [_jsx(ConversationAnnotationMarkers, { annotations: annotations, ...editingAnnotation === null
                     ? {}
                     : { activeAnnotationIndex: editingAnnotation.annotationIndex }, onEdit: (annotation, restoredSelection) => {
@@ -318,7 +292,7 @@ export function Rc6SideChatOverlay({ controller, sessions, }) {
                 } }), activeSelection !== null && (_jsx(SelectionActions, { selection: activeSelection.value, touchInteraction: activeSelection.touch, annotationNumber: sessions.nextConversationAnnotationNumber(), ...askDisabledReason === undefined ? {} : { askDisabledReason }, onAddToChat: (captured, comment) => {
                     try {
                         if (sessions.addSelectionToConversation(captured, comment))
-                            focusParentComposer();
+                            focusConversationComposer(captured.parentSessionId);
                         else
                             sessions.notify({ kind: 'warning', text: 'Could not add the selection to the current chat.' });
                     }
@@ -373,12 +347,8 @@ export function Rc6SideChatOverlay({ controller, sessions, }) {
                 }, onMoreDetails: () => { }, onAskInSideChat: () => { }, onDismiss: () => {
                     annotationEditing.current = false;
                     setEditingAnnotation(null);
-                } }, `annotation:${String(editingAnnotation.annotationIndex)}`)), state.phase !== 'closed' && (_jsx(SideChatPanel, { state: state, locale: locale, ...childFace === undefined || inheritedThroughSeq === undefined
-                    ? {}
-                    : {
-                        embeddedConversation: (_jsx(ArchivedConversation, { face: childFace, inheritedThroughSeq: inheritedThroughSeq, controller: controller, cwd: childCwd, ...state.selection === undefined ? {} : { selection: state.selection }, locale: locale, modelControl: modelControl })),
-                    }, modelControl: modelControl, onDraftChange: (draft) => { controller.setDraft(draft); }, onFirstSend: (question) => controller.sendFirst(question), onClose: () => controller.close(), onRetry: () => controller.retry(), onFocusParent: () => {
+                } }, `annotation:${String(editingAnnotation.annotationIndex)}`)), state.phase !== 'closed' && (_jsx(SideChatPanel, { state: state, locale: locale, embeddedConversation: _jsx(ReadOnlyConversation, { state: state, controller: controller, locale: locale, modelControl: modelControl }, state.chatId), modelControl: modelControl, onDraftChange: (draft) => { controller.setDraft(draft); }, onFirstSend: (question) => controller.sendFirst(question), onClose: () => controller.close(), onRetry: () => controller.retry(), onFocusParent: () => {
                     if (state.parentSessionId !== undefined)
                         void sessions.openSession(state.parentSessionId);
-                }, onAddToConversation: addToConversation, addToConversationDisabled: addToConversationDisabled, onRemoveSelection: () => { controller.clearSelection(); } }))] }));
+                }, onAddToConversation: addToConversation, addToConversationDisabled: addToConversationDisabled, ...state.chatId === undefined ? { onRemoveSelection: () => { controller.clearSelection(); } } : {} }))] }));
 }

package/lib/client/{rc6 → dsh}/context.d.ts

@@ -4,10 +4,10 @@ import type { ISessions } from '@deepseek-ai/dsh-api-session-controller/client';
 import type { UiConversation } from '@deepseek-ai/dsh-client-ui-conversation/client';
 import type { ModelDirectoryResolver } from '@deepseek-ai/dsh-client-ui-model-selection/client';
 import type { SlotRegistry } from '@deepseek-ai/dsh-client-ui-renderer/client';
-import type { UiSession } from '@deepseek-ai/dsh-client-ui-session/client';
+import type { UiWorkspace } from '@deepseek-ai/dsh-client-ui-workspace/client';
 import type { ParentConversationService, SelectionReferenceSource } from '../parent-composer/add-to-conversation.js';
 /** Browser-only Cordis view for a package that also compiles the Host half. */
-export type Rc6ClientContext = Omit<Context, 'conversation' | 'inputTriggers' | 'modelDirectories' | 'remote' | 'sessions' | 'slots' | 'uiConversation' | 'uiSession'> & {
+export type DshClientContext = Omit<Context, 'conversation' | 'inputTriggers' | 'modelDirectories' | 'remote' | 'sessions' | 'slots' | 'uiConversation' | 'uiWorkspace'> & {
     readonly conversation: ParentConversationService;
     readonly inputTriggers: {
         registerSource(source: SelectionReferenceSource): () => void;
@@ -16,8 +16,6 @@ export type Rc6ClientContext = Omit<Context, 'conversation' | 'inputTriggers' |
     readonly remote: ClientRemote;
     readonly sessions: ISessions;
     readonly slots: SlotRegistry;
-    /** Added by DSH 0.1.2; absent on the monolithic 0.1.0/0.1.1 runtime. */
-    readonly uiConversation?: Pick<UiConversation, 'binding'>;
-    /** Added by DSH 0.1.2; absent on the monolithic 0.1.0/0.1.1 runtime. */
-    readonly uiSession?: Pick<UiSession, 'pendingInteractions'>;
+    readonly uiWorkspace: UiWorkspace;
+    readonly uiConversation: Pick<UiConversation, 'binding'>;
 };

package/lib/client/dsh/conversation-store.d.ts

@@ -0,0 +1,22 @@
+import type { ChatSnapshot } from '@deepseek-ai/dsh-client-ui-chat/client';
+export type SideChatNodeStore = ChatSnapshot['nodes'];
+export interface ParentConversationSnapshot {
+    readonly turnEnds: ReadonlyMap<number, number>;
+    readonly chatNodes: Pick<SideChatNodeStore, 'get'>;
+}
+export interface ParentConversationFace {
+    getSnapshot(): ParentConversationSnapshot;
+    subscribe(listener: () => void): () => void;
+}
+/** Read-only parent Chat projection, used only for selection anchors and turn boundaries. */
+export declare class DshParentConversation implements ParentConversationFace {
+    private readonly chat;
+    private source;
+    private snapshot;
+    constructor(chat: {
+        getSnapshot(): ChatSnapshot | undefined;
+        subscribe(listener: () => void): () => void;
+    });
+    subscribe: (listener: () => void) => (() => void);
+    getSnapshot: () => ParentConversationSnapshot;
+}

package/lib/client/dsh/conversation-store.js

@@ -0,0 +1,19 @@
+const EMPTY = { turnEnds: new Map(), chatNodes: { get: () => undefined } };
+/** Read-only parent Chat projection, used only for selection anchors and turn boundaries. */
+export class DshParentConversation {
+    chat;
+    source;
+    snapshot = EMPTY;
+    constructor(chat) {
+        this.chat = chat;
+    }
+    subscribe = (listener) => this.chat.subscribe(listener);
+    getSnapshot = () => {
+        const source = this.chat.getSnapshot();
+        if (source !== this.source) {
+            this.source = source;
+            this.snapshot = source === undefined ? EMPTY : { turnEnds: source.legacy.turnEnds, chatNodes: source.nodes };
+        }
+        return this.snapshot;
+    };
+}

package/lib/client/dsh/primitive-labels.d.ts

@@ -0,0 +1,2 @@
+import type { MarkdownLabels } from '@deepseek-ai/dsh-client-ui-primitives';
+export declare const MARKDOWN_LABELS: MarkdownLabels;

package/lib/client/dsh/primitive-labels.js

@@ -0,0 +1,4 @@
+export const MARKDOWN_LABELS = {
+    code: { copyLabel: 'Copy', copiedLabel: 'Copied' },
+    footnotes: 'Footnotes',
+};

package/lib/client/{rc6 → dsh}/remote-adapter.d.ts

@@ -1,6 +1,6 @@
 import type { SideChatRemote } from '../../shared/contracts.js';
-import type { Rc6ClientContext } from './context.js';
-export declare function mountArchivedRemote(ctx: Rc6ClientContext): Promise<{
+import type { DshClientContext } from './context.js';
+export declare function mountSideChatRemote(ctx: DshClientContext): Promise<{
     readonly remote: SideChatRemote;
     readonly dispose: () => Promise<void>;
 }>;

package/lib/client/dsh/remote-adapter.js

@@ -0,0 +1,22 @@
+import TYPERT_REMOTE from '../../remote.js';
+function remoteFailure(error) {
+    const code = error.code;
+    const badRequest = code === 'bad-request' || code === 'gateway/bad-request';
+    return { code: badRequest ? 'invalid_request' : 'transport_error',
+        message: error.message || 'The Side Chat RPC failed.', recoverable: !badRequest };
+}
+async function unwrap(result) {
+    const value = await result;
+    return value.ok ? value.value : { ok: false, error: remoteFailure(value.error) };
+}
+export async function mountSideChatRemote(ctx) {
+    const dispose = await ctx.remote.$mount(TYPERT_REMOTE);
+    const rpc = ctx.get('remote.sideChat');
+    return { remote: {
+            create: request => unwrap(rpc.create(request)),
+            selectModel: request => unwrap(rpc.selectModel(request)),
+            stream: request => rpc.stream(request),
+            cancel: request => unwrap(rpc.cancel(request)),
+            close: request => unwrap(rpc.close(request)),
+        }, dispose };
+}

package/lib/client/dsh/sessions-adapter.d.ts

@@ -0,0 +1,56 @@
+import type { ModelDirectory } from '@deepseek-ai/dsh-client-ui-model-selection/client';
+import type { SideChatClientSessions } from '../contracts.js';
+import { SessionId, type ConversationSelection, type SideChatModelSelection } from '../../shared/contracts.js';
+import { type ParentComposerInputSnapshot } from '../parent-composer/add-to-conversation.js';
+import { type ReferencedSideChatConversation } from '../parent-composer/referenced-conversation.js';
+import type { DshClientContext } from './context.js';
+import { type ParentConversationFace, type ParentConversationSnapshot } from './conversation-store.js';
+declare module '@deepseek-ai/dsh-api-session-controller/client' {
+    interface SessionReferenceSourceMap {
+        sideChat: unknown;
+    }
+}
+/** The only Session touched by the plugin is the parent: read its Chat, retain its editor, and insert explicit references. */
+export declare class DshSideChatSessions implements SideChatClientSessions {
+    private readonly ctx;
+    private readonly faces;
+    private readonly parentInputs;
+    private readonly annotationPersistence;
+    private readonly modelPreferences;
+    constructor(ctx: DshClientContext);
+    readonly subscribeList: (listener: () => void) => (() => void);
+    readonly subscribeConversationInput: (listener: () => void) => (() => void);
+    readonly currentConversationInputSnapshot: () => ParentComposerInputSnapshot | undefined;
+    currentSessionId(): SessionId | undefined;
+    lastCompletedSeq(parentSessionId: SessionId): number | undefined;
+    selectionIsCurrent(selection: ConversationSelection): boolean;
+    addSelectionToConversation(selection: ConversationSelection, comment?: string): boolean;
+    addSideChatToConversation(parentSessionId: SessionId, reference: ReferencedSideChatConversation): boolean;
+    removeConversationAnnotation(index: number): boolean;
+    updateConversationAnnotation(index: number, comment?: string): boolean;
+    reconcileConversationAnnotationPersistence(): void;
+    nextConversationAnnotationNumber(): number;
+    removeConversationAnnotations(id?: SessionId | undefined): boolean;
+    retainParent(id: SessionId): () => void;
+    openSession(id: SessionId): Promise<void>;
+    notify(message: {
+        readonly kind: 'status' | 'warning';
+        readonly text: string;
+    }): void;
+    face(id: SessionId): ParentConversationFace | undefined;
+    title(id: SessionId): string | undefined;
+    modelDirectory(id: SessionId): ModelDirectory | undefined;
+    sideChatModelPreference(): SideChatModelSelection | undefined;
+    rememberSideChatModelPreference(model: SideChatModelSelection): void;
+    private currentParentInput;
+    private parentInput;
+}
+export declare function selectionDescriptor(snapshot: ParentConversationSnapshot, anchorKey: string): {
+    readonly nodeKey: string;
+    readonly nodeKind: string;
+    readonly turnKey: string;
+    readonly seq: number;
+    readonly source: 'user' | 'assistant' | 'context' | 'code';
+    readonly modelVisible: boolean;
+    readonly settled: boolean;
+} | undefined;

package/lib/client/dsh/sessions-adapter.js

@@ -0,0 +1,185 @@
+import { SessionId } from '../../shared/contracts.js';
+import { addSelectionToConversation as addSelection, conversationAnnotations, removeConversationAnnotation as removeAnnotation, removeConversationAnnotations as removeAnnotations, updateConversationAnnotation as updateAnnotation, } from '../parent-composer/add-to-conversation.js';
+import { ConversationAnnotationPersistence } from '../parent-composer/annotation-persistence.js';
+import { addReferencedSideChatToConversation } from '../parent-composer/referenced-conversation.js';
+import { SideChatModelPreferences } from '../model-preference.js';
+import { DshParentConversation } from './conversation-store.js';
+function dshId(id) { return id; }
+function locationSettled(location) {
+    if (location.kind === 'turn')
+        return location.turn.status === 'closed';
+    if (location.kind === 'step')
+        return location.turn.status === 'closed' && location.step.status === 'closed';
+    return false;
+}
+/** The only Session touched by the plugin is the parent: read its Chat, retain its editor, and insert explicit references. */
+export class DshSideChatSessions {
+    ctx;
+    faces = new WeakMap();
+    parentInputs = new WeakMap();
+    annotationPersistence = new ConversationAnnotationPersistence();
+    modelPreferences = new SideChatModelPreferences();
+    constructor(ctx) {
+        this.ctx = ctx;
+    }
+    subscribeList = (listener) => this.ctx.sessions.list.subscribe(listener);
+    subscribeConversationInput = (listener) => {
+        let input;
+        let removeInput = () => { };
+        const bind = () => {
+            const next = this.currentParentInput();
+            if (next === input)
+                return;
+            removeInput();
+            input = next;
+            removeInput = input?.state.subscribe(listener) ?? (() => { });
+        };
+        bind();
+        const removeList = this.ctx.sessions.list.subscribe(() => { bind(); listener(); });
+        return () => { removeList(); removeInput(); };
+    };
+    currentConversationInputSnapshot = () => this.currentParentInput()?.state.getSnapshot();
+    currentSessionId() {
+        const current = Object.entries(this.ctx.sessions.list.getSnapshot().byId)
+            .find(([, summary]) => (summary.retainedBy.mainView ?? 0) > 0)?.[0];
+        return current === undefined ? undefined : SessionId(current);
+    }
+    lastCompletedSeq(parentSessionId) {
+        const snapshot = this.face(parentSessionId)?.getSnapshot();
+        let latest;
+        for (const seq of snapshot?.turnEnds.values() ?? [])
+            if (latest === undefined || seq > latest)
+                latest = seq;
+        return latest;
+    }
+    selectionIsCurrent(selection) {
+        const snapshot = this.face(selection.parentSessionId)?.getSnapshot();
+        if (snapshot === undefined)
+            return false;
+        return selection.fragments.every(fragment => {
+            const node = snapshot.chatNodes.get(fragment.nodeKey);
+            return node !== undefined && node.visibility === 'visible' && node.kind === fragment.nodeKind
+                && node.anchorSeq === fragment.seq && locationSettled(node.location);
+        });
+    }
+    addSelectionToConversation(selection, comment) {
+        if (this.currentSessionId() !== selection.parentSessionId)
+            return false;
+        const input = this.currentParentInput();
+        if (input === undefined || !addSelection(input, selection, comment))
+            return false;
+        this.annotationPersistence.reconcile(selection.parentSessionId, input);
+        return true;
+    }
+    addSideChatToConversation(parentSessionId, reference) {
+        const scope = this.ctx.sessions.scope(dshId(parentSessionId));
+        const input = scope === undefined ? undefined : this.parentInput(scope);
+        if (input === undefined || !addReferencedSideChatToConversation(input, reference))
+            return false;
+        this.annotationPersistence.reconcile(parentSessionId, input);
+        return true;
+    }
+    removeConversationAnnotation(index) {
+        const id = this.currentSessionId();
+        const input = this.currentParentInput();
+        if (id === undefined || input === undefined || !removeAnnotation(input, index))
+            return false;
+        this.annotationPersistence.reconcile(id, input);
+        return true;
+    }
+    updateConversationAnnotation(index, comment) {
+        const id = this.currentSessionId();
+        const input = this.currentParentInput();
+        if (id === undefined || input === undefined || !updateAnnotation(input, index, comment))
+            return false;
+        this.annotationPersistence.reconcile(id, input);
+        return true;
+    }
+    reconcileConversationAnnotationPersistence() {
+        const id = this.currentSessionId();
+        const input = this.currentParentInput();
+        if (id !== undefined && input !== undefined)
+            this.annotationPersistence.reconcile(id, input);
+    }
+    nextConversationAnnotationNumber() {
+        const snapshot = this.currentConversationInputSnapshot();
+        return snapshot === undefined ? 1 : conversationAnnotations(snapshot).length + 1;
+    }
+    removeConversationAnnotations(id = this.currentSessionId()) {
+        const scope = id === undefined ? undefined : this.ctx.sessions.scope(dshId(id));
+        const input = scope === undefined ? undefined : this.parentInput(scope);
+        if (id === undefined || input === undefined || !removeAnnotations(input))
+            return false;
+        this.annotationPersistence.reconcile(id, input);
+        return true;
+    }
+    retainParent(id) {
+        const reference = this.ctx.sessions.retain(dshId(id), { source: 'sideChat' });
+        let active = true;
+        void reference.ready.catch(() => { if (active)
+            this.notify({ kind: 'warning', text: 'The parent conversation could not be loaded.' }); });
+        return () => { active = false; reference.release(); };
+    }
+    async openSession(id) { this.ctx.uiWorkspace.openSession(dshId(id)); }
+    notify(message) {
+        console[message.kind === 'warning' ? 'warn' : 'info'](`[dsh-side-chat] ${message.text}`);
+        this.currentParentInput()?.notify?.(message.kind === 'warning' ? 'error' : 'info', message.text);
+    }
+    face(id) {
+        const source = this.ctx.sessions.binding(dshId(id))?.session;
+        if (source === undefined)
+            return;
+        const existing = this.faces.get(source);
+        if (existing !== undefined)
+            return existing;
+        const conversation = this.ctx.uiConversation.binding(source.sessionId);
+        conversation.activate('chat');
+        const face = new DshParentConversation(conversation.target('chat'));
+        this.faces.set(source, face);
+        return face;
+    }
+    title(id) { return this.ctx.sessions.list.getSnapshot().byId[dshId(id)]?.displayTitle; }
+    modelDirectory(id) {
+        try {
+            return this.ctx.modelDirectories.directoryFor(dshId(id));
+        }
+        catch {
+            return undefined;
+        }
+    }
+    sideChatModelPreference() { return this.modelPreferences.get(); }
+    rememberSideChatModelPreference(model) { this.modelPreferences.set(model); }
+    currentParentInput() {
+        const id = this.currentSessionId();
+        const scope = id === undefined ? undefined : this.ctx.sessions.scope(dshId(id));
+        return scope === undefined ? undefined : this.parentInput(scope);
+    }
+    parentInput(scope) {
+        const source = this.ctx.conversation.input.for(scope);
+        if (source === undefined)
+            return;
+        const existing = this.parentInputs.get(source);
+        if (existing !== undefined)
+            return existing;
+        const input = {
+            state: source.state, setDraft: text => { source.setDraft(text); },
+            notify: (level, text) => source.notify?.(level, text),
+            insertReference: (reference, span) => source.insertReference(reference, span),
+            replaceText: (text, span) => scope.bail(scope, 'slash/input-insert-text', { text, span }) === true,
+        };
+        this.parentInputs.set(source, input);
+        return input;
+    }
+}
+export function selectionDescriptor(snapshot, anchorKey) {
+    const node = snapshot.chatNodes.get(anchorKey);
+    if (node === undefined || node.visibility !== 'visible')
+        return;
+    const source = node.kind === 'user' || node.kind === 'steering' ? 'user'
+        : node.kind === 'assistant-step' ? 'assistant' : node.kind === 'context' ? 'context' : undefined;
+    const turn = node.location.kind === 'turn' || node.location.kind === 'step' ? node.location.turn.turn : undefined;
+    if (source === undefined || turn === undefined)
+        return;
+    return { nodeKey: node.key, nodeKind: node.kind, turnKey: `turn:${String(turn)}`, seq: node.anchorSeq,
+        source, modelVisible: true, settled: locationSettled(node.location) };
+}

package/lib/client/index.d.ts

@@ -1,5 +1,5 @@
 export { apply, inject, name } from './apply.js';
-export type { SideChatActionResult, SideChatClientSessions, SideChatSessionBinding, SideChatSessionLease, SideChatSessionSnapshot, } from './contracts.js';
+export type { SideChatActionResult, SideChatClientSessions, } from './contracts.js';
 export { SideChatController } from './side-chat-controller.js';
 export { buildSideChatPrompt } from './parent-composer/add-to-conversation.js';
 export { SideChatPanel, type SideChatPanelProps } from './panel/SideChatPanel.js';
@@ -7,4 +7,4 @@ export { SelectionActions, type SelectionActionsProps } from './selection/Select
 export { captureDomConversationSelection, restoreDomConversationSelection, type RestoredConversationSelection, type SelectionAnchorResolver, type SelectionNodeDescriptor, } from './selection/selection-controller.js';
 export { selectionFitsLimit, summarizeSelection, utf8ByteLength } from './selection/selection-limits.js';
 export { assertSelectionCurrent, finalizeConversationSelection, normalizeSelectedText, SelectionValidationError, type ConversationSelectionInput, } from './selection/selection-normalizer.js';
-export type { ConversationSelection, SelectionFragment, SelectionRect, SideChatModelSelection, SideChatState, } from '../shared/contracts.js';
+export type { ConversationSelection, SelectionFragment, SelectionRect, SideChatModelSelection, SideChatMessage, SideChatId, SideChatState, } from '../shared/contracts.js';

package/lib/client/panel/SelectionQuote.js

@@ -60,7 +60,14 @@ export function SelectionQuote({ selections, messages, onRemove, }) {
     return (_jsxs("section", { ref: quoteRef, className: "dsh-side-chat-quote", "aria-label": messages.selectedPassage, "data-expanded": expanded || undefined, "data-hovered": hovered || undefined, onMouseEnter: () => {
             keepHoverOpen();
             constrainDetailsToBoundary();
-        }, onMouseLeave: closeHoverAfterGrace, onFocusCapture: constrainDetailsToBoundary, children: [_jsxs("div", { className: "dsh-side-chat-quote-chip", children: [_jsxs("button", { type: "button", className: "dsh-side-chat-quote-trigger", "aria-expanded": expanded, "aria-label": `${expanded ? messages.collapse : messages.expand}: ${messages.selectedPassage}`, onClick: () => {
+        }, onMouseLeave: closeHoverAfterGrace, onFocusCapture: constrainDetailsToBoundary, onKeyDown: (event) => {
+            if (event.key !== 'Escape' || (!expanded && !hovered))
+                return;
+            event.preventDefault();
+            event.stopPropagation();
+            setExpanded(false);
+            setHovered(false);
+        }, children: [_jsxs("div", { className: "dsh-side-chat-quote-chip", children: [_jsxs("button", { type: "button", className: "dsh-side-chat-quote-trigger", "aria-expanded": expanded, "aria-label": `${expanded ? messages.collapse : messages.expand}: ${messages.selectedPassage}`, onClick: () => {
                             if (expanded) {
                                 if (leaveTimerRef.current !== undefined)
                                     window.clearTimeout(leaveTimerRef.current);

package/lib/client/panel/SideChatErrorState.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /** Error strip with one direct retry action. */
 export function SideChatErrorState({ error, messages, onRetry, }) {
-    return (_jsxs("section", { className: "dsh-side-chat-error", role: "alert", children: [_jsx("strong", { children: error.code === 'side_chat_destroy_failed' ? messages.closeError : messages.genericError }), _jsx("p", { children: error.message }), error.recoverable && _jsx("button", { type: "button", onClick: onRetry, children: messages.retry })] }));
+    return (_jsxs("section", { className: "dsh-side-chat-error", role: "alert", children: [_jsx("strong", { children: error.operation === 'close' ? messages.closeError : messages.genericError }), _jsx("p", { children: error.message }), error.recoverable && _jsx("button", { type: "button", onClick: onRetry, children: messages.retry })] }));
 }

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

@@ -5,6 +5,7 @@ export interface SideChatModelSelectProps {
     readonly directory: ModelDirectory;
     readonly selection?: SideChatModelSelection | undefined;
     readonly locked: boolean;
+    readonly running?: boolean;
     readonly validateInitialSelection?: boolean;
     readonly locale?: 'en' | 'zh-CN';
     readonly onInitialize: (selection: SideChatModelSelection, options: {
@@ -13,4 +14,4 @@ export interface SideChatModelSelectProps {
     readonly onSelect: (selection: SideChatModelSelection) => Promise<SideChatActionResult<SideChatModelSelection>>;
 }
 /** Side Chat projection of DSH Web's native composer model selector. */
-export declare function SideChatModelSelect({ directory, selection, locked, validateInitialSelection, locale, onInitialize, onSelect, }: SideChatModelSelectProps): import("react/jsx-runtime").JSX.Element;
+export declare function SideChatModelSelect({ directory, selection, locked, running, validateInitialSelection, locale, onInitialize, onSelect, }: SideChatModelSelectProps): import("react/jsx-runtime").JSX.Element;