@ahggg/dsh-side-chat 0.7.2 → 1.0.0

package/lib/client/parent-composer/add-to-conversation.js

@@ -1,38 +1,19 @@
-import { draftWithoutOccurrence, LEGACY_REFERENCE_PLACEHOLDER, newlyInsertedOccurrence, occurrenceMatchesDraft, occurrenceRange, referenceDisplayText, } from './composer-reference.js';
-const SELECTION_REFERENCE_SOURCE = 'dsh-side-chat-selection';
+import { newlyInsertedOccurrence, occurrenceEditSpan, occurrenceMatchesDraft } from './composer-reference.js';
+export const SELECTION_REFERENCE_SOURCE = 'dsh-side-chat-selection';
 export const SELECTION_REFERENCE_LABEL = '__dsh_side_chat_annotations__';
 function escapeXmlText(value) {
-    return value
-        .replaceAll('&', '&')
-        .replaceAll('<', '&lt;')
-        .replaceAll('>', '&gt;');
+    return value.replaceAll('&', '&amp;').replaceAll('<', '&lt;').replaceAll('>', '&gt;');
 }
-function annotationFromSelection(selection, comment) {
-    const trimmedComment = comment?.trim();
-    return {
-        text: selection.text,
-        selection,
-        ...(trimmedComment === undefined || trimmedComment.length === 0
-            ? {}
-            : { comment: trimmedComment }),
-    };
-}
-function encodeSelectionReference(annotations) {
-    return JSON.stringify({
-        version: 2,
-        annotations,
-    });
+export function unescapeXmlText(value) {
+    return value.replaceAll('&lt;', '<').replaceAll('&gt;', '>').replaceAll('&amp;', '&');
 }
 function isSelection(value) {
     if (typeof value !== 'object' || value === null)
         return false;
     const selection = value;
-    if (typeof selection.parentSessionId !== 'string'
-        || typeof selection.text !== 'string'
-        || !Number.isSafeInteger(selection.atSeq)
-        || !Array.isArray(selection.fragments)
-        || typeof selection.rect !== 'object'
-        || selection.rect === null)
+    if (typeof selection.parentSessionId !== 'string' || typeof selection.text !== 'string'
+        || !Number.isSafeInteger(selection.atSeq) || !Array.isArray(selection.fragments)
+        || typeof selection.rect !== 'object' || selection.rect === null)
         return false;
     const rect = selection.rect;
     if (![rect.x, rect.y, rect.width, rect.height, rect.viewportWidth, rect.viewportHeight]
@@ -42,79 +23,38 @@ function isSelection(value) {
         if (typeof candidate !== 'object' || candidate === null)
             return false;
         const fragment = candidate;
-        return typeof fragment.nodeKey === 'string'
-            && typeof fragment.nodeKind === 'string'
-            && typeof fragment.turnKey === 'string'
-            && Number.isSafeInteger(fragment.seq)
-            && Number.isSafeInteger(fragment.startOffset)
-            && Number.isSafeInteger(fragment.endOffset)
+        return typeof fragment.nodeKey === 'string' && typeof fragment.nodeKind === 'string'
+            && typeof fragment.turnKey === 'string' && Number.isSafeInteger(fragment.seq)
+            && Number.isSafeInteger(fragment.startOffset) && Number.isSafeInteger(fragment.endOffset)
             && typeof fragment.text === 'string'
             && ['user', 'assistant', 'context', 'code'].includes(fragment.source ?? '')
-            && typeof fragment.modelVisible === 'boolean'
-            && typeof fragment.settled === 'boolean';
+            && typeof fragment.modelVisible === 'boolean' && typeof fragment.settled === 'boolean';
     });
 }
-function isStoredAnnotation(value) {
-    if (typeof value !== 'object' || value === null)
-        return false;
-    const annotation = value;
-    return typeof annotation.text === 'string'
-        && (annotation.comment === undefined || typeof annotation.comment === 'string')
-        && (annotation.selection === undefined || isSelection(annotation.selection));
-}
-function visibleAnnotation(annotation) {
-    return {
-        text: annotation.text,
-        ...(annotation.comment === undefined ? {} : { comment: annotation.comment }),
-    };
-}
 function decodeStoredSelectionReference(ref) {
-    const value = JSON.parse(ref);
-    // Accept the one-selection payload written by the first Add-to-chat build.
-    if (isStoredAnnotation(value))
-        return [value];
-    if (typeof value !== 'object' || value === null) {
-        throw new Error('The selected conversation annotation is no longer valid.');
-    }
-    const payload = value;
-    if ((payload.version !== 1 && payload.version !== 2)
-        || !Array.isArray(payload.annotations)
-        || payload.annotations.length === 0
-        || !payload.annotations.every(isStoredAnnotation)) {
+    const payload = JSON.parse(ref);
+    if (payload === null || payload.version !== 2 || !Array.isArray(payload.annotations)
+        || payload.annotations.length === 0 || !payload.annotations.every((value) => {
+        if (typeof value !== 'object' || value === null)
+            return false;
+        const annotation = value;
+        return typeof annotation.text === 'string' && isSelection(annotation.selection)
+            && (annotation.comment === undefined || typeof annotation.comment === 'string');
+    }))
         throw new Error('The selected conversation annotation is no longer valid.');
-    }
     return payload.annotations;
 }
+function visibleAnnotation(annotation) {
+    return { text: annotation.text, ...(annotation.comment === undefined ? {} : { comment: annotation.comment }) };
+}
 export function decodeSelectionReference(ref) {
     return decodeStoredSelectionReference(ref).map(visibleAnnotation);
 }
-function selectedContext(annotations) {
-    return [
-        '<selected_context>',
-        ...annotations.flatMap((annotation, index) => annotation.comment === undefined
-            ? [
-                `<annotation index="${String(index + 1)}">`,
-                escapeXmlText(annotation.text),
-                '</annotation>',
-            ]
-            : [
-                `<annotation index="${String(index + 1)}">`,
-                '<selected_text>',
-                escapeXmlText(annotation.text),
-                '</selected_text>',
-                '<user_comment>',
-                escapeXmlText(annotation.comment),
-                '</user_comment>',
-                '</annotation>',
-            ]),
-        '</selected_context>',
-    ].join('\n');
-}
 function selectionOccurrences(snapshot) {
     return snapshot.occurrences.filter(occurrence => occurrence.source === SELECTION_REFERENCE_SOURCE);
 }
-function storedConversationAnnotations(snapshot) {
-    return selectionOccurrences(snapshot).flatMap((occurrence) => {
+function storedAnnotations(snapshot) {
+    return selectionOccurrences(snapshot).flatMap(occurrence => {
         try {
             return [...decodeStoredSelectionReference(occurrence.ref)];
         }
@@ -123,406 +63,143 @@ function storedConversationAnnotations(snapshot) {
         }
     });
 }
-/** Read all plugin annotations represented by the current DSH input occurrence. */
 export function conversationAnnotations(snapshot) {
-    return storedConversationAnnotations(snapshot).map(visibleAnnotation);
+    return storedAnnotations(snapshot).map(visibleAnnotation);
 }
-/** Read annotations that retain an exact source-selection anchor. */
 export function conversationSelectionAnnotations(snapshot) {
-    const anchored = [];
-    storedConversationAnnotations(snapshot).forEach((annotation, annotationIndex) => {
-        if (annotation.selection === undefined)
-            return;
-        anchored.push({
-            ...visibleAnnotation(annotation),
-            annotationIndex,
-            selection: annotation.selection,
-        });
-    });
-    return anchored;
+    return storedAnnotations(snapshot).map((annotation, annotationIndex) => ({ ...annotation, annotationIndex }));
 }
-function draftWithoutSelectionOccurrences(snapshot) {
-    const occurrences = [...selectionOccurrences(snapshot)].sort((a, b) => b.offset - a.offset);
-    let current = snapshot;
-    for (const occurrence of occurrences) {
-        const draft = draftWithoutOccurrence(current, occurrence, SELECTION_REFERENCE_LABEL);
-        if (draft === undefined)
-            continue;
-        current = { ...current, draft };
-    }
-    let draft = current.draft;
-    // Add to chat owns the separator immediately after its leading occurrence.
-    if (occurrences.some(occurrence => occurrence.offset === 0)) {
-        if (draft.startsWith('\n\n'))
-            draft = draft.slice(2);
-        else if (draft.startsWith('\n') || draft.startsWith(' '))
-            draft = draft.slice(1);
-    }
-    return draft;
-}
-/** Remove every unsent plugin annotation while preserving the user's draft. */
-export function removeConversationAnnotations(input) {
-    const snapshot = input.state.getSnapshot();
-    if (selectionOccurrences(snapshot).length === 0)
+/** A single atomic chip replacement preserves other references and the user's draft. */
+function writeAnnotations(input, before, annotations) {
+    const existing = selectionOccurrences(before);
+    if (existing.length > 1)
         return false;
-    input.setDraft(draftWithoutSelectionOccurrences(snapshot));
-    return true;
-}
-/** Reference codec used by DSH's native composer chip and submit pipeline. */
-export const selectionReferenceSource = {
-    trigger: '@',
-    name: SELECTION_REFERENCE_SOURCE,
-    order: 1_000,
-    candidates: async () => [],
-    onPick: () => undefined,
-    codec: {
-        clipboardText: ref => decodeSelectionReference(ref).map(annotation => annotation.text).join('\n\n'),
-        serialize: async (ref, signal) => {
-            if (signal.aborted)
-                throw signal.reason;
-            return selectedContext(decodeSelectionReference(ref));
-        },
-    },
-};
-function writeConversationAnnotations(input, before, annotations) {
-    const draft = draftWithoutSelectionOccurrences(before);
-    const insertionState = input.state.getSnapshot();
-    if (insertionState.draftRev !== before.draftRev || insertionState.draft !== before.draft)
+    const previous = existing[0];
+    const span = previous === undefined ? { start: 0, end: 0, draftRev: before.draftRev }
+        : occurrenceEditSpan(input, before, previous);
+    if (span === undefined)
         return false;
-    const ref = encodeSelectionReference(annotations);
+    const ref = JSON.stringify({ version: 2, annotations });
     const inserted = input.insertReference({
-        source: SELECTION_REFERENCE_SOURCE,
-        ref,
-        label: SELECTION_REFERENCE_LABEL,
+        source: SELECTION_REFERENCE_SOURCE, ref, label: SELECTION_REFERENCE_LABEL,
         clipboardText: annotations.map(annotation => annotation.text).join('\n\n'),
-    }, {
-        start: 0,
-        end: 0,
-        draftRev: insertionState.draftRev,
-    });
-    // Existing annotations are intentionally still live here. If DSH rejects the
-    // insertion, the operation is a no-op instead of deleting the previous chip.
+    }, span);
     if (!inserted)
         return false;
-    const afterInsert = input.state.getSnapshot();
-    const occurrence = newlyInsertedOccurrence(insertionState, afterInsert, SELECTION_REFERENCE_SOURCE, ref);
-    const rollbackInsertion = () => {
-        const current = input.state.getSnapshot();
-        const insertedOccurrence = occurrence === undefined
-            ? undefined
-            : current.occurrences.find(candidate => candidate.occurrenceId === occurrence.occurrenceId);
-        if (insertedOccurrence === undefined || insertedOccurrence.offset !== 0)
-            return;
-        const insertedRange = occurrenceRange(current, insertedOccurrence, SELECTION_REFERENCE_LABEL);
-        if (insertedRange === undefined || insertedRange.start !== 0)
-            return;
-        let tail = current.draft.slice(insertedRange.end);
-        if (tail.startsWith(' ') && tail.slice(1) === before.draft)
-            tail = before.draft;
-        else if (tail !== before.draft)
-            return;
-        input.setDraft(tail);
-    };
-    if (occurrence === undefined || occurrence.offset !== 0) {
-        rollbackInsertion();
-        return false;
-    }
-    const range = occurrenceRange(afterInsert, occurrence, SELECTION_REFERENCE_LABEL);
-    if (range === undefined || range.start !== 0) {
-        rollbackInsertion();
-        return false;
-    }
-    // Current DSH inserts the complete `@label` display text followed by an
-    // optional ASCII separating gap. Older releases insert a one-unit U+FFFC
-    // placeholder. At this point the old occurrence is still in the tail; one
-    // tail replacement preserves the new occurrence and removes the old one.
-    let rest = afterInsert.draft.slice(range.end);
-    if (rest.startsWith(' ') && rest.slice(1) === before.draft)
-        rest = before.draft;
-    else if (rest !== before.draft) {
-        rollbackInsertion();
-        return false;
-    }
-    const display = afterInsert.draft.slice(range.start, range.end);
-    const normalizedDraft = `${display}\n\n${draft}`;
-    // insertReference and setDraft are separate public transactions. Re-read the
-    // exact occurrence before the second write so a synchronous subscriber cannot
-    // make us normalize a stale insertion.
-    const current = input.state.getSnapshot();
-    const currentOccurrence = current.occurrences.find(candidate => candidate.occurrenceId === occurrence.occurrenceId);
-    if (current.draftRev !== afterInsert.draftRev
-        || current.draft !== afterInsert.draft
-        || currentOccurrence === undefined
-        || currentOccurrence.source !== SELECTION_REFERENCE_SOURCE
-        || currentOccurrence.ref !== ref
-        || !occurrenceMatchesDraft(current, currentOccurrence, SELECTION_REFERENCE_LABEL)) {
-        rollbackInsertion();
-        return false;
-    }
-    input.setDraft(normalizedDraft);
-    const normalized = input.state.getSnapshot();
-    const retained = normalized.occurrences.find(candidate => candidate.occurrenceId === occurrence.occurrenceId);
-    return normalized.draft === normalizedDraft
-        && retained !== undefined
-        && retained.source === SELECTION_REFERENCE_SOURCE
-        && retained.ref === ref
-        && retained.offset === 0
-        && occurrenceMatchesDraft(normalized, retained, SELECTION_REFERENCE_LABEL);
+    const after = input.state.getSnapshot();
+    const occurrence = newlyInsertedOccurrence(before, after, SELECTION_REFERENCE_SOURCE, ref);
+    return occurrence !== undefined && selectionOccurrences(after).length === 1
+        && occurrenceMatchesDraft(after, occurrence, SELECTION_REFERENCE_LABEL);
 }
-/** Add one passage to the parent composer's aggregated annotation occurrence. */
 export function addSelectionToConversation(input, selection, comment) {
     const before = input.state.getSnapshot();
-    const annotations = [...storedConversationAnnotations(before), annotationFromSelection(selection, comment)];
-    return writeConversationAnnotations(input, before, annotations);
+    const trimmed = comment?.trim();
+    return writeAnnotations(input, before, [...storedAnnotations(before), {
+            text: selection.text, selection, ...(trimmed ? { comment: trimmed } : {}),
+        }]);
+}
+export function removeConversationAnnotations(input) {
+    const occurrences = selectionOccurrences(input.state.getSnapshot());
+    if (occurrences.length === 0)
+        return false;
+    for (const occurrenceId of occurrences.map(occurrence => occurrence.occurrenceId).reverse()) {
+        const snapshot = input.state.getSnapshot();
+        const occurrence = snapshot.occurrences.find(candidate => candidate.occurrenceId === occurrenceId);
+        if (occurrence === undefined)
+            continue;
+        // Delete only the chip, never a possibly user-owned leading space/newline.
+        const span = occurrenceEditSpan(input, snapshot, occurrence);
+        if (span === undefined || !input.replaceText('', span))
+            return false;
+    }
+    return selectionOccurrences(input.state.getSnapshot()).length === 0;
 }
-/** Remove one unsent selected-passage annotation, retaining the aggregate when needed. */
 export function removeConversationAnnotation(input, annotationIndex) {
     const before = input.state.getSnapshot();
-    const annotations = [...storedConversationAnnotations(before)];
+    const annotations = [...storedAnnotations(before)];
     if (!Number.isSafeInteger(annotationIndex) || annotations[annotationIndex] === undefined)
         return false;
     annotations.splice(annotationIndex, 1);
-    if (annotations.length === 0) {
-        input.setDraft(draftWithoutSelectionOccurrences(before));
-        return selectionOccurrences(input.state.getSnapshot()).length === 0;
-    }
-    return writeConversationAnnotations(input, before, annotations);
+    return annotations.length === 0 ? removeConversationAnnotations(input) : writeAnnotations(input, before, annotations);
 }
-/** Replace the optional comment on one unsent selected-passage annotation. */
 export function updateConversationAnnotation(input, annotationIndex, comment) {
     const before = input.state.getSnapshot();
-    const annotations = [...storedConversationAnnotations(before)];
-    const current = annotations[annotationIndex];
-    if (!Number.isSafeInteger(annotationIndex) || current === undefined)
-        return false;
-    const trimmedComment = comment?.trim();
-    annotations[annotationIndex] = {
-        text: current.text,
-        ...(current.selection === undefined ? {} : { selection: current.selection }),
-        ...(trimmedComment === undefined || trimmedComment.length === 0
-            ? {}
-            : { comment: trimmedComment }),
-    };
-    return writeConversationAnnotations(input, before, annotations);
-}
-function exactClipboardProjection(snapshot, annotationOccurrence, annotationClipboardText) {
-    let projected = '';
-    let cursor = 0;
-    const occurrences = [...snapshot.occurrences].sort((left, right) => left.offset - right.offset);
-    for (const occurrence of occurrences) {
-        const expectedLabel = occurrence.occurrenceId === annotationOccurrence.occurrenceId
-            ? SELECTION_REFERENCE_LABEL
-            : occurrence.label;
-        if (occurrence.length === undefined
-            && !snapshot.draft.startsWith(LEGACY_REFERENCE_PLACEHOLDER, occurrence.offset)
-            && expectedLabel === undefined)
-            return;
-        const range = occurrenceRange(snapshot, occurrence, expectedLabel ?? '');
-        if (range === undefined || range.start < cursor)
-            return;
-        const clipboardText = occurrence.occurrenceId === annotationOccurrence.occurrenceId
-            ? annotationClipboardText
-            : occurrence.clipboardText;
-        if (clipboardText === undefined)
-            return;
-        projected += snapshot.draft.slice(cursor, range.start) + clipboardText;
-        cursor = range.end;
-    }
-    return projected + snapshot.draft.slice(cursor);
-}
-function annotationSeparator(draftTail) {
-    if (draftTail.startsWith('\n\n'))
-        return '\n\n';
-    if (draftTail.startsWith('\n'))
-        return '\n';
-    if (draftTail.startsWith(' '))
-        return ' ';
-    return '';
-}
-function baseDraftFromMirror(mirrorDraft, clipboardText, expectedBaseDraft) {
-    const separators = ['\n\n', '\n', ' ', ''];
-    if (expectedBaseDraft !== undefined) {
-        return separators.some(separator => mirrorDraft === clipboardText + separator + expectedBaseDraft)
-            ? expectedBaseDraft
-            : undefined;
-    }
-    for (const separator of separators.slice(0, -1)) {
-        const prefix = clipboardText + separator;
-        if (mirrorDraft.startsWith(prefix))
-            return mirrorDraft.slice(prefix.length);
-    }
-    return mirrorDraft === clipboardText ? '' : undefined;
-}
-/** Describe both the display draft and DSH's persisted clipboard projection. */
-export function conversationAnnotationRecoveryRecord(snapshot) {
-    const occurrence = selectionOccurrences(snapshot).find(candidate => candidate.offset === 0);
-    const ref = conversationAnnotationReference(snapshot);
-    if (occurrence === undefined || ref === undefined)
-        return;
-    const range = occurrenceRange(snapshot, occurrence, SELECTION_REFERENCE_LABEL);
-    if (range === undefined || range.start !== 0)
-        return;
-    let annotations;
-    try {
-        annotations = decodeStoredSelectionReference(ref);
-    }
-    catch {
-        return;
-    }
-    const clipboardText = annotations.map(annotation => annotation.text).join('\n\n');
-    const mirrorDraft = exactClipboardProjection(snapshot, occurrence, clipboardText);
-    if (mirrorDraft === undefined)
-        return;
-    const separator = annotationSeparator(snapshot.draft.slice(range.end));
-    const mirrorPrefix = clipboardText + separator;
-    if (!mirrorDraft.startsWith(mirrorPrefix))
-        return;
-    return {
-        ref,
-        displayDraft: snapshot.draft,
-        mirrorDraft,
-        baseDraft: mirrorDraft.slice(mirrorPrefix.length),
-    };
-}
-/** Return the valid aggregated reference currently occupying the leading draft slot. */
-export function conversationAnnotationReference(snapshot) {
-    const occurrence = selectionOccurrences(snapshot).find(candidate => candidate.offset === 0);
-    if (occurrence === undefined
-        || !occurrenceMatchesDraft(snapshot, occurrence, SELECTION_REFERENCE_LABEL))
-        return;
-    try {
-        decodeStoredSelectionReference(occurrence.ref);
-        return occurrence.ref;
-    }
-    catch {
-        return;
-    }
-}
-function draftWithoutOrphanedAnnotationPrefix(snapshot) {
-    if (snapshot.occurrences.some(occurrence => occurrence.offset === 0))
-        return;
-    const legacyPrefix = `${LEGACY_REFERENCE_PLACEHOLDER}\n\n`;
-    if (snapshot.draft.startsWith(legacyPrefix))
-        return snapshot.draft.slice(legacyPrefix.length);
-    const display = referenceDisplayText(SELECTION_REFERENCE_LABEL);
-    if (!snapshot.draft.startsWith(display))
-        return;
-    let rest = snapshot.draft.slice(display.length);
-    if (rest.startsWith('\n\n'))
-        rest = rest.slice(2);
-    else if (rest.startsWith(' '))
-        rest = rest.slice(1);
-    else
-        return;
-    return rest;
-}
-/** Remove the plugin-owned prefix when rc.6 restored its draft without occurrences. */
-export function removeOrphanedConversationAnnotationPlaceholder(input) {
-    const draft = draftWithoutOrphanedAnnotationPrefix(input.state.getSnapshot());
-    if (draft === undefined)
+    const annotations = [...storedAnnotations(before)];
+    const annotation = annotations[annotationIndex];
+    if (!Number.isSafeInteger(annotationIndex) || annotation === undefined)
         return false;
-    input.setDraft(draft);
-    return true;
+    const trimmed = comment?.trim();
+    annotations[annotationIndex] = { text: annotation.text, selection: annotation.selection,
+        ...(trimmed ? { comment: trimmed } : {}) };
+    return writeAnnotations(input, before, annotations);
 }
-/** Rehydrate a lost occurrence over either its display draft or exact mirror projection. */
-export function restoreConversationAnnotationReference(input, ref, expectedMirrorDraft, expectedBaseDraft) {
-    let annotations;
-    try {
-        annotations = decodeStoredSelectionReference(ref);
-    }
-    catch {
-        return false;
-    }
-    const snapshot = input.state.getSnapshot();
-    const orphanDraft = draftWithoutOrphanedAnnotationPrefix(snapshot);
-    const clipboardText = annotations.map(annotation => annotation.text).join('\n\n');
-    const mirrorBaseDraft = expectedMirrorDraft === undefined
-        ? undefined
-        : baseDraftFromMirror(expectedMirrorDraft, clipboardText, expectedBaseDraft);
-    const draft = orphanDraft
-        ?? (expectedMirrorDraft !== undefined
-            && snapshot.occurrences.length === 0
-            && snapshot.draft === expectedMirrorDraft
-            && mirrorBaseDraft !== undefined
-            ? mirrorBaseDraft
-            : undefined);
-    if (draft === undefined)
-        return false;
-    if (draft !== snapshot.draft)
-        input.setDraft(draft);
-    const beforeWrite = input.state.getSnapshot();
-    if (beforeWrite.draft !== draft || beforeWrite.occurrences.length !== 0)
-        return false;
-    if (writeConversationAnnotations(input, beforeWrite, annotations))
-        return true;
-    // Recovery must be content preserving. If DSH rejects insertion, put the
-    // exact mirror projection back rather than leaving a partially stripped draft.
-    const afterFailure = input.state.getSnapshot();
-    if (afterFailure.occurrences.length === 0 && expectedMirrorDraft !== undefined) {
-        input.setDraft(expectedMirrorDraft);
-    }
-    return false;
-}
-function unescapeXmlText(value) {
-    return value
-        .replaceAll('&lt;', '<')
-        .replaceAll('&gt;', '>')
-        .replaceAll('&amp;', '&');
-}
-function parseAnnotationBody(body) {
-    const selectedText = /^<selected_text>\n([\s\S]*?)\n<\/selected_text>(?:\n<user_comment>\n([\s\S]*?)\n<\/user_comment>)?$/u.exec(body);
-    if (selectedText === null)
-        return { text: unescapeXmlText(body) };
-    const comment = selectedText[2];
-    return {
-        text: unescapeXmlText(selectedText[1] ?? ''),
-        ...(comment === undefined ? {} : { comment: unescapeXmlText(comment) }),
-    };
+function selectedContext(annotations) {
+    return ['<selected_context>', ...annotations.flatMap((annotation, index) => [
+            `<annotation index="${String(index + 1)}">`,
+            '<selected_text>', escapeXmlText(annotation.text), '</selected_text>',
+            ...(annotation.comment === undefined ? [] : ['<user_comment>', escapeXmlText(annotation.comment), '</user_comment>']),
+            '</annotation>',
+        ]), '</selected_context>'].join('\n');
 }
-/** Parse the durable model form back into the user-facing annotation capsule. */
+export const selectionReferenceSource = {
+    trigger: '@', name: SELECTION_REFERENCE_SOURCE, order: 1_000,
+    candidates: async () => [], onPick: () => undefined,
+    codec: {
+        clipboardText: ref => decodeSelectionReference(ref).map(annotation => annotation.text).join('\n\n'),
+        serialize: async (ref, signal) => {
+            if (signal.aborted)
+                throw signal.reason;
+            return selectedContext(decodeSelectionReference(ref));
+        },
+    },
+};
 export function parseAnnotatedConversationPrompt(text) {
-    const current = /^<selected_context>\n([\s\S]*?)\n<\/selected_context>\s*/u.exec(text);
-    if (current !== null) {
-        const annotations = [];
-        const annotationPattern = /<annotation(?: index="\d+")?>\n([\s\S]*?)\n<\/annotation>/gu;
-        for (const match of current[1]?.matchAll(annotationPattern) ?? []) {
-            annotations.push(parseAnnotationBody(match[1] ?? ''));
-        }
-        if (annotations.length > 0) {
-            return { annotations, message: text.slice(current[0].length).trim() };
+    // Stored messages outlive a plugin update. Reading their durable text does
+    // not require an old DSH runtime or an old composer implementation.
+    const prefix = /^\s*<selected_context(?: source="current-conversation" event-seq="\d+")?>\r?\n([\s\S]*?)\r?\n<\/selected_context>\s*/u.exec(text);
+    if (prefix === null)
+        return;
+    const annotations = [];
+    if (prefix[0].trimStart().startsWith('<selected_context source=')) {
+        annotations.push({ text: unescapeXmlText(prefix[1] ?? '') });
+    }
+    else {
+        for (const match of prefix[1]?.matchAll(/<annotation(?: index="\d+")?>\r?\n([\s\S]*?)\r?\n<\/annotation>/gu) ?? []) {
+            const body = match[1] ?? '';
+            const parts = /^<selected_text>\r?\n([\s\S]*?)\r?\n<\/selected_text>(?:\r?\n<user_comment>\r?\n([\s\S]*?)\r?\n<\/user_comment>)?$/u.exec(body);
+            annotations.push({ text: unescapeXmlText(parts?.[1] ?? body),
+                ...(parts?.[2] === undefined ? {} : { comment: unescapeXmlText(parts[2]) }) });
         }
     }
-    const legacyXml = /^<selected_context source="current-conversation" event-seq="(\d+)">\n?([\s\S]*?)\n?<\/selected_context>\s*/u.exec(text);
-    if (legacyXml !== null) {
-        return {
-            annotations: [{ text: unescapeXmlText(legacyXml[2] ?? '') }],
-            message: text.slice(legacyXml[0].length).trim(),
-        };
-    }
-    const legacyText = /^Selected passage from the current conversation \(message (\d+)\):\n([\s\S]*?)\nEnd selected passage\.\s*/u.exec(text);
-    if (legacyText === null)
-        return undefined;
-    return {
-        annotations: [{ text: legacyText[2] ?? '' }],
-        message: text.slice(legacyText[0].length).trim(),
-    };
+    return annotations.length === 0 ? undefined : { annotations, message: text.slice(prefix[0].length).trim() };
 }
-/** Add the selected quote to the first child prompt. */
+/** The first prompt uses the same durable annotation format as the main composer. */
 export function buildSideChatPrompt(selection, question) {
     const trimmed = question.trim();
-    if (selection === undefined)
-        return [{ type: 'text', text: trimmed }];
-    return [{
-            type: 'text',
-            text: [
-                `<selected_context source="current-conversation" event-seq="${selection.atSeq}">`,
-                escapeXmlText(selection.text),
-                '</selected_context>',
-                '',
-                '<user_question>',
-                escapeXmlText(trimmed),
-                '</user_question>',
-            ].join('\n'),
-        }];
+    return [{ type: 'text', text: selection === undefined ? trimmed : [
+                selectedContext([{ text: selection.text }]), '',
+                '<user_question>', escapeXmlText(trimmed), '</user_question>',
+            ].join('\n') }];
+}
+/** Decode a question only after recognizing this plugin's annotation prefix. */
+export function annotationMessageText(message) {
+    const question = /^<user_question>(?:\r?\n)?([\s\S]*?)(?:\r?\n)?<\/user_question>(?=$|\s)/u.exec(message);
+    if (question === null)
+        return message;
+    const text = unescapeXmlText((question[1] ?? '').trim());
+    // Attachments or additional text blocks must not make the question wrapper
+    // reappear, nor be discarded while projecting the model-facing payload.
+    const suffix = message.slice(question[0].length).trim();
+    return [text, suffix].filter(part => part.length > 0).join('\n');
+}
+/** One projection supplies both the annotation capsule and the visible question. */
+export function parseSideChatPrompt(text) {
+    const annotated = parseAnnotatedConversationPrompt(text);
+    return annotated === undefined ? undefined : {
+        annotations: annotated.annotations,
+        message: annotationMessageText(annotated.message),
+    };
+}
+export function sideChatQuestionText(text) {
+    return parseSideChatPrompt(text)?.message ?? text;
 }
-//# sourceMappingURL=add-to-conversation.js.map