@ahggg/dsh-side-chat 0.7.1 → 0.7.3

package/lib/client/parent-composer/composer-reference.d.ts

@@ -0,0 +1,81 @@
+import type { Context } from '@deepseek-ai/cordis';
+export declare const LEGACY_REFERENCE_PLACEHOLDER = "\uFFFC";
+export interface ParentComposerOccurrence {
+    readonly occurrenceId: number;
+    readonly source: string;
+    readonly ref: string;
+    readonly offset: number;
+    /** Occupied projection length (display text through 0.1.1, clipboard text in 0.1.2). */
+    readonly length?: number;
+    /** Insert-time display label, present in current DSH input snapshots. */
+    readonly label?: string;
+    /** Draft-persistence projection cached by current DSH input snapshots. */
+    readonly clipboardText?: string;
+    readonly appearance?: 'session' | 'file' | 'folder';
+}
+export interface ParentComposerInputSnapshot {
+    readonly draft: string;
+    readonly draftRev: number;
+    readonly occurrences: readonly ParentComposerOccurrence[];
+}
+export interface ParentComposerSpan {
+    readonly start: number;
+    readonly end: number;
+    readonly draftRev: number;
+}
+export interface ParentComposerInput {
+    readonly state: {
+        getSnapshot(): ParentComposerInputSnapshot;
+        subscribe?(listener: () => void): () => void;
+    };
+    /** DSH 0.1.2's Lexical editor projects each reference as one mutation coordinate. */
+    readonly referenceMode?: 'text' | 'lexical';
+    setDraft(text: string): void;
+    /** Atomic plain-text replacement supplied by Side Chat's scoped input-event adapter. */
+    replaceText?(text: string, span: ParentComposerSpan): boolean;
+    insertReference(reference: {
+        readonly source: string;
+        readonly ref: string;
+        readonly label: string;
+        readonly appearance?: 'session' | 'file' | 'folder';
+        readonly clipboardText: string;
+    }, span: ParentComposerSpan): boolean;
+}
+export interface ParentConversationService {
+    readonly input: {
+        for(scope: Context): ParentComposerInput;
+    };
+}
+export interface SelectionReferenceSource {
+    readonly trigger: '@';
+    readonly name: string;
+    readonly order: number;
+    candidates(): Promise<readonly never[]>;
+    onPick(): undefined;
+    readonly codec: {
+        clipboardText(ref: string): string;
+        serialize(ref: string, signal: AbortSignal): Promise<string>;
+    };
+}
+export interface OccurrenceRange {
+    readonly start: number;
+    readonly end: number;
+}
+export declare function referenceDisplayText(label: string): string;
+/**
+ * Resolve one occurrence's occupied draft range across both DSH reference
+ * representations: current full `@label` text with `length`, and the legacy
+ * one-code-unit U+FFFC placeholder without it.
+ */
+export declare function occurrenceRange(snapshot: ParentComposerInputSnapshot, occurrence: ParentComposerOccurrence, expectedLabel: string): OccurrenceRange | undefined;
+export declare function occurrenceMatchesDraft(snapshot: ParentComposerInputSnapshot, occurrence: ParentComposerOccurrence, expectedLabel: string): boolean;
+/** Convert one published occurrence range to the host input machine's mutation coordinates. */
+export declare function occurrenceEditSpan(input: ParentComposerInput, snapshot: ParentComposerInputSnapshot, occurrence: ParentComposerOccurrence, options?: {
+    readonly consumeFollowingSeparator?: boolean;
+}): ParentComposerSpan | undefined;
+/** Find the exact occurrence minted by one synchronous insertReference call. */
+export declare function newlyInsertedOccurrence(before: ParentComposerInputSnapshot, after: ParentComposerInputSnapshot, source: string, ref: string): ParentComposerOccurrence | undefined;
+/** Remove one occurrence's display range and, optionally, its separating ASCII gap. */
+export declare function draftWithoutOccurrence(snapshot: ParentComposerInputSnapshot, occurrence: ParentComposerOccurrence, expectedLabel: string, options?: {
+    readonly consumeAdjacentSpace?: boolean;
+}): string | undefined;

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

