@ahggg/dsh-side-chat 0.7.3 → 1.0.0

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.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',
@@ -74,6 +74,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 +99,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 +132,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 +170,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 +188,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)) {
@@ -235,12 +254,12 @@ export function SideChatModelSelect({ directory, selection, locked, validateInit
                                     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 {};