diff --git a/src/CommunityToolkit.Aspire.Hosting.McpInspector/api/CommunityToolkit.Aspire.Hosting.McpInspector.cs b/src/CommunityToolkit.Aspire.Hosting.McpInspector/api/CommunityToolkit.Aspire.Hosting.McpInspector.cs
index 8344f30bb..e0b3b7843 100644
--- a/src/CommunityToolkit.Aspire.Hosting.McpInspector/api/CommunityToolkit.Aspire.Hosting.McpInspector.cs
+++ b/src/CommunityToolkit.Aspire.Hosting.McpInspector/api/CommunityToolkit.Aspire.Hosting.McpInspector.cs
@@ -26,11 +26,11 @@ public static partial class McpInspectorResourceBuilderExtensions
         public static ApplicationModel.IResourceBuilder<ApplicationModel.McpInspectorResource> AddMcpInspector(this IDistributedApplicationBuilder builder, string name, System.Action<McpInspectorOptions> configureOptions) { throw null; }
 
         [System.Obsolete("Use the overload with McpInspectorOptions instead. This overload will be removed in the next version.")]
-        public static ApplicationModel.IResourceBuilder<ApplicationModel.McpInspectorResource> AddMcpInspector(this IDistributedApplicationBuilder builder, string name, int clientPort = 6274, int serverPort = 6277, string inspectorVersion = "0.16.2") { throw null; }
+        public static ApplicationModel.IResourceBuilder<ApplicationModel.McpInspectorResource> AddMcpInspector(this IDistributedApplicationBuilder builder, string name, int clientPort = 6274, int serverPort = 6277, string inspectorVersion = "0.16.5") { throw null; }
 
         public static ApplicationModel.IResourceBuilder<ApplicationModel.McpInspectorResource> AddMcpInspector(this IDistributedApplicationBuilder builder, string name) { throw null; }
 
-        public static ApplicationModel.IResourceBuilder<ApplicationModel.McpInspectorResource> WithMcpServer<TResource>(this ApplicationModel.IResourceBuilder<ApplicationModel.McpInspectorResource> builder, ApplicationModel.IResourceBuilder<TResource> mcpServer, bool isDefault = true, McpTransportType transportType = McpTransportType.StreamableHttp)
+        public static ApplicationModel.IResourceBuilder<ApplicationModel.McpInspectorResource> WithMcpServer<TResource>(this ApplicationModel.IResourceBuilder<ApplicationModel.McpInspectorResource> builder, ApplicationModel.IResourceBuilder<TResource> mcpServer, bool isDefault = true, McpTransportType transportType = McpTransportType.StreamableHttp, string path = "/mcp")
             where TResource : ApplicationModel.IResourceWithEndpoints { throw null; }
     }
 
@@ -46,7 +46,7 @@ namespace Aspire.Hosting.ApplicationModel
     public partial class McpInspectorResource : ExecutableResource
     {
         public const string ClientEndpointName = "client";
-        public const string InspectorVersion = "0.16.2";
+        public const string InspectorVersion = "0.16.5";
         public const string ServerProxyEndpointName = "server-proxy";
         public McpInspectorResource(string name) : base(default!, default!, default!) { }
 
@@ -61,7 +61,7 @@ public McpInspectorResource(string name) : base(default!, default!, default!) {
         public EndpointReference ServerProxyEndpoint { get { throw null; } }
     }
 
-    public partial record McpServerMetadata(string Name, EndpointReference Endpoint, McpTransportType TransportType)
+    public partial record McpServerMetadata(string Name, EndpointReference Endpoint, McpTransportType TransportType, string Path)
     {
     }
 }