@@ -0,0 +1,89 @@
+export const LEGACY_REFERENCE_PLACEHOLDER = '\uFFFC';
+export function referenceDisplayText(label) {
+    return `@${label}`;
+}
+/**
+ * Resolve one occurrence's occupied draft range across both DSH reference
+ * representations: current full `@label` text with `length`, and the legacy
+ * one-code-unit U+FFFC placeholder without it.
+ */
+export function occurrenceRange(snapshot, occurrence, expectedLabel) {
+    const start = occurrence.offset;
+    if (!Number.isSafeInteger(start) || start < 0 || start > snapshot.draft.length)
+        return;
+    if (occurrence.length !== undefined
+        && Number.isSafeInteger(occurrence.length)
+        && occurrence.length > 0
+        && start + occurrence.length <= snapshot.draft.length) {
+        return { start, end: start + occurrence.length };
+    }
+    if (snapshot.draft.startsWith(LEGACY_REFERENCE_PLACEHOLDER, start)) {
+        return { start, end: start + LEGACY_REFERENCE_PLACEHOLDER.length };
+    }
+    const display = referenceDisplayText(expectedLabel);
+    if (snapshot.draft.startsWith(display, start))
+        return { start, end: start + display.length };
+    return;
+}
+export function occurrenceMatchesDraft(snapshot, occurrence, expectedLabel) {
+    const range = occurrenceRange(snapshot, occurrence, expectedLabel);
+    if (range === undefined)
+        return false;
+    const text = snapshot.draft.slice(range.start, range.end);
+    if (text === LEGACY_REFERENCE_PLACEHOLDER || text === referenceDisplayText(expectedLabel))
+        return true;
+    return occurrence.label === expectedLabel
+        && occurrence.clipboardText !== undefined
+        && text === occurrence.clipboardText;
+}
+/** Convert one published occurrence range to the host input machine's mutation coordinates. */
+export function occurrenceEditSpan(input, snapshot, occurrence, options = {}) {
+    const range = occurrenceRange(snapshot, occurrence, occurrence.label ?? '');
+    if (range === undefined)
+        return;
+    let start = range.start;
+    let end = range.end;
+    if (input.referenceMode === 'lexical') {
+        if (occurrence.length === undefined)
+            return;
+        start = occurrence.offset;
+        for (const candidate of [...snapshot.occurrences].sort((left, right) => left.offset - right.offset)) {
+            if (candidate.occurrenceId === occurrence.occurrenceId)
+                break;
+            if (candidate.offset > occurrence.offset || candidate.length === undefined)
+                return;
+            start -= candidate.length - 1;
+        }
+        end = start + 1;
+    }
+    if (options.consumeFollowingSeparator === true) {
+        const tail = snapshot.draft.slice(range.end);
+        if (tail.startsWith('\n\n'))
+            end += 2;
+        else if (tail.startsWith('\n') || tail.startsWith(' '))
+            end += 1;
+    }
+    return { start, end, draftRev: snapshot.draftRev };
+}
+/** Find the exact occurrence minted by one synchronous insertReference call. */
+export function newlyInsertedOccurrence(before, after, source, ref) {
+    const previousIds = new Set(before.occurrences.map(occurrence => occurrence.occurrenceId));
+    const inserted = after.occurrences.filter(occurrence => !previousIds.has(occurrence.occurrenceId)
+        && occurrence.source === source
+        && occurrence.ref === ref);
+    return inserted.length === 1 ? inserted[0] : undefined;
+}
+/** Remove one occurrence's display range and, optionally, its separating ASCII gap. */
+export function draftWithoutOccurrence(snapshot, occurrence, expectedLabel, options = {}) {
+    const range = occurrenceRange(snapshot, occurrence, expectedLabel);
+    if (range === undefined)
+        return;
+    let { start, end } = range;
+    if (options.consumeAdjacentSpace === true) {
+        if (snapshot.draft[end] === ' ')
+            end += 1;
+        else if (start > 0 && snapshot.draft[start - 1] === ' ')
+            start -= 1;
+    }
+    return snapshot.draft.slice(0, start) + snapshot.draft.slice(end);
+}

package/lib/client/parent-composer/referenced-conversation.d.ts

@@ -1,6 +1,6 @@
-import type { ConversationNode } from '@deepseek-ai/dsh-client-runtime/client';
+import type { ConversationNode } from '@deepseek-ai/dsh-client-ui-conversation/client';
 import type { SessionId } from '../../shared/contracts.js';
