Add Azure ManagedCleanroom toolset with first commands: collaborations list and collaboration create

.github/CODEOWNERS

@@ -281,6 +281,12 @@
 # ServiceLabel: %tools-ManagedLustre
 # ServiceOwners:                       @rebecca-makar @wolfgang-desalvador
 
+# PRLabel: %tools-ManagedCleanroom
+/tools/Azure.Mcp.Tools.ManagedCleanroom/  @ashank @yavohra @vaidmishra @microsoft/azure-mcp
+
+# ServiceLabel: %tools-ManagedCleanroom
+# ServiceOwners:                           @ashank @yavohra @vaidmishra @microsoft/azure-mcp 
+
 # PRLabel: %tools-Marketplace
 /tools/Azure.Mcp.Tools.Marketplace/    @meirloichter @shaharsandak @obit91 @microsoft/azure-mcp
 

Directory.Packages.props

@@ -5,6 +5,8 @@
   <ItemGroup>
     <PackageVersion Include="Apache.Arrow" Version="22.1.0" />
     <PackageVersion Include="Azure.Containers.ContainerRegistry" Version="1.2.0" />
+    <!-- Cleanroom SDKs are temporarily added as vendored NuGet packages until they are published. -->
+    <PackageVersion Include="Azure.Cleanroom.Analytics.Frontend.Client" Version="1.0.0-beta.1" />
     <PackageVersion Include="Azure.Communication.Sms" Version="1.0.2" />
     <PackageVersion Include="Azure.Communication.Email" Version="1.0.2" />
     <PackageVersion Include="Azure.AI.Projects" Version="1.0.0-beta.9" />
@@ -31,6 +33,8 @@
     <PackageVersion Include="Azure.ResourceManager.DesktopVirtualization" Version="1.3.2" />
     <PackageVersion Include="Azure.ResourceManager.DeviceRegistry" Version="1.1.0-beta.2" />
     <PackageVersion Include="Azure.ResourceManager.ContainerService" Version="1.2.5" />
+    <!-- Cleanroom SDKs are temporarily added as vendored NuGet packages until they are published. -->
+    <PackageVersion Include="Azure.ResourceManager.CleanRoom" Version="1.0.0-alpha.20260603.1" />
     <PackageVersion Include="Azure.ResourceManager.EventGrid" Version="1.2.0-beta.2" />
     <PackageVersion Include="Azure.ResourceManager.EventHubs" Version="1.2.1" />
     <PackageVersion Include="Azure.ResourceManager.CognitiveServices" Version="1.5.1" />

Microsoft.Mcp.slnx

@@ -309,6 +309,13 @@
   <Folder Name="/tools/Azure.Mcp.Tools.LoadTesting/tests/">
     <Project Path="tools/Azure.Mcp.Tools.LoadTesting/tests/Azure.Mcp.Tools.LoadTesting.Tests/Azure.Mcp.Tools.LoadTesting.Tests.csproj" />
   </Folder>
+  <Folder Name="/tools/Azure.Mcp.Tools.ManagedCleanroom/" />
+  <Folder Name="/tools/Azure.Mcp.Tools.ManagedCleanroom/src/">
+    <Project Path="tools/Azure.Mcp.Tools.ManagedCleanroom/src/Azure.Mcp.Tools.ManagedCleanroom.csproj" />
+  </Folder>
+  <Folder Name="/tools/Azure.Mcp.Tools.ManagedCleanroom/tests/">
+    <Project Path="tools/Azure.Mcp.Tools.ManagedCleanroom/tests/Azure.Mcp.Tools.ManagedCleanroom.Tests/Azure.Mcp.Tools.ManagedCleanroom.Tests.csproj" />
+  </Folder>
   <Folder Name="/tools/Azure.Mcp.Tools.ManagedLustre/" />
   <Folder Name="/tools/Azure.Mcp.Tools.ManagedLustre/src/">
     <Project Path="tools/Azure.Mcp.Tools.ManagedLustre/src/Azure.Mcp.Tools.ManagedLustre.csproj" />

eng/tools/ToolMetadataExporter/src/Program.cs

