feat: cross-reference existing Network and Data tests into AI pillar

src/powershell/classes/ZtTest.ps1

@@ -9,7 +9,7 @@ class ZtTest : System.Attribute
 
 	[string[]]$Service
 
-	[string]$Pillar
+	[string[]]$Pillar
 	[ValidateSet('Critical','High','Medium','Low','Unranked')][string]$RiskLevel
 	[string]$SfiPillar
 	[ValidateSet('Workforce','External')][string[]]$TenantType

src/powershell/private/core/Clear-ZtModuleVariable.ps1

@@ -23,4 +23,5 @@ function Clear-ZtModuleVariable {
     $script:__ZtSession.ProgressState.Value.Clear()
     $script:__ZtSession.SignInLogDuration = $null
     $script:__ZtSession.PreviewEnabled = $false
+    $script:__ZtSession.RequestedPillar = $null
 }

src/powershell/private/core/Get-ZtAssessmentResults.ps1

@@ -83,6 +83,24 @@ function Get-ZtAssessmentResults {
 	$org = Get-Organization
 	$tests = $script:__ZtSession.TestResultDetail.Value.values
 
+	# Restrict TestPillar on cross-referenced tests (multi-pillar arrays) based on how the
+	# assessment was invoked. This runs on the main thread where RequestedPillar and PreviewEnabled
+	# are always available, avoiding runspace scope issues.
+	#   - Specific pillar (e.g. -Pillar AI): set TestPillar to exactly the requested pillar.
+	#   - -Pillar All + preview enabled: keep full array (test appears on every tagged page).
+	#   - -Pillar All + preview disabled: strip 'AI' so the AI preview page stays empty.
+	$_reqPillar   = $script:__ZtSession.RequestedPillar
+	$_previewOn   = $script:__ZtSession.PreviewEnabled
+	$_isAllPillar = (-not $_reqPillar -or $_reqPillar -eq 'All')
+	foreach ($test in $tests) {
+		if ($test.TestPillar -isnot [array]) { continue }
+		if (-not $_isAllPillar) {
+			$test.TestPillar = $_reqPillar
+		} elseif (-not $_previewOn) {
+			$test.TestPillar = $test.TestPillar | Where-Object { $_ -ne 'AI' }
+		}
+	}
+
 	$ztTestResults = [PSCustomObject][ordered]@{
 		ExecutedAt        = Get-Date
 		TenantId          = $mgContext.TenantId

src/powershell/private/tests/Invoke-ZtTests.ps1

@@ -87,12 +87,14 @@
 	}
 
 	$testsToRun = Get-ZtTest -Tests $Tests -Pillar $Pillar -TenantType $tenantTypeMapping[$TenantType]
+	# Store the requested pillar so Get-ZtAssessmentResults can restrict TestPillar on cross-ref tests
+	$script:__ZtSession.RequestedPillar = $Pillar
 
 	# Filter based on preview feature flag
 	if (-not $script:__ZtSession.PreviewEnabled) {
 		# Non-preview mode: Only include stable/released pillars
 		$stablePillars = @('Identity', 'Devices', 'Network', 'Data')
-		$testsToRun = $testsToRun.Where{ $_.Pillar -in $stablePillars }
+		$testsToRun = $testsToRun.Where{ ($_.Pillar | Where-Object { $_ -in $stablePillars }) }
 	}
 
 	# Filter based on Compatible licenses
@@ -117,7 +119,7 @@
 	# Separate Sync Tests (Compliance/ExchangeOnline/SharePointOnline) from Parallel Tests (because of DLL order to manage in runspaces & remoting into WPS)
 	# Tests that depend on SecurityCompliance remoting must run on the main thread regardless of pillar.
 	[int[]]$syncTestIds   = $testsToRun.Where{
-		$_.Pillar -eq 'Data' -or $_.Service -contains 'SecurityCompliance'
+		$_.Pillar -contains 'Data' -or $_.Service -contains 'SecurityCompliance'
 	}.TestId
 	$syncTests     = $testsToRun.Where{ $_.TestId -in $syncTestIds }
 	$parallelTests = $testsToRun.Where{ $_.TestId -notin $syncTestIds }

src/powershell/public/Get-ZtTest.ps1

@@ -77,7 +77,7 @@
 
 		$script:__ZtSession.TestMeta | Where-Object {
 			(-not $Tests -or $_.TestID -in $Tests) -and
-			(-not $Pillar -or $Pillar -contains 'All' -or $_.Pillar -in $Pillar) -and
+			(-not $Pillar -or $Pillar -contains 'All' -or ($_.Pillar | Where-Object { $_ -in $Pillar })) -and
 			(-not $TenantType -or $_.TenantType -contains $TenantType)
 		}
 	}

