Cleanup AI Profile and remove Connection Name (#392)

Author: MikeAlhayek

.github/copilot-instructions.md

@@ -285,6 +285,9 @@ If CloudSmith is inaccessible, only asset builds and code analysis are possible.
 - **Database IDs**: Use `IdGenerator.GenerateId()` when creating database IDs manually. Generated IDs are always 26 characters long.
 - **Date/time**: Never use `DateTime.UtcNow`. Always inject `IClock` in the constructor (e.g., `IClock clock`) and store it as `private readonly IClock _clock = clock;`, then call `_clock.UtcNow` in methods
 - **Localization extraction**: When using `ILocalizer`, the property/variable must be named `S`, and localized strings must use the literal pattern `S["This is a localized string"]`. Do not use variables inside the brackets because extraction tooling looks specifically for `S["..."]`.
+- **Settings UI casing**: Use sentence case for settings labels, hints, and warning headings. Keep placement tab/card/column names and admin menu labels in title case.
+- **Catalog entry handlers**: When a feature must react to create, update, or delete operations for catalog-backed models, prefer `CatalogEntryHandlerBase<T>` registered as `ICatalogEntryHandler<T>` and route write operations through the matching catalog manager so the handler events actually run. Do not rely on raw store writes alone when handler lifecycle behavior is required.
+- **Deferred third-party work**: When a catalog handler must call indexing systems, external APIs, or other third-party/background-style services, follow the deferred task pattern used by `ChatInteractionHandler` and `AIMemoryEntryHandler`: capture the affected models/IDs in the scoped handler and schedule the work with `ShellScope.AddDeferredTask(...)` so the external work runs later instead of inline during the catalog event.
 - **One type per file**: Every public type must live in its own file. The file name must always match the type name (e.g., `MyService.cs` for `class MyService`)
 - **Global usings**: Do not add `GlobalUsings.cs` files or new global using directives; prefer explicit file-level usings
 - **sealed classes**: Seal all classes by default (`sealed class`), **except** ViewModel classes that are consumed by any Orchard Core display driver — those must remain unsealed because the framework creates runtime proxies for them and proxies cannot be created from sealed types

Directory.Packages.props

@@ -7,8 +7,8 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- Miscellaneous Packages -->
-    <PackageVersion Include="CrestApps.AgentSkills.OrchardCore" Version="1.0.0-preview-0002" />
-    <PackageVersion Include="CrestApps.AgentSkills.Mcp.OrchardCore" Version="1.0.0-preview-0002" />
+    <PackageVersion Include="CrestApps.AgentSkills.OrchardCore" Version="1.0.0-preview-0003" />
+    <PackageVersion Include="CrestApps.AgentSkills.Mcp.OrchardCore" Version="1.0.0-preview-0003" />
     <PackageVersion Include="DocumentFormat.OpenXml" Version="3.4.1" />
     <PackageVersion Include="Fluid.Core" Version="2.31.0" />
     <PackageVersion Include="FluentFTP" Version="53.0.2" />

src/Abstractions/CrestApps.OrchardCore.AI.Abstractions/Models/AIProfile.cs

@@ -30,8 +30,10 @@ public sealed class AIProfile : SourceCatalogEntry, INameAwareModel, IDisplayTex
     public string Description { get; set; }
 
     /// <summary>
-    /// Gets or sets the connection name to use for this profile.
+    /// Gets or sets the legacy connection name for the profile.
+    /// Retained for backward compatibility with older stored profiles.
     /// </summary>
+    [Obsolete("Use ChatDeploymentId and UtilityDeploymentId. The selected deployment determines the connection.")]
     public string ConnectionName { get; set; }
 
     /// <summary>
@@ -106,6 +108,13 @@ private string _deploymentIdBackingField
     /// </summary>
     public JsonObject Settings { get; init; } = [];
 
+    public string GetLegacyConnectionName()
+    {
+#pragma warning disable CS0618 // Type or member is obsolete
+        return ConnectionName;
+#pragma warning restore CS0618 // Type or member is obsolete
+    }
+
     /// <summary>
     /// Creates a deep copy of the current profile.
     /// </summary>
@@ -121,7 +130,9 @@ public AIProfile Clone()
             Type = Type,
             Description = Description,
             OrchestratorName = OrchestratorName,
+#pragma warning disable CS0618 // Type or member is obsolete
             ConnectionName = ConnectionName,
+#pragma warning restore CS0618 // Type or member is obsolete
             ChatDeploymentId = ChatDeploymentId,
             UtilityDeploymentId = UtilityDeploymentId,
             TitleType = TitleType,

src/Abstractions/CrestApps.OrchardCore.AI.Abstractions/Models/AIProviderConnection.cs

@@ -42,6 +42,34 @@ public string ProviderName
 
     public string OwnerId { get; set; }
 
+    public string GetLegacyChatDeploymentName()
+    {
+#pragma warning disable CS0618 // Type or member is obsolete
+        return ChatDeploymentName;
+#pragma warning restore CS0618 // Type or member is obsolete
+    }
+
+    public string GetLegacyEmbeddingDeploymentName()
+    {
+#pragma warning disable CS0618 // Type or member is obsolete
+        return EmbeddingDeploymentName;
+#pragma warning restore CS0618 // Type or member is obsolete
+    }
+
+    public string GetLegacyImageDeploymentName()
+    {
+#pragma warning disable CS0618 // Type or member is obsolete
+        return ImagesDeploymentName;
+#pragma warning restore CS0618 // Type or member is obsolete
+    }
+
+    public string GetLegacyUtilityDeploymentName()
+    {
+#pragma warning disable CS0618 // Type or member is obsolete
+        return UtilityDeploymentName;
+#pragma warning restore CS0618 // Type or member is obsolete
+    }
+
     public AIProviderConnection Clone()
     {
         return new AIProviderConnection

src/Abstractions/CrestApps.OrchardCore.AI.Abstractions/Models/ProfileTemplateMetadata.cs

@@ -13,10 +13,22 @@ public sealed class ProfileTemplateMetadata
     public AIProfileType? ProfileType { get; set; }
 
     /// <summary>
-    /// Gets or sets the connection name to pre-fill.
+    /// Gets or sets the legacy connection name used by older templates.
+    /// Retained for backward compatibility with existing template metadata.
     /// </summary>
+    [Obsolete("Use ChatDeploymentId and UtilityDeploymentId. The selected deployment determines the connection.")]
     public string ConnectionName { get; set; }
 
+    /// <summary>
+    /// Gets or sets the chat deployment identifier to pre-fill.
+    /// </summary>
+    public string ChatDeploymentId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the utility deployment identifier to pre-fill.
+    /// </summary>
+    public string UtilityDeploymentId { get; set; }
+
     /// <summary>
     /// Gets or sets the name of the orchestrator to use.
     /// </summary>

src/Core/CrestApps.OrchardCore.AI.Core/Handlers/AIDeploymentProfileHandler.cs

@@ -46,13 +46,6 @@ private static Task PopulateAsync(AIProfile profile, JsonNode data)
             profile.ChatDeploymentId = deploymentId;
         }
 
-        var connectionName = data[nameof(AIProfile.ConnectionName)]?.GetValue<string>()?.Trim();
-
-        if (!string.IsNullOrEmpty(connectionName))
-        {
-            profile.ConnectionName = connectionName;
-        }
-
         return Task.CompletedTask;
     }
 }