\ No newline at end of file
diff --git a/src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/api/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions.cs b/src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/api/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions.cs
index cc47228e3..31be5f568 100644
--- a/src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/api/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions.cs
+++ b/src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/api/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions.cs
@@ -8,19 +8,60 @@
 //------------------------------------------------------------------------------
 namespace Aspire.Hosting
 {
+    public sealed partial class JavaScriptPackageInstallerAnnotation : ApplicationModel.IResourceAnnotation
+    {
+        public JavaScriptPackageInstallerAnnotation(ApplicationModel.ExecutableResource installerResource) { }
+
+        public ApplicationModel.ExecutableResource Resource { get { throw null; } }
+    }
+
+    public sealed partial class JavaScriptPackageManagerAnnotation : ApplicationModel.IResourceAnnotation
+    {
+        public JavaScriptPackageManagerAnnotation(string packageManager) { }
+
+        public string PackageManager { get { throw null; } }
+    }
+
     public static partial class NodeJSHostingExtensions
     {
+        public static ApplicationModel.IResourceBuilder<ApplicationModel.NxAppResource> AddApp(this ApplicationModel.IResourceBuilder<ApplicationModel.NxResource> builder, string name, string? appName = null, System.Func<ApplicationModel.IResourceBuilder<ApplicationModel.NxAppResource>, ApplicationModel.IResourceBuilder<ApplicationModel.NxAppResource>>? configure = null) { throw null; }
+
+        public static ApplicationModel.IResourceBuilder<ApplicationModel.TurborepoAppResource> AddApp(this ApplicationModel.IResourceBuilder<ApplicationModel.TurborepoResource> builder, string name, string? filter = null, System.Func<ApplicationModel.IResourceBuilder<ApplicationModel.TurborepoAppResource>, ApplicationModel.IResourceBuilder<ApplicationModel.TurborepoAppResource>>? configure = null) { throw null; }
+
+        public static ApplicationModel.IResourceBuilder<ApplicationModel.NxResource> AddNxApp(this IDistributedApplicationBuilder builder, string name, string? workingDirectory = null) { throw null; }
+
         public static ApplicationModel.IResourceBuilder<NodeAppResource> AddPnpmApp(this IDistributedApplicationBuilder builder, string name, string workingDirectory, string scriptName = "start", string[]? args = null) { throw null; }
 
+        public static ApplicationModel.IResourceBuilder<ApplicationModel.TurborepoResource> AddTurborepoApp(this IDistributedApplicationBuilder builder, string name, string? workingDirectory = null) { throw null; }
+
         public static ApplicationModel.IResourceBuilder<NodeAppResource> AddViteApp(this IDistributedApplicationBuilder builder, string name, string? workingDirectory = null, string packageManager = "npm", bool useHttps = false) { throw null; }
 
         public static ApplicationModel.IResourceBuilder<NodeAppResource> AddYarnApp(this IDistributedApplicationBuilder builder, string name, string workingDirectory, string scriptName = "start", string[]? args = null) { throw null; }
 
+        public static ApplicationModel.IResourceBuilder<ApplicationModel.NxResource> RunWithPackageManager(this ApplicationModel.IResourceBuilder<ApplicationModel.NxResource> builder, string? packageManager = null) { throw null; }
+
+        public static ApplicationModel.IResourceBuilder<ApplicationModel.TurborepoResource> RunWithPackageManager(this ApplicationModel.IResourceBuilder<ApplicationModel.TurborepoResource> builder, string? packageManager = null) { throw null; }
+
+        public static ApplicationModel.IResourceBuilder<TResource> WithMappedEndpointPort<TResource>(this ApplicationModel.IResourceBuilder<TResource> builder, string? endpointName = null)
+            where TResource : NodeAppResource { throw null; }
+
         public static ApplicationModel.IResourceBuilder<NodeAppResource> WithNpmPackageInstallation(this ApplicationModel.IResourceBuilder<NodeAppResource> resource, bool useCI = false, System.Action<ApplicationModel.IResourceBuilder<ApplicationModel.NpmInstallerResource>>? configureInstaller = null) { throw null; }
 
+        public static ApplicationModel.IResourceBuilder<ApplicationModel.NxResource> WithNpmPackageInstaller(this ApplicationModel.IResourceBuilder<ApplicationModel.NxResource> resource, bool useCI = false, System.Action<ApplicationModel.IResourceBuilder<ApplicationModel.NpmInstallerResource>>? configureInstaller = null) { throw null; }
+
+        public static ApplicationModel.IResourceBuilder<ApplicationModel.TurborepoResource> WithNpmPackageInstaller(this ApplicationModel.IResourceBuilder<ApplicationModel.TurborepoResource> resource, bool useCI = false, System.Action<ApplicationModel.IResourceBuilder<ApplicationModel.NpmInstallerResource>>? configureInstaller = null) { throw null; }
+
         public static ApplicationModel.IResourceBuilder<NodeAppResource> WithPnpmPackageInstallation(this ApplicationModel.IResourceBuilder<NodeAppResource> resource, System.Action<ApplicationModel.IResourceBuilder<ApplicationModel.PnpmInstallerResource>>? configureInstaller = null) { throw null; }
 
+        public static ApplicationModel.IResourceBuilder<ApplicationModel.NxResource> WithPnpmPackageInstaller(this ApplicationModel.IResourceBuilder<ApplicationModel.NxResource> resource, System.Action<ApplicationModel.IResourceBuilder<ApplicationModel.PnpmInstallerResource>>? configureInstaller = null) { throw null; }
+
+        public static ApplicationModel.IResourceBuilder<ApplicationModel.TurborepoResource> WithPnpmPackageInstaller(this ApplicationModel.IResourceBuilder<ApplicationModel.TurborepoResource> resource, System.Action<ApplicationModel.IResourceBuilder<ApplicationModel.PnpmInstallerResource>>? configureInstaller = null) { throw null; }
+
         public static ApplicationModel.IResourceBuilder<NodeAppResource> WithYarnPackageInstallation(this ApplicationModel.IResourceBuilder<NodeAppResource> resource, System.Action<ApplicationModel.IResourceBuilder<ApplicationModel.YarnInstallerResource>>? configureInstaller = null) { throw null; }
+
+        public static ApplicationModel.IResourceBuilder<ApplicationModel.NxResource> WithYarnPackageInstaller(this ApplicationModel.IResourceBuilder<ApplicationModel.NxResource> resource, System.Action<ApplicationModel.IResourceBuilder<ApplicationModel.YarnInstallerResource>>? configureInstaller = null) { throw null; }
+
+        public static ApplicationModel.IResourceBuilder<ApplicationModel.TurborepoResource> WithYarnPackageInstaller(this ApplicationModel.IResourceBuilder<ApplicationModel.TurborepoResource> resource, System.Action<ApplicationModel.IResourceBuilder<ApplicationModel.YarnInstallerResource>>? configureInstaller = null) { throw null; }
     }
 }
 