src/powershell/tests/Test-Assessment.25415.ps1

@@ -14,7 +14,7 @@ function Test-Assessment-25415 {
     	Service = ('Graph'),
     	MinimumLicense = ('Entra_Premium_Internet_Access'),
     	CompatibleLicense = ('Entra_Premium_Internet_Access'),
-    	Pillar = 'Network',
+    	Pillar = ('Network', 'AI'),
     	RiskLevel = 'High',
     	SfiPillar = 'Protect networks',
     	TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35003.ps1

@@ -19,7 +19,7 @@ function Test-Assessment-35003 {
     	MinimumLicense = ('Microsoft 365 E3'),
     	CompatibleLicense = ('RMS_S_PREMIUM'),
     	Service = ('SecurityCompliance'),
-    	Pillar = 'Data',
+    	Pillar = ('Data', 'AI'),
     	RiskLevel = 'High',
     	SfiPillar = 'Protect tenants and production systems',
     	TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35004.ps1

@@ -21,7 +21,7 @@ function Test-Assessment-35004 {
     	MinimumLicense = ('Microsoft 365 E3'),
     	CompatibleLicense = ('RMS_S_PREMIUM'),
     	Service = ('SecurityCompliance'),
-    	Pillar = 'Data',
+    	Pillar = ('Data', 'AI'),
     	RiskLevel = 'Low',
     	SfiPillar = 'Protect tenants and production systems',
     	TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35005.ps1

@@ -18,7 +18,7 @@ function Test-Assessment-35005 {
     	MinimumLicense = ('MIP_P1'),
     	CompatibleLicense = ('RMS_S_PREMIUM'),
     	Service = ('SharePointOnline'),
-    	Pillar = 'Data',
+    	Pillar = ('Data', 'AI'),
     	RiskLevel = 'High',
     	SfiPillar = 'Protect tenants and production systems',
     	TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35006.ps1

@@ -18,7 +18,7 @@ function Test-Assessment-35006 {
     	MinimumLicense = ('MIP_P1'),
     	CompatibleLicense = ('RMS_S_PREMIUM'),
     	Service = ('SharePointOnline'),
-    	Pillar = 'Data',
+    	Pillar = ('Data', 'AI'),
     	RiskLevel = 'Medium',
     	SfiPillar = 'Protect tenants and production systems',
     	TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35007.ps1

@@ -18,7 +18,7 @@ function Test-Assessment-35007 {
         Service = ('SharePointOnline'),
         MinimumLicense = ('Microsoft 365 E3'),
         CompatibleLicense = ('RMS_S_PREMIUM'),
-        Pillar = 'Data',
+        Pillar = ('Data', 'AI'),
         RiskLevel = 'Low',
         SfiPillar = '',
         TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35008.ps1

@@ -18,7 +18,7 @@ function Test-Assessment-35008 {
     	MinimumLicense = ('Microsoft 365 E5'),
     	CompatibleLicense = ('RMS_S_PREMIUM2'),
     	Service = ('SharePointOnline'),
-    	Pillar = 'Data',
+    	Pillar = ('Data', 'AI'),
     	RiskLevel = 'Medium',
     	SfiPillar = 'Protect tenants and production systems',
     	TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35010.ps1

@@ -28,7 +28,7 @@ function Test-Assessment-35010 {
     	Service = ('SecurityCompliance'),
     	MinimumLicense = ('Microsoft 365 E5'),
     	CompatibleLicense = ('RMS_S_PREMIUM2'),
-    	Pillar = 'Data',
+    	Pillar = ('Data', 'AI'),
     	RiskLevel = 'Low',
     	SfiPillar = 'Protect tenants and production systems',
     	TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35011.ps1

@@ -20,7 +20,7 @@ function Test-Assessment-35011 {
     	MinimumLicense = ('Microsoft 365 E5'),
     	CompatibleLicense = ('RMS_S_PREMIUM2'),
     	Service = ('AipService','Graph'),
-    	Pillar = 'Data',
+    	Pillar = ('Data', 'AI'),
     	RiskLevel = 'Medium',
     	SfiPillar = 'Protect tenants and production systems',
     	TenantType = ('Workforce','External'),

src/powershell/tests/Test-Assessment.35012.ps1

@@ -22,7 +22,7 @@ function Test-Assessment-35012 {
     	MinimumLicense = ('Microsoft 365 E5'),
     	CompatibleLicense = ('RMS_S_PREMIUM2'),
     	Service = ('SecurityCompliance'),
-    	Pillar = 'Data',
+    	Pillar = ('Data', 'AI'),
     	RiskLevel = 'Medium',
     	SfiPillar = 'Protect tenants and production systems',
     	TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35013.ps1

@@ -22,7 +22,7 @@ function Test-Assessment-35013 {
         Service = ('SecurityCompliance'),
         MinimumLicense = 'Microsoft 365 E3',
         CompatibleLicense = ('RMS_S_PREMIUM'),
-        Pillar = 'Data',
+        Pillar = ('Data', 'AI'),
         RiskLevel = 'High',
         SfiPillar = 'Protect tenants and production systems',
         TenantType = ('Workforce', 'External'),

src/powershell/tests/Test-Assessment.35014.ps1

@@ -21,7 +21,7 @@ function Test-Assessment-35014 {
         Service = ('SecurityCompliance'),
         MinimumLicense = ('Microsoft 365 E3'),
         CompatibleLicense = ('RMS_S_PREMIUM'),
-        Pillar = 'Data',
+        Pillar = ('Data', 'AI'),
         RiskLevel = 'Medium',
         SfiPillar = 'Protect tenants and production systems',
         TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35015.ps1

@@ -18,7 +18,7 @@ function Test-Assessment-35015 {
     	MinimumLicense = ('Microsoft 365 E3'),
     	CompatibleLicense = ('RMS_S_PREMIUM'),
     	Service = ('SecurityCompliance'),
-    	Pillar = 'Data',
+    	Pillar = ('Data', 'AI'),
     	RiskLevel = 'Medium',
     	SfiPillar = 'Protect tenants and production systems',
     	TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35016.ps1

@@ -10,7 +10,7 @@ function Test-Assessment-35016 {
         Service = ('SecurityCompliance'),
         MinimumLicense = ('Microsoft 365 E3'),
         CompatibleLicense = ('RMS_S_PREMIUM'),
-        Pillar = 'Data',
+        Pillar = ('Data', 'AI'),
         RiskLevel = 'High',
         SfiPillar = 'Protect tenants and production systems',
         TenantType = ('Workforce','External'),

src/powershell/tests/Test-Assessment.35017.ps1

@@ -21,7 +21,7 @@ function Test-Assessment-35017 {
         Service = ('SecurityCompliance'),
         MinimumLicense = ('Microsoft 365 E3'),
         CompatibleLicense = ('RMS_S_PREMIUM'),
-        Pillar = 'Data',
+        Pillar = ('Data', 'AI'),
         RiskLevel = 'Medium',
         SfiPillar = 'Protect tenants and production systems',
         TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35019.ps1

@@ -17,7 +17,7 @@ function Test-Assessment-35019 {
     	ImplementationCost = 'Medium',
     	CompatibleLicense = ('EXCHANGE_S_ENTERPRISE'),
     	Service = ('SecurityCompliance'),
-    	Pillar = 'Data',
+    	Pillar = ('Data', 'AI'),
     	RiskLevel = 'High',
     	SfiPillar = 'Protect tenants and production systems',
     	TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35020.ps1

@@ -9,7 +9,7 @@ function Test-Assessment-35020 {
         ImplementationCost = 'Low',
         Service = ('SecurityCompliance'),
         CompatibleLicense = ('EXCHANGE_S_ENTERPRISE'),
-        Pillar = 'Data',
+        Pillar = ('Data', 'AI'),
         RiskLevel = 'High',
         SfiPillar = 'Protect tenants and production systems',
         TenantType = ('Workforce','External'),

src/powershell/tests/Test-Assessment.35021.ps1

@@ -17,7 +17,7 @@ function Test-Assessment-35021 {
         ImplementationCost = 'Medium',
         Service = ('SecurityCompliance'),
         CompatibleLicense = ('EXCHANGE_S_ENTERPRISE'),
-        Pillar = 'Data',
+        Pillar = ('Data', 'AI'),
         RiskLevel = 'High',
         SfiPillar = 'Protect tenants and production systems',
         TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35022.ps1

@@ -23,7 +23,7 @@ function Test-Assessment-35022 {
         ImplementationCost = 'Medium',
         Service = ('SecurityCompliance'),
         CompatibleLicense = ('EXCHANGE_S_ENTERPRISE'),
-        Pillar = 'Data',
+        Pillar = ('Data', 'AI'),
         RiskLevel = 'Medium',
         SfiPillar = 'Protect tenants and production systems',
         TenantType = 'Workforce',

src/powershell/tests/Test-Assessment.35023.ps1

@@ -21,7 +21,7 @@ function Test-Assessment-35023 {
         ImplementationCost = 'Medium',
         Service = ('SecurityCompliance'),
         CompatibleLicense = ('EXCHANGE_S_ENTERPRISE'),
-        Pillar = 'Data',
+        Pillar = ('Data', 'AI'),
         RiskLevel = 'Medium',
         SfiPillar = 'Protect tenants and production systems',
         TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35024.ps1

@@ -22,7 +22,7 @@ function Test-Assessment-35024 {
     	MinimumLicense = ('Microsoft 365 E3'),
     	CompatibleLicense = ('RMS_S_PREMIUM'),
     	Service = ('ExchangeOnline'),
-    	Pillar = 'Data',
+    	Pillar = ('Data', 'AI'),
     	RiskLevel = 'High',
     	SfiPillar = 'Protect tenants and production systems',
     	TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35025.ps1

@@ -22,7 +22,7 @@ function Test-Assessment-35025 {
         Service = ('ExchangeOnline'),
         MinimumLicense = ('Microsoft 365 E3'),
         CompatibleLicense = ('RMS_S_PREMIUM'),
-        Pillar = 'Data',
+        Pillar = ('Data', 'AI'),
         RiskLevel = 'High',
         SfiPillar = 'Protect tenants and production systems',
         TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35030.ps1

@@ -18,7 +18,7 @@ function Test-Assessment-35030 {
         ImplementationCost = 'Medium',
         Service = ('SecurityCompliance'),
         CompatibleLicense = ('EXCHANGE_S_ENTERPRISE'),
-        Pillar = 'Data',
+        Pillar = ('Data', 'AI'),
         RiskLevel = 'High',
         SfiPillar = 'Protect tenants and production systems',
         TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35032.ps1

@@ -25,7 +25,7 @@ function Test-Assessment-35032 {
         ImplementationCost = 'Low',
         Service = ('SecurityCompliance'),
         CompatibleLicense = ('EXCHANGE_S_ENTERPRISE'),
-        Pillar = 'Data',
+        Pillar = ('Data', 'AI'),
         RiskLevel = 'Medium',
         SfiPillar = 'Protect tenants and production systems',
         TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35033.ps1

@@ -21,7 +21,7 @@ function Test-Assessment-35033 {
         ImplementationCost = 'High',
         Service = ('SecurityCompliance'),
         CompatibleLicense = ('EXCHANGE_S_ENTERPRISE'),
-        Pillar = 'Data',
+        Pillar = ('Data', 'AI'),
         RiskLevel = 'High',
         SfiPillar = 'Protect tenants and production systems',
         TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35034.ps1

@@ -21,7 +21,7 @@ function Test-Assessment-35034 {
         ImplementationCost = 'Medium',
         Service = ('SecurityCompliance'),
         CompatibleLicense = ('EXCHANGE_S_ENTERPRISE'),
-        Pillar = 'Data',
+        Pillar = ('Data', 'AI'),
         RiskLevel = 'High',
         SfiPillar = 'Protect tenants and production systems',
         TenantType = ('Workforce', 'External'),

src/powershell/tests/Test-Assessment.35035.ps1

@@ -21,7 +21,7 @@ function Test-Assessment-35035 {
     	ImplementationCost = 'Low',
     	CompatibleLicense = ('EXCHANGE_S_ENTERPRISE'),
     	Service = ('SecurityCompliance'),
-    	Pillar = 'Data',
+    	Pillar = ('Data', 'AI'),
     	RiskLevel = 'High',
     	SfiPillar = 'Protect tenants and production systems',
     	TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35036.ps1

@@ -21,7 +21,7 @@ function Test-Assessment-35036 {
     	ImplementationCost = 'High',
     	CompatibleLicense = ('EXCHANGE_S_ENTERPRISE'),
     	Service = ('SecurityCompliance'),
-    	Pillar = 'Data',
+    	Pillar = ('Data', 'AI'),
     	RiskLevel = 'Medium',
     	SfiPillar = 'Protect tenants and production systems',
     	TenantType = ('Workforce','External'),

src/powershell/tests/Test-Assessment.35037.ps1

@@ -10,7 +10,7 @@ function Test-Assessment-35037 {
     	MinimumLicense = ('Microsoft 365 E3'),
     	CompatibleLicense = ('RMS_S_PREMIUM'),
     	Service = ('ExchangeOnline'),
-    	Pillar = 'Data',
+    	Pillar = ('Data', 'AI'),
     	RiskLevel = 'High',
     	SfiPillar = 'Protect tenants and production systems',
     	TenantType = ('Workforce','External'),

src/powershell/tests/Test-Assessment.35038.ps1

@@ -18,7 +18,7 @@ function Test-Assessment-35038 {
         ImplementationCost = 'Medium',
         Service = ('SecurityCompliance'),
         CompatibleLicense = ('EXCHANGE_S_ENTERPRISE'),
-        Pillar = 'Data',
+        Pillar = ('Data', 'AI'),
         RiskLevel = 'High',
         SfiPillar = 'Protect tenants and production systems',
         TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35039.ps1

@@ -21,7 +21,7 @@ function Test-Assessment-35039 {
         ImplementationCost = 'Medium',
         Service = ('SecurityCompliance'),
         CompatibleLicense = ('EXCHANGE_S_ENTERPRISE'),
-        Pillar = 'Data',
+        Pillar = ('Data', 'AI'),
         RiskLevel = 'High',
         SfiPillar = 'Protect tenants and production systems',
         TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35040.ps1

@@ -21,7 +21,7 @@ function Test-Assessment-35040 {
         ImplementationCost = 'Medium',
         Service = ('SecurityCompliance'),
         CompatibleLicense = ('EXCHANGE_S_ENTERPRISE'),
-        Pillar = 'Data',
+        Pillar = ('Data', 'AI'),
         RiskLevel = 'High',
         SfiPillar = 'Protect tenants and production systems',
         TenantType = ('Workforce'),

src/powershell/tests/Test-Assessment.35041.ps1

@@ -22,7 +22,7 @@ function Test-Assessment-35041 {
         Service = ('SecurityCompliance'),
         MinimumLicense = ('Microsoft 365 E5', 'Microsoft Purview PAYG'),
         CompatibleLicense = ('RMS_S_PREMIUM2'),
-        Pillar = 'Data',
+        Pillar = ('Data', 'AI'),
         RiskLevel = 'Medium',
         SfiPillar = 'Protect tenants and production systems',
         TenantType = ('Workforce'),

src/report/src/components/test-table/data-table.tsx

@@ -89,7 +89,7 @@ export function DataTable<TData extends Test, TValue>({
     const pillarFilteredData = React.useMemo(() => {
         if (pillar) {
             return data.filter(item =>
-                item.TestPillar === pillar
+                Array.isArray(item.TestPillar) ? item.TestPillar.includes(pillar) : item.TestPillar === pillar
             );
         }
         return data;

src/report/src/config/report-data.ts

@@ -226,7 +226,7 @@ export interface Test {
   TestImplementationCost: string;
   TestMinimumLicense?: string[] | null;
   TestSfiPillar: string | null;
-  TestPillar: string | null;
+  TestPillar: string | string[] | null;
   SkippedReason: string | null;
   TestResult: string;
   TestSkipped: string;