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

package/src/features/resource-viewer/__tests__/GenerationFlowIntegration.test.tsx

@@ -27,32 +27,16 @@ import { ApiClientProvider } from '../../../contexts/ApiClientContext';
 import { AuthTokenProvider } from '../../../contexts/AuthTokenContext';
 import { useResolutionFlow } from '../../../hooks/useResolutionFlow';
 import { SSEClient } from '@semiont/api-client';
-import type { ResourceUri, AnnotationUri } from '@semiont/api-client';
-import { resourceUri, annotationUri } from '@semiont/api-client';
+import type { ResourceUri, AnnotationUri } from '@semiont/core';
+import { resourceUri, annotationUri } from '@semiont/core';
 import type { Emitter } from 'mitt';
-import type { EventMap } from '../../../contexts/EventBusContext';
+import type { EventMap } from '@semiont/core';
 
-// Mock SSE stream that we can control in tests
+// Mock SSE stream - SSE now emits directly to EventBus, no callbacks
 const createMockGenerationStream = () => {
-  const stream = {
-    onProgressCallback: null as ((chunk: any) => void) | null,
-    onCompleteCallback: null as ((finalChunk: any) => void) | null,
-    onErrorCallback: null as ((error: Error) => void) | null,
-    onProgress: vi.fn((callback: (chunk: any) => void) => {
-      stream.onProgressCallback = callback;
-      return stream;
-    }),
-    onComplete: vi.fn((callback: (finalChunk: any) => void) => {
-      stream.onCompleteCallback = callback;
-      return stream;
-    }),
-    onError: vi.fn((callback: (error: Error) => void) => {
-      stream.onErrorCallback = callback;
-      return stream;
-    }),
+  return {
     close: vi.fn(),
   };
-  return stream;
 };
 
 describe('Generation Flow - Feature Integration', () => {
@@ -107,7 +91,7 @@ describe('Generation Flow - Feature Integration', () => {
     const testResourceUri = resourceUri('http://localhost:4000/resources/test-resource');
     const testAnnotationUri = annotationUri('http://localhost:4000/resources/test-resource/annotations/test-annotation');
 
-    const { emitGenerationStart } = renderGenerationFlow(
+    const { emitGenerationStart, getEventBus } = renderGenerationFlow(
       testResourceUri
     );
 
@@ -146,7 +130,7 @@ describe('Generation Flow - Feature Integration', () => {
           entityTypes: ['Person', 'Organization'],
         },
       },
-      { auth: undefined }
+      expect.objectContaining({ auth: undefined })
     );
   });
 
@@ -154,7 +138,7 @@ describe('Generation Flow - Feature Integration', () => {
     const testResourceUri = resourceUri('http://localhost:4000/resources/test-resource');
     const testAnnotationUri = annotationUri('http://localhost:4000/resources/test-resource/annotations/test-annotation');
 
-    const { emitGenerationStart } = renderGenerationFlow(
+    const { emitGenerationStart, getEventBus } = renderGenerationFlow(
       testResourceUri
     );
 
@@ -173,7 +157,7 @@ describe('Generation Flow - Feature Integration', () => {
 
     // Simulate SSE progress callback being invoked
     act(() => {
-      mockStream.onProgressCallback!({
+      getEventBus().get('generation:progress').next({
         status: 'generating',
         message: 'Generating content...',
         percentage: 25,
@@ -191,7 +175,7 @@ describe('Generation Flow - Feature Integration', () => {
     const testResourceUri = resourceUri('http://localhost:4000/resources/test-resource');
     const testAnnotationUri = annotationUri('http://localhost:4000/resources/test-resource/annotations/test-annotation');
 
-    const { emitGenerationStart } = renderGenerationFlow(
+    const { emitGenerationStart, getEventBus } = renderGenerationFlow(
       testResourceUri
     );
 
@@ -209,7 +193,7 @@ describe('Generation Flow - Feature Integration', () => {
 
     // First progress update
     act(() => {
-      mockStream.onProgressCallback!({
+      getEventBus().get('generation:progress').next({
         status: 'started',
         message: 'Starting generation...',
         percentage: 0,
@@ -222,7 +206,7 @@ describe('Generation Flow - Feature Integration', () => {
 
     // Second progress update
     act(() => {
-      mockStream.onProgressCallback!({
+      getEventBus().get('generation:progress').next({
         status: 'generating',
         message: 'Creating document structure...',
         percentage: 50,
@@ -235,11 +219,14 @@ describe('Generation Flow - Feature Integration', () => {
 
     // Final progress update via onComplete
     act(() => {
-      mockStream.onCompleteCallback!({
-        status: 'complete',
-        message: 'Document created successfully',
-        percentage: 100,
-        resourceName: 'Generated Document',
+      getEventBus().get('generation:complete').next({
+        annotationUri: testAnnotationUri,
+        progress: {
+          status: 'complete',
+          message: 'Document created successfully',
+          percentage: 100,
+          resourceName: 'Generated Document',
+        }
       });
     });
 
@@ -271,7 +258,7 @@ describe('Generation Flow - Feature Integration', () => {
 
     // Simulate completion with final chunk
     act(() => {
-      mockStream.onProgressCallback!({
+      getEventBus().get('generation:progress').next({
         status: 'complete',
         message: 'Complete',
         resourceName: 'Generated Document',
@@ -280,7 +267,7 @@ describe('Generation Flow - Feature Integration', () => {
 
     // Emit completion event
     act(() => {
-      getEventBus().emit('generation:complete', {
+      getEventBus().get('generation:complete').next({
         annotationUri: testAnnotationUri,
         progress: {
           status: 'complete',
@@ -311,7 +298,7 @@ describe('Generation Flow - Feature Integration', () => {
 
     // Add some progress
     act(() => {
-      mockStream.onProgressCallback!({
+      getEventBus().get('generation:progress').next({
         status: 'generating',
         message: 'Generating...',
       });
@@ -323,7 +310,7 @@ describe('Generation Flow - Feature Integration', () => {
 
     // Emit failure
     act(() => {
-      getEventBus().emit('generation:failed', { error: new Error('Network error') });
+      getEventBus().get('generation:failed').next({ error: new Error('Network error') });
     });
 
     // Verify: progress cleared and not generating
@@ -343,7 +330,7 @@ describe('Generation Flow - Feature Integration', () => {
 
     // Add an additional event listener (simulating multiple subscribers)
     const additionalListener = vi.fn();
-    getEventBus().on('generation:start', additionalListener);
+    const subscription = getEventBus().get('generation:start').subscribe(additionalListener);
 
     // Trigger generation
     act(() => {
@@ -363,13 +350,15 @@ describe('Generation Flow - Feature Integration', () => {
 
     // VERIFY: Our additional listener was called (events work)
     expect(additionalListener).toHaveBeenCalledTimes(1);
+
+    subscription.unsubscribe();
   });
 
   it('should forward final chunk as progress before emitting complete', async () => {
     const testResourceUri = resourceUri('http://localhost:4000/resources/test-resource');
     const testAnnotationUri = annotationUri('http://localhost:4000/resources/test-resource/annotations/test-annotation');
 
-    const { emitGenerationStart } = renderGenerationFlow(
+    const { emitGenerationStart, getEventBus } = renderGenerationFlow(
       testResourceUri
     );
 
@@ -387,11 +376,14 @@ describe('Generation Flow - Feature Integration', () => {
 
     // Simulate onComplete with final chunk
     act(() => {
-      mockStream.onCompleteCallback!({
-        status: 'complete',
-        message: 'Document created: My Document',
-        resourceName: 'My Document',
-        percentage: 100,
+      getEventBus().get('generation:complete').next({
+        annotationUri: testAnnotationUri,
+        progress: {
+          status: 'complete',
+          message: 'Document created: My Document',
+          resourceName: 'My Document',
+          percentage: 100,
+        }
       });
     });
 
@@ -470,7 +462,7 @@ function renderGenerationFlow(
       resourceUri: ResourceUri,
       defaultTitle: string
     ) => {
-      eventBusInstance.emit('generation:modal-open', {
+      eventBusInstance.get('generation:modal-open').next({
         annotationUri,
         resourceUri,
         defaultTitle,
@@ -488,7 +480,7 @@ function renderGenerationFlow(
         context: any;
       }
     ) => {
-      eventBusInstance.emit('generation:start', {
+      eventBusInstance.get('generation:start').next({
         annotationUri,
         resourceUri,
         options,

package/src/features/resource-viewer/__tests__/ResolutionFlowIntegration.test.tsx

@@ -22,7 +22,8 @@ import { useResolutionFlow } from '../../../hooks/useResolutionFlow';
 import { EventBusProvider, useEventBus, resetEventBusForTesting } from '../../../contexts/EventBusContext';
 import { ApiClientProvider } from '../../../contexts/ApiClientContext';
 import { AuthTokenProvider } from '../../../contexts/AuthTokenContext';
-import { SemiontApiClient, resourceUri, accessToken } from '@semiont/api-client';
+import { SemiontApiClient } from '@semiont/api-client';
+import { resourceUri, accessToken } from '@semiont/core';
 
 describe('Resolution Flow - Search Modal & Body Update Integration', () => {
   let updateAnnotationBodySpy: ReturnType<typeof vi.fn>;
@@ -66,15 +67,7 @@ describe('Resolution Flow - Search Modal & Body Update Integration', () => {
 
     return {
       getState: () => lastState!,
-      emit: (event: Parameters<typeof eventBusInstance.emit>[0], payload: Parameters<typeof eventBusInstance.emit>[1]) => {
-        act(() => { eventBusInstance!.emit(event as any, payload as any); });
-      },
-      on: (event: Parameters<typeof eventBusInstance.on>[0], handler: (payload: any) => void) => {
-        eventBusInstance!.on(event as any, handler);
-      },
-      off: (event: Parameters<typeof eventBusInstance.off>[0], handler: (payload: any) => void) => {
-        eventBusInstance!.off(event as any, handler);
-      },
+      getEventBus: () => eventBusInstance!,
     };
   }
 
@@ -89,12 +82,12 @@ describe('Resolution Flow - Search Modal & Body Update Integration', () => {
   // ─── reference:link ─────────────────────────────────────────────────────────
 
   it('reference:link emits resolution:search-requested with referenceId and searchTerm', () => {
-    const { emit, on, off } = renderResolutionFlow();
+    const { getEventBus } = renderResolutionFlow();
     const searchRequestedSpy = vi.fn();
 
-    on('resolution:search-requested', searchRequestedSpy);
-    emit('reference:link', { annotationUri: 'ann-uri-123', searchTerm: 'climate change' });
-    off('resolution:search-requested', searchRequestedSpy);
+    const subscription = getEventBus().get('resolution:search-requested').subscribe(searchRequestedSpy);
+    act(() => { getEventBus().get('reference:link').next({ annotationUri: 'ann-uri-123', searchTerm: 'climate change' }); });
+    subscription.unsubscribe();
 
     expect(searchRequestedSpy).toHaveBeenCalledTimes(1);
     expect(searchRequestedSpy).toHaveBeenCalledWith({
@@ -106,11 +99,11 @@ describe('Resolution Flow - Search Modal & Body Update Integration', () => {
   // ─── resolution:search-requested ────────────────────────────────────────────
 
   it('resolution:search-requested opens the search modal', async () => {
-    const { getState, emit } = renderResolutionFlow();
+    const { getState, getEventBus } = renderResolutionFlow();
 
     expect(getState().searchModalOpen).toBe(false);
 
-    emit('resolution:search-requested', { referenceId: 'ref-abc', searchTerm: 'oceans' });
+    act(() => { getEventBus().get('resolution:search-requested').next({ referenceId: 'ref-abc', searchTerm: 'oceans' }); });
 
     await waitFor(() => {
       expect(getState().searchModalOpen).toBe(true);
@@ -118,9 +111,9 @@ describe('Resolution Flow - Search Modal & Body Update Integration', () => {
   });
 
   it('resolution:search-requested sets pendingReferenceId', async () => {
-    const { getState, emit } = renderResolutionFlow();
+    const { getState, getEventBus } = renderResolutionFlow();
 
-    emit('resolution:search-requested', { referenceId: 'ref-xyz', searchTerm: 'forests' });
+    act(() => { getEventBus().get('resolution:search-requested').next({ referenceId: 'ref-xyz', searchTerm: 'forests' }); });
 
     await waitFor(() => {
       expect(getState().pendingReferenceId).toBe('ref-xyz');
@@ -128,10 +121,10 @@ describe('Resolution Flow - Search Modal & Body Update Integration', () => {
   });
 
   it('reference:link → resolution:search-requested chain opens modal end-to-end', async () => {
-    const { getState, emit } = renderResolutionFlow();
+    const { getState, getEventBus } = renderResolutionFlow();
 
     // Simulate the full user journey: user clicks "Link Document" on a reference entry
-    emit('reference:link', { annotationUri: 'ann-full-chain', searchTerm: 'biodiversity' });
+    act(() => { getEventBus().get('reference:link').next({ annotationUri: 'ann-full-chain', searchTerm: 'biodiversity' }); });
 
     await waitFor(() => {
       expect(getState().searchModalOpen).toBe(true);
@@ -142,9 +135,9 @@ describe('Resolution Flow - Search Modal & Body Update Integration', () => {
   // ─── onCloseSearchModal ──────────────────────────────────────────────────────
 
   it('onCloseSearchModal closes the search modal', async () => {
-    const { getState, emit } = renderResolutionFlow();
+    const { getState, getEventBus } = renderResolutionFlow();
 
-    emit('resolution:search-requested', { referenceId: 'ref-close', searchTerm: 'test' });
+    act(() => { getEventBus().get('resolution:search-requested').next({ referenceId: 'ref-close', searchTerm: 'test' }); });
 
     await waitFor(() => expect(getState().searchModalOpen).toBe(true));
 
@@ -156,9 +149,9 @@ describe('Resolution Flow - Search Modal & Body Update Integration', () => {
   });
 
   it('onCloseSearchModal does not clear pendingReferenceId (preserves for re-open)', async () => {
-    const { getState, emit } = renderResolutionFlow();
+    const { getState, getEventBus } = renderResolutionFlow();
 
-    emit('resolution:search-requested', { referenceId: 'ref-persist', searchTerm: 'test' });
+    act(() => { getEventBus().get('resolution:search-requested').next({ referenceId: 'ref-persist', searchTerm: 'test' }); });
     await waitFor(() => expect(getState().searchModalOpen).toBe(true));
 
     act(() => { getState().onCloseSearchModal(); });
@@ -171,13 +164,13 @@ describe('Resolution Flow - Search Modal & Body Update Integration', () => {
   // ─── annotation:update-body ──────────────────────────────────────────────────
 
   it('annotation:update-body calls updateAnnotationBody API', async () => {
-    const { emit } = renderResolutionFlow();
+    const { getEventBus } = renderResolutionFlow();
 
-    emit('annotation:update-body', {
+    act(() => { getEventBus().get('annotation:update-body').next({
       annotationUri: 'http://localhost:4000/resources/test-resource/annotations/ann-body-1',
       resourceId: 'linked-resource-id',
       operations: [{ op: 'add', item: { id: 'linked-resource-id' } }],
-    });
+    }); });
 
     await waitFor(() => {
       expect(updateAnnotationBodySpy).toHaveBeenCalledTimes(1);
@@ -185,13 +178,13 @@ describe('Resolution Flow - Search Modal & Body Update Integration', () => {
   });
 
   it('annotation:update-body passes auth token to API call', async () => {
-    const { emit } = renderResolutionFlow();
+    const { getEventBus } = renderResolutionFlow();
 
-    emit('annotation:update-body', {
+    act(() => { getEventBus().get('annotation:update-body').next({
       annotationUri: 'http://localhost:4000/resources/test-resource/annotations/ann-auth',
       resourceId: 'resource-id',
       operations: [{ op: 'replace', newItem: { id: 'resource-id' } }],
-    });
+    }); });
 
     await waitFor(() => {
       expect(updateAnnotationBodySpy).toHaveBeenCalled();
@@ -203,22 +196,22 @@ describe('Resolution Flow - Search Modal & Body Update Integration', () => {
   });
 
   it('annotation:update-body emits annotation:body-updated on success', async () => {
-    const { emit, on, off } = renderResolutionFlow();
+    const { getEventBus } = renderResolutionFlow();
     const bodyUpdatedSpy = vi.fn();
 
-    on('annotation:body-updated', bodyUpdatedSpy);
+    const subscription = getEventBus().get('annotation:body-updated').subscribe(bodyUpdatedSpy);
 
-    emit('annotation:update-body', {
+    act(() => { getEventBus().get('annotation:update-body').next({
       annotationUri: 'http://localhost:4000/resources/test-resource/annotations/ann-success',
       resourceId: 'resource-id',
       operations: [{ op: 'add', item: { id: 'resource-id' } }],
-    });
+    }); });
 
     await waitFor(() => {
       expect(bodyUpdatedSpy).toHaveBeenCalledTimes(1);
     });
 
-    off('annotation:body-updated', bodyUpdatedSpy);
+    subscription.unsubscribe();
 
     expect(bodyUpdatedSpy).toHaveBeenCalledWith({
       annotationUri: 'http://localhost:4000/resources/test-resource/annotations/ann-success',
@@ -228,22 +221,22 @@ describe('Resolution Flow - Search Modal & Body Update Integration', () => {
   it('annotation:update-body emits annotation:body-update-failed on API error', async () => {
     updateAnnotationBodySpy.mockRejectedValue(new Error('Update failed'));
 
-    const { emit, on, off } = renderResolutionFlow();
+    const { getEventBus } = renderResolutionFlow();
     const bodyUpdateFailedSpy = vi.fn();
 
-    on('annotation:body-update-failed', bodyUpdateFailedSpy);
+    const subscription = getEventBus().get('annotation:body-update-failed').subscribe(bodyUpdateFailedSpy);
 
-    emit('annotation:update-body', {
+    act(() => { getEventBus().get('annotation:update-body').next({
       annotationUri: 'http://localhost:4000/resources/test-resource/annotations/ann-fail',
       resourceId: 'resource-id',
       operations: [{ op: 'remove', item: { id: 'old-id' } }],
-    });
+    }); });
 
     await waitFor(() => {
       expect(bodyUpdateFailedSpy).toHaveBeenCalledTimes(1);
     });
 
-    off('annotation:body-update-failed', bodyUpdateFailedSpy);
+    subscription.unsubscribe();
 
     expect(bodyUpdateFailedSpy).toHaveBeenCalledWith({
       error: expect.any(Error),
@@ -251,13 +244,13 @@ describe('Resolution Flow - Search Modal & Body Update Integration', () => {
   });
 
   it('annotation:update-body called ONCE — no duplicate subscriptions', async () => {
-    const { emit } = renderResolutionFlow();
+    const { getEventBus } = renderResolutionFlow();
 
-    emit('annotation:update-body', {
+    act(() => { getEventBus().get('annotation:update-body').next({
       annotationUri: 'http://localhost:4000/resources/test-resource/annotations/ann-dedup',
       resourceId: 'resource-id',
       operations: [{ op: 'add', item: { id: 'resource-id' } }],
-    });
+    }); });
 
     await waitFor(() => {
       expect(updateAnnotationBodySpy).toHaveBeenCalledTimes(1);

package/src/features/resource-viewer/__tests__/ResourceMutations.test.tsx

@@ -25,14 +25,14 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { render, waitFor } from '@testing-library/react';
 import { act } from 'react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { SemiontApiClient, resourceUri, accessToken } from '@semiont/api-client';
+import { SemiontApiClient } from '@semiont/api-client';
+import { resourceUri, accessToken } from '@semiont/core';
 import { EventBusProvider, useEventBus, resetEventBusForTesting } from '../../../contexts/EventBusContext';
 import { useEventSubscriptions } from '../../../contexts/useEventSubscription';
 import { ApiClientProvider } from '../../../contexts/ApiClientContext';
 import { AuthTokenProvider } from '../../../contexts/AuthTokenContext';
 import { useResources } from '../../../lib/api-hooks';
-import type { EventMap } from '../../../contexts/EventBusContext';
-import type { Emitter } from 'mitt';
+import type { EventMap, EventBus } from '@semiont/core';
 
 // ─── Constants ────────────────────────────────────────────────────────────────
 
@@ -50,10 +50,10 @@ const CLONE_TOKEN = 'generated-clone-token-xyz';
  * The critical invariant under test: useMutation() is called at hook level
  * (inside useResources), not inside the useCallback bodies.
  */
-function ResourceMutationHarness({ onEventBus }: { onEventBus: (bus: Emitter<EventMap>) => void }) {
+function ResourceMutationHarness({ onEventBus }: { onEventBus: (eventBus: EventBus) => void }) {
   const eventBus = useEventBus();
 
-  // Capture the bus for the test to emit events
+  // Capture the eventBus for the test to emit events
   React.useEffect(() => {
     onEventBus(eventBus);
   }, []); // eslint-disable-line react-hooks/exhaustive-deps
@@ -91,7 +91,7 @@ function ResourceMutationHarness({ onEventBus }: { onEventBus: (bus: Emitter<Eve
 // ─── Test setup ───────────────────────────────────────────────────────────────
 
 function renderHarness() {
-  let capturedBus: Emitter<EventMap> | null = null;
+  let capturedEventBus: EventBus | null = null;
 
   const queryClient = new QueryClient({
     defaultOptions: {
@@ -105,7 +105,7 @@ function renderHarness() {
       <ApiClientProvider baseUrl={BASE_URL}>
         <QueryClientProvider client={queryClient}>
           <EventBusProvider>
-            <ResourceMutationHarness onEventBus={(bus) => { capturedBus = bus; }} />
+            <ResourceMutationHarness onEventBus={(eventBus) => { capturedEventBus = eventBus; }} />
           </EventBusProvider>
         </QueryClientProvider>
       </ApiClientProvider>
@@ -113,7 +113,7 @@ function renderHarness() {
   );
 
   const emit = <K extends keyof EventMap>(event: K, payload: EventMap[K]) => {
-    act(() => { capturedBus!.emit(event, payload); });
+    act(() => { capturedEventBus!.get(event).next(payload); });
   };
 
   return { emit };

package/src/features/resource-viewer/__tests__/detection-progress-flow.test.tsx

@@ -32,7 +32,7 @@ import { EventBusProvider, resetEventBusForTesting } from '../../../contexts/Eve
 import { ApiClientProvider } from '../../../contexts/ApiClientContext';
 import { AuthTokenProvider } from '../../../contexts/AuthTokenContext';
 import { SSEClient } from '@semiont/api-client';
-import type { components } from '@semiont/api-client';
+import type { components } from '@semiont/core';
 
 type Annotation = components['schemas']['Annotation'];
 
@@ -60,33 +60,26 @@ vi.mock('../../../contexts/TranslationContext', () => ({
 
 // Create a mock SSE stream that we can control
 class MockSSEStream {
-  private progressHandlers: Array<(chunk: any) => void> = [];
-  private completeHandlers: Array<(finalChunk?: any) => void> = [];
-  private errorHandlers: Array<(error: Error) => void> = [];
+  constructor(private eventBus: any) {}
 
-  onProgress(handler: (chunk: any) => void) {
-    this.progressHandlers.push(handler);
+  close() {
+    // Mock close method
   }
 
-  onComplete(handler: (finalChunk?: any) => void) {
-    this.completeHandlers.push(handler);
-  }
-
-  onError(handler: (error: Error) => void) {
-    this.errorHandlers.push(handler);
-  }
-
-  // Test helper methods
+  // Test helper methods that emit to EventBus
   emitProgress(chunk: any) {
-    this.progressHandlers.forEach(handler => handler(chunk));
+    this.eventBus.get('detection:progress').next(chunk);
   }
 
   emitComplete(finalChunk?: any) {
-    this.completeHandlers.forEach(handler => handler(finalChunk));
+    if (finalChunk) {
+      this.eventBus.get('detection:progress').next(finalChunk);
+    }
+    this.eventBus.get('detection:complete').next({});
   }
 
   emitError(error: Error) {
-    this.errorHandlers.forEach(handler => handler(error));
+    this.eventBus.get('detection:failed').next({ error });
   }
 }
 
@@ -135,11 +128,11 @@ describe('Detection Progress Flow Integration (Layer 3)', () => {
 
   beforeEach(() => {
     // Reset event bus for test isolation
-    resetEventBusForTesting();
+    const eventBus = resetEventBusForTesting();
     vi.clearAllMocks();
 
-    // Reset mocks
-    mockStream = new MockSSEStream();
+    // Reset mocks - create stream with eventBus
+    mockStream = new MockSSEStream(eventBus);
 
     // Spy on SSEClient prototype methods to inject mock stream
     vi.spyOn(SSEClient.prototype, 'detectHighlights').mockReturnValue(mockStream as any);

package/src/features/resource-viewer/components/ResourceViewerPage.tsx

@@ -7,8 +7,9 @@
 
 import React, { useState, useEffect, useCallback, useMemo } from 'react';
 import { useQueryClient } from '@tanstack/react-query';
-import type { components, ResourceUri } from '@semiont/api-client';
-import { getLanguage, getPrimaryRepresentation, resourceAnnotationUri, getPrimaryMediaType } from '@semiont/api-client';
+import type { components, ResourceUri } from '@semiont/core';
+import { resourceAnnotationUri } from '@semiont/core';
+import { getLanguage, getPrimaryRepresentation, getPrimaryMediaType } from '@semiont/api-client';
 import { uriToAnnotationId } from '@semiont/core';
 import { ANNOTATORS } from '@semiont/react-ui';
 import { ErrorBoundary } from '@semiont/react-ui';
@@ -308,7 +309,7 @@ export function ResourceViewerPage({
     try {
       const result = await generateCloneTokenMutation.mutateAsync(rUri);
       const token = result.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');
@@ -345,14 +346,14 @@ export function ResourceViewerPage({
   const handleReferenceNavigate = useCallback(({ documentId }: { documentId: string }) => {
     if (routes.resource) {
       const path = routes.resource.replace('[resourceId]', encodeURIComponent(documentId));
-      eventBus.emit('navigation:router-push', { path, reason: 'reference-link' });
+      eventBus.get('navigation:router-push').next({ path, reason: 'reference-link' });
     }
   }, [routes.resource]); // eventBus is stable singleton - never in deps
 
   const handleEntityTypeClicked = useCallback(({ entityType }: { entityType: string }) => {
     if (routes.know) {
       const path = `${routes.know}?entityType=${encodeURIComponent(entityType)}`;
-      eventBus.emit('navigation:router-push', { path, reason: 'entity-type-filter' });
+      eventBus.get('navigation:router-push').next({ path, reason: 'entity-type-filter' });
     }
   }, [routes.know]); // eventBus is stable singleton - never in deps
 
@@ -436,7 +437,7 @@ export function ResourceViewerPage({
   // Handlers for AnnotationHistory (legacy event-based interaction)
   const handleEventHover = useCallback((annotationId: string | null) => {
     if (annotationId) {
-      eventBus.emit('annotation:sparkle', { annotationId });
+      eventBus.get('annotation:sparkle').next({ annotationId });
     }
   }, []); // eventBus is stable singleton - never in deps
 
@@ -603,7 +604,7 @@ export 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: resourceAnnotationUri(nestedUri),
                 resourceId: resourceIdSegment,
                 operations: [{