Replace string-based root dispatch with typed ExecuteFromProfile

AssemblyAnalyzer/GlobalUsings.cs

@@ -0,0 +1 @@
+global using ExecutionContext = XrmSync.Model.ExecutionContext;

AssemblyAnalyzer/Reader/LocalReader.cs

@@ -7,7 +7,7 @@
 
 namespace XrmSync.Analyzer.Reader;
 
-internal class LocalReader(ILogger<LocalReader> logger, IOptions<SharedOptions> sharedOptions) : ILocalReader
+internal class LocalReader(ILogger<LocalReader> logger, IOptions<ExecutionContext> sharedOptions) : ILocalReader
 {
 	private readonly Dictionary<string, AssemblyInfo> assemblyCache = [];
 

CHANGELOG.md

@@ -1,3 +1,6 @@
+### v1.0.0-preview.19 - 24 April 2026
+* Refactor / Fix: Complete rewrite of the option passing logic
+
 ### v1.0.0-preview.18 - 22 April 2026
 * Fix: Handling of passing boolean arguments through from CLI to final command
 * Refactor: Only print the header and Dataverse connection once during execution

Dataverse/CustomApiWriter.cs

@@ -5,6 +5,7 @@
 using XrmSync.Dataverse.Interfaces;
 using XrmSync.Model;
 using XrmSync.Model.CustomApi;
+using XrmSync.Model.Plugin;
 
 namespace XrmSync.Dataverse;
 

Dataverse/DataverseWriter.cs

@@ -14,9 +14,9 @@ internal sealed class DataverseWriter : IDataverseWriter
 	private readonly IOrganizationService service;
 	private readonly ILogger<DataverseWriter> logger;
 
-	public DataverseWriter(IOrganizationServiceProvider serviceProvider, ILogger<DataverseWriter> logger, IOptions<ExecutionModeOptions> configuration)
+	public DataverseWriter(IOrganizationServiceProvider serviceProvider, ILogger<DataverseWriter> logger, IOptions<ExecutionContext> configuration)
 	{
-		if (configuration.Value.DryRun)
+		if (configuration.Value.DryRun == true)
 		{
 			throw new XrmSyncException("Cannot perform write operations in dry run mode. Please disable dry run to proceed with writing to Dataverse.");
 		}

Dataverse/DryRunDataverseWriter.cs

@@ -14,9 +14,9 @@ internal class DryRunDataverseWriter : IDataverseWriter
 {
 	private readonly ILogger<DryRunDataverseWriter> logger;
 
-	public DryRunDataverseWriter(IOptions<ExecutionModeOptions> configuration, ILogger<DryRunDataverseWriter> logger)
+	public DryRunDataverseWriter(IOptions<ExecutionContext> configuration, ILogger<DryRunDataverseWriter> logger)
 	{
-		if (!configuration.Value.DryRun)
+		if (configuration.Value.DryRun != true)
 		{
 			throw new XrmSyncException("This writer is intended for dry runs only.");
 		}

Dataverse/Extensions/ServiceCollectionExtensions.cs

@@ -2,7 +2,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using XrmSync.Dataverse.Interfaces;
-using XrmSync.Model;
 
 namespace XrmSync.Dataverse.Extensions;
 
@@ -17,9 +16,9 @@ public static IServiceCollection AddDataverseServices(this IServiceCollection se
 		services.AddSingleton<IDataverseReader, DataverseReader>();
 		services.AddSingleton<IDataverseWriter>((sp) =>
 		{
-			var options = sp.GetRequiredService<IOptions<ExecutionModeOptions>>();
+			var options = sp.GetRequiredService<IOptions<ExecutionContext>>();
 
-			return options.Value.DryRun
+			return options.Value.DryRun == true
 				? ActivatorUtilities.CreateInstance<DryRunDataverseWriter>(sp)
 				: ActivatorUtilities.CreateInstance<DataverseWriter>(sp);
 		});

Dataverse/GlobalUsings.cs

@@ -0,0 +1 @@
+global using ExecutionContext = XrmSync.Model.ExecutionContext;

Dataverse/PluginAssemblyWriter.cs

@@ -3,6 +3,7 @@
 using XrmSync.Dataverse.Interfaces;
 using XrmSync.Model;
 using XrmSync.Model.Exceptions;
+using XrmSync.Model.Plugin;
 
 namespace XrmSync.Dataverse;
 

Model/ExecutionContext.cs

@@ -0,0 +1,17 @@
+using Microsoft.Extensions.Logging;
+
+namespace XrmSync.Model;
+
+/// <summary>
+/// Carries execution parameters resolved from configuration and CLI overrides.
+/// Used as the single DI-registered context replacing both SharedOptions and ExecutionModeOptions.
+/// </summary>
+public record ExecutionContext(
+	string? SolutionName,
+	bool? DryRun,
+	bool? CiMode,
+	LogLevel? LogLevel,
+	string? ProfileName)
+{
+	public static ExecutionContext Empty => new(null, null, null, null, null);
+}

Model/Identity/IdentityCommandOptions.cs

@@ -0,0 +1,7 @@
+namespace XrmSync.Model.Identity;
+
+public record IdentityCommandOptions(IdentityOperation Operation, string AssemblyPath, string SolutionName, string ClientId, string TenantId)
+{
+	public static IdentityCommandOptions Empty => new(IdentityOperation.Remove, string.Empty, string.Empty, string.Empty, string.Empty);
+}
+

Model/Plugin/PluginAnalysisCommandOptions.cs

@@ -0,0 +1,7 @@
+namespace XrmSync.Model.Plugin;
+
+public record PluginAnalysisCommandOptions(string AssemblyPath, string PublisherPrefix, bool PrettyPrint)
+{
+	public static PluginAnalysisCommandOptions Empty => new(string.Empty, "new", false);
+}
+

Model/Plugin/PluginSyncCommandOptions.cs

@@ -0,0 +1,8 @@
+namespace XrmSync.Model.Plugin;
+
+// Command-specific options that can be populated from CLI or profile
+public record PluginSyncCommandOptions(string AssemblyPath, string SolutionName)
+{
+	public static PluginSyncCommandOptions Empty => new(string.Empty, string.Empty);
+}
+

Model/Webresource/WebresourceSyncCommandOptions.cs

@@ -0,0 +1,7 @@
+namespace XrmSync.Model.Webresource;
+
+public record WebresourceSyncCommandOptions(string FolderPath, string SolutionName, List<string>? FileExtensions = null)
+{
+	public static WebresourceSyncCommandOptions Empty => new(string.Empty, string.Empty);
+}
+

Model/XrmSyncOptions.cs

@@ -92,34 +92,13 @@ public record WebresourceSyncItem(string FolderPath, List<string>? FileExtension
 	public override string SyncType => TypeName;
 }
 
-public record SharedOptions(string? ProfileName)
-{
-	public static SharedOptions Empty => new((string?)null);
-}
-
-// Command-specific options that can be populated from CLI or profile
-public record PluginSyncCommandOptions(string AssemblyPath, string SolutionName)
-{
-	public static PluginSyncCommandOptions Empty => new(string.Empty, string.Empty);
-}
-
-public record PluginAnalysisCommandOptions(string AssemblyPath, string PublisherPrefix, bool PrettyPrint)
-{
-	public static PluginAnalysisCommandOptions Empty => new(string.Empty, "new", false);
-}
-
-public record WebresourceSyncCommandOptions(string FolderPath, string SolutionName, List<string>? FileExtensions = null)
-{
-	public static WebresourceSyncCommandOptions Empty => new(string.Empty, string.Empty);
-}
-
 public enum IdentityOperation
 {
 	Remove,
 	Ensure
 }
 
-public record IdentitySyncItem(IdentityOperation? Operation = null, string AssemblyPath = "", string? ClientId = null, string? TenantId = null) : SyncItem
+public record IdentitySyncItem(IdentityOperation? Operation = null, string AssemblyPath = "", string ClientId = "", string TenantId = "") : SyncItem
 {
 	public const string TypeName = "Identity";
 	public static IdentitySyncItem Empty => new(AssemblyPath: string.Empty);
@@ -128,12 +107,3 @@ public record IdentitySyncItem(IdentityOperation? Operation = null, string Assem
 	public override string SyncType => Operation.HasValue ? $"{TypeName} ({Operation})" : TypeName;
 }
 
-public record IdentityCommandOptions(IdentityOperation Operation, string AssemblyPath, string SolutionName, string? ClientId = null, string? TenantId = null)
-{
-	public static IdentityCommandOptions Empty => new(IdentityOperation.Remove, string.Empty, string.Empty);
-}
-
-public record ExecutionModeOptions(bool DryRun)
-{
-	public static ExecutionModeOptions Empty => new(false);
-}

SyncService/Difference/PrintService.cs

@@ -8,10 +8,10 @@ namespace XrmSync.SyncService.Difference;
 
 internal class PrintService(
 	ILogger<PrintService> log,
-	IOptions<ExecutionModeOptions> configuration
+	IOptions<ExecutionContext> configuration
 	) : IPrintService
 {
-	private readonly LogLevel LogLevel = configuration.Value.DryRun ? LogLevel.Information : LogLevel.Debug;
+	private readonly LogLevel LogLevel = configuration.Value.DryRun == true ? LogLevel.Information : LogLevel.Debug;
 
 	public void Print<TEntity>(Difference<TEntity> differences, string title, Func<TEntity, string> namePicker)
 		where TEntity : EntityBase

SyncService/GlobalUsings.cs

@@ -0,0 +1 @@
+global using ExecutionContext = XrmSync.Model.ExecutionContext;

SyncService/IdentitySyncService.cs

@@ -3,7 +3,7 @@
 using XrmSync.Dataverse.Interfaces;
 using XrmSync.Model;
 using XrmSync.Model.Exceptions;
-using XrmSync.SyncService.Difference;
+using XrmSync.Model.Identity;
 
 namespace XrmSync.SyncService;
 

SyncService/WebresourceSyncService.cs

@@ -2,10 +2,8 @@
 using Microsoft.Extensions.Options;
 using XrmSync.Analyzer.Reader;
 using XrmSync.Dataverse.Interfaces;
-using XrmSync.Model;
 using XrmSync.Model.Exceptions;
 using XrmSync.Model.Webresource;
-using XrmSync.SyncService.Difference;
 using XrmSync.SyncService.Exceptions;
 using XrmSync.SyncService.Validation;
 

Tests.Integration/GlobalUsings.cs

@@ -0,0 +1 @@
+global using ExecutionContext = XrmSync.Model.ExecutionContext;

Tests.Integration/Infrastructure/TestBase.cs

@@ -6,7 +6,8 @@
 using NSubstitute;
 using XrmSync.Dataverse.Extensions;
 using XrmSync.Dataverse.Interfaces;
-using XrmSync.Model;
+using XrmSync.Model.Plugin;
+using XrmSync.Model.Webresource;
 
 namespace Tests.Integration.Infrastructure;
 
@@ -70,7 +71,7 @@ private IServiceCollection BuildBaseServices()
 		services.AddSingleton(ServiceProvider);
 
 		// Configure execution options (not dry run for tests)
-		services.AddSingleton(Options.Create(new ExecutionModeOptions(DryRun: false)));
+		services.AddSingleton(Options.Create(new ExecutionContext(null, false, null, null, null)));
 
 		// Reuse all reader/writer registrations from production code
 		services.AddDataverseServices();

Tests/Config/ConfigValidateCommandTests.cs

@@ -70,7 +70,7 @@ public async Task ConfigValidationOutputWithValidConfigurationOutputsSuccessfull
 		{
 			var configReader = new TestConfigReader(tempFile);
 			var configuration = configReader.GetConfiguration();
-			var sharedOptions = Options.Create(SharedOptions.Empty);
+			var sharedOptions = Options.Create(ExecutionContext.Empty);
 			var builder = new XrmSyncConfigurationBuilder(configuration);
 			var config = builder.Build();
 			var configOptions = Options.Create(config);
@@ -129,7 +129,7 @@ public async Task ConfigValidationOutputWithMultipleConfigsListsAllConfiguration
 		{
 			var configReader = new TestConfigReader(tempFile);
 			var configuration = configReader.GetConfiguration();
-			var sharedOptions = Options.Create(SharedOptions.Empty);
+			var sharedOptions = Options.Create(ExecutionContext.Empty);
 			var builder = new XrmSyncConfigurationBuilder(configuration);
 			var config = builder.Build();
 			var configOptions = Options.Create(config);
@@ -162,7 +162,7 @@ public async Task ConfigValidationOutputWithNoConfigurationHandlesGracefully()
 		{
 			var configReader = new TestConfigReader(tempFile);
 			var configuration = configReader.GetConfiguration();
-			var sharedOptions = Options.Create(SharedOptions.Empty);
+			var sharedOptions = Options.Create(ExecutionContext.Empty);
 			var builder = new XrmSyncConfigurationBuilder(configuration);
 			var config = builder.Build();
 			var configOptions = Options.Create(config);
@@ -186,7 +186,7 @@ public async Task OutputAllValidationResultsWithNoProfilesHandlesGracefully()
 		var configuration = new ConfigurationBuilder().Build();
 		var config = XrmSyncConfiguration.Empty;
 		var configOptions = Options.Create(config);
-		var sharedOptions = Options.Create(SharedOptions.Empty);
+		var sharedOptions = Options.Create(ExecutionContext.Empty);
 
 		var output = new ConfigValidationOutput(configuration, configOptions, sharedOptions);
 
@@ -210,7 +210,7 @@ public async Task OutputAllValidationResultsWithSingleProfileOutputsValidationRe
 			]
 		);
 		var configOptions = Options.Create(config);
-		var sharedOptions = Options.Create(SharedOptions.Empty);
+		var sharedOptions = Options.Create(ExecutionContext.Empty);
 
 		var output = new ConfigValidationOutput(configuration, configOptions, sharedOptions);
 
@@ -235,7 +235,7 @@ public async Task OutputAllValidationResultsWithMultipleProfilesOutputsAllProfil
 			]
 		);
 		var configOptions = Options.Create(config);
-		var sharedOptions = Options.Create(SharedOptions.Empty);
+		var sharedOptions = Options.Create(ExecutionContext.Empty);
 
 		var output = new ConfigValidationOutput(configuration, configOptions, sharedOptions);
 
@@ -260,7 +260,7 @@ public async Task OutputAllValidationResultsWithInvalidProfileReportsFailure()
 			]
 		);
 		var configOptions = Options.Create(config);
-		var sharedOptions = Options.Create(SharedOptions.Empty);
+		var sharedOptions = Options.Create(ExecutionContext.Empty);
 
 		var output = new ConfigValidationOutput(configuration, configOptions, sharedOptions);
 

Tests/Config/NamedConfigurationTests.cs

@@ -366,8 +366,8 @@ public void IdentityRemoveSyncItemParsesFromConfig()
 			var identitySync = Assert.IsType<IdentitySyncItem>(profile.Sync[0]);
 			Assert.Equal(IdentityOperation.Remove, identitySync.Operation);
 			Assert.Equal("plugins.dll", identitySync.AssemblyPath);
-			Assert.Null(identitySync.ClientId);
-			Assert.Null(identitySync.TenantId);
+			Assert.Empty(identitySync.ClientId);
+			Assert.Empty(identitySync.TenantId);
 		}
 		finally
 		{

Tests/Config/OptionsValidationTests.cs

@@ -7,8 +7,8 @@ namespace Tests.Config;
 
 public class OptionsValidationTests
 {
-	private static SharedOptions CreateSharedOptions(string profileName = "default") =>
-		new SharedOptions(profileName);
+	private static ExecutionContext CreateSharedOptions(string profileName = "default") =>
+		new ExecutionContext(null, null, null, null, profileName);
 
 	[Fact]
 	public void PluginSyncValidatorValidOptionsPassesValidation()
@@ -579,7 +579,7 @@ public void IdentityEnsureValidatorMissingClientIdThrowsValidationException()
 				{
 					new("default", "TestSolution", new List<SyncItem>
 					{
-						new IdentitySyncItem(IdentityOperation.Ensure, dllPath, null, "a1b2c3d4-5e6f-7a8b-9c0d-1e2f3a4b5c6d")
+						new IdentitySyncItem(IdentityOperation.Ensure, dllPath, string.Empty, "a1b2c3d4-5e6f-7a8b-9c0d-1e2f3a4b5c6d")
 					})
 				}
 			);
@@ -618,7 +618,7 @@ public void IdentityEnsureValidatorMissingTenantIdThrowsValidationException()
 				{
 					new("default", "TestSolution", new List<SyncItem>
 					{
-						new IdentitySyncItem(IdentityOperation.Ensure, dllPath, "d3b5e6a1-2c4f-4a8b-9e1d-7f3c6b8a2e4d", null)
+						new IdentitySyncItem(IdentityOperation.Ensure, dllPath, "d3b5e6a1-2c4f-4a8b-9e1d-7f3c6b8a2e4d", string.Empty)
 					})
 				}
 			);
@@ -696,7 +696,7 @@ public void IdentityRemoveValidatorDoesNotRequireClientIdOrTenantId()
 				{
 					new("default", "TestSolution", new List<SyncItem>
 					{
-						new IdentitySyncItem(IdentityOperation.Remove, dllPath, null, null)
+						new IdentitySyncItem(IdentityOperation.Remove, dllPath, string.Empty, string.Empty)
 					})
 				}
 			);
@@ -767,7 +767,7 @@ public void ValidatorNoProfilesAndNoProfileNamePassesValidation()
 		// Act & Assert - Should not throw (CLI mode, no profile validation needed)
 		var validator = new XrmSyncConfigurationValidator(
 			Options.Create(config),
-			Options.Create(new SharedOptions(null)));
+			Options.Create(new ExecutionContext(null, null, null, null, null)));
 		validator.Validate(ConfigurationScope.PluginSync);
 	}
 

Tests/CustomApis/DifferenceCalculatorCustomApiTests.cs

@@ -20,7 +20,7 @@ public DifferenceCalculatorCustomApiTests()
 	{
 		var logger = new LoggerFactory().CreateLogger<PrintService>();
 		var description = new Description();
-		var options = new ExecutionModeOptions(true);
+		var options = new ExecutionContext(null, true, null, null, null);
 		differenceCalculator = new DifferenceCalculator(
 			new PluginDefinitionComparer(),
 			new PluginStepComparer(),

Tests/GlobalUsings.cs

@@ -0,0 +1 @@
+global using ExecutionContext = XrmSync.Model.ExecutionContext;