Clean up

JamesNK · JamesNK · commit 03fa05533f77 · 2025-10-22T08:26:19.000+08:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -97,8 +97,8 @@
     <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.13.0" />
     <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.13.0" />
     <PackageVersion Include="Milvus.Client" Version="2.3.0-preview.1" />
-    <PackageVersion Include="ModelContextProtocol" Version="0.4.0-preview.2" />
-    <PackageVersion Include="ModelContextProtocol.AspNetCore" Version="0.4.0-preview.2" />
+    <PackageVersion Include="ModelContextProtocol" Version="0.4.0-preview.3" />
+    <PackageVersion Include="ModelContextProtocol.AspNetCore" Version="0.4.0-preview.3" />
     <PackageVersion Include="MongoDB.Driver" Version="3.5.0" />
     <PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="2.1.0" />
     <PackageVersion Include="MySqlConnector.DependencyInjection" Version="2.4.0" />
diff --git a/src/Aspire.Dashboard/Authentication/FrontendCompositeAuthenticationHandler.cs b/src/Aspire.Dashboard/Authentication/FrontendCompositeAuthenticationHandler.cs
@@ -4,7 +4,6 @@
 using System.Text.Encodings.Web;
 using Aspire.Dashboard.Authentication.Connection;
 using Aspire.Dashboard.Configuration;
-using Aspire.Dashboard.Startup;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.Options;
 
diff --git a/src/Aspire.Dashboard/Authentication/UnsecuredAuthenticationHandler.cs b/src/Aspire.Dashboard/Authentication/UnsecuredAuthenticationHandler.cs
@@ -3,7 +3,7 @@
 
 using System.Security.Claims;
 using System.Text.Encodings.Web;
-using Aspire.Dashboard.Startup;
+using Aspire.Dashboard.Configuration;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.Options;
 
diff --git a/src/Aspire.Dashboard/Components/_Imports.razor b/src/Aspire.Dashboard/Components/_Imports.razor
@@ -17,9 +17,9 @@
 @using Aspire.Dashboard.Components
 @using Aspire.Dashboard.Components.Controls
 @using Aspire.Dashboard.Components.Layout
+@using Aspire.Dashboard.Configuration
 @using Aspire.Dashboard.Model
 @using Aspire.Dashboard.ServiceClient
-@using Aspire.Dashboard.Startup
 @using Microsoft.Extensions.Localization
 
 @* Require authorization for all pages of the web app *@
diff --git a/src/Aspire.Dashboard/Configuration/EndpointInfo.cs b/src/Aspire.Dashboard/Configuration/EndpointInfo.cs
@@ -4,7 +4,7 @@
 using Aspire.Dashboard.Authentication.Connection;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 