@@ -84,7 +84,7 @@ private static void ConfigureAzureServices(IServiceCollection services)
         services.AddScoped<TokenCredential>(sp =>
         {
             var credential = new ChainedTokenCredential(
-                new ManagedIdentityCredential(),
+                new ManagedIdentityCredential(new ManagedIdentityCredentialOptions()),
                 new DefaultAzureCredential()
             );
 

nuget.config

@@ -5,6 +5,8 @@
     <!-- Do not add any additional feeds. If new packages are needed, they need to come from our azure-sdk-for-net DevOps feed which has an upstream set to nuget.org -->
     <!-- See the Central NuGet Feed documentation in CONTRIBUTING.md for more details -->
     <add key="azure-sdk-for-net" value="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json" />
+    <!-- Temporary local feed for vendored Cleanroom SDK NuGet packages until those SDKs are published. -->
+    <add key="cleanroom-local" value="vendor/cleanroom-nupkgs" />
   </packageSources>
   <disabledPackageSources>
     <clear />

servers/Azure.Mcp.Server/Azure.Mcp.Server.slnx

@@ -263,6 +263,13 @@
   <Folder Name="/tools/Azure.Mcp.Tools.LoadTesting/tests/">
     <Project Path="../../tools/Azure.Mcp.Tools.LoadTesting/tests/Azure.Mcp.Tools.LoadTesting.Tests/Azure.Mcp.Tools.LoadTesting.Tests.csproj" />
   </Folder>
+  <Folder Name="/tools/Azure.Mcp.Tools.ManagedCleanroom/" />
+  <Folder Name="/tools/Azure.Mcp.Tools.ManagedCleanroom/src/">
+    <Project Path="../../tools/Azure.Mcp.Tools.ManagedCleanroom/src/Azure.Mcp.Tools.ManagedCleanroom.csproj" />
+  </Folder>
+  <Folder Name="/tools/Azure.Mcp.Tools.ManagedCleanroom/tests/">
+    <Project Path="../../tools/Azure.Mcp.Tools.ManagedCleanroom/tests/Azure.Mcp.Tools.ManagedCleanroom.Tests/Azure.Mcp.Tools.ManagedCleanroom.Tests.csproj" />
+  </Folder>
   <Folder Name="/tools/Azure.Mcp.Tools.ManagedLustre/" />
   <Folder Name="/tools/Azure.Mcp.Tools.ManagedLustre/src/">
     <Project Path="../../tools/Azure.Mcp.Tools.ManagedLustre/src/Azure.Mcp.Tools.ManagedLustre.csproj" />

servers/Azure.Mcp.Server/changelog-entries/managedcleanroom-toolset.yaml

@@ -0,0 +1,3 @@
+changes:
+  - section: "New Features"
+    description: "Added Azure Managed Cleanroom toolset with two commands for interacting with Azure Cleanroom: `managedcleanroom collaborations list` and `managedcleanroom collaboration create`."

servers/Azure.Mcp.Server/src/Program.cs

@@ -213,6 +213,7 @@ private static IAreaSetup[] RegisterAreas()
             new Azure.Mcp.Tools.KeyVault.KeyVaultSetup(),
             new Azure.Mcp.Tools.Kusto.KustoSetup(),
             new Azure.Mcp.Tools.LoadTesting.LoadTestingSetup(),
+            new Azure.Mcp.Tools.ManagedCleanroom.ManagedCleanroomSetup(),
             new Azure.Mcp.Tools.Marketplace.MarketplaceSetup(),
             new Azure.Mcp.Tools.Quota.QuotaSetup(),
             new Azure.Mcp.Tools.Monitor.MonitorSetup(),

servers/Azure.Mcp.Server/src/Resources/consolidated-tools.json

@@ -4298,6 +4298,72 @@
         "sreagent_scheduledtasks_delete",
         "sreagent_threads_delete"
       ]
+    },
+    {
+      "name": "list_azure_managed_cleanroom_collaborations",
+      "description": "List Azure Managed Cleanroom collaborations the calling user participates in via the Cleanroom Analytics Frontend service.",
+      "toolMetadata": {
+        "destructive": {
+          "value": false,
+          "description": "This tool performs only additive updates without deleting or modifying existing resources."
+        },
+        "idempotent": {
+          "value": true,
+          "description": "Running this operation multiple times with the same arguments produces the same result without additional effects."
+        },
+        "openWorld": {
+          "value": false,
+          "description": "This tool's domain of interaction is closed and well-defined, limited to a specific set of entities."
+        },
+        "readOnly": {
+          "value": true,
+          "description": "This tool only performs read operations without modifying any state or data."
+        },
+        "secret": {
+          "value": false,
+          "description": "This tool does not handle sensitive or secret information."
+        },
+        "localRequired": {
+          "value": false,
+          "description": "This tool is available in both local and remote server modes."
+        }
+      },
+      "mappedToolList": [
+        "managedcleanroom_collaborations_list"
+      ]
+    },
+    {
+      "name": "create_azure_managed_cleanroom_collaboration",
+      "description": "Create an Azure Managed Cleanroom collaboration ARM resource in a resource group and region.",
+      "toolMetadata": {
+        "destructive": {
+          "value": false,
+          "description": "This tool performs only additive updates without deleting or modifying existing resources."
+        },
+        "idempotent": {
+          "value": true,
+          "description": "Running this operation multiple times with the same arguments produces the same result without additional effects."
+        },
+        "openWorld": {
+          "value": false,
+          "description": "This tool's domain of interaction is closed and well-defined, limited to a specific set of entities."
+        },
+        "readOnly": {
+          "value": false,
+          "description": "This tool may modify its environment by creating, updating, or deleting data."
+        },
+        "secret": {
+          "value": false,
+          "description": "This tool does not handle sensitive or secret information."
+        },
+        "localRequired": {
+          "value": false,
+          "description": "This tool is available in both local and remote server modes."
+        }
+      },
+      "mappedToolList": [
+        "managedcleanroom_collaborationarm_create"
+      ]
     }
   ]
 }