-import type { ParentComposerInput, SelectionReferenceSource } from './add-to-conversation.js';
+import type { ParentComposerInput, SelectionReferenceSource } from './composer-reference.js';
 export declare const SIDE_CHAT_CONVERSATION_REFERENCE_SOURCE = "dsh-side-chat-conversation";
 export interface ReferencedConversationMessage {
     readonly role: 'user' | 'assistant';
@@ -32,4 +32,3 @@ export declare function parseReferencedConversationPrompt(text: string): ParsedR
 export declare function addReferencedSideChatToConversation(input: ParentComposerInput, reference: ReferencedSideChatConversation): boolean;
 /** Reference codec used by the native composer chip and submit pipeline. */
 export declare const sideChatConversationReferenceSource: SelectionReferenceSource;
-//# sourceMappingURL=referenced-conversation.d.ts.map

package/lib/client/parent-composer/referenced-conversation.js

@@ -1,3 +1,4 @@
+import { draftWithoutOccurrence, newlyInsertedOccurrence, occurrenceEditSpan, } from './composer-reference.js';
 export const SIDE_CHAT_CONVERSATION_REFERENCE_SOURCE = 'dsh-side-chat-conversation';
 const OPEN_TAG = '<referenced_conversation>';
 const CLOSE_TAG = '</referenced_conversation>';
@@ -19,7 +20,7 @@ function visibleContentText(content) {
 }
 function assistantText(node) {
     return node.blocks
-        .flatMap(block => block.kind === 'text' ? [block.text] : [])
+        .flatMap((block) => block.kind === 'text' ? [block.text] : [])
         .join('\n')
         .trim();
 }
@@ -138,29 +139,29 @@ function matchingOccurrences(snapshot, reference) {
         }
     });
 }
-function occurrenceLength(occurrence) {
-    if (occurrence.length !== undefined && Number.isSafeInteger(occurrence.length) && occurrence.length > 0) {
-        return occurrence.length;
-    }
-    try {
-        return `@${decodeReferencedConversation(occurrence.ref).title}`.length;
-    }
-    catch {
-        return 1;
-    }
-}
 function removeOccurrence(input, occurrenceId) {
     const snapshot = input.state.getSnapshot();
     const occurrence = snapshot.occurrences.find(candidate => candidate.occurrenceId === occurrenceId);
     if (occurrence === undefined)
         return;
-    let start = occurrence.offset;
-    let end = occurrence.offset + occurrenceLength(occurrence);
-    if (snapshot.draft[end] === ' ')
-        end += 1;
-    else if (start > 0 && snapshot.draft[start - 1] === ' ')
-        start -= 1;
-    input.setDraft(snapshot.draft.slice(0, start) + snapshot.draft.slice(end));
+    let title;
+    try {
+        title = decodeReferencedConversation(occurrence.ref).title;
+    }
+    catch {
+        return;
+    }
+    if (input.referenceMode === 'lexical' && input.replaceText !== undefined) {
+        const span = occurrenceEditSpan(input, snapshot, occurrence, {
+            consumeFollowingSeparator: true,
+        });
+        if (span !== undefined)
+            input.replaceText('', span);
+        return;
+    }
+    const draft = draftWithoutOccurrence(snapshot, occurrence, title, { consumeAdjacentSpace: true });
+    if (draft !== undefined)
+        input.setDraft(draft);
 }
 /** Insert or refresh one Side Chat label without duplicating an older snapshot. */
 export function addReferencedSideChatToConversation(input, reference) {
@@ -171,19 +172,30 @@ export function addReferencedSideChatToConversation(input, reference) {
     const encoded = encodeReferencedConversation(reference);
     if (existing.some(occurrence => occurrence.ref === encoded))
         return true;
+    const target = input.referenceMode === 'lexical' ? existing[0] : undefined;
+    const span = target === undefined
+        ? { start: 0, end: 0, draftRev: before.draftRev }
+        : occurrenceEditSpan(input, before, target);
+    if (span === undefined)
+        return false;
     const inserted = input.insertReference({
         source: SIDE_CHAT_CONVERSATION_REFERENCE_SOURCE,
         ref: encoded,
         label: reference.title,
         appearance: 'session',
         clipboardText: `@${reference.title}`,
-    }, {
-        start: 0,
-        end: 0,
-        draftRev: before.draftRev,
-    });
+    }, span);
     if (!inserted)
         return false;