src/Core/CrestApps.OrchardCore.AI.Core/Handlers/AIProfileHandler.cs

@@ -157,13 +157,6 @@ private static Task PopulateAsync(AIProfile profile, JsonNode data, bool isNew)
             profile.ChatDeploymentId = deploymentId;
         }
 
-        var connectionName = data[nameof(AIProfile.ConnectionName)]?.GetValue<string>()?.Trim();
-
-        if (!string.IsNullOrEmpty(connectionName))
-        {
-            profile.ConnectionName = connectionName;
-        }
-
         var welcomeMessage = data[nameof(AIProfile.WelcomeMessage)]?.GetValue<string>()?.Trim();
 
         if (!string.IsNullOrEmpty(welcomeMessage))

src/Core/CrestApps.OrchardCore.AI.Core/Indexes/AIProfileIndex.cs

@@ -28,11 +28,6 @@ public sealed class AIProfileIndex : CatalogItemIndex, INameAwareIndex, ISourceA
     /// </summary>
     public string Description { get; set; }
 
-    /// <summary>
-    /// Gets or sets the connection name associated with the profile.
-    /// </summary>
-    public string ConnectionName { get; set; }
-
     /// <summary>
     /// Gets or sets the deployment identifier associated with the profile.
     /// </summary>

src/Core/CrestApps.OrchardCore.AI.Core/Services/DataExtractionService.cs

