@plannotator/ui 0.51.0 → 0.52.1

package/hooks/useAIChat.ts

@@ -46,8 +46,33 @@ export interface AskAIParams {
   /** "Ask this session" only: what to do when the host session is busy
    *  ("wait" = ask when it finishes, "interrupt" = stop its turn and ask now). */
   busyPolicy?: 'wait' | 'interrupt';
+  /** "Ask this session" only: the reviewer's CURRENT unsubmitted annotations
+   *  as a plain list (`formatDraftAnnotationsForAsk`; '' when there are none).
+   *  The hook sends it only when it differs from what this session last
+   *  received, and the server frames it as read-only context, never as
+   *  feedback (#1748). Leave unset for every other provider. */
+  draftAnnotations?: string;
 }
 
+/** What to send as `draftAnnotations` for one question: the list when this
+ *  session has not received it yet, '' once to clear drafts it saw earlier,
+ *  nothing when it already has the current list. */
+export function draftAnnotationsToSend(
+  delivered: { sessionId: string; text: string } | null,
+  sessionId: string,
+  current: string | undefined,
+): string | undefined {
+  if (current === undefined) return undefined;
+  const seen = delivered?.sessionId === sessionId ? delivered.text : '';
+  return current === seen ? undefined : current;
+}
+
+/** `draftAnnotationsToSend` key for "Ask this session": one host session per page. */
+const BRIDGE_DRAFTS_KEY = 'session-bridge';
+
+/** Stream messages that show the session received the question. */
+const DELIVERED_MESSAGE_TYPES = new Set(['text_delta', 'text', 'tool_use', 'tool_result', 'result']);
+
 /** Overrides for re-asking a question that ended in a busy/gone/blocked answer. */
 export interface AIRetryOptions {
   busyPolicy?: 'wait' | 'interrupt';
@@ -66,6 +91,16 @@ interface UseAIChatOptions {
   threadTitle?: string;
 }
 
+/** `line 41` / `lines 41–44` (the export's spelling) for a selection's
+ *  source lines; `null` when the scope carries no valid line. */
+function selectionLinesLabel(lineStart: unknown, lineEnd: unknown): string | null {
+  if (typeof lineStart !== 'number' || !Number.isInteger(lineStart) || lineStart < 1) return null;
+  const end = typeof lineEnd === 'number' && Number.isInteger(lineEnd) && lineEnd > lineStart
+    ? lineEnd
+    : lineStart;
+  return end === lineStart ? `line ${lineStart}` : `lines ${lineStart}–${end}`;
+}
+
 export function buildDefaultPrompt(params: AskAIParams): string {
   // The "changes under review" context (and any other preamble) leads the
   // message, so the agent is oriented to the live view before the question and
@@ -90,7 +125,9 @@ export function buildDefaultPrompt(params: AskAIParams): string {
 
     if (params.scope?.kind === 'selection') {
       const label = params.scope.label ? `Re: ${params.scope.label}` : 'Re: selected text';
-      const source = params.scope.sourcePath ? `\nSource: ${params.scope.sourcePath}` : '';
+      const lines = selectionLinesLabel(params.scope.lineStart, params.scope.lineEnd);
+      const sourceParts = [params.scope.sourcePath, lines].filter(Boolean);
+      const source = sourceParts.length > 0 ? `\nSource: ${sourceParts.join(', ')}` : '';
       const selection = params.scope.text ? `\n\nSelected text:\n\`\`\`\n${params.scope.text}\n\`\`\`` : '';
       const detail = params.scope.detail?.trim() ? `\n\nSelected element:\n${params.scope.detail.trim()}` : '';
       return `${label}${source}${selection}${detail}\n\n${params.prompt}`;
@@ -294,6 +331,14 @@ export function useAIChat({
   // The params each question was asked with, so a busy answer can be
   // re-asked ("Ask when it finishes", "Interrupt and ask now").
   const paramsByQuestionRef = useRef(new Map<string, AskAIParams>());
+  // The draft list the agent session last RECEIVED, so an unchanged list is
+  // not pasted into it again on every question. Kept for the page, not per
+  // Plannotator AI session: every Ask AI session (a new thread, a document
+  // switch in a folder or bundle) reaches the SAME host agent session through
+  // the bridge, which keeps what it already read. Per AI session, a new thread
+  // re-sent the whole list, and drafts cleared after one never reached the
+  // session as cleared.
+  const deliveredDraftsRef = useRef<{ sessionId: string; text: string } | null>(null);
 
   const ask = useCallback(async (params: AskAIParams, askOptions?: { providerId?: string }) => {
     if (abortRef.current) {
@@ -352,11 +397,21 @@ export function useAIChat({
       }
 
       const fullPrompt = buildPrompt(params);
+      const drafts = draftAnnotationsToSend(deliveredDraftsRef.current, BRIDGE_DRAFTS_KEY, params.draftAnnotations);
+      // Recorded once the session shows it received the question, so a busy,
+      // gone or failed ask sends the list again next time.
+      const markDraftsDelivered = (msg: { type?: unknown; code?: unknown }) => {
+        if (drafts === undefined) return;
+        const received = DELIVERED_MESSAGE_TYPES.has(String(msg.type))
+          || (msg.type === 'error' && msg.code === SESSION_ASK_ERROR_CODES.takenOver);
+        if (received) deliveredDraftsRef.current = { sessionId: BRIDGE_DRAFTS_KEY, text: drafts };
+      };
       const res = await aiTransport.query({
         sessionId: sid,
         prompt: fullPrompt,
         ...(params.contextUpdate && { contextUpdate: params.contextUpdate }),
         ...(params.busyPolicy && { busyPolicy: params.busyPolicy }),
+        ...(drafts !== undefined && { draftAnnotations: drafts }),
       }, controller.signal);
 
       if (!res.ok || !res.body) {
@@ -383,6 +438,7 @@ export function useAIChat({
 
           try {
             const msg = JSON.parse(data);
+            markDraftsDelivered(msg);
 
             if (msg.type === 'text_delta') {
               updateMessages(prev =>

package/hooks/useAnnotationHighlighter.ts

@@ -29,6 +29,9 @@ export interface CommentPopoverState {
   initialText?: string;
   source?: any;
   draftKey: string;
+  /** `data-block-id`s of the blocks the pending selection covers, in
+   *  document order (a host maps them to source lines for Ask AI). */
+  blockIds?: string[];
 }
 
 export interface QuickLabelPickerState {
@@ -63,6 +66,27 @@ function commentDraftTargetKey(source: any, selectedText: string): string {
   return `selection:${startKey}:${endKey}:${selectedText}`;
 }
 
+/** The blocks a pending selection covers: a math source names its own block;
+ *  a text selection is read off the highlighter's pending marks, each mapped
+ *  to its nearest `[data-block-id]` (the block its annotation would carry). */
+function selectionBlockIds(highlighter: any, source: any): string[] {
+  if (isMathAnnotationSource(source)) return [source.blockId];
+  if (!highlighter || !source?.id) return [];
+  let doms: unknown[] = [];
+  try {
+    doms = highlighter.getDoms(source.id) ?? [];
+  } catch {
+    return [];
+  }
+  const ids: string[] = [];
+  for (const dom of doms) {
+    if (!(dom instanceof HTMLElement)) continue;
+    const id = dom.closest<HTMLElement>('[data-block-id]')?.dataset.blockId;
+    if (id && !ids.includes(id)) ids.push(id);
+  }
+  return ids;
+}
+
 type MathAnnotationTarget = {
   element: HTMLElement;
   blockId: string;
@@ -1490,6 +1514,7 @@ export function useAnnotationHighlighter({
               selectedText: source.text,
               source,
               draftKey: commentDraftTargetKey(source, source.text),
+              blockIds: selectionBlockIds(highlighter, source),
             });
           } else if (effectiveMode === 'quickLabel') {
             pendingSourceRef.current = source;
@@ -1621,6 +1646,7 @@ export function useAnnotationHighlighter({
           selectedText: source.text,
           source,
           draftKey: commentDraftTargetKey(source, source.text),
+          blockIds: [source.blockId],
         });
         return;
       }
@@ -1767,6 +1793,7 @@ export function useAnnotationHighlighter({
         selectedText: source.text,
         source,
         draftKey: commentDraftTargetKey(source, source.text),
+        blockIds: [source.blockId],
       });
       return;
     }
@@ -1911,6 +1938,7 @@ export function useAnnotationHighlighter({
       initialText: initialChar,
       source: toolbarState.source,
       draftKey: commentDraftTargetKey(toolbarState.source, toolbarState.selectionText),
+      blockIds: selectionBlockIds(highlighterRef.current, toolbarState.source),
     });
     setToolbarState(null);
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plannotator/ui",
-  "version": "0.51.0",
+  "version": "0.52.1",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
@@ -77,7 +77,7 @@
     "@lezer/highlight": "^1.2.3",
     "@pierre/diffs": "1.3.6",
     "@plannotator/atomic-editor": "^0.9.0",
-    "@plannotator/core": "0.25.11",
+    "@plannotator/core": "0.25.12",
     "@plannotator/markdown-editor": "^0.5.0",
     "@plannotator/web-highlighter": "^0.8.1",
     "@tanstack/react-table": "^8.21.3",