@envive-ai/react-hooks 0.3.18 → 0.3.19-alpha-marlo-0

package/src/contexts/pageContext/__tests__/pageContext.test.tsx

@@ -15,9 +15,9 @@ import { mapUrlResolverResponseToVariantInfo } from '../mapping';
 import { PageProvider, usePage } from '../pageContext';
 
 // Mock the Logger to avoid console output in tests
-vi.spyOn(Logger, 'logInfo').mockImplementation(() => {});
-vi.spyOn(Logger, 'logWarn').mockImplementation(() => {});
-vi.spyOn(Logger, 'logError').mockImplementation(() => {});
+vi.spyOn(Logger.prototype, 'logInfo').mockImplementation(() => {});
+vi.spyOn(Logger.prototype, 'logWarn').mockImplementation(() => {});
+vi.spyOn(Logger.prototype, 'logError').mockImplementation(() => {});
 
 // Mock CommerceApiClient
 const mockResolveUrl = vi.fn();
@@ -468,7 +468,7 @@ describe('PageProvider', () => {
 
   describe('Error Handling', () => {
     it('should log error and not crash when resolveUrl fails', async () => {
-      const errorSpy = vi.spyOn(Logger, 'logError');
+      const errorSpy = vi.spyOn(Logger.prototype, 'logError');
       const error = new Error('Network error');
       mockResolveUrl.mockRejectedValue(error);
 
@@ -487,7 +487,7 @@ describe('PageProvider', () => {
     });
 
     it('should handle invalid variant type gracefully', async () => {
-      const errorSpy = vi.spyOn(Logger, 'logError');
+      const errorSpy = vi.spyOn(Logger.prototype, 'logError');
 
       const invalidResponse = {
         variant_type: 'invalid_type',

package/src/contexts/pageContext/pageContext.tsx

@@ -5,6 +5,7 @@ import {
   useContext,
   useEffect,
   useMemo,
+  useRef,
   useState,
 } from 'react';
 import {
@@ -21,6 +22,8 @@ import { VariantTypeEnum } from 'src/application/models';
 import { mapApiUserEventToUserEvent, mapUrlResolverResponseToVariantInfo } from './mapping';
 import { PageDetails } from './types';
 
+const logger = new Logger('pageContext');
+
 const PageContext = createContext<
   | (PageDetails & {
       isLoading: boolean;
@@ -33,13 +36,17 @@ const PageContext = createContext<
 export const PageProvider: React.FC<{
   children: ReactNode;
   previewMode: boolean;
-}> = ({ children, previewMode = false }) => {
+  /** When URL resolver returns `ready: false`, invoked for extension/injection failure reporting. */
+  onUrlResolverNotReady?: (error: Error) => Promise<unknown> | void;
+}> = ({ children, previewMode = false, onUrlResolverNotReady }) => {
   const [pageUrl, setPageUrl] = useState<string | undefined>(undefined);
   const [urlResolverResponse, setUrlResolverResponse] = useAtom(urlResolverAtom);
   const [isLoading, setIsLoading] = useState(false);
   const [variantInfo, setVariantInfo] = useAtom(pageVariantInfoAtom);
   const [userEvent, setUserEvent] = useAtom(pageUserEventAtom);
   const [isSupported, setIsSupported] = useState(false);
+  const lastNotReadyUrlRef = useRef<string | null>(null);
+
   useEffect(() => {
     setPageUrl(window.location.href);
   }, []);
@@ -70,11 +77,13 @@ export const PageProvider: React.FC<{
       if (response.ready) {
         const newVariantInfo = mapUrlResolverResponseToVariantInfo(url, response);
         const newUserEvent = mapApiUserEventToUserEvent(response.user_event ?? undefined);
+        logger.logDebug('setting variant info and user event', { newVariantInfo, newUserEvent });
         setVariantInfo(newVariantInfo);
         setUserEvent(newUserEvent);
       } else {
         setUserEvent(undefined);
         setVariantInfo(undefined);
+        logger.logDebug('set variant info and user event to undefined', { variantInfo, userEvent });
       }
     },
     [setVariantInfo, setUserEvent],
@@ -102,9 +111,19 @@ export const PageProvider: React.FC<{
         setVariantFromUrlResolver(cleansedUrl, response);
         setIsLoading(false);
         setIsSupported(response.ready);
+
+        if (response.ready) {
+          lastNotReadyUrlRef.current = null;
+        } else if (onUrlResolverNotReady && lastNotReadyUrlRef.current !== cleansedUrl) {
+          lastNotReadyUrlRef.current = cleansedUrl;
+          const err = new Error(`URL resolver returned ready=false for ${cleansedUrl}`);
+          Promise.resolve(onUrlResolverNotReady(err)).catch(callbackError => {
+            logger.logDebug('onUrlResolverNotReady callback failed', callbackError);
+          });
+        }
       } catch (e) {
         setIsLoading(false);
-        Logger.logError('Failed to resolve page URL', e, { pageUrl });
+        logger.logError('Failed to resolve page URL', e, { pageUrl });
       }
     };
     resolvePageUrl();
@@ -116,6 +135,7 @@ export const PageProvider: React.FC<{
     userEvent,
     variantInfo,
     previewMode,
+    onUrlResolverNotReady,
   ]);
 
   const setPageUrlStable = useCallback((url: string) => {

package/src/contexts/salesAgentContext/chatAPI.ts

@@ -29,6 +29,8 @@ const TRACKED_USER_EVENTS = [
   UserEventCategory.PdpVisit,
   UserEventCategory.PlpVisit,
 ];
+
+const logger = new Logger('chatAPI');
 export interface SalesAgentChatAPI {
   logPageVisit: ({ pageVisitCategory }: { pageVisitCategory: PageVisitCategory }) => void;
   logUserEvent: (event: UserEvent) => void;
@@ -88,11 +90,9 @@ export const useSalesAgentChatAPI = (widget?: WidgetInteractionComponent) => {
   const logUserEvent = useCallback(
     (event: UserEvent) => {
       if (!hasParsedVariantInfo) {
-        Logger.logWarn(
-          '[envive-ai] hasParsedVariantInfo is false, not logging user event',
-          undefined,
-          { event },
-        );
+        logger.logWarn('hasParsedVariantInfo is false, not logging user event', undefined, {
+          event,
+        });
         return;
       }
       if (TRACKED_USER_EVENTS.includes(event.category)) {

package/src/contexts/salesAgentContext/salesAgentContext.tsx

@@ -47,6 +47,8 @@ export interface MockSalesAgentData {
 
 const SalesAgentContext = createContext<SalesAgent | undefined>(undefined);
 
+const logger = new Logger('salesAgentContext');
+
 export interface SalesAgentProviderProps {
   children: ReactNode;
   previewMode?: boolean;
@@ -99,7 +101,7 @@ export const SalesAgentProvider: React.FC<SalesAgentProviderProps> = ({
         // Remove the pending message from the user events
         requestPayload.userEvents?.map(userEvent => markUserEventsProcessed([userEvent.eventId]));
       } catch (error) {
-        Logger.logError('[envive-ai] error sending message', error);
+        logger.logError('error sending message', error);
       }
     },
     [getStreamingResponses, setIsInitialized, markUserEventsProcessed],
@@ -207,7 +209,7 @@ export const SalesAgentProvider: React.FC<SalesAgentProviderProps> = ({
         try {
           await hydrateMessages();
         } catch (error) {
-          Logger.logError('[envive-ai] error hydrating messages', error);
+          logger.logError('error hydrating messages', error);
         } finally {
           setIsHydrated(true);
         }

package/src/contexts/salesAgentContext/salesAgentService.ts

@@ -12,7 +12,7 @@ import {
   Response,
   UserEvent,
 } from 'src/application/models';
-import { messageFromQueryEvent, messageFromResponse } from 'src/application/utils';
+import { messageFromResponse } from 'src/application/utils';
 import { appDetailsAtom } from 'src/atoms/app';
 import { analyticsContextAtom } from 'src/atoms/app/variant';
 import {
@@ -33,6 +33,8 @@ import { v4 as uuid } from 'uuid';
 
 import { StatusCodeError } from './statusCodeError';
 
+const logger = new Logger('salesAgentService');
+
 interface SalesAgentService {
   createResponsePayload: (payload: {
     userEvents: UserEvent[];
@@ -223,7 +225,7 @@ const processStreamingResponse = async (
 
       lastMessage = updateMessageState(message, lastMessage!, setMessages);
     } catch (error: unknown) {
-      Logger.logWarn(`[spiffy-ai] Failed to generate responses from stream`, error, {
+      logger.logWarn('Failed to generate responses from stream', error, {
         lastResponse: lastMessage,
         response,
       });

package/src/contexts/searchContext/__tests__/searchContext.test.tsx

@@ -1,10 +1,7 @@
 import React from 'react';
 import { act, render, screen, waitFor } from '@testing-library/react';
 import { Provider, useAtomValue } from 'jotai';
-import {
-  EnviveConfigProvider,
-  useEnviveConfig,
-} from 'src/contexts/enviveConfigContext/enviveConfigContext';
+import { EnviveConfigProvider, useEnviveConfig } from 'src/contexts/enviveConfigContext';
 import { LocalStorageProvider } from 'src/contexts/localStorageContext/localStorageContext';
 import { GraphQLProvider } from 'src/contexts/graphqlContext/graphqlContext';
 import { UserIdentityProvider } from 'src/contexts/userIdentityContext/userIdentityContext';
@@ -79,14 +76,20 @@ vi.mock('src/contexts/enviveConfigContext/enviveConfigContext', async () => {
 });
 
 // Mock Logger
-vi.mock('src/application/logging/logger', () => ({
-  default: {
-    logInfo: vi.fn(),
-    logWarn: vi.fn(),
-    logError: vi.fn(),
-    logDebug: vi.fn(),
-  },
-}));
+vi.mock('src/application/logging/logger', () => {
+  const MockLogger = vi.fn(function MockLogger() {
+    return {
+      logInfo: vi.fn(),
+      logWarn: vi.fn(),
+      logError: vi.fn(),
+      logDebug: vi.fn(),
+    };
+  });
+
+  return {
+    default: MockLogger,
+  };
+});
 
 // Mock the search service adapter
 vi.mock('src/atoms/search/searchServiceAdapter', () => ({

package/src/contexts/searchContext/searchContext.tsx

@@ -9,7 +9,7 @@ import {
 import { baseUrlAtom } from 'src/atoms/envive/enviveConfig';
 import Logger from 'src/application/logging/logger';
 import { useAppDetails } from 'src/hooks/AppDetails/useAppDetails';
-import { useEnviveConfig } from 'src/contexts/enviveConfigContext/enviveConfigContext';
+import { useEnviveConfig } from 'src/contexts/enviveConfigContext';
 import { SessionRestartRequired } from 'src/types/exceptions/sessionExceptions';
 import { UnsupportedProductException } from 'src/types/exceptions/unsupportedProductExceptions';
 import { SearchParams, SearchResult } from 'src/application/models/api/search';
@@ -18,6 +18,8 @@ import {
   setSearchServiceFunction,
 } from 'src/atoms/search/searchServiceAdapter';
 
+const logger = new Logger('searchContext');
+
 const transformProductResponses = (products: SearchResult['products']) =>
   products.map(data => ({
     id: data.id,
@@ -49,7 +51,7 @@ async function errorResponseBody(error: ResponseError) {
 
 async function throwSessionRestartRequiredIf(errorMsg: string, error: unknown) {
   if (!(error instanceof ResponseError)) {
-    Logger.logInfo(errorMsg, error);
+    logger.logInfo(errorMsg, error);
     throw error;
   }
 
@@ -63,7 +65,7 @@ async function throwSessionRestartRequiredIf(errorMsg: string, error: unknown) {
     errorResponse?.app_code?.toUpperCase() === 'RESTART_SESSION' ||
     errorResponse?.sub_code?.toUpperCase() === 'NOT_FOUND'
   ) {
-    Logger.logInfo(
+    logger.logInfo(
       'Session does not exist. Re-start session',
       error,
       error.response,
@@ -72,7 +74,7 @@ async function throwSessionRestartRequiredIf(errorMsg: string, error: unknown) {
     throw new SessionRestartRequired();
   }
 
-  Logger.logInfo(errorMsg, error);
+  logger.logInfo(errorMsg, error);
   throw error;
 }
 

package/src/contexts/sessionStorageContext/sessionStorageContext.tsx

@@ -9,6 +9,8 @@ interface SessionStorageContextType {
 
 const SessionStorageContext = createContext<SessionStorageContextType | null>(null);
 
+const logger = new Logger('sessionStorageContext');
+
 export const SessionStorageProvider: React.FC<{
   children: React.ReactNode;
 }> = ({ children }) => {
@@ -22,7 +24,7 @@ export const SessionStorageProvider: React.FC<{
 
   useEffect(() => {
     if (!isAvailable) {
-      Logger.logError('sessionStorage is not available', undefined);
+      logger.logError('sessionStorage is not available', undefined);
     }
   }, [isAvailable]);
 

package/src/contexts/uiConfigContext/__tests__/uiConfigContext.test.tsx

@@ -6,13 +6,13 @@ import { SparkleIconColor } from '@envive-ai/react-toolkit-v3/WelcomeMessage';
 import { ChatHeaderVariant } from '@envive-ai/react-toolkit-v3/ChatHeader';
 import { Theme } from '@envive-ai/react-toolkit-v3/Tokens';
 import { FloatingButtonLocation } from '@envive-ai/react-toolkit-v3/FloatingButton';
-import { UiConfigProvider, useUiConfig } from '../uiConfigContext';
+import { useUiConfig } from '../uiConfigContext';
 import { ConfigVersionEnum, OrgUIConfigV3 } from '../../typesV3';
 
 // Mock the Logger to avoid console output in tests
-vi.spyOn(Logger, 'logInfo').mockImplementation(() => {});
-vi.spyOn(Logger, 'logWarn').mockImplementation(() => {});
-vi.spyOn(Logger, 'logError').mockImplementation(() => {});
+vi.spyOn(Logger.prototype, 'logInfo').mockImplementation(() => {});
+vi.spyOn(Logger.prototype, 'logWarn').mockImplementation(() => {});
+vi.spyOn(Logger.prototype, 'logError').mockImplementation(() => {});
 
 // Mock the useNewOrgConfig hook
 vi.mock('src/hooks/NewOrgConfig', () => ({
@@ -30,7 +30,7 @@ const MockUiConfigComponent: React.FC = () => {
     setIsLoadingState(true);
     try {
       const config = await getUiConfig();
-      setUiConfig(config);
+      setUiConfig(config ?? null);
       setError(null);
     } catch (err: unknown) {
       setError(err instanceof Error ? err.message : 'Unknown error');
@@ -74,7 +74,7 @@ const TestWrapper: React.FC<{
     loading: mockNewOrgConfig.loading ?? false,
   });
 
-  return <UiConfigProvider>{children}</UiConfigProvider>;
+  return children;
 };
 
 describe('UiConfigProvider', () => {
@@ -129,7 +129,7 @@ describe('UiConfigProvider', () => {
   });
 
   describe('useUiConfig Hook Integration', () => {
-    it('should provide context through useUiConfig hook', async () => {
+    it('should provide ui config data via useUiConfig hook', async () => {
       const mockUiConfig = createMockUiConfig();
 
       render(
@@ -151,31 +151,6 @@ describe('UiConfigProvider', () => {
 
       expect(screen.getByTestId('is-loading')).toHaveTextContent('false');
     });
-
-    it('should throw error when used outside of UiConfigProvider', () => {
-      const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-
-      const TestComponent: React.FC = () => {
-        try {
-          useUiConfig();
-          return <div data-testid="no-error">No Error</div>;
-        } catch (error: unknown) {
-          return (
-            <div data-testid="error">
-              {error instanceof Error ? error.message : 'Unknown error'}
-            </div>
-          );
-        }
-      };
-
-      render(<TestComponent />);
-
-      expect(screen.getByTestId('error')).toHaveTextContent(
-        'useUiConfig must be used within a UiConfigProvider',
-      );
-
-      consoleSpy.mockRestore();
-    });
   });
 
   describe('getUiConfig', () => {

package/src/contexts/uiConfigContext/uiConfigContext.tsx

@@ -1,44 +1,32 @@
-import { ReactNode, createContext, useCallback, useContext, useMemo, useState } from 'react';
 import Logger from 'src/application/logging/logger';
 import { useNewOrgConfig } from 'src/hooks/NewOrgConfig';
 import { OrgUIConfigV3 } from '../typesV3';
 
-interface UiConfigContextType {
-  getUiConfig: () => Promise<OrgUIConfigV3>;
+const logger = new Logger('uiConfigContext');
+interface UiConfigHookResult {
+  getUiConfig: () => Promise<OrgUIConfigV3 | undefined>;
   isLoading: boolean;
 }
 
-const UiConfigContext = createContext<UiConfigContextType | undefined>(undefined);
+export const useUiConfig = (): UiConfigHookResult => {
+  const { frontendConfig, loading } = useNewOrgConfig();
 
-export const UiConfigProvider: React.FC<{ children: ReactNode }> = ({ children }) => {
-  const { frontendConfig, loading: isFrontendConfigLoading } = useNewOrgConfig();
-  const [isLoadingUiConfig, setIsLoadingUiConfig] = useState(false);
+  const getUiConfig = async (): Promise<OrgUIConfigV3 | undefined> => {
+    logger.logDebug('uiConfigContext | retrieving ui config');
 
-  const getUiConfig = useCallback(async (): Promise<OrgUIConfigV3> => {
-    setIsLoadingUiConfig(true);
-    Logger.logInfo('uiConfigContext | retrieving ui config');
-    if (isFrontendConfigLoading) {
-      setIsLoadingUiConfig(false);
+    if (loading) {
+      logger.logDebug('uiConfigContext | frontend config still loading');
       throw new Error('Frontend config is loading');
     }
 
-    const response = frontendConfig?.uiConfigs as OrgUIConfigV3;
-    Logger.logInfo('uiConfigContext | returning ui config response', response);
-    setIsLoadingUiConfig(false);
-    return response;
-  }, [frontendConfig, isFrontendConfigLoading]);
-
-  const isLoading = isFrontendConfigLoading || isLoadingUiConfig;
-
-  const value = useMemo(() => ({ getUiConfig, isLoading }), [getUiConfig, isLoading]);
+    const response = frontendConfig?.uiConfigs as OrgUIConfigV3 | undefined;
+    logger.logDebug('uiConfigContext | returning ui config response', response);
 
-  return <UiConfigContext.Provider value={value}>{children}</UiConfigContext.Provider>;
-};
+    return response;
+  };
 
-export const useUiConfig = () => {
-  const context = useContext(UiConfigContext);
-  if (!context) {
-    throw new Error('useUiConfig must be used within a UiConfigProvider');
-  }
-  return context;
+  return {
+    getUiConfig,
+    isLoading: loading,
+  };
 };

package/src/contexts/userIdentityContext/__tests__/userIdentityContext.test.tsx

@@ -8,9 +8,9 @@ import { UserIdentityService } from 'src/services/userIdentityService';
 import { UserIdentityProvider, useUserIdentity } from '../userIdentityContext';
 
 // Mock the Logger to avoid console output in tests
-vi.spyOn(Logger, 'logInfo').mockImplementation(() => {});
-vi.spyOn(Logger, 'logWarn').mockImplementation(() => {});
-vi.spyOn(Logger, 'logError').mockImplementation(() => {});
+vi.spyOn(Logger.prototype, 'logInfo').mockImplementation(() => {});
+vi.spyOn(Logger.prototype, 'logWarn').mockImplementation(() => {});
+vi.spyOn(Logger.prototype, 'logError').mockImplementation(() => {});
 
 // Mock uuid to have predictable values in tests
 vi.mock('uuid', () => ({
@@ -262,7 +262,7 @@ describe('UserIdentityProvider', () => {
     });
 
     it('should log info when setting userId override', async () => {
-      const logSpy = vi.spyOn(Logger, 'logInfo');
+      const logSpy = vi.spyOn(Logger.prototype, 'logInfo');
 
       const ComponentWithSet: React.FC = () => {
         const context = useUserIdentity();
@@ -283,7 +283,7 @@ describe('UserIdentityProvider', () => {
     });
 
     it('should log info when clearing userId override', async () => {
-      const logSpy = vi.spyOn(Logger, 'logInfo');
+      const logSpy = vi.spyOn(Logger.prototype, 'logInfo');
 
       const ComponentWithClear: React.FC = () => {
         const context = useUserIdentity();

package/src/contexts/userIdentityContext/userIdentityContext.tsx

@@ -13,6 +13,8 @@ import { useSetAtom } from 'jotai';
 import { userIdAtom } from 'src/atoms/app';
 import { UserIdentityService } from 'src/services/userIdentityService';
 
+const logger = new Logger('userIdentityContext');
+
 export interface UserIdentityContextType {
   getUserIdOrDefault: () => Promise<string>;
   getUserIdOverrideFromLocalStorage: () => string | undefined;
@@ -53,7 +55,7 @@ export const UserIdentityProvider: React.FC<UserIdentityProviderProps> = ({
 
   const setUserIdOverrideInLocalStorage = useCallback(
     (userId: string): string => {
-      Logger.logInfo(`setUserIdOverrideInLocalStorage - Setting user_id=${userId}`);
+      logger.logInfo(`setUserIdOverrideInLocalStorage - Setting user_id=${userId}`);
       setItem(USER_ID_OVERRIDE_KEY, userId);
       // window.dispatchEvent is handled by useLocalStorage now
       return userId;
@@ -62,7 +64,7 @@ export const UserIdentityProvider: React.FC<UserIdentityProviderProps> = ({
   );
 
   const clearUserIdOverrideInLocalStorage = useCallback(() => {
-    Logger.logInfo(`clearUserIdOverrideInLocalStorage - Clearing user_id`);
+    logger.logInfo(`clearUserIdOverrideInLocalStorage - Clearing user_id`);
     // LocalStorageService.getLocalStorage()?.removeItem(USER_ID_OVERRIDE_KEY);
     // window.dispatchEvent is handled by useLocalStorage now
     setItem(USER_ID_OVERRIDE_KEY, ''); // Set to empty string to clear
@@ -80,15 +82,15 @@ export const UserIdentityProvider: React.FC<UserIdentityProviderProps> = ({
 
       if (!enviveUserId) {
         throw new Error(
-          '[spiffy-ai] EnviveAnalytics.resolveEnviveUserId() returned null/undefined - this should never happen',
+          'EnviveAnalytics.resolveEnviveUserId() returned null/undefined - this should never happen',
         );
       }
 
       return enviveUserId;
     } catch (error: unknown) {
-      Logger.logError('[spiffy-ai] CRITICAL: Failed to get user ID from EnviveAnalytics', error);
+      logger.logError('CRITICAL: Failed to get user ID from EnviveAnalytics', error);
       const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-      throw new Error(`[spiffy-ai] CRITICAL: User ID resolution failed: ${errorMessage}`);
+      throw new Error(`CRITICAL: User ID resolution failed: ${errorMessage}`);
     }
   }, [getUserIdOverrideFromLocalStorage]);
 
@@ -112,7 +114,6 @@ export const UserIdentityProvider: React.FC<UserIdentityProviderProps> = ({
     if (isReady && !localUserId) {
       const setUserIdStates = async () => {
         const newUserId = await getUserIdOrDefault();
-        console.log('useUserIdentity useEffect - setting localUserId', newUserId);
         setLocalUserId(newUserId);
         setUserId(newUserId);
       };

package/src/contexts/widgetConfigContext/__tests__/widgetConfigContext.test.tsx

@@ -7,9 +7,9 @@ import { WidgetConfigProvider, useWidgetConfig } from '../widgetConfigContext';
 import { WidgetConfigV3, WidgetTypeV3 } from '../../typesV3';
 
 // Mock the Logger to avoid console output in tests
-vi.spyOn(Logger, 'logInfo').mockImplementation(() => {});
-vi.spyOn(Logger, 'logWarn').mockImplementation(() => {});
-vi.spyOn(Logger, 'logError').mockImplementation(() => {});
+vi.spyOn(Logger.prototype, 'logInfo').mockImplementation(() => {});
+vi.spyOn(Logger.prototype, 'logWarn').mockImplementation(() => {});
+vi.spyOn(Logger.prototype, 'logError').mockImplementation(() => {});
 
 // Mock the useNewOrgConfig hook
 vi.mock('src/hooks/NewOrgConfig', () => ({
@@ -394,7 +394,7 @@ describe('WidgetConfigProvider', () => {
 
   describe('Logger Integration', () => {
     it('should log info when retrieving widget config', async () => {
-      const logInfoSpy = vi.spyOn(Logger, 'logInfo');
+      const logDebugSpy = vi.spyOn(Logger.prototype, 'logDebug');
       const mockWidgetConfig: WidgetConfigV3 = {
         widgetConfigId: 'test-config-id',
         type: WidgetTypeV3.PromptCarouselV3,
@@ -425,12 +425,12 @@ describe('WidgetConfigProvider', () => {
       });
 
       await waitFor(() => {
-        expect(logInfoSpy).toHaveBeenCalledWith('widgetConfigContext | retrieving widget config', {
+        expect(logDebugSpy).toHaveBeenCalledWith('retrieving widget config', {
           widgetConfigId: 'test-config-id',
           widgetType: WidgetTypeV3.PromptCarouselV3,
         });
-        expect(logInfoSpy).toHaveBeenCalledWith(
-          'widgetConfigContext | returning widget config response',
+        expect(logDebugSpy).toHaveBeenCalledWith(
+          'returning widget config response',
           mockWidgetConfig,
         );
       });

package/src/contexts/widgetConfigContext/widgetConfigContext.tsx

@@ -3,6 +3,8 @@ import Logger from 'src/application/logging/logger';
 import { useNewOrgConfig } from 'src/hooks/NewOrgConfig';
 import { WidgetConfigV3, WidgetTypeV3 } from '../typesV3';
 
+const logger = new Logger('widgetConfigContext');
+
 interface WidgetConfigRequest {
   widgetType: WidgetTypeV3;
   widgetConfigId: string;
@@ -22,7 +24,7 @@ export const WidgetConfigProvider: React.FC<{ children: ReactNode }> = ({ childr
   const getWidgetConfig = useCallback(
     async (request: WidgetConfigRequest): Promise<WidgetConfigV3> => {
       setIsLoadingWidgetConfig(true);
-      Logger.logInfo('widgetConfigContext | retrieving widget config', {
+      logger.logDebug('retrieving widget config', {
         widgetConfigId: request.widgetConfigId,
         widgetType: request.widgetType,
       });
@@ -33,7 +35,7 @@ export const WidgetConfigProvider: React.FC<{ children: ReactNode }> = ({ childr
 
       const { widgetConfigId, widgetType } = request;
       const response = frontendConfig?.widgetConfigs?.[widgetConfigId];
-      Logger.logInfo('widgetConfigContext | returning widget config response', response);
+      logger.logDebug('returning widget config response', response);
 
       if (widgetConfigId === 'fake-widget-config-id') {
         return {} as WidgetConfigV3;

package/src/hooks/CustomerSupportHandoff/useCustomerSupportHandoff.ts

@@ -1,6 +1,8 @@
 import Logger from 'src/application/logging/logger';
 import { useCallback } from 'react';
 
+const logger = new Logger('useCustomerSupportHandoff');
+
 /**
  * Hook to call the `click` method of the merchant's customer support chat widget.
  *
@@ -17,14 +19,14 @@ export const useCustomerSupportHandoff = (onSwitchToAgent?: () => void) => {
     const kustomerElement = document.getElementById('kustomer-ui-sdk-iframe');
 
     if (kustomerElement == null || !(kustomerElement instanceof HTMLIFrameElement)) {
-      Logger.logError('[spiffy-ai] Kustomer iFrame element not found', undefined);
+      logger.logError('Kustomer iFrame element not found', undefined);
       return;
     }
 
     const kustomerButton = kustomerElement.contentWindow?.document?.getElementById('rootChatIcon');
 
     if (kustomerButton == null) {
-      Logger.logError('[spiffy-ai] Kustomer button not found', undefined);
+      logger.logError('Kustomer button not found', undefined);
       return;
     }
 

package/src/hooks/Search/__tests__/useSearch.test.tsx

@@ -135,14 +135,20 @@ vi.mock('@spiffy-ai/commerce-api-client', () => ({
 }));
 
 // Mock Logger
-vi.mock('src/application/logging/logger', () => ({
-  default: {
-    logInfo: vi.fn(),
-    logWarn: vi.fn(),
-    logError: vi.fn(),
-    logDebug: vi.fn(),
-  },
-}));
+vi.mock('src/application/logging/logger', () => {
+  const MockLogger = vi.fn(function MockLogger() {
+    return {
+      logInfo: vi.fn(),
+      logWarn: vi.fn(),
+      logError: vi.fn(),
+      logDebug: vi.fn(),
+    };
+  });
+
+  return {
+    default: MockLogger,
+  };
+});
 
 // Mock search service adapter
 vi.mock('src/atoms/search/searchServiceAdapter', () => ({