@semiont/react-ui 0.2.34-build.91 → 0.2.34-build.93

package/src/components/settings/SettingsPanel.tsx

@@ -12,6 +12,7 @@ interface SettingsPanelProps {
   theme: 'light' | 'dark' | 'system';
   locale: string;
   isPendingLocaleChange?: boolean;
+  hoverDelayMs: number;
 }
 
 /**
@@ -20,12 +21,14 @@ interface SettingsPanelProps {
  * @emits settings:locale-changed - Locale changed by user. Payload: { locale: string }
  * @emits settings:line-numbers-toggled - Line numbers toggled on/off. Payload: undefined
  * @emits settings:theme-changed - Theme changed by user. Payload: { theme: 'light' | 'dark' | 'system' }
+ * @emits settings:hover-delay-changed - Hover delay changed by user. Payload: { hoverDelayMs: number }
  */
 export function SettingsPanel({
   showLineNumbers,
   theme,
   locale,
-  isPendingLocaleChange = false
+  isPendingLocaleChange = false,
+  hoverDelayMs
 }: SettingsPanelProps) {
   const t = useTranslations('Settings');
   const eventBus = useEventBus();
@@ -154,6 +157,31 @@ export function SettingsPanel({
             </p>
           )}
         </div>
+
+        {/* Hover Delay Slider */}
+        <div className="semiont-settings-panel__field">
+          <label htmlFor="hover-delay-slider" className="semiont-form__label">
+            {t('hoverDelay')}
+          </label>
+          <input
+            id="hover-delay-slider"
+            type="range"
+            min="0"
+            max="500"
+            step="50"
+            value={hoverDelayMs}
+            onChange={(e) => eventBus.get('settings:hover-delay-changed').next({ hoverDelayMs: Number(e.target.value) })}
+            className="semiont-slider"
+            aria-describedby="hover-delay-description"
+          />
+          <div className="semiont-slider__labels">
+            <span>{t('hoverDelayFast')}</span>
+            <span>{t('hoverDelaySlow')}</span>
+          </div>
+          <p id="hover-delay-description" className="semiont-form__help">
+            {t('hoverDelayDescription', { delay: hoverDelayMs })}
+          </p>
+        </div>
       </div>
     </div>
   );

package/src/features/resource-compose/components/ResourceComposePage.tsx