+    if (input.referenceMode === 'lexical') {
+        const after = input.state.getSnapshot();
+        const occurrence = newlyInsertedOccurrence(before, after, SIDE_CHAT_CONVERSATION_REFERENCE_SOURCE, encoded);
+        if (occurrence === undefined)
+            return false;
+        for (const duplicate of existing.slice(1))
+            removeOccurrence(input, duplicate.occurrenceId);
+        return matchingOccurrences(input.state.getSnapshot(), reference).length === 1;
+    }
     for (const occurrence of existing)
         removeOccurrence(input, occurrence.occurrenceId);
     return true;
@@ -204,4 +216,3 @@ export const sideChatConversationReferenceSource = {
         },
     },
 };
-//# sourceMappingURL=referenced-conversation.js.map

package/lib/client/rc6/ArchivedConversation.d.ts

@@ -1,10 +1,10 @@
 import { type ReactNode } from 'react';
-import type { SessionFace } from '@deepseek-ai/dsh-client-runtime/client';
 import type { ConversationSelection } from '../../shared/contracts.js';
 import type { SideChatController } from '../side-chat-controller.js';
+import type { SideChatConversationFace } from './runtime-compat.js';
 /** Functional rc.6 conversation surface bound to a non-current child Session. */
 export declare function ArchivedConversation({ face, inheritedThroughSeq, controller, selection, locale, cwd, modelControl, }: {
-    readonly face: SessionFace;
+    readonly face: SideChatConversationFace;
     readonly inheritedThroughSeq: number;
     readonly controller: SideChatController;
     readonly selection?: ConversationSelection;
@@ -12,4 +12,3 @@ export declare function ArchivedConversation({ face, inheritedThroughSeq, contro
     readonly cwd?: string | undefined;
     readonly modelControl?: ReactNode;
 }): import("react/jsx-runtime").JSX.Element;
-//# sourceMappingURL=ArchivedConversation.d.ts.map

package/lib/client/rc6/ArchivedConversation.js

@@ -7,6 +7,7 @@ import { SendIcon } from '../panel/SendIcon.js';
 import { StopIcon } from '../panel/StopIcon.js';
 import { useAutoGrowingTextarea } from '../panel/use-auto-growing-textarea.js';
 import { RunningToolCard, ToolBlockCard, ToolCard, } from './SideChatTool.js';
+import { MARKDOWN_LABELS } from './primitive-labels.js';
 function stringify(value) {
     if (typeof value === 'string')
         return value;
@@ -87,8 +88,9 @@ function ReasoningRow({ text, running, locale }) {
 function AssistantBlocks({ blocks, streaming = false, projectedToolCallIds, unprojectedToolState = 'pending', cwd, locale }) {
     return _jsx(_Fragment, { children: blocks.map((block, index) => {
             const key = `${block.kind}-${String(index)}`;
-            if (block.kind === 'text')
-                return _jsx(MarkdownText, { text: block.text, streaming: streaming }, key);
+            if (block.kind === 'text') {
+                return _jsx(MarkdownText, { text: block.text, streaming: streaming, labels: MARKDOWN_LABELS }, key);
+            }
             if (block.kind === 'reasoning') {
                 return (_jsx(ReasoningRow, { text: block.text, running: streaming && index === blocks.length - 1, locale: locale }, key));
             }
@@ -133,10 +135,10 @@ function MessageRow({ node, projectedToolCallIds, cwd, locale }) {
     return _jsxs("details", { className: "dsh-side-chat-turn-notice", children: [_jsx("summary", { children: node.type }), _jsx("pre", { children: stringify(node.data) })] });
 }
 function ApprovalCard({ wait, onRespond, }) {
-    return (_jsxs("section", { className: "dsh-side-chat-interaction", "aria-label": "Tool approval required", children: [_jsxs("strong", { children: ["Allow tool: ", wait.payload.toolName, "?"] }), wait.payload.reason !== undefined && _jsx("p", { children: wait.payload.reason }), _jsxs("div", { className: "dsh-side-chat-interaction-actions", children: [_jsx("button", { type: "button", onClick: () => { onRespond('decline'); }, children: "Decline" }), _jsx("button", { type: "button", onClick: () => { onRespond('approve'); }, children: "Allow once" })] })] }));
+    return (_jsxs("section", { className: "dsh-side-chat-interaction", "aria-label": "Tool approval required", children: [_jsxs("strong", { children: ["Allow tool: ", wait.toolName, "?"] }), wait.reason !== undefined && _jsx("p", { children: wait.reason }), _jsxs("div", { className: "dsh-side-chat-interaction-actions", children: [_jsx("button", { type: "button", onClick: () => { onRespond('decline'); }, children: "Decline" }), _jsx("button", { type: "button", onClick: () => { onRespond('approve'); }, children: "Allow once" })] })] }));
 }
 function QuestionCard({ wait, onRespond, }) {
-    const questions = wait.payload.questions;
+    const questions = wait.questions;
     const [answers, setAnswers] = useState(() => Object.fromEntries(questions.map(question => [question.id, { selected: [], custom: '' }])));
     const update = (id, answer) => {
         setAnswers(current => ({ ...current, [id]: answer }));
@@ -227,4 +229,3 @@ export function ArchivedConversation({ face, inheritedThroughSeq, controller, se
                             }
                         } }), _jsxs("div", { className: "dsh-side-chat-composer-actions", children: [modelControl, snapshot.running ? (_jsx("button", { type: "button", className: "dsh-side-chat-stop-button", "aria-label": "Stop generating", title: "Stop generating", onClick: () => { void controller.cancel(); }, children: _jsx(StopIcon, {}) })) : (_jsx("button", { type: "submit", className: "dsh-side-chat-send-button", "aria-label": "Send", disabled: sending || draft.trim().length === 0, children: _jsx(SendIcon, {}) }))] })] })] }));
 }
-//# sourceMappingURL=ArchivedConversation.js.map

package/lib/client/rc6/Rc6SideChatOverlay.d.ts

@@ -5,4 +5,3 @@ export declare function Rc6SideChatOverlay({ controller, sessions, }: {
     readonly controller: SideChatController;
     readonly sessions: Rc6SideChatSessions;
 }): import("react/jsx-runtime").JSX.Element;
-//# sourceMappingURL=Rc6SideChatOverlay.d.ts.map

package/lib/client/rc6/Rc6SideChatOverlay.js

@@ -359,7 +359,18 @@ export function Rc6SideChatOverlay({ controller, sessions, }) {
                     }
                     annotationEditing.current = false;
                     setEditingAnnotation(null);
-                }, onAnnotationEditorChange: (open) => { annotationEditing.current = open; }, onMoreDetails: () => { }, onAskInSideChat: () => { }, onDismiss: () => {
+                }, onAnnotationEditorChange: (open) => { annotationEditing.current = open; }, onRemoveAnnotation: () => {
+                    try {
+                        if (!sessions.removeConversationAnnotation(editingAnnotation.annotationIndex)) {
+                            sessions.notify({ kind: 'warning', text: 'Could not remove the annotation.' });
+                        }
+                    }
+                    catch {
+                        sessions.notify({ kind: 'warning', text: 'Could not remove the annotation.' });
+                    }
+                    annotationEditing.current = false;
+                    setEditingAnnotation(null);
+                }, 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
@@ -371,4 +382,3 @@ export function Rc6SideChatOverlay({ controller, sessions, }) {
                         void sessions.openSession(state.parentSessionId);
                 }, onAddToConversation: addToConversation, addToConversationDisabled: addToConversationDisabled, onRemoveSelection: () => { controller.clearSelection(); } }))] }));
 }