@@ -31,11 +72,39 @@ public partial class NpmInstallerResource : ExecutableResource
         public NpmInstallerResource(string name, string workingDirectory) : base(default!, default!, default!) { }
     }
 
+    public partial class NxAppResource : NodeAppResource
+    {
+        public NxAppResource(string name, string workingDirectory, string appName, string command = "nx") : base(default!, default!, default!) { }
+
+        public string AppName { get { throw null; } }
+    }
+
+    public partial class NxResource : Resource
+    {
+        public NxResource(string name, string workingDirectory) : base(default!) { }
+
+        public string WorkingDirectory { get { throw null; } }
+    }
+
     public partial class PnpmInstallerResource : ExecutableResource
     {
         public PnpmInstallerResource(string name, string workingDirectory) : base(default!, default!, default!) { }
     }
 
+    public partial class TurborepoAppResource : NodeAppResource
+    {
+        public TurborepoAppResource(string name, string workingDirectory, string filter, string command = "turbo") : base(default!, default!, default!) { }
+
+        public string Filter { get { throw null; } }
+    }
+
+    public partial class TurborepoResource : Resource
+    {
+        public TurborepoResource(string name, string workingDirectory) : base(default!) { }
+
+        public string WorkingDirectory { get { throw null; } }
+    }
+
     public partial class YarnInstallerResource : ExecutableResource
     {
         public YarnInstallerResource(string name, string workingDirectory) : base(default!, default!, default!) { }