@ahggg/dsh-side-chat 0.7.2 → 0.7.3

package/lib/client/rc6/runtime-compat.js

@@ -0,0 +1,187 @@
+const EMPTY_NODES = [];
+const EMPTY_TURN_ENDS = new Map();
+const EMPTY_RUNNING_CALLS = [];
+const EMPTY_PENDING = [];
+const EMPTY_NODE_STORE = { get: () => undefined };
+function isLegacySnapshot(snapshot) {
+    return typeof snapshot === 'object'
+        && snapshot !== null
+        && Array.isArray(snapshot.nodes)
+        && Array.isArray(snapshot.pending);
+}
+function currentPending(source, sessionId) {
+    const pending = source?.get(sessionId);
+    if (typeof pending !== 'object' || pending === null)
+        return;
+    const candidate = pending;
+    if (candidate.kind === 'approval'
+        && typeof candidate.key === 'string'
+        && typeof candidate.toolName === 'string'
+        && typeof candidate.answer === 'function') {
+        return pending;
+    }
+    if ((candidate.kind === 'question' || candidate.kind === 'plan-review')
+        && typeof candidate.key === 'string'
+        && Array.isArray(candidate.questions)
+        && typeof candidate.answer === 'function'
+        && typeof candidate.cancel === 'function') {
+        return pending;
+    }
+    return undefined;
+}
+function normalizeLegacyPending(wait) {
+    if (wait.kind === 'approval') {
+        return {
+            kind: 'approval',
+            key: wait.key,
+            toolName: wait.payload.toolName,
+            ...(wait.payload.reason === undefined ? {} : { reason: wait.payload.reason }),
+            respond: async (decision) => {
+                const receipt = await wait.respond({
+                    ok: true,
+                    value: {
+                        sessionId: wait.sessionId,
+                        approvalId: wait.payload.approvalId,
+                        outcome: decision === 'approve' ? 'allowed-once' : 'rejected',
+                    },
+                });
+                return receipt.accepted;
+            },
+        };
+    }
+    return {
+        kind: 'question',
+        key: wait.key,
+        questions: wait.payload.questions,
+        respond: async (answer) => {
+            const receipt = await wait.respond(answer === null
+                ? {
+                    ok: false,
+                    error: { code: 'cancelled', message: 'Question cancelled.', details: {} },
+                }
+                : {
+                    ok: true,
+                    value: { sessionId: wait.sessionId, answer },
+                });
+            return receipt.accepted;
+        },
+    };
+}
+function normalizeCurrentPending(wait) {
+    if (wait.kind === 'approval') {
+        return {
+            kind: 'approval',
+            key: wait.key,
+            toolName: wait.toolName,
+            ...(wait.reason === undefined ? {} : { reason: wait.reason }),
+            respond: async (decision) => {
+                await wait.answer(decision === 'approve' ? 'allowed-once' : 'rejected');
+                return true;
+            },
+        };
+    }
+    return {
+        kind: 'question',
+        key: wait.key,
+        questions: wait.questions,
+        respond: async (answer) => {
+            if (answer === null)
+                await wait.cancel();
+            else
+                await wait.answer(answer);
+            return true;
+        },
+    };
+}
+/** Bridge DSH <=0.1.1's combined Session snapshot and 0.1.2's split stores. */
+export class CompatibleConversationFace {
+    session;
+    chat;
+    pending;
+    sessionId;
+    cache;
+    constructor(session, chat, pending) {
+        this.session = session;
+        this.chat = chat;
+        this.pending = pending;
+        this.sessionId = session.sessionId;
+    }
+    subscribe = (listener) => {
+        const removers = [this.session.subscribe(listener)];
+        if (this.chat !== undefined)
+            removers.push(this.chat.subscribe(listener));
+        if (this.pending !== undefined)
+            removers.push(this.pending.subscribe(listener));
+        return () => {
+            for (const remove of removers)
+                remove();
+        };
+    };
+    getSnapshot = () => {
+        const session = this.session.getSnapshot();
+        if (isLegacySnapshot(session)) {
+            if (this.cache?.session === session)
+                return this.cache.value;
+            const value = {
+                nodes: session.nodes,
+                turnEnds: session.turnEnds,
+                partial: session.partial,
+                runningCalls: session.runningCalls,
+                pending: session.pending.map(normalizeLegacyPending),
+                queue: session.queue,
+                running: session.running,
+                openState: session.openState,
+                promptError: session.promptError,
+                lastAgentError: session.lastAgentError,
+                chatNodes: session.chat.nodes,
+            };
+            this.cache = { session, chat: undefined, pending: undefined, value };
+            return value;
+        }
+        const lifecycle = session;
+        const chat = this.chat?.getSnapshot();
+        const pending = this.pending?.getSnapshot();
+        const cached = this.cache;
+        if (cached !== undefined
+            && cached.session === session
+            && cached.chat === chat
+            && cached.pending === pending) {
+            return cached.value;
+        }
+        const legacy = chat?.legacy;
+        const wait = currentPending(pending, this.sessionId);
+        const value = {
+            nodes: legacy?.nodes ?? EMPTY_NODES,
+            turnEnds: legacy?.turnEnds ?? EMPTY_TURN_ENDS,
+            partial: legacy?.partial ?? null,
+            runningCalls: legacy?.runningCalls ?? EMPTY_RUNNING_CALLS,
+            pending: wait === undefined ? EMPTY_PENDING : [normalizeCurrentPending(wait)],
+            queue: lifecycle.queue,
+            running: lifecycle.running,
+            openState: lifecycle.openState,
+            promptError: lifecycle.promptError,
+            lastAgentError: lifecycle.lastAgentError,
+            chatNodes: chat?.nodes ?? EMPTY_NODE_STORE,
+        };
+        this.cache = { session, chat, pending, value };
+        return value;
+    };
+    prompt(content, mode) {
+        return this.session.prompt(content, mode);
+    }
+    updateQueue(itemId, action) {
+        return this.session.updateQueue(itemId, action);
+    }
+    cancel() {
+        return this.session.cancel();
+    }
+    rename(title) {
+        return this.session.rename(title);
+    }
+    async open() {
+        await this.session.open?.call(this.session);
+    }
+}
+export function compatibleConversationFace(session, sources = {}) {
+    return new CompatibleConversationFace(session, sources.chat, sources.pending);
+}

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