tools/Azure.Mcp.Tools.Advisor/tests/Azure.Mcp.Tools.Advisor.Tests/Recommendation/RecommendationListCommandTests.cs

@@ -8,6 +8,7 @@
 using Azure.Mcp.Tools.Advisor.Services;
 using Microsoft.Mcp.Core.Options;
 using Microsoft.Mcp.Tests.Client;
+using Microsoft.Mcp.Tests.Helpers;
 using NSubstitute;
 using NSubstitute.ExceptionExtensions;
 using Xunit;
@@ -31,6 +32,11 @@ public void Constructor_InitializesCommandCorrectly()
     [InlineData("", false)]                    // Missing all required options
     public async Task ExecuteAsync_ValidatesInputCorrectly(string args, bool shouldSucceed)
     {
+        if (!shouldSucceed && string.IsNullOrWhiteSpace(args))
+        {
+            TestEnvironment.SkipIfDefaultSubscriptionConfigured();
+        }
+
         // Arrange
         if (shouldSucceed)
         {

tools/Azure.Mcp.Tools.Extension/tests/Azure.Mcp.Tools.Extension.Tests/AzqrCommandTests.cs

@@ -10,6 +10,7 @@
 using Microsoft.Mcp.Core.Services.ProcessExecution;
 using Microsoft.Mcp.Core.Services.Time;
 using Microsoft.Mcp.Tests.Client;
+using Microsoft.Mcp.Tests.Helpers;
 using NSubstitute;
 using Xunit;
 
@@ -83,6 +84,11 @@ await Service.Received().ExecuteAsync(
         }
         finally
         {
+            if (field is not null)
+            {
+                field.SetValue(null, originalAzqrPath);
+            }
+
             // Cleanup
             if (File.Exists(xlsxReportFilePath))
             {
@@ -102,6 +108,8 @@ await Service.Received().ExecuteAsync(
     [Fact]
     public async Task ExecuteAsync_ReturnsBadRequest_WhenMissingSubscriptionArgument()
     {
+        TestEnvironment.SkipIfDefaultSubscriptionConfigured();
+
         // Arrange & Act
         var response = await ExecuteCommandAsync("");
 

tools/Azure.Mcp.Tools.ManagedCleanroom/docs/architecture.md

@@ -0,0 +1,101 @@
+# Azure Managed Cleanroom MCP Toolset - Architecture
+
+## Overview
+
+`Azure.Mcp.Tools.ManagedCleanroom` provides comprehensive operations for interacting with Azure Managed Cleanroom services. Commands are organized into logical groups for managing collaborations, analytics workloads, OIDC configuration, datasets, queries, consent documents, and audit events.
+
+Commands interact with:
+- **Data Plane APIs**: Cleanroom Analytics Frontend for read operations (list collaborations, queries, datasets)
+- **Control Plane APIs**: Azure Resource Manager (ARM) for write operations (create collaboration, manage resources)
+
+---
+
+## Command Surfaces
+
+- **Management Plane Commands**:
+
+| Command Group | Command | Status |
+| --- | --- | --- |
+| Collaboration | `collaboration create` | Completed |
+| Collaboration | `collaboration get` | Pending |
+| Collaboration | `collaboration add-collaborator` | Pending |
+| Collaboration | `collaboration enable-workload` | Pending |
+| Collaboration | `collaboration get-readonly-kubeconfig` | Pending |
+
+- **Data Plane Commands**:
+
+| Command Group | Command | Status |
+| --- | --- | --- |
+| Collaborations | `collaborations list` | Completed |
+| Collaborations | `collaborations get` | Pending |
+| Analytics | `analytics get` | Pending |
+| Analytics | `analytics skr-policy` | Pending |
+| OIDC | `oidc issuer-info` | Pending |
+| OIDC | `oidc keys` | Pending |
+| OIDC | `oidc set-issuer-url` | Pending |
+| Invitations | `invitations list` | Pending |
+| Invitations | `invitations accept` | Pending |
+| Datasets | `datasets publish` | Pending |
+| Datasets | `datasets get` | Pending |
+| Datasets | `datasets list` | Pending |
+| Consent | `consent put` | Pending |
+| Queries | `queries publish` | Pending |
+| Queries | `queries get` | Pending |
+| Queries | `queries list` | Pending |
+| Queries | `queries vote` | Pending |
+| Queries | `queries run` | Pending |
+| Queries | `queries runs` | Pending |
+| Runs | `runs get` | Pending |
+| Audit Events | `auditevents list` | Pending |
+
+---
+
+## Project Structure
+
+```
+Azure.Mcp.Tools.ManagedCleanroom/
+├── src/
+│   ├── ManagedCleanroomSetup.cs                      # DI registration & command tree
+│   ├── Commands/
+│   │   ├── ManagedCleanroomJsonContext.cs            # AOT-safe JSON serialization
+│   │   ├── Collaboration/
+│   │   │   ├── CollaborationCreateCommand.cs 
+│   │   │   └── [Other collaboration commands ]
+│   │   ├── Collaborations/
+│   │   │   ├── CollaborationsListCommand.cs 
+│   │   │   └── [Other collaboration commands ]
+│   │   ├── Analytics/                              # Analytics operations
+│   │   ├── Oidc/                                   # OIDC configuration
+│   │   ├── Invitations/                            # Invitation management
+│   │   ├── Datasets/                               # Dataset operations
+│   │   ├── Consent/                                # Consent documents
+│   │   ├── Queries/                                # Query operations
+│   │   ├── Runs/                                   # Query run tracking
+│   │   └── AuditEvents/                            # Audit event listing
+│   ├── Options/
+│   │   ├── ManagedCleanroomOptionDefinitions.cs
+│   │   ├── Collaboration/
+│   │   │   └── [Options classes - mixed status]
+│   │   └── [Options for all command groups]
+│   └── Services/
+│       ├── IManagedCleanroomService.cs
+│       └── ManagedCleanroomService.cs
+└── tests/
+    └── Azure.Mcp.Tools.ManagedCleanroom.Tests/
+        ├── Collaboration/
+        │   ├── CollaborationCreateCommandTests.cs 
+        │   └── [Other tests - ⏳]
+        ├── Collaborations/
+        │   ├── CollaborationsListCommandTests.cs 
+        │   └── [Other tests - ⏳]
+        └── [Tests for remaining command groups - ⏳]
+```
+
+---
+
+## Implementation Notes
+
+- **Completed**: `collaborations list`, `collaboration create`
+- **Pending**: 25 additional commands across 9 command groups
+- Commands span both data plane and control plane operations
+

tools/Azure.Mcp.Tools.ManagedCleanroom/docs/skills.md

@@ -0,0 +1 @@
+TBD

tools/Azure.Mcp.Tools.ManagedCleanroom/src/AssemblyInfo.cs

@@ -0,0 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Azure.Mcp.Tools.ManagedCleanroom.Tests")]

tools/Azure.Mcp.Tools.ManagedCleanroom/src/Azure.Mcp.Tools.ManagedCleanroom.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <IsAotCompatible>true</IsAotCompatible>
+    <AzureSupportedClouds>AzureCloud</AzureSupportedClouds>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\core\Azure.Mcp.Core\src\Azure.Mcp.Core.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Cleanroom SDKs are temporarily vendored as NuGet packages until they are published. -->
+    <PackageReference Include="Azure.Cleanroom.Analytics.Frontend.Client" />
+    <PackageReference Include="Azure.Core" VersionOverride="1.57.0" />
+    <PackageReference Include="Azure.Identity" />
+    <PackageReference Include="Azure.ResourceManager.CleanRoom" />
+    <PackageReference Include="Azure.ResourceManager.Resources" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="ModelContextProtocol" />
+    <PackageReference Include="System.CommandLine" />
+  </ItemGroup>
+</Project>