-namespace Aspire.Dashboard.Startup;
+namespace Aspire.Dashboard.Configuration;
 
 public record EndpointInfo(string Name, BindingAddress Address, HttpProtocols? HttpProtocols, bool RequireCertificate, ConnectionType ConnectionType)
 {
diff --git a/src/Aspire.Dashboard/Configuration/FrontendAuthenticationDefaults.cs b/src/Aspire.Dashboard/Configuration/FrontendAuthenticationDefaults.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace Aspire.Dashboard.Startup;
+namespace Aspire.Dashboard.Configuration;
 
 public static class FrontendAuthenticationDefaults
 {
diff --git a/src/Aspire.Dashboard/Configuration/FrontendAuthorizationDefaults.cs b/src/Aspire.Dashboard/Configuration/FrontendAuthorizationDefaults.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace Aspire.Dashboard.Startup;
+namespace Aspire.Dashboard.Configuration;
 
 public static class FrontendAuthorizationDefaults
 {
diff --git a/src/Aspire.Dashboard/Configuration/ResolvedEndpointInfo.cs b/src/Aspire.Dashboard/Configuration/ResolvedEndpointInfo.cs
@@ -4,7 +4,7 @@
 using System.Globalization;
 using System.Net;
 
-namespace Aspire.Dashboard.Startup;
+namespace Aspire.Dashboard.Configuration;
 
 /// <summary>
 /// This endpoint info represents a resolved endpoint with its binding address, actual IP endpoint, and whether it uses HTTPS.
diff --git a/src/Aspire.Dashboard/DashboardWebApplication.cs b/src/Aspire.Dashboard/DashboardWebApplication.cs
@@ -21,7 +21,6 @@
 using Aspire.Dashboard.Otlp.Grpc;
 using Aspire.Dashboard.Otlp.Http;
 using Aspire.Dashboard.Otlp.Storage;
-using Aspire.Dashboard.Startup;
 using Aspire.Dashboard.Telemetry;
 using Aspire.Dashboard.Utils;
 using Aspire.Hosting;
diff --git a/src/Aspire.Dashboard/Mcp/ResourceMcpTools.cs b/src/Aspire.Dashboard/Mcp/ResourceMcpTools.cs
@@ -232,7 +232,7 @@ public static string GetResourceCommands(IDashboardClient dashboardClient, [Desc
 
         if (resource == null)
         {
-            throw new McpException($"Resource '{resourceName}' not found.", McpErrorCode.InvalidParams);
+            throw new McpProtocolException($"Resource '{resourceName}' not found.", McpErrorCode.InvalidParams);
         }
 
         // Only include commands that can be executed (Enabled).
@@ -247,30 +247,30 @@ public static async Task ExecuteCommand(IDashboardClient dashboardClient, [Descr
 
         if (resource == null)
         {
-            throw new McpException($"Resource '{resourceName}' not found.", McpErrorCode.InvalidParams);
+            throw new McpProtocolException($"Resource '{resourceName}' not found.", McpErrorCode.InvalidParams);
         }
 
         var command = resource.Commands.FirstOrDefault(c => string.Equals(c.Name, commandName, StringComparison.Ordinal));
 
         if (command is null)
         {
-            throw new McpException($"Command '{commandName}' not found for resource '{resourceName}'.", McpErrorCode.InvalidParams);
+            throw new McpProtocolException($"Command '{commandName}' not found for resource '{resourceName}'.", McpErrorCode.InvalidParams);
         }
 
         // Block execution when command isn't available.
         if (command.State == Model.CommandViewModelState.Hidden)
         {
-            throw new McpException($"Command '{commandName}' is not available for resource '{resourceName}'.", McpErrorCode.InvalidParams);
+            throw new McpProtocolException($"Command '{commandName}' is not available for resource '{resourceName}'.", McpErrorCode.InvalidParams);
         }
 
         if (command.State == Model.CommandViewModelState.Disabled)
         {
             if (command.Name == "resource-restart" && resource.Commands.Any(c => c.Name == "resource-start" && c.State == CommandViewModelState.Enabled))
             {
-                throw new McpException($"Resource '{resourceName}' is stopped. Use the 'resource-start' command instead of 'resource-restart'.", McpErrorCode.InvalidParams);
+                throw new McpProtocolException($"Resource '{resourceName}' is stopped. Use the 'resource-start' command instead of 'resource-restart'.", McpErrorCode.InvalidParams);
             }
 
-            throw new McpException($"Command '{commandName}' is currently disabled for resource '{resourceName}'.", McpErrorCode.InvalidParams);
+            throw new McpProtocolException($"Command '{commandName}' is currently disabled for resource '{resourceName}'.", McpErrorCode.InvalidParams);
         }
 
         try
@@ -282,20 +282,20 @@ public static async Task ExecuteCommand(IDashboardClient dashboardClient, [Descr
                 case Model.ResourceCommandResponseKind.Succeeded:
                     return;
                 case Model.ResourceCommandResponseKind.Cancelled:
-                    throw new McpException($"Command '{commandName}' was cancelled.", McpErrorCode.InternalError);
+                    throw new McpProtocolException($"Command '{commandName}' was cancelled.", McpErrorCode.InternalError);
                 case Model.ResourceCommandResponseKind.Failed:
                 default:
                     var message = response.ErrorMessage is { Length: > 0 } ? response.ErrorMessage : "Unknown error. See logs for details.";
-                    throw new McpException($"Command '{commandName}' failed for resource '{resourceName}': {message}", McpErrorCode.InternalError);
+                    throw new McpProtocolException($"Command '{commandName}' failed for resource '{resourceName}': {message}", McpErrorCode.InternalError);
             }
         }
-        catch (McpException)
+        catch (McpProtocolException)
         {
             throw;
         }
         catch (Exception ex)
         {
-            throw new McpException($"Error executing command '{commandName}' for resource '{resourceName}': {ex.Message}", McpErrorCode.InternalError);
+            throw new McpProtocolException($"Error executing command '{commandName}' for resource '{resourceName}': {ex.Message}", McpErrorCode.InternalError);
         }
     }
 
diff --git a/tests/Aspire.Dashboard.Tests/Integration/StartupTests.cs b/tests/Aspire.Dashboard.Tests/Integration/StartupTests.cs
@@ -7,7 +7,6 @@
 using Aspire.Dashboard.Configuration;
 using Aspire.Dashboard.Model.Assistant;
 using Aspire.Dashboard.Otlp.Http;
-using Aspire.Dashboard.Startup;
 using Aspire.Dashboard.Telemetry;
 using Aspire.Hosting;
 using Aspire.Tests.Shared.Telemetry;

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using Aspire.Dashboard.Authentication.Connection;`
`5`	`5`	`using Microsoft.AspNetCore.Server.Kestrel.Core;`
`6`	`6`
`7`		`-namespace Aspire.Dashboard.Startup;`
	`7`	`+namespace Aspire.Dashboard.Configuration;`
`8`	`8`
`9`	`9`	`public record EndpointInfo(string Name, BindingAddress Address, HttpProtocols? HttpProtocols, bool RequireCertificate, ConnectionType ConnectionType)`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Licensed to the .NET Foundation under one or more agreements.`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
`4`		`-namespace Aspire.Dashboard.Startup;`
	`4`	`+namespace Aspire.Dashboard.Configuration;`
`5`	`5`
`6`	`6`	`public static class FrontendAuthenticationDefaults`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ public static string GetResourceCommands(IDashboardClient dashboardClient, [Desc`
`232`	`232`
`233`	`233`	`if (resource == null)`
`234`	`234`	`{`
`235`		`- throw new McpException($"Resource '{resourceName}' not found.", McpErrorCode.InvalidParams);`
	`235`	`+ throw new McpProtocolException($"Resource '{resourceName}' not found.", McpErrorCode.InvalidParams);`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`// Only include commands that can be executed (Enabled).`
`@@ -247,30 +247,30 @@ public static async Task ExecuteCommand(IDashboardClient dashboardClient, [Descr`
`247`	`247`
`248`	`248`	`if (resource == null)`
`249`	`249`	`{`
`250`		`- throw new McpException($"Resource '{resourceName}' not found.", McpErrorCode.InvalidParams);`
	`250`	`+ throw new McpProtocolException($"Resource '{resourceName}' not found.", McpErrorCode.InvalidParams);`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`var command = resource.Commands.FirstOrDefault(c => string.Equals(c.Name, commandName, StringComparison.Ordinal));`
`254`	`254`
`255`	`255`	`if (command is null)`
`256`	`256`	`{`
`257`		`- throw new McpException($"Command '{commandName}' not found for resource '{resourceName}'.", McpErrorCode.InvalidParams);`
	`257`	`+ throw new McpProtocolException($"Command '{commandName}' not found for resource '{resourceName}'.", McpErrorCode.InvalidParams);`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`// Block execution when command isn't available.`
`261`	`261`	`if (command.State == Model.CommandViewModelState.Hidden)`
`262`	`262`	`{`
`263`		`- throw new McpException($"Command '{commandName}' is not available for resource '{resourceName}'.", McpErrorCode.InvalidParams);`
	`263`	`+ throw new McpProtocolException($"Command '{commandName}' is not available for resource '{resourceName}'.", McpErrorCode.InvalidParams);`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`if (command.State == Model.CommandViewModelState.Disabled)`
`267`	`267`	`{`
`268`	`268`	`if (command.Name == "resource-restart" && resource.Commands.Any(c => c.Name == "resource-start" && c.State == CommandViewModelState.Enabled))`
`269`	`269`	`{`
`270`		`- throw new McpException($"Resource '{resourceName}' is stopped. Use the 'resource-start' command instead of 'resource-restart'.", McpErrorCode.InvalidParams);`
	`270`	`+ throw new McpProtocolException($"Resource '{resourceName}' is stopped. Use the 'resource-start' command instead of 'resource-restart'.", McpErrorCode.InvalidParams);`
`271`	`271`	`}`
`272`	`272`
`273`		`- throw new McpException($"Command '{commandName}' is currently disabled for resource '{resourceName}'.", McpErrorCode.InvalidParams);`
	`273`	`+ throw new McpProtocolException($"Command '{commandName}' is currently disabled for resource '{resourceName}'.", McpErrorCode.InvalidParams);`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`try`
`@@ -282,20 +282,20 @@ public static async Task ExecuteCommand(IDashboardClient dashboardClient, [Descr`
`282`	`282`	`case Model.ResourceCommandResponseKind.Succeeded:`
`283`	`283`	`return;`
`284`	`284`	`case Model.ResourceCommandResponseKind.Cancelled:`
`285`		`- throw new McpException($"Command '{commandName}' was cancelled.", McpErrorCode.InternalError);`
	`285`	`+ throw new McpProtocolException($"Command '{commandName}' was cancelled.", McpErrorCode.InternalError);`
`286`	`286`	`case Model.ResourceCommandResponseKind.Failed:`
`287`	`287`	`default:`
`288`	`288`	`var message = response.ErrorMessage is { Length: > 0 } ? response.ErrorMessage : "Unknown error. See logs for details.";`
`289`		`- throw new McpException($"Command '{commandName}' failed for resource '{resourceName}': {message}", McpErrorCode.InternalError);`
	`289`	`+ throw new McpProtocolException($"Command '{commandName}' failed for resource '{resourceName}': {message}", McpErrorCode.InternalError);`
`290`	`290`	`}`
`291`	`291`	`}`
`292`		`- catch (McpException)`
	`292`	`+ catch (McpProtocolException)`
`293`	`293`	`{`
`294`	`294`	`throw;`
`295`	`295`	`}`
`296`	`296`	`catch (Exception ex)`
`297`	`297`	`{`
`298`		`- throw new McpException($"Error executing command '{commandName}' for resource '{resourceName}': {ex.Message}", McpErrorCode.InternalError);`
	`298`	`+ throw new McpProtocolException($"Error executing command '{commandName}' for resource '{resourceName}': {ex.Message}", McpErrorCode.InternalError);`
`299`	`299`	`}`
`300`	`300`	`}`
`301`	`301`