-//# sourceMappingURL=Rc6SideChatOverlay.js.map

package/lib/client/rc6/SideChatTool.d.ts

@@ -1,5 +1,5 @@
-import type { RunningToolCall, ToolCallBlock } from '@deepseek-ai/dsh-client-runtime/client';
 import type { ContentBlock } from '@deepseek-ai/dsh-api-remotes/client';
+import type { RunningToolCall, ToolCallBlock } from './runtime-compat.js';
 export type ToolState = 'pending' | 'running' | 'success' | 'error' | 'interrupted';
 export declare function toolOutputText(content: readonly ContentBlock[]): string;
 export declare function ToolCard({ callId, name, argsRaw, state, output, callView, resultView, cwd, }: {
@@ -20,4 +20,3 @@ export declare function RunningToolCard({ call, cwd }: {
     readonly call: RunningToolCall;
     readonly cwd?: string | undefined;
 }): import("react/jsx-runtime").JSX.Element;
-//# sourceMappingURL=SideChatTool.d.ts.map

package/lib/client/rc6/SideChatTool.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState } from 'react';
 import { CodeBlock, DiffBlock, DisclosureRow, IconApiOutline14, IconBrowseOutline16, IconCodeOutline16, IconEditOutline16, IconSearchOutline16, IconSparkle16, ReadBlock, SearchBlock, StateDot, TerminalBlock, WebBlock, } from '@deepseek-ai/dsh-client-ui-primitives';
+import { DIFF_LABELS, READ_LABELS, SEARCH_LABELS, TERMINAL_LABELS, WEB_LABELS, } from './primitive-labels.js';
 const TOOL_VARIANTS = {
     bash: 'bash',
     pwsh: 'bash',
@@ -238,7 +239,7 @@ function validSearchCard(resultView) {
     if (result['shape'] === 'paths') {
         const paths = result['paths'];
         return Array.isArray(paths) && paths.every((path) => typeof path === 'string')
-            ? { kind: 'paths', paths, truncated, total }
+            ? { kind: 'paths', paths, truncated, total, labels: SEARCH_LABELS }
             : null;
     }
     if (result['shape'] !== 'matches' || !Array.isArray(result['files']))
@@ -261,7 +262,7 @@ function validSearchCard(resultView) {
         }
         files.push({ path, matches });
     }
-    return { kind: 'matches', files, truncated, total };
+    return { kind: 'matches', files, truncated, total, labels: SEARCH_LABELS };
 }
 function validDiffs(view) {
     const value = record(view);
@@ -289,7 +290,9 @@ function validWebCard(view) {
     if (result['kind'] === 'fetch') {
         const url = stringValue(result['url']);
         const statusCode = numberValue(result['statusCode']);
-        return url === undefined || statusCode === undefined ? null : { kind: 'fetch', url, statusCode, truncated };
+        return url === undefined || statusCode === undefined
+            ? null
+            : { kind: 'fetch', url, statusCode, truncated, labels: WEB_LABELS };
     }
     if (result['kind'] !== 'search' || !Array.isArray(result['sources']))
         return null;
@@ -310,7 +313,13 @@ function validWebCard(view) {
         });
     }
     const answer = stringValue(result['answer']);
-    return { kind: 'search', sources, truncated, ...(answer === undefined ? {} : { answer }) };
+    return {
+        kind: 'search',
+        sources,
+        truncated,
+        labels: WEB_LABELS,
+        ...(answer === undefined ? {} : { answer }),
+    };
 }
 function genericBody(variant, argsRaw) {
     if (argsRaw === '' || argsRaw === '{}')
@@ -362,13 +371,13 @@ export function ToolCard({ callId, name, argsRaw, state, output, callView, resul
     return (_jsxs("section", { className: "dsh-side-chat-tool", "data-call-id": callId, "data-state": visualState, "data-expanded": open || undefined, children: [status !== null && _jsx("span", { className: "dsh-side-chat-tool-visually-hidden", children: status }), _jsx(DisclosureRow, { rowClassName: "dsh-side-chat-tool-row", leadingClassName: "dsh-side-chat-tool-leading", titleClassName: "dsh-side-chat-tool-title", chevronClassName: "dsh-side-chat-tool-chevron", icon: leadingFor(visualState, variantIcon(variant)), title: toolTitle(name, variant), open: open, expandable: expandable, expandOnRowClick: true, keepContentWhenOpen: true, onToggle: () => { setExpanded(current => !current); }, collapsedContent: summaryText !== '' && (_jsxs(_Fragment, { children: [_jsx("span", { className: "dsh-side-chat-tool-separator", "aria-hidden": "true" }), _jsx("span", { className: failureLine === null
                                 ? 'dsh-side-chat-tool-summary'
                                 : 'dsh-side-chat-tool-summary dsh-side-chat-tool-error-summary', children: summaryText })] })), children: _jsx("div", { className: "dsh-side-chat-tool-body-wrap", children: terminal !== null
-                        ? (_jsx(TerminalBlock, { command: terminal.command, cwd: terminal.cwd, output: terminal.output, exitCode: terminal.exitCode, signal: terminal.signal, running: terminal.running, maxLines: Infinity, className: "dsh-side-chat-tool-terminal" }))
+                        ? (_jsx(TerminalBlock, { command: terminal.command, cwd: terminal.cwd, output: terminal.output, exitCode: terminal.exitCode, signal: terminal.signal, running: terminal.running, maxLines: Infinity, className: "dsh-side-chat-tool-terminal", labels: TERMINAL_LABELS }))
                         : read !== null
-                            ? _jsx(ReadBlock, { ...read, maxLines: 8, className: "dsh-side-chat-tool-read" })
+                            ? _jsx(ReadBlock, { ...read, labels: READ_LABELS, maxLines: 8, className: "dsh-side-chat-tool-read" })
                             : search !== null
                                 ? _jsx(SearchBlock, { ...search, maxLines: 8, className: "dsh-side-chat-tool-search" })
                                 : diffs !== null
-                                    ? _jsx(DiffBlock, { diffs: diffs, maxLines: 8, className: "dsh-side-chat-tool-diff" })
+                                    ? _jsx(DiffBlock, { diffs: diffs, labels: DIFF_LABELS, maxLines: 8, className: "dsh-side-chat-tool-diff" })
                                     : web !== null
                                         ? _jsx(WebBlock, { ...web, className: "dsh-side-chat-tool-web" })
                                         : code !== undefined
@@ -382,14 +391,14 @@ function resultState(node, output) {
     return /\b(?:aborted|cancelled|canceled)\b/iu.test(identity) ? 'interrupted' : 'error';
 }
 export function ToolBlockCard({ block, cwd }) {
+    const presentation = block;
     const settled = 'kind' in block;
     const output = settled ? toolOutputText(block.content) : undefined;
     const state = settled ? resultState(block, output ?? '') : 'running';
     const name = settled ? block.call?.name ?? block.callId : block.name;
     const argsRaw = settled ? block.call?.argsRaw ?? '{}' : block.argsRaw;
-    return (_jsxs("div", { className: "dsh-side-chat-tool-branch", children: [_jsx(ToolCard, { callId: block.callId, name: name, argsRaw: argsRaw, state: state, output: output, callView: block.callView, resultView: settled ? block.resultView : null, cwd: cwd }), block.subCalls.length > 0 && (_jsx("div", { className: "dsh-side-chat-tool-subcalls", "data-subcalls": true, children: block.subCalls.map(child => _jsx(ToolBlockCard, { block: child, cwd: cwd }, child.callId)) }))] }));
+    return (_jsxs("div", { className: "dsh-side-chat-tool-branch", children: [_jsx(ToolCard, { callId: block.callId, name: name, argsRaw: argsRaw, state: state, output: output, callView: presentation.callView, resultView: settled ? presentation.resultView : null, cwd: cwd }), block.subCalls.length > 0 && (_jsx("div", { className: "dsh-side-chat-tool-subcalls", "data-subcalls": true, children: block.subCalls.map(child => _jsx(ToolBlockCard, { block: child, cwd: cwd }, child.callId)) }))] }));
 }
 export function RunningToolCard({ call, cwd }) {
     return _jsx(ToolBlockCard, { block: call, cwd: cwd });
 }
-//# sourceMappingURL=SideChatTool.js.map

package/lib/client/rc6/context.d.ts

@@ -1,10 +1,13 @@
 import type { Context } from '@deepseek-ai/cordis';
 import type { ClientRemote } from '@deepseek-ai/dsh-api-remotes/client';
-import type { ISessions, SlotRegistry } from '@deepseek-ai/dsh-client-runtime/client';
+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 { 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'> & {
+export type Rc6ClientContext = Omit<Context, 'conversation' | 'inputTriggers' | 'modelDirectories' | 'remote' | 'sessions' | 'slots' | 'uiConversation' | 'uiSession'> & {
     readonly conversation: ParentConversationService;
     readonly inputTriggers: {
         registerSource(source: SelectionReferenceSource): () => void;
@@ -13,5 +16,8 @@ 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'>;
 };
-//# sourceMappingURL=context.d.ts.map

package/lib/client/rc6/context.js

@@ -1,2 +1 @@
 export {};
-//# sourceMappingURL=context.js.map

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

@@ -0,0 +1,7 @@
+import type { DiffBlockLabels, MarkdownLabels, ReadBlockLabels, SearchBlockLabels, TerminalBlockLabels, WebBlockLabels } from '@deepseek-ai/dsh-client-ui-primitives';
+export declare const MARKDOWN_LABELS: MarkdownLabels;
+export declare const TERMINAL_LABELS: TerminalBlockLabels;
+export declare const READ_LABELS: ReadBlockLabels;
+export declare const DIFF_LABELS: DiffBlockLabels;
+export declare const SEARCH_LABELS: SearchBlockLabels;
+export declare const WEB_LABELS: WebBlockLabels;

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

@@ -0,0 +1,60 @@
+const hiddenLines = (hidden) => `Show ${String(hidden)} hidden line${hidden === 1 ? '' : 's'}`;
+export const MARKDOWN_LABELS = {
+    code: { copyLabel: 'Copy', copiedLabel: 'Copied' },
+    footnotes: 'Footnotes',
+};
+export const TERMINAL_LABELS = {
+    signal: signal => `Signal ${signal}`,
+    exitCode: code => `Exit ${String(code)}`,
+    running: 'Running',
+    failed: 'Failed',
+    done: 'Done',
+    copy: 'Copy',
+    copied: 'Copied',
+    noOutput: 'No output',
+    collapseAria: 'Collapse command output',
+    collapse: 'Collapse',
+    expandAria: hiddenLines,
+    expand: hiddenLines,
+};
+export const READ_LABELS = {
+    window: (shown, total) => `Showing ${String(shown)} of ${String(total)} lines`,
+    copy: 'Copy',
+    copied: 'Copied',
+    collapseAria: 'Collapse file content',
+    expandAria: hiddenLines,
+    collapse: 'Collapse',
+    expand: hiddenLines,
+};
+export const DIFF_LABELS = {
+    copy: 'Copy',
+    copied: 'Copied',
+    collapseAria: 'Collapse diff',
+    expandAria: hiddenLines,
+    collapse: 'Collapse',
+    expand: hiddenLines,
+    files: count => `${String(count)} file${count === 1 ? '' : 's'}`,
+};
+export const SEARCH_LABELS = {
+    pathsSummary: (shown, total, truncated) => truncated
+        ? `Showing ${String(shown)} of ${String(total)} paths`
+        : `${String(total)} path${total === 1 ? '' : 's'}`,
+    matchesSummary: (shown, total, files, truncated) => {
+        const summary = `${String(shown)} match${shown === 1 ? '' : 'es'} in ${String(files)} file${files === 1 ? '' : 's'}`;
+        return truncated ? `${summary} (${String(total)} total)` : summary;
+    },
+    copy: 'Copy',
+    copied: 'Copied',
+    noResults: 'No results',
+    collapseAria: 'Collapse search results',
+    expandAria: hiddenLines,
+    collapse: 'Collapse',
+    expand: hiddenLines,
+};
+export const WEB_LABELS = {
+    noResults: 'No results',
+    sourcesTruncated: 'Sources truncated',
+    http: 'HTTP',
+    contentTruncated: 'Content truncated',
+    markdown: MARKDOWN_LABELS,
+};

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

@@ -4,4 +4,3 @@ export declare function mountArchivedRemote(ctx: Rc6ClientContext): Promise<{
     readonly remote: SideChatRemote;
     readonly dispose: () => Promise<void>;
 }>;
-//# sourceMappingURL=remote-adapter.d.ts.map

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

@@ -1,9 +1,11 @@
 import TYPERT_REMOTE from '../../remote.js';
 function remoteFailure(error) {
+    const code = error.code;
+    const badRequest = code === 'bad-request' || code === 'gateway/bad-request';
     return {
-        code: error.code === 'bad-request' ? 'invalid_request' : 'transport_error',
+        code: badRequest ? 'invalid_request' : 'transport_error',
         message: error.message || 'The Side Chat RPC failed.',
-        recoverable: error.code !== 'bad-request',
+        recoverable: !badRequest,
     };
 }
 export async function mountArchivedRemote(ctx) {
@@ -30,4 +32,3 @@ export async function mountArchivedRemote(ctx) {
         dispose,
     };
 }
-//# sourceMappingURL=remote-adapter.js.map