@semiont/react-ui 0.2.33 → 0.2.34-build.89

package/dist/index.mjs

@@ -6,7 +6,7 @@ import {
   useEventSubscription,
   useEventSubscriptions,
   useHoverEmitter
-} from "./chunk-FC6SGLLT.mjs";
+} from "./chunk-M7SZRRIE.mjs";
 import {
   AVAILABLE_LOCALES,
   ApiClientProvider,
@@ -21,12 +21,12 @@ import {
   useSessionContext,
   useToast,
   useTranslations
-} from "./chunk-YPYLOBA2.mjs";
+} from "./chunk-C63BARI7.mjs";
 import {
   EventBusProvider,
   resetEventBusForTesting,
   useEventBus
-} from "./chunk-XS27QKGP.mjs";
+} from "./chunk-ULIET3MW.mjs";
 import "./chunk-D7NBW4RV.mjs";
 import {
   __commonJS,
@@ -364,7 +364,7 @@ var require_extend = __commonJS({
 });
 
 // src/lib/annotation-registry.ts
-import { entityType, isHighlight, isComment, isReference, isTag } from "@semiont/api-client";
+import { isHighlight, isComment, isReference, isTag } from "@semiont/api-client";
 var ANNOTATORS = {
   highlight: {
     motivation: "highlighting",
@@ -530,122 +530,17 @@ var ANNOTATORS = {
     }
   }
 };
-function createDetectionHandler(annotator, context) {
-  const { detection } = annotator;
-  if (!detection) {
-    throw new Error(`Annotator ${annotator.internalType} does not support detection`);
-  }
-  const detectionConfig = detection;
-  return async (...args) => {
-    if (!context.client) return;
-    const requestParams = detectionConfig.formatRequestParams ? detectionConfig.formatRequestParams(args) : [];
-    context.setDetectingMotivation(annotator.motivation);
-    context.setMotivationDetectionProgress({
-      status: "started",
-      message: `Starting ${detectionConfig.displayNameSingular} detection...`,
-      requestParams
-    });
-    function attachHandlers(stream) {
-      context.detectionStreamRef.current = stream;
-      stream.onProgress((progress) => {
-        if (detectionConfig.sseMethod === "detectReferences") {
-          const refProgress = progress;
-          context.setMotivationDetectionProgress({
-            status: refProgress.status,
-            message: refProgress.message || (refProgress.currentEntityType ? `Detecting ${refProgress.currentEntityType}...` : `Processing ${refProgress.processedEntityTypes} of ${refProgress.totalEntityTypes} entity types...`),
-            processedCategories: refProgress.processedEntityTypes,
-            totalCategories: refProgress.totalEntityTypes,
-            ...refProgress.currentEntityType && { currentCategory: refProgress.currentEntityType },
-            requestParams
-          });
-        } else {
-          context.setMotivationDetectionProgress({
-            status: progress.status,
-            percentage: progress.percentage,
-            message: progress.message,
-            ...progress.currentCategory && { currentCategory: progress.currentCategory },
-            ...progress.processedCategories !== void 0 && { processedCategories: progress.processedCategories },
-            ...progress.totalCategories !== void 0 && { totalCategories: progress.totalCategories },
-            requestParams
-          });
-        }
-      });
-      stream.onComplete((result) => {
-        const resultRecord = result;
-        const count2 = resultRecord[detectionConfig.countField] ?? 0;
-        context.setMotivationDetectionProgress({
-          status: "complete",
-          percentage: 100,
-          message: `Created ${count2} ${count2 === 1 ? detectionConfig.displayNameSingular : detectionConfig.displayNamePlural}`,
-          requestParams
-        });
-        context.setDetectingMotivation(null);
-        context.detectionStreamRef.current = null;
-        context.cacheManager.invalidateAnnotations(context.rUri);
-        context.cacheManager.invalidateEvents(context.rUri);
-        context.showSuccess(`Created ${count2} ${count2 === 1 ? detectionConfig.displayNameSingular : detectionConfig.displayNamePlural}`);
-      });
-      stream.onError((error) => {
-        context.setMotivationDetectionProgress(null);
-        context.setDetectingMotivation(null);
-        context.detectionStreamRef.current = null;
-        context.showError(`${annotator.displayName} detection failed: ${error.message}`);
-      });
-    }
-    try {
-      const sseClient = context.client.sse;
-      if (detectionConfig.sseMethod === "detectReferences") {
-        const selectedTypes = Array.isArray(args[0]) ? args[0] : [];
-        const includeDescriptiveReferences = args[1] === true;
-        attachHandlers(sseClient.detectReferences(context.rUri, {
-          entityTypes: selectedTypes.map((t12) => entityType(t12)),
-          includeDescriptiveReferences
-        }));
-      } else if (detectionConfig.sseMethod === "detectTags") {
-        const schemaId = typeof args[0] === "string" ? args[0] : "";
-        const categories = Array.isArray(args[1]) ? args[1] : [];
-        attachHandlers(sseClient.detectTags(context.rUri, { schemaId, categories }));
-      } else if (detectionConfig.sseMethod === "detectHighlights") {
-        const instructions = typeof args[0] === "string" ? args[0] : void 0;
-        attachHandlers(sseClient.detectHighlights(context.rUri, { instructions }));
-      } else if (detectionConfig.sseMethod === "detectComments") {
-        const instructions = typeof args[0] === "string" ? args[0] : void 0;
-        attachHandlers(sseClient.detectComments(context.rUri, { instructions }));
-      } else if (detectionConfig.sseMethod === "detectAssessments") {
-        const instructions = typeof args[0] === "string" ? args[0] : void 0;
-        attachHandlers(sseClient.detectAssessments(context.rUri, { instructions }));
-      } else {
-        throw new Error(`Unknown detection method: ${detectionConfig.sseMethod}`);
-      }
-    } catch (error) {
-      context.setDetectingMotivation(null);
-      context.setMotivationDetectionProgress(null);
-      context.detectionStreamRef.current = null;
-      context.showError(`Failed to start ${detectionConfig.displayNameSingular} detection`);
-    }
-  };
-}
-function createCancelDetectionHandler(context) {
-  return () => {
-    if (context.detectionStreamRef.current) {
-      context.detectionStreamRef.current.close();
-      context.detectionStreamRef.current = null;
-    }
-    context.setDetectingMotivation(null);
-    context.setMotivationDetectionProgress(null);
-  };
-}
 
 // src/lib/api-hooks.ts
 import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
 import {
   searchQuery,
   cloneToken,
-  entityType as entityType2,
+  entityType,
   userDID,
-  accessToken,
-  decodeWithCharset
-} from "@semiont/api-client";
+  accessToken
+} from "@semiont/core";
+import { decodeWithCharset } from "@semiont/api-client";
 import { extractResourceUriFromAnnotationUri, uriToAnnotationId } from "@semiont/core";
 
 // src/lib/query-keys.ts
