@jmruthers/pace-core 0.6.3 → 0.6.4

package/dist/{chunk-YDQHOZNA.js → chunk-NN6WWZ5U.js}

@@ -2,11 +2,11 @@ import {
   useAppConfig,
   useEvents,
   useOrganisationSecurity
-} from "./chunk-6Z7LTB3D.js";
+} from "./chunk-OEWDTMG7.js";
 import {
   useOrganisations,
   useUnifiedAuth
-} from "./chunk-DWUBLJJM.js";
+} from "./chunk-AVMLPIM7.js";
 import {
   getAccessLevel,
   getPageScopeType,
@@ -16,11 +16,11 @@ import {
   isPermitted,
   isPermittedCached,
   resolveAppContext
-} from "./chunk-RWEBCB47.js";
+} from "./chunk-3LPHPB62.js";
 import {
   ContextValidator,
   OrganisationContextRequiredError
-} from "./chunk-QRPVRXYT.js";
+} from "./chunk-36LVWXB2.js";
 import {
   getCurrentAppName
 } from "./chunk-M7MPQISP.js";
@@ -542,7 +542,7 @@ function useResolvedScope({
           }
           return;
         }
-        const { ContextValidator: ContextValidator2 } = await import("./contextValidator-3JNZKUTX.js");
+        const { ContextValidator: ContextValidator2 } = await import("./contextValidator-OOPCLPZW.js");
         const validation = await ContextValidator2.resolveScopeForPage(
           initialScope,
           "organisation",
@@ -822,7 +822,7 @@ function useAccessLevel(userId, scope) {
     try {
       setIsLoading(true);
       setError(null);
-      const { isSuperAdmin: checkSuperAdmin } = await import("./api-IAGWF3ZG.js");
+      const { isSuperAdmin: checkSuperAdmin } = await import("./api-6LVZTHDS.js");
       const isSuperAdminUser = await checkSuperAdmin(userId);
       if (isSuperAdminUser) {
         setAccessLevel("super");
@@ -941,7 +941,7 @@ function useCan(userId, scope, permission, pageId, useCache = true, precomputedS
       const checkSuperAdmin = async () => {
         const startTime = Date.now();
         try {
-          const { isSuperAdmin: checkSuperAdmin2 } = await import("./api-IAGWF3ZG.js");
+          const { isSuperAdmin: checkSuperAdmin2 } = await import("./api-6LVZTHDS.js");
           const timeoutWarning = setTimeout(() => {
             if (!cancelled) {
               console.warn("[useCan] Super admin check taking longer than 5 seconds", {
@@ -1942,4 +1942,4 @@ export {
   useRoleManagement,
   useSecureSupabase
 };
-//# sourceMappingURL=chunk-YDQHOZNA.js.map
+//# sourceMappingURL=chunk-NN6WWZ5U.js.map

package/dist/{chunk-6Z7LTB3D.js → chunk-OEWDTMG7.js}

@@ -2,7 +2,7 @@ import {
   useEventService,
   useOrganisations,
   useUnifiedAuth
-} from "./chunk-DWUBLJJM.js";
+} from "./chunk-AVMLPIM7.js";
 import {
   performanceBudgetMonitor
 } from "./chunk-FMUCXFII.js";
@@ -403,7 +403,7 @@ var useOrganisationSecurity = () => {
     const targetOrgId = orgId || selectedOrganisation?.id;
     if (!targetOrgId || !user) return false;
     try {
-      const { isPermittedCached } = await import("./api-IAGWF3ZG.js");
+      const { isPermittedCached } = await import("./api-6LVZTHDS.js");
       const scope = {
         organisationId: targetOrgId,
         eventId: user.user_metadata?.eventId || user.app_metadata?.eventId,
@@ -426,7 +426,7 @@ var useOrganisationSecurity = () => {
     const targetOrgId = orgId || selectedOrganisation?.id;
     if (!targetOrgId || !user) return [];
     try {
-      const { getPermissionMap } = await import("./api-IAGWF3ZG.js");
+      const { getPermissionMap } = await import("./api-6LVZTHDS.js");
       const scope = {
         organisationId: targetOrgId,
         eventId: user.user_metadata?.eventId || user.app_metadata?.eventId,
@@ -515,4 +515,4 @@ export {
   useAppConfig,
   useOrganisationSecurity
 };
-//# sourceMappingURL=chunk-6Z7LTB3D.js.map
+//# sourceMappingURL=chunk-OEWDTMG7.js.map

package/dist/{chunk-2T2IG7T7.js → chunk-YKRAFF5K.js}

@@ -1,9 +1,9 @@
 import {
   useEvents
-} from "./chunk-6Z7LTB3D.js";
+} from "./chunk-OEWDTMG7.js";
 import {
   isSuperAdmin
-} from "./chunk-RWEBCB47.js";
+} from "./chunk-3LPHPB62.js";
 import {
   assertAppId
 } from "./chunk-QXHPKYJV.js";
@@ -2234,4 +2234,4 @@ export {
   useEventTheme,
   usePreventTabReload
 };
-//# sourceMappingURL=chunk-2T2IG7T7.js.map
+//# sourceMappingURL=chunk-YKRAFF5K.js.map

package/dist/components.js

@@ -47,7 +47,7 @@ import {
   useFileReferenceById,
   useFileReferenceForRecord,
   useFilesByCategory
-} from "./chunk-ZNIWI3UC.js";
+} from "./chunk-I6DAQMWX.js";
 import {
   Alert,
   AlertDescription,
@@ -88,9 +88,9 @@ import {
   TooltipProvider,
   TooltipRoot,
   TooltipTrigger
-} from "./chunk-PQBSKX33.js";
-import "./chunk-YDQHOZNA.js";
-import "./chunk-2T2IG7T7.js";
+} from "./chunk-7JPAB3T5.js";
+import "./chunk-NN6WWZ5U.js";
+import "./chunk-YKRAFF5K.js";
 import {
   useToast
 } from "./chunk-6SOIHG6Z.js";
@@ -100,15 +100,15 @@ import {
   PublicPageProvider,
   useIsPublicPage,
   usePublicPageContext
-} from "./chunk-6Z7LTB3D.js";
+} from "./chunk-OEWDTMG7.js";
 import "./chunk-KQCRWDSA.js";
 import {
   UnifiedAuthProvider,
   useUnifiedAuth
-} from "./chunk-DWUBLJJM.js";
-import "./chunk-RWEBCB47.js";
+} from "./chunk-AVMLPIM7.js";
+import "./chunk-3LPHPB62.js";
 import "./chunk-63FOKYGO.js";
-import "./chunk-QRPVRXYT.js";
+import "./chunk-36LVWXB2.js";
 import {
   FileCategory
 } from "./chunk-ZSAAAMVR.js";

package/dist/{contextValidator-3JNZKUTX.js → contextValidator-OOPCLPZW.js}

@@ -1,9 +1,9 @@
 import {
   ContextValidator
-} from "./chunk-QRPVRXYT.js";
+} from "./chunk-36LVWXB2.js";
 import "./chunk-PWLANIRT.js";
 import "./chunk-DGUM43GV.js";
 export {
   ContextValidator
 };
-//# sourceMappingURL=contextValidator-3JNZKUTX.js.map
+//# sourceMappingURL=contextValidator-OOPCLPZW.js.map

package/dist/hooks.js

@@ -12,7 +12,7 @@ import {
   usePublicEventLogo,
   usePublicRouteParams,
   useZodForm
-} from "./chunk-HFZBI76P.js";
+} from "./chunk-5EC5MEWX.js";
 import {
   archiveFile,
   cleanupQueryCache,
@@ -34,7 +34,7 @@ import {
   usePreventTabReload,
   usePublicFileDisplay,
   useQueryCache
-} from "./chunk-2T2IG7T7.js";
+} from "./chunk-YKRAFF5K.js";
 import {
   useDataTablePerformance,
   useToast
@@ -42,12 +42,12 @@ import {
 import {
   useAppConfig,
   useOrganisationSecurity
-} from "./chunk-6Z7LTB3D.js";
+} from "./chunk-OEWDTMG7.js";
 import "./chunk-KQCRWDSA.js";
-import "./chunk-DWUBLJJM.js";
-import "./chunk-RWEBCB47.js";
+import "./chunk-AVMLPIM7.js";
+import "./chunk-3LPHPB62.js";
 import "./chunk-63FOKYGO.js";
-import "./chunk-QRPVRXYT.js";
+import "./chunk-36LVWXB2.js";
 import "./chunk-ZSAAAMVR.js";
 import "./chunk-QXHPKYJV.js";
 import {

package/dist/index.js

@@ -39,7 +39,7 @@ import {
   withAccessLevelGuard,
   withPermissionGuard,
   withRoleGuard
-} from "./chunk-CNCQDFLN.js";
+} from "./chunk-ATKZM7RX.js";
 import {
   AddressField,
   Avatar,
@@ -90,7 +90,7 @@ import {
   useFileReferenceById,
   useFileReferenceForRecord,
   useFilesByCategory
-} from "./chunk-ZNIWI3UC.js";
+} from "./chunk-I6DAQMWX.js";
 import {
   Alert,
   AlertDescription,
@@ -140,7 +140,7 @@ import {
   max,
   min,
   sum
-} from "./chunk-PQBSKX33.js";
+} from "./chunk-7JPAB3T5.js";
 import {
   SECURE_CLIENT_SYMBOL,
   SecureSupabaseClient,
@@ -160,7 +160,7 @@ import {
   useRoleManagement,
   useSecureSupabase,
   warnIfInsecureClient
-} from "./chunk-YDQHOZNA.js";
+} from "./chunk-NN6WWZ5U.js";
 import {
   StorageUtils,
   clearPublicEventCache,
@@ -176,7 +176,7 @@ import {
   usePublicEventLogo,
   usePublicRouteParams,
   useZodForm
-} from "./chunk-HFZBI76P.js";
+} from "./chunk-5EC5MEWX.js";
 import {
   APP_PATH_MAPPING,
   DEFAULT_FILE_SIZE_LIMIT,
@@ -200,7 +200,7 @@ import {
   useEventTheme,
   usePublicFileDisplay,
   validateFileSize
-} from "./chunk-2T2IG7T7.js";
+} from "./chunk-YKRAFF5K.js";
 import {
   useToast
 } from "./chunk-6SOIHG6Z.js";
@@ -213,7 +213,7 @@ import {
   useIsPublicPage,
   useOrganisationSecurity,
   usePublicPageContext
-} from "./chunk-6Z7LTB3D.js";
+} from "./chunk-OEWDTMG7.js";
 import "./chunk-KQCRWDSA.js";
 import {
   EventServiceProvider,
@@ -227,7 +227,7 @@ import {
   useOrganisations,
   useSessionRestoration,
   useUnifiedAuth
-} from "./chunk-DWUBLJJM.js";
+} from "./chunk-AVMLPIM7.js";
 import {
   CACHE_PATTERNS,
   RBACCache,
@@ -259,7 +259,7 @@ import {
   resetPerformanceMetrics,
   resolveAppContext,
   setupRBAC
-} from "./chunk-RWEBCB47.js";
+} from "./chunk-3LPHPB62.js";
 import {
   RBACAuditManager,
   createAuditManager,
@@ -267,7 +267,7 @@ import {
   getGlobalAuditManager,
   setGlobalAuditManager
 } from "./chunk-63FOKYGO.js";
-import "./chunk-QRPVRXYT.js";
+import "./chunk-36LVWXB2.js";
 import {
   FileCategory
 } from "./chunk-ZSAAAMVR.js";

package/dist/providers.js

@@ -11,10 +11,10 @@ import {
   UnifiedAuthContext,
   UnifiedAuthProvider,
   useUnifiedAuth
-} from "./chunk-DWUBLJJM.js";
-import "./chunk-RWEBCB47.js";
+} from "./chunk-AVMLPIM7.js";
+import "./chunk-3LPHPB62.js";
 import "./chunk-63FOKYGO.js";
-import "./chunk-QRPVRXYT.js";
+import "./chunk-36LVWXB2.js";
 import "./chunk-QXHPKYJV.js";
 import "./chunk-VBXEHIUJ.js";
 import "./chunk-PWLANIRT.js";

package/dist/rbac/index.js

@@ -39,7 +39,7 @@ import {
   withAccessLevelGuard,
   withPermissionGuard,
   withRoleGuard
-} from "../chunk-CNCQDFLN.js";
+} from "../chunk-ATKZM7RX.js";
 import {
   SECURE_CLIENT_SYMBOL,
   SecureSupabaseClient,
@@ -59,10 +59,10 @@ import {
   useRoleManagement,
   useSecureSupabase,
   warnIfInsecureClient
-} from "../chunk-YDQHOZNA.js";
-import "../chunk-6Z7LTB3D.js";
+} from "../chunk-NN6WWZ5U.js";
+import "../chunk-OEWDTMG7.js";
 import "../chunk-KQCRWDSA.js";
-import "../chunk-DWUBLJJM.js";
+import "../chunk-AVMLPIM7.js";
 import {
   CACHE_PATTERNS,
   RBACCache,
@@ -94,7 +94,7 @@ import {
   resetPerformanceMetrics,
   resolveAppContext,
   setupRBAC
-} from "../chunk-RWEBCB47.js";
+} from "../chunk-3LPHPB62.js";
 import {
   RBACAuditManager,
   createAuditManager,
@@ -102,7 +102,7 @@ import {
   getGlobalAuditManager,
   setGlobalAuditManager
 } from "../chunk-63FOKYGO.js";
-import "../chunk-QRPVRXYT.js";
+import "../chunk-36LVWXB2.js";
 import "../chunk-QXHPKYJV.js";
 import "../chunk-M7MPQISP.js";
 import "../chunk-FMUCXFII.js";

package/dist/utils.js

@@ -951,7 +951,7 @@ function createLazyComponent(importFn, componentName, options = {}) {
   return WrappedComponent;
 }
 var LazyDataTable = createLazyComponent(
-  () => import("./DataTable-THFPBKTP.js").then((module) => ({ default: module.DataTable })),
+  () => import("./DataTable-E7YQZD7D.js").then((module) => ({ default: module.DataTable })),
   "DataTable"
 );
 

package/docs/api/modules.md

@@ -1161,7 +1161,7 @@ Configures the application layout including navigation, header, and footer.
 
 #### Defined in
 
-[packages/core/src/components/PaceAppLayout/PaceAppLayout.tsx:128](https://github.com/jmruthers/pace-core/blob/main/packages/core/src/components/PaceAppLayout/PaceAppLayout.tsx#L128)
+[packages/core/src/components/PaceAppLayout/PaceAppLayout.tsx:129](https://github.com/jmruthers/pace-core/blob/main/packages/core/src/components/PaceAppLayout/PaceAppLayout.tsx#L129)
 
 ___
 
@@ -4778,7 +4778,7 @@ function AdminApp() {
 
 #### Defined in
 
-[packages/core/src/components/PaceAppLayout/PaceAppLayout.tsx:351](https://github.com/jmruthers/pace-core/blob/main/packages/core/src/components/PaceAppLayout/PaceAppLayout.tsx#L351)
+[packages/core/src/components/PaceAppLayout/PaceAppLayout.tsx:352](https://github.com/jmruthers/pace-core/blob/main/packages/core/src/components/PaceAppLayout/PaceAppLayout.tsx#L352)
 
 ___
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jmruthers/pace-core",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Clean, modern React component library with Tailwind v4 styling and native utilities",
   "private": false,
   "publishConfig": {
@@ -222,7 +222,6 @@
     "zod": "^3.20.0"
   },
   "devDependencies": {
-    "@tanstack/react-virtual": "^3.10.8",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",
@@ -247,9 +246,15 @@
     "vite": "^6.0.3"
   },
   "dependencies": {
+    "@hookform/resolvers": "^3.9.0",
     "@supabase/supabase-js": "^2.49.10",
     "@tanstack/react-query": "^5.56.2",
+    "@tanstack/react-virtual": "^3.13.12",
     "date-fns": "^3.0.0",
-    "date-fns-tz": "^3.0.0"
+    "date-fns-tz": "^3.0.0",
+    "lodash.debounce": "^4.0.8",
+    "lodash.throttle": "^4.1.1",
+    "papaparse": "^5.5.3",
+    "react-is": "^19.2.0"
   }
 }

package/scripts/audit/core/checks/dependencies.cjs

@@ -647,6 +647,15 @@ const dependenciesCheck = {
         if (dep === '@jmruthers/pace-core') {
           return;
         }
+        
+        // Skip if it's a dependency of pace-core (required by pace-core's bundled code)
+        if (!isPaceCoreRepository) {
+          const paceCoreDeps = getPaceCoreDeps(projectRoot);
+          if (paceCoreDeps[dep]) {
+            // This dependency is required by pace-core, so it's not unused
+            return;
+          }
+        }
       
       // Check if package is imported in source files (runtime)
       if (importedPackages.has(dep)) {

package/src/components/PaceAppLayout/PaceAppLayout.tsx

@@ -109,6 +109,7 @@ import { getCurrentAppName } from '../../utils/app/appNameResolver';
 import { isSuperAdmin as checkSuperAdminApi } from '../../rbac/api';
 import { logger } from '../../utils/core/logger';
 import type { Permission, Scope } from '../../rbac/types';
+import { EventContextRequiredError, OrganisationContextRequiredError } from '../../rbac/types';
 
 // Stable empty objects to prevent infinite loops
 const EMPTY_PAGE_ID_MAPPING = {};
@@ -548,6 +549,21 @@ export function PaceAppLayout({
   // Use combined super admin check (RBAC + direct check)
   const can = isSuperAdmin ? true : canFromHook;
   const hasPermission = enforcePermissions ? can : true;
+  
+  // Check if the permission error is a context error (missing event/org context)
+  // Context errors should allow the page to render so it can show helpful messaging
+  // Real permission denials should still show "Access Denied"
+  const isContextError = useMemo(() => {
+    if (!permissionError) {
+      return false;
+    }
+    return (
+      permissionError instanceof EventContextRequiredError ||
+      permissionError instanceof OrganisationContextRequiredError ||
+      permissionError.name === 'EventContextRequiredError' ||
+      permissionError.name === 'OrganisationContextRequiredError'
+    );
+  }, [permissionError]);
 
   // Handle permission check results with audit logging and callbacks
   useEffect(() => {
@@ -1006,9 +1022,11 @@ export function PaceAppLayout({
     );
   }
 
-  // Show permission error (only after BOTH checks are complete)
+  // Show permission error (only after check is complete)
   // Super admins bypass all permission checks, so don't show errors for them
-  if (enforcePermissions && permissionError && !isSuperAdmin) {
+  // Context errors (missing event/org) should allow the page to render so it can show helpful messaging
+  // Real permission errors should still show "Access Denied"
+  if (enforcePermissions && permissionError && !isSuperAdmin && !isContextError) {
     return (
       <div className="flex items-center justify-center min-h-screen">
         <div className="text-center">
@@ -1022,7 +1040,8 @@ export function PaceAppLayout({
 
   // Show permission fallback if user lacks permission
   // Only show this if super admin check is complete and user is not a super admin
-  if (enforcePermissions && hasPermission === false && !isCheckingSuperAdminDirect && !isSuperAdmin) {
+  // Skip if it's a context error (missing event/org) - allow page to render and show helpful messaging
+  if (enforcePermissions && hasPermission === false && !isCheckingSuperAdminDirect && !isSuperAdmin && !isContextError) {
     // NEW: Phase 1 - Use page permission fallback if available
     if (enforcePagePermissions && pagePermissionFallback) {
       return <>{pagePermissionFallback}</>;

package/src/services/EventService.ts

@@ -108,6 +108,9 @@ export class EventService extends BaseService implements IEventService {
       this.resetInitialization();
       this.isInitializedRef = false;
       this.isFetchingRef = false;
+      // Reset user cleared flag when new user logs in - allows auto-selection for new user
+      this.userClearedEventRef = false;
+      this.hasAutoSelectedRef = false;
       
       logger.debug('EventService', `User changed [ID:${this.instanceId}]`, {
         previousUserId,
@@ -177,15 +180,40 @@ export class EventService extends BaseService implements IEventService {
       // Do not clear events for super admins when organisation context is removed
       const shouldClearEvents = !this.isSuperAdmin;
 
+      // Determine if this is the first time an org is being set (from null/undefined to a value)
+      const isFirstOrgSet = (previousOrgId === null || previousOrgId === undefined) && newOrgId !== null && newOrgId !== undefined;
+      
       // Clear events ONLY when switching between different organisations (not when org first becomes available)
-      if (previousOrgId !== null && newOrgId !== null && previousOrgId !== newOrgId) {
+      // IMPORTANT: Check isFirstOrgSet FIRST to prevent clearing when org is first set
+      if (isFirstOrgSet) {
+        // Organisation first becomes available - DO NOT clear the event, preserve it
+        // The event will be validated when events are re-fetched with org context
+        // If it's no longer valid, it will be cleared without setting userClearedEventRef = true
+        const hadAutoSelectedEvent = this.hasAutoSelectedRef && !!this.selectedEvent;
+        this.userClearedEventRef = false;
+        // Don't reset hasAutoSelectedRef if we had an auto-selected event - preserve it
+        // This ensures the event remains selected when org is first set
+        if (!hadAutoSelectedEvent) {
+          this.hasAutoSelectedRef = false;
+        }
+        logger.debug('EventService', 'Organisation first set - preserving event and resetting auto-selection flags', {
+          organisationId: newOrgId,
+          hasSelectedEvent: !!this.selectedEvent,
+          selectedEventId: this.selectedEvent?.event_id,
+          hadAutoSelectedEvent,
+          preservingEvent: hadAutoSelectedEvent,
+          previousOrgId,
+          newOrgId
+        });
+      } else if (previousOrgId !== null && previousOrgId !== undefined && newOrgId !== null && newOrgId !== undefined && previousOrgId !== newOrgId) {
+        // Switching between different organisations - clear events
         if (shouldClearEvents) {
           this.events = [];
           // Use setSelectedEvent(null) to preserve userClearedEventRef flag if user explicitly cleared
           // This prevents auto-selection from re-selecting the event after org switch
           this.setSelectedEvent(null);
         }
-      } else if (previousOrgId !== null && newOrgId === null) {
+      } else if (previousOrgId !== null && previousOrgId !== undefined && newOrgId === null) {
         // Organisation was removed - clear events if not super admin
         if (shouldClearEvents) {
           this.events = [];
@@ -232,7 +260,13 @@ export class EventService extends BaseService implements IEventService {
       });
       // Reset the user cleared flag when selecting an event
       this.userClearedEventRef = false;
+      logger.debug('EventService', 'Event selected', {
+        eventId: event.event_id,
+        eventName: event.event_name,
+        userClearedEventRef: this.userClearedEventRef
+      });
     } else {
+      const previousEventId = this.selectedEvent?.event_id;
       this.selectedEvent = null;
       this.setSelectedEventId?.(null);
       // Clear from secure storage (don't await to avoid blocking)
@@ -243,6 +277,11 @@ export class EventService extends BaseService implements IEventService {
       this.hasAutoSelectedRef = false;
       // Mark that user explicitly cleared the event to prevent auto-selection
       this.userClearedEventRef = true;
+      logger.debug('EventService', 'Event cleared via setSelectedEvent(null)', {
+        previousEventId,
+        userClearedEventRef: this.userClearedEventRef,
+        stackTrace: new Error().stack
+      });
     }
     this.notify();
   }
@@ -617,6 +656,28 @@ export class EventService extends BaseService implements IEventService {
         this.events = sortedEvents;
         this.error = null;
 
+        // Validate selected event - if it's no longer in the events list, clear it
+        // This can happen when org context changes or events are refreshed
+        // Don't set userClearedEventRef to true in this case - it's an automatic clear, not user-initiated
+        if (this.selectedEvent) {
+          const selectedEventId = this.selectedEvent.event_id;
+          const eventStillExists = transformedEvents.some(
+            e => e.event_id === selectedEventId
+          );
+          if (!eventStillExists) {
+            // Event no longer available - clear it but don't mark as user-cleared
+            const previousUserClearedRef = this.userClearedEventRef;
+            this.selectedEvent = null;
+            this.setSelectedEventId?.(null);
+            // Restore the previous userClearedEventRef value - this was an automatic clear, not user-initiated
+            this.userClearedEventRef = previousUserClearedRef;
+            logger.debug('EventService', 'Cleared selected event - no longer in events list', {
+              previousEventId: selectedEventId,
+              eventsCount: transformedEvents.length
+            });
+          }
+        }
+
         // Reset auto-selection ref for new events
         this.hasAutoSelectedRef = false;
 
@@ -624,26 +685,62 @@ export class EventService extends BaseService implements IEventService {
         if (!skipLoadPersisted) {
           const persistedEventLoaded = await this.loadPersistedEvent(transformedEvents);
           
+          logger.debug('EventService', 'Event selection check', {
+            persistedEventLoaded,
+            userClearedEventRef: this.userClearedEventRef,
+            eventsCount: transformedEvents.length,
+            hasSelectedEvent: !!this.selectedEvent
+          });
+          
           // If no persisted event was loaded and user hasn't explicitly cleared an event, auto-select the next event
           if (!persistedEventLoaded && !this.userClearedEventRef) {
             const nextEvent = this.getNextEventByDate(transformedEvents);
+            logger.debug('EventService', 'Auto-selection attempt', {
+              nextEventFound: !!nextEvent,
+              nextEventId: nextEvent?.event_id,
+              nextEventDate: nextEvent?.event_date
+            });
             if (nextEvent) {
               this.hasAutoSelectedRef = true;
               // Use setSelectedEvent() to ensure consistent behavior
               // Theme will be applied by useEventTheme() hook
               this.setSelectedEvent(nextEvent);
+              logger.debug('EventService', 'Auto-selected next event', {
+                eventId: nextEvent.event_id,
+                eventName: nextEvent.event_name,
+                eventDate: nextEvent.event_date
+              });
+            } else {
+              logger.debug('EventService', 'No next event found for auto-selection', {
+                eventsCount: transformedEvents.length,
+                eventsWithDates: transformedEvents.filter(e => e.event_date).length
+              });
             }
+          } else if (persistedEventLoaded) {
+            logger.debug('EventService', 'Skipped auto-selection - persisted event loaded');
+          } else if (this.userClearedEventRef) {
+            logger.debug('EventService', 'Skipped auto-selection - user explicitly cleared event');
           }
         } else {
           // If skipping persisted event load, still do auto-selection for new users
           if (!this.userClearedEventRef) {
             const nextEvent = this.getNextEventByDate(transformedEvents);
+            logger.debug('EventService', 'Auto-selection attempt (skip persisted)', {
+              nextEventFound: !!nextEvent,
+              nextEventId: nextEvent?.event_id
+            });
             if (nextEvent) {
               this.hasAutoSelectedRef = true;
               // Use setSelectedEvent() to ensure consistent behavior
               // Theme will be applied by useEventTheme() hook
               this.setSelectedEvent(nextEvent);
+              logger.debug('EventService', 'Auto-selected next event (skip persisted)', {
+                eventId: nextEvent.event_id,
+                eventName: nextEvent.event_name
+              });
             }
+          } else {
+            logger.debug('EventService', 'Skipped auto-selection (skip persisted) - user explicitly cleared event');
           }
         }
       }