@open-mercato/ui 0.6.8-develop.6878.1.ab817e58ac → 0.6.8-develop.6881.1.8ea75912f2

package/src/ai/__tests__/AiChatSessions.test.tsx

@@ -24,6 +24,19 @@ jest.mock('../conversation-store', () => {
   }
 })
 
+jest.mock('@open-mercato/shared/lib/logger', () => {
+  const mocked = {
+    debug: jest.fn(),
+    info: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+    child: jest.fn(),
+  }
+  mocked.child.mockImplementation(() => mocked)
+  return { createLogger: jest.fn(() => mocked) }
+})
+
+import { createLogger } from '@open-mercato/shared/lib/logger'
 import {
   listAiServerConversations,
   createAiServerConversation,
@@ -31,6 +44,8 @@ import {
 
 const listMock = listAiServerConversations as jest.MockedFunction<typeof listAiServerConversations>
 const createMock = createAiServerConversation as jest.MockedFunction<typeof createAiServerConversation>
+const loggerError = createLogger('ui').error as jest.Mock
+const loggerWarn = createLogger('ui').warn as jest.Mock
 
 const KEY_PREFIX = 'om-ai-chat-sessions-v1'
 
@@ -69,6 +84,8 @@ describe('<AiChatSessionsProvider> — tenant/org scope isolation', () => {
     listMock.mockResolvedValue(null)
     createMock.mockReset()
     createMock.mockResolvedValue(null)
+    loggerError.mockClear()
+    loggerWarn.mockClear()
     // Reset scope to a known starting point. The module-level state in
     // organizationEvents persists across tests in the same file.
     act(() => {
@@ -212,6 +229,51 @@ describe('<AiChatSessionsProvider> — tenant/org scope isolation', () => {
     })
   })
 
+  it('warns when the server conversation list is unavailable', async () => {
+    listMock.mockReset()
+    listMock.mockResolvedValue(null)
+
+    renderWithProviders(<Harness agentId="assistant" />)
+
+    await waitFor(() => {
+      expect(loggerWarn).toHaveBeenCalledWith(
+        'Could not load server conversations; keeping the locally persisted sessions',
+      )
+    })
+  })
+
+  it('logs and keeps the locally persisted sessions when the server list rejects', async () => {
+    const failure = new Error('[internal] conversations endpoint unreachable')
+    listMock.mockReset()
+    listMock.mockRejectedValue(failure)
+    window.localStorage.setItem(
+      scopedKey('T1', 'O1'),
+      JSON.stringify({
+        sessions: [
+          {
+            id: 'local-session',
+            agentId: 'assistant',
+            conversationId: 'local-conv',
+            createdAt: 1,
+            lastUsedAt: 1,
+            status: 'open',
+          },
+        ],
+        activeByAgent: { assistant: 'local-session' },
+      }),
+    )
+
+    renderWithProviders(<Harness agentId="assistant" />)
+
+    await waitFor(() => {
+      expect(loggerError).toHaveBeenCalledWith('Failed to load server conversations', {
+        err: failure,
+      })
+    })
+
+    expect(screen.getByTestId('session-count').textContent).toBe('1')
+  })
+
   it('falls back to the no-tenant/no-org bucket when scope is unresolved', async () => {
     act(() => {
       emitOrganizationScopeChanged({ tenantId: null, organizationId: null })

package/src/ai/parts/__tests__/useAiPendingActionPolling.test.tsx

@@ -9,6 +9,19 @@ jest.mock('../../../backend/utils/apiCall', () => ({
   apiCallOrThrow: jest.fn(),
 }))
 
+jest.mock('@open-mercato/shared/lib/logger', () => {
+  const mocked = {
+    debug: jest.fn(),
+    info: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+    child: jest.fn(),
+  }
+  mocked.child.mockImplementation(() => mocked)
+  return { createLogger: jest.fn(() => mocked) }
+})
+
+import { createLogger } from '@open-mercato/shared/lib/logger'
 import { apiCallOrThrow } from '../../../backend/utils/apiCall'
 import { useAiPendingActionPolling } from '../useAiPendingActionPolling'
 import type { AiPendingActionCardAction, AiPendingActionCardStatus } from '../types'
@@ -48,9 +61,12 @@ function mockResponse(action: AiPendingActionCardAction) {
   }))
 }
 
+const loggerError = createLogger('ui').error as jest.Mock
+
 describe('useAiPendingActionPolling', () => {
   beforeEach(() => {
     ;(apiCallOrThrow as jest.Mock).mockReset()
+    loggerError.mockClear()
   })
 
   it('fetches on mount and continues polling while status is pending', async () => {
@@ -148,4 +164,49 @@ describe('useAiPendingActionPolling', () => {
       jest.useRealTimers()
     }
   })
+
+  it('logs a failed fetch and keeps polling until it recovers', async () => {
+    const failure = new Error('[internal] pending action endpoint unreachable')
+    ;(apiCallOrThrow as jest.Mock)
+      .mockImplementationOnce(async () => {
+        throw failure
+      })
+      .mockImplementation(async () => ({
+        ok: true,
+        status: 200,
+        result: { pendingAction: makeAction({ status: 'pending' }) },
+        response: {},
+        cacheStatus: null,
+      }))
+
+    jest.useFakeTimers()
+    try {
+      const { result, unmount } = renderHook(() =>
+        useAiPendingActionPolling({ pendingActionId: 'pa-1', intervalMs: 1000 }),
+      )
+
+      await act(async () => {
+        await Promise.resolve()
+        await Promise.resolve()
+      })
+      expect(loggerError).toHaveBeenCalledWith('Failed to load the pending AI action', {
+        err: failure,
+        pendingActionId: 'pa-1',
+      })
+      expect(result.current.error?.message).toBe(failure.message)
+      expect(result.current.action).toBeNull()
+
+      await act(async () => {
+        jest.advanceTimersByTime(1000)
+        await Promise.resolve()
+        await Promise.resolve()
+      })
+      expect(result.current.action?.status).toBe('pending')
+      expect(result.current.error).toBeNull()
+
+      unmount()
+    } finally {
+      jest.useRealTimers()
+    }
+  })
 })

package/src/ai/parts/useAiPendingActionPolling.ts

@@ -1,9 +1,12 @@
 "use client"
 
 import * as React from 'react'
+import { createLogger } from '@open-mercato/shared/lib/logger'
 import { apiCallOrThrow } from '../../backend/utils/apiCall'
 import type { AiPendingActionCardAction, AiPendingActionCardStatus } from './types'
 
+const logger = createLogger('ui').child({ component: 'useAiPendingActionPolling' })
+
 /**
  * Shared polling hook for the Phase 3 mutation-approval cards (Step 5.10).
  *
@@ -148,6 +151,7 @@ export function useAiPendingActionPolling(
       }
       return result.pendingAction
     } catch (err) {
+      logger.error('Failed to load the pending AI action', { err, pendingActionId })
       if (!mountedRef.current) return null
       const message = err instanceof Error ? err.message : 'Failed to load pending action.'
       setError({ message })
@@ -168,7 +172,11 @@ export function useAiPendingActionPolling(
     }
     setIsPolling(true)
     timerRef.current = setTimeout(async () => {
-      await refresh()
+      try {
+        await refresh()
+      } catch (err) {
+        logger.error('Polling the pending AI action failed unexpectedly', { err })
+      }
       scheduleNext()
     }, intervalMs)
   }, [clearTimer, disabled, intervalMs, refresh])
@@ -184,11 +192,18 @@ export function useAiPendingActionPolling(
       }
     }
     setIsPolling(true)
-    // Always fetch on mount — the "reconnect behavior" guarantee.
-    void refresh().then(() => {
-      if (!mountedRef.current) return
-      scheduleNext()
-    })
+    // Always fetch on mount — the "reconnect behavior" guarantee. The catch
+    // runs before the scheduling step so a rejected first fetch degrades to a
+    // logged error instead of silently killing the polling loop.
+    void refresh()
+      .catch((err) => {
+        logger.error('Loading the pending AI action failed unexpectedly', { err })
+        return null
+      })
+      .then(() => {
+        if (!mountedRef.current) return
+        scheduleNext()
+      })
     return () => {
       mountedRef.current = false
       clearTimer()