@@ -13,6 +13,7 @@ namespace CrestApps.OrchardCore.AI.Core.Services;
 public sealed class DataExtractionService
 {
     private readonly IAIClientFactory _clientFactory;
+    private readonly IAIDeploymentManager _deploymentManager;
     private readonly IAITemplateService _aiTemplateService;
     private readonly IClock _clock;
     private readonly AIProviderOptions _providerOptions;
@@ -23,9 +24,11 @@ public DataExtractionService(
         IAITemplateService aiTemplateService,
         IOptions<AIProviderOptions> providerOptions,
         IClock clock,
-        ILogger<DataExtractionService> logger)
+        ILogger<DataExtractionService> logger,
+        IAIDeploymentManager deploymentManager = null)
     {
         _clientFactory = clientFactory;
+        _deploymentManager = deploymentManager;
         _aiTemplateService = aiTemplateService;
         _clock = clock;
         _providerOptions = providerOptions.Value;
@@ -253,14 +256,29 @@ private ExtractionChangeSet ApplyExtraction(
 
     private async Task<IChatClient> GetChatClientAsync(AIProfile profile)
     {
+        if (_deploymentManager != null)
+        {
+            var deployment = await _deploymentManager.ResolveAsync(
+                AIDeploymentType.Utility,
+                deploymentId: profile.UtilityDeploymentId,
+                providerName: profile.Source)
+                ?? await _deploymentManager.ResolveAsync(
+                    AIDeploymentType.Chat,
+                    deploymentId: profile.ChatDeploymentId,
+                    providerName: profile.Source);
+
+            if (deployment != null && !string.IsNullOrEmpty(deployment.ConnectionName) && !string.IsNullOrEmpty(deployment.Name))
+            {
+                return await _clientFactory.CreateChatClientAsync(profile.Source, deployment.ConnectionName, deployment.Name);
+            }
+        }
+
         if (!_providerOptions.Providers.TryGetValue(profile.Source, out var provider))
         {
             return null;
         }
 
-        var connectionName = !string.IsNullOrEmpty(profile.ConnectionName)
-            ? profile.ConnectionName
-            : provider.DefaultConnectionName;
+        var connectionName = provider.DefaultConnectionName;
 
         if (string.IsNullOrEmpty(connectionName) || !provider.Connections.TryGetValue(connectionName, out var connection))
         {

src/Core/CrestApps.OrchardCore.AI.Core/Services/PostSessionProcessingService.cs

@@ -19,6 +19,7 @@ namespace CrestApps.OrchardCore.AI.Core.Services;
 public sealed class PostSessionProcessingService
 {
     private readonly IAIClientFactory _clientFactory;
+    private readonly IAIDeploymentManager _deploymentManager;
     private readonly IAIToolsService _toolsService;
     private readonly IAITemplateService _aiTemplateService;
     private readonly IServiceProvider _serviceProvider;
@@ -36,9 +37,11 @@ public PostSessionProcessingService(
         DefaultAIOptions defaultOptions,
         IServiceProvider serviceProvider,
         IClock clock,
-        ILoggerFactory loggerFactory)
+        ILoggerFactory loggerFactory,
+        IAIDeploymentManager deploymentManager = null)
     {
         _clientFactory = clientFactory;
+        _deploymentManager = deploymentManager;
         _toolsService = toolsService;
         _aiTemplateService = aiTemplateService;
         _serviceProvider = serviceProvider;
@@ -792,14 +795,29 @@ private Dictionary<string, PostSessionResult> ApplyResults(
 
     private async Task<IChatClient> GetChatClientAsync(AIProfile profile)
     {
+        if (_deploymentManager != null)
+        {
+            var deployment = await _deploymentManager.ResolveAsync(
+                AIDeploymentType.Utility,
+                deploymentId: profile.UtilityDeploymentId,
+                providerName: profile.Source)
+                ?? await _deploymentManager.ResolveAsync(
+                    AIDeploymentType.Chat,
+                    deploymentId: profile.ChatDeploymentId,
+                    providerName: profile.Source);
+
+            if (deployment != null && !string.IsNullOrEmpty(deployment.ConnectionName) && !string.IsNullOrEmpty(deployment.Name))
+            {
+                return await _clientFactory.CreateChatClientAsync(profile.Source, deployment.ConnectionName, deployment.Name);
+            }
+        }
+
         if (!_providerOptions.Providers.TryGetValue(profile.Source, out var provider))
         {
             return null;
         }
 
-        var connectionName = !string.IsNullOrEmpty(profile.ConnectionName)
-            ? profile.ConnectionName
-            : provider.DefaultConnectionName;
+        var connectionName = provider.DefaultConnectionName;
 
         if (string.IsNullOrEmpty(connectionName) || !provider.Connections.TryGetValue(connectionName, out var connection))
         {