@ahggg/dsh-side-chat 0.7.1 → 0.7.3

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

@@ -1,5 +1,5 @@
+import { draftWithoutOccurrence, LEGACY_REFERENCE_PLACEHOLDER, newlyInsertedOccurrence, occurrenceEditSpan, occurrenceMatchesDraft, occurrenceRange, referenceDisplayText, } from './composer-reference.js';
 const SELECTION_REFERENCE_SOURCE = 'dsh-side-chat-selection';
-const OBJECT_REPLACEMENT_CHARACTER = '\uFFFC';
 export const SELECTION_REFERENCE_LABEL = '__dsh_side_chat_annotations__';
 function escapeXmlText(value) {
     return value
@@ -113,13 +113,6 @@ function selectedContext(annotations) {
 function selectionOccurrences(snapshot) {
     return snapshot.occurrences.filter(occurrence => occurrence.source === SELECTION_REFERENCE_SOURCE);
 }
-function occurrenceLength(occurrence) {
-    return occurrence.length !== undefined
-        && Number.isSafeInteger(occurrence.length)
-        && occurrence.length > 0
-        ? occurrence.length
-        : 1;
-}
 function storedConversationAnnotations(snapshot) {
     return selectionOccurrences(snapshot).flatMap((occurrence) => {
         try {
@@ -150,16 +143,19 @@ export function conversationSelectionAnnotations(snapshot) {
 }
 function draftWithoutSelectionOccurrences(snapshot) {
     const occurrences = [...selectionOccurrences(snapshot)].sort((a, b) => b.offset - a.offset);
-    let draft = snapshot.draft;
+    let current = snapshot;
     for (const occurrence of occurrences) {
-        draft = draft.slice(0, occurrence.offset)
-            + draft.slice(occurrence.offset + occurrenceLength(occurrence));
+        const draft = draftWithoutOccurrence(current, occurrence, SELECTION_REFERENCE_LABEL);
+        if (draft === undefined)
+            continue;
+        current = { ...current, draft };
     }
-    // Add to chat owns the blank lines immediately after its leading occurrence.
+    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'))
+        else if (draft.startsWith('\n') || draft.startsWith(' '))
             draft = draft.slice(1);
     }
     return draft;
@@ -167,8 +163,23 @@ function draftWithoutSelectionOccurrences(snapshot) {
 /** 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)
+    const occurrences = selectionOccurrences(snapshot);
+    if (occurrences.length === 0)
         return false;
+    if (input.referenceMode === 'lexical' && input.replaceText !== undefined) {
+        for (const occurrenceId of occurrences.map(occurrence => occurrence.occurrenceId).reverse()) {
+            const current = input.state.getSnapshot();
+            const occurrence = current.occurrences.find(candidate => candidate.occurrenceId === occurrenceId);
+            if (occurrence === undefined)
+                continue;
+            const span = occurrenceEditSpan(input, current, occurrence, {
+                consumeFollowingSeparator: true,
+            });
+            if (span === undefined || !input.replaceText('', span))
+                return false;
+        }
+        return selectionOccurrences(input.state.getSnapshot()).length === 0;
+    }
     input.setDraft(draftWithoutSelectionOccurrences(snapshot));
     return true;
 }
@@ -188,46 +199,169 @@ export const selectionReferenceSource = {
         },
     },
 };
-function annotationClipboardText(annotations) {
-    return annotations.map(annotation => annotation.text).join('\n\n');
-}
-function writeConversationAnnotations(input, before, annotations) {
+function writeTextConversationAnnotations(input, before, annotations) {
     const draft = draftWithoutSelectionOccurrences(before);
-    if (selectionOccurrences(before).length > 0)
-        input.setDraft(draft);
     const insertionState = input.state.getSnapshot();
+    if (insertionState.draftRev !== before.draftRev || insertionState.draft !== before.draft)
+        return false;
     const ref = encodeSelectionReference(annotations);
     const inserted = input.insertReference({
         source: SELECTION_REFERENCE_SOURCE,
         ref,
         label: SELECTION_REFERENCE_LABEL,
-        clipboardText: annotationClipboardText(annotations),
+        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.
     if (!inserted)
         return false;
-    // rc.7 inserts one U+FFFC placeholder, while newer DSH versions insert the
-    // full @label range. Preserve whichever range DSH minted and only replace
-    // its trailing separator so the first visual row remains available to the
-    // plugin's interactive capsule.
-    const afterInsertion = input.state.getSnapshot();
-    const occurrence = selectionOccurrences(afterInsertion)
-        .find(candidate => candidate.offset === 0 && candidate.ref === ref);
-    const displayLength = occurrence === undefined ? 0 : occurrenceLength(occurrence);
-    if (occurrence === undefined || displayLength > afterInsertion.draft.length) {
-        input.setDraft(draft);
+    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 display = afterInsertion.draft.slice(0, displayLength);
-    input.setDraft(`${display}\n\n${draft}`);
-    const preserved = selectionOccurrences(input.state.getSnapshot())
-        .some(candidate => candidate.offset === 0 && candidate.ref === ref);
-    if (!preserved)
-        input.setDraft(draft);
-    return preserved;
+    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);
+}
+function writeLexicalConversationAnnotations(input, before, annotations) {
+    if (input.replaceText === undefined)
+        return false;
+    const existing = selectionOccurrences(before);
+    if (existing.length > 1)
+        return false;
+    const previous = existing[0];
+    if (previous !== undefined && previous.length === undefined)
+        return false;
+    let insertionState = before;
+    let preparedGap = false;
+    if (previous === undefined) {
+        // A gap inserted before the chip is unambiguously plugin-owned. DSH's
+        // automatic gap cannot otherwise be distinguished from a user's leading
+        // space when the reference is later removed.
+        if (!input.replaceText(' ', { start: 0, end: 0, draftRev: before.draftRev }))
+            return false;
+        insertionState = input.state.getSnapshot();
+        if (insertionState.draft !== ` ${before.draft}`)
+            return false;
+        preparedGap = true;
+    }
+    const span = previous === undefined
+        ? { start: 0, end: 0, draftRev: insertionState.draftRev }
+        : occurrenceEditSpan(input, insertionState, previous);
+    if (span === undefined)
+        return false;
+    const ref = encodeSelectionReference(annotations);
+    const clipboardText = annotations.map(annotation => annotation.text).join('\n\n');
+    const inserted = input.insertReference({
+        source: SELECTION_REFERENCE_SOURCE,
+        ref,
+        label: SELECTION_REFERENCE_LABEL,
+        clipboardText,
+    }, span);
+    if (!inserted) {
+        if (preparedGap) {
+            const current = input.state.getSnapshot();
+            if (current.draft === ` ${before.draft}`) {
+                input.replaceText('', { start: 0, end: 1, draftRev: current.draftRev });
+            }
+        }
+        return false;
+    }
+    const afterInsert = input.state.getSnapshot();
+    const occurrence = newlyInsertedOccurrence(insertionState, afterInsert, SELECTION_REFERENCE_SOURCE, ref);
+    const previousEnd = previous === undefined ? 0 : previous.offset + (previous.length ?? 0);
+    const previousTail = previous === undefined
+        ? insertionState.draft
+        : insertionState.draft.slice(previousEnd);
+    const automaticGap = previousTail.startsWith(' ') ? '' : ' ';
+    const expectedDraft = previous === undefined
+        ? `${clipboardText}${insertionState.draft}`
+        : insertionState.draft.slice(0, previous.offset) + clipboardText + automaticGap + previousTail;
+    const valid = occurrence !== undefined
+        && selectionOccurrences(afterInsert).length === 1
+        && occurrence.offset === (previous?.offset ?? 0)
+        && occurrence.label === SELECTION_REFERENCE_LABEL
+        && occurrence.clipboardText === clipboardText
+        && occurrenceMatchesDraft(afterInsert, occurrence, SELECTION_REFERENCE_LABEL)
+        && afterInsert.draft === expectedDraft;
+    if (valid)
+        return true;
+    // Best-effort rollback for a first insertion. Replacing an existing chip is
+    // atomic and should never reach this path on a conforming DSH input facade.
+    if (previous === undefined && occurrence !== undefined) {
+        const rollback = occurrenceEditSpan(input, afterInsert, occurrence, {
+            consumeFollowingSeparator: true,
+        });
+        if (rollback !== undefined)
+            input.replaceText('', rollback);
+    }
+    return false;
+}
+function writeConversationAnnotations(input, before, annotations) {
+    return input.referenceMode === 'lexical'
+        ? writeLexicalConversationAnnotations(input, before, annotations)
+        : writeTextConversationAnnotations(input, before, annotations);
 }
 /** Add one passage to the parent composer's aggregated annotation occurrence. */
 export function addSelectionToConversation(input, selection, comment) {
@@ -235,6 +369,17 @@ export function addSelectionToConversation(input, selection, comment) {
     const annotations = [...storedConversationAnnotations(before), annotationFromSelection(selection, comment)];
     return writeConversationAnnotations(input, before, annotations);
 }
+/** 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)];
+    if (!Number.isSafeInteger(annotationIndex) || annotations[annotationIndex] === undefined)
+        return false;
+    annotations.splice(annotationIndex, 1);
+    if (annotations.length === 0)
+        return removeConversationAnnotations(input);
+    return writeConversationAnnotations(input, before, annotations);
+}
 /** Replace the optional comment on one unsent selected-passage annotation. */
 export function updateConversationAnnotation(input, annotationIndex, comment) {
     const before = input.state.getSnapshot();
@@ -252,13 +397,90 @@ export function updateConversationAnnotation(input, annotationIndex, comment) {
     };
     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
-        || occurrenceLength(occurrence) > snapshot.draft.length
-        || (occurrence.length === undefined
-            && !snapshot.draft.startsWith(OBJECT_REPLACEMENT_CHARACTER)))
+        || !occurrenceMatchesDraft(snapshot, occurrence, SELECTION_REFERENCE_LABEL))
         return;
     try {
         decodeStoredSelectionReference(occurrence.ref);
@@ -268,25 +490,25 @@ export function conversationAnnotationReference(snapshot) {
         return;
     }
 }
-function draftWithoutOrphanedAnnotationPrefix(snapshot, ref) {
+function draftWithoutOrphanedAnnotationPrefix(snapshot) {
     if (snapshot.occurrences.some(occurrence => occurrence.offset === 0))
         return;
-    const prefixes = [
-        `${OBJECT_REPLACEMENT_CHARACTER}\n\n`,
-        `@${SELECTION_REFERENCE_LABEL}\n\n`,
-    ];
-    if (ref !== undefined) {
-        try {
-            prefixes.push(`${annotationClipboardText(decodeStoredSelectionReference(ref))}\n\n`);
-        }
-        catch {
-            // Invalid stored references cannot authorize removing plain draft text.
-        }
-    }
-    const prefix = prefixes.find(candidate => snapshot.draft.startsWith(candidate));
-    return prefix === undefined ? undefined : snapshot.draft.slice(prefix.length);
+    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 a recognized plugin-owned prefix restored without its occurrence. */
+/** 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)
@@ -294,8 +516,8 @@ export function removeOrphanedConversationAnnotationPlaceholder(input) {
     input.setDraft(draft);
     return true;
 }
-/** Rehydrate a lost occurrence only over an exact stored plugin projection. */
-export function restoreConversationAnnotationReference(input, ref) {
+/** 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);
@@ -303,11 +525,35 @@ export function restoreConversationAnnotationReference(input, ref) {
     catch {
         return false;
     }
-    const draft = draftWithoutOrphanedAnnotationPrefix(input.state.getSnapshot(), ref);
+    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;
-    input.setDraft(draft);
-    return writeConversationAnnotations(input, input.state.getSnapshot(), annotations);
+    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
@@ -371,4 +617,3 @@ export function buildSideChatPrompt(selection, question) {
             ].join('\n'),
         }];
 }
-//# sourceMappingURL=add-to-conversation.js.map

package/lib/client/parent-composer/annotation-persistence.d.ts

@@ -5,7 +5,7 @@ interface AnnotationStorage {
     setItem(key: string, value: string): void;
     removeItem(key: string): void;
 }
-/** Tab-scoped recovery for drafts persisted without their runtime occurrences. */
+/** Tab-scoped recovery for drafts persisted as a reference clipboard projection. */
 export declare class ConversationAnnotationPersistence {
     private readonly storage;
     private readonly observedSessions;
@@ -16,4 +16,3 @@ export declare class ConversationAnnotationPersistence {
     private remove;
 }
 export {};
-//# sourceMappingURL=annotation-persistence.d.ts.map

package/lib/client/parent-composer/annotation-persistence.js

@@ -1,4 +1,4 @@
-import { conversationAnnotationReference, removeOrphanedConversationAnnotationPlaceholder, restoreConversationAnnotationReference, } from './add-to-conversation.js';
+import { conversationAnnotationRecoveryRecord, removeOrphanedConversationAnnotationPlaceholder, restoreConversationAnnotationReference, } from './add-to-conversation.js';
 const STORAGE_PREFIX = 'dsh-side-chat:composer-annotations:';
 function browserSessionStorage() {
     if (typeof window === 'undefined')
@@ -13,37 +13,17 @@ function browserSessionStorage() {
 function storageKey(sessionId) {
     return `${STORAGE_PREFIX}${encodeURIComponent(sessionId)}`;
 }
-function clipboardProjection(snapshot) {
-    let draft = snapshot.draft;
-    const occurrences = [...snapshot.occurrences].sort((a, b) => b.offset - a.offset);
-    for (const occurrence of occurrences) {
-        const length = occurrence.length ?? 1;
-        if (!Number.isSafeInteger(occurrence.offset)
-            || occurrence.offset < 0
-            || !Number.isSafeInteger(length)
-            || length <= 0
-            || occurrence.offset + length > draft.length
-            || occurrence.clipboardText === undefined)
-            return;
-        draft = draft.slice(0, occurrence.offset)
-            + occurrence.clipboardText
-            + draft.slice(occurrence.offset + length);
-    }
-    return draft;
-}
 function recordOf(snapshot) {
-    const ref = conversationAnnotationReference(snapshot);
-    if (ref === undefined)
-        return;
-    const projection = clipboardProjection(snapshot);
-    return {
-        version: 1,
-        draft: snapshot.draft,
-        ...(projection === undefined ? {} : { projection }),
-        ref,
-    };
+    const record = conversationAnnotationRecoveryRecord(snapshot);
+    return record === undefined ? undefined : { version: 2, ...record };
 }
-/** Tab-scoped recovery for drafts persisted without their runtime occurrences. */
+function displayDraft(record) {
+    return record.version === 1 ? record.draft : record.displayDraft;
+}
+function mirrorDraft(record) {
+    return record.version === 1 ? record.projection : record.mirrorDraft;
+}
+/** Tab-scoped recovery for drafts persisted as a reference clipboard projection. */
 export class ConversationAnnotationPersistence {
     storage;
     observedSessions = new Set();
@@ -60,14 +40,24 @@ export class ConversationAnnotationPersistence {
             return;
         }
         const stored = this.read(key);
-        if (stored !== undefined
-            && (snapshot.draft === stored.draft || snapshot.draft === stored.projection)) {
-            this.observedSessions.add(key);
-            if (restoreConversationAnnotationReference(input, stored.ref))
+        if (stored !== undefined) {
+            const exactDisplayDraft = snapshot.draft === displayDraft(stored);
+            const storedMirrorDraft = mirrorDraft(stored);
+            const exactMirrorDraft = storedMirrorDraft !== undefined && snapshot.draft === storedMirrorDraft;
+            if (exactDisplayDraft || exactMirrorDraft) {
+                this.observedSessions.add(key);
+                const restored = restoreConversationAnnotationReference(input, stored.ref, storedMirrorDraft, stored.version === 2 ? stored.baseDraft : undefined);
+                if (restored)
+                    return;
+                // A refused insertion may move an exact display record to its exact
+                // mirror. Keep either v1 or v2 storage retryable from that safe state.
+                if (storedMirrorDraft !== undefined
+                    && input.state.getSnapshot().draft === storedMirrorDraft)
+                    return;
+                this.remove(key);
+                removeOrphanedConversationAnnotationPlaceholder(input);
                 return;
-            this.remove(key);
-            removeOrphanedConversationAnnotationPlaceholder(input);
-            return;
+            }
         }
         // A live occurrence disappeared in this plugin lifetime: removal or send
         // is authoritative, including the transition to an empty draft.
@@ -92,15 +82,28 @@ export class ConversationAnnotationPersistence {
             if (raw === null)
                 return;
             const value = JSON.parse(raw);
-            return value.version === 1
+            if (value.version === 1
                 && typeof value.draft === 'string'
                 && typeof value.ref === 'string'
-                && (value.projection === undefined || typeof value.projection === 'string')
-                ? {
+                && (value.projection === undefined || typeof value.projection === 'string')) {
+                return {
                     version: 1,
                     draft: value.draft,
                     ...(value.projection === undefined ? {} : { projection: value.projection }),
                     ref: value.ref,
+                };
+            }
+            return value.version === 2
+                && typeof value.displayDraft === 'string'
+                && typeof value.mirrorDraft === 'string'
+                && typeof value.baseDraft === 'string'
+                && typeof value.ref === 'string'
+                ? {
+                    version: 2,
+                    displayDraft: value.displayDraft,
+                    mirrorDraft: value.mirrorDraft,
+                    baseDraft: value.baseDraft,
+                    ref: value.ref,
                 }
                 : undefined;
         }
@@ -129,4 +132,3 @@ export class ConversationAnnotationPersistence {
         }
     }
 }
-//# sourceMappingURL=annotation-persistence.js.map