@ahggg/dsh-side-chat 0.7.3 → 1.0.0

package/lib/client/selection/ConversationAnnotationMarkers.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useRef, useState } from 'react';
 import { restoreDomConversationSelection } from './selection-controller.js';
+import { conversationChatRoot } from './conversation-dom.js';
 const ANNOTATION_HIGHLIGHT = 'dsh-side-chat-annotations';
 const ACTIVE_ANNOTATION_HIGHLIGHT = 'dsh-side-chat-active-annotation';
 function clamp(value, minimum, maximum) {
@@ -144,7 +145,8 @@ export function ConversationAnnotationMarkers({ annotations, activeAnnotationInd
         let resizeObserver;
         const refresh = () => {
             animationFrame = undefined;
-            const conversationRoot = document.querySelector('[data-chat-flow]');
+            const sessionId = annotations[0]?.selection.parentSessionId;
+            const conversationRoot = sessionId === undefined ? null : conversationChatRoot(sessionId) ?? null;
             if (conversationRoot !== observedConversationRoot) {
                 resizeObserver?.disconnect();
                 observedConversationRoot = conversationRoot;
@@ -157,6 +159,8 @@ export function ConversationAnnotationMarkers({ annotations, activeAnnotationInd
             const activeRanges = [];
             if (conversationRoot !== null) {
                 for (const annotation of annotations) {
+                    if (annotation.selection.parentSessionId !== sessionId)
+                        continue;
                     const restored = restoreDomConversationSelection({
                         selection: annotation.selection,
                         conversationRoot,

package/lib/client/selection/SelectionActions.js

@@ -148,7 +148,8 @@ export function SelectionActions({ selection, touchInteraction = false, askDisab
             closeEditor();
             return;
         }
-        if (event.key === 'Enter' && !event.shiftKey) {
+        if (event.key === 'Enter' && !event.shiftKey && !event.nativeEvent.isComposing
+            && event.keyCode !== 229) {
             event.preventDefault();
             saveAnnotation();
         }

package/lib/client/selection/conversation-dom.d.ts

@@ -0,0 +1,5 @@
+import type { SessionId } from '../../shared/contracts.js';
+/** Resolve the exact Session, never the first chat/composer in a multi-panel UI. */
+export declare function conversationElement(sessionId: SessionId): HTMLElement | undefined;
+export declare function conversationChatRoot(sessionId: SessionId): HTMLElement | undefined;
+export declare function focusConversationComposer(sessionId: SessionId): void;

package/lib/client/selection/conversation-dom.js

@@ -0,0 +1,24 @@
+/** Resolve the exact Session, never the first chat/composer in a multi-panel UI. */
+export function conversationElement(sessionId) {
+    return [...document.querySelectorAll('[data-conversation-session]')]
+        .find(element => element.dataset['conversationSession'] === sessionId
+        && element.closest('[data-side-chat-panel], [hidden], [aria-hidden="true"]') === null);
+}
+export function conversationChatRoot(sessionId) {
+    return conversationElement(sessionId)?.querySelector('[data-chat-flow]') ?? undefined;
+}
+export function focusConversationComposer(sessionId) {
+    // Workspace navigation schedules React rendering; focus after that commit,
+    // and never fall back to a different Session's composer.
+    window.requestAnimationFrame(() => {
+        const input = conversationElement(sessionId)?.querySelector([
+            '[data-composer-seat] textarea', '[data-composer-seat] [role="textbox"]',
+            '[data-composer-seat] [contenteditable="true"]',
+        ].join(', '));
+        if (input === undefined || input === null)
+            return;
+        input.focus();
+        if (input instanceof HTMLTextAreaElement)
+            input.setSelectionRange(input.value.length, input.value.length);
+    });
+}

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

@@ -20,7 +20,7 @@ export interface RestoredConversationSelection {
     readonly browserRange: Range;
 }
 /**
- * Locked-commit fallback capture. It intentionally fails closed unless every
+ * Capture against DSH's public Chat anchors. Fail closed unless every
  * selected text node belongs to one public Chat anchor.
  */
 export declare function captureDomConversationSelection(input: {

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

@@ -11,6 +11,10 @@ function excluded(node, root) {
         '[data-selection-exclude]',
         '[data-side-chat-panel]',
         '[aria-hidden="true"]',
+        '[hidden]',
+        '[inert]',
+        'script',
+        'style',
         'button',
         'textarea',
         'input',
@@ -23,7 +27,7 @@ function acceptedTextNodes(anchor, root) {
     let current = walker.nextNode();
     while (current !== null) {
         const text = current;
-        if (!excluded(text, root))
+        if (!excluded(text, root) && anchorOf(text) === anchor)
             nodes.push(text);
         current = walker.nextNode();
     }
@@ -50,7 +54,7 @@ function selectedSlice(range, node) {
     return { start, end, text: node.data.slice(start, end) };
 }
 /**
- * Locked-commit fallback capture. It intentionally fails closed unless every
+ * Capture against DSH's public Chat anchors. Fail closed unless every
  * selected text node belongs to one public Chat anchor.
  */
 export async function captureDomConversationSelection(input) {
@@ -65,7 +69,7 @@ export async function captureDomConversationSelection(input) {
     const startAnchor = anchorOf(range.startContainer);
     const endAnchor = anchorOf(range.endContainer);
     if (startAnchor === null || endAnchor === null || startAnchor !== endAnchor) {
-        throw new SelectionValidationError('selection_crosses_unsupported_nodes', 'This compatibility adapter supports a selection inside one message only.');
+        throw new SelectionValidationError('selection_crosses_unsupported_nodes', 'Select a passage inside one message.');
     }
     const descriptor = input.resolver.resolve(startAnchor);
     if (descriptor === undefined) {

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

@@ -27,7 +27,7 @@ export function finalizeConversationSelection(input) {
         throw new SelectionValidationError('selection_too_large', 'The selected text is too large.');
     }
     if (!fragment.modelVisible || !fragment.settled) {
-        throw new SelectionValidationError('fork_unavailable', 'Wait for this message to finish before branching.');
+        throw new SelectionValidationError('context_unavailable', 'Wait for this message to finish before opening Side Chat.');
     }
     if (!Number.isSafeInteger(fragment.seq) || fragment.seq < 0) {
         throw new SelectionValidationError('selection_stale', 'The selected message is no longer available.');

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

@@ -1,17 +1,20 @@
-import type { ConversationSelection, SessionId, SideChatModelSelection, SideChatPromptPart, SideChatRemote, SideChatState } from '../shared/contracts.js';
-import type { HostObservable } from '../shared/observable.js';
-import type { SideChatActionResult, SideChatClientSessions, SideChatQuestionAnswer } from './contracts.js';
-/** Small controller for the stock rc.6 archived-fork path. */
-export declare class SideChatController implements HostObservable<SideChatState> {
+import type { ConversationSelection, SessionId, SideChatModelSelection, SideChatRemote, SideChatState } from '../shared/contracts.js';
+import type { SideChatActionResult, SideChatClientSessions } from './contracts.js';
+/** Owns only plugin UI state and a cancellable model stream, never a child Session. */
+export declare class SideChatController {
     private readonly remote;
     private readonly sessions;
     private readonly observable;
-    private lease;
-    private childUnsubscribe;
-    private opening;
-    private closing;
-    private closeRequested;
+    private generation;
+    private modelGeneration;
+    private requestSequence;
     private disposed;
+    private releaseParent;
+    private creating;
+    private closing;
+    private running;
+    private cancelling;
+    private pendingRequest;
     constructor(remote: SideChatRemote, sessions: SideChatClientSessions);
     getSnapshot: () => SideChatState;
     subscribe: (listener: () => void) => (() => void);
@@ -19,38 +22,22 @@ export declare class SideChatController implements HostObservable<SideChatState>
         readonly parentSessionId?: SessionId;
         readonly selection?: ConversationSelection;
         readonly draft?: string;
-    }): SideChatActionResult<void>;
-    setDraft(draft: string): SideChatActionResult<void>;
-    clearSelection(): SideChatActionResult<void>;
-    initializeModel(selection: SideChatModelSelection): SideChatActionResult<SideChatModelSelection>;
-    selectModel(selection: SideChatModelSelection): Promise<SideChatActionResult<SideChatModelSelection>>;
-    sendFirst(question: string): Promise<SideChatActionResult<void>>;
-    send(text: string, mode?: 'queue' | 'steer'): Promise<SideChatActionResult<void>>;
-    sendParts(content: readonly SideChatPromptPart[], mode?: 'queue' | 'steer'): Promise<SideChatActionResult<void>>;
-    updateQueue(itemId: string, action: {
-        readonly kind: 'edit';
-        readonly content: readonly SideChatPromptPart[];
-    } | {
-        readonly kind: 'remove';
-    } | {
-        readonly kind: 'steer';
-    }): Promise<SideChatActionResult<void>>;
-    cancel(): Promise<SideChatActionResult<void>>;
-    respondApproval(interactionId: string, decision: 'approve' | 'decline'): Promise<SideChatActionResult<void>>;
-    respondQuestion(interactionId: string, answer: SideChatQuestionAnswer | null): Promise<SideChatActionResult<void>>;
-    close(): Promise<SideChatActionResult<void>>;
-    retry(): Promise<SideChatActionResult<unknown>>;
+    }): SideChatActionResult;
+    setDraft(draft: string): SideChatActionResult;
+    clearSelection(): SideChatActionResult;
+    initializeModel(model: SideChatModelSelection): SideChatActionResult<SideChatModelSelection>;
+    selectModel(model: SideChatModelSelection): Promise<SideChatActionResult<SideChatModelSelection>>;
+    sendFirst(question: string): Promise<SideChatActionResult>;
+    /** Resolves at admission; the independently consumed stream continues to update the transcript. */
+    send(question: string): Promise<SideChatActionResult>;
+    cancel(): Promise<SideChatActionResult>;
+    retry(): Promise<SideChatActionResult>;
+    close(): Promise<SideChatActionResult>;
     dispose(): Promise<void>;
-    private createOpenAndPrompt;
-    private publishCreated;
-    private closeChild;
-    private performClose;
-    private bindingTarget;
-    private attachLease;
-    private detachLease;
-    private updateFromChild;
+    private consume;
+    private streamFailure;
+    private closeCurrent;
     private fail;
+    private disposeStream;
     private invoke;
-    private reset;
-    private publish;
 }