Refactor/cqrs architecture decoupling todo 7

GFramework.Core.Abstractions/Architectures/IArchitectureContext.cs

@@ -18,7 +18,7 @@ namespace GFramework.Core.Abstractions.Architectures;
 ///     <para>新的 <c>GFramework.Cqrs.Abstractions.Cqrs</c> 契约由内置 CQRS dispatcher 统一处理，支持 request pipeline、notification publish 与 stream request。</para>
 ///     <para>新功能优先使用 <see cref="SendRequestAsync{TResponse}(IRequest{TResponse},CancellationToken)" />、<see cref="SendAsync{TCommand}(TCommand,CancellationToken)" /> 与对应的 CQRS Command/Query 重载；迁移旧代码时可先保留旧入口，再逐步替换为 CQRS 请求模型。</para>
 /// </remarks>
-public interface IArchitectureContext
+public interface IArchitectureContext : ICqrsContext
 {
     /// <summary>
     ///     获取指定类型的服务实例

GFramework.Core.Abstractions/Cqrs/ICqrsRuntime.cs

@@ -1,52 +1,16 @@
-using GFramework.Core.Abstractions.Architectures;
-using GFramework.Cqrs.Abstractions.Cqrs;
+using System.ComponentModel;
 
 namespace GFramework.Core.Abstractions.Cqrs;
 
 /// <summary>
-///     定义架构上下文使用的 CQRS runtime seam。
-///     该抽象把请求分发、通知发布与流式处理从具体实现中解耦，
-///     使 <see cref="IArchitectureContext" /> 不再直接依赖某个固定的 runtime 类型。
+///     提供旧 <c>GFramework.Core.Abstractions.Cqrs</c> 命名空间下的 CQRS runtime 兼容别名。
 /// </summary>
-public interface ICqrsRuntime
+/// <remarks>
+///     正式 runtime seam 已迁移到 <see cref="GFramework.Cqrs.Abstractions.Cqrs.ICqrsRuntime" />，
+///     但当前仍保留该接口以避免立即打断历史公开路径与既有二进制引用。
+///     新代码应优先依赖 <c>GFramework.Cqrs.Abstractions.Cqrs</c> 下的正式契约。
+/// </remarks>
+[EditorBrowsable(EditorBrowsableState.Never)]
+public interface ICqrsRuntime : GFramework.Cqrs.Abstractions.Cqrs.ICqrsRuntime
 {
-    /// <summary>
-    ///     发送请求并返回响应。
-    /// </summary>
-    /// <typeparam name="TResponse">响应类型。</typeparam>
-    /// <param name="context">当前架构上下文，用于上下文感知处理器注入与嵌套请求访问。</param>
-    /// <param name="request">要分发的请求。</param>
-    /// <param name="cancellationToken">取消令牌。</param>
-    /// <returns>请求响应。</returns>
-    ValueTask<TResponse> SendAsync<TResponse>(
-        IArchitectureContext context,
-        IRequest<TResponse> request,
-        CancellationToken cancellationToken = default);
-
-    /// <summary>
-    ///     发布通知到所有已注册处理器。
-    /// </summary>
-    /// <typeparam name="TNotification">通知类型。</typeparam>
-    /// <param name="context">当前架构上下文，用于上下文感知处理器注入。</param>
-    /// <param name="notification">要发布的通知。</param>
-    /// <param name="cancellationToken">取消令牌。</param>
-    /// <returns>表示通知分发完成的值任务。</returns>
-    ValueTask PublishAsync<TNotification>(
-        IArchitectureContext context,
-        TNotification notification,
-        CancellationToken cancellationToken = default)
-        where TNotification : INotification;
-
-    /// <summary>
-    ///     创建流式请求的异步响应序列。
-    /// </summary>
-    /// <typeparam name="TResponse">流元素类型。</typeparam>
-    /// <param name="context">当前架构上下文，用于上下文感知处理器注入。</param>
-    /// <param name="request">流式请求。</param>
-    /// <param name="cancellationToken">取消令牌。</param>
-    /// <returns>按需生成的异步响应序列。</returns>
-    IAsyncEnumerable<TResponse> CreateStream<TResponse>(
-        IArchitectureContext context,
-        IStreamRequest<TResponse> request,
-        CancellationToken cancellationToken = default);
 }

GFramework.Core.Tests/Architectures/ArchitectureContextTests.cs

@@ -1,7 +1,6 @@
 using System.Reflection;
 using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Command;
-using GFramework.Core.Abstractions.Cqrs;
 using GFramework.Core.Abstractions.Enums;
 using GFramework.Core.Abstractions.Environment;
 using GFramework.Core.Abstractions.Ioc;

GFramework.Core.Tests/Ioc/MicrosoftDiContainerTests.cs

@@ -1,12 +1,12 @@
 using System.Reflection;
 using GFramework.Core.Abstractions.Bases;
-using GFramework.Core.Abstractions.Cqrs;
 using GFramework.Core.Abstractions.Logging;
 using GFramework.Core.Ioc;
 using GFramework.Core.Logging;
 using GFramework.Core.Tests.Cqrs;
 using GFramework.Core.Tests.Systems;
 using GFramework.Cqrs.Abstractions.Cqrs;
+using LegacyICqrsRuntime = GFramework.Core.Abstractions.Cqrs.ICqrsRuntime;
 
 namespace GFramework.Core.Tests.Ioc;
 
@@ -160,12 +160,16 @@ public void Get_Should_Return_First_Instance()
     public void RegisterHandlers_Should_Not_Duplicate_Cqrs_Infrastructure_When_It_Is_Already_Registered()
     {
         Assert.That(_container.GetAll<ICqrsRuntime>(), Has.Count.EqualTo(1));
+        Assert.That(_container.GetAll<LegacyICqrsRuntime>(), Has.Count.EqualTo(1));
         Assert.That(_container.GetAll<ICqrsHandlerRegistrar>(), Has.Count.EqualTo(1));
+        Assert.That(_container.Get<ICqrsRuntime>(), Is.SameAs(_container.Get<LegacyICqrsRuntime>()));
 
         CqrsTestRuntime.RegisterHandlers(_container);
 
         Assert.That(_container.GetAll<ICqrsRuntime>(), Has.Count.EqualTo(1));
+        Assert.That(_container.GetAll<LegacyICqrsRuntime>(), Has.Count.EqualTo(1));
         Assert.That(_container.GetAll<ICqrsHandlerRegistrar>(), Has.Count.EqualTo(1));
+        Assert.That(_container.Get<ICqrsRuntime>(), Is.SameAs(_container.Get<LegacyICqrsRuntime>()));
     }
 
     /// <summary>

GFramework.Core/Architectures/ArchitectureContext.cs

@@ -1,7 +1,6 @@
 using System.Collections.Concurrent;
 using GFramework.Core.Abstractions.Architectures;
 using GFramework.Core.Abstractions.Command;
-using GFramework.Core.Abstractions.Cqrs;
 using GFramework.Core.Abstractions.Environment;
 using GFramework.Core.Abstractions.Events;
 using GFramework.Core.Abstractions.Ioc;
@@ -190,7 +189,7 @@ public TResult SendQuery<TResult>(IQuery<TResult> query)
     /// <typeparam name="TResponse">查询响应类型</typeparam>
     /// <param name="query">要发送的查询对象</param>
     /// <returns>查询结果</returns>
-    public TResponse SendQuery<TResponse>(GFramework.Cqrs.Abstractions.Cqrs.Query.IQuery<TResponse> query)
+    public TResponse SendQuery<TResponse>(Cqrs.Abstractions.Cqrs.Query.IQuery<TResponse> query)
     {
         return SendQueryAsync(query).AsTask().GetAwaiter().GetResult();
     }
@@ -216,8 +215,7 @@ public async Task<TResult> SendQueryAsync<TResult>(IAsyncQuery<TResult> query)
     /// <param name="query">要发送的查询对象</param>
     /// <param name="cancellationToken">取消令牌，用于取消操作</param>
     /// <returns>包含查询结果的ValueTask</returns>
-    public async ValueTask<TResponse> SendQueryAsync<TResponse>(
-        GFramework.Cqrs.Abstractions.Cqrs.Query.IQuery<TResponse> query,
+    public async ValueTask<TResponse> SendQueryAsync<TResponse>(Cqrs.Abstractions.Cqrs.Query.IQuery<TResponse> query,
         CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(query);
@@ -354,7 +352,7 @@ public IReadOnlyList<TUtility> GetUtilitiesByPriority<TUtility>() where TUtility
     /// <param name="cancellationToken">取消令牌，用于取消操作</param>
     /// <returns>包含命令执行结果的ValueTask</returns>
     public async ValueTask<TResponse> SendCommandAsync<TResponse>(
-        GFramework.Cqrs.Abstractions.Cqrs.Command.ICommand<TResponse> command,
+        Cqrs.Abstractions.Cqrs.Command.ICommand<TResponse> command,
         CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(command);
@@ -393,7 +391,7 @@ public async Task<TResult> SendCommandAsync<TResult>(IAsyncCommand<TResult> comm
     /// <typeparam name="TResponse">命令响应类型</typeparam>
     /// <param name="command">要发送的命令对象</param>
     /// <returns>命令执行结果</returns>
-    public TResponse SendCommand<TResponse>(GFramework.Cqrs.Abstractions.Cqrs.Command.ICommand<TResponse> command)
+    public TResponse SendCommand<TResponse>(Cqrs.Abstractions.Cqrs.Command.ICommand<TResponse> command)
     {
         return SendCommandAsync(command).AsTask().GetAwaiter().GetResult();
     }

GFramework.Core/Ioc/MicrosoftDiContainer.cs

@@ -4,8 +4,8 @@
 using GFramework.Core.Abstractions.Ioc;
 using GFramework.Core.Abstractions.Logging;
 using GFramework.Core.Abstractions.Systems;
-using GFramework.Core.Logging;
 using GFramework.Core.Rule;
+using GFramework.Cqrs;
 using GFramework.Cqrs.Abstractions.Cqrs;
 
 namespace GFramework.Core.Ioc;
@@ -57,12 +57,6 @@ private void ThrowIfFrozen()
     /// </summary>
     private readonly HashSet<object> _registeredInstances = [];
 
-    /// <summary>
-    /// 已接入 CQRS handler 注册流程的程序集键集合。
-    /// 使用稳定字符串键而不是 Assembly 引用本身，以避免默认路径和显式扩展路径使用不同 Assembly 对象时重复注册。
-    /// </summary>
-    private readonly HashSet<string> _registeredCqrsHandlerAssemblyKeys = new(StringComparer.Ordinal);
-
     /// <summary>
     /// 日志记录器，用于记录容器操作日志
     /// </summary>
@@ -406,26 +400,7 @@ public void RegisterCqrsHandlersFromAssemblies(IEnumerable<Assembly> assemblies)
         try
         {
             ThrowIfFrozen();
-
-            var processedAssemblyKeys = new HashSet<string>(StringComparer.Ordinal);
-            foreach (var assembly in assemblies
-                         .Where(static assembly => assembly is not null)
-                         .OrderBy(GetCqrsAssemblyRegistrationKey, StringComparer.Ordinal))
-            {
-                var assemblyKey = GetCqrsAssemblyRegistrationKey(assembly);
-                if (!processedAssemblyKeys.Add(assemblyKey))
-                    continue;
-
-                if (_registeredCqrsHandlerAssemblyKeys.Contains(assemblyKey))
-                {
-                    _logger.Debug(
-                        $"Skipping CQRS handler registration for assembly {assemblyKey} because it was already registered.");
-                    continue;
-                }
-
-                ResolveCqrsHandlerRegistrar().RegisterHandlers([assembly]);
-                _registeredCqrsHandlerAssemblyKeys.Add(assemblyKey);
-            }
+            ResolveCqrsRegistrationService().RegisterHandlers(assemblies);
         }
         finally
         {
@@ -456,22 +431,22 @@ public void ExecuteServicesHook(Action<IServiceCollection>? configurator = null)
     #region Get
 
     /// <summary>
-    ///     获取当前容器中已注册的 CQRS 处理器注册器。
+    ///     获取当前容器中已注册的 CQRS 程序集注册协调器。
     ///     该方法仅供容器内部在注册阶段使用，因此直接读取服务描述符中的实例绑定，
     ///     避免在容器未冻结前依赖完整的服务提供者构建流程。
     /// </summary>
-    /// <returns>已注册的 CQRS 处理器注册器实例。</returns>
-    /// <exception cref="InvalidOperationException">未找到可用的 CQRS 处理器注册器实例时抛出。</exception>
-    private ICqrsHandlerRegistrar ResolveCqrsHandlerRegistrar()
+    /// <returns>已注册的 CQRS 程序集注册协调器实例。</returns>
+    /// <exception cref="InvalidOperationException">未找到可用的 CQRS 程序集注册协调器实例时抛出。</exception>
+    private ICqrsRegistrationService ResolveCqrsRegistrationService()
     {
         var descriptor = GetServicesUnsafe.LastOrDefault(static service =>
-            service.ServiceType == typeof(ICqrsHandlerRegistrar));
+            service.ServiceType == typeof(ICqrsRegistrationService));
 
-        if (descriptor?.ImplementationInstance is ICqrsHandlerRegistrar registrar)
-            return registrar;
+        if (descriptor?.ImplementationInstance is ICqrsRegistrationService registrationService)
+            return registrationService;
 
         const string errorMessage =
-            "ICqrsHandlerRegistrar not registered. Ensure the CQRS runtime module has been installed before registering handlers.";
+            "ICqrsRegistrationService not registered. Ensure the CQRS runtime module has been installed before registering handlers.";
         _logger.Error(errorMessage);
         throw new InvalidOperationException(errorMessage);
     }
@@ -624,11 +599,14 @@ public IReadOnlyList<T> GetAll<T>() where T : class
                     .Where(s => s.ServiceType == serviceType || serviceType.IsAssignableFrom(s.ServiceType)).ToList();
 
                 var result = new List<T>();
+                var seenInstances = new HashSet<object>(ReferenceEqualityComparer.Instance);
                 foreach (var descriptor in registeredServices)
                 {
                     if (descriptor.ImplementationInstance is T instance)
                     {
-                        result.Add(instance);
+                        // 同一实例可能同时以“正式接口 + 兼容别名接口”被注册；未冻结路径需去重以保持与冻结后的解析口径一致。
+                        if (seenInstances.Add(instance))
+                            result.Add(instance);
                     }
                     else if (descriptor.ImplementationFactory != null)
                     {
@@ -672,11 +650,14 @@ public IReadOnlyList<object> GetAll(Type type)
                     .ToList();
 
                 var result = new List<object>();
+                var seenInstances = new HashSet<object>(ReferenceEqualityComparer.Instance);
                 foreach (var descriptor in registeredServices)
                 {
                     if (descriptor.ImplementationInstance != null)
                     {
-                        result.Add(descriptor.ImplementationInstance);
+                        // 同一实例可能通过多个可赋值服务类型暴露；返回前按引用去重，避免兼容别名造成重复观察结果。
+                        if (seenInstances.Add(descriptor.ImplementationInstance))
+                            result.Add(descriptor.ImplementationInstance);
                     }
                     else if (descriptor.ImplementationFactory != null)
                     {
@@ -827,7 +808,6 @@ public void Clear()
 
             GetServicesUnsafe.Clear();
             _registeredInstances.Clear();
-            _registeredCqrsHandlerAssemblyKeys.Clear();
             _provider = null;
             _logger.Info("Container cleared");
         }
@@ -899,16 +879,5 @@ public IServiceScope CreateScope()
         }
     }
 
-    /// <summary>
-    ///     生成 CQRS handler 注册用的稳定程序集键。
-    ///     该键需要同时兼顾真实程序集与测试中使用的 mocked Assembly，避免仅靠引用比较导致重复接入。
-    /// </summary>
-    /// <param name="assembly">目标程序集。</param>
-    /// <returns>稳定的程序集标识字符串。</returns>
-    private static string GetCqrsAssemblyRegistrationKey(Assembly assembly)
-    {
-        return assembly.FullName ?? assembly.GetName().Name ?? assembly.ToString();
-    }
-
     #endregion
 }

GFramework.Core/Services/Modules/CqrsRuntimeModule.cs

@@ -1,9 +1,9 @@
 using GFramework.Core.Abstractions.Architectures;
-using GFramework.Core.Abstractions.Cqrs;
 using GFramework.Core.Abstractions.Ioc;
 using GFramework.Core.Abstractions.Logging;
 using GFramework.Cqrs;
 using GFramework.Cqrs.Abstractions.Cqrs;
+using LegacyICqrsRuntime = GFramework.Core.Abstractions.Cqrs.ICqrsRuntime;
 
 namespace GFramework.Core.Services.Modules;
 
@@ -39,10 +39,15 @@ public void Register(IIocContainer container)
 
         var dispatcherLogger = LoggerFactoryResolver.Provider.CreateLogger("CqrsDispatcher");
         var registrarLogger = LoggerFactoryResolver.Provider.CreateLogger("DefaultCqrsHandlerRegistrar");
+        var registrationLogger = LoggerFactoryResolver.Provider.CreateLogger("DefaultCqrsRegistrationService");
+        var runtime = CqrsRuntimeFactory.CreateRuntime(container, dispatcherLogger);
+        var registrar = CqrsRuntimeFactory.CreateHandlerRegistrar(container, registrarLogger);
 
-        container.Register<ICqrsRuntime>(CqrsRuntimeFactory.CreateRuntime(container, dispatcherLogger));
-        container.Register<ICqrsHandlerRegistrar>(
-            CqrsRuntimeFactory.CreateHandlerRegistrar(container, registrarLogger));
+        container.Register(runtime);
+        container.Register<LegacyICqrsRuntime>((LegacyICqrsRuntime)runtime);
+        container.Register<ICqrsHandlerRegistrar>(registrar);
+        container.Register<ICqrsRegistrationService>(
+            CqrsRuntimeFactory.CreateRegistrationService(registrar, registrationLogger));
     }
 
     /// <summary>

GFramework.Cqrs.Abstractions/Cqrs/ICqrsContext.cs

@@ -0,0 +1,13 @@
+namespace GFramework.Cqrs.Abstractions.Cqrs;
+
+/// <summary>
+///     定义 CQRS runtime 在分发期间携带的最小上下文标记。
+/// </summary>
+/// <remarks>
+///     该接口当前刻意保持为轻量 marker seam，只用于让 <see cref="ICqrsRuntime" /> 从
+///     <c>GFramework.Core.Abstractions</c> 的 <c>IArchitectureContext</c> 解耦。
+///     运行时实现仍可在需要时识别更具体的上下文类型，并对现有 <c>IContextAware</c> 处理器执行兼容注入。
+/// </remarks>
+public interface ICqrsContext
+{
+}

GFramework.Cqrs.Abstractions/Cqrs/ICqrsRuntime.cs

@@ -0,0 +1,49 @@
+namespace GFramework.Cqrs.Abstractions.Cqrs;
+
+/// <summary>
+///     定义架构上下文使用的 CQRS runtime seam。
+///     该抽象把请求分发、通知发布与流式处理从具体实现中解耦，
+///     使 CQRS runtime 契约可独立归属到 <c>GFramework.Cqrs.Abstractions</c>。
+/// </summary>
+public interface ICqrsRuntime
+{
+    /// <summary>
+    ///     发送请求并返回响应。
+    /// </summary>
+    /// <typeparam name="TResponse">响应类型。</typeparam>
+    /// <param name="context">当前 CQRS 分发上下文。</param>
+    /// <param name="request">要分发的请求。</param>
+    /// <param name="cancellationToken">取消令牌。</param>
+    /// <returns>请求响应。</returns>
+    ValueTask<TResponse> SendAsync<TResponse>(
+        ICqrsContext context,
+        IRequest<TResponse> request,
+        CancellationToken cancellationToken = default);
+
+    /// <summary>
+    ///     发布通知到所有已注册处理器。
+    /// </summary>
+    /// <typeparam name="TNotification">通知类型。</typeparam>
+    /// <param name="context">当前 CQRS 分发上下文。</param>
+    /// <param name="notification">要发布的通知。</param>
+    /// <param name="cancellationToken">取消令牌。</param>
+    /// <returns>表示通知分发完成的值任务。</returns>
+    ValueTask PublishAsync<TNotification>(
+        ICqrsContext context,
+        TNotification notification,
+        CancellationToken cancellationToken = default)
+        where TNotification : INotification;
+
+    /// <summary>
+    ///     创建流式请求的异步响应序列。
+    /// </summary>
+    /// <typeparam name="TResponse">流元素类型。</typeparam>
+    /// <param name="context">当前 CQRS 分发上下文。</param>
+    /// <param name="request">流式请求。</param>
+    /// <param name="cancellationToken">取消令牌。</param>
+    /// <returns>按需生成的异步响应序列。</returns>
+    IAsyncEnumerable<TResponse> CreateStream<TResponse>(
+        ICqrsContext context,
+        IStreamRequest<TResponse> request,
+        CancellationToken cancellationToken = default);
+}