Reduce delta

Azure · Mar 27, 2024 · c7e82e3 · c7e82e3
1 parent 3190c30
commit c7e82e3
Show file tree

Hide file tree

Showing 14 changed files with 232 additions and 176 deletions.
diff --git a/.azure/pipelines/scripts/set-variables.sh b/.azure/pipelines/scripts/set-variables.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 define_variable () {
-    echo "Setting $1=$2"
+    echo "$1=$2"
     echo "##vso[task.setvariable variable=$1;isOutput=true]$2"
 }
 

diff --git a/ai-cli.sln b/ai-cli.sln
@@ -41,61 +41,169 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{D79D76D8-4E60-46DC-80B6-D5039C5D67F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D79D76D8-4E60-46DC-80B6-D5039C5D67F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D79D76D8-4E60-46DC-80B6-D5039C5D67F8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D79D76D8-4E60-46DC-80B6-D5039C5D67F8}.Debug|x64.Build.0 = Debug|Any CPU
+		{D79D76D8-4E60-46DC-80B6-D5039C5D67F8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D79D76D8-4E60-46DC-80B6-D5039C5D67F8}.Debug|x86.Build.0 = Debug|Any CPU
 		{D79D76D8-4E60-46DC-80B6-D5039C5D67F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D79D76D8-4E60-46DC-80B6-D5039C5D67F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D79D76D8-4E60-46DC-80B6-D5039C5D67F8}.Release|x64.ActiveCfg = Release|Any CPU
+		{D79D76D8-4E60-46DC-80B6-D5039C5D67F8}.Release|x64.Build.0 = Release|Any CPU
+		{D79D76D8-4E60-46DC-80B6-D5039C5D67F8}.Release|x86.ActiveCfg = Release|Any CPU
+		{D79D76D8-4E60-46DC-80B6-D5039C5D67F8}.Release|x86.Build.0 = Release|Any CPU
 		{7639F510-D2CD-491A-BB25-C9D89F3A576A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7639F510-D2CD-491A-BB25-C9D89F3A576A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7639F510-D2CD-491A-BB25-C9D89F3A576A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7639F510-D2CD-491A-BB25-C9D89F3A576A}.Debug|x64.Build.0 = Debug|Any CPU
+		{7639F510-D2CD-491A-BB25-C9D89F3A576A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7639F510-D2CD-491A-BB25-C9D89F3A576A}.Debug|x86.Build.0 = Debug|Any CPU
 		{7639F510-D2CD-491A-BB25-C9D89F3A576A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7639F510-D2CD-491A-BB25-C9D89F3A576A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7639F510-D2CD-491A-BB25-C9D89F3A576A}.Release|x64.ActiveCfg = Release|Any CPU