@@ -1,14 +1,16 @@
-import type { ConversationSnapshot, SessionFace } from '@deepseek-ai/dsh-client-runtime/client';
 import type { ModelDirectory } from '@deepseek-ai/dsh-client-ui-model-selection/client';
 import type { SideChatClientSessions, SideChatSessionLease } from '../contracts.js';
 import type { ConversationSelection, SessionId, 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 { Rc6ClientContext } from './context.js';
+import { type SideChatConversationFace, type SideChatConversationSnapshot } from './runtime-compat.js';
 /** Adapter over rc.6's public SessionRuntime and exported concrete Session type. */
 export declare class Rc6SideChatSessions implements SideChatClientSessions {
     private readonly ctx;
     private readonly renamed;
+    private readonly faces;
+    private readonly parentInputs;
     private readonly annotationPersistence;
     private readonly modelPreferences;
     constructor(ctx: Rc6ClientContext);
@@ -40,16 +42,18 @@ export declare class Rc6SideChatSessions implements SideChatClientSessions {
         readonly kind: 'status' | 'warning';
         readonly text: string;
     }): void;
-    face(sessionId: SessionId): SessionFace | undefined;
+    face(sessionId: SessionId): SideChatConversationFace | undefined;
     title(sessionId: SessionId): string | undefined;
     cwd(sessionId: SessionId): string | undefined;
     modelDirectory(sessionId: SessionId): ModelDirectory | undefined;
     sideChatModelPreference(): SideChatModelSelection | undefined;
     rememberSideChatModelPreference(selection: SideChatModelSelection): void;
+    private adaptedFace;
     private currentParentInput;
+    private parentInput;
     private waitForBinding;
 }
