@jmruthers/pace-core 0.6.10 → 0.6.11

package/src/hooks/{__tests__/useOrganisationSecurity.unit.test.tsx → useOrganisationSecurity.unit.test.tsx}

@@ -1,23 +1,21 @@
 import { renderHook, act } from '@testing-library/react';
 import { vi, describe, it, expect, beforeEach } from 'vitest';
-import { useOrganisationSecurity } from '../useOrganisationSecurity';
-import { useUnifiedAuth } from '../../providers';
-import { useOrganisations } from '../../hooks/useOrganisations';
-// Mock dependencies
-vi.mock('../../providers', () => ({
-  useUnifiedAuth: vi.fn(),
-}));
+import { useOrganisationSecurity } from './useOrganisationSecurity';
+
+// Hoist mock fns so vi.mocked(...).mockReturnValue works (same reference in mock factory and tests)
+const mockUseUnifiedAuthFn = vi.hoisted(() => vi.fn());
+const mockUseOrganisationsFn = vi.hoisted(() => vi.fn());
 
-vi.mock('../../providers/services/UnifiedAuthProvider', () => ({
-  useUnifiedAuth: vi.fn(),
+vi.mock('../providers', () => ({
+  useUnifiedAuth: mockUseUnifiedAuthFn,
 }));
 
-vi.mock('../../hooks/useOrganisations', () => ({
-  useOrganisations: vi.fn(),
+vi.mock('./useOrganisations', () => ({
+  useOrganisations: mockUseOrganisationsFn,
 }));
 
 // Mock the RBAC API
-vi.mock('../../rbac/api', () => ({
+vi.mock('../rbac/api', () => ({
   isPermitted: vi.fn(),
   isPermittedCached: vi.fn(),
   getPermissionMap: vi.fn(),
@@ -25,7 +23,7 @@ vi.mock('../../rbac/api', () => ({
 }));
 
 // Mock the RBAC audit module
-vi.mock('../../rbac/audit', () => ({
+vi.mock('../rbac/audit', () => ({
   emitAuditEvent: vi.fn()
 }));
 
@@ -60,8 +58,8 @@ const mockSupabase = {
 describe('useOrganisationSecurity', () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    vi.mocked(useUnifiedAuth).mockReturnValue(mockUseUnifiedAuth as any);
-    vi.mocked(useOrganisations).mockReturnValue(mockUseOrganisations as any);
+    mockUseUnifiedAuthFn.mockReturnValue(mockUseUnifiedAuth as any);
+    mockUseOrganisationsFn.mockReturnValue(mockUseOrganisations as any);
     
     // Reset Supabase mock chain
     mockSupabaseQuery.select.mockClear().mockReturnThis();
@@ -91,7 +89,7 @@ describe('useOrganisationSecurity', () => {
         error: null
       });
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         session: { access_token: 'token' },
@@ -115,7 +113,7 @@ describe('useOrganisationSecurity', () => {
         id: 'user-123',
         user_metadata: { globalRole: 'regular_user' }
       };
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser
       } as any);
@@ -158,7 +156,7 @@ describe('useOrganisationSecurity', () => {
         error: null
       });
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         session: { access_token: 'token' },
@@ -198,7 +196,7 @@ describe('useOrganisationSecurity', () => {
         })
       };
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         session: mockSession,
@@ -233,7 +231,7 @@ describe('useOrganisationSecurity', () => {
         })
       };
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         supabase: mockSupabase
@@ -254,7 +252,7 @@ describe('useOrganisationSecurity', () => {
         })
       };
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         supabase: mockSupabase
@@ -282,7 +280,7 @@ describe('useOrganisationSecurity', () => {
         error: null
       });
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         session: { access_token: 'token' },
@@ -308,7 +306,7 @@ describe('useOrganisationSecurity', () => {
 
     it('should check role hierarchy correctly', () => {
       const mockOrg = { id: 'org-123' };
-      vi.mocked(useOrganisations).mockReturnValue({
+      mockUseOrganisationsFn.mockReturnValue({
         ...mockUseOrganisations,
         selectedOrganisation: mockOrg
       } as any);
@@ -356,7 +354,7 @@ describe('useOrganisationSecurity', () => {
         error: null
       });
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         session: { access_token: 'token' },
@@ -375,7 +373,7 @@ describe('useOrganisationSecurity', () => {
 
     it('should return true for org_admin', () => {
       const mockOrg = { id: 'org-123' };
-      vi.mocked(useOrganisations).mockReturnValue({
+      mockUseOrganisationsFn.mockReturnValue({
         ...mockUseOrganisations,
         selectedOrganisation: mockOrg
       } as any);
@@ -388,7 +386,7 @@ describe('useOrganisationSecurity', () => {
 
     it('should return false for other roles', () => {
       const mockOrg = { id: 'org-123' };
-      vi.mocked(useOrganisations).mockReturnValue({
+      mockUseOrganisationsFn.mockReturnValue({
         ...mockUseOrganisations,
         selectedOrganisation: mockOrg
       } as any);
@@ -428,7 +426,7 @@ describe('useOrganisationSecurity', () => {
         error: null
       });
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         session: { access_token: 'token' },
@@ -452,15 +450,15 @@ describe('useOrganisationSecurity', () => {
       const mockOrg = { id: 'org-123' };
 
       // Mock the RBAC API
-      const { isPermittedCached } = await import('../../rbac/api');
-      vi.mocked(isPermittedCached).mockResolvedValue(true);
+      const { isPermittedCached } = await import('../rbac/api');
+      vi.mocked(isPermittedCached).mockResolvedValue({ ok: true, data: true });
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         supabase: { rpc: vi.fn() }
       } as any);
-      vi.mocked(useOrganisations).mockReturnValue({
+      mockUseOrganisationsFn.mockReturnValue({
         ...mockUseOrganisations,
         selectedOrganisation: mockOrg
       } as any);
@@ -486,15 +484,15 @@ describe('useOrganisationSecurity', () => {
       const mockOrg = { id: 'org-123' };
 
       // Mock the RBAC API to throw an error
-      const { isPermittedCached } = await import('../../rbac/api');
+      const { isPermittedCached } = await import('../rbac/api');
       vi.mocked(isPermittedCached).mockRejectedValue(new Error('RBAC API error'));
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         supabase: { rpc: vi.fn() }
       } as any);
-      vi.mocked(useOrganisations).mockReturnValue({
+      mockUseOrganisationsFn.mockReturnValue({
         ...mockUseOrganisations,
         selectedOrganisation: mockOrg
       } as any);
@@ -511,17 +509,17 @@ describe('useOrganisationSecurity', () => {
       const mockOrg = { id: 'org-123' };
 
       // Mock the RBAC API to throw an error
-      const { isPermittedCached } = await import('../../rbac/api');
+      const { isPermittedCached } = await import('../rbac/api');
       vi.mocked(isPermittedCached).mockImplementation(() => {
         throw new Error('RBAC API exception');
       });
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         supabase: { rpc: vi.fn() }
       } as any);
-      vi.mocked(useOrganisations).mockReturnValue({
+      mockUseOrganisationsFn.mockReturnValue({
         ...mockUseOrganisations,
         selectedOrganisation: mockOrg
       } as any);
@@ -537,10 +535,10 @@ describe('useOrganisationSecurity', () => {
       const mockUser = { id: 'user-123', user_metadata: { eventId: 'event-123', appId: 'app-123' } };
 
       // Mock the RBAC API
-      const { isPermittedCached } = await import('../../rbac/api');
-      vi.mocked(isPermittedCached).mockResolvedValue(true);
+      const { isPermittedCached } = await import('../rbac/api');
+      vi.mocked(isPermittedCached).mockResolvedValue({ ok: true, data: true });
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         supabase: { rpc: vi.fn() }
@@ -584,7 +582,7 @@ describe('useOrganisationSecurity', () => {
         error: null
       });
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         session: { access_token: 'token' },
@@ -608,7 +606,7 @@ describe('useOrganisationSecurity', () => {
       const mockOrg = { id: 'org-123' };
 
       // Mock the RBAC API
-      const { getPermissionMap } = await import('../../rbac/api');
+      const { getPermissionMap } = await import('../rbac/api');
       const mockPermissions = {
         'view_basic': true,
         'view_details': true,
@@ -617,14 +615,14 @@ describe('useOrganisationSecurity', () => {
         'manage_members': true,
         'manage_settings': true
       };
-      vi.mocked(getPermissionMap).mockResolvedValue(mockPermissions);
+      vi.mocked(getPermissionMap).mockResolvedValue({ ok: true, data: mockPermissions });
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         supabase: { rpc: vi.fn() }
       } as any);
-      vi.mocked(useOrganisations).mockReturnValue({
+      mockUseOrganisationsFn.mockReturnValue({
         ...mockUseOrganisations,
         selectedOrganisation: mockOrg
       } as any);
@@ -656,20 +654,20 @@ describe('useOrganisationSecurity', () => {
       const mockSupabase = { rpc: vi.fn() };
       const mockOrg = { id: 'org-123' };
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         supabase: mockSupabase
       } as any);
-      vi.mocked(useOrganisations).mockReturnValue({
+      mockUseOrganisationsFn.mockReturnValue({
         ...mockUseOrganisations,
         selectedOrganisation: mockOrg
       } as any);
       vi.mocked(mockUseOrganisations.getUserRole).mockReturnValue('unknown_role');
 
       // Mock the RBAC import to return empty permissions
-      vi.doMock('../../rbac/api', () => ({
-        getPermissionMap: vi.fn().mockResolvedValue({})
+      vi.doMock('../rbac/api', () => ({
+        getPermissionMap: vi.fn().mockResolvedValue({ ok: true, data: {} })
       }));
 
       const { result } = renderHook(() => useOrganisationSecurity());
@@ -684,19 +682,19 @@ describe('useOrganisationSecurity', () => {
       const mockSupabase = { rpc: vi.fn() };
       const mockOrg = { id: 'org-123' };
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         supabase: mockSupabase
       } as any);
-      vi.mocked(useOrganisations).mockReturnValue({
+      mockUseOrganisationsFn.mockReturnValue({
         ...mockUseOrganisations,
         selectedOrganisation: mockOrg
       } as any);
       vi.mocked(mockUseOrganisations.getUserRole).mockReturnValue('org_admin');
 
       // Mock RBAC import to throw error
-      vi.doMock('../../rbac/api', () => {
+      vi.doMock('../rbac/api', () => {
         throw new Error('Import failed');
       });
 
@@ -722,15 +720,15 @@ describe('useOrganisationSecurity', () => {
       const mockOrg = { id: 'org-123' };
 
       // Mock the RBAC audit API
-      const { emitAuditEvent } = await import('../../rbac/audit');
+      const { emitAuditEvent } = await import('../rbac/audit');
       vi.mocked(emitAuditEvent).mockResolvedValue(undefined);
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         supabase: { rpc: vi.fn() }
       } as any);
-      vi.mocked(useOrganisations).mockReturnValue({
+      mockUseOrganisationsFn.mockReturnValue({
         ...mockUseOrganisations,
         selectedOrganisation: mockOrg
       } as any);
@@ -760,12 +758,12 @@ describe('useOrganisationSecurity', () => {
       };
       const mockOrg = { id: 'org-123' };
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         supabase: mockSupabase
       } as any);
-      vi.mocked(useOrganisations).mockReturnValue({
+      mockUseOrganisationsFn.mockReturnValue({
         ...mockUseOrganisations,
         selectedOrganisation: mockOrg
       } as any);
@@ -799,7 +797,7 @@ describe('useOrganisationSecurity', () => {
         })
       };
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         session: mockSession,
@@ -832,7 +830,7 @@ describe('useOrganisationSecurity', () => {
         })
       };
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         supabase: mockSupabase
@@ -866,7 +864,7 @@ describe('useOrganisationSecurity', () => {
         error: null
       });
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         session: { access_token: 'token' },
@@ -889,7 +887,7 @@ describe('useOrganisationSecurity', () => {
       const mockUser = { id: 'user-123' };
       const mockSupabase = { from: vi.fn() };
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         supabase: mockSupabase
@@ -923,7 +921,7 @@ describe('useOrganisationSecurity', () => {
         })
       };
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         session: mockSession,
@@ -945,7 +943,7 @@ describe('useOrganisationSecurity', () => {
         })
       };
       
-      vi.mocked(useUnifiedAuth).mockReturnValue({
+      mockUseUnifiedAuthFn.mockReturnValue({
         ...mockUseUnifiedAuth,
         user: mockUser,
         supabase: mockSupabase

package/src/hooks/{__tests__/useOrganisations.unit.test.ts → useOrganisations.unit.test.ts}

@@ -1,7 +1,7 @@
 /**
  * @file useOrganisations Hook Unit Tests
  * @package @jmruthers/pace-core
- * @module Hooks/__tests__
+ * @module Hooks
  * @since 0.1.0
  *
  * Comprehensive tests for the useOrganisations hook following TEST_STANDARD.md.
@@ -10,8 +10,8 @@
 
 import { renderHook } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { useOrganisations } from '../useOrganisations';
-import type { Organisation, OrganisationMembership } from '../../types/organisation';
+import { useOrganisations } from './useOrganisations';
+import type { Organisation, OrganisationMembership } from '../types/organisation';
 
 // Mock useOrganisationService
 const mockOrganisationService = {
@@ -32,11 +32,11 @@ const mockOrganisationService = {
   getPrimaryOrganisation: vi.fn()
 };
 
-vi.mock('../services/useOrganisationService', () => ({
+vi.mock('./services/useOrganisationService', () => ({
   useOrganisationService: vi.fn(() => mockOrganisationService)
 }));
 
-import { useOrganisationService } from '../services/useOrganisationService';
+import { useOrganisationService } from './services/useOrganisationService';
 
 describe('useOrganisations Hook', () => {
   const mockOrganisation: Organisation = {

package/src/hooks/{__tests__/usePerformanceMonitor.unit.test.ts → usePerformanceMonitor.unit.test.ts}

@@ -1,7 +1,7 @@
 /**
  * @file usePerformanceMonitor Hook Unit Tests
  * @package @jmruthers/pace-core
- * @module Hooks/__tests__/usePerformanceMonitor
+ * @module Hooks/usePerformanceMonitor
  * @since 0.1.0
  * 
  * Comprehensive tests for the usePerformanceMonitor hook covering all critical functionality.
@@ -9,20 +9,19 @@
 
 import { renderHook, act } from '@testing-library/react';
 import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { usePerformanceMonitor, useOperationPerformance } from '../usePerformanceMonitor';
+import { usePerformanceMonitor, useOperationPerformance } from './usePerformanceMonitor';
 
 // Mock performance.now()
 let mockPerformanceNowValue = 0;
 const mockPerformanceNow = vi.fn(() => mockPerformanceNowValue);
 
-// Mock performanceBudgetMonitor
-vi.mock('../../utils/performance/performanceBudgets', () => ({
+// Mock performanceBudgetMonitor - use hoisted measure so it's a proper spy (same path as hook imports)
+const mockMeasure = vi.hoisted(() =>
+  vi.fn(() => ({ passed: true, value: 0, threshold: 50 }))
+);
+vi.mock('../utils/performance/performanceBudgets', () => ({
   performanceBudgetMonitor: {
-    measure: vi.fn(() => ({
-      passed: true,
-      value: 0,
-      threshold: 50,
-    })),
+    measure: mockMeasure,
   },
   PERFORMANCE_BUDGETS: {
     COMPONENT_RENDER: { threshold: 50 },
@@ -30,8 +29,8 @@ vi.mock('../../utils/performance/performanceBudgets', () => ({
   },
 }));
 
-// Mock the Logger module
-vi.mock('../../utils/core/logger', () => {
+// Mock the Logger module - same path as hook imports
+vi.mock('../utils/core/logger', () => {
   const mockLoggerInstance = {
     warn: vi.fn(),
   };
@@ -41,10 +40,10 @@ vi.mock('../../utils/core/logger', () => {
 });
 
 // Get the mock instance after mock is set up
-import { createLogger as createLoggerImport } from '../../utils/core/logger';
+import { createLogger as createLoggerImport } from '../utils/core/logger';
 const getMockLogger = () => createLoggerImport('test');
 
-import { performanceBudgetMonitor } from '../../utils/performance/performanceBudgets';
+import { performanceBudgetMonitor } from '../utils/performance/performanceBudgets';
 
 // Mock window.performance
 Object.defineProperty(window, 'performance', {
@@ -59,7 +58,7 @@ describe('usePerformanceMonitor', () => {
     vi.clearAllMocks();
     mockPerformanceNowValue = 0;
     mockPerformanceNow.mockImplementation(() => mockPerformanceNowValue);
-    vi.mocked(performanceBudgetMonitor.measure).mockReturnValue({
+    mockMeasure.mockReturnValue({
       passed: true,
       value: 0,
       threshold: 50,

package/src/hooks/{__tests__/usePermissionCache.test.ts → usePermissionCache.test.ts}

@@ -1,7 +1,7 @@
 /**
  * @file usePermissionCache Hook Tests
  * @package @jmruthers/pace-core
- * @module Hooks/__tests__
+ * @module Hooks
  * @since 0.3.0
  *
  * Comprehensive tests for the usePermissionCache hook covering caching, permission checking,
@@ -10,27 +10,28 @@
 
 import { renderHook, act } from '@testing-library/react';
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { usePermissionCache } from '../usePermissionCache';
-import { isPermittedCached } from '../../rbac/api';
+import { usePermissionCache } from './usePermissionCache';
 
 // Mock dependencies
 const mockUseUnifiedAuthFn = vi.fn();
-vi.mock('../../providers/services/UnifiedAuthProvider', () => ({
+vi.mock('../providers/services/UnifiedAuthProvider', () => ({
   useUnifiedAuth: () => mockUseUnifiedAuthFn(),
 }));
 
 const mockUseOrganisations = vi.fn();
-vi.mock('../useOrganisations', () => ({
+vi.mock('./useOrganisations', () => ({
   useOrganisations: () => mockUseOrganisations(),
 }));
 
 const mockUseEvents = vi.fn();
-vi.mock('../useEvents', () => ({
+vi.mock('./useEvents', () => ({
   useEvents: () => mockUseEvents(),
 }));
 
-vi.mock('../../rbac/api', () => ({
-  isPermittedCached: vi.fn(),
+// Hoist so mock applies to same module usePermissionCache imports (../rbac/api from hooks/)
+const mockIsPermittedCached = vi.hoisted(() => vi.fn().mockResolvedValue({ ok: true, data: true }));
+vi.mock('../rbac/api', () => ({
+  isPermittedCached: mockIsPermittedCached,
 }));
 
 const loggerSpy = vi.hoisted(() => ({
@@ -38,13 +39,11 @@ const loggerSpy = vi.hoisted(() => ({
   error: vi.fn(),
 }));
 
-vi.mock('../../utils/core/logger', () => ({
+vi.mock('../utils/core/logger', () => ({
   logger: loggerSpy,
   createLogger: () => loggerSpy,
 }));
 
-const mockIsPermittedCached = vi.mocked(isPermittedCached);
-
 describe('usePermissionCache', () => {
   beforeEach(() => {
     vi.clearAllMocks();
@@ -67,7 +66,7 @@ describe('usePermissionCache', () => {
       selectedEvent: null,
     } as any);
 
-    mockIsPermittedCached.mockResolvedValue(true);
+    mockIsPermittedCached.mockResolvedValue({ ok: true, data: true });
   });
 
   afterEach(() => {
@@ -186,8 +185,8 @@ describe('usePermissionCache', () => {
     });
 
     it('deduplicates concurrent permission checks', async () => {
-      let resolveFn: (value: boolean) => void;
-      const promise = new Promise<boolean>((resolve) => {
+      let resolveFn: (value: { ok: true; data: boolean }) => void;
+      const promise = new Promise<{ ok: true; data: boolean }>((resolve) => {
         resolveFn = resolve;
       });
       mockIsPermittedCached.mockImplementation(() => promise);
@@ -197,7 +196,7 @@ describe('usePermissionCache', () => {
       const promise1 = result.current.checkPermission('read', 'dashboard');
       const promise2 = result.current.checkPermission('read', 'dashboard');
 
-      resolveFn!(true);
+      resolveFn!({ ok: true, data: true });
 
       const [first, second] = await Promise.all([promise1, promise2]);
 
@@ -210,10 +209,10 @@ describe('usePermissionCache', () => {
   describe('Multiple Permission Checking', () => {
     it('checks multiple permissions efficiently', async () => {
       mockIsPermittedCached
-        .mockResolvedValueOnce(true)
-        .mockResolvedValueOnce(false)
-        .mockResolvedValueOnce(true)
-        .mockResolvedValueOnce(false);
+        .mockResolvedValueOnce({ ok: true, data: true })
+        .mockResolvedValueOnce({ ok: true, data: false })
+        .mockResolvedValueOnce({ ok: true, data: true })
+        .mockResolvedValueOnce({ ok: true, data: false });
 
       const { result } = renderHook(() => usePermissionCache());
 
@@ -243,8 +242,8 @@ describe('usePermissionCache', () => {
 
     it('uses cached results for multiple permission checks', async () => {
       mockIsPermittedCached
-        .mockResolvedValueOnce(true)
-        .mockResolvedValueOnce(false);
+        .mockResolvedValueOnce({ ok: true, data: true })
+        .mockResolvedValueOnce({ ok: true, data: false });
 
       const { result } = renderHook(() => usePermissionCache());
 
@@ -370,10 +369,10 @@ describe('usePermissionCache', () => {
   describe('Cached Permissions', () => {
     it('returns cached permissions for a page', async () => {
       mockIsPermittedCached
-        .mockResolvedValueOnce(true)
-        .mockResolvedValueOnce(false)
-        .mockResolvedValueOnce(true)
-        .mockResolvedValueOnce(false);
+        .mockResolvedValueOnce({ ok: true, data: true })
+        .mockResolvedValueOnce({ ok: true, data: false })
+        .mockResolvedValueOnce({ ok: true, data: true })
+        .mockResolvedValueOnce({ ok: true, data: false });
 
       const { result } = renderHook(() => usePermissionCache());
 
@@ -405,8 +404,8 @@ describe('usePermissionCache', () => {
   describe('Debug Information', () => {
     it('provides accurate debug information', async () => {
       mockIsPermittedCached
-        .mockResolvedValueOnce(true)
-        .mockResolvedValueOnce(false);
+        .mockResolvedValueOnce({ ok: true, data: true })
+        .mockResolvedValueOnce({ ok: true, data: false });
 
       const { result } = renderHook(() => usePermissionCache());