@plannotator/ui 0.50.0 → 0.52.0

package/hooks/useLinkedDoc.ts

@@ -14,6 +14,7 @@ import type { ViewerHandle } from "../components/Viewer";
 import type { SidebarTab } from "./useSidebar";
 import type { SourceSaveCapability } from "@plannotator/core/source-save";
 import type { VersionInfo } from "./usePlanDiff";
+import { annotationOwnsHighlight } from "../utils/annotationOwnsHighlight";
 
 export interface LinkedDocLoadData {
   markdown?: string;
@@ -124,6 +125,29 @@ export interface CachedDocState {
   versionInfo?: VersionInfo | null;
 }
 
+/**
+ * The session's documents split the way FEEDBACK must be: the root document
+ * (the plan, the annotated file, or the folder itself) once, and every other
+ * document once under its own path. `getDocAnnotations()` is NOT this split —
+ * it also carries the active document's live state, which the host exports
+ * from its own state too, so exporting both printed the open document twice.
+ */
+export interface FeedbackDocuments {
+  /**
+   * The root document's stashed state while a linked document is open. Null
+   * while the root itself is the active document: its annotations are then
+   * the host's live state, which the host exports itself.
+   */
+  root: (CachedDocState & { renderAs: DocumentRenderAs }) | null;
+  /**
+   * Every document other than the root that carries state, keyed by path:
+   * the cached documents plus the active linked document's live state. The
+   * root's own annotations are never here; a copy of the root's path opened
+   * from the root itself is a separate annotation set and is listed by path.
+   */
+  documents: Map<string, CachedDocState>;
+}
+
 export interface LinkedDocSessionState {
   root: SavedPlanState;
   docs: Map<string, CachedDocState>;
@@ -156,8 +180,12 @@ export interface UseLinkedDocReturn {
   back: () => void;
   /** Dismiss the current error */
   dismissError: () => void;
-  /** All linked doc annotations including the active doc's live state (keyed by filepath) */
+  /** All linked doc annotations including the active doc's live state (keyed by filepath).
+   *  For counts and the cross-file panel; a feedback export reads getFeedbackDocuments(). */
   getDocAnnotations: () => Map<string, CachedDocState>;
+  /** The root document and every other document, each exactly once — what a
+   *  feedback export reads (see FeedbackDocuments). */
+  getFeedbackDocuments: () => FeedbackDocuments;
   /**
    * Replace the stored annotations of a document that is NOT the active one —
    * a cached linked doc, or the stashed source document. This is what lets the
@@ -285,7 +313,7 @@ export function useLinkedDoc(options: UseLinkedDocOptions): UseLinkedDocReturn {
     if (saved.annotations.length) {
       setTimeout(() => {
         viewerRef.current?.clearAllHighlights();
-        viewerRef.current?.applySharedAnnotations(saved.annotations);
+        viewerRef.current?.applySharedAnnotations(saved.annotations.filter(annotationOwnsHighlight));
       }, HIGHLIGHT_REAPPLY_DELAY);
     }
   }, [
@@ -415,7 +443,7 @@ export function useLinkedDoc(options: UseLinkedDocOptions): UseLinkedDocReturn {
     if (cached?.annotations.length) {
       setTimeout(() => {
         viewerRef.current?.clearAllHighlights();
-        viewerRef.current?.applySharedAnnotations(cached.annotations);
+        viewerRef.current?.applySharedAnnotations(cached.annotations.filter(annotationOwnsHighlight));
       }, HIGHLIGHT_REAPPLY_DELAY);
     }
   }, [
@@ -562,7 +590,7 @@ export function useLinkedDoc(options: UseLinkedDocOptions): UseLinkedDocReturn {
     if (state.root.annotations.length) {
       setTimeout(() => {
         viewerRef.current?.clearAllHighlights();
-        viewerRef.current?.applySharedAnnotations(state.root.annotations);
+        viewerRef.current?.applySharedAnnotations(state.root.annotations.filter(annotationOwnsHighlight));
       }, HIGHLIGHT_REAPPLY_DELAY);
     }
   }, [
@@ -644,6 +672,37 @@ export function useLinkedDoc(options: UseLinkedDocOptions): UseLinkedDocReturn {
     // identity of this callback is what tells memoized readers to recompute.
   }, [linkedDoc, annotations, globalAttachments, sourceFilePath, sourceConverted, getDocumentMarkdown, storeRevision]);
 
+  const getFeedbackDocuments = useCallback((): FeedbackDocuments => {
+    const documents = new Map(docCache.current);
+    if (linkedDoc) {
+      documents.set(linkedDoc.filepath, {
+        annotations: [...annotations],
+        globalAttachments: [...globalAttachments],
+        markdown: getDocumentMarkdown?.(linkedDoc.filepath, linkedDoc.markdown) ?? linkedDoc.markdown,
+        isConverted: linkedDoc.isConverted,
+      });
+    }
+    // A cache entry under the root's own path is NOT the root: it is a copy
+    // the reviewer opened from the root itself (an HTML "Home" link, or
+    // index.html#intro from index.html — a backlink only routes through
+    // back() while a linked doc is open). Its comments are a separate set the
+    // counts include, so it is exported under its path, never dropped.
+    const saved = linkedDoc ? savedPlanState.current : null;
+    return {
+      root: saved
+        ? {
+            annotations: [...saved.annotations],
+            globalAttachments: [...saved.globalAttachments],
+            markdown: saved.markdown,
+            isConverted: !!sourceConverted,
+            renderAs: saved.renderAs,
+          }
+        : null,
+      documents,
+    };
+    // storeRevision: same reason as getDocAnnotations above.
+  }, [linkedDoc, annotations, globalAttachments, sourceConverted, getDocumentMarkdown, storeRevision]);
+
   return {
     isActive: linkedDoc !== null,
     filepath: linkedDoc?.filepath ?? null,
@@ -654,6 +713,7 @@ export function useLinkedDoc(options: UseLinkedDocOptions): UseLinkedDocReturn {
     back,
     dismissError,
     getDocAnnotations,
+    getFeedbackDocuments,
     updateStoredAnnotations,
     snapshotSession,
     restoreSession,

package/hooks/useModelCatalogs.ts

@@ -14,7 +14,10 @@ export { effortSelectOptions, modelSelectOptions } from '@plannotator/core/model
  * Claude / Codex model catalogs for the agent launchers (review, Code Tour,
  * Guided Review) — the SAME lists Ask AI shows. Each is the Ask AI provider's
  * discovered list, fetched through `/api/ai/capabilities?activate=<id>` (which
- * runs the provider's server-cached discovery). Nothing is fetched until a
+ * runs the provider's server-cached discovery). When a session bridge makes
+ * Ask AI bridge-only, the server reports these under `catalogProviders`
+ * instead of `providers`, so the launchers keep them while Ask AI cannot
+ * offer them. Nothing is fetched until a
  * surface asks for one engine with `useModelCatalogs(...).load(engine)`, and
  * only when that engine is installed, so opening a launcher spawns only the
  * selected CLI. While a fetch is in flight the static fallback is shown with
@@ -67,7 +70,11 @@ function loadCatalogEntry(engine: CatalogEngine): Promise<LoadedCatalog> {
     load = fetch(`/api/ai/capabilities?activate=${encodeURIComponent(id)}`)
       .then((res) => (res.ok ? res.json() : null))
       .then((data): LoadedCatalog => {
-        const provider = data?.providers?.find((p: { id?: string; name?: string }) => p.id === id || p.name === id);
+        // A server whose Ask AI is a session bridge lists the SDK providers
+        // only under `catalogProviders` (never under `providers`, which Ask AI
+        // reads), so the launchers look in both.
+        const matches = (p: { id?: string; name?: string }) => p.id === id || p.name === id;
+        const provider = data?.providers?.find(matches) ?? data?.catalogProviders?.find(matches);
         const models = provider?.models;
         if (!Array.isArray(models) || models.length === 0) return failed();
         // The server answers 200 with its static fallback when discovery

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plannotator/ui",
-  "version": "0.50.0",
+  "version": "0.52.0",
   "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.10",
+    "@plannotator/core": "0.25.12",
     "@plannotator/markdown-editor": "^0.5.0",
     "@plannotator/web-highlighter": "^0.8.1",
     "@tanstack/react-table": "^8.21.3",