Fix race condition

Author: TomProkop

README.md

@@ -40,7 +40,11 @@ dotnet tool install --global TALXIS.CLI
 **Update to the latest version:**
 ```sh
 dotnet tool update --global TALXIS.CLI
+
+dotnet new update
 ```
+> [!TIP]
+> Running `dotnet new update` ensures that template packages used by the CLI are updated to their latest versions.
 
 After installation, use the CLI via the `txc` command in any terminal.
 

src/TALXIS.CLI.Workspace/ComponentCreateCliCommand.cs

@@ -1,5 +1,6 @@
 using System.CommandLine.Completions;
 using DotMake.CommandLine;
+using TALXIS.CLI.Workspace.TemplateEngine;
 namespace TALXIS.CLI.Workspace;
 
 [CliCommand(

src/TALXIS.CLI.Workspace/ComponentExplainCliCommand.cs

@@ -1,4 +1,5 @@
 using DotMake.CommandLine;
+using TALXIS.CLI.Workspace.TemplateEngine;
 
 namespace TALXIS.CLI.Workspace;
 

src/TALXIS.CLI.Workspace/ComponentListCliCommand.cs

@@ -1,4 +1,5 @@
 using DotMake.CommandLine;
+using TALXIS.CLI.Workspace.TemplateEngine;
 
 namespace TALXIS.CLI.Workspace;
 

src/TALXIS.CLI.Workspace/ComponentParameterListCliCommand.cs

@@ -1,4 +1,5 @@
 using DotMake.CommandLine;
+using TALXIS.CLI.Workspace.TemplateEngine;
 
 namespace TALXIS.CLI.Workspace;
 

src/TALXIS.CLI.Workspace/TemplateEngine/TemplateInvoker.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.TemplateEngine.Abstractions;
-namespace TALXIS.CLI.Workspace
+namespace TALXIS.CLI.Workspace.TemplateEngine
 {
     /// <summary>
     /// Template invoker that uses the new service-based architecture for template engine operations.
@@ -15,9 +15,9 @@ public class TemplateInvoker : IDisposable
         public TemplateInvoker(string? outputPath = null, LogLevel logLevel = LogLevel.Error)
         {
             // Use the factory to create the service-based architecture
-            _templateCreationService = TemplateEngine.TemplateEngineFactory.CreateTemplateCreationService(outputPath, logLevel);
-            _templateDiscoveryService = TemplateEngine.TemplateEngineFactory.CreateTemplateDiscoveryService(outputPath, logLevel);
-            _templatePackageService = TemplateEngine.TemplateEngineFactory.CreateTemplatePackageService(outputPath, logLevel);
+            _templateCreationService = TemplateEngineFactory.CreateTemplateCreationService(outputPath, logLevel);
+            _templateDiscoveryService = TemplateEngineFactory.CreateTemplateDiscoveryService(outputPath, logLevel);
+            _templatePackageService = TemplateEngineFactory.CreateTemplatePackageService(outputPath, logLevel);
         }
 
         /// <summary>
@@ -68,7 +68,9 @@ public async Task<IReadOnlyList<ITemplateParameter>> ListParametersForTemplateAs
 
         public void Dispose()
         {
-            // Services are created via factory and don't need explicit disposal
+            // Dispose of services that implement IDisposable
+            _templatePackageService?.Dispose();
+            // Note: _templateCreationService and _templateDiscoveryService don't implement IDisposable
             // The underlying template engine components handle their own cleanup
         }
     }

src/TALXIS.CLI.Workspace/TemplateEngine/TemplatePackageService.cs

@@ -9,12 +9,13 @@ namespace TALXIS.CLI.Workspace.TemplateEngine
     /// <summary>
     /// Service responsible for managing template packages (installation, listing, etc.)
     /// </summary>
-    public class TemplatePackageService
+    public class TemplatePackageService : IDisposable
     {
         private readonly TemplatePackageManager _templatePackageManager;
         private readonly IEngineEnvironmentSettings _environmentSettings;
         private readonly string _templatePackageName = "TALXIS.DevKit.Templates.Dataverse";
-        private bool _isTemplateInstalled = false;
+        private readonly SemaphoreSlim _installationSemaphore = new(1, 1);
+        private volatile bool _isTemplateInstalled = false;
         private IManagedTemplatePackage? _installedTemplatePackage;
 
         public string TemplatePackageName => _templatePackageName;
@@ -27,13 +28,35 @@ public TemplatePackageService(TemplatePackageManager templatePackageManager, IEn
 
         public async Task EnsureTemplatePackageInstalledAsync(string? version = null)
         {
+            // Double-checked locking pattern for thread safety within the same process
             if (_isTemplateInstalled && _installedTemplatePackage != null)
             {
                 return; // Already installed and we have a reference to it
             }
 
+            await _installationSemaphore.WaitAsync();
             try
             {
+                // Check again inside the lock (double-checked locking)
+                if (_isTemplateInstalled && _installedTemplatePackage != null)
+                {
+                    return; // Another thread completed the installation
+                }
+
+                // First check if the package is already installed globally (cross-process safety)
+                var existingPackages = await _templatePackageManager.GetManagedTemplatePackagesAsync(false, CancellationToken.None);
+                var existingPackage = existingPackages.FirstOrDefault(p => 
+                    string.Equals(p.Identifier, _templatePackageName, StringComparison.OrdinalIgnoreCase));
+                
+                if (existingPackage != null)
+                {
+                    // Package is already installed globally, just store reference
+                    _installedTemplatePackage = existingPackage;
+                    _isTemplateInstalled = true;
+                    return;
+                }
+
+                // Package not installed, proceed with installation
                 // Following the official dotnet CLI pattern: create install request with details
                 var installRequest = new InstallRequest(_templatePackageName, version, details: new Dictionary<string, string>(), force: false);
 
@@ -67,6 +90,7 @@ public async Task EnsureTemplatePackageInstalledAsync(string? version = null)
                     throw new InvalidOperationException($"Template package '{_templatePackageName}' was installed but could not be retrieved as a managed package");
                 }
 
+                // Set flag last to ensure atomic operation visibility
                 _isTemplateInstalled = true;
             }
             catch (Exception ex) when (!(ex is InvalidOperationException))
@@ -81,20 +105,31 @@ public async Task EnsureTemplatePackageInstalledAsync(string? version = null)
 
                 throw new InvalidOperationException(userErrorMessage, ex);
             }
+            finally
+            {
+                _installationSemaphore.Release();
+            }
         }
 
         public async Task<List<ITemplateInfo>> ListTemplatesAsync(string? version = null)
         {
             await EnsureTemplatePackageInstalledAsync(version);
 
-            if (_installedTemplatePackage == null)
+            // Read the installed package reference with memory barrier for thread safety
+            var installedPackage = _installedTemplatePackage;
+            if (installedPackage == null)
             {
                 throw new InvalidOperationException("Template package was installed but reference is not available");
             }
 
             // Use the official dotnet CLI pattern - get templates from the specific installed package
-            var templates = await _templatePackageManager.GetTemplatesAsync(_installedTemplatePackage, CancellationToken.None);
+            var templates = await _templatePackageManager.GetTemplatesAsync(installedPackage, CancellationToken.None);
             return templates.ToList();
         }
+
+        public void Dispose()
+        {
+            _installationSemaphore?.Dispose();
+        }
     }
 }