@semiont/react-ui 0.4.14 → 0.4.15

package/src/components/resource/panels/__tests__/ResourceInfoPanel.test.tsx

@@ -122,6 +122,7 @@ const renderWithEventBus = (component: React.ReactElement, tracker?: ReturnType<
 
 describe('ResourceInfoPanel Component', () => {
   const defaultProps = {
+    resourceId: 'test-resource-id',
     documentEntityTypes: [],
     documentLocale: undefined,
     primaryMediaType: undefined,

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

@@ -248,7 +248,7 @@ describe('Annotation creation clears pendingAnnotation', () => {
     const createdListener = vi.fn();
     // Set listener after first render so eventBus is captured
     await waitFor(() => expect(getEventBus()).toBeDefined());
-    const subscription = getEventBus().get('mark:created').subscribe(createdListener);
+    const subscription = getEventBus().get('mark:create-ok').subscribe(createdListener);
 
     act(() => {
       emit('mark:requested', { selector: TEXT_SELECTOR, motivation: 'linking' });

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

@@ -27,6 +27,7 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { render, waitFor } from '@testing-library/react';
 import { act } from 'react';
 import { useMarkFlow } from '../../../hooks/useMarkFlow';
+import { useStoreTokenSync } from '../../../hooks/useStoreTokenSync';
 import { EventBusProvider, useEventBus } from '../../../contexts/EventBusContext';
 
 // Mock Toast module to prevent "useToast must be used within a ToastProvider" errors
@@ -69,8 +70,7 @@ describe('Annotation Deletion - Feature Integration', () => {
 
     function TestComponent() {
       eventBusInstance = useEventBus();
-      // useMarkFlow is the single registration point for useBindFlow
-      // (handles mark:delete mark:create annotate:detect-request, etc.)
+      useStoreTokenSync(); // Syncs auth token to namespace getToken
       useMarkFlow(testId);
       return null;
     }
@@ -138,7 +138,7 @@ describe('Annotation Deletion - Feature Integration', () => {
     const deletedListener = vi.fn();
 
     // Subscribe to success event
-    eventBus.get('mark:deleted').subscribe(deletedListener);
+    eventBus.get('mark:delete-ok').subscribe(deletedListener);
 
     emitDelete('annotation-789');
 
@@ -175,7 +175,7 @@ describe('Annotation Deletion - Feature Integration', () => {
     // Verify failure event was emitted
     await waitFor(() => {
       expect(failedListener).toHaveBeenCalledWith({
-        error: expect.any(Error),
+        message: expect.any(String),
       });
     });
   });

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

@@ -25,7 +25,7 @@ import { useMarkFlow } from '../../../hooks/useMarkFlow';
 import { EventBusProvider, useEventBus } from '../../../contexts/EventBusContext';
 import { ApiClientProvider } from '../../../contexts/ApiClientContext';
 import { AuthTokenProvider } from '../../../contexts/AuthTokenContext';
-import { SSEClient } from '@semiont/api-client';
+import { SemiontApiClient } from '@semiont/api-client';
 import { resourceId } from '@semiont/core';
 
 // Mock Toast module to prevent "useToast must be used within a ToastProvider" errors
@@ -39,20 +39,15 @@ vi.mock('../../../components/Toast', () => ({
 }));
 
 describe('Detection Progress Dismissal Bug', () => {
-  let mockStream: any;
   const rUri = resourceId('test');
 
   beforeEach(() => {
     vi.clearAllMocks();
 
-    mockStream = {
-      close: vi.fn(),
-    };
-
-    vi.spyOn(SSEClient.prototype, 'markReferences').mockReturnValue(mockStream);
-    vi.spyOn(SSEClient.prototype, 'markHighlights').mockReturnValue(mockStream);
-    vi.spyOn(SSEClient.prototype, 'markComments').mockReturnValue(mockStream);
-    vi.spyOn(SSEClient.prototype, 'markAssessments').mockReturnValue(mockStream);
+    vi.spyOn(SemiontApiClient.prototype, 'annotateReferences').mockResolvedValue({ correlationId: 'c1', jobId: 'j1' });
+    vi.spyOn(SemiontApiClient.prototype, 'annotateHighlights').mockResolvedValue({ correlationId: 'c1', jobId: 'j1' });
+    vi.spyOn(SemiontApiClient.prototype, 'annotateComments').mockResolvedValue({ correlationId: 'c1', jobId: 'j1' });
+    vi.spyOn(SemiontApiClient.prototype, 'annotateAssessments').mockResolvedValue({ correlationId: 'c1', jobId: 'j1' });
   });
 
   afterEach(() => {

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

@@ -2,14 +2,14 @@
  * Layer 3: Feature Integration Test - Bind Flow (body update)
  *
  * Tests the write side of useBindFlow:
- * - bind:update-body → calls bindAnnotation API
- * - bind:update-body → emits bind:body-updated on success
+ * - bind:update-body → calls http.bindAnnotation API (plain POST)
  * - bind:update-body → emits bind:body-update-failed on error
  * - auth token passed to bindAnnotation
  *
- * The wizard modal (ReferenceWizardModal) handles modal state, context
- * gathering, search configuration, and result display. This test covers
- * only the downstream API calls after the wizard emits bind:update-body.
+ * After the UNIFIED-STREAM migration, bind is a plain POST returning
+ * {correlationId}. The state change arrives on the events-stream as
+ * mark:body-updated. These tests focus on the POST call, not the
+ * events-stream delivery (which is tested in AnnotationStore tests).
  *
  * Uses real providers (EventBus, ApiClient, AuthToken) with mocked API boundary.
  */
@@ -21,14 +21,15 @@ import { useBindFlow } from '../../../hooks/useBindFlow';
 import { EventBusProvider, useEventBus } from '../../../contexts/EventBusContext';
 import { ApiClientProvider } from '../../../contexts/ApiClientContext';
 import { AuthTokenProvider } from '../../../contexts/AuthTokenContext';
-import { SSEClient } from '@semiont/api-client';
-import { resourceId, accessToken, annotationId } from '@semiont/core';
+import { SemiontApiClient } from '@semiont/api-client';
+import { resourceId, annotationId } from '@semiont/core';
+
+const mockShowError = vi.fn();
 
-// Mock Toast module to prevent "useToast must be used within a ToastProvider" errors
 vi.mock('../../../components/Toast', () => ({
   useToast: () => ({
     showSuccess: vi.fn(),
-    showError: vi.fn(),
+    showError: mockShowError,
     showInfo: vi.fn(),
     showWarning: vi.fn(),
   }),
@@ -43,11 +44,9 @@ describe('Bind Flow - Body Update Integration', () => {
   beforeEach(() => {
     vi.clearAllMocks();
 
-    bindAnnotationSpy = vi.fn().mockImplementation((_rId: any, annId: any, _req: any, opts: any) => {
-      queueMicrotask(() => opts.eventBus.get('bind:finished').next({ annotationId: annId }));
-      return { close: vi.fn() };
-    });
-    vi.spyOn(SSEClient.prototype, 'bindAnnotation').mockImplementation(bindAnnotationSpy as any);
+    // Mock the HTTP bindAnnotation method (plain POST, returns {correlationId})
+    bindAnnotationSpy = vi.fn().mockResolvedValue({ correlationId: 'corr-test' });
+    vi.spyOn(SemiontApiClient.prototype, 'bindAnnotation').mockImplementation(bindAnnotationSpy as any);
   });
 
   afterEach(() => {
@@ -82,10 +81,11 @@ describe('Bind Flow - Body Update Integration', () => {
 
   // ─── bind:update-body ──────────────────────────────────────────────────
 
-  it('bind:update-body calls bindAnnotation API', async () => {
+  it('bind:update-body calls http.bindAnnotation (plain POST)', async () => {
     const { getEventBus } = renderBindFlow();
 
     act(() => { getEventBus().get('bind:update-body').next({
+      correlationId: 'corr-1',
       annotationId: annotationId('ann-body-1'),
       resourceId: resourceId('linked-resource-id'),
       operations: [{ op: 'add', item: { type: 'SpecificResource' as const, source: 'linked-resource-id' } }],
@@ -100,6 +100,7 @@ describe('Bind Flow - Body Update Integration', () => {
     const { getEventBus } = renderBindFlow();
 
     act(() => { getEventBus().get('bind:update-body').next({
+      correlationId: 'corr-2',
       annotationId: annotationId('ann-auth'),
       resourceId: resourceId('resource-id'),
       operations: [{ op: 'replace', newItem: { type: 'SpecificResource' as const, source: 'resource-id' } }],
@@ -111,57 +112,24 @@ describe('Bind Flow - Body Update Integration', () => {
 
     const callArgs = bindAnnotationSpy.mock.calls[0];
     expect(callArgs[3]).toHaveProperty('auth');
-    expect(callArgs[3].auth).toBe(accessToken(testToken));
-  });
-
-  it('bind:update-body emits bind:body-updated on success', async () => {
-    const { getEventBus } = renderBindFlow();
-    const bodyUpdatedSpy = vi.fn();
-
-    const subscription = getEventBus().get('bind:body-updated').subscribe(bodyUpdatedSpy);
-
-    act(() => { getEventBus().get('bind:update-body').next({
-      annotationId: annotationId('ann-success'),
-      resourceId: resourceId('resource-id'),
-      operations: [{ op: 'add', item: { type: 'SpecificResource' as const, source: 'resource-id' } }],
-    }); });
-
-    await waitFor(() => {
-      expect(bodyUpdatedSpy).toHaveBeenCalledTimes(1);
-    });
-
-    subscription.unsubscribe();
-
-    expect(bodyUpdatedSpy).toHaveBeenCalledWith({
-      annotationId: annotationId('ann-success'),
-    });
   });
 
-  it('bind:update-body emits bind:body-update-failed on API error', async () => {
-    bindAnnotationSpy.mockImplementation((_rId: any, _annId: any, _req: any, opts: any) => {
-      queueMicrotask(() => opts.eventBus.get('bind:failed').next({ error: new Error('Update failed') }));
-      return { close: vi.fn() };
-    });
+  it('bind:update-body shows error toast on API error', async () => {
+    bindAnnotationSpy.mockRejectedValueOnce(new Error('Update failed'));
 
     const { getEventBus } = renderBindFlow();
-    const bodyUpdateFailedSpy = vi.fn();
-
-    const subscription = getEventBus().get('bind:body-update-failed').subscribe(bodyUpdateFailedSpy);
 
     act(() => { getEventBus().get('bind:update-body').next({
+      correlationId: 'corr-3',
       annotationId: annotationId('ann-fail'),
       resourceId: resourceId('resource-id'),
       operations: [{ op: 'remove', item: { type: 'SpecificResource' as const, source: 'old-id' } }],
     }); });
 
     await waitFor(() => {
-      expect(bodyUpdateFailedSpy).toHaveBeenCalledTimes(1);
-    });
-
-    subscription.unsubscribe();
-
-    expect(bodyUpdateFailedSpy).toHaveBeenCalledWith({
-      error: expect.any(Error),
+      expect(mockShowError).toHaveBeenCalledWith(
+        expect.stringContaining('Update failed'),
+      );
     });
   });
 
@@ -169,6 +137,7 @@ describe('Bind Flow - Body Update Integration', () => {
     const { getEventBus } = renderBindFlow();
 
     act(() => { getEventBus().get('bind:update-body').next({
+      correlationId: 'corr-4',
       annotationId: annotationId('ann-dedup'),
       resourceId: resourceId('resource-id'),
       operations: [{ op: 'add', item: { type: 'SpecificResource' as const, source: 'resource-id' } }],

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

@@ -17,7 +17,7 @@ import { useMarkFlow } from '../../../hooks/useMarkFlow';
 import { EventBusProvider, useEventBus } from '../../../contexts/EventBusContext';
 import { ApiClientProvider } from '../../../contexts/ApiClientContext';
 import { AuthTokenProvider } from '../../../contexts/AuthTokenContext';
-import { SSEClient } from '@semiont/api-client';
+import { SemiontApiClient } from '@semiont/api-client';
 
 // Mock Toast module to prevent "useToast must be used within a ToastProvider" errors
 vi.mock('../../../components/Toast', () => ({
@@ -33,11 +33,11 @@ describe('REPRODUCING BUG: Detection state not updating', () => {
   beforeEach(() => {
     vi.clearAllMocks();
 
-    // Minimal mock - SSE streams not needed for this test
-    vi.spyOn(SSEClient.prototype, 'markReferences').mockReturnValue({ onProgress: vi.fn().mockReturnThis(), onComplete: vi.fn().mockReturnThis(), onError: vi.fn().mockReturnThis(), close: vi.fn() } as any);
-    vi.spyOn(SSEClient.prototype, 'markHighlights').mockReturnValue({ onProgress: vi.fn().mockReturnThis(), onComplete: vi.fn().mockReturnThis(), onError: vi.fn().mockReturnThis(), close: vi.fn() } as any);
-    vi.spyOn(SSEClient.prototype, 'markComments').mockReturnValue({ onProgress: vi.fn().mockReturnThis(), onComplete: vi.fn().mockReturnThis(), onError: vi.fn().mockReturnThis(), close: vi.fn() } as any);
-    vi.spyOn(SSEClient.prototype, 'markAssessments').mockReturnValue({ onProgress: vi.fn().mockReturnThis(), onComplete: vi.fn().mockReturnThis(), onError: vi.fn().mockReturnThis(), close: vi.fn() } as any);
+    // Minimal mock — namespace methods call these HTTP methods internally
+    vi.spyOn(SemiontApiClient.prototype, 'annotateReferences').mockResolvedValue({ correlationId: 'c1', jobId: 'j1' });
+    vi.spyOn(SemiontApiClient.prototype, 'annotateHighlights').mockResolvedValue({ correlationId: 'c1', jobId: 'j1' });
+    vi.spyOn(SemiontApiClient.prototype, 'annotateComments').mockResolvedValue({ correlationId: 'c1', jobId: 'j1' });
+    vi.spyOn(SemiontApiClient.prototype, 'annotateAssessments').mockResolvedValue({ correlationId: 'c1', jobId: 'j1' });
   });
 
   afterEach(() => {

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

@@ -29,7 +29,7 @@ import { useMarkFlow } from '../../../hooks/useMarkFlow';
 import { EventBusProvider, useEventBus } from '../../../contexts/EventBusContext';
 import { ApiClientProvider } from '../../../contexts/ApiClientContext';
 import { AuthTokenProvider } from '../../../contexts/AuthTokenContext';
-import { SSEClient } from '@semiont/api-client';
+import { SemiontApiClient } from '@semiont/api-client';
 import type { Motivation } from '@semiont/core';
 import { resourceId } from '@semiont/core';
 import type { Emitter } from 'mitt';
@@ -45,15 +45,7 @@ vi.mock('../../../components/Toast', () => ({
 }));
 import type { EventMap } from '@semiont/core';
 
-// Mock SSE stream - SSE now emits directly to EventBus, no callbacks
-const createMockSSEStream = () => {
-  return {
-    close: vi.fn(),
-  };
-};
-
 describe('Detection Flow - Feature Integration', () => {
-  let mockStream: ReturnType<typeof createMockSSEStream>;
   let markReferencesSpy: any;
   let markHighlightsSpy: any;
   let detectCommentsSpy: any;
@@ -61,14 +53,11 @@ describe('Detection Flow - Feature Integration', () => {
   beforeEach(() => {
     vi.clearAllMocks();
 
-    // Create fresh mock stream for each test
-    mockStream = createMockSSEStream();
-
-    // Spy on SSEClient prototype methods
-    markReferencesSpy = vi.spyOn(SSEClient.prototype, 'markReferences').mockReturnValue(mockStream as any);
-    markHighlightsSpy = vi.spyOn(SSEClient.prototype, 'markHighlights').mockReturnValue(mockStream as any);
-    detectCommentsSpy = vi.spyOn(SSEClient.prototype, 'markComments').mockReturnValue(mockStream as any);
-    vi.spyOn(SSEClient.prototype, 'markAssessments').mockReturnValue(mockStream as any);
+    // Spy on SemiontApiClient prototype HTTP methods (namespace methods call these)
+    markReferencesSpy = vi.spyOn(SemiontApiClient.prototype, 'annotateReferences').mockResolvedValue({ correlationId: 'c1', jobId: 'j1' });
+    markHighlightsSpy = vi.spyOn(SemiontApiClient.prototype, 'annotateHighlights').mockResolvedValue({ correlationId: 'c1', jobId: 'j1' });
+    detectCommentsSpy = vi.spyOn(SemiontApiClient.prototype, 'annotateComments').mockResolvedValue({ correlationId: 'c1', jobId: 'j1' });
+    vi.spyOn(SemiontApiClient.prototype, 'annotateAssessments').mockResolvedValue({ correlationId: 'c1', jobId: 'j1' });
   });
 
   afterEach(() => {
@@ -298,8 +287,7 @@ describe('Detection Flow - Feature Integration', () => {
 
     // Reset for next test
     vi.clearAllMocks();
-    mockStream = createMockSSEStream();
-    detectCommentsSpy.mockReturnValue(mockStream);
+    detectCommentsSpy.mockResolvedValue({ correlationId: 'c2', jobId: 'j2' });
 
     // Test commenting
     act(() => {

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

@@ -158,7 +158,7 @@ describe('Toast Notifications - Verifies Toast Integration', () => {
       // Emit generation failed event
       act(() => {
         eventBusInstance.get('yield:failed').next({
-          error: new Error('Failed to generate document'),
+          error: 'Failed to generate document',
         });
       });
 

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

@@ -26,10 +26,9 @@ import { EventBusProvider, useEventBus } from '../../../contexts/EventBusContext
 import { ApiClientProvider } from '../../../contexts/ApiClientContext';
 import { AuthTokenProvider } from '../../../contexts/AuthTokenContext';
 import { useBindFlow } from '../../../hooks/useBindFlow';
-import { SSEClient } from '@semiont/api-client';
+import { SemiontApiClient } from '@semiont/api-client';
 import type { AnnotationId, ResourceId } from '@semiont/core';
 import { resourceId, annotationId } from '@semiont/core';
-import type { Emitter } from 'mitt';
 import type { EventMap } from '@semiont/core';
 
 // Mock Toast module to prevent "useToast must be used within a ToastProvider" errors
@@ -42,15 +41,7 @@ vi.mock('../../../components/Toast', () => ({
   }),
 }));
 
-// Mock SSE stream - SSE now emits directly to EventBus, no callbacks
-const createMockGenerationStream = () => {
-  return {
-    close: vi.fn(),
-  };
-};
-
 describe('Generation Flow - Feature Integration', () => {
-  let mockStream: ReturnType<typeof createMockGenerationStream>;
   let generateResourceSpy: any;
   let mockShowSuccess: ReturnType<typeof vi.fn>;
   let mockShowError: ReturnType<typeof vi.fn>;
@@ -59,11 +50,8 @@ describe('Generation Flow - Feature Integration', () => {
   beforeEach(() => {
     vi.clearAllMocks();
 
-    // Create fresh mock stream for each test
-    mockStream = createMockGenerationStream();
-
-    // Spy on SSEClient prototype method
-    generateResourceSpy = vi.spyOn(SSEClient.prototype, 'yieldResource').mockReturnValue(mockStream as any);
+    // Spy on SemiontApiClient prototype HTTP method (namespace methods call this)
+    generateResourceSpy = vi.spyOn(SemiontApiClient.prototype, 'yieldResourceFromAnnotation').mockResolvedValue({ correlationId: 'c1', jobId: 'j1' });
 
     // Mock callbacks
     mockShowSuccess = vi.fn();
@@ -107,17 +95,13 @@ describe('Generation Flow - Feature Integration', () => {
     expect(generateResourceSpy).toHaveBeenCalledWith(
       testResourceId,
       testAnnotationId,
-      {
+      expect.objectContaining({
         title: 'Generated Document',
         prompt: 'Create a comprehensive document',
         language: 'en',
         temperature: 0.7,
         maxTokens: 2000,
-        context: {
-          sourceText: 'Reference text from the document',
-          entityTypes: ['Person', 'Organization'],
-        },
-      },
+      }),
       expect.objectContaining({ auth: undefined })
     );
   });
@@ -295,7 +279,7 @@ describe('Generation Flow - Feature Integration', () => {
 
     // Emit failure
     act(() => {
-      getEventBus().get('yield:failed').next({ error: new Error('Network error') });
+      getEventBus().get('yield:failed').next({ error: 'Network error' });
     });
 
     // Verify: progress cleared and not generating
@@ -305,18 +289,14 @@ describe('Generation Flow - Feature Integration', () => {
     });
   });
 
-  it('should only call API once even with multiple event listeners', async () => {
+  it('should only call API once even with multiple renders', async () => {
     const testResourceId = resourceId('test-resource');
     const testAnnotationId = annotationId('test-annotation');
 
-    const { emitGenerationStart, getEventBus } = renderYieldFlow(
+    const { emitGenerationStart } = renderYieldFlow(
       testResourceId
     );
 
-    // Add an additional event listener (simulating multiple subscribers)
-    const additionalListener = vi.fn();
-    const subscription = getEventBus().get('yield:request').subscribe(additionalListener);
-
     // Trigger generation
     act(() => {
       emitGenerationStart(testAnnotationId, testResourceId, {
@@ -330,13 +310,8 @@ describe('Generation Flow - Feature Integration', () => {
       expect(generateResourceSpy).toHaveBeenCalled();
     });
 
-    // VERIFY: API called exactly once, even though multiple listeners exist
+    // VERIFY: API called exactly once
     expect(generateResourceSpy).toHaveBeenCalledTimes(1);
-
-    // 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 () => {
@@ -385,15 +360,13 @@ describe('Generation Flow - Feature Integration', () => {
 function renderYieldFlow(
   testResourceId: ResourceId
 ) {
-  let eventBusInstance: Emitter<EventMap>;
+  let eventBusInstance: ReturnType<typeof useEventBus>;
+  let generateFn: ReturnType<typeof useYieldFlow>['onGenerateDocument'];
 
   // Component to capture EventBus instance and set up event operations
   function EventBusCapture() {
     eventBusInstance = useEventBus();
-
-    // Set up resolution flow (resolve:update-body, resolve:link)
     useBindFlow(testResourceId);
-
     return null;
   }
 
@@ -402,12 +375,15 @@ function renderYieldFlow(
     const {
       isGenerating,
       generationProgress,
+      onGenerateDocument,
     } = useYieldFlow(
       'en',
       testResourceId,
       vi.fn()
     );
 
+    generateFn = onGenerateDocument;
+
     return (
       <div>
         <div data-testid="is-generating">
@@ -434,9 +410,10 @@ function renderYieldFlow(
   return {
     emitGenerationStart: (
       aId: AnnotationId,
-      rId: ResourceId,
+      _rId: ResourceId,
       options: {
         title: string;
+        storageUri?: string;
         prompt?: string;
         language?: string;
         temperature?: number;
@@ -444,11 +421,8 @@ function renderYieldFlow(
         context: any;
       }
     ) => {
-      eventBusInstance.get('yield:request').next({
-        annotationId: aId,
-        resourceId: rId,
-        options,
-      });
+      // Call the hook's callback directly (no longer EventBus-driven)
+      generateFn(aId as string, { storageUri: options.storageUri ?? 'file:///tmp/test', ...options });
     },
     getEventBus: () => eventBusInstance,
   };

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

@@ -31,7 +31,7 @@ import { useMarkFlow } from '../../../hooks/useMarkFlow';
 import { EventBusProvider, useEventBus } from '../../../contexts/EventBusContext';
 import { ApiClientProvider } from '../../../contexts/ApiClientContext';
 import { AuthTokenProvider } from '../../../contexts/AuthTokenContext';
-import { SSEClient } from '@semiont/api-client';
+import { SemiontApiClient } from '@semiont/api-client';
 import type { components } from '@semiont/core';
 
 // Mock Toast module to prevent "useToast must be used within a ToastProvider" errors
@@ -167,11 +167,11 @@ describe('Detection Progress Flow Integration (Layer 3)', () => {
     // Create fresh stream for each test
     mockStream = new MockSSEStream();
 
-    // Spy on SSEClient prototype methods to inject mock stream
-    vi.spyOn(SSEClient.prototype, 'markHighlights').mockReturnValue(mockStream as any);
-    vi.spyOn(SSEClient.prototype, 'markAssessments').mockReturnValue(mockStream as any);
-    vi.spyOn(SSEClient.prototype, 'markComments').mockReturnValue(mockStream as any);
-    vi.spyOn(SSEClient.prototype, 'markReferences').mockReturnValue(mockStream as any);
+    // Spy on SemiontApiClient prototype HTTP methods (namespace methods call these)
+    vi.spyOn(SemiontApiClient.prototype, 'annotateHighlights').mockResolvedValue({ correlationId: 'c1', jobId: 'j1' });
+    vi.spyOn(SemiontApiClient.prototype, 'annotateAssessments').mockResolvedValue({ correlationId: 'c1', jobId: 'j1' });
+    vi.spyOn(SemiontApiClient.prototype, 'annotateComments').mockResolvedValue({ correlationId: 'c1', jobId: 'j1' });
+    vi.spyOn(SemiontApiClient.prototype, 'annotateReferences').mockResolvedValue({ correlationId: 'c1', jobId: 'j1' });
 
     mockAnnotations = [];
   });

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

@@ -7,7 +7,7 @@
 
 import React, { useState, useEffect, useCallback, useMemo } from 'react';
 import { useQueryClient } from '@tanstack/react-query';
-import type { components, ResourceId, ResourceEvent, GatheredContext } from '@semiont/core';
+import type { components, ResourceId, GatheredContext, EventMap } from '@semiont/core';
 import { annotationId } from '@semiont/core';
 import { getLanguage, getPrimaryRepresentation, getPrimaryMediaType, getMimeCategory } from '@semiont/api-client';
 import { ANNOTATORS } from '@semiont/react-ui';
@@ -140,7 +140,7 @@ export function ResourceViewerPage({
 
   // Get unified event bus for subscribing to UI events
   const eventBus = useEventBus();
-  const client = useApiClient();
+  const semiont = useApiClient();
   const queryClient = useQueryClient(); // retained for non-store queries (events log)
 
   // UI state hooks
@@ -164,17 +164,17 @@ export function ResourceViewerPage({
 
   // Binary path: fetch short-lived media token, construct URL
   const { token: mediaToken, loading: mediaTokenLoading } = useMediaToken(rUri);
-  const binaryContent = (isBinary && mediaToken && client)
-    ? `${client.baseUrl}/api/resources/${rUri}?token=${mediaToken}`
+  const binaryContent = (isBinary && mediaToken && semiont)
+    ? `${semiont.baseUrl}/api/resources/${rUri}?token=${mediaToken}`
     : '';
 
   const content = isBinary ? binaryContent : textContent;
   const contentLoading = isBinary ? mediaTokenLoading : textLoading;
 
-  const annotationsData = useObservable(client.stores.annotations.listForResource(rUri));
+  const annotationsData = useObservable(semiont.browse.annotations(rUri));
   const annotations = useMemo(
-    () => annotationsData?.annotations || [],
-    [annotationsData?.annotations]
+    () => annotationsData || [],
+    [annotationsData]
   );
 
   const { data: referencedByData, isLoading: referencedByLoading } = resources.referencedBy.useQuery(rUri);
@@ -209,8 +209,8 @@ export function ResourceViewerPage({
       setWizardEntityTypes(event.entityTypes);
       setWizardOpen(true);
 
-      // Trigger context gathering
-      eventBus.get('gather:requested').next({ correlationId: crypto.randomUUID(), annotationId: event.annotationId, resourceId: event.resourceId });
+      // Trigger context gathering — gather:requested is consumed by useContextGatherFlow
+      eventBus.get('gather:requested').next({ correlationId: crypto.randomUUID(), annotationId: event.annotationId, resourceId: event.resourceId, options: { contextWindow: 2000 } });
     });
     return () => subscription.unsubscribe();
   }, [eventBus]);
@@ -231,21 +231,18 @@ export function ResourceViewerPage({
     });
   }, [onGenerateDocument]);
 
-  const handleWizardLinkResource = useCallback((referenceId: string, targetResourceId: string) => {
-    eventBus.get('bind:update-body').next({
-      annotationId: annotationId(referenceId),
-      resourceId: rUri,
-      operations: [{
-        op: 'add',
-        item: {
-          type: 'SpecificResource' as const,
-          source: targetResourceId,
-          purpose: 'linking' as const,
-        },
-      }],
-    });
-    showSuccess('Reference linked successfully');
-  }, [rUri, showSuccess]); // eventBus is stable singleton
+  const handleWizardLinkResource = useCallback(async (referenceId: string, targetResourceId: string) => {
+    try {
+      await semiont.bind.body(
+        rUri,
+        annotationId(referenceId),
+        [{ op: 'add', item: { type: 'SpecificResource' as const, source: targetResourceId, purpose: 'linking' as const } }],
+      );
+      showSuccess('Reference linked successfully');
+    } catch (error) {
+      showError(`Failed to link reference: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  }, [rUri, semiont, showSuccess, showError]);
 
   const handleWizardComposeNavigate = useCallback((
     context: GatheredContext,
@@ -364,8 +361,8 @@ export function ResourceViewerPage({
     triggerSparkleAnimation(annotationId);
   }, [triggerSparkleAnimation]);
 
-  const handleAnnotationAdded = useCallback((event: Extract<ResourceEvent, { type: 'annotation.added' }>) => {
-    triggerSparkleAnimation(event.payload.annotation.id);
+  const handleAnnotationAdded = useCallback((stored: EventMap['mark:added']) => {
+    triggerSparkleAnimation(stored.payload.annotation.id);
   }, [triggerSparkleAnimation]);
 
   const handleAnnotationCreateFailed = useCallback(() => showError('Failed to create annotation'), [showError]);
@@ -615,6 +612,7 @@ export function ResourceViewerPage({
             {/* Document Info Panel */}
             {activePanel === 'info' && (
               <ResourceInfoPanel
+                resourceId={rUri}
                 documentEntityTypes={documentEntityTypes}
                 documentLocale={getLanguage(resource)}
                 primaryMediaType={primaryMediaType}