Hook up the buttons, and othe UX nits

src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Apps/AppAction.cs

@@ -62,6 +62,6 @@ internal async Task Launch()
     public override CommandResult Invoke()
     {
         _ = Launch();
-        return CommandResult.GoHome();
+        return CommandResult.Dismiss();
     }
 }

src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Shell/Pages/ShellListPage.cs

@@ -18,6 +18,7 @@ public ShellListPage(SettingsManager settingsManager)
         Icon = new("\uE756");
         Id = "com.microsoft.cmdpal.shell";
         Name = Resources.cmd_plugin_name;
+        PlaceholderText = Resources.list_placeholder_text;
         _helper = new(settingsManager);
     }
 

src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.Shell/Properties/Resources.resx

@@ -176,12 +176,15 @@
     <value>All entries using the Windows Terminal force the Windows Terminal as the console host regardless of the system settings</value>
   </data>
   <data name="shell_command_name" xml:space="preserve">
-    <value>Execute shell commands</value>
+    <value>Run commands</value>
   </data>
   <data name="generic_run_command" xml:space="preserve">
     <value>Run</value>
   </data>
   <data name="settings_page_name" xml:space="preserve">
     <value>Settings</value>
   </data>
+  <data name="list_placeholder_text" xml:space="preserve">
+    <value>Type the name of a command to run</value>
+  </data>
 </root>

src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.WindowsServices/Pages/ServicesListPage.cs

@@ -2,39 +2,27 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Net.Http;
-using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.WindowsRuntime;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Xml.Linq;
 using Microsoft.CmdPal.Ext.WindowsServices.Helpers;
 using Microsoft.CmdPal.Extensions;
 using Microsoft.CmdPal.Extensions.Helpers;
-using Microsoft.UI.Windowing;
 
 namespace Microsoft.CmdPal.Ext.WindowsServices;
 
 internal sealed partial class ServicesListPage : DynamicListPage
 {
     public ServicesListPage()
     {
-        Icon = new(string.Empty);
+        Icon = new("%windir%\\system32\\filemgmt.dll");
         Name = "Windows Services";
     }
 
-    public override void UpdateSearchText(string oldSearch, string newSearch)
-    {
-        RaiseItemsChanged(0);
-    }
+    public override void UpdateSearchText(string oldSearch, string newSearch) => RaiseItemsChanged(0);
 
     public override IListItem[] GetItems()
     {
-        ListItem[] items = ServiceHelper.Search(SearchText).ToArray();
+        var items = ServiceHelper.Search(SearchText).ToArray();
 
         return items;
     }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandItemViewModel.cs

@@ -11,6 +11,7 @@ namespace Microsoft.CmdPal.UI.ViewModels;
 public partial class CommandItemViewModel : ExtensionObjectViewModel
 {
     private readonly ExtensionObject<ICommandItem> _commandItemModel = new(null);
+    private CommandContextItemViewModel? _defaultCommandContextItem;
 
     // These are properties that are "observable" from the extension object
     // itself, in the sense that they get raised by PropChanged events from the
@@ -40,21 +41,10 @@ public List<CommandContextItemViewModel> AllCommands
     {
         get
         {
-            var command = _commandItemModel.Unsafe?.Command;
-            var model = new CommandContextItem(command!)
-            {
-            };
-            CommandContextItemViewModel defaultCommand = new(model, PageContext)
-            {
-                Name = Name,
-                Title = Name,
-                Subtitle = Subtitle,
-                Icon = Icon,
-
-                // TODO this probably should just be a CommandContextItemViewModel(CommandItemViewModel) ctor, or a copy ctor or whatever
-            };
-
-            var l = new List<CommandContextItemViewModel> { defaultCommand };
+            List<CommandContextItemViewModel> l = _defaultCommandContextItem == null ?
+                [_defaultCommandContextItem] :
+                new();
+
             l.AddRange(MoreCommands);
             return l;
         }
@@ -76,15 +66,25 @@ public override void InitializeProperties()
         }
 
         Command = new(model.Command);
+
         Name = model.Command?.Name ?? string.Empty;
         Title = model.Title;
         Subtitle = model.Subtitle;
-        Icon = model.Icon;
-        MoreCommands = model.MoreCommands
-            .Where(contextItem => contextItem is ICommandContextItem)
-            .Select(contextItem => (contextItem as ICommandContextItem)!)
-            .Select(contextItem => new CommandContextItemViewModel(contextItem, PageContext))
-            .ToList();
+
+        var listIcon = model.Icon;
+        Icon = !string.IsNullOrEmpty(listIcon.Icon) ?
+            listIcon :
+            Command.Unsafe!.Icon;
+
+        var more = model.MoreCommands;
+        if (more != null)
+        {
+            MoreCommands = more
+                .Where(contextItem => contextItem is ICommandContextItem)
+                .Select(contextItem => (contextItem as ICommandContextItem)!)
+                .Select(contextItem => new CommandContextItemViewModel(contextItem, PageContext))
+                .ToList();
+        }
 
         // Here, we're already theoretically in the async context, so we can
         // use Initialize straight up
@@ -93,6 +93,17 @@ public override void InitializeProperties()
             contextItem.InitializeProperties();
         });
 