+		{7639F510-D2CD-491A-BB25-C9D89F3A576A}.Release|x64.Build.0 = Release|Any CPU
+		{7639F510-D2CD-491A-BB25-C9D89F3A576A}.Release|x86.ActiveCfg = Release|Any CPU
+		{7639F510-D2CD-491A-BB25-C9D89F3A576A}.Release|x86.Build.0 = Release|Any CPU
 		{272E0B1B-6C05-428E-BF64-E30B1E5F603A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{272E0B1B-6C05-428E-BF64-E30B1E5F603A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{272E0B1B-6C05-428E-BF64-E30B1E5F603A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{272E0B1B-6C05-428E-BF64-E30B1E5F603A}.Debug|x64.Build.0 = Debug|Any CPU
+		{272E0B1B-6C05-428E-BF64-E30B1E5F603A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{272E0B1B-6C05-428E-BF64-E30B1E5F603A}.Debug|x86.Build.0 = Debug|Any CPU
 		{272E0B1B-6C05-428E-BF64-E30B1E5F603A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{272E0B1B-6C05-428E-BF64-E30B1E5F603A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{272E0B1B-6C05-428E-BF64-E30B1E5F603A}.Release|x64.ActiveCfg = Release|Any CPU
+		{272E0B1B-6C05-428E-BF64-E30B1E5F603A}.Release|x64.Build.0 = Release|Any CPU
+		{272E0B1B-6C05-428E-BF64-E30B1E5F603A}.Release|x86.ActiveCfg = Release|Any CPU
+		{272E0B1B-6C05-428E-BF64-E30B1E5F603A}.Release|x86.Build.0 = Release|Any CPU
 		{7BD6EF67-BA75-478D-9721-C1B2AB6DE3FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7BD6EF67-BA75-478D-9721-C1B2AB6DE3FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7BD6EF67-BA75-478D-9721-C1B2AB6DE3FF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7BD6EF67-BA75-478D-9721-C1B2AB6DE3FF}.Debug|x64.Build.0 = Debug|Any CPU
+		{7BD6EF67-BA75-478D-9721-C1B2AB6DE3FF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7BD6EF67-BA75-478D-9721-C1B2AB6DE3FF}.Debug|x86.Build.0 = Debug|Any CPU
 		{7BD6EF67-BA75-478D-9721-C1B2AB6DE3FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7BD6EF67-BA75-478D-9721-C1B2AB6DE3FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7BD6EF67-BA75-478D-9721-C1B2AB6DE3FF}.Release|x64.ActiveCfg = Release|Any CPU
+		{7BD6EF67-BA75-478D-9721-C1B2AB6DE3FF}.Release|x64.Build.0 = Release|Any CPU
+		{7BD6EF67-BA75-478D-9721-C1B2AB6DE3FF}.Release|x86.ActiveCfg = Release|Any CPU
+		{7BD6EF67-BA75-478D-9721-C1B2AB6DE3FF}.Release|x86.Build.0 = Release|Any CPU
 		{023B4F9C-E2B3-4CCD-A993-87E337C16EDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{023B4F9C-E2B3-4CCD-A993-87E337C16EDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{023B4F9C-E2B3-4CCD-A993-87E337C16EDE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{023B4F9C-E2B3-4CCD-A993-87E337C16EDE}.Debug|x64.Build.0 = Debug|Any CPU
+		{023B4F9C-E2B3-4CCD-A993-87E337C16EDE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{023B4F9C-E2B3-4CCD-A993-87E337C16EDE}.Debug|x86.Build.0 = Debug|Any CPU
 		{023B4F9C-E2B3-4CCD-A993-87E337C16EDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{023B4F9C-E2B3-4CCD-A993-87E337C16EDE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{023B4F9C-E2B3-4CCD-A993-87E337C16EDE}.Release|x64.ActiveCfg = Release|Any CPU
+		{023B4F9C-E2B3-4CCD-A993-87E337C16EDE}.Release|x64.Build.0 = Release|Any CPU
+		{023B4F9C-E2B3-4CCD-A993-87E337C16EDE}.Release|x86.ActiveCfg = Release|Any CPU
+		{023B4F9C-E2B3-4CCD-A993-87E337C16EDE}.Release|x86.Build.0 = Release|Any CPU
 		{7C3F1355-B679-487D-904D-7E5FEBA9E75C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7C3F1355-B679-487D-904D-7E5FEBA9E75C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C3F1355-B679-487D-904D-7E5FEBA9E75C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7C3F1355-B679-487D-904D-7E5FEBA9E75C}.Debug|x64.Build.0 = Debug|Any CPU
+		{7C3F1355-B679-487D-904D-7E5FEBA9E75C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7C3F1355-B679-487D-904D-7E5FEBA9E75C}.Debug|x86.Build.0 = Debug|Any CPU
 		{7C3F1355-B679-487D-904D-7E5FEBA9E75C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C3F1355-B679-487D-904D-7E5FEBA9E75C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C3F1355-B679-487D-904D-7E5FEBA9E75C}.Release|x64.ActiveCfg = Release|Any CPU
+		{7C3F1355-B679-487D-904D-7E5FEBA9E75C}.Release|x64.Build.0 = Release|Any CPU
+		{7C3F1355-B679-487D-904D-7E5FEBA9E75C}.Release|x86.ActiveCfg = Release|Any CPU
+		{7C3F1355-B679-487D-904D-7E5FEBA9E75C}.Release|x86.Build.0 = Release|Any CPU
 		{B0B3437F-1828-4A13-866F-1CF7C924015E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B0B3437F-1828-4A13-866F-1CF7C924015E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0B3437F-1828-4A13-866F-1CF7C924015E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B0B3437F-1828-4A13-866F-1CF7C924015E}.Debug|x64.Build.0 = Debug|Any CPU
+		{B0B3437F-1828-4A13-866F-1CF7C924015E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B0B3437F-1828-4A13-866F-1CF7C924015E}.Debug|x86.Build.0 = Debug|Any CPU
 		{B0B3437F-1828-4A13-866F-1CF7C924015E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B0B3437F-1828-4A13-866F-1CF7C924015E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B0B3437F-1828-4A13-866F-1CF7C924015E}.Release|x64.ActiveCfg = Release|Any CPU
+		{B0B3437F-1828-4A13-866F-1CF7C924015E}.Release|x64.Build.0 = Release|Any CPU
+		{B0B3437F-1828-4A13-866F-1CF7C924015E}.Release|x86.ActiveCfg = Release|Any CPU
+		{B0B3437F-1828-4A13-866F-1CF7C924015E}.Release|x86.Build.0 = Release|Any CPU
 		{39876475-2D98-40CF-8B08-CD423A5EB4E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{39876475-2D98-40CF-8B08-CD423A5EB4E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39876475-2D98-40CF-8B08-CD423A5EB4E8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{39876475-2D98-40CF-8B08-CD423A5EB4E8}.Debug|x64.Build.0 = Debug|Any CPU
+		{39876475-2D98-40CF-8B08-CD423A5EB4E8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{39876475-2D98-40CF-8B08-CD423A5EB4E8}.Debug|x86.Build.0 = Debug|Any CPU
 		{39876475-2D98-40CF-8B08-CD423A5EB4E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{39876475-2D98-40CF-8B08-CD423A5EB4E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39876475-2D98-40CF-8B08-CD423A5EB4E8}.Release|x64.ActiveCfg = Release|Any CPU
+		{39876475-2D98-40CF-8B08-CD423A5EB4E8}.Release|x64.Build.0 = Release|Any CPU
+		{39876475-2D98-40CF-8B08-CD423A5EB4E8}.Release|x86.ActiveCfg = Release|Any CPU
+		{39876475-2D98-40CF-8B08-CD423A5EB4E8}.Release|x86.Build.0 = Release|Any CPU
 		{9499C018-FA08-4133-93B3-FC0F3863A6CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9499C018-FA08-4133-93B3-FC0F3863A6CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9499C018-FA08-4133-93B3-FC0F3863A6CC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9499C018-FA08-4133-93B3-FC0F3863A6CC}.Debug|x64.Build.0 = Debug|Any CPU
+		{9499C018-FA08-4133-93B3-FC0F3863A6CC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9499C018-FA08-4133-93B3-FC0F3863A6CC}.Debug|x86.Build.0 = Debug|Any CPU
 		{9499C018-FA08-4133-93B3-FC0F3863A6CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9499C018-FA08-4133-93B3-FC0F3863A6CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9499C018-FA08-4133-93B3-FC0F3863A6CC}.Release|x64.ActiveCfg = Release|Any CPU
+		{9499C018-FA08-4133-93B3-FC0F3863A6CC}.Release|x64.Build.0 = Release|Any CPU
+		{9499C018-FA08-4133-93B3-FC0F3863A6CC}.Release|x86.ActiveCfg = Release|Any CPU
+		{9499C018-FA08-4133-93B3-FC0F3863A6CC}.Release|x86.Build.0 = Release|Any CPU
 		{CED7C805-0435-4BF7-A42F-9F3BBF14A18F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CED7C805-0435-4BF7-A42F-9F3BBF14A18F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CED7C805-0435-4BF7-A42F-9F3BBF14A18F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CED7C805-0435-4BF7-A42F-9F3BBF14A18F}.Debug|x64.Build.0 = Debug|Any CPU
+		{CED7C805-0435-4BF7-A42F-9F3BBF14A18F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CED7C805-0435-4BF7-A42F-9F3BBF14A18F}.Debug|x86.Build.0 = Debug|Any CPU
 		{CED7C805-0435-4BF7-A42F-9F3BBF14A18F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CED7C805-0435-4BF7-A42F-9F3BBF14A18F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CED7C805-0435-4BF7-A42F-9F3BBF14A18F}.Release|x64.ActiveCfg = Release|Any CPU
+		{CED7C805-0435-4BF7-A42F-9F3BBF14A18F}.Release|x64.Build.0 = Release|Any CPU
+		{CED7C805-0435-4BF7-A42F-9F3BBF14A18F}.Release|x86.ActiveCfg = Release|Any CPU
+		{CED7C805-0435-4BF7-A42F-9F3BBF14A18F}.Release|x86.Build.0 = Release|Any CPU
 		{306A3CD6-91C2-450B-9995-79701CE63FE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{306A3CD6-91C2-450B-9995-79701CE63FE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{306A3CD6-91C2-450B-9995-79701CE63FE2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{306A3CD6-91C2-450B-9995-79701CE63FE2}.Debug|x64.Build.0 = Debug|Any CPU
+		{306A3CD6-91C2-450B-9995-79701CE63FE2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{306A3CD6-91C2-450B-9995-79701CE63FE2}.Debug|x86.Build.0 = Debug|Any CPU
 		{306A3CD6-91C2-450B-9995-79701CE63FE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{306A3CD6-91C2-450B-9995-79701CE63FE2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{306A3CD6-91C2-450B-9995-79701CE63FE2}.Release|x64.ActiveCfg = Release|Any CPU
+		{306A3CD6-91C2-450B-9995-79701CE63FE2}.Release|x64.Build.0 = Release|Any CPU
+		{306A3CD6-91C2-450B-9995-79701CE63FE2}.Release|x86.ActiveCfg = Release|Any CPU
+		{306A3CD6-91C2-450B-9995-79701CE63FE2}.Release|x86.Build.0 = Release|Any CPU
 		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Debug|x64.Build.0 = Debug|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Debug|x86.Build.0 = Debug|Any CPU
 		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Release|x64.ActiveCfg = Release|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Release|x64.Build.0 = Release|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Release|x86.ActiveCfg = Release|Any CPU
+		{A136A55F-C27B-4FC9-82ED-84A3790BFC3C}.Release|x86.Build.0 = Release|Any CPU
 		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Debug|x64.Build.0 = Debug|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Debug|x86.Build.0 = Debug|Any CPU
 		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Release|x64.ActiveCfg = Release|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Release|x64.Build.0 = Release|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Release|x86.ActiveCfg = Release|Any CPU
+		{BA7F8DB9-2789-4410-99B5-AC38F85697FE}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/ai/Program_AI.cs b/src/ai/Program_AI.cs
@@ -41,12 +41,6 @@ static async Task<int> Main(string[] args)
                     Console.WriteLine($"StopWatch: Stopped at {DateTime.Now} ({GetStopWatchElapsedAsString(stopwatch.Elapsed)})");
                 }
 
-                if (data.Telemetry != null)
-                {
-                    await data.Telemetry.DisposeAsync()
-                        .ConfigureAwait(false);
-                }
-
                 return exitCode;
             }
             catch (Exception)

diff --git a/src/ai/commands/init_command.cs b/src/ai/commands/init_command.cs
@@ -283,29 +283,30 @@ private async ValueTask DoInitRootMenuPick()
             var label = "  Initialize";
             Console.Write($"{label}: ");
 
-            var choices = new ListBoxPickerChoice[]
+            var choices = new[]
             {
-                new() { DisplayName = "New AI Project", Value = "init-root-project-create", Metadata = "new" },
-                new() { DisplayName = "Existing AI Project", Value = "init-root-project-select", Metadata = "existing" },
-                new() { DisplayName = "Standalone resources", Value = "init-root-standalone-select-or-create", Metadata = "standalone" },
+                new { DisplayName = "New AI Project", Value = "init-root-project-create", Metadata = "new" },
+                new { DisplayName = "Existing AI Project", Value = "init-root-project-select", Metadata = "existing" },
+                new { DisplayName = "Standalone resources", Value = "init-root-standalone-select-or-create", Metadata = "standalone" },
             };
 
-            ListBoxPickerChoice selected = default;
+            int selected = -1;
+
             var outcome = Program.Telemetry.Wrap(() =>
-            {
-                selected = ListBoxPicker.PickValue(choices);
-                if (selected == null)
                 {
-                    Console.WriteLine($"\r{label}: CANCELED (no selection)");
-                    return Outcome.Canceled;
-                }
+                    selected = ListBoxPicker.PickIndexOf(choices.Select(e => e.DisplayName).ToArray());
+                    if (selected < 0)
+                    {
+                        Console.WriteLine($"\r{label}: CANCELED (no selection)");
+                        return Outcome.Canceled;
+                    }
 
-                Console.Write($"\r{label.Trim()}: {selected.DisplayName}\n");
-                _values.Reset("telemetry.init.run_type", selected.Metadata);
+                    Console.Write($"\r{label.Trim()}: {choices.ElementAtOrDefault(selected)?.DisplayName}\n");
+                    _values.Reset("telemetry.init.run_type", choices.ElementAtOrDefault(selected)?.Metadata);
 
-                return Outcome.Success;
-            },
-                (outcome, ex, timeTaken) => selected.Metadata == "standalone"
+                    return Outcome.Success;
+                },
+                (outcome, ex, timeTaken) => choices.ElementAtOrDefault(selected)?.Metadata == "standalone"
                 ? null
                 : new InitTelemetryEvent(InitStage.Choice)
                 {
@@ -318,7 +319,7 @@ private async ValueTask DoInitRootMenuPick()
 
             if (outcome == Outcome.Success)
             {
-                await DoInitServiceParts(interactive, selected.Value);
+                await DoInitServiceParts(interactive, choices.ElementAtOrDefault(selected)?.Value);
             }
         }
 
@@ -335,41 +336,41 @@ private async Task DoInitStandaloneResources(bool interactive)
             var label = "  Initialize";
             Console.Write($"{label}: ");
 
-            var choices = new ListBoxPickerChoice[]
+            var choices = new[]
             {
-                new ("Azure AI Services (v2)", "init-root-cognitiveservices-ai-services-kind-create-or-select", "aiservices"),
-                new ("Azure AI Services (v1)", "init-root-cognitiveservices-cognitiveservices-kind-create-or-select", "cognitiveservices"),
-                new ("Azure OpenAI", "init-root-openai-create-or-select", "openai"),
-                new ("Azure Search", "init-root-search-create-or-select", "search"),
-                new ("Azure Speech", "init-root-speech-create-or-select", "speech")
+                new { DisplayName = "Azure AI Services (v2)",  Value = "init-root-cognitiveservices-ai-services-kind-create-or-select", Metadata = "aiservices" },
+                new { DisplayName = "Azure AI Services (v1)", Value = "init-root-cognitiveservices-cognitiveservices-kind-create-or-select", Metadata ="cognitiveservices" },
+                new { DisplayName = "Azure OpenAI", Value = "init-root-openai-create-or-select", Metadata = "openai" },
+                new { DisplayName = "Azure Search", Value = "init-root-search-create-or-select", Metadata = "search" },
+                new { DisplayName = "Azure Speech", Value = "init-root-speech-create-or-select", Metadata =  "speech" }
             };
 
-            ListBoxPickerChoice picked = null;
+            int picked = -1;
             var outcome = Program.Telemetry.Wrap(() =>
                 {
-                    picked = ListBoxPicker.PickValue(choices);
-                    if (picked == null)
+                    picked = ListBoxPicker.PickIndexOf(choices.Select(e => e.DisplayName).ToArray());
+                    if (picked < 0)
                     {
                         Console.WriteLine("\rInitialize: CANCELED (no selection)");
                         return Outcome.Canceled;
                     }
 
-                    Console.WriteLine($"\rInitialize: {picked.DisplayName}");
+                    Console.WriteLine($"\rInitialize: {choices.ElementAtOrDefault(picked)?.DisplayName}");
                     return Outcome.Success;
                 },
                 (outcome, ex, timeTaken) => new InitTelemetryEvent(InitStage.Choice)
                 {
                     Outcome = outcome,
                     RunId = _values.GetOrDefault("telemetry.init.run_id", null),
                     RunType = _values.GetOrDefault("telemetry.init.run_type", null),
-                    Selected = picked.Metadata,
+                    Selected = choices.ElementAtOrDefault(picked)?.Metadata,
                     DurationInMs = timeTaken.TotalMilliseconds,
                     Error  = ex?.Message
                 });
 
             if (outcome == Outcome.Success)
             {
-                await DoInitServiceParts(true, picked.Value);
+                await DoInitServiceParts(true, choices.ElementAtOrDefault(picked)?.Value);
             }
         }
 
@@ -646,7 +647,6 @@ private async Task DoInitRootSpeech(bool interactive)
             await DoInitSubscriptionId(interactive);
             await DoInitSpeech(interactive);
         }
-
         private async Task DoInitRootVision(bool interactive)
         {
             await DoInitSubscriptionId(interactive);