@@ -992,7 +887,7 @@ function useEntityTypes() {
         return useMutation({
           mutationFn: (type) => {
             if (!client) throw new Error("Not authenticated");
-            return client.addEntityType(entityType2(type), { auth: toAccessToken(token2) });
+            return client.addEntityType(entityType(type), { auth: toAccessToken(token2) });
           },
           onSuccess: () => {
             queryClient.invalidateQueries({ queryKey: QUERY_KEYS.entityTypes.all() });
@@ -1006,7 +901,7 @@ function useEntityTypes() {
         return useMutation({
           mutationFn: (types2) => {
             if (!client) throw new Error("Not authenticated");
-            return client.addEntityTypesBulk(types2.map(entityType2), { auth: toAccessToken(token2) });
+            return client.addEntityTypesBulk(types2.map(entityType), { auth: toAccessToken(token2) });
           },
           onSuccess: () => {
             queryClient.invalidateQueries({ queryKey: QUERY_KEYS.entityTypes.all() });
@@ -17358,7 +17253,7 @@ var ReferenceResolutionWidget = class extends WidgetType {
         indicator.addEventListener("click", (e6) => {
           e6.preventDefault();
           e6.stopPropagation();
-          eventBus.emit("navigation:reference-navigate", { documentId: bodySource });
+          eventBus.get("navigation:reference-navigate").next({ documentId: bodySource });
         });
       } else if (!isResolved && this.eventBus) {
         const eventBus = this.eventBus;
@@ -17366,7 +17261,7 @@ var ReferenceResolutionWidget = class extends WidgetType {
         indicator.addEventListener("click", (e6) => {
           e6.preventDefault();
           e6.stopPropagation();
-          eventBus.emit("annotation:click", { annotationId: annotation.id, motivation: annotation.motivation });
+          eventBus.get("annotation:click").next({ annotationId: annotation.id, motivation: annotation.motivation });
         });
       }
     }
@@ -18066,7 +17961,9 @@ function isTag2(annotation) {
 function getTagCategory(annotation) {
   if (!isTag2(annotation)) return void 0;
   const bodies = Array.isArray(annotation.body) ? annotation.body : [annotation.body];
-  const taggingBody = bodies.find((b8) => b8 && "purpose" in b8 && b8.purpose === "tagging");
+  const taggingBody = bodies.find(
+    (b8) => b8 !== null && typeof b8 === "object" && "purpose" in b8 && b8.purpose === "tagging"
+  );
   if (taggingBody && "value" in taggingBody) {
     return taggingBody.value;
   }
@@ -18075,7 +17972,9 @@ function getTagCategory(annotation) {
 function getTagSchemaId(annotation) {
   if (!isTag2(annotation)) return void 0;
   const bodies = Array.isArray(annotation.body) ? annotation.body : [annotation.body];
-  const classifyingBody = bodies.find((b8) => b8 && "purpose" in b8 && b8.purpose === "classifying");
+  const classifyingBody = bodies.find(
+    (b8) => b8 !== null && typeof b8 === "object" && "purpose" in b8 && b8.purpose === "classifying"
+  );
   if (classifyingBody && "value" in classifyingBody) {
     return classifyingBody.value;
   }
@@ -18375,7 +18274,7 @@ import { useCallback as useCallback4 } from "react";
 function useObservableRouter(baseRouter) {
   const eventBus = useEventBus();
   const push2 = useCallback4((path2, options) => {
-    eventBus.emit("navigation:router-push", {
+    eventBus.get("navigation:router-push").next({
       path: path2,
       reason: options?.reason
     });
@@ -18383,7 +18282,7 @@ function useObservableRouter(baseRouter) {
   }, []);
   const replace3 = useCallback4((path2, options) => {
     if (!baseRouter.replace) return;
-    eventBus.emit("navigation:router-push", {
+    eventBus.get("navigation:router-push").next({
       path: path2,
       reason: options?.reason ? `replace:${options.reason}` : "replace"
     });
@@ -18404,7 +18303,7 @@ function useObservableExternalNavigation() {
       );
       window.location.href = url;
     }, 10);
-    eventBus.emit("navigation:external-navigate", {
+    eventBus.get("navigation:external-navigate").next({
       url,
       resourceId: metadata?.resourceId,
       cancelFallback: () => clearTimeout(fallbackTimer)
@@ -18448,7 +18347,7 @@ function usePanelWidth({
 
 // src/hooks/useResourceEvents.ts
 import { useEffect as useEffect4, useState as useState4, useRef as useRef4, useCallback as useCallback5 } from "react";
-import { accessToken as accessToken2 } from "@semiont/api-client";
+import { accessToken as accessToken2 } from "@semiont/core";
 function useResourceEvents({
   rUri,
   onEvent,
@@ -18464,6 +18363,7 @@ function useResourceEvents({
 }) {
   const client = useApiClient();
   const token = useAuthToken();
+  const eventBus = useEventBus();
   const [status, setStatus] = useState4("disconnected");
   const [lastEvent, setLastEvent] = useState4(null);
   const [eventCount, setEventCount] = useState4(0);
@@ -18519,6 +18419,12 @@ function useResourceEvents({
         break;
     }
   }, []);
+  useEffect4(() => {
+    const subscription = eventBus.get("make-meaning:event").subscribe((event) => {
+      handleEvent(event);
+    });
+    return () => subscription.unsubscribe();
+  }, [eventBus, handleEvent]);
   const connect = useCallback5(async () => {
     if (connectingRef.current || streamRef.current) {
       return;
@@ -18539,40 +18445,20 @@ function useResourceEvents({
     try {
       const stream = client.sse.resourceEvents(rUri, {
         ...token ? { auth: accessToken2(token) } : {},
-        onConnected: () => {
-          setStatus("connected");
-          reconnectAttemptsRef.current = 0;
-        }
+        eventBus
+        // ← Stream auto-emits to EventBus
       });
       streamRef.current = stream;
-      stream.onProgress((event) => {
-        handleEvent(event);
-      });
-      stream.onError((error) => {
-        console.error(`[ResourceEvents] Stream error for ${rUri}:`, error);
-        setStatus("error");
-        if (error.message.includes("404")) {
-          console.error(`[ResourceEvents] Document ${rUri} not found (404). Stopping reconnection attempts.`);
-          onErrorRef.current?.("Document not found");
-          streamRef.current = null;
-          connectingRef.current = false;
-          return;
-        }
-        reconnectAttemptsRef.current++;
-        const delay = reconnectAttemptsRef.current === 1 ? 100 : Math.min(1e3 * Math.pow(2, reconnectAttemptsRef.current - 2), 3e4);
-        reconnectTimeoutRef.current = setTimeout(() => {
-          if (!streamRef.current) {
-            connect();
-          }
-        }, delay);
-      });
+      setStatus("connected");
+      reconnectAttemptsRef.current = 0;
+      connectingRef.current = false;
     } catch (error) {
       console.error("[ResourceEvents] Failed to connect:", error);
       setStatus("error");
       onErrorRef.current?.("Failed to connect to event stream");
       connectingRef.current = false;
     }
-  }, [rUri, handleEvent, client]);
+  }, [rUri, client, token, eventBus]);
   const disconnect = useCallback5(() => {
     if (streamRef.current) {
       streamRef.current.close();
@@ -26693,7 +26579,7 @@ function CodeMirrorRenderer({
               const segment = segmentsRef.current.find((s11) => s11.annotation?.id === annotationId);
               if (segment?.annotation) {
                 event.preventDefault();
-                eventBusRef.current.emit("annotation:click", {
+                eventBusRef.current.get("annotation:click").next({
                   annotationId,
                   motivation: segment.annotation.motivation
                 });
@@ -26754,7 +26640,7 @@ function CodeMirrorRenderer({
     containerRef.current.__cmView = view;
     const container = view.dom;
     const { handleMouseEnter, handleMouseLeave, cleanup: cleanupHover } = createHoverHandlers(
-      (annotationId) => eventBusRef.current?.emit("annotation:hover", { annotationId })
+      (annotationId) => eventBusRef.current?.get("annotation:hover").next({ annotationId })
     );
     const handleMouseOver = (e6) => {
       const target = e6.target;
@@ -26899,7 +26785,7 @@ function DetectionProgressWidget({ progress, annotationType = "reference" }) {
   const t12 = useTranslations("DetectionProgressWidget");
   const eventBus = useEventBus();
   const handleCancel = () => {
-    eventBus.emit("job:cancel-requested", { jobType: "detection" });
+    eventBus.get("job:cancel-requested").next({ jobType: "detection" });
   };
   if (!progress) return null;
   return /* @__PURE__ */ jsxs2(
@@ -27194,7 +27080,7 @@ function Toolbar({
   const t12 = useTranslations("Toolbar");
   const eventBus = useEventBus();
   const handlePanelToggle = (panel) => {
-    eventBus.emit("panel:toggle", { panel });
+    eventBus.get("panel:toggle").next({ panel });
   };
   return /* @__PURE__ */ jsxs4("div", { className: "semiont-toolbar", "data-context": context, children: [
     context === "document" && /* @__PURE__ */ jsxs4(Fragment, { children: [
@@ -27310,7 +27196,7 @@ function SettingsPanel({
   const handleLocaleChange = (newLocale) => {
     const localeName = LOCALES.find((l10) => l10.code === newLocale)?.nativeName || newLocale;
     announceLanguageChanging(localeName);
-    eventBus.emit("settings:locale-changed", { locale: newLocale });
+    eventBus.get("settings:locale-changed").next({ locale: newLocale });
   };
   useEffect12(() => {
     if (locale !== previousLocale && !isPendingLocaleChange) {
@@ -27331,7 +27217,7 @@ function SettingsPanel({
               type: "button",
               role: "switch",
               "aria-checked": showLineNumbers,
-              onClick: () => eventBus.emit("settings:line-numbers-toggled", void 0),
+              onClick: () => eventBus.get("settings:line-numbers-toggled").next(void 0),
               className: `semiont-toggle ${showLineNumbers ? "semiont-toggle--active" : ""}`,
               children: /* @__PURE__ */ jsx14(
                 "span",
@@ -27350,7 +27236,7 @@ function SettingsPanel({
           /* @__PURE__ */ jsxs5(
             "button",
             {
-              onClick: () => eventBus.emit("settings:theme-changed", { theme: "light" }),
+              onClick: () => eventBus.get("settings:theme-changed").next({ theme: "light" }),
               className: `semiont-panel-button ${theme2 === "light" ? "semiont-panel-button-active" : ""}`,
               "aria-pressed": theme2 === "light",
               children: [
@@ -27362,7 +27248,7 @@ function SettingsPanel({
           /* @__PURE__ */ jsxs5(
             "button",
             {
-              onClick: () => eventBus.emit("settings:theme-changed", { theme: "dark" }),
+              onClick: () => eventBus.get("settings:theme-changed").next({ theme: "dark" }),
               className: `semiont-panel-button ${theme2 === "dark" ? "semiont-panel-button-active" : ""}`,
               "aria-pressed": theme2 === "dark",
               children: [
@@ -27374,7 +27260,7 @@ function SettingsPanel({
           /* @__PURE__ */ jsxs5(
             "button",
             {
-              onClick: () => eventBus.emit("settings:theme-changed", { theme: "system" }),
+              onClick: () => eventBus.get("settings:theme-changed").next({ theme: "system" }),
               className: `semiont-panel-button ${theme2 === "system" ? "semiont-panel-button-active" : ""}`,
               "aria-pressed": theme2 === "system",
               children: [
@@ -27531,9 +27417,9 @@ function AnnotateToolbar({
   }, []);
   const handleSelectionClick = (motivation) => {
     if (motivation === null) {
-      eventBus.emit("toolbar:selection-changed", { motivation: null });
+      eventBus.get("toolbar:selection-changed").next({ motivation: null });
     } else {
-      eventBus.emit("toolbar:selection-changed", {
+      eventBus.get("toolbar:selection-changed").next({
         motivation: selectedMotivation === motivation ? null : motivation
       });
     }
@@ -27541,17 +27427,17 @@ function AnnotateToolbar({
     setSelectionHovered(false);
   };
   const handleClickClick = (action) => {
-    eventBus.emit("toolbar:click-changed", { action });
+    eventBus.get("toolbar:click-changed").next({ action });
     setClickPinned(false);
     setClickHovered(false);
   };
   const handleShapeClick = (shape) => {
-    eventBus.emit("toolbar:shape-changed", { shape });
+    eventBus.get("toolbar:shape-changed").next({ shape });
     setShapePinned(false);
     setShapeHovered(false);
   };
   const handleModeToggle = () => {
-    eventBus.emit("view:mode-toggled", void 0);
+    eventBus.get("view:mode-toggled").next(void 0);
     setModePinned(false);
     setModeHovered(false);
   };
@@ -29636,7 +29522,7 @@ function AnnotationOverlay({
   const scaleX = displayWidth / imageWidth;
   const scaleY = displayHeight / imageHeight;
   const { handleMouseEnter, handleMouseLeave } = useMemo2(
-    () => createHoverHandlers((annotationId) => eventBus?.emit("annotation:hover", { annotationId })),
+    () => createHoverHandlers((annotationId) => eventBus?.get("annotation:hover").next({ annotationId })),
     [eventBus]
   );
   return /* @__PURE__ */ jsx18(
@@ -29677,7 +29563,7 @@ function AnnotationOverlay({
                   className: "semiont-annotation-overlay__shape",
                   "data-hovered": isHovered ? "true" : "false",
                   "data-selected": isSelected ? "true" : "false",
-                  onClick: () => eventBus?.emit("annotation:click", { annotationId: annotation.id, motivation: annotation.motivation }),
+                  onClick: () => eventBus?.get("annotation:click").next({ annotationId: annotation.id, motivation: annotation.motivation }),
                   onMouseEnter: () => handleMouseEnter(annotation.id),
                   onMouseLeave: handleMouseLeave
                 }
@@ -29692,7 +29578,7 @@ function AnnotationOverlay({
                   style: { userSelect: "none" },
                   onClick: (e6) => {
                     e6.stopPropagation();
-                    eventBus?.emit("annotation:click", { annotationId: annotation.id, motivation: annotation.motivation });
+                    eventBus?.get("annotation:click").next({ annotationId: annotation.id, motivation: annotation.motivation });
                   },
                   onMouseEnter: () => handleMouseEnter(annotation.id),
                   onMouseLeave: handleMouseLeave,
@@ -29722,7 +29608,7 @@ function AnnotationOverlay({
                   className: "semiont-annotation-overlay__shape",
                   "data-hovered": isHovered ? "true" : "false",
                   "data-selected": isSelected ? "true" : "false",
-                  onClick: () => eventBus?.emit("annotation:click", { annotationId: annotation.id, motivation: annotation.motivation }),
+                  onClick: () => eventBus?.get("annotation:click").next({ annotationId: annotation.id, motivation: annotation.motivation }),
                   onMouseEnter: () => handleMouseEnter(annotation.id),
                   onMouseLeave: handleMouseLeave
                 }
@@ -29737,7 +29623,7 @@ function AnnotationOverlay({
                   style: { userSelect: "none" },
                   onClick: (e6) => {
                     e6.stopPropagation();
-                    eventBus?.emit("annotation:click", { annotationId: annotation.id, motivation: annotation.motivation });
+                    eventBus?.get("annotation:click").next({ annotationId: annotation.id, motivation: annotation.motivation });
                   },
                   onMouseEnter: () => handleMouseEnter(annotation.id),
                   onMouseLeave: handleMouseLeave,
@@ -29771,7 +29657,7 @@ function AnnotationOverlay({
                   className: "semiont-annotation-overlay__shape",
                   "data-hovered": isHovered ? "true" : "false",
                   "data-selected": isSelected ? "true" : "false",
-                  onClick: () => eventBus?.emit("annotation:click", { annotationId: annotation.id, motivation: annotation.motivation }),
+                  onClick: () => eventBus?.get("annotation:click").next({ annotationId: annotation.id, motivation: annotation.motivation }),
                   onMouseEnter: () => handleMouseEnter(annotation.id),
                   onMouseLeave: handleMouseLeave
                 }
@@ -29786,7 +29672,7 @@ function AnnotationOverlay({
                   style: { userSelect: "none" },
                   onClick: (e6) => {
                     e6.stopPropagation();
-                    eventBus?.emit("annotation:click", { annotationId: annotation.id, motivation: annotation.motivation });
+                    eventBus?.get("annotation:click").next({ annotationId: annotation.id, motivation: annotation.motivation });
                   },
                   onMouseEnter: () => handleMouseEnter(annotation.id),
                   onMouseLeave: handleMouseLeave,
@@ -29942,7 +29828,7 @@ function SvgDrawingCanvas({
           return false;
         });
         if (clickedAnnotation) {
-          eventBus?.emit("annotation:click", { annotationId: clickedAnnotation.id, motivation: clickedAnnotation.motivation });
+          eventBus?.get("annotation:click").next({ annotationId: clickedAnnotation.id, motivation: clickedAnnotation.motivation });
           setIsDrawing(false);
           setStartPoint(null);
           setCurrentPoint(null);
@@ -29994,7 +29880,7 @@ function SvgDrawingCanvas({
       imageDimensions.height
     );
     if (eventBus && selectedMotivation) {
-      eventBus.emit("annotation:requested", {
+      eventBus.get("annotation:requested").next({
         selector: {
           type: "SvgSelector",
           value: nativeSvg
@@ -30417,9 +30303,10 @@ function ProposeEntitiesModal({
 
 // src/components/resource/AnnotateView.tsx
 import { useRef as useRef12, useEffect as useEffect18, useCallback as useCallback12, lazy, Suspense } from "react";
-import { getTextPositionSelector, getTextQuoteSelector, getTargetSelector, getMimeCategory, isPdfMimeType as isPdfMimeType2, resourceUri as toResourceUri, extractContext, findTextWithContext } from "@semiont/api-client";
+import { resourceUri as toResourceUri } from "@semiont/core";
+import { getTextPositionSelector, getTextQuoteSelector, getTargetSelector, getMimeCategory, isPdfMimeType as isPdfMimeType2, extractContext, findTextWithContext } from "@semiont/api-client";
 import { jsx as jsx22, jsxs as jsxs13 } from "react/jsx-runtime";
-var PdfAnnotationCanvas = lazy(() => import("./PdfAnnotationCanvas.client-FGV33CWN.mjs").then((mod) => ({ default: mod.PdfAnnotationCanvas })));
+var PdfAnnotationCanvas = lazy(() => import("./PdfAnnotationCanvas.client-VLNA5O5M.mjs").then((mod) => ({ default: mod.PdfAnnotationCanvas })));
 function segmentTextWithAnnotations(content4, annotations) {
   if (!content4) {
     return [{ exact: "", start: 0, end: 0 }];
@@ -30556,7 +30443,7 @@ function AnnotateView({
         const end2 = start3 + text7.length;
         const context = extractContext(content4, start3, end2);
         if (selectedMotivation) {
-          eventBus.emit("annotation:requested", {
+          eventBus.get("annotation:requested").next({
             selector: [
               {
                 type: "TextPositionSelector",
@@ -30582,7 +30469,7 @@ function AnnotateView({
       if (start2 >= 0) {
         const context = extractContext(content4, start2, end);
         if (selectedMotivation) {
-          eventBus.emit("annotation:requested", {
+          eventBus.get("annotation:requested").next({
             selector: [
               {
                 type: "TextPositionSelector",
@@ -45454,7 +45341,8 @@ function remarkGfm(options) {
 }
 
 // src/components/resource/BrowseView.tsx
-import { getExactText as getExactText2, getTextPositionSelector as getTextPositionSelector2, getTargetSelector as getTargetSelector3, getBodySource as getBodySource3, getMimeCategory as getMimeCategory2, isPdfMimeType as isPdfMimeType3, resourceUri as toResourceUri2 } from "@semiont/api-client";
+import { resourceUri as toResourceUri2 } from "@semiont/core";
+import { getExactText as getExactText2, getTextPositionSelector as getTextPositionSelector2, getTargetSelector as getTargetSelector3, getBodySource as getBodySource3, getMimeCategory as getMimeCategory2, isPdfMimeType as isPdfMimeType3 } from "@semiont/api-client";
 
 // src/components/viewers/ImageViewer.tsx
 import { jsx as jsx26 } from "react/jsx-runtime";
@@ -45474,7 +45362,7 @@ function ImageViewer({ resourceUri: resourceUri2, alt = "Resource image" }) {
 
 // src/components/resource/BrowseView.tsx
 import { jsx as jsx27, jsxs as jsxs17 } from "react/jsx-runtime";
-var PdfAnnotationCanvas2 = lazy2(() => import("./PdfAnnotationCanvas.client-FGV33CWN.mjs").then((mod) => ({ default: mod.PdfAnnotationCanvas })));
+var PdfAnnotationCanvas2 = lazy2(() => import("./PdfAnnotationCanvas.client-VLNA5O5M.mjs").then((mod) => ({ default: mod.PdfAnnotationCanvas })));
 function prepareAnnotations(annotations) {
   return annotations.map((ann) => {
     const targetSelector = getTargetSelector3(ann.target);
@@ -45521,12 +45409,12 @@ function BrowseView({
       if (annotationId && annotationType === "reference") {
         const annotation = allAnnotations.find((a15) => a15.id === annotationId);
         if (annotation) {
-          eventBus.emit("annotation:click", { annotationId, motivation: annotation.motivation });
+          eventBus.get("annotation:click").next({ annotationId, motivation: annotation.motivation });
         }
       }
     };
     const { handleMouseEnter, handleMouseLeave, cleanup: cleanupHover } = createHoverHandlers(
-      (annotationId) => eventBus.emit("annotation:hover", { annotationId })
+      (annotationId) => eventBus.get("annotation:hover").next({ annotationId })
     );
     const handleMouseOver = (e6) => {
       const target = e6.target;
@@ -45689,7 +45577,8 @@ function BrowseView({
 
 // src/components/resource/ResourceViewer.tsx
 import { useState as useState16, useEffect as useEffect23, useCallback as useCallback15, useRef as useRef16 } from "react";
-import { getExactText as getExactText3, getTargetSelector as getTargetSelector4, resourceUri, isHighlight as isHighlight4, isAssessment as isAssessment3, isReference as isReference4, isComment as isComment4, isTag as isTag5, getBodySource as getBodySource4 } from "@semiont/api-client";
+import { resourceUri } from "@semiont/core";
+import { getExactText as getExactText3, getTargetSelector as getTargetSelector4, isHighlight as isHighlight4, isAssessment as isAssessment3, isReference as isReference4, isComment as isComment4, isTag as isTag5, getBodySource as getBodySource4 } from "@semiont/api-client";
 import { jsx as jsx28, jsxs as jsxs18 } from "react/jsx-runtime";
 function ResourceViewer({
   resource,
@@ -45819,7 +45708,7 @@ function ResourceViewer({
     };
   };
   const handleDeleteAnnotation = useCallback15((id2) => {
-    eventBus.emit("annotation:delete", { annotationId: id2 });
+    eventBus.get("annotation:delete").next({ annotationId: id2 });
   }, []);
   const handleAnnotationClick = useCallback15((annotation, event) => {
     const metadata = Object.values(ANNOTATORS).find((a15) => a15.matchesAnnotation(annotation));
@@ -45873,7 +45762,7 @@ function ResourceViewer({
       }
       return;
     }
-    eventBus.emit("panel:open", { panel: "annotations", scrollToAnnotationId: annotationId, motivation });
+    eventBus.get("panel:open").next({ panel: "annotations", scrollToAnnotationId: annotationId, motivation });
   }, [highlights, references, assessments, comments, tags3, handleAnnotationClick, selectedClick]);
   useEventSubscriptions({
     // View mode
@@ -46053,7 +45942,7 @@ var AssessmentEntry = forwardRef(
         "data-type": "assessment",
         "data-focused": isFocused ? "true" : "false",
         onClick: () => {
-          eventBus.emit("annotation:click", { annotationId: assessment.id, motivation: assessment.motivation });
+          eventBus.get("annotation:click").next({ annotationId: assessment.id, motivation: assessment.motivation });
         },
         ...hoverProps,
         children: [
@@ -46107,7 +45996,7 @@ function DetectSection({
   }, [isExpanded, annotationType]);
   const handleDetect = useCallback16(() => {
     const motivation = annotationType === "highlight" ? "highlighting" : annotationType === "assessment" ? "assessing" : "commenting";
-    eventBus.emit("detection:start", {
+    eventBus.get("detection:start").next({
       motivation,
       options: {
         instructions: instructions.trim() || void 0,
@@ -46119,7 +46008,7 @@ function DetectSection({
     setTone("");
   }, [annotationType, instructions, tone, useDensity, density]);
   const handleDismissProgress = useCallback16(() => {
-    eventBus.emit("detection:dismiss-progress", void 0);
+    eventBus.get("detection:dismiss-progress").next(void 0);
   }, []);
   return /* @__PURE__ */ jsxs20("div", { className: "semiont-panel__section", children: [
     /* @__PURE__ */ jsxs20(
@@ -46376,7 +46265,7 @@ function AssessmentPanel({
   const handleSaveNewAssessment = () => {
     if (pendingAnnotation) {
       const body = newAssessmentText.trim() ? [{ type: "TextualBody", value: newAssessmentText, purpose: "assessing" }] : [];
-      eventBus.emit("annotation:create", {
+      eventBus.get("annotation:create").next({
         motivation: "assessing",
         selector: pendingAnnotation.selector,
         body
@@ -46388,7 +46277,7 @@ function AssessmentPanel({
     if (!pendingAnnotation) return;
     const handleEscape = (e6) => {
       if (e6.key === "Escape") {
-        eventBus.emit("annotation:cancel-pending", void 0);
+        eventBus.get("annotation:cancel-pending").next(void 0);
         setNewAssessmentText("");
       }
     };
@@ -46434,7 +46323,7 @@ function AssessmentPanel({
             "button",
             {
               onClick: () => {
-                eventBus.emit("annotation:cancel-pending", void 0);
+                eventBus.get("annotation:cancel-pending").next(void 0);
                 setNewAssessmentText("");
               },
               className: "semiont-button semiont-button--secondary",
@@ -46616,7 +46505,7 @@ var CommentEntry = forwardRef2(
         "data-type": "comment",
         "data-focused": isFocused ? "true" : "false",
         onClick: () => {
-          eventBus.emit("annotation:click", { annotationId: comment2.id, motivation: comment2.motivation });
+          eventBus.get("annotation:click").next({ annotationId: comment2.id, motivation: comment2.motivation });
         },
         ...hoverProps,
         children: [
@@ -46777,7 +46666,7 @@ function CommentsPanel({
   });
   const handleSaveNewComment = () => {
     if (newCommentText.trim() && pendingAnnotation) {
-      eventBus.emit("annotation:create", {
+      eventBus.get("annotation:create").next({
         motivation: "commenting",
         selector: pendingAnnotation.selector,
         body: [{ type: "TextualBody", value: newCommentText, purpose: "commenting" }]
@@ -46789,7 +46678,7 @@ function CommentsPanel({
     if (!pendingAnnotation) return;
     const handleEscape = (e6) => {
       if (e6.key === "Escape") {
-        eventBus.emit("annotation:cancel-pending", void 0);
+        eventBus.get("annotation:cancel-pending").next(void 0);
         setNewCommentText("");
       }
     };
@@ -46828,7 +46717,7 @@ function CommentsPanel({
             "button",
             {
               onClick: () => {
-                eventBus.emit("annotation:cancel-pending", void 0);
+                eventBus.get("annotation:cancel-pending").next(void 0);
                 setNewCommentText("");
               },
               className: "semiont-button semiont-button--secondary",
@@ -46908,7 +46797,7 @@ var HighlightEntry = forwardRef3(
         "data-type": "highlight",
         "data-focused": isFocused ? "true" : "false",
         onClick: () => {
-          eventBus.emit("annotation:click", { annotationId: highlight.id, motivation: highlight.motivation });
+          eventBus.get("annotation:click").next({ annotationId: highlight.id, motivation: highlight.motivation });
         },
         ...hoverProps,
         children: [
@@ -47004,7 +46893,7 @@ function HighlightPanel({
   });
   useEffect28(() => {
     if (pendingAnnotation && pendingAnnotation.motivation === "highlighting") {
-      eventBus.emit("annotation:create", {
+      eventBus.get("annotation:create").next({
         motivation: "highlighting",
         selector: pendingAnnotation.selector,
         body: []
@@ -47143,7 +47032,7 @@ var ReferenceEntry = forwardRef4(
       }
     };
     const handleComposeDocument = () => {
-      eventBus.emit("reference:create-manual", {
+      eventBus.get("reference:create-manual").next({
         annotationUri: reference.id,
         title: selectedText,
         entityTypes
@@ -47152,7 +47041,7 @@ var ReferenceEntry = forwardRef4(
     const handleUnlink = () => {
       const sourceUri = typeof reference.target === "object" && "source" in reference.target ? reference.target.source : "";
       if (sourceUri) {
-        eventBus.emit("annotation:update-body", {
+        eventBus.get("annotation:update-body").next({
           annotationUri: reference.id,
           resourceId: sourceUri.split("/resources/")[1] || "",
           operations: [{ op: "remove" }]
@@ -47162,14 +47051,14 @@ var ReferenceEntry = forwardRef4(
     };
     const handleGenerate = () => {
       const resourceUri2 = typeof reference.target === "object" && "source" in reference.target ? reference.target.source : "";
-      eventBus.emit("generation:modal-open", {
+      eventBus.get("generation:modal-open").next({
         annotationUri: reference.id,
         resourceUri: resourceUri2,
         defaultTitle: selectedText
       });
     };
     const handleSearch = () => {
-      eventBus.emit("reference:link", {
+      eventBus.get("reference:link").next({
         annotationUri: reference.id,
         searchTerm: selectedText
       });
@@ -47182,7 +47071,7 @@ var ReferenceEntry = forwardRef4(
         "data-type": "reference",
         "data-focused": isFocused ? "true" : "false",
         onClick: () => {
-          eventBus.emit("annotation:click", { annotationId: reference.id, motivation: reference.motivation });
+          eventBus.get("annotation:click").next({ annotationId: reference.id, motivation: reference.motivation });
         },
         ...hoverProps,
         children: [
@@ -47385,7 +47274,7 @@ function ReferencesPanel({
   });
   const handleDetect = () => {
     setLastDetectionLog(null);
-    eventBus.emit("detection:start", {
+    eventBus.get("detection:start").next({
       motivation: "linking",
       options: {
         entityTypes: selectedEntityTypes,
@@ -47412,11 +47301,11 @@ function ReferencesPanel({
   };
   const handleCreateReference = () => {
     if (pendingAnnotation) {
-      const entityType4 = pendingEntityTypes.join(",") || void 0;
-      eventBus.emit("annotation:create", {
+      const entityType3 = pendingEntityTypes.join(",") || void 0;
+      eventBus.get("annotation:create").next({
         motivation: "linking",
         selector: pendingAnnotation.selector,
-        body: entityType4 ? [{ type: "TextualBody", value: entityType4, purpose: "tagging" }] : []
+        body: entityType3 ? [{ type: "TextualBody", value: entityType3, purpose: "tagging" }] : []
       });
       setPendingEntityTypes([]);
     }
@@ -47425,7 +47314,7 @@ function ReferencesPanel({
     if (!pendingAnnotation) return;
     const handleEscape = (e6) => {
       if (e6.key === "Escape") {
-        eventBus.emit("annotation:cancel-pending", void 0);
+        eventBus.get("annotation:cancel-pending").next(void 0);
         setPendingEntityTypes([]);
       }
     };
@@ -47460,7 +47349,7 @@ function ReferencesPanel({
           "button",
           {
             onClick: () => {
-              eventBus.emit("annotation:cancel-pending", void 0);
+              eventBus.get("annotation:cancel-pending").next(void 0);
               setPendingEntityTypes([]);
             },
             className: "semiont-button semiont-button--secondary",
@@ -47689,7 +47578,7 @@ function ResourceInfoPanel({
       /* @__PURE__ */ jsxs31(
         "button",
         {
-          onClick: () => eventBus.emit("resource:clone", void 0),
+          onClick: () => eventBus.get("resource:clone").next(void 0),
           className: "semiont-resource-button semiont-resource-button--secondary",
           children: [
             "\u{1F517} ",
@@ -47703,7 +47592,7 @@ function ResourceInfoPanel({
       /* @__PURE__ */ jsxs31(
         "button",
         {
-          onClick: () => eventBus.emit("resource:unarchive", void 0),
+          onClick: () => eventBus.get("resource:unarchive").next(void 0),
           className: "semiont-resource-button semiont-resource-button--secondary",
           children: [
             "\u{1F4E4} ",
@@ -47716,7 +47605,7 @@ function ResourceInfoPanel({
       /* @__PURE__ */ jsxs31(
         "button",
         {
-          onClick: () => eventBus.emit("resource:archive", void 0),
+          onClick: () => eventBus.get("resource:archive").next(void 0),
           className: "semiont-resource-button semiont-resource-button--archive",
           children: [
             "\u{1F4E6} ",
@@ -47822,7 +47711,7 @@ var TagEntry = forwardRef5(
       {
         ref,
         onClick: () => {
-          eventBus.emit("annotation:click", { annotationId: tag.id, motivation: tag.motivation });
+          eventBus.get("annotation:click").next({ annotationId: tag.id, motivation: tag.motivation });
         },
         ...hoverProps,
         className: `semiont-annotation-entry${isHovered ? " semiont-annotation-pulse" : ""}`,
@@ -47966,7 +47855,7 @@ function TaggingPanel({
   };
   const handleDetect = () => {
     if (selectedCategories.size > 0) {
-      eventBus.emit("detection:start", {
+      eventBus.get("detection:start").next({
         motivation: "tagging",
         options: {
           schemaId: selectedSchemaId,
@@ -47980,7 +47869,7 @@ function TaggingPanel({
     if (!pendingAnnotation) return;
     const handleEscape = (e6) => {
       if (e6.key === "Escape") {
-        eventBus.emit("annotation:cancel-pending", void 0);
+        eventBus.get("annotation:cancel-pending").next(void 0);
       }
     };
     document.addEventListener("keydown", handleEscape);
@@ -48018,7 +47907,7 @@ function TaggingPanel({
               className: "semiont-select",
               onChange: (e6) => {
                 if (e6.target.value && pendingAnnotation) {
-                  eventBus.emit("annotation:create", {
+                  eventBus.get("annotation:create").next({
                     motivation: "tagging",
                     selector: pendingAnnotation.selector,
                     body: [
@@ -48047,7 +47936,7 @@ function TaggingPanel({
         /* @__PURE__ */ jsx43("div", { className: "semiont-annotation-prompt__footer", children: /* @__PURE__ */ jsx43(
           "button",
           {
-            onClick: () => eventBus.emit("annotation:cancel-pending", void 0),
+            onClick: () => eventBus.get("annotation:cancel-pending").next(void 0),
             className: "semiont-button semiont-button--secondary",
             "data-type": "tag",
             children: t12("cancel")
@@ -48548,7 +48437,7 @@ function ObservableLink({
     onClickRef.current = onClick;
   });
   const handleClick = useCallback22((e6) => {
-    eventBus.emit("navigation:link-clicked", {
+    eventBus.get("navigation:link-clicked").next({
       href,
       label
     });
@@ -48615,7 +48504,7 @@ function SimpleNavigation({
         /* @__PURE__ */ jsx48(
           "button",
           {
-            onClick: () => eventBus.emit("navigation:sidebar-toggle", void 0),
+            onClick: () => eventBus.get("navigation:sidebar-toggle").next(void 0),
             className: "semiont-nav-section__header-icon",
             title: isCollapsed ? expandSidebarLabel : collapseSidebarLabel,
             "aria-label": isCollapsed ? expandSidebarLabel : collapseSidebarLabel,
@@ -52842,14 +52731,14 @@ function CollapsibleResourceNavigation({
       announceCannotMove(direction);
       return;
     }
-    eventBus.emit("navigation:resource-reorder", { oldIndex: currentIndex, newIndex });
+    eventBus.get("navigation:resource-reorder").next({ oldIndex: currentIndex, newIndex });
     const resource = resources[currentIndex];
     announceKeyboardReorder(resource.name, direction, newIndex + 1, resources.length);
   }, [resources]);
   const handleResourceClose = (resourceId, e6) => {
     e6.preventDefault();
     e6.stopPropagation();
-    eventBus.emit("navigation:resource-close", { resourceId });
+    eventBus.get("navigation:resource-close").next({ resourceId });
     const resourceHref = getResourceHref(resourceId);
     if (currentPath === resourceHref && onNavigate && fixedItems.length > 0) {
       onNavigate(fixedItems[0].href);
@@ -52869,7 +52758,7 @@ function CollapsibleResourceNavigation({
       const oldIndex = resources.findIndex((resource) => resource.id === active.id);
       const newIndex = resources.findIndex((resource) => resource.id === over.id);
       if (oldIndex !== -1 && newIndex !== -1) {
-        eventBus.emit("navigation:resource-reorder", { oldIndex, newIndex });
+        eventBus.get("navigation:resource-reorder").next({ oldIndex, newIndex });
         const resource = resources[oldIndex];
         announceDrop(resource.name, newIndex + 1, resources.length);
       }
@@ -52896,7 +52785,7 @@ function CollapsibleResourceNavigation({
           /* @__PURE__ */ jsx50(
             "button",
             {
-              onClick: () => eventBus.emit("navigation:sidebar-toggle", void 0),
+              onClick: () => eventBus.get("navigation:sidebar-toggle").next(void 0),
               className: "semiont-nav-section__header-icon",
               title: isCollapsed ? mergedTranslations.expandSidebar : mergedTranslations.collapseSidebar,
               "aria-label": isCollapsed ? mergedTranslations.expandSidebar : mergedTranslations.collapseSidebar,
@@ -56329,8 +56218,8 @@ function ResourceDiscoveryPage({
   );
   const onNavigateToResourceRef = useRef31(onNavigateToResource);
   onNavigateToResourceRef.current = onNavigateToResource;
-  const handleEntityTypeFilter = useCallback30((entityType4) => {
-    setSelectedEntityType(entityType4);
+  const handleEntityTypeFilter = useCallback30((entityType3) => {
+    setSelectedEntityType(entityType3);
   }, []);
   const openResource = useCallback30((resource) => {
     const resourceId = getResourceId2(resource);
@@ -56472,12 +56361,13 @@ function ResourceDiscoveryPage({
 // src/features/resource-viewer/components/ResourceViewerPage.tsx
 import { useState as useState44, useEffect as useEffect49, useCallback as useCallback35, useMemo as useMemo12 } from "react";
 import { useQueryClient as useQueryClient2 } from "@tanstack/react-query";
-import { getLanguage, getPrimaryRepresentation, resourceAnnotationUri as resourceAnnotationUri3, getPrimaryMediaType as getPrimaryMediaType2 } from "@semiont/api-client";
+import { resourceAnnotationUri as resourceAnnotationUri3 } from "@semiont/core";
+import { getLanguage, getPrimaryRepresentation, getPrimaryMediaType as getPrimaryMediaType2 } from "@semiont/api-client";
 import { uriToAnnotationId as uriToAnnotationId2 } from "@semiont/core";
 
 // src/hooks/useResolutionFlow.ts
 import { useCallback as useCallback31, useEffect as useEffect44, useRef as useRef32, useState as useState39 } from "react";
-import { resourceAnnotationUri, accessToken as accessToken3 } from "@semiont/api-client";
+import { resourceAnnotationUri, accessToken as accessToken3 } from "@semiont/core";
 import { uriToAnnotationIdOrPassthrough } from "@semiont/core";
 function toAccessToken2(token) {
   return token ? accessToken3(token) : void 0;
@@ -56512,23 +56402,23 @@ function useResolutionFlow(rUri) {
           resourceId: event.resourceId,
           operations: event.operations
         }, { auth: toAccessToken2(tokenRef.current) });
-        eventBus.emit("annotation:body-updated", { annotationUri: event.annotationUri });
+        eventBus.get("annotation:body-updated").next({ annotationUri: event.annotationUri });
       } catch (error) {
         console.error("Failed to update annotation body:", error);
-        eventBus.emit("annotation:body-update-failed", { error });
+        eventBus.get("annotation:body-update-failed").next({ error });
       }
     };
     const handleReferenceLink = (event) => {
-      eventBus.emit("resolution:search-requested", {
+      eventBus.get("resolution:search-requested").next({
         referenceId: event.annotationUri,
         searchTerm: event.searchTerm
       });
     };
-    eventBus.on("annotation:update-body", handleAnnotationUpdateBody);
-    eventBus.on("reference:link", handleReferenceLink);
+    const subscription1 = eventBus.get("annotation:update-body").subscribe(handleAnnotationUpdateBody);
+    const subscription2 = eventBus.get("reference:link").subscribe(handleReferenceLink);
     return () => {
-      eventBus.off("annotation:update-body", handleAnnotationUpdateBody);
-      eventBus.off("reference:link", handleReferenceLink);
+      subscription1.unsubscribe();
+      subscription2.unsubscribe();
     };
   }, [eventBus]);
   useEffect44(() => {
@@ -56536,17 +56426,15 @@ function useResolutionFlow(rUri) {
       setPendingReferenceId(event.referenceId);
       setSearchModalOpen(true);
     };
-    eventBus.on("resolution:search-requested", handleResolutionSearchRequested);
-    return () => {
-      eventBus.off("resolution:search-requested", handleResolutionSearchRequested);
-    };
+    const subscription = eventBus.get("resolution:search-requested").subscribe(handleResolutionSearchRequested);
+    return () => subscription.unsubscribe();
   }, [eventBus]);
   return { searchModalOpen, pendingReferenceId, onCloseSearchModal };
 }
 
 // src/hooks/useDetectionFlow.ts
 import { useState as useState40, useRef as useRef33, useEffect as useEffect45, useCallback as useCallback32 } from "react";
-import { resourceAnnotationUri as resourceAnnotationUri2, accessToken as accessToken4, entityType as entityType3 } from "@semiont/api-client";
+import { resourceAnnotationUri as resourceAnnotationUri2, accessToken as accessToken4, entityType as entityType2 } from "@semiont/core";
 import { uriToAnnotationIdOrPassthrough as uriToAnnotationIdOrPassthrough2 } from "@semiont/core";
 function toAccessToken3(token) {
   return token ? accessToken4(token) : void 0;
@@ -56584,7 +56472,7 @@ function useDetectionFlow(rUri) {
       questioning: "annotations",
       replying: "annotations"
     };
-    eventBus.emit("panel:open", { panel: MOTIVATION_TO_TAB[pending.motivation] || "annotations" });
+    eventBus.get("panel:open").next({ panel: MOTIVATION_TO_TAB[pending.motivation] || "annotations" });
     setPendingAnnotation(pending);
   }, []);
   const selectionToSelector = useCallback32((selection2) => {
@@ -56687,11 +56575,11 @@ function useDetectionFlow(rUri) {
         }, { auth: toAccessToken3(tokenRef.current) });
         if (result.annotation) {
           setPendingAnnotation(null);
-          eventBus.emit("annotation:created", { annotation: result.annotation });
+          eventBus.get("annotation:created").next({ annotation: result.annotation });
         }
       } catch (error) {
         console.error("Failed to create annotation:", error);
-        eventBus.emit("annotation:create-failed", { error });
+        eventBus.get("annotation:create-failed").next({ error });
       }
     };
     const handleAnnotationDelete = async (event) => {
@@ -56701,10 +56589,10 @@ function useDetectionFlow(rUri) {
         const annotationIdSegment = uriToAnnotationIdOrPassthrough2(event.annotationId);
         const annotationUri2 = resourceAnnotationUri2(`${currentRUri}/annotations/${annotationIdSegment}`);
         await currentClient.deleteAnnotation(annotationUri2, { auth: toAccessToken3(tokenRef.current) });
-        eventBus.emit("annotation:deleted", { annotationId: event.annotationId });
+        eventBus.get("annotation:deleted").next({ annotationId: event.annotationId });
       } catch (error) {
         console.error("Failed to delete annotation:", error);
-        eventBus.emit("annotation:delete-failed", { error });
+        eventBus.get("annotation:delete-failed").next({ error });
       }
     };
     const handleDetectionStart = async (event) => {
@@ -56722,103 +56610,43 @@ function useDetectionFlow(rUri) {
         }
         setDetectingMotivation(event.motivation);
         setDetectionProgress(null);
-        const auth = { auth: toAccessToken3(tokenRef.current) };
+        const auth = { auth: toAccessToken3(tokenRef.current), eventBus };
         if (event.motivation === "tagging") {
           const { schemaId, categories } = event.options;
           if (!schemaId || !categories || categories.length === 0) {
             throw new Error("Tag detection requires schemaId and categories");
           }
-          const stream = currentClient.sse.detectTags(currentRUri, { schemaId, categories }, auth);
-          stream.onProgress((chunk) => {
-            eventBus.emit("detection:progress", chunk);
-          });
-          stream.onComplete((finalChunk) => {
-            eventBus.emit("detection:progress", finalChunk);
-            eventBus.emit("detection:complete", { motivation: event.motivation });
-          });
-          stream.onError((error) => {
-            console.error("Detection failed:", error);
-            setDetectingMotivation(null);
-            setDetectionProgress(null);
-          });
+          currentClient.sse.detectTags(currentRUri, { schemaId, categories }, auth);
         } else if (event.motivation === "linking") {
           const { entityTypes, includeDescriptiveReferences } = event.options;
           if (!entityTypes || entityTypes.length === 0) {
             throw new Error("Reference detection requires entityTypes");
           }
-          const stream = currentClient.sse.detectReferences(currentRUri, {
-            entityTypes: entityTypes.map((et) => entityType3(et)),
+          currentClient.sse.detectReferences(currentRUri, {
+            entityTypes: entityTypes.map((et) => entityType2(et)),
             includeDescriptiveReferences: includeDescriptiveReferences || false
           }, auth);
-          stream.onProgress((chunk) => {
-            eventBus.emit("detection:progress", chunk);
-          });
-          stream.onComplete((finalChunk) => {
-            eventBus.emit("detection:progress", finalChunk);
-            eventBus.emit("detection:complete", { motivation: event.motivation });
-          });
-          stream.onError((error) => {
-            console.error("[useDetectionFlow] Detection failed:", error);
-            setDetectingMotivation(null);
-            setDetectionProgress(null);
-          });
         } else if (event.motivation === "highlighting") {
-          const stream = currentClient.sse.detectHighlights(currentRUri, {
+          currentClient.sse.detectHighlights(currentRUri, {
             instructions: event.options.instructions,
             density: event.options.density
           }, auth);
-          stream.onProgress((chunk) => {
-            eventBus.emit("detection:progress", chunk);
-          });
-          stream.onComplete((finalChunk) => {
-            eventBus.emit("detection:progress", finalChunk);
-            eventBus.emit("detection:complete", { motivation: event.motivation });
-          });
-          stream.onError((error) => {
-            console.error("Detection failed:", error);
-            setDetectingMotivation(null);
-            setDetectionProgress(null);
-          });
         } else if (event.motivation === "assessing") {
-          const stream = currentClient.sse.detectAssessments(currentRUri, {
+          currentClient.sse.detectAssessments(currentRUri, {
             instructions: event.options.instructions,
             tone: event.options.tone,
             density: event.options.density
           }, auth);
-          stream.onProgress((chunk) => {
-            eventBus.emit("detection:progress", chunk);
-          });
-          stream.onComplete((finalChunk) => {
-            eventBus.emit("detection:progress", finalChunk);
-            eventBus.emit("detection:complete", { motivation: event.motivation });
-          });
-          stream.onError((error) => {
-            console.error("[useDetectionFlow] Assessment detection error:", error);
-            setDetectingMotivation(null);
-            setDetectionProgress(null);
-          });
         } else if (event.motivation === "commenting") {
-          const stream = currentClient.sse.detectComments(currentRUri, {
+          currentClient.sse.detectComments(currentRUri, {
             instructions: event.options.instructions,
             tone: event.options.tone,
             density: event.options.density
           }, auth);
-          stream.onProgress((chunk) => {
-            eventBus.emit("detection:progress", chunk);
-          });
-          stream.onComplete((finalChunk) => {
-            eventBus.emit("detection:progress", finalChunk);
-            eventBus.emit("detection:complete", { motivation: event.motivation });
-          });
-          stream.onError((error) => {
-            console.error("Detection failed:", error);
-            setDetectingMotivation(null);
-            setDetectionProgress(null);
-          });
         }
       } catch (error) {
         if (error instanceof Error && error.name === "AbortError") {
-          eventBus.emit("detection:cancelled", void 0);
+          eventBus.get("detection:cancelled").next(void 0);
         } else {
           console.error("Detection failed:", error);
           setDetectingMotivation(null);
@@ -56832,15 +56660,15 @@ function useDetectionFlow(rUri) {
         detectionStreamRef.current = null;
       }
     };
-    eventBus.on("annotation:create", handleAnnotationCreate);
-    eventBus.on("annotation:delete", handleAnnotationDelete);
-    eventBus.on("detection:start", handleDetectionStart);
-    eventBus.on("job:cancel-requested", handleJobCancelRequested);
+    const subscription1 = eventBus.get("annotation:create").subscribe(handleAnnotationCreate);
+    const subscription2 = eventBus.get("annotation:delete").subscribe(handleAnnotationDelete);
+    const subscription3 = eventBus.get("detection:start").subscribe(handleDetectionStart);
+    const subscription4 = eventBus.get("job:cancel-requested").subscribe(handleJobCancelRequested);
     return () => {
-      eventBus.off("annotation:create", handleAnnotationCreate);
-      eventBus.off("annotation:delete", handleAnnotationDelete);
-      eventBus.off("detection:start", handleDetectionStart);
-      eventBus.off("job:cancel-requested", handleJobCancelRequested);
+      subscription1.unsubscribe();
+      subscription2.unsubscribe();
+      subscription3.unsubscribe();
+      subscription4.unsubscribe();
       detectionStreamRef.current?.abort();
     };
   }, [eventBus]);
@@ -56934,7 +56762,7 @@ function usePanelNavigation() {
 
 // src/hooks/useGenerationFlow.ts
 import { useState as useState42, useCallback as useCallback34, useEffect as useEffect47, useRef as useRef34 } from "react";
-import { annotationUri, accessToken as accessToken5 } from "@semiont/api-client";
+import { annotationUri, accessToken as accessToken5 } from "@semiont/core";
 function toAccessToken4(token) {
   return token ? accessToken5(token) : void 0;
 }
@@ -56972,7 +56800,7 @@ function useGenerationFlow(locale, resourceId, showSuccess, showError, cacheMana
     }
     clearNewAnnotationId(annotationUri(referenceId));
     const resourceUriStr = `resource://${resourceId}`;
-    eventBus.emit("generation:start", {
+    eventBus.get("generation:start").next({
       annotationUri: referenceId,
       resourceUri: resourceUriStr,
       options: {
@@ -56991,7 +56819,7 @@ function useGenerationFlow(locale, resourceId, showSuccess, showError, cacheMana
     setGenerationReferenceId(annUri);
     setGenerationDefaultTitle(defaultTitle);
     setGenerationModalOpen(true);
-    eventBus.emit("context:retrieval-requested", { annotationUri: annUri, resourceUri: resourceUri2 });
+    eventBus.get("context:retrieval-requested").next({ annotationUri: annUri, resourceUri: resourceUri2 });
   }, []);
   const handleGenerationComplete = useCallback34(({ progress }) => {
     setGenerationProgress(progress);
@@ -57017,34 +56845,18 @@ function useGenerationFlow(locale, resourceId, showSuccess, showError, cacheMana
       try {
         generationStreamRef.current?.abort();
         generationStreamRef.current = new AbortController();
-        const stream = clientRef.current.sse.generateResourceFromAnnotation(
+        clientRef.current.sse.generateResourceFromAnnotation(
           event.resourceUri,
           event.annotationUri,
           event.options,
-          { auth: toAccessToken4(tokenRef.current) }
+          { auth: toAccessToken4(tokenRef.current), eventBus }
         );
-        stream.onProgress((chunk) => {
-          console.log("[useGenerationFlow] Generation progress chunk received", chunk);
-          eventBus.emit("generation:progress", chunk);
-        });
-        stream.onComplete((finalChunk) => {
-          console.log("[useGenerationFlow] Generation complete with final chunk", finalChunk);
-          eventBus.emit("generation:progress", finalChunk);
-          eventBus.emit("generation:complete", {
-            annotationUri: event.annotationUri,
-            progress: finalChunk
-          });
-        });
-        stream.onError((error) => {
-          console.error("[useGenerationFlow] Generation failed:", error);
-          eventBus.emit("generation:failed", { error });
-        });
       } catch (error) {
         if (error.name === "AbortError") {
           console.log("[useGenerationFlow] Generation cancelled");
         } else {
           console.error("[useGenerationFlow] Generation failed:", error);
-          eventBus.emit("generation:failed", { error });
+          eventBus.get("generation:failed").next({ error });
         }
       }
     };
@@ -57064,13 +56876,13 @@ function useGenerationFlow(locale, resourceId, showSuccess, showError, cacheMana
       });
       window.location.href = `${baseUrl}/know/compose?${params.toString()}`;
     };
-    eventBus.on("generation:start", handleGenerationStart);
-    eventBus.on("job:cancel-requested", handleJobCancelRequested);
-    eventBus.on("reference:create-manual", handleReferenceCreateManual);
+    const subscription1 = eventBus.get("generation:start").subscribe(handleGenerationStart);
+    const subscription2 = eventBus.get("job:cancel-requested").subscribe(handleJobCancelRequested);
+    const subscription3 = eventBus.get("reference:create-manual").subscribe(handleReferenceCreateManual);
     return () => {
-      eventBus.off("generation:start", handleGenerationStart);
-      eventBus.off("job:cancel-requested", handleJobCancelRequested);
-      eventBus.off("reference:create-manual", handleReferenceCreateManual);
+      subscription1.unsubscribe();
+      subscription2.unsubscribe();
+      subscription3.unsubscribe();
       generationStreamRef.current?.abort();
     };
   }, [eventBus, resourceId]);
@@ -57093,11 +56905,11 @@ function useGenerationFlow(locale, resourceId, showSuccess, showError, cacheMana
 
 // src/hooks/useContextRetrievalFlow.ts
 import { useState as useState43, useEffect as useEffect48, useRef as useRef35 } from "react";
-import { accessToken as accessToken6 } from "@semiont/api-client";
+import { accessToken as accessToken6 } from "@semiont/core";
 function toAccessToken5(token) {
   return token ? accessToken6(token) : void 0;
 }
-function useContextRetrievalFlow(emitter, config) {
+function useContextRetrievalFlow(eventBus, config) {
   const token = useAuthToken();
   const [retrievalContext, setRetrievalContext] = useState43(null);
   const [retrievalLoading, setRetrievalLoading] = useState43(false);
@@ -57129,7 +56941,7 @@ function useContextRetrievalFlow(emitter, config) {
         setRetrievalContext(context);
         setRetrievalLoading(false);
         if (context) {
-          emitter.emit("context:retrieval-complete", {
+          eventBus.get("context:retrieval-complete").next({
             annotationUri: event.annotationUri,
             context
           });
@@ -57138,17 +56950,15 @@ function useContextRetrievalFlow(emitter, config) {
         const err = error;
         setRetrievalError(err);
         setRetrievalLoading(false);
-        emitter.emit("context:retrieval-failed", {
+        eventBus.get("context:retrieval-failed").next({
           annotationUri: event.annotationUri,
           error: err
         });
       }
     };
-    emitter.on("context:retrieval-requested", handleContextRetrievalRequested);
-    return () => {
-      emitter.off("context:retrieval-requested", handleContextRetrievalRequested);
-    };
-  }, [emitter]);
+    const subscription = eventBus.get("context:retrieval-requested").subscribe(handleContextRetrievalRequested);
+    return () => subscription.unsubscribe();
+  }, [eventBus]);
   return { retrievalContext, retrievalLoading, retrievalError, retrievalAnnotationUri };
 }
 
@@ -57310,7 +57120,7 @@ function ResourceViewerPage({
     try {
       const result2 = await generateCloneTokenMutation.mutateAsync(rUri);
       const token = result2.token;
-      eventBus.emit("navigation:router-push", { path: `/know/compose?mode=clone&token=${token}`, reason: "clone" });
+      eventBus.get("navigation:router-push").next({ path: `/know/compose?mode=clone&token=${token}`, reason: "clone" });
     } catch (err) {
       console.error("Failed to generate clone token:", err);
       showError("Failed to generate clone link");
@@ -57340,13 +57150,13 @@ function ResourceViewerPage({
   const handleReferenceNavigate = useCallback35(({ documentId }) => {
     if (routes.resource) {
       const path2 = routes.resource.replace("[resourceId]", encodeURIComponent(documentId));
-      eventBus.emit("navigation:router-push", { path: path2, reason: "reference-link" });
+      eventBus.get("navigation:router-push").next({ path: path2, reason: "reference-link" });
     }
   }, [routes.resource]);
-  const handleEntityTypeClicked = useCallback35(({ entityType: entityType4 }) => {
+  const handleEntityTypeClicked = useCallback35(({ entityType: entityType3 }) => {
     if (routes.know) {
-      const path2 = `${routes.know}?entityType=${encodeURIComponent(entityType4)}`;
-      eventBus.emit("navigation:router-push", { path: path2, reason: "entity-type-filter" });
+      const path2 = `${routes.know}?entityType=${encodeURIComponent(entityType3)}`;
+      eventBus.get("navigation:router-push").next({ path: path2, reason: "entity-type-filter" });
     }
   }, [routes.know]);
   useEventSubscriptions({
@@ -57410,7 +57220,7 @@ function ResourceViewerPage({
   const resourceWithContent = { ...resource, content: content4 };
   const handleEventHover = useCallback35((annotationId) => {
     if (annotationId) {
-      eventBus.emit("annotation:sparkle", { annotationId });
+      eventBus.get("annotation:sparkle").next({ annotationId });
     }
   }, []);
   const handleEventClick = useCallback35((_annotationId) => {
@@ -57536,7 +57346,7 @@ function ResourceViewerPage({
               }
               const resourceIdSegment = rUri.split("/").pop() || "";
               const nestedUri = `${window.location.origin}/resources/${resourceIdSegment}/annotations/${annotationIdShort}`;
-              eventBus.emit("annotation:update-body", {
+              eventBus.get("annotation:update-body").next({
                 annotationUri: resourceAnnotationUri3(nestedUri),
                 resourceId: resourceIdSegment,
                 operations: [{
@@ -57678,8 +57488,6 @@ export {
   UserMenuSkeleton,
   WelcomePage,
   buttonStyles,
-  createCancelDetectionHandler,
-  createDetectionHandler,
   createHoverHandlers,
   cssVariables,
   dispatch401Error,