+        _defaultCommandContextItem = new(new CommandContextItem(model.Command!), PageContext)
+        {
+            Name = Name,
+            Title = Name,
+            Subtitle = Subtitle,
+            Icon = Icon,
+            Command = new(model.Command),
+
+            // TODO this probably should just be a CommandContextItemViewModel(CommandItemViewModel) ctor, or a copy ctor or whatever
+        };
+
         model.PropChanged += Model_PropChanged;
 
         // _initialized = true;
@@ -130,7 +141,8 @@ protected virtual void FetchProperty(string propertyName)
                 this.Subtitle = model.Subtitle;
                 break;
             case nameof(Icon):
-                this.Icon = model.Icon;
+                var listIcon = model.Icon;
+                Icon = !string.IsNullOrEmpty(listIcon.Icon) ? listIcon : Command.Unsafe!.Icon;
                 break;
 
                 // TODO! MoreCommands array, which needs to also raise HasMoreCommands

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs

@@ -4,6 +4,7 @@
 
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.Diagnostics;
 using Microsoft.CmdPal.Ext.Apps.Programs;
 using Microsoft.CmdPal.Extensions;
 using Microsoft.CmdPal.Extensions.Helpers;
@@ -29,7 +30,8 @@ public partial class MainListPage : DynamicListPage
     public MainListPage(IServiceProvider serviceProvider)
     {
         Name = "Command Palette";
-
+        Icon = new(Path.Combine(AppDomain.CurrentDomain.BaseDirectory.ToString(), "Assets\\StoreLogo.scale-200.png"));
+        ShowDetails = true;
         _serviceProvider = serviceProvider;
 
         var tlcManager = _serviceProvider.GetService<TopLevelCommandManager>()!;
@@ -66,6 +68,7 @@ public override IListItem[] GetItems()
     public override void UpdateSearchText(string oldSearch, string newSearch)
     {
         /* handle changes to the filter text here */
+        Debug.WriteLine($"UpdateSearchText '{oldSearch}' -> '{newSearch}'");
 
         foreach (var command in _commands)
         {

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/FormViewModel.cs

@@ -91,8 +91,7 @@ public void HandleSubmit(IAdaptiveActionElement action, JsonObject inputs)
                 if (model != null)
                 {
                     var result = model.SubmitForm(inputString);
-
-                    // TODO Handle results
+                    WeakReferenceMessenger.Default.Send<HandleCommandResultMessage>(new(new(result)));
                 }
             }
             catch (Exception ex)

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Messages/NavigateToDetailsMessage.cs → src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Messages/ActivateSecondaryCommandMessage.cs

@@ -4,8 +4,9 @@
 
 namespace Microsoft.CmdPal.UI.ViewModels.Messages;
 
-// Want to know what a record is?  here is a TLDR
-// https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/builtin-types/record
-public record NavigateToDetailsMessage(ListItemViewModel ListItem)
+/// <summary>
+/// Used to perform a list item's secondary command when the user presses ctrl+enter in the search box
+/// </summary>
+public record ActivateSecondaryCommandMessage
 {
 }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Messages/DismissMessage.cs

@@ -2,8 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.UI.ViewModels.BuiltinCommands;
-
 namespace Microsoft.CmdPal.UI.ViewModels.Messages;
 
 public record DismissMessage()

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Messages/HandleCommandResultMessage.cs

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CmdPal.Extensions;
+using Microsoft.CmdPal.UI.ViewModels.Models;
+
+namespace Microsoft.CmdPal.UI.ViewModels.Messages;
+
+public record HandleCommandResultMessage(ExtensionObject<ICommandResult> Result)
+{
+}

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Messages/OpenContextMenuMessage.cs

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.UI.ViewModels.Messages;
+
+/// <summary>
+/// Used to perform a list item's secondary command when the user presses ctrl+enter in the search box
+/// </summary>
+public record OpenContextMenuMessage
+{
+}

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ActionBar.xaml

@@ -45,7 +45,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
 
-    <Grid Padding="8" ColumnSpacing="8">
+    <Grid Padding="8" ColumnSpacing="8" MinHeight="56">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="Auto" />
@@ -78,10 +78,10 @@
                 Height="40"
                 Padding="8,4,8,4"
                 x:Load="{x:Bind IsLoaded, Mode=OneWay}"
+                Tapped="PrimaryButton_Tapped"
                 Visibility="{x:Bind ViewModel.PrimaryAction.Name, Converter={StaticResource StringNotEmptyToVisibilityConverter}, Mode=OneWay}">
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
-                    <!-- <FontIcon Glyph="&#xEA3A;" /> -->
                     <cpcontrols:IconBox
                         Width="16"
                         Height="16"
@@ -108,10 +108,9 @@
                 Height="40"
                 Padding="8,4,8,4"
                 x:Load="{x:Bind IsLoaded, Mode=OneWay}"
+                Tapped="SecondaryButton_Tapped"
                 Visibility="{x:Bind ViewModel.HasSecondaryCommand, Mode=OneWay}">
                 <StackPanel Orientation="Horizontal" Spacing="8">
-                    <!-- <FontIcon Glyph="&#xEA3A;" /> -->
-
                     <cpcontrols:IconBox
                         Width="16"
                         Height="16"