From 0a9c885175cfc534d840c84e79c1c93cd89a9e66 Mon Sep 17 00:00:00 2001
From: Phil Asmar <phil.asmar@gmail.com>
Date: Fri, 6 Dec 2024 20:47:35 -0500
Subject: [PATCH] feat: switch to Spectre.Console for a better CLI experience

---
 .../Amazon.Lambda.TestTool.csproj             |   3 +-
 .../src/Amazon.Lambda.TestTool/AppRunner.cs   |  15 -
 .../Commands/CommandFactory.cs                | 102 -------
 .../Commands/RunCommand.cs                    |  86 ++++++
 .../Components/Pages/Home.razor               |  17 +-
 .../Components/Pages/SaveRequestDialog.razor  |   9 +-
 .../src/Amazon.Lambda.TestTool/Constants.cs   |   1 +
 .../Extensions/ServiceCollectionExtensions.cs |   4 +-
 .../Models/ApplicationOptions.cs              |  25 --
 .../Models/EventContainer.cs                  |  11 +-
 .../Processes/TestToolProcess.cs              |  13 +-
 .../src/Amazon.Lambda.TestTool/Program.cs     |  20 +-
 .../SampleRequests/LambdaRequest.cs           |  13 +-
 .../SampleRequests/SampleRequestManager.cs    | 219 +++++++--------
 .../Services/DirectoryManager.cs              |   6 +
 .../Services/IDirectoryManager.cs             |   6 +
 .../Services/LambdaRuntimeAPI.cs              |  26 +-
 .../Services/RuntimeApiDataStore.cs           | 265 +++++++++---------
 .../Services/TypeRegistrar.cs                 |  31 ++
 .../Services/TypeResolver.cs                  |  26 ++
 .../Amazon.Lambda.TestTool/Utilities/Utils.cs |  10 +-
 .../RuntimeApiTests.cs                        |   3 +-
 22 files changed, 457 insertions(+), 454 deletions(-)
 delete mode 100644 Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/AppRunner.cs
 delete mode 100644 Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Commands/CommandFactory.cs
 create mode 100644 Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Commands/RunCommand.cs
 delete mode 100644 Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Models/ApplicationOptions.cs
 create mode 100644 Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/DirectoryManager.cs
 create mode 100644 Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/IDirectoryManager.cs
 create mode 100644 Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/TypeRegistrar.cs
 create mode 100644 Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/TypeResolver.cs

diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj
index 04c5f39a7..7afdd2e7a 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj
@@ -15,7 +15,8 @@
   </PropertyGroup>
 	
   <ItemGroup>
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    <PackageReference Include="Spectre.Console" Version="0.49.1" />
+    <PackageReference Include="Spectre.Console.Cli" Version="0.49.1" />
     <PackageReference Include="Blazored.Modal" Version="7.3.1" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.11" /> 
   </ItemGroup>	
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/AppRunner.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/AppRunner.cs
deleted file mode 100644
index 07189b99f..000000000
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/AppRunner.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.CommandLine;
-using System.Text;
-
-namespace Amazon.Lambda.TestTool;
-
-public class AppRunner(
-    ICommandFactory commandFactory)
-{
-    public async Task<int> Run(string[] args)
-    {
-        Console.OutputEncoding = Encoding.UTF8;
-
-        return await commandFactory.BuildRootCommand().InvokeAsync(args);
-    }
-}
\ No newline at end of file
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Commands/CommandFactory.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Commands/CommandFactory.cs
deleted file mode 100644
index 83622e85c..000000000
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Commands/CommandFactory.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System.CommandLine;
-using System.Diagnostics;
-using Amazon.Lambda.TestTool.Extensions;
-using Amazon.Lambda.TestTool.Models;
-using Amazon.Lambda.TestTool.Processes;
-using Amazon.Lambda.TestTool.Services;
-
-namespace Amazon.Lambda.TestTool;
-
-public interface ICommandFactory
-{
-    Command BuildRootCommand();
-}
-
-public class CommandFactory(
-    IToolInteractiveService toolInteractiveService) : ICommandFactory
-{
-    private static readonly object RootCommandLock = new();
-    
-    public Command BuildRootCommand()
-    {
-        // Name is important to set here to show correctly in the CLI usage help.
-        var rootCommand = new RootCommand
-        {
-            Name = "lambda-test-tool",
-            Description = Constants.ProductName,
-        };
-        
-        Option<string> hostOption = new("--host", () => Constants.DefaultHost, "The hostname or IP address used for the test tool's web interface. Any host other than an explicit IP address or localhost (e.g. '*', '+' or 'example.com') binds to all public IPv4 and IPv6 addresses.");
-        Option<int> portOption = new("--port", () => Constants.DefaultPort,"The port number used for the test tool's web interface.");
-        Option<bool> noLaunchWindowOption = new("--no-launch-window","Disable auto launching the test tool's web interface in a browser.");
-        Option<bool> pauseExitOption = new("--pause-exit",() => true, "If set to true the test tool will pause waiting for a key input before exiting. The is useful when executing from an IDE so you can avoid having the output window immediately disappear after executing the Lambda code. The default value is true.");
-        Option<bool> disableLogsOption = new("--disable-logs",() => false);
-
-        lock (RootCommandLock)
-        {
-            rootCommand.Add(hostOption);
-            rootCommand.Add(portOption);
-            rootCommand.Add(noLaunchWindowOption);
-            rootCommand.Add(pauseExitOption);
-            rootCommand.Add(disableLogsOption);
-        }
-        
-        rootCommand.SetHandler(async (context) =>
-        {
-            try
-            {
-                var lambdaOptions = new ApplicationOptions
-                {
-                    Host = context.ParseResult.GetValueForOption(hostOption) ?? Constants.DefaultHost,
-                    Port = context.ParseResult.GetValueForOption(portOption),
-                    NoLaunchWindow = context.ParseResult.GetValueForOption(noLaunchWindowOption),
-                    PauseExit = context.ParseResult.GetValueForOption(pauseExitOption),
-                    DisableLogs = context.ParseResult.GetValueForOption(disableLogsOption)
-                };
-                
-                var process = TestToolProcess.Startup(lambdaOptions);
-                
-                if (!lambdaOptions.NoLaunchWindow)
-                {
-                    try
-                    {
-                        var info = new ProcessStartInfo
-                        {
-                            UseShellExecute = true,
-                            FileName = process.ServiceUrl
-                        };
-                        Process.Start(info);
-                    }
-                    catch (Exception e)
-                    {
-                        toolInteractiveService.WriteErrorLine($"Error launching browser: {e.Message}");
-                    }
-                }
-                
-                await process.RunningTask;
-                
-                context.ExitCode = CommandReturnCodes.Success;
-            }
-            catch (Exception e) when (e.IsExpectedException())
-            {
-                toolInteractiveService.WriteErrorLine(string.Empty);
-                toolInteractiveService.WriteErrorLine(e.Message);
-                    
-                context.ExitCode = CommandReturnCodes.UserError;
-            }
-            catch (Exception e)
-            {
-                // This is a bug
-                toolInteractiveService.WriteErrorLine(
-                    $"Unhandled exception.{Environment.NewLine}" +
-                    $"This is a bug.{Environment.NewLine}" +
-                    $"Please copy the stack trace below and file a bug at {Constants.LinkGithubRepo}. " +
-                    e.PrettyPrint());
-                    
-                context.ExitCode = CommandReturnCodes.UnhandledException;
-            }
-        });
-        
-        return rootCommand;
-    }
-}
\ No newline at end of file
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Commands/RunCommand.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Commands/RunCommand.cs
new file mode 100644
index 000000000..0857dd8d0
--- /dev/null
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Commands/RunCommand.cs
@@ -0,0 +1,86 @@
+using System.ComponentModel;
+using System.Diagnostics;
+using Amazon.Lambda.TestTool.Extensions;
+using Amazon.Lambda.TestTool.Models;
+using Amazon.Lambda.TestTool.Processes;
+using Amazon.Lambda.TestTool.Services;
+using Spectre.Console.Cli;
+
+namespace Amazon.Lambda.TestTool.Commands;
+
+public sealed class RunCommand(
+    IToolInteractiveService toolInteractiveService) : AsyncCommand<RunCommand.Settings>
+{
+    public sealed class Settings : CommandSettings
+    {
+        [CommandOption("--host <HOST>")]
+        [Description(
+            "The hostname or IP address used for the test tool's web interface. Any host other than an explicit IP address or localhost (e.g. '*', '+' or 'example.com') binds to all public IPv4 and IPv6 addresses.")]
+        [DefaultValue(Constants.DefaultHost)]
+        public string Host { get; set; } = Constants.DefaultHost;
+
+        [CommandOption("-p|--port <PORT>")]
+        [Description("The port number used for the test tool's web interface.")]
+        [DefaultValue(Constants.DefaultPort)]
+        public int Port { get; set; } = Constants.DefaultPort;
+        
+        [CommandOption("--no-launch-window")]
+        [Description("Disable auto launching the test tool's web interface in a browser.")]
+        public bool NoLaunchWindow { get; set; }
+        
+        [CommandOption("--pause-exit")]
+        [Description("If set to true the test tool will pause waiting for a key input before exiting. The is useful when executing from an IDE so you can avoid having the output window immediately disappear after executing the Lambda code. The default value is true.")]
+        public bool PauseExit { get; set; }
+        
+        [CommandOption("--disable-logs")]
+        [Description("Disables logging in the application")]
+        public bool DisableLogs { get; set; }
+    }
+
+    public override async Task<int> ExecuteAsync(CommandContext context, Settings settings)
+    {
+        try
+        {
+            var process = TestToolProcess.Startup(settings);
+            
+            if (!settings.NoLaunchWindow)
+            {
+                try
+                {
+                    var info = new ProcessStartInfo
+                    {
+                        UseShellExecute = true,
+                        FileName = process.ServiceUrl
+                    };
+                    Process.Start(info);
+                }
+                catch (Exception e)
+                {
+                    toolInteractiveService.WriteErrorLine($"Error launching browser: {e.Message}");
+                }
+            }
+            
+            await process.RunningTask;
+            
+            return CommandReturnCodes.Success;
+        }
+        catch (Exception e) when (e.IsExpectedException())
+        {
+            toolInteractiveService.WriteErrorLine(string.Empty);
+            toolInteractiveService.WriteErrorLine(e.Message);
+                
+            return CommandReturnCodes.UserError;
+        }
+        catch (Exception e)
+        {
+            // This is a bug
+            toolInteractiveService.WriteErrorLine(
+                $"Unhandled exception.{Environment.NewLine}" +
+                $"This is a bug.{Environment.NewLine}" +
+                $"Please copy the stack trace below and file a bug at {Constants.LinkGithubRepo}. " +
+                e.PrettyPrint());
+                
+            return CommandReturnCodes.UnhandledException;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/Home.razor b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/Home.razor
index 7ceeffaf1..5b933013f 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/Home.razor
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/Home.razor
@@ -1,14 +1,15 @@
 @page "/"
 
+@using Amazon.Lambda.TestTool.Commands
 @using Amazon.Lambda.TestTool.Services
 @using Amazon.Lambda.TestTool.Models
 @using Amazon.Lambda.TestTool.SampleRequests;
 @using Amazon.Lambda.TestTool.Utilities
 @using Microsoft.AspNetCore.Http;
 
-@inject IHttpContextAccessor httpContextAccessor
-@inject ApplicationOptions LambdaOptions
+@inject IHttpContextAccessor HttpContextAccessor
 @inject IRuntimeApiDataStore RuntimeApiModel
+@inject IDirectoryManager DirectoryManager
 
 <PageTitle>Lambd Function Tester</PageTitle>
 
@@ -16,7 +17,7 @@
 
 <p>
     For Lambda functions written as executable assemblies, i.e. custom runtimes functions and top level statement functions, this page can be used for testing the functions locally.
-    Set the <b>AWS_LAMBDA_RUNTIME_API</b> environment variable to <b>@httpContextAccessor?.HttpContext?.Request?.Host</b> while debugging executable assembly
+    Set the <b>AWS_LAMBDA_RUNTIME_API</b> environment variable to <b>@HttpContextAccessor?.HttpContext?.Request?.Host</b> while debugging executable assembly
     Lambda function. More information can be found in the <a href="/documentation">documentation</a>.
 </p>
 
@@ -26,10 +27,10 @@
         <label class="" for="sample-requests">Example Requests:</label>
         <select class="control" id="sample-requests" @bind="SelectedSampleRequestName">
             <option id="@NO_SAMPLE_SELECTED_ID"> -- select a request -- </option>
-            @if (@SampleRequests.ContainsKey(SampleRequestManager.SAVED_REQUEST_GROUP))
+            @if (@SampleRequests.ContainsKey(SampleRequestManager.SavedRequestGroup))
             {
-                <optgroup id="saved-select-request-group" label="@SampleRequestManager.SAVED_REQUEST_GROUP">
-                    @foreach (var request in SampleRequests[SampleRequestManager.SAVED_REQUEST_GROUP])
+                <optgroup id="saved-select-request-group" label="@SampleRequestManager.SavedRequestGroup">
+                    @foreach (var request in SampleRequests[SampleRequestManager.SavedRequestGroup])
                     {
                         <option value="@request.Filename">@request.Name</option>
                     }
@@ -37,7 +38,7 @@
             }
             @foreach (var group in SampleRequests.Keys)
             {
-                @if (!string.Equals(group, SampleRequestManager.SAVED_REQUEST_GROUP))
+                @if (!string.Equals(group, SampleRequestManager.SavedRequestGroup))
                 {
                     <optgroup label="@group">
                         @foreach (var request in SampleRequests[group])
@@ -208,7 +209,7 @@
     protected override void OnInitialized()
     {
         RuntimeApiModel.StateChange += RuntimeApiModelOnStateChange;
-        this.SampleRequestManager = new SampleRequestManager(LambdaOptions.GetPreferenceDirectory(false));
+        this.SampleRequestManager = new SampleRequestManager(DirectoryManager.GetCurrentDirectory());
         this.SampleRequests = SampleRequestManager.GetSampleRequests();
     }
 
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/SaveRequestDialog.razor b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/SaveRequestDialog.razor
index 5cad3da9f..52f4444c4 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/SaveRequestDialog.razor
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Components/Pages/SaveRequestDialog.razor
@@ -1,7 +1,8 @@
-@using Amazon.Lambda.TestTool.Models
+@using Amazon.Lambda.TestTool.Commands
 @using Amazon.Lambda.TestTool.SampleRequests;
-@inject ApplicationOptions LambdaOptions
+@using Amazon.Lambda.TestTool.Services
 @inject IModalService ModalService
+@inject IDirectoryManager DirectoryManager
 
 <div class="simple-form" style="min-width: 400px">
     <div class="form-group" for="save-request-name">
@@ -29,8 +30,8 @@
 
         var requestBody = Parameters.Get<string>(PARAMETER_NAME_REQUEST_BODY);
 
-        var manager = new SampleRequestManager(this.LambdaOptions.GetPreferenceDirectory(true));
-        var systemName = manager.SaveRequest(this.SaveRequestName, requestBody);
+        var manager = new SampleRequestManager(DirectoryManager.GetCurrentDirectory());
+        var systemName = manager.SaveRequest(SaveRequestName, requestBody);
 
         await BlazoredModal.CloseAsync(ModalResult.Ok(systemName));
     }
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Constants.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Constants.cs
index a9f1cd53b..3e2926941 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Constants.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Constants.cs
@@ -2,6 +2,7 @@ namespace Amazon.Lambda.TestTool;
 
 public abstract class Constants
 {
+    public const string ToolName = "lambda-test-tool";
     public const int DefaultPort = 5050;
     public const string DefaultHost = "localhost";
 
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Extensions/ServiceCollectionExtensions.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Extensions/ServiceCollectionExtensions.cs
index 7ef6d5f22..529c46236 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Extensions/ServiceCollectionExtensions.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Extensions/ServiceCollectionExtensions.cs
@@ -8,9 +8,7 @@ public static class ServiceCollectionExtensions
     public static void AddCustomServices(this IServiceCollection serviceCollection,
         ServiceLifetime lifetime = ServiceLifetime.Singleton)
     {
-        serviceCollection.TryAdd(new ServiceDescriptor(typeof(ICommandFactory), typeof(CommandFactory), lifetime));
         serviceCollection.TryAdd(new ServiceDescriptor(typeof(IToolInteractiveService), typeof(ConsoleInteractiveService), lifetime));
-        
-        serviceCollection.AddSingleton<AppRunner>();
+        serviceCollection.TryAdd(new ServiceDescriptor(typeof(IDirectoryManager), typeof(DirectoryManager), lifetime));
     }
 }
\ No newline at end of file
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Models/ApplicationOptions.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Models/ApplicationOptions.cs
deleted file mode 100644
index 67697aee3..000000000
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Models/ApplicationOptions.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-namespace Amazon.Lambda.TestTool.Models;
-
-public class ApplicationOptions
-{
-    public string Host { get; set; } = Constants.DefaultHost;
-
-    public int Port { get; set; } = Constants.DefaultPort;
-
-    public bool NoLaunchWindow { get; set; }
-
-    public bool PauseExit { get; set; } = true;
-
-    public bool DisableLogs { get; set; } = false;
-
-
-    /// <summary>
-    /// The directory to store in local settings for a Lambda project for example saved Lambda requests.
-    /// </summary>
-    public string GetPreferenceDirectory(bool createIfNotExist)
-    {
-        // TODO Figure out what the preference directory should be in V2.
-
-        return Directory.GetCurrentDirectory();
-    }
-}
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Models/EventContainer.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Models/EventContainer.cs
index 56bd0d13d..6771c8250 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Models/EventContainer.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Models/EventContainer.cs
@@ -6,7 +6,7 @@ public class EventContainer
 {
     public enum Status { Queued, Executing, Success, Failure }
 
-    private const string defaultFunctionArn = "arn:aws:lambda:us-west-2:123412341234:function:Function";
+    private const string DefaultFunctionArn = "arn:aws:lambda:us-west-2:123412341234:function:Function";
     public string AwsRequestId { get; }
     public string EventJson { get; }
     public string? ErrorResponse { get; private set; }
@@ -29,17 +29,18 @@ public Status EventStatus
     }
 
     private readonly RuntimeApiDataStore _dataStore;
+    
     public EventContainer(RuntimeApiDataStore dataStore, int eventCount, string eventJson)
     {
         LastUpdated = DateTime.Now;
-        this._dataStore = dataStore;
-        this.AwsRequestId = eventCount.ToString("D12");
-        this.EventJson = eventJson;
+        _dataStore = dataStore;
+        AwsRequestId = eventCount.ToString("D12");
+        EventJson = eventJson;
     }
 
     public string FunctionArn
     {
-        get => defaultFunctionArn;
+        get => DefaultFunctionArn;
     }
 
     public void ReportSuccessResponse(string response)
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Processes/TestToolProcess.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Processes/TestToolProcess.cs
index 763e36d8a..55677b1c6 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Processes/TestToolProcess.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Processes/TestToolProcess.cs
@@ -1,5 +1,5 @@
-using Amazon.Lambda.TestTool.Components;
-using Amazon.Lambda.TestTool.Models;
+using Amazon.Lambda.TestTool.Commands;
+using Amazon.Lambda.TestTool.Components;
 using Amazon.Lambda.TestTool.Services;
 using Blazored.Modal;
 using Microsoft.Extensions.FileProviders;
@@ -22,7 +22,7 @@ private TestToolProcess()
 
     }
 
-    public static TestToolProcess Startup(ApplicationOptions lambdaOptions)
+    public static TestToolProcess Startup(RunCommand.Settings settings)
     {
         var builder = WebApplication.CreateBuilder();
 
@@ -38,10 +38,9 @@ public static TestToolProcess Startup(ApplicationOptions lambdaOptions)
         builder.Services.AddBlazoredModal();
 
         builder.Services.AddTransient<IPostConfigureOptions<StaticFileOptions>, ConfigureStaticFilesOptions>();
+        builder.Services.AddSingleton<IDirectoryManager, DirectoryManager>();
 
-        builder.Services.AddSingleton(lambdaOptions);
-
-        var serviceUrl = $"http://{lambdaOptions.Host}:{lambdaOptions.Port}";
+        var serviceUrl = $"http://{settings.Host}:{settings.Port}";
         builder.WebHost.UseUrls(serviceUrl);
         builder.WebHost.SuppressStatusMessages(true);
 
@@ -55,7 +54,7 @@ public static TestToolProcess Startup(ApplicationOptions lambdaOptions)
         app.MapRazorComponents<App>()
             .AddInteractiveServerRenderMode();
 
-        _ = new LambdaRuntimeAPI(app, app.Services.GetService<IRuntimeApiDataStore>()!);
+        _ = new LambdaRuntimeApi(app, app.Services.GetService<IRuntimeApiDataStore>()!);
 
         var cancellationTokenSource = new CancellationTokenSource();
         var runTask = app.RunAsync(cancellationTokenSource.Token);
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Program.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Program.cs
index 093cb66bd..df65b6f10 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Program.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Program.cs
@@ -1,17 +1,19 @@
 using Amazon.Lambda.TestTool;
+using Amazon.Lambda.TestTool.Commands;
 using Amazon.Lambda.TestTool.Extensions;
+using Amazon.Lambda.TestTool.Services;
+using Spectre.Console.Cli;
 
-var builder = Host.CreateApplicationBuilder();
+var serviceCollection = new ServiceCollection();
 
-builder.Services.AddCustomServices();
+serviceCollection.AddCustomServices();
 
-var serviceProvider = builder.Build();
+var registrar = new TypeRegistrar(serviceCollection);
 
-var appRunner = serviceProvider.Services.GetService<AppRunner>();
-if (appRunner == null)
+var app = new CommandApp<RunCommand>(registrar);
+app.Configure(config =>
 {
-    throw new Exception($"{nameof(AppRunner)} dependencies aren't injected correctly." +
-                        $" Verify {nameof(ServiceCollectionExtensions)} has all the required dependencies to instantiate {nameof(AppRunner)}.");
-}
+    config.SetApplicationName(Constants.ToolName);
+});
 
-return await appRunner.Run(args);
\ No newline at end of file
+return await app.RunAsync(args);
\ No newline at end of file
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/SampleRequests/LambdaRequest.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/SampleRequests/LambdaRequest.cs
index 007b2fcd7..40cc00d72 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/SampleRequests/LambdaRequest.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/SampleRequests/LambdaRequest.cs
@@ -1,9 +1,8 @@
-namespace Amazon.Lambda.TestTool.SampleRequests
+namespace Amazon.Lambda.TestTool.SampleRequests;
+
+public class LambdaRequest
 {
-    public class LambdaRequest
-    {
-        public required string Name { get; init; }
-        public required string Group { get; init; }
-        public required string Filename { get; init; }
-    }
+    public required string Name { get; init; }
+    public required string Group { get; init; }
+    public required string Filename { get; init; }
 }
\ No newline at end of file
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/SampleRequests/SampleRequestManager.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/SampleRequests/SampleRequestManager.cs
index 7ba6e35b2..30cab4e43 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/SampleRequests/SampleRequestManager.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/SampleRequests/SampleRequestManager.cs
@@ -1,149 +1,138 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Xml.Linq;
 
-namespace Amazon.Lambda.TestTool.SampleRequests
+namespace Amazon.Lambda.TestTool.SampleRequests;
+
+/// <summary>
+/// This class manages the sample Lambda input requests. This includes the pre-canned requests and saved requests.
+/// </summary>
+public class SampleRequestManager(string preferenceDirectory)
 {
-    /// <summary>
-    /// This class manages the sample Lambda input requests. This includes the precanned requests and saved requests.
-    /// </summary>
-    public class SampleRequestManager
+    public const string SavedRequestGroup = "Saved Requests";
+    public const string SavedRequestDirectory = "SavedRequests";
+
+    public IDictionary<string, IList<LambdaRequest>> GetSampleRequests()
     {
-        public const string SAVED_REQUEST_GROUP = "Saved Requests";
-        public const string SAVED_REQUEST_DIRECTORY = "SavedRequests";
-        private string _preferenceDirectory;
-        
-        public SampleRequestManager(string preferenceDirectory)
-        {
-            this._preferenceDirectory = preferenceDirectory;
-        }
-        
-        public IDictionary<string, IList<LambdaRequest>> GetSampleRequests()
-        {
-            var content = GetEmbeddedResource("manifest.xml");
-            XDocument xmlDoc = XDocument.Parse(content);
+        var content = GetEmbeddedResource("manifest.xml");
+        XDocument xmlDoc = XDocument.Parse(content);
 
-            var query = from item in xmlDoc.Descendants("request")
-                select new
-                {
-                    Name = item.Element("name")!.Value,
-                    Filename = item.Element("filename")!.Value
-                };
+        var query = from item in xmlDoc.Descendants("request")
+            select new
+            {
+                Name = item.Element("name")!.Value,
+                Filename = item.Element("filename")!.Value
+            };
 
-            var requests = from item in xmlDoc.Descendants("request")
-                select new LambdaRequest
-                {
-                    Group = item.Attribute("category")?.Value ?? string.Empty,
-                    Name = item.Element("name")?.Value ?? string.Empty,
-                    Filename = item.Element("filename")?.Value ?? string.Empty, 
-                };
-            
-            var hash = new Dictionary<string, IList<LambdaRequest>>();
+        var requests = from item in xmlDoc.Descendants("request")
+            select new LambdaRequest
+            {
+                Group = item.Attribute("category")?.Value ?? string.Empty,
+                Name = item.Element("name")?.Value ?? string.Empty,
+                Filename = item.Element("filename")?.Value ?? string.Empty, 
+            };
+        
+        var hash = new Dictionary<string, IList<LambdaRequest>>();
 
-            foreach (var request in requests)
+        foreach (var request in requests)
+        {
+            IList<LambdaRequest>? r;
+            if (!hash.TryGetValue(request.Group, out r))
             {
-                IList<LambdaRequest>? r;
-                if (!hash.TryGetValue(request.Group, out r))
-                {
-                    r = new List<LambdaRequest>();
-                    hash[request.Group] = r;
-                }
-                
-                r.Add(request);
+                r = new List<LambdaRequest>();
+                hash[request.Group] = r;
             }
+            
+            r.Add(request);
+        }
 
-            var savedRequestDirectory = GetSavedRequestDirectory();
-            if(Directory.Exists(savedRequestDirectory))
+        var savedRequestDirectory = GetSavedRequestDirectory();
+        if(Directory.Exists(savedRequestDirectory))
+        {
+            var savedRequestFiles = Directory.GetFiles(GetSavedRequestDirectory(), "*.json");
+            if (savedRequestFiles.Length > 0)
             {
-                var savedRequestFiles = Directory.GetFiles(GetSavedRequestDirectory(), "*.json");
-                if (savedRequestFiles.Length > 0)
+                var savedRequests = new List<LambdaRequest>();
+                hash[SavedRequestGroup] = savedRequests;
+                foreach (var file in savedRequestFiles)
                 {
-                    var savedRequests = new List<LambdaRequest>();
-                    hash[SAVED_REQUEST_GROUP] = savedRequests;
-                    foreach (var file in savedRequestFiles)
+                    var r = new LambdaRequest
                     {
-                        var r = new LambdaRequest
-                        {
-                            Filename = $"{SAVED_REQUEST_DIRECTORY}@{Path.GetFileName(file)}",
-                            Group = SAVED_REQUEST_GROUP,
-                            Name = Path.GetFileNameWithoutExtension(file)
-                        };
-                        savedRequests.Add(r);
-                    }
+                        Filename = $"{SavedRequestDirectory}@{Path.GetFileName(file)}",
+                        Group = SavedRequestGroup,
+                        Name = Path.GetFileNameWithoutExtension(file)
+                    };
+                    savedRequests.Add(r);
                 }
             }
-
-            foreach (var key in hash.Keys.ToList())
-            {
-                hash[key] = hash[key].OrderBy(x => x.Name).ToList();
-            }
-
-            return hash;
         }
 
-        public static bool TryDetermineSampleRequestName(string value, out string? sampleName)
+        foreach (var key in hash.Keys.ToList())
         {
-            sampleName = null;
-            if (value == null)
-                return false;
+            hash[key] = hash[key].OrderBy(x => x.Name).ToList();
+        }
 
-            if (!value.StartsWith(SAVED_REQUEST_DIRECTORY))
-                return false;
+        return hash;
+    }
 
-            // The minus 6 is for the "@" and the trailing ".json"
-            sampleName = value.Substring(SAVED_REQUEST_DIRECTORY.Length + 1, value.Length - SAVED_REQUEST_DIRECTORY.Length - 6);
-            return true;
-        }
+    public static bool TryDetermineSampleRequestName(string value, out string? sampleName)
+    {
+        sampleName = null;
+        if (value == null)
+            return false;
+
+        if (!value.StartsWith(SavedRequestDirectory))
+            return false;
 
-        public string GetRequest(string name)
+        // The minus 6 is for the "@" and the trailing ".json"
+        sampleName = value.Substring(SavedRequestDirectory.Length + 1, value.Length - SavedRequestDirectory.Length - 6);
+        return true;
+    }
+
+    public string GetRequest(string name)
+    {
+        if(name.StartsWith(SavedRequestDirectory + "@"))
         {
-            if(name.StartsWith(SAVED_REQUEST_DIRECTORY + "@"))
-            {
-                name = name.Substring(name.IndexOf("@") + 1);
-                var path = Path.Combine(this.GetSavedRequestDirectory(), name);
-                return File.ReadAllText(path);
-            }
-            return GetEmbeddedResource(name);
+            name = name.Substring(name.IndexOf("@") + 1);
+            var path = Path.Combine(this.GetSavedRequestDirectory(), name);
+            return File.ReadAllText(path);
         }
+        return GetEmbeddedResource(name);
+    }
 
-        public string SaveRequest(string name, string content)
-        {
-            var filename = $"{name}.json";
+    public string SaveRequest(string name, string content)
+    {
+        var filename = $"{name}.json";
 
-            var savedRequestDirectory = GetSavedRequestDirectory();
-            if (!Directory.Exists(savedRequestDirectory))
-                Directory.CreateDirectory(savedRequestDirectory);
+        var savedRequestDirectory = GetSavedRequestDirectory();
+        if (!Directory.Exists(savedRequestDirectory))
+            Directory.CreateDirectory(savedRequestDirectory);
 
-            File.WriteAllText(Path.Combine(savedRequestDirectory, filename), content);
-            return $"{SAVED_REQUEST_DIRECTORY}@{filename}";
-        }
+        File.WriteAllText(Path.Combine(savedRequestDirectory, filename), content);
+        return $"{SavedRequestDirectory}@{filename}";
+    }
 
-        public string GetSaveRequestRelativePath(string name)
-        {
-            var relativePath = $"{SAVED_REQUEST_DIRECTORY}{Path.DirectorySeparatorChar}{name}";
-            if (!name.EndsWith(".json"))
-                relativePath += ".json";
+    public string GetSaveRequestRelativePath(string name)
+    {
+        var relativePath = $"{SavedRequestDirectory}{Path.DirectorySeparatorChar}{name}";
+        if (!name.EndsWith(".json"))
+            relativePath += ".json";
 
-            return relativePath;
-        }
+        return relativePath;
+    }
 
-        private string GetEmbeddedResource(string name)
+    private string GetEmbeddedResource(string name)
+    {
+        using (var stream =
+            typeof(SampleRequestManager).Assembly.GetManifestResourceStream(
+                "Amazon.Lambda.TestTool.Resources.SampleRequests." + name))
+        using(var reader = new StreamReader(stream!))
         {
-            using (var stream =
-                typeof(SampleRequestManager).Assembly.GetManifestResourceStream(
-                    "Amazon.Lambda.TestTool.Resources.SampleRequests." + name))
-            using(var reader = new StreamReader(stream!))
-            {
-                return reader.ReadToEnd();
-            }
+            return reader.ReadToEnd();
         }
+    }
 
-        public string GetSavedRequestDirectory()
-        {
-            var path = Path.Combine(this._preferenceDirectory, SAVED_REQUEST_DIRECTORY);
-            return path;
-        }
+    public string GetSavedRequestDirectory()
+    {
+        var path = Path.Combine(preferenceDirectory, SavedRequestDirectory);
+        return path;
     }
 }
\ No newline at end of file
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/DirectoryManager.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/DirectoryManager.cs
new file mode 100644
index 000000000..8956bcd7a
--- /dev/null
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/DirectoryManager.cs
@@ -0,0 +1,6 @@
+namespace Amazon.Lambda.TestTool.Services;
+
+public class DirectoryManager : IDirectoryManager
+{
+    public string GetCurrentDirectory() => Directory.GetCurrentDirectory();
+}
\ No newline at end of file
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/IDirectoryManager.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/IDirectoryManager.cs
new file mode 100644
index 000000000..28705a6ab
--- /dev/null
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/IDirectoryManager.cs
@@ -0,0 +1,6 @@
+namespace Amazon.Lambda.TestTool.Services;
+
+public interface IDirectoryManager
+{
+    string GetCurrentDirectory();
+}
\ No newline at end of file
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/LambdaRuntimeAPI.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/LambdaRuntimeAPI.cs
index a39565e4f..77bf0e557 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/LambdaRuntimeAPI.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/LambdaRuntimeAPI.cs
@@ -10,14 +10,14 @@
 
 namespace Amazon.Lambda.TestTool.Services;
 
-public class LambdaRuntimeAPI
+public class LambdaRuntimeApi
 {
-    private const string DEFAULT_FUNCTION_NAME = "__DefaultFunction__";
-    private const string HEADER_BREAK = "-----------------------------------";
+    private const string DefaultFunctionName = "__DefaultFunction__";
+    private const string HeaderBreak = "-----------------------------------";
 
     private readonly IRuntimeApiDataStore _runtimeApiDataStore;
 
-    public LambdaRuntimeAPI(WebApplication app, IRuntimeApiDataStore runtimeApiDataStore)
+    public LambdaRuntimeApi(WebApplication app, IRuntimeApiDataStore runtimeApiDataStore)
     {
         _runtimeApiDataStore = runtimeApiDataStore;
         app.MapPost("/2015-03-31/functions/function/invocations", (Delegate)PostEventDefaultFunction);
@@ -38,7 +38,7 @@ public LambdaRuntimeAPI(WebApplication app, IRuntimeApiDataStore runtimeApiDataS
 
     public Task<IResult> PostEventDefaultFunction(HttpContext ctx)
     {
-        return PostEvent(ctx, DEFAULT_FUNCTION_NAME);
+        return PostEvent(ctx, DefaultFunctionName);
     }
 
     public async Task<IResult> PostEvent(HttpContext ctx, string functionName)
@@ -52,7 +52,7 @@ public async Task<IResult> PostEvent(HttpContext ctx, string functionName)
 
     public Task GetNextInvocationDefaultFunction(HttpContext ctx)
     {
-        return GetNextInvocation(ctx, DEFAULT_FUNCTION_NAME);
+        return GetNextInvocation(ctx, DefaultFunctionName);
     }
 
     public async Task GetNextInvocation(HttpContext ctx, string functionName)
@@ -66,7 +66,7 @@ public async Task GetNextInvocation(HttpContext ctx, string functionName)
         if (activeEvent == null)
             return;
 
-        Console.WriteLine(HEADER_BREAK);
+        Console.WriteLine(HeaderBreak);
         Console.WriteLine($"Next invocation returned: {activeEvent.AwsRequestId}");
 
         ctx.Response.Headers["Lambda-Runtime-Aws-Request-Id"] = activeEvent.AwsRequestId;
@@ -87,21 +87,21 @@ public async Task GetNextInvocation(HttpContext ctx, string functionName)
 
     public IResult PostInitErrorDefaultFunction([FromHeader(Name = "Lambda-Runtime-Function-Error-Type")] string errorType, [FromBody] string error)
     {
-        return PostInitError(DEFAULT_FUNCTION_NAME, errorType, error);
+        return PostInitError(DefaultFunctionName, errorType, error);
     }
 
     public IResult PostInitError(string functionName, [FromHeader(Name = "Lambda-Runtime-Function-Error-Type")] string errorType, [FromBody] string error)
     {
         Console.Error.WriteLine("Init Error Type: " + errorType);
         Console.Error.WriteLine(error);
-        Console.Error.WriteLine(HEADER_BREAK);
+        Console.Error.WriteLine(HeaderBreak);
         return Results.Accepted(null, new StatusResponse { Status = "success" });
     }
 
 
     public Task<IResult> PostInvocationResponseDefaultFunction(HttpContext ctx, string awsRequestId)
     {
-        return PostInvocationResponse(ctx, DEFAULT_FUNCTION_NAME, awsRequestId);
+        return PostInvocationResponse(ctx, DefaultFunctionName, awsRequestId);
     }
 
     public async Task<IResult> PostInvocationResponse(HttpContext ctx, string functionName, string awsRequestId)
@@ -111,7 +111,7 @@ public async Task<IResult> PostInvocationResponse(HttpContext ctx, string functi
 
         _runtimeApiDataStore.ReportSuccess(awsRequestId, response);
 
-        Console.WriteLine(HEADER_BREAK);
+        Console.WriteLine(HeaderBreak);
         Console.WriteLine($"Response for request {awsRequestId}");
         Console.WriteLine(response);
 
@@ -120,7 +120,7 @@ public async Task<IResult> PostInvocationResponse(HttpContext ctx, string functi
 
     public Task<IResult> PostErrorDefaultFunction(HttpContext ctx, string awsRequestId, [FromHeader(Name = "Lambda-Runtime-Function-Error-Type")] string errorType)
     {
-        return PostError(ctx, DEFAULT_FUNCTION_NAME, awsRequestId, errorType);
+        return PostError(ctx, DefaultFunctionName, awsRequestId, errorType);
     }
 
     public async Task<IResult> PostError(HttpContext ctx, string functionName, string awsRequestId, [FromHeader(Name = "Lambda-Runtime-Function-Error-Type")] string errorType)
@@ -129,7 +129,7 @@ public async Task<IResult> PostError(HttpContext ctx, string functionName, strin
         var errorBody = await reader.ReadToEndAsync();
 
         _runtimeApiDataStore.ReportError(awsRequestId, errorType, errorBody);
-        await Console.Error.WriteLineAsync(HEADER_BREAK);
+        await Console.Error.WriteLineAsync(HeaderBreak);
         await Console.Error.WriteLineAsync($"Request {awsRequestId} Error Type: {errorType}");
         await Console.Error.WriteLineAsync(errorBody);
 
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/RuntimeApiDataStore.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/RuntimeApiDataStore.cs
index dfe6598f6..d8688d0d0 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/RuntimeApiDataStore.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/RuntimeApiDataStore.cs
@@ -1,200 +1,197 @@
 using Amazon.Lambda.TestTool.Models;
 using System.Collections.ObjectModel;
 
-namespace Amazon.Lambda.TestTool.Services
+namespace Amazon.Lambda.TestTool.Services;
+
+public interface IRuntimeApiDataStore
 {
-    public interface IRuntimeApiDataStore
-    {
-        EventContainer QueueEvent(string eventBody);
-        
-        IReadOnlyList<EventContainer> QueuedEvents { get; }
-        
-        IReadOnlyList<EventContainer> ExecutedEvents { get; }
+    EventContainer QueueEvent(string eventBody);
+    
+    IReadOnlyList<EventContainer> QueuedEvents { get; }
+    
+    IReadOnlyList<EventContainer> ExecutedEvents { get; }
 
-        void ClearQueued();
+    void ClearQueued();
 
-        void ClearExecuted();
+    void ClearExecuted();
 
-        void DeleteEvent(string awsRequestId);
+    void DeleteEvent(string awsRequestId);
 
 
-        EventContainer? ActiveEvent { get; }
+    EventContainer? ActiveEvent { get; }
 
-        event EventHandler? StateChange;
+    event EventHandler? StateChange;
 
-        bool TryActivateEvent(out EventContainer? activeEvent);
+    bool TryActivateEvent(out EventContainer? activeEvent);
 
-        void ReportSuccess(string awsRequestId, string response);
-        void ReportError(string awsRequestId, string errorType, string errorBody);
-    }
+    void ReportSuccess(string awsRequestId, string response);
+    void ReportError(string awsRequestId, string errorType, string errorBody);
+}
 
-    public class RuntimeApiDataStore : IRuntimeApiDataStore
+public class RuntimeApiDataStore : IRuntimeApiDataStore
+{
+    private IList<EventContainer> _queuedEvents = new List<EventContainer>();
+    private IList<EventContainer> _executedEvents = new List<EventContainer>();
+    private int _eventCounter = 1;
+    private object _lock = new object();
+    
+    public event EventHandler? StateChange;
+    
+    public EventContainer QueueEvent(string eventBody)
     {
-        private IList<EventContainer> _queuedEvents = new List<EventContainer>();
-        private IList<EventContainer> _executedEvents = new List<EventContainer>();
-        private int _eventCounter = 1;
-        private object _lock = new object();
-        
-        public event EventHandler? StateChange;
-        
-        public EventContainer QueueEvent(string eventBody)
+        var evnt = new EventContainer(this, _eventCounter++, eventBody);
+        lock (_lock)
         {
-            var evnt = new EventContainer(this, _eventCounter++, eventBody);
-            lock (_lock)
-            {
-                _queuedEvents.Add(evnt);
-            }
-            
-            RaiseStateChanged();
-            return evnt;
+            _queuedEvents.Add(evnt);
         }
+        
+        RaiseStateChanged();
+        return evnt;
+    }
 
-        public bool TryActivateEvent(out EventContainer? activeEvent)
+    public bool TryActivateEvent(out EventContainer? activeEvent)
+    {
+        activeEvent = null;
+        lock(_lock)
         {
-            activeEvent = null;
-            lock(_lock)
+            if (!_queuedEvents.Any())
             {
-                if (!_queuedEvents.Any())
-                {
-                    return false;
-                }
-
-                // Grab the next event from the queue
-                var evnt = _queuedEvents[0];
-                _queuedEvents.RemoveAt(0);
-                evnt.EventStatus = EventContainer.Status.Executing;
+                return false;
+            }
 
-                // Move current active event to the executed list.
-                if (ActiveEvent != null)
-                {
-                    _executedEvents.Add(ActiveEvent);
-                }
+            // Grab the next event from the queue
+            var evnt = _queuedEvents[0];
+            _queuedEvents.RemoveAt(0);
+            evnt.EventStatus = EventContainer.Status.Executing;
 
-                // Make the event pull from the queue active
-                ActiveEvent = evnt;
-                activeEvent = ActiveEvent;
-                RaiseStateChanged();
-                return true;
+            // Move current active event to the executed list.
+            if (ActiveEvent != null)
+            {
+                _executedEvents.Add(ActiveEvent);
             }
+
+            // Make the event pull from the queue active
+            ActiveEvent = evnt;
+            activeEvent = ActiveEvent;
+            RaiseStateChanged();
+            return true;
         }
-        
-        public EventContainer? ActiveEvent { get; private set; }
+    }
+    
+    public EventContainer? ActiveEvent { get; private set; }
 
-        public IReadOnlyList<EventContainer> QueuedEvents
+    public IReadOnlyList<EventContainer> QueuedEvents
+    {
+        get
         {
-            get
+            lock(_lock)
             {
-                lock(_lock)
-                {
-                    return new ReadOnlyCollection<EventContainer>(_queuedEvents.ToArray()); 
-                }
+                return new ReadOnlyCollection<EventContainer>(_queuedEvents.ToArray()); 
             }
         }
+    }
 
-        public IReadOnlyList<EventContainer> ExecutedEvents
+    public IReadOnlyList<EventContainer> ExecutedEvents
+    {
+        get
         {
-            get
+            lock(_lock)
             {
-                lock(_lock)
-                {
-                    return new ReadOnlyCollection<EventContainer>(_executedEvents.ToArray());
-                }
+                return new ReadOnlyCollection<EventContainer>(_executedEvents.ToArray());
             }
         }
+    }
 
-        public void ReportSuccess(string awsRequestId, string response)
+    public void ReportSuccess(string awsRequestId, string response)
+    {
+        lock(_lock)
         {
-            lock(_lock)
+            var evnt = FindEventContainer(awsRequestId);
+            if (evnt == null)
             {
-                var evnt = FindEventContainer(awsRequestId);
-                if (evnt == null)
-                {
-                    return;
-                }
-                
-                evnt.ReportSuccessResponse(response);
+                return;
             }
-            RaiseStateChanged();
+            
+            evnt.ReportSuccessResponse(response);
         }
+        RaiseStateChanged();
+    }
 
-        public void ReportError(string awsRequestId, string errorType, string errorBody)
+    public void ReportError(string awsRequestId, string errorType, string errorBody)
+    {
+        lock(_lock)
         {
-            lock(_lock)
+            var evnt = FindEventContainer(awsRequestId);
+            if (evnt == null)
             {
-                var evnt = FindEventContainer(awsRequestId);
-                if (evnt == null)
-                {
-                    return;
-                }
-                
-                evnt.ReportErrorResponse(errorType, errorBody);
+                return;
             }
-            RaiseStateChanged();
+            
+            evnt.ReportErrorResponse(errorType, errorBody);
         }
+        RaiseStateChanged();
+    }
 
-        public void ClearQueued()
+    public void ClearQueued()
+    {
+        lock(_lock)
         {
-            lock(_lock)
-            {
-                this._queuedEvents.Clear();
-            }
-            RaiseStateChanged();
+            this._queuedEvents.Clear();
         }
+        RaiseStateChanged();
+    }
 
-        public void ClearExecuted()
+    public void ClearExecuted()
+    {
+        lock(_lock)
         {
-            lock(_lock)
-            {
-                this._executedEvents.Clear();
-            }
-            RaiseStateChanged();
+            this._executedEvents.Clear();
         }
+        RaiseStateChanged();
+    }
 
-        public void DeleteEvent(string awsRequestId)
+    public void DeleteEvent(string awsRequestId)
+    {
+        lock(_lock)
         {
-            lock(_lock)
+            var executedEvent = this._executedEvents.FirstOrDefault(x => string.Equals(x.AwsRequestId, awsRequestId));
+            if (executedEvent != null)
+            {
+                this._executedEvents.Remove(executedEvent);
+            }
+            else
             {
-                var executedEvent = this._executedEvents.FirstOrDefault(x => string.Equals(x.AwsRequestId, awsRequestId));
+                executedEvent = this._queuedEvents.FirstOrDefault(x => string.Equals(x.AwsRequestId, awsRequestId));
                 if (executedEvent != null)
                 {
-                    this._executedEvents.Remove(executedEvent);
-                }
-                else
-                {
-                    executedEvent = this._queuedEvents.FirstOrDefault(x => string.Equals(x.AwsRequestId, awsRequestId));
-                    if (executedEvent != null)
-                    {
-                        this._queuedEvents.Remove(executedEvent);
-                    }
+                    this._queuedEvents.Remove(executedEvent);
                 }
             }
-            RaiseStateChanged();
         }
+        RaiseStateChanged();
+    }
 
-        private EventContainer? FindEventContainer(string awsRequestId)
+    private EventContainer? FindEventContainer(string awsRequestId)
+    {
+        if (string.Equals(this.ActiveEvent?.AwsRequestId, awsRequestId))
         {
-            if (string.Equals(this.ActiveEvent?.AwsRequestId, awsRequestId))
-            {
-                return this.ActiveEvent;
-            }
-
-            var evnt = _executedEvents.FirstOrDefault(x => string.Equals(x.AwsRequestId, awsRequestId));
-            if (evnt != null)
-            {
-                return evnt;
-            }
-
-            evnt = _queuedEvents.FirstOrDefault(x => string.Equals(x.AwsRequestId, awsRequestId));
-
-            return evnt;
+            return this.ActiveEvent;
         }
 
-        internal void RaiseStateChanged()
+        var evnt = _executedEvents.FirstOrDefault(x => string.Equals(x.AwsRequestId, awsRequestId));
+        if (evnt != null)
         {
-            var handler = StateChange;
-            handler?.Invoke(this, EventArgs.Empty);
+            return evnt;
         }
+
+        evnt = _queuedEvents.FirstOrDefault(x => string.Equals(x.AwsRequestId, awsRequestId));
+
+        return evnt;
     }
 
-    
+    internal void RaiseStateChanged()
+    {
+        var handler = StateChange;
+        handler?.Invoke(this, EventArgs.Empty);
+    }
 }
\ No newline at end of file
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/TypeRegistrar.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/TypeRegistrar.cs
new file mode 100644
index 000000000..343aa8895
--- /dev/null
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/TypeRegistrar.cs
@@ -0,0 +1,31 @@
+using Spectre.Console.Cli;
+
+namespace Amazon.Lambda.TestTool.Services;
+
+public sealed class TypeRegistrar(IServiceCollection builder) : ITypeRegistrar
+{
+    public ITypeResolver Build()
+    {
+        return new TypeResolver(builder.BuildServiceProvider());
+    }
+
+    public void Register(Type service, Type implementation)
+    {
+        builder.AddSingleton(service, implementation);
+    }
+
+    public void RegisterInstance(Type service, object implementation)
+    {
+        builder.AddSingleton(service, implementation);
+    }
+
+    public void RegisterLazy(Type service, Func<object> func)
+    {
+        if (func is null)
+        {
+            throw new ArgumentNullException(nameof(func));
+        }
+
+        builder.AddSingleton(service, (provider) => func());
+    }
+}
\ No newline at end of file
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/TypeResolver.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/TypeResolver.cs
new file mode 100644
index 000000000..083bd4859
--- /dev/null
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Services/TypeResolver.cs
@@ -0,0 +1,26 @@
+using Spectre.Console.Cli;
+
+namespace Amazon.Lambda.TestTool.Services;
+
+public sealed class TypeResolver(IServiceProvider provider) : ITypeResolver, IDisposable
+{
+    private readonly IServiceProvider _provider = provider ?? throw new ArgumentNullException(nameof(provider));
+
+    public object? Resolve(Type? type)
+    {
+        if (type == null)
+        {
+            return null;
+        }
+
+        return _provider.GetService(type);
+    }
+
+    public void Dispose()
+    {
+        if (_provider is IDisposable disposable)
+        {
+            disposable.Dispose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Utilities/Utils.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Utilities/Utils.cs
index 642d34dd5..bec8b9bae 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Utilities/Utils.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Utilities/Utils.cs
@@ -7,18 +7,18 @@ namespace Amazon.Lambda.TestTool.Utilities;
 
 public static class Utils
 {
-    public const string DEFAULT_CONFIG_FILE = "aws-lambda-tools-defaults.json";
+    public const string DefaultConfigFile = "aws-lambda-tools-defaults.json";
 
     public static string DetermineToolVersion()
     {
-        const string UnknownVersion = "Unknown";
+        const string unknownVersion = "Unknown";
 
         AssemblyInformationalVersionAttribute? attribute = null;
         try
         {
             var assembly = Assembly.GetEntryAssembly();
             if (assembly == null)
-                return UnknownVersion;
+                return unknownVersion;
             attribute = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
         }
         catch (Exception)
@@ -34,7 +34,7 @@ public static string DetermineToolVersion()
             version = version.Substring(0, version.IndexOf('+'));
         }
 
-        return version ?? UnknownVersion;
+        return version ?? unknownVersion;
     }
 
 
@@ -64,7 +64,7 @@ public static string TryPrettyPrintJson(string? data)
                 return string.Empty;
 
             var doc = JsonDocument.Parse(data);
-            var prettyPrintJson = System.Text.Json.JsonSerializer.Serialize(doc, new JsonSerializerOptions()
+            var prettyPrintJson = JsonSerializer.Serialize(doc, new JsonSerializerOptions()
             {
                 WriteIndented = true
             });
diff --git a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/RuntimeApiTests.cs b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/RuntimeApiTests.cs
index c237c5c05..74f817e3a 100644
--- a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/RuntimeApiTests.cs
+++ b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/RuntimeApiTests.cs
@@ -4,6 +4,7 @@
 using Amazon.Lambda.RuntimeSupport;
 using Amazon.Lambda.Serialization.SystemTextJson;
 using Amazon.Lambda.Core;
+using Amazon.Lambda.TestTool.Commands;
 using Amazon.Lambda.TestTool.Models;
 using Amazon.Lambda.TestTool.Processes;
 
@@ -20,7 +21,7 @@ public RuntimeApiTests()
     [Fact]
     public async Task AddEventToDataStore()
     {
-        var options = new ApplicationOptions();
+        var options = new RunCommand.Settings();
 
         var testToolProcess = TestToolProcess.Startup(options);
         try