-export declare function selectionDescriptor(snapshot: ConversationSnapshot, anchorKey: string): {
+export declare function selectionDescriptor(snapshot: SideChatConversationSnapshot, anchorKey: string): {
     readonly nodeKey: string;
     readonly nodeKind: string;
     readonly turnKey: string;
@@ -58,4 +62,3 @@ export declare function selectionDescriptor(snapshot: ConversationSnapshot, anch
     readonly modelVisible: boolean;
     readonly settled: boolean;
 } | undefined;
-//# sourceMappingURL=sessions-adapter.d.ts.map

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

@@ -3,12 +3,15 @@ import { addSelectionToConversation as addSelectionToParentComposer, conversatio
 import { ConversationAnnotationPersistence } from '../parent-composer/annotation-persistence.js';
 import { addReferencedSideChatToConversation as addReferencedSideChatToParentComposer, } from '../parent-composer/referenced-conversation.js';
 import { SideChatModelPreferences } from '../model-preference.js';
+import { compatibleConversationFace, } from './runtime-compat.js';
 const BINDING_WAIT_MS = 8_000;
 function sideChatError(error, fallback) {
+    const badRequest = error.code === 'bad-request' || error.code === 'gateway/bad-request';
+    const missing = error.code === 'session-not-found' || error.code === 'session/not-found';
     return {
-        code: error.code === 'session-not-found' ? 'side_chat_not_found' : fallback,
+        code: missing ? 'side_chat_not_found' : fallback,
         message: error.message,
-        recoverable: error.code !== 'bad-request',
+        recoverable: !badRequest,
     };
 }
 function operationError(code, message) {
@@ -83,21 +86,12 @@ class Rc6SessionBinding {
             : { ok: false, error: sideChatError(result.error, 'side_chat_interrupt_failed') };
     }
     async respondApproval(interactionId, decision) {
-        const wait = this.face.getSnapshot().pending
-            .find(item => item.key === interactionId && item.kind === 'approval');
+        const wait = this.face.getSnapshot().pending.find((item) => item.key === interactionId && item.kind === 'approval');
         if (wait === undefined) {
             return { ok: false, error: operationError('invalid_request', 'The approval is no longer pending.') };
         }
         try {
-            const receipt = await wait.respond({
-                ok: true,
-                value: {
-                    sessionId: wait.sessionId,
-                    approvalId: wait.payload.approvalId,
-                    outcome: decision === 'approve' ? 'allowed-once' : 'rejected',
-                },
-            });
-            return receipt.accepted
+            return await wait.respond(decision)
                 ? { ok: true }
                 : { ok: false, error: operationError('transport_error', 'The approval response arrived too late.') };
         }
@@ -106,32 +100,21 @@ class Rc6SessionBinding {
         }
     }
     async respondQuestion(interactionId, answer) {
-        const wait = this.face.getSnapshot().pending
-            .find(item => item.key === interactionId && item.kind === 'question');
+        const wait = this.face.getSnapshot().pending.find((item) => item.key === interactionId && item.kind === 'question');
         if (wait === undefined) {
             return { ok: false, error: operationError('invalid_request', 'The question is no longer pending.') };
         }
         try {
-            const result = answer === null
-                ? {
-                    ok: false,
-                    error: { code: 'cancelled', message: 'Question cancelled.', details: {} },
-                }
+            const normalized = answer === null
+                ? null
                 : {
-                    ok: true,
-                    value: {
-                        sessionId: wait.sessionId,
-                        answer: {
-                            answers: answer.answers.map(item => ({
-                                id: item.id,
-                                selected: [...item.selected],
-                                ...(item.custom === undefined ? {} : { custom: item.custom }),
-                            })),
-                        },
-                    },
+                    answers: answer.answers.map(item => ({
+                        id: item.id,
+                        selected: [...item.selected],
+                        ...(item.custom === undefined ? {} : { custom: item.custom }),
+                    })),
                 };
-            const receipt = await wait.respond(result);
-            return receipt.accepted
+            return await wait.respond(normalized)
                 ? { ok: true }
                 : { ok: false, error: operationError('transport_error', 'The question response arrived too late.') };
         }
@@ -144,6 +127,8 @@ class Rc6SessionBinding {
 export class Rc6SideChatSessions {
     ctx;
     renamed = new Set();
+    faces = new Map();
+    parentInputs = new WeakMap();
     annotationPersistence = new ConversationAnnotationPersistence();
     modelPreferences = new SideChatModelPreferences();
     constructor(ctx) {
@@ -179,17 +164,17 @@ export class Rc6SideChatSessions {
         return current === undefined ? undefined : sideChatSessionId(current);
     }
     lastCompletedSeq(parentSessionId) {
-        const snapshot = this.ctx.sessions.binding(dshSessionId(parentSessionId))?.session.getSnapshot();
+        const snapshot = this.face(parentSessionId)?.getSnapshot();
         return snapshot === undefined ? undefined : latestCompleted(snapshot);
     }
     selectionIsCurrent(selection) {
         if (this.currentSessionId() !== selection.parentSessionId)
             return false;
-        const snapshot = this.ctx.sessions.binding(dshSessionId(selection.parentSessionId))?.session.getSnapshot();
+        const snapshot = this.face(selection.parentSessionId)?.getSnapshot();
         if (snapshot === undefined)
             return false;
         return selection.fragments.every((fragment) => {
-            const node = snapshot.chat.nodes.get(fragment.nodeKey);
+            const node = snapshot.chatNodes.get(fragment.nodeKey);
             return node !== undefined
                 && node.visibility === 'visible'
                 && node.kind === fragment.nodeKind
@@ -210,7 +195,7 @@ export class Rc6SideChatSessions {
     /** Add one immutable Side Chat transcript to its parent Session's composer. */
     addSideChatToConversation(parentSessionId, reference) {
         const scope = this.ctx.sessions.scope(dshSessionId(parentSessionId));
-        const input = scope === undefined ? undefined : this.ctx.conversation.input.for(scope);
+        const input = scope === undefined ? undefined : this.parentInput(scope);
         if (input === undefined || !addReferencedSideChatToParentComposer(input, reference))
             return false;
         this.annotationPersistence.reconcile(parentSessionId, input);
@@ -264,15 +249,15 @@ export class Rc6SideChatSessions {
     }
     async retain(sessionId) {
         const binding = await this.waitForBinding(dshSessionId(sessionId));
-        const concrete = binding.session;
-        await concrete.open();
+        const face = this.adaptedFace(binding.session);
+        await face.open();
         if (!this.renamed.has(sessionId)) {
             this.renamed.add(sessionId);
             const parentTitle = this.ctx.sessions.list.getSnapshot().byId[dshSessionId(sessionId)]?.displayTitle;
             const title = parentTitle === undefined ? 'Side Chat' : `Side Chat · ${parentTitle}`;
-            await binding.session.rename(title.slice(0, 160)).catch(() => undefined);
+            await face.rename(title.slice(0, 160)).catch(() => undefined);
         }
-        const adapted = new Rc6SessionBinding(binding.session);
+        const adapted = new Rc6SessionBinding(face);
         return { sessionId, binding: adapted, release: () => { } };
     }
     async openSession(sessionId) {
@@ -283,7 +268,8 @@ export class Rc6SideChatSessions {
         console[method](`[dsh-side-chat] ${message.text}`);
     }
     face(sessionId) {
-        return this.ctx.sessions.binding(dshSessionId(sessionId))?.session;
+        const source = this.ctx.sessions.binding(dshSessionId(sessionId))?.session;
+        return source === undefined ? undefined : this.adaptedFace(source);
     }
     title(sessionId) {
         return this.ctx.sessions.list.getSnapshot().byId[dshSessionId(sessionId)]?.displayTitle;
@@ -305,12 +291,44 @@ export class Rc6SideChatSessions {
     rememberSideChatModelPreference(selection) {
         this.modelPreferences.set(selection);
     }
+    adaptedFace(source) {
+        const existing = this.faces.get(source.sessionId);
+        if (existing?.source === source)
+            return existing.compatible;
+        const uiConversation = this.ctx.get('uiConversation');
+        const uiSession = this.ctx.get('uiSession');
+        const chat = uiConversation?.binding(source.sessionId).target('chat');
+        const pending = uiSession?.pendingInteractions;
+        const compatible = compatibleConversationFace(source, {
+            ...(chat === undefined ? {} : { chat }),
+            ...(pending === undefined ? {} : { pending }),
+        });
+        this.faces.set(source.sessionId, { source, compatible });
+        return compatible;
+    }
     currentParentInput() {
         const sessionId = this.currentSessionId();
         if (sessionId === undefined)
             return;
         const scope = this.ctx.sessions.scope(dshSessionId(sessionId));
-        return scope === undefined ? undefined : this.ctx.conversation.input.for(scope);
+        return scope === undefined ? undefined : this.parentInput(scope);
+    }
+    parentInput(scope) {
+        const source = this.ctx.conversation.input.for(scope);
+        if (source === undefined || this.ctx.get('uiConversation') === undefined)
+            return source;
+        const existing = this.parentInputs.get(source);
+        if (existing !== undefined)
+            return existing;
+        const adapted = {
+            referenceMode: 'lexical',
+            state: source.state,
+            setDraft: text => { source.setDraft(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, adapted);
+        return adapted;
     }
     waitForBinding(sessionId) {
         const immediate = this.ctx.sessions.binding(sessionId);
@@ -342,7 +360,7 @@ export class Rc6SideChatSessions {
     }
 }
 export function selectionDescriptor(snapshot, anchorKey) {
-    const node = snapshot.chat.nodes.get(anchorKey);
+    const node = snapshot.chatNodes.get(anchorKey);
     if (node === undefined || node.visibility !== 'visible')
         return undefined;
     const source = node.kind === 'user' || node.kind === 'steering'
@@ -367,4 +385,3 @@ export function selectionDescriptor(snapshot, anchorKey) {
         settled: locationSettled(node.location),
     };
 }
-//# sourceMappingURL=sessions-adapter.js.map

package/lib/client/selection/ConversationAnnotationMarkers.d.ts

@@ -6,4 +6,3 @@ export declare function ConversationAnnotationMarkers({ annotations, activeAnnot
     readonly activeAnnotationIndex?: number;
     readonly onEdit: (annotation: ConversationSelectionAnnotation, selection: ConversationSelection) => void;
 }): (import("react/jsx-runtime").JSX.Element | null)[];
-//# sourceMappingURL=ConversationAnnotationMarkers.d.ts.map

package/lib/client/selection/ConversationAnnotationMarkers.js

@@ -238,4 +238,3 @@ export function ConversationAnnotationMarkers({ annotations, activeAnnotationInd
             }, onClick: activate, children: badge }, `${annotation.selection.parentSessionId}:${annotation.selection.fragments[0]?.nodeKey ?? ''}:${String(annotation.annotationIndex)}`));
     });
 }
-//# sourceMappingURL=ConversationAnnotationMarkers.js.map

package/lib/client/selection/SelectionActions.d.ts

@@ -30,4 +30,3 @@ export declare function calculateSelectionActionsPosition(rect: ConversationSele
     readonly top: number;
 };
 export declare function SelectionActions({ selection, touchInteraction, askDisabledReason, annotationNumber, annotationEditor, onAddToChat, onMoreDetails, onAskInSideChat, onAnnotationEditorChange, onRemoveAnnotation, onDismiss, }: SelectionActionsProps): import("react/jsx-runtime").JSX.Element;
-//# sourceMappingURL=SelectionActions.d.ts.map

package/lib/client/selection/SelectionActions.js

@@ -199,4 +199,3 @@ export function SelectionActions({ selection, touchInteraction = false, askDisab
                 onDismiss();
         }, children: [_jsx("button", { type: "button", onPointerDown: (event) => { activateOnTouch(event, openAnnotationEditor); }, onClick: (event) => { activateOnClick(event, openAnnotationEditor); }, children: "Add to chat" }), _jsx("button", { type: "button", disabled: askDisabledReason !== undefined, title: askDisabledReason, onPointerDown: (event) => { activateOnTouch(event, showMoreDetails); }, onClick: (event) => { activateOnClick(event, showMoreDetails); }, children: "More details" }), _jsx("button", { type: "button", disabled: askDisabledReason !== undefined, title: askDisabledReason, onPointerDown: (event) => { activateOnTouch(event, askInSideChat); }, onClick: (event) => { activateOnClick(event, askInSideChat); }, children: "Ask in side chat" })] }));
 }
-//# sourceMappingURL=SelectionActions.js.map

package/lib/client/selection/selection-controller.d.ts

@@ -34,4 +34,3 @@ export declare function restoreDomConversationSelection(input: {
     readonly selection: ConversationSelection;
     readonly conversationRoot: HTMLElement;
 }): RestoredConversationSelection | undefined;
-//# sourceMappingURL=selection-controller.d.ts.map

package/lib/client/selection/selection-controller.js

@@ -162,4 +162,3 @@ export function restoreDomConversationSelection(input) {
     browserRange.setEnd(last.endContainer, last.endOffset);
     return { ranges, browserRange };
 }
-//# sourceMappingURL=selection-controller.js.map

package/lib/client/selection/selection-limits.d.ts

@@ -4,4 +4,3 @@ export declare function utf8ByteLength(value: string): number;
 export declare function selectionFitsLimit(value: string): boolean;
 /** Code-point-safe preview that never cuts a surrogate pair. */
 export declare function summarizeSelection(value: string, maxCodePoints?: number): string;
-//# sourceMappingURL=selection-limits.d.ts.map

package/lib/client/selection/selection-limits.js

@@ -16,4 +16,3 @@ export function summarizeSelection(value, maxCodePoints = 240) {
     const tailLength = maxCodePoints - headLength;
     return `${points.slice(0, headLength).join('')}…${points.slice(-tailLength).join('')}`;
 }
-//# sourceMappingURL=selection-limits.js.map

package/lib/client/selection/selection-normalizer.d.ts

@@ -13,4 +13,3 @@ export interface ConversationSelectionInput {
 }
 export declare function finalizeConversationSelection(input: ConversationSelectionInput): ConversationSelection;
 export declare function assertSelectionCurrent(selection: ConversationSelection, currentSessionId: SessionId | undefined): void;
-//# sourceMappingURL=selection-normalizer.d.ts.map

package/lib/client/selection/selection-normalizer.js

@@ -45,4 +45,3 @@ export function assertSelectionCurrent(selection, currentSessionId) {
         throw new SelectionValidationError('selection_stale', 'The parent conversation changed after selection.');
     }
 }
-//# sourceMappingURL=selection-normalizer.js.map

package/lib/client/side-chat-controller.d.ts

@@ -54,4 +54,3 @@ export declare class SideChatController implements HostObservable<SideChatState>
     private reset;
     private publish;
 }
-//# sourceMappingURL=side-chat-controller.d.ts.map

package/lib/client/side-chat-controller.js

@@ -420,4 +420,3 @@ export class SideChatController {
         this.observable.publish(Object.freeze(state));
     }
 }
-//# sourceMappingURL=side-chat-controller.js.map