@@ -42,6 +42,7 @@ export interface ResourceComposePageProps {
   // UI state
   theme: 'light' | 'dark';
   showLineNumbers: boolean;
+  hoverDelayMs: number;
   activePanel: string | null;
 
   // Actions
@@ -110,6 +111,7 @@ export function ResourceComposePage({
   initialLocale,
   theme,
   showLineNumbers,
+  hoverDelayMs,
   activePanel,
   onSaveResource,
   onCancel,
@@ -527,6 +529,7 @@ export function ResourceComposePage({
                     editable={!isCreating}
                     sourceView={true}
                     showLineNumbers={showLineNumbers}
+                    hoverDelayMs={hoverDelayMs}
                     onChange={(newContent) => setNewResourceContent(newContent)}
                   />
                 </div>

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

@@ -1,13 +1,13 @@
 /**
- * Regression test: pendingAnnotation cleared after annotation:create succeeds
+ * Regression test: pendingAnnotation cleared after annotate:createsucceeds
  *
- * Bug: handleAnnotationCreate in useDetectionFlow called the API and emitted
- * annotation:created, but never called setPendingAnnotation(null). The pending
+ * Bug: handleAnnotationCreate in useAnnotationFlow called the API and emitted
+ * annotate:created, but never called setPendingAnnotation(null). The pending
  * creation form (e.g. "Create Reference", "Save" assessment) remained visible
  * after the user clicked the confirm button.
  *
  * Fix: setPendingAnnotation(null) added in handleAnnotationCreate on success,
- * before emitting annotation:created.
+ * before emitting annotate:created.
  *
  * This test covers all four motivations that have a pending form:
  * - linking  (ReferencesPanel: "Create Reference" button)
@@ -20,7 +20,7 @@ import React from 'react';
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { render, screen, waitFor } from '@testing-library/react';
 import { act } from 'react';
-import { useDetectionFlow } from '../../../hooks/useDetectionFlow';
+import { useAnnotationFlow } from '../../../hooks/useAnnotationFlow';
 import { EventBusProvider, useEventBus, resetEventBusForTesting } from '../../../contexts/EventBusContext';
 import { ApiClientProvider } from '../../../contexts/ApiClientContext';
 import { AuthTokenProvider } from '../../../contexts/AuthTokenContext';
@@ -28,6 +28,16 @@ import { SemiontApiClient } from '@semiont/api-client';
 import { resourceUri } 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
+vi.mock('../../../components/Toast', () => ({
+  useToast: () => ({
+    showSuccess: vi.fn(),
+    showError: vi.fn(),
+    showInfo: vi.fn(),
+    showWarning: vi.fn(),
+  }),
+}));
 import type { Motivation, Selector } from '@semiont/core';
 
 const TEST_URI = resourceUri('http://localhost:4000/resources/test-resource');
@@ -61,7 +71,7 @@ function renderDetectionFlow(testUri: string) {
   }
 
   function DetectionFlowHarness() {
-    const { pendingAnnotation } = useDetectionFlow(testUri as any);
+    const { pendingAnnotation } = useAnnotationFlow(testUri as any);
     return (
       <div>
         <div data-testid="pending-motivation">
@@ -112,16 +122,16 @@ describe('Annotation creation clears pendingAnnotation', () => {
 
     // Set a pending annotation
     act(() => {
-      emit('annotation:requested', { selector: TEXT_SELECTOR, motivation: 'linking' });
+      emit('annotate:requested', { selector: TEXT_SELECTOR, motivation: 'linking' });
     });
 
     await waitFor(() => {
       expect(screen.getByTestId('pending-motivation')).toHaveTextContent('linking');
     });
 
-    // Emit annotation:create (what ReferencesPanel does when user clicks "Create Reference")
+    // Emit annotate:create(what ReferencesPanel does when user clicks "Create Reference")
     await act(async () => {
-      emit('annotation:create', {
+      emit('annotate:create', {
         motivation: 'linking',
         selector: TEXT_SELECTOR,
         body: [{ type: 'TextualBody', value: 'Person', purpose: 'tagging' }],
@@ -140,7 +150,7 @@ describe('Annotation creation clears pendingAnnotation', () => {
     const { emit } = renderDetectionFlow(TEST_URI);
 
     act(() => {
-      emit('annotation:requested', { selector: SVG_SELECTOR, motivation: 'assessing' });
+      emit('annotate:requested', { selector: SVG_SELECTOR, motivation: 'assessing' });
     });
 
     await waitFor(() => {
@@ -148,7 +158,7 @@ describe('Annotation creation clears pendingAnnotation', () => {
     });
 
     await act(async () => {
-      emit('annotation:create', {
+      emit('annotate:create', {
         motivation: 'assessing',
         selector: SVG_SELECTOR,
         body: [{ type: 'TextualBody', value: 'Looks good', purpose: 'assessing' }],
@@ -164,7 +174,7 @@ describe('Annotation creation clears pendingAnnotation', () => {
     const { emit } = renderDetectionFlow(TEST_URI);
 
     act(() => {
-      emit('annotation:requested', { selector: SVG_SELECTOR, motivation: 'assessing' });
+      emit('annotate:requested', { selector: SVG_SELECTOR, motivation: 'assessing' });
     });
 
     await waitFor(() => {
@@ -173,7 +183,7 @@ describe('Annotation creation clears pendingAnnotation', () => {
 
     // Empty body is valid for assessments
     await act(async () => {
-      emit('annotation:create', {
+      emit('annotate:create', {
         motivation: 'assessing',
         selector: SVG_SELECTOR,
         body: [],
@@ -189,7 +199,7 @@ describe('Annotation creation clears pendingAnnotation', () => {
     const { emit } = renderDetectionFlow(TEST_URI);
 
     act(() => {
-      emit('annotation:requested', { selector: TEXT_SELECTOR, motivation: 'commenting' });
+      emit('annotate:requested', { selector: TEXT_SELECTOR, motivation: 'commenting' });
     });
 
     await waitFor(() => {
@@ -197,7 +207,7 @@ describe('Annotation creation clears pendingAnnotation', () => {
     });
 
     await act(async () => {
-      emit('annotation:create', {
+      emit('annotate:create', {
         motivation: 'commenting',
         selector: TEXT_SELECTOR,
         body: [{ type: 'TextualBody', value: 'Great point', purpose: 'commenting' }],
@@ -213,7 +223,7 @@ describe('Annotation creation clears pendingAnnotation', () => {
     const { emit } = renderDetectionFlow(TEST_URI);
 
     act(() => {
-      emit('annotation:requested', { selector: SVG_SELECTOR, motivation: 'tagging' });
+      emit('annotate:requested', { selector: SVG_SELECTOR, motivation: 'tagging' });
     });
 
     await waitFor(() => {
@@ -221,7 +231,7 @@ describe('Annotation creation clears pendingAnnotation', () => {
     });
 
     await act(async () => {
-      emit('annotation:create', {
+      emit('annotate:create', {
         motivation: 'tagging',
         selector: SVG_SELECTOR,
         body: [{ type: 'TextualBody', value: 'concept:trust', purpose: 'tagging' }],
@@ -233,20 +243,20 @@ describe('Annotation creation clears pendingAnnotation', () => {
     });
   });
 
-  it('emits annotation:created after successful creation', async () => {
+  it('emits annotate:created after successful creation', async () => {
     const { emit, getEventBus } = renderDetectionFlow(TEST_URI);
 
     const createdListener = vi.fn();
     // Set listener after first render so eventBus is captured
     await waitFor(() => expect(getEventBus()).toBeDefined());
-    const subscription = getEventBus().get('annotation:created').subscribe(createdListener);
+    const subscription = getEventBus().get('annotate:created').subscribe(createdListener);
 
     act(() => {
-      emit('annotation:requested', { selector: TEXT_SELECTOR, motivation: 'linking' });
+      emit('annotate:requested', { selector: TEXT_SELECTOR, motivation: 'linking' });
     });
 
     await act(async () => {
-      emit('annotation:create', {
+      emit('annotate:create', {
         motivation: 'linking',
         selector: TEXT_SELECTOR,
         body: [],
@@ -267,7 +277,7 @@ describe('Annotation creation clears pendingAnnotation', () => {
     const { emit } = renderDetectionFlow(TEST_URI);
 
     act(() => {
-      emit('annotation:requested', { selector: TEXT_SELECTOR, motivation: 'linking' });
+      emit('annotate:requested', { selector: TEXT_SELECTOR, motivation: 'linking' });
     });
 
     await waitFor(() => {
@@ -275,7 +285,7 @@ describe('Annotation creation clears pendingAnnotation', () => {
     });
 
     await act(async () => {
-      emit('annotation:create', {
+      emit('annotate:create', {
         motivation: 'linking',
         selector: TEXT_SELECTOR,
         body: [],
@@ -289,11 +299,11 @@ describe('Annotation creation clears pendingAnnotation', () => {
     });
   });
 
-  it('clears pendingAnnotation on cancel (annotation:cancel-pending)', async () => {
+  it('clears pendingAnnotation on cancel (annotate:cancel-pending)', async () => {
     const { emit } = renderDetectionFlow(TEST_URI);
 
     act(() => {
-      emit('annotation:requested', { selector: TEXT_SELECTOR, motivation: 'assessing' });
+      emit('annotate:requested', { selector: TEXT_SELECTOR, motivation: 'assessing' });
     });
 
     await waitFor(() => {
@@ -301,7 +311,7 @@ describe('Annotation creation clears pendingAnnotation', () => {
     });
 
     act(() => {
-      emit('annotation:cancel-pending', undefined);
+      emit('annotate:cancel-pending', undefined);
     });
 
     await waitFor(() => {

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

@@ -4,7 +4,7 @@
  * Tests the COMPLETE annotation deletion flow with real component composition:
  * - EventBusProvider (REAL)
  * - ApiClientProvider (REAL, with MOCKED client)
- * - useDetectionFlow (REAL) — single registration point for useResolutionFlow
+ * - useAnnotationFlow (REAL) — single registration point for useResolutionFlow
  * - useEventSubscriptions (REAL)
  *
  * This test focuses on ARCHITECTURE and EVENT WIRING:
@@ -18,16 +18,26 @@
  * - useResolutionFlow called in more than one hook (causes duplicate subscriptions)
  * - Auth token missing from API calls (401 errors)
  *
- * ARCHITECTURE: useResolutionFlow is called ONLY in useDetectionFlow.
- * useDetectionFlow handles all detection state (manual annotation selection
+ * ARCHITECTURE: useResolutionFlow is called ONLY in useAnnotationFlow.
+ * useAnnotationFlow handles all detection state (manual annotation selection
  * and AI-driven SSE detection) plus all API operations via useResolutionFlow.
  */
 
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { render, waitFor } from '@testing-library/react';
 import { act } from 'react';
-import { useDetectionFlow } from '../../../hooks/useDetectionFlow';
+import { useAnnotationFlow } from '../../../hooks/useAnnotationFlow';
 import { EventBusProvider, useEventBus, resetEventBusForTesting } from '../../../contexts/EventBusContext';
+
+// Mock Toast module to prevent "useToast must be used within a ToastProvider" errors
+vi.mock('../../../components/Toast', () => ({
+  useToast: () => ({
+    showSuccess: vi.fn(),
+    showError: vi.fn(),
+    showInfo: vi.fn(),
+    showWarning: vi.fn(),
+  }),
+}));
 import { ApiClientProvider } from '../../../contexts/ApiClientContext';
 import { AuthTokenProvider } from '../../../contexts/AuthTokenContext';
 import { SemiontApiClient } from '@semiont/api-client';
@@ -60,9 +70,9 @@ describe('Annotation Deletion - Feature Integration', () => {
 
     function TestComponent() {
       eventBusInstance = useEventBus();
-      // useDetectionFlow is the single registration point for useResolutionFlow
-      // (handles annotation:delete, annotation:create, detection:start, etc.)
-      useDetectionFlow(testUri);
+      // useAnnotationFlow is the single registration point for useResolutionFlow
+      // (handles annotate:delete annotate:create annotate:detect-request, etc.)
+      useAnnotationFlow(testUri);
       return null;
     }
 
@@ -79,14 +89,14 @@ describe('Annotation Deletion - Feature Integration', () => {
     return {
       emitDelete: (annotationId: string) => {
         act(() => {
-          eventBusInstance!.get('annotation:delete').next({ annotationId });
+          eventBusInstance!.get('annotate:delete').next({ annotationId });
         });
       },
       eventBus: eventBusInstance!,
     };
   }
 
-  it('should call deleteAnnotation API exactly ONCE when annotation:delete event is emitted', async () => {
+  it('should call deleteAnnotation API exactly ONCE when annotate:deleteevent is emitted', async () => {
     const { emitDelete } = renderAnnotationFlow();
     const annotationId = 'annotation-123';
 
@@ -123,12 +133,12 @@ describe('Annotation Deletion - Feature Integration', () => {
     expect(callArgs[1].auth).toBe(accessToken(testToken));
   });
 
-  it('should emit annotation:deleted event on successful deletion', async () => {
+  it('should emit annotate:deleted event on successful deletion', async () => {
     const { emitDelete, eventBus } = renderAnnotationFlow();
     const deletedListener = vi.fn();
 
     // Subscribe to success event
-    eventBus.get('annotation:deleted').subscribe(deletedListener);
+    eventBus.get('annotate:deleted').subscribe(deletedListener);
 
     emitDelete('annotation-789');
 
@@ -145,7 +155,7 @@ describe('Annotation Deletion - Feature Integration', () => {
     });
   });
 
-  it('should emit annotation:delete-failed event on API error', async () => {
+  it('should emit annotate:delete-failed event on API error', async () => {
     // Make API call fail
     deleteAnnotationSpy.mockRejectedValue(new Error('Network error'));
 
@@ -153,7 +163,7 @@ describe('Annotation Deletion - Feature Integration', () => {
     const failedListener = vi.fn();
 
     // Subscribe to failure event
-    eventBus.get('annotation:delete-failed').subscribe(failedListener);
+    eventBus.get('annotate:delete-failed').subscribe(failedListener);
 
     emitDelete('annotation-error');
 
@@ -192,10 +202,10 @@ describe('Annotation Deletion - Feature Integration', () => {
     expect(deleteAnnotationSpy.mock.calls[1][0]).toContain('annotation-2');
   });
 
-  it('ARCHITECTURE: useResolutionFlow is called in useDetectionFlow (single registration point)', async () => {
+  it('ARCHITECTURE: useResolutionFlow is called in useAnnotationFlow (single registration point)', async () => {
     /**
      * This test validates that there's only ONE event-driven deletion path:
-     * - useDetectionFlow calls useResolutionFlow (the single registration point)
+     * - useAnnotationFlow calls useResolutionFlow (the single registration point)
      * - useResolutionFlow subscribes to annotation:delete
      *
      * If this test fails with 2 API calls, it means useResolutionFlow was added
@@ -219,7 +229,7 @@ describe('Annotation Deletion - Feature Integration', () => {
      * that bypassed the event bus.
      *
      * The correct pattern is event-driven only:
-     * - UI emits annotation:delete event
+     * - UI emits annotate:deleteevent
      * - useResolutionFlow handles it
      * - No direct function calls
      */

package/src/features/resource-viewer/__tests__/{DetectionProgressDismissal.test.tsx → AnnotationProgressDismissal.test.tsx}

@@ -8,26 +8,36 @@
  * 4. BUG: Progress modal stays visible showing "Processing: Location" indefinitely
  *
  * ROOT CAUSE:
- * - useDetectionFlow.ts (line 54-62): detection:complete clears `detectingMotivation` but keeps `detectionProgress`
- * - DetectSection.tsx (line 214): Shows progress UI whenever `detectionProgress` is not null
+ * - useAnnotationFlow.ts (line 54-62): annotate:assist-finished clears `assistingMotivation` but keeps `progress`
+ * - AssistSection.tsx (line 214): Shows progress UI whenever `progress` is not null
  * - No mechanism to auto-dismiss or manually close the progress display
  *
  * FIX OPTIONS:
  * A) Auto-dismiss after timeout (3s after completion)
  * B) Add "Close" button to progress display
- * C) Clear progress on next detection:start (already works but not ideal UX)
+ * C) Clear progress on next annotate:assist-request (already works but not ideal UX)
  */
 
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { render, screen, waitFor } from '@testing-library/react';
 import { act } from 'react';
-import { useDetectionFlow } from '../../../hooks/useDetectionFlow';
+import { useAnnotationFlow } from '../../../hooks/useAnnotationFlow';
 import { EventBusProvider, resetEventBusForTesting, useEventBus } from '../../../contexts/EventBusContext';
 import { ApiClientProvider } from '../../../contexts/ApiClientContext';
 import { AuthTokenProvider } from '../../../contexts/AuthTokenContext';
 import { SSEClient } from '@semiont/api-client';
 import { resourceUri } from '@semiont/core';
 
+// Mock Toast module to prevent "useToast must be used within a ToastProvider" errors
+vi.mock('../../../components/Toast', () => ({
+  useToast: () => ({
+    showSuccess: vi.fn(),
+    showError: vi.fn(),
+    showInfo: vi.fn(),
+    showWarning: vi.fn(),
+  }),
+}));
+
 describe('Detection Progress Dismissal Bug', () => {
   let mockStream: any;
   const rUri = resourceUri('https://example.com/resources/test');
@@ -40,10 +50,10 @@ describe('Detection Progress Dismissal Bug', () => {
       close: vi.fn(),
     };
 
-    vi.spyOn(SSEClient.prototype, 'detectReferences').mockReturnValue(mockStream);
-    vi.spyOn(SSEClient.prototype, 'detectHighlights').mockReturnValue(mockStream);
-    vi.spyOn(SSEClient.prototype, 'detectComments').mockReturnValue(mockStream);
-    vi.spyOn(SSEClient.prototype, 'detectAssessments').mockReturnValue(mockStream);
+    vi.spyOn(SSEClient.prototype, 'annotateReferences').mockReturnValue(mockStream);
+    vi.spyOn(SSEClient.prototype, 'annotateHighlights').mockReturnValue(mockStream);
+    vi.spyOn(SSEClient.prototype, 'annotateComments').mockReturnValue(mockStream);
+    vi.spyOn(SSEClient.prototype, 'annotateAssessments').mockReturnValue(mockStream);
   });
 
   afterEach(() => {
@@ -55,13 +65,13 @@ describe('Detection Progress Dismissal Bug', () => {
 
     function TestHarness() {
       eventBusInstance = useEventBus();
-      const { detectingMotivation, detectionProgress } = useDetectionFlow(rUri);
+      const { assistingMotivation, progress } = useAnnotationFlow(rUri);
 
       return (
         <div>
-          <div data-testid="detecting">{detectingMotivation || 'none'}</div>
+          <div data-testid="detecting">{assistingMotivation || 'none'}</div>
           <div data-testid="progress">
-            {detectionProgress ? detectionProgress.message || 'has progress' : 'no progress'}
+            {progress ? progress.message || 'has progress' : 'no progress'}
           </div>
         </div>
       );
@@ -81,9 +91,9 @@ describe('Detection Progress Dismissal Bug', () => {
     expect(screen.getByTestId('detecting')).toHaveTextContent('none');
     expect(screen.getByTestId('progress')).toHaveTextContent('no progress');
 
-    // User clicks detect button (emits detection:start)
+    // User clicks detect button (emits annotate:assist-request)
     act(() => {
-      eventBusInstance.get('detection:start').next({
+      eventBusInstance.get('annotate:assist-request').next({
         motivation: 'linking',
         options: { entityTypes: ['Location'] }
       });
@@ -96,7 +106,7 @@ describe('Detection Progress Dismissal Bug', () => {
 
     // SSE sends progress update
     act(() => {
-      eventBusInstance.get('detection:progress').next({
+      eventBusInstance.get('annotate:progress').next({
         status: 'scanning',
         message: 'Processing: Location',
         currentEntityType: 'Location',
@@ -108,12 +118,12 @@ describe('Detection Progress Dismissal Bug', () => {
       expect(screen.getByTestId('progress')).toHaveTextContent('Processing: Location');
     });
 
-    // Detection completes (SSE finishes, backend emits detection:complete)
+    // Detection completes (SSE finishes, backend emits annotate:assist-finished)
     act(() => {
-      eventBusInstance.get('detection:complete').next({ motivation: 'linking' });
+      eventBusInstance.get('annotate:assist-finished').next({ motivation: 'linking' });
     });
 
-    // detectingMotivation cleared immediately
+    // assistingMotivation cleared immediately
     await waitFor(() => {
       expect(screen.getByTestId('detecting')).toHaveTextContent('none');
     });
@@ -128,11 +138,11 @@ describe('Detection Progress Dismissal Bug', () => {
 
     function TestHarness() {
       eventBusInstance = useEventBus();
-      const { detectionProgress } = useDetectionFlow(rUri);
+      const { progress } = useAnnotationFlow(rUri);
 
       return (
         <div data-testid="progress">
-          {detectionProgress ? detectionProgress.message || 'has progress' : 'no progress'}
+          {progress ? progress.message || 'has progress' : 'no progress'}
         </div>
       );
     }
@@ -149,15 +159,15 @@ describe('Detection Progress Dismissal Bug', () => {
 
     // First detection with stuck progress
     act(() => {
-      eventBusInstance.get('detection:start').next({ motivation: 'linking', options: {} });
+      eventBusInstance.get('annotate:assist-request').next({ motivation: 'linking', options: {} });
     });
 
     act(() => {
-      eventBusInstance.get('detection:progress').next({ message: 'Old progress stuck here' });
+      eventBusInstance.get('annotate:progress').next({ message: 'Old progress stuck here' });
     });
 
     act(() => {
-      eventBusInstance.get('detection:complete').next({ motivation: 'linking' });
+      eventBusInstance.get('annotate:assist-finished').next({ motivation: 'linking' });
     });
 
     await waitFor(() => {
@@ -166,7 +176,7 @@ describe('Detection Progress Dismissal Bug', () => {
 
     // WORKAROUND: Start new detection clears old progress
     act(() => {
-      eventBusInstance.get('detection:start').next({ motivation: 'highlighting', options: {} });
+      eventBusInstance.get('annotate:assist-request').next({ motivation: 'highlighting', options: {} });
     });
 
     await waitFor(() => {
@@ -181,11 +191,11 @@ describe('Detection Progress Dismissal Bug', () => {
 
     function TestHarness() {
       eventBusInstance = useEventBus();
-      const { detectionProgress } = useDetectionFlow(rUri);
+      const { progress } = useAnnotationFlow(rUri);
 
       return (
         <div data-testid="progress">
-          {detectionProgress ? 'visible' : 'dismissed'}
+          {progress ? 'visible' : 'dismissed'}
         </div>
       );
     }
@@ -202,18 +212,18 @@ describe('Detection Progress Dismissal Bug', () => {
 
     // Show progress
     act(() => {
-      eventBusInstance.get('detection:start').next({ motivation: 'linking', options: {} });
+      eventBusInstance.get('annotate:assist-request').next({ motivation: 'linking', options: {} });
     });
 
     act(() => {
-      eventBusInstance.get('detection:progress').next({
+      eventBusInstance.get('annotate:progress').next({
         status: 'complete',
         message: 'Complete! Created 5 annotations'
       });
     });
 
     act(() => {
-      eventBusInstance.get('detection:complete').next({ motivation: 'linking' });
+      eventBusInstance.get('annotate:assist-finished').next({ motivation: 'linking' });
     });
 
     // Progress visible initially
@@ -229,10 +239,10 @@ describe('Detection Progress Dismissal Bug', () => {
     });
   });
 
-  it('FIXED: SSE emits final completion chunk data as detection:progress', async () => {
+  it('FIXED: SSE emits final completion chunk data as annotate:assist-progress', async () => {
     /**
-     * This test verifies that SSE emits the final chunk as detection:progress
-     * BEFORE emitting detection:complete.
+     * This test verifies that SSE emits the final chunk as annotate:assist-progress
+     * BEFORE emitting annotate:assist-finished.
      *
      * This ensures the UI can display the final completion message with status:'complete'.
      */
@@ -241,12 +251,12 @@ describe('Detection Progress Dismissal Bug', () => {
 
     function TestHarness() {
       eventBusInstance = useEventBus();
-      const { detectionProgress } = useDetectionFlow(rUri);
+      const { progress } = useAnnotationFlow(rUri);
 
       return (
         <div>
-          <div data-testid="progress-status">{detectionProgress?.status || 'none'}</div>
-          <div data-testid="progress-message">{detectionProgress?.message || 'no message'}</div>
+          <div data-testid="progress-status">{progress?.status || 'none'}</div>
+          <div data-testid="progress-message">{progress?.message || 'no message'}</div>
         </div>
       );
     }
@@ -263,7 +273,7 @@ describe('Detection Progress Dismissal Bug', () => {
 
     // Start detection (triggers SSE stream creation)
     act(() => {
-      eventBusInstance.get('detection:start').next({
+      eventBusInstance.get('annotate:assist-request').next({
         motivation: 'linking',
         options: { entityTypes: ['Location'] }
       });
@@ -271,7 +281,7 @@ describe('Detection Progress Dismissal Bug', () => {
 
     // Simulate SSE scanning chunk
     act(() => {
-      eventBusInstance.get('detection:progress').next({
+      eventBusInstance.get('annotate:progress').next({
         status: 'scanning',
         message: 'Processing: Location',
       });
@@ -281,9 +291,9 @@ describe('Detection Progress Dismissal Bug', () => {
       expect(screen.getByTestId('progress-status')).toHaveTextContent('scanning');
     });
 
-    // Simulate SSE emitting final chunk as detection:progress
+    // Simulate SSE emitting final chunk as annotate:assist-progress
     act(() => {
-      eventBusInstance.get('detection:progress').next({
+      eventBusInstance.get('annotate:progress').next({
         status: 'complete',
         message: 'Complete! Found 5 entities',
         foundCount: 5,