Update build-installer.ps1

## Summary of the Pull Request

Added more instructions to first time building command palette

## PR Checklist

- [ ] **Closes:** #xxx
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [X ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx

<!-- Provide a more detailed description of the PR, other things fixed,
or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments

<!-- Describe how you validated the behavior. Add automated tests
wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed

.pipelines/ESRPSigning_core.json

@@ -120,8 +120,6 @@
             "WinUI3Apps\\Powertoys.Peek.UI.dll",
             "WinUI3Apps\\Powertoys.Peek.UI.exe",
             "WinUI3Apps\\Powertoys.Peek.dll",
-            "WinUI3Apps\\Powertoys.Peek.CLI.dll",
-            "WinUI3Apps\\PowerToys.Peek.CLI.exe",
 
             "WinUI3Apps\\PowerToys.EnvironmentVariablesModuleInterface.dll",
             "WinUI3Apps\\PowerToys.EnvironmentVariablesUILib.dll",

.pipelines/v2/templates/job-build-project.yml

@@ -190,30 +190,22 @@ jobs:
     displayName: Verify ARM64 configurations
 
   - ${{ if eq(parameters.enablePackageCaching, true) }}:
-    - pwsh: |-
-        $dotnetVersion = dotnet --version
-        Write-Host "Current .NET SDK Version: $dotnetVersion"
-        Write-Host "##vso[task.setvariable variable=DotNetSdkVersion]$dotnetVersion"
-      displayName: Get .NET SDK Version for Cache Key
-
     - task: Cache@2
       displayName: 'Cache nuget packages (PackageReference)'
       inputs:
-        key: '"$(DotNetSdkVersion)" | "PackageReference" | "$(Agent.OS)" | Directory.Packages.props'
+        key: '"PackageReference" | "$(Agent.OS)" | Directory.Packages.props'
         restoreKeys: |
-           "$(DotNetSdkVersion)" | "PackageReference" | "$(Agent.OS)"
-           "$(DotNetSdkVersion)" | "PackageReference"
-           "$(DotNetSdkVersion)"
+           "PackageReference" | "$(Agent.OS)"
+           "PackageReference"
         path: $(NUGET_PACKAGES)
 
     - task: Cache@2
       displayName: 'Cache nuget packages (packages.config)'
       inputs:
-        key: '"$(DotNetSdkVersion)" | "packages.config" | "$(Agent.OS)" | **/packages.config'
+        key: '"packages.config" | "$(Agent.OS)" | **/packages.config'
         restoreKeys: |
-           "$(DotNetSdkVersion)" | "packages.config" | "$(Agent.OS)"
-           "$(DotNetSdkVersion)" | "packages.config"
-           "$(DotNetSdkVersion)"
+           "packages.config" | "$(Agent.OS)"
+           "packages.config"
         path: packages
   
   - ${{ if eq(parameters.useLatestWinAppSDK, true)}}:

PowerToys.sln

@@ -711,8 +711,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdPalKeyboardService", "sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRename.FuzzingTest", "src\modules\powerrename\PowerRename.FuzzingTest\PowerRename.FuzzingTest.vcxproj", "{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Peek.CLI", "src\modules\peek\Peek.CLI\Peek.CLI.csproj", "{886648E3-A9FC-D591-898F-246954EE5682}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BgcodePreviewHandler", "src\modules\previewpane\BgcodePreviewHandler\BgcodePreviewHandler.csproj", "{9E0CBC06-F29A-4810-B93C-97D53863B95E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BgcodePreviewHandlerCpp", "src\modules\previewpane\BgcodePreviewHandlerCpp\BgcodePreviewHandlerCpp.vcxproj", "{F6088A11-1C9E-4420-AA90-CF7E78DD7F1C}"
@@ -2633,14 +2631,6 @@ Global
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|ARM64.Build.0 = Release|ARM64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.ActiveCfg = Release|x64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.Build.0 = Release|x64
-		{886648E3-A9FC-D591-898F-246954EE5682}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{886648E3-A9FC-D591-898F-246954EE5682}.Debug|ARM64.Build.0 = Debug|ARM64
-		{886648E3-A9FC-D591-898F-246954EE5682}.Debug|x64.ActiveCfg = Debug|x64
-		{886648E3-A9FC-D591-898F-246954EE5682}.Debug|x64.Build.0 = Debug|x64
-		{886648E3-A9FC-D591-898F-246954EE5682}.Release|ARM64.ActiveCfg = Release|ARM64
-		{886648E3-A9FC-D591-898F-246954EE5682}.Release|ARM64.Build.0 = Release|ARM64
-		{886648E3-A9FC-D591-898F-246954EE5682}.Release|x64.ActiveCfg = Release|x64
-		{886648E3-A9FC-D591-898F-246954EE5682}.Release|x64.Build.0 = Release|x64
 		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.Build.0 = Debug|ARM64
 		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.ActiveCfg = Debug|x64
@@ -3078,7 +3068,6 @@ Global
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
 		{5702B3CC-8575-48D5-83D8-15BB42269CD3} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
 		{64B88F02-CD88-4ED8-9624-989A800230F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{886648E3-A9FC-D591-898F-246954EE5682} = {17B4FA70-001E-4D33-BBBB-0D142DBC2E20}
 		{0217E86E-3476-9946-DE8E-9D200CEBD47A} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs

@@ -56,6 +56,8 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
     public CommandItemViewModel EmptyContent { get; private set; }
 
+    public bool IsMainPage { get; init; }
+
     private bool _isDynamic;
 
     private Task? _initializeItemsTask;
@@ -370,6 +372,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
                }
 
                TextToSuggest = item.TextToSuggest;
+               WeakReferenceMessenger.Default.Send<UpdateSuggestionMessage>(new(item.TextToSuggest));
            });
 
         _lastSelectedItem = item;
@@ -423,6 +426,8 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
                WeakReferenceMessenger.Default.Send<HideDetailsMessage>();
 
+               WeakReferenceMessenger.Default.Send<UpdateSuggestionMessage>(new(string.Empty));
+
                TextToSuggest = string.Empty;
            });
     }

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateSuggestionMessage.cs

@@ -2,10 +2,8 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Peek.UI.Models
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
+
+public record UpdateSuggestionMessage(string TextToSuggest)
 {
-    public abstract class SelectedItem
-    {
-        public abstract bool Matches(string? path);
-    }
 }

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

@@ -263,7 +263,7 @@ public partial class MainListPage : DynamicListPage,
         {
              nameMatch,
              descriptionMatch,
-             isFallback ? 1 : 0, // Always give fallbacks a chance...
+             isFallback ? 1 : 0, // Always give fallbacks a chance
         };
         var max = scores.Max();
 
@@ -273,8 +273,7 @@ public partial class MainListPage : DynamicListPage,
         // above "git" from "whatever"
         max = max + extensionTitleMatch;
 
-        // ... but downweight them
-        var matchSomething = (max / (isFallback ? 3 : 1))
+        var matchSomething = max
             + (isAliasMatch ? 9001 : (isAliasSubstringMatch ? 1 : 0));
 
         // If we matched title, subtitle, or alias (something real), then

src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs

@@ -98,10 +98,12 @@ public partial class App : Application
 
         // Built-in Commands. Order matters - this is the order they'll be presented by default.
         var allApps = new AllAppsCommandProvider();
+        var files = new IndexerCommandsProvider();
+        files.SuppressFallbackWhen(ShellCommandsProvider.SuppressFileFallbackIf);
         services.AddSingleton<ICommandProvider>(allApps);
         services.AddSingleton<ICommandProvider, ShellCommandsProvider>();
         services.AddSingleton<ICommandProvider, CalculatorCommandProvider>();
-        services.AddSingleton<ICommandProvider, IndexerCommandsProvider>();
+        services.AddSingleton<ICommandProvider>(files);
         services.AddSingleton<ICommandProvider, BookmarksCommandProvider>();
 
         services.AddSingleton<ICommandProvider, WindowWalkerCommandsProvider>();

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/SearchBar.xaml.cs

@@ -2,7 +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 System.Diagnostics;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.WinUI;
 using Microsoft.CmdPal.Core.ViewModels;
@@ -21,6 +20,7 @@ namespace Microsoft.CmdPal.UI.Controls;
 public sealed partial class SearchBar : UserControl,
     IRecipient<GoHomeMessage>,
     IRecipient<FocusSearchBoxMessage>,
+    IRecipient<UpdateSuggestionMessage>,
     ICurrentPageAware
 {
     private readonly DispatcherQueue _queue = DispatcherQueue.GetForCurrentThread();
@@ -31,6 +31,10 @@ public sealed partial class SearchBar : UserControl,
     private readonly DispatcherQueueTimer _debounceTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
     private bool _isBackspaceHeld;
 
+    private bool _inSuggestion;
+    private string? _lastText;
+    private string? _deletedSuggestion;
+
     public PageViewModel? CurrentPageViewModel
     {
         get => (PageViewModel?)GetValue(CurrentPageViewModelProperty);
@@ -69,6 +73,7 @@ public sealed partial class SearchBar : UserControl,
         this.InitializeComponent();
         WeakReferenceMessenger.Default.Register<GoHomeMessage>(this);
         WeakReferenceMessenger.Default.Register<FocusSearchBoxMessage>(this);
+        WeakReferenceMessenger.Default.Register<UpdateSuggestionMessage>(this);
     }
 
     public void ClearSearch()
@@ -125,15 +130,6 @@ public sealed partial class SearchBar : UserControl,
             WeakReferenceMessenger.Default.Send<OpenContextMenuMessage>(new OpenContextMenuMessage(null, null, null, ContextMenuFilterLocation.Bottom));
             e.Handled = true;
         }
-        else if (e.Key == VirtualKey.Right)
-        {
-            if (CurrentPageViewModel != null && !string.IsNullOrEmpty(CurrentPageViewModel.TextToSuggest))
-            {
-                FilterBox.Text = CurrentPageViewModel.TextToSuggest;
-                FilterBox.Select(FilterBox.Text.Length, 0);
-                e.Handled = true;
-            }
-        }
         else if (e.Key == VirtualKey.Escape)
         {
             if (string.IsNullOrEmpty(FilterBox.Text))
@@ -200,12 +196,65 @@ public sealed partial class SearchBar : UserControl,
 
             e.Handled = true;
         }
+        else if (e.Key == VirtualKey.Right)
+        {
+            if (_inSuggestion)
+            {
+                _inSuggestion = false;
+                _lastText = null;
+                DoFilterBoxUpdate();
+            }
+        }
         else if (e.Key == VirtualKey.Down)
         {
             WeakReferenceMessenger.Default.Send<NavigateNextCommand>();
 
             e.Handled = true;
         }
+
+        if (_inSuggestion)
+        {
+            if (
+                 e.Key == VirtualKey.Back ||
+                 e.Key == VirtualKey.Delete
+                 )
+            {
+                _deletedSuggestion = FilterBox.Text;
+
+                FilterBox.Text = _lastText ?? string.Empty;
+                FilterBox.Select(FilterBox.Text.Length, 0);
+
+                // Logger.LogInfo("deleting suggestion");
+                _inSuggestion = false;
+                _lastText = null;
+
+                e.Handled = true;
+                return;
+            }
+
+            var ignoreLeave =
+
+                e.Key == VirtualKey.Up ||
+                e.Key == VirtualKey.Down ||
+
+                e.Key == VirtualKey.RightMenu ||
+                e.Key == VirtualKey.LeftMenu ||
+                e.Key == VirtualKey.Menu ||
+                e.Key == VirtualKey.Shift ||
+                e.Key == VirtualKey.RightShift ||
+                e.Key == VirtualKey.LeftShift ||
+                e.Key == VirtualKey.RightControl ||
+                e.Key == VirtualKey.LeftControl ||
+                e.Key == VirtualKey.Control;
+            if (ignoreLeave)
+            {
+                return;
+            }
+
+            // Logger.LogInfo("leaving suggestion");
+            _inSuggestion = false;
+            _lastText = null;
+        }
     }
 
     private void FilterBox_PreviewKeyUp(object sender, KeyRoutedEventArgs e)
@@ -219,7 +268,7 @@ public sealed partial class SearchBar : UserControl,
 
     private void FilterBox_TextChanged(object sender, TextChangedEventArgs e)
     {
-        Debug.WriteLine($"FilterBox_TextChanged: {FilterBox.Text}");
+        // Logger.LogInfo($"FilterBox_TextChanged: {FilterBox.Text}");
 
         // TERRIBLE HACK TODO GH #245
         // There's weird wacky bugs with debounce currently. We're trying
@@ -228,23 +277,22 @@ public sealed partial class SearchBar : UserControl,
         // (otherwise aliases just stop working)
         if (FilterBox.Text.Length == 1)
         {
-            if (CurrentPageViewModel != null)
-            {
-                CurrentPageViewModel.Filter = FilterBox.Text;
-            }
+            DoFilterBoxUpdate();
 
             return;
         }
 
+        if (_inSuggestion)
+        {
+            // Logger.LogInfo($"-- skipping, in suggestion --");
+            return;
+        }
+
         // TODO: We could encapsulate this in a Behavior if we wanted to bind to the Filter property.
         _debounceTimer.Debounce(
             () =>
             {
-                // Actually plumb Filtering to the view model
-                if (CurrentPageViewModel != null)
-                {
-                    CurrentPageViewModel.Filter = FilterBox.Text;
-                }
+                DoFilterBoxUpdate();
             },
             //// Couldn't find a good recommendation/resource for value here. PT uses 50ms as default, so that is a reasonable default
             //// This seems like a useful testing site for typing times: https://keyboardtester.info/keyboard-latency-test/
@@ -254,6 +302,21 @@ public sealed partial class SearchBar : UserControl,
             immediate: FilterBox.Text.Length <= 1);
     }
 
+    private void DoFilterBoxUpdate()
+    {
+        if (_inSuggestion)
+        {
+            // Logger.LogInfo($"--- skipping ---");
+            return;
+        }
+
+        // Actually plumb Filtering to the view model
+        if (CurrentPageViewModel != null)
+        {
+            CurrentPageViewModel.Filter = FilterBox.Text;
+        }
+    }
+
     // Used to handle the case when a ListPage's `SearchText` may have changed
     private void Page_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
     {
@@ -273,6 +336,8 @@ public sealed partial class SearchBar : UserControl,
                     // ... Move the cursor to the end of the input
                     FilterBox.Select(FilterBox.Text.Length, 0);
                 }
+
+                // TODO! deal with suggestion
             }
             else if (property == nameof(ListViewModel.InitialSearchText))
             {
@@ -290,4 +355,96 @@ public sealed partial class SearchBar : UserControl,
     public void Receive(GoHomeMessage message) => ClearSearch();
 
     public void Receive(FocusSearchBoxMessage message) => FilterBox.Focus(Microsoft.UI.Xaml.FocusState.Programmatic);
+
+    public void Receive(UpdateSuggestionMessage message)
+    {
+        var suggestion = message.TextToSuggest;
+
+        _queue.TryEnqueue(new(() =>
+        {
+            var clearSuggestion = string.IsNullOrEmpty(suggestion);
+
+            if (clearSuggestion && _inSuggestion)
+            {
+                // Logger.LogInfo($"Cleared suggestion \"{_lastText}\" to {suggestion}");
+                _inSuggestion = false;
+                FilterBox.Text = _lastText ?? string.Empty;
+                _lastText = null;
+                return;
+            }
+
+            if (clearSuggestion)
+            {
+                _deletedSuggestion = null;
+                return;
+            }
+
+            if (suggestion == _deletedSuggestion)
+            {
+                return;
+            }
+            else
+            {
+                _deletedSuggestion = null;
+            }
+
+            var currentText = _lastText ?? FilterBox.Text;
+
+            _lastText = currentText;
+
+            // if (_inSuggestion)
+            // {
+            //     Logger.LogInfo($"Suggestion from \"{_lastText}\" to {suggestion}");
+            // }
+            // else
+            // {
+            //     Logger.LogInfo($"Entering suggestion from \"{_lastText}\" to {suggestion}");
+            // }
+            _inSuggestion = true;
+
+            var matchedChars = 0;
+            var suggestionStartsWithQuote = suggestion.Length > 0 && suggestion[0] == '"';
+            var currentStartsWithQuote = currentText.Length > 0 && currentText[0] == '"';
+            var skipCheckingFirst = suggestionStartsWithQuote && !currentStartsWithQuote;
+            for (int i = skipCheckingFirst ? 1 : 0, j = 0;
+                 i < suggestion.Length && j < currentText.Length;
+                 i++, j++)
+            {
+                if (string.Equals(
+                    suggestion[i].ToString(),
+                    currentText[j].ToString(),
+                    StringComparison.OrdinalIgnoreCase))
+                {
+                    matchedChars++;
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            var first = skipCheckingFirst ? "\"" : string.Empty;
+            var second = currentText.AsSpan(0, matchedChars);
+            var third = suggestion.AsSpan(matchedChars + (skipCheckingFirst ? 1 : 0));
+
+            var newText = string.Concat(
+                first,
+                second,
+                third);
+
+            FilterBox.Text = newText;
+
+            var wrappedInQuotes = suggestionStartsWithQuote && suggestion.Last() == '"';
+            if (wrappedInQuotes)
+            {
+                FilterBox.Select(
+                    (skipCheckingFirst ? 1 : 0) + matchedChars,
+                    Math.Max(0, suggestion.Length - matchedChars - 1 + (skipCheckingFirst ? -1 : 0)));
+            }
+            else
+            {
+                FilterBox.Select(matchedChars, suggestion.Length - matchedChars);
+            }
+        }));
+    }
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml.cs

@@ -265,6 +265,13 @@ public sealed partial class ListPage : Page,
         {
             ItemsList.SelectedIndex = 0;
         }
+
+        // Always reset the selected item when the top-level list page changes
+        // its items
+        if (!sender.IsNested)
+        {
+            ItemsList.SelectedIndex = 0;
+        }
     }
 
     private void ViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)

src/modules/cmdpal/Microsoft.CmdPal.UI/Styles/TextBox.xaml

@@ -186,6 +186,8 @@
                             x:Load="False"
                             AutomationProperties.AccessibilityView="Raw"
                             CharacterSpacing="15"
+                            FontFamily="{TemplateBinding FontFamily}"
+                            FontSize="{TemplateBinding FontSize}"
                             Foreground="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForeground}}"
                             Text="{TemplateBinding Description}"
                             TextWrapping="{TemplateBinding TextWrapping}" />

src/modules/cmdpal/Microsoft.CmdPal.UI/rd.xml

@@ -3,5 +3,8 @@
 		<Assembly Name="Microsoft.WinUI">
 			<Type Name="Microsoft.UI.Xaml.Controls.FontIconSource" Dynamic="Required All" />
 		</Assembly>
+		<Assembly Name="Microsoft.CmdPal.UI">
+			<Type Name="Microsoft.CmdPal.UI.ContextItemTemplateSelector" Dynamic="Required All" />
+		</Assembly>
 	</Application>
 </Directives>

src/modules/cmdpal/README.md

@@ -2,16 +2,15 @@
 
 Windows Command Palette ("CmdPal") is the next iteration of PowerToys Run. With extensibility at its core, the Command Palette is your one-stop launcher to start _anything_.
 
-By default, CmdPal is bound to <kbd>Win+Alt+Space</kbd>. 
-
+By default, CmdPal is bound to <kbd>Win+Alt+Space</kbd>.
 
 ## Creating an extension
 
-The fastest way to get started is just to run the "Create extension" command in the palette itself. That'll prompt you for a project name and a Display Name, and where you want to place your project. Then just open the `sln` it produces. You should be ready to go 🙂. 
+The fastest way to get started is just to run the "Create extension" command in the palette itself. That'll prompt you for a project name and a Display Name, and where you want to place your project. Then just open the `sln` it produces. You should be ready to go 🙂.
 
 The official API documentation can be found [on this docs site](https://learn.microsoft.com/windows/powertoys/command-palette/extensibility-overview).
 
-We've also got samples, so that you can see how the APIs in-action. 
+We've also got samples, so that you can see how the APIs in-action.
 
 * We've got [generic samples] in the repo
 * We've got [real samples] in the repo too
@@ -22,14 +21,22 @@ We've also got samples, so that you can see how the APIs in-action.
 
 ## Building CmdPal
 
-The Command Palette is included as a part of PowerToys. To get started building, open up the root `PowerToys.sln`, to get started building. 
+### Install & Build PowerToys
+
+1. Follow the install and build instructions for [PowerToys](https://github.com/microsoft/PowerToys/tree/main/doc/devdocs#compiling-powertoys)
+
+### Load & Build
+
+1. In Visual Studio, in the Solution Explorer Pane, confirm that all of the files/projects in `src\modules\CommandPalette` and `src\common\CalculatorEngineCommon` do not have `(unloaded)` on the right side
+    1. If any file has `(unloaded)`, right click on file and select `Reload Project`
+1. Now you can right click on one of the project below to `Build` and then `Deploy`:
 
 Projects of interest are:
 * `Microsoft.CmdPal.UI`: This is the main project for CmdPal. Build and run this to get the CmdPal.
 * `Microsoft.CommandPalette.Extensions`: This is the official extension interface. 
   * This is designed to be language-agnostic. Any programming language which supports implementing WinRT interfaces should be able to implement the WinRT interface. 
 * `Microsoft.CommandPalette.Extensions.Toolkit`: This is a C# helper library for creating extensions. This makes writing extensions easier.
-* Everything under "SampleExtensions": These are example plugins to demo how to author extensions. Deploy any number of these, to get a feel for how the extension API works. 
+* Everything under "SampleExtensions": These are example plugins to demo how to author extensions. Deploy any number of these, to get a feel for how the extension API works.
 
 ### Footnotes and other links
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/ResultHelper.cs

@@ -30,13 +30,14 @@ public static class ResultHelper
 
         var copyCommandItem = CreateResult(roundedResult, inputCulture, outputCulture, query);
 
+        // No TextToSuggest on the main save command item. We don't want to keep suggesting what the result is,
+        // as the user is typing it.
         return new ListItem(saveCommand)
         {
             // Using CurrentCulture since this is user facing
             Icon = Icons.ResultIcon,
             Title = result,
             Subtitle = query,
-            TextToSuggest = result,
             MoreCommands = [
                 new CommandContextItem(copyCommandItem.Command)
                 {

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/FallbackOpenFileItem.cs

@@ -23,6 +23,8 @@ internal sealed partial class FallbackOpenFileItem : FallbackCommandItem, System
 
     private uint _queryCookie = 10;
 
+    private Func<string, bool> _suppressCallback;
+
     public FallbackOpenFileItem()
         : base(_baseCommandWithId, Resources.Indexer_Find_Path_fallback_display_title)
     {
@@ -44,6 +46,17 @@ internal sealed partial class FallbackOpenFileItem : FallbackCommandItem, System
             return;
         }
 
+        if (_suppressCallback != null && _suppressCallback(query))
+        {
+            Command = new NoOpCommand();
+            Title = string.Empty;
+            Subtitle = string.Empty;
+            Icon = null;
+            MoreCommands = null;
+
+            return;
+        }
+
         if (Path.Exists(query))
         {
             // Exit 1: The query is a direct path to a file. Great! Return it.
@@ -128,4 +141,9 @@ internal sealed partial class FallbackOpenFileItem : FallbackCommandItem, System
         _searchEngine.Dispose();
         GC.SuppressFinalize(this);
     }
+
+    public void SuppressFallbackWhen(Func<string, bool> callback)
+    {
+        _suppressCallback = callback;
+    }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/IndexerCommandsProvider.cs

@@ -2,6 +2,7 @@
 // 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 Microsoft.CmdPal.Ext.Indexer.Data;
 using Microsoft.CmdPal.Ext.Indexer.Properties;
 using Microsoft.CommandPalette.Extensions;
@@ -41,4 +42,9 @@ public partial class IndexerCommandsProvider : CommandProvider
         [
             _fallbackFileItem
         ];
+
+    public void SuppressFallbackWhen(Func<string, bool> callback)
+    {
+        _fallbackFileItem.SuppressFallbackWhen(callback);
+    }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Commands/ExecuteItem.cs

@@ -36,7 +36,7 @@ internal sealed partial class ExecuteItem : InvokableCommand
         else
         {
             Name = Properties.Resources.generic_run_command;
-            Icon = Icons.ReturnIcon;
+            Icon = Icons.RunV2Icon;
         }
 
         Cmd = cmd;
@@ -44,36 +44,6 @@ internal sealed partial class ExecuteItem : InvokableCommand
         _runas = type;
     }
 
-    private static bool ExistInPath(string filename)
-    {
-        if (File.Exists(filename))
-        {
-            return true;
-        }
-        else
-        {
-            var values = Environment.GetEnvironmentVariable("PATH");
-            if (values != null)
-            {
-                foreach (var path in values.Split(';'))
-                {
-                    var path1 = Path.Combine(path, filename);
-                    var path2 = Path.Combine(path, filename + ".exe");
-                    if (File.Exists(path1) || File.Exists(path2))
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-            else
-            {
-                return false;
-            }
-        }
-    }
-
     private void Execute(Func<ProcessStartInfo, Process?> startProcess, ProcessStartInfo info)
     {
         if (startProcess == null)
@@ -184,7 +154,7 @@ internal sealed partial class ExecuteItem : InvokableCommand
                     if (parts.Length == 2)
                     {
                         var filename = parts[0];
-                        if (ExistInPath(filename))
+                        if (ShellListPageHelpers.FileExistInPath(filename))
                         {
                             var arguments = parts[1];
                             if (_settings.LeaveShellOpen)

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/FallbackExecuteItem.cs

@@ -2,39 +2,197 @@
 // 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.Ext.Shell.Commands;
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.CmdPal.Ext.Shell.Helpers;
+using Microsoft.CmdPal.Ext.Shell.Pages;
 using Microsoft.CmdPal.Ext.Shell.Properties;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.Shell;
 
-internal sealed partial class FallbackExecuteItem : FallbackCommandItem
+internal sealed partial class FallbackExecuteItem : FallbackCommandItem, IDisposable
 {
-    private readonly ExecuteItem _executeItem;
-    private readonly SettingsManager _settings;
+    private CancellationTokenSource? _cancellationTokenSource;
+    private Task? _currentUpdateTask;
 
     public FallbackExecuteItem(SettingsManager settings)
         : base(
-            new ExecuteItem(string.Empty, settings) { Id = "com.microsoft.run.fallback" },
+            new NoOpCommand() { Id = "com.microsoft.run.fallback" },
             Resources.shell_command_display_title)
     {
-        _settings = settings;
-        _executeItem = (ExecuteItem)this.Command!;
         Title = string.Empty;
-        _executeItem.Name = string.Empty;
         Subtitle = Properties.Resources.generic_run_command;
         Icon = Icons.RunV2Icon; // Defined in Icons.cs and contains the execute command icon.
     }
 
     public override void UpdateQuery(string query)
     {
-        _executeItem.Cmd = query;
-        _executeItem.Name = string.IsNullOrEmpty(query) ? string.Empty : Properties.Resources.generic_run_command;
-        Title = query;
-        MoreCommands = [
-            new CommandContextItem(new ExecuteItem(query, _settings, RunAsType.Administrator)),
-            new CommandContextItem(new ExecuteItem(query, _settings, RunAsType.OtherUser)),
-        ];
+        // Cancel any ongoing query processing
+        _cancellationTokenSource?.Cancel();
+
+        _cancellationTokenSource = new CancellationTokenSource();
+        var cancellationToken = _cancellationTokenSource.Token;
+
+        try
+        {
+            // Save the latest update task
+            _currentUpdateTask = DoUpdateQueryAsync(query, cancellationToken);
+        }
+        catch (OperationCanceledException)
+        {
+            // DO NOTHING HERE
+            return;
+        }
+        catch (Exception)
+        {
+            // Handle other exceptions
+            return;
+        }
+
+        // Await the task to ensure only the latest one gets processed
+        _ = ProcessUpdateResultsAsync(_currentUpdateTask);
+    }
+
+    private async Task ProcessUpdateResultsAsync(Task updateTask)
+    {
+        try
+        {
+            await updateTask;
+        }
+        catch (OperationCanceledException)
+        {
+            // Handle cancellation gracefully
+        }
+        catch (Exception)
+        {
+            // Handle other exceptions
+        }
+    }
+
+    private async Task DoUpdateQueryAsync(string query, CancellationToken cancellationToken)
+    {
+        // Check for cancellation at the start
+        cancellationToken.ThrowIfCancellationRequested();
+
+        var searchText = query.Trim();
+        var expanded = Environment.ExpandEnvironmentVariables(searchText);
+        searchText = expanded;
+        if (string.IsNullOrEmpty(searchText) || string.IsNullOrWhiteSpace(searchText))
+        {
+            Command = null;
+            Title = string.Empty;
+            return;
+        }
+
+        ShellListPage.ParseExecutableAndArgs(searchText, out var exe, out var args);
+
+        // Check for cancellation before file system operations
+        cancellationToken.ThrowIfCancellationRequested();
+
+        var exeExists = false;
+        var fullExePath = string.Empty;
+        var pathIsDir = false;
+
+        try
+        {
+            // Create a timeout for file system operations (200ms)
+            using var timeoutCts = new CancellationTokenSource(TimeSpan.FromMilliseconds(200));
+            using var combinedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCts.Token);
+            var timeoutToken = combinedCts.Token;
+
+            // Use Task.Run with timeout for file system operations
+            var fileSystemTask = Task.Run(
+                () =>
+                {
+                    exeExists = ShellListPageHelpers.FileExistInPath(exe, out fullExePath);
+                    pathIsDir = Directory.Exists(exe);
+                },
+                CancellationToken.None);
+
+            // Wait for either completion or timeout
+            await fileSystemTask.WaitAsync(timeoutToken);
+        }
+        catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
+        {
+            // Main cancellation token was cancelled, re-throw
+            throw;
+        }
+        catch (TimeoutException)
+        {
+            // Timeout occurred - use defaults
+            return;
+        }
+        catch (OperationCanceledException)
+        {
+            // Timeout occurred (from WaitAsync) - use defaults
+            return;
+        }
+        catch (Exception)
+        {
+            // Handle any other exceptions that might bubble up
+            return;
+        }
+
+        // Check for cancellation before updating UI properties
+        cancellationToken.ThrowIfCancellationRequested();
+
+        if (exeExists)
+        {
+            // TODO we need to probably get rid of the settings for this provider entirely
+            var exeItem = ShellListPage.CreateExeItem(exe, args, fullExePath);
+            Title = exeItem.Title;
+            Subtitle = exeItem.Subtitle;
+            Icon = exeItem.Icon;
+            Command = exeItem.Command;
+            MoreCommands = exeItem.MoreCommands;
+        }
+        else if (pathIsDir)
+        {
+            var pathItem = new PathListItem(exe, query);
+            Title = pathItem.Title;
+            Subtitle = pathItem.Subtitle;
+            Icon = pathItem.Icon;
+            Command = pathItem.Command;
+            MoreCommands = pathItem.MoreCommands;
+        }
+        else if (System.Uri.TryCreate(searchText, UriKind.Absolute, out var uri))
+        {
+            Command = new OpenUrlCommand(searchText) { Result = CommandResult.Dismiss() };
+            Title = searchText;
+        }
+        else
+        {
+            Command = null;
+            Title = string.Empty;
+        }
+
+        // Final cancellation check
+        cancellationToken.ThrowIfCancellationRequested();
+    }
+
+    public void Dispose()
+    {
+        _cancellationTokenSource?.Cancel();
+        _cancellationTokenSource?.Dispose();
+    }
+
+    internal static bool SuppressFileFallbackIf(string query)
+    {
+        var searchText = query.Trim();
+        var expanded = Environment.ExpandEnvironmentVariables(searchText);
+        searchText = expanded;
+        if (string.IsNullOrEmpty(searchText) || string.IsNullOrWhiteSpace(searchText))
+        {
+            return false;
+        }
+
+        ShellListPage.ParseExecutableAndArgs(searchText, out var exe, out var args);
+        var exeExists = ShellListPageHelpers.FileExistInPath(exe, out var fullExePath);
+        var pathIsDir = Directory.Exists(exe);
+
+        return exeExists || pathIsDir;
     }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Helpers/ShellListPageHelpers.cs

@@ -4,11 +4,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Reflection;
+using System.IO;
 using System.Text;
-using System.Threading.Tasks;
+using System.Threading;
 using Microsoft.CmdPal.Ext.Shell.Commands;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
@@ -26,7 +24,7 @@ public class ShellListPageHelpers
 
     private ListItem GetCurrentCmd(string cmd)
     {
-        ListItem result = new ListItem(new ExecuteItem(cmd, _settings))
+        var result = new ListItem(new ExecuteItem(cmd, _settings))
         {
             Title = cmd,
             Subtitle = Properties.Resources.cmd_plugin_name + ": " + Properties.Resources.cmd_execute_through_shell,
@@ -36,58 +34,6 @@ public class ShellListPageHelpers
         return result;
     }
 
-    private List<ListItem> GetHistoryCmds(string cmd, ListItem result)
-    {
-        IEnumerable<ListItem?> history = _settings.Count.Where(o => o.Key.Contains(cmd, StringComparison.CurrentCultureIgnoreCase))
-            .OrderByDescending(o => o.Value)
-            .Select(m =>
-            {
-                if (m.Key == cmd)
-                {
-                    // Using CurrentCulture since this is user facing
-                    result.Subtitle = Properties.Resources.cmd_plugin_name + ": " + string.Format(CultureInfo.CurrentCulture, CmdHasBeenExecutedTimes, m.Value);
-                    return null;
-                }
-
-                var ret = new ListItem(new ExecuteItem(m.Key, _settings))
-                {
-                    Title = m.Key,
-
-                    // Using CurrentCulture since this is user facing
-                    Subtitle = Properties.Resources.cmd_plugin_name + ": " + string.Format(CultureInfo.CurrentCulture, CmdHasBeenExecutedTimes, m.Value),
-                    Icon = Icons.HistoryIcon,
-                };
-                return ret;
-            }).Where(o => o != null).Take(4);
-        return history.Select(o => o!).ToList();
-    }
-
-    public List<ListItem> Query(string query)
-    {
-        ArgumentNullException.ThrowIfNull(query);
-
-        List<ListItem> results = new List<ListItem>();
-        var cmd = query;
-        if (string.IsNullOrEmpty(cmd))
-        {
-            results = ResultsFromHistory();
-        }
-        else
-        {
-            var queryCmd = GetCurrentCmd(cmd);
-            results.Add(queryCmd);
-            var history = GetHistoryCmds(cmd, queryCmd);
-            results.AddRange(history);
-        }
-
-        foreach (var currItem in results)
-        {
-            currItem.MoreCommands = LoadContextMenus(currItem).ToArray();
-        }
-
-        return results;
-    }
-
     public List<CommandContextItem> LoadContextMenus(ListItem listItem)
     {
         var resultList = new List<CommandContextItem>
@@ -99,18 +45,53 @@ public class ShellListPageHelpers
         return resultList;
     }
 
-    private List<ListItem> ResultsFromHistory()
+    internal static bool FileExistInPath(string filename)
     {
-        IEnumerable<ListItem> history = _settings.Count.OrderByDescending(o => o.Value)
-            .Select(m => new ListItem(new ExecuteItem(m.Key, _settings))
+        return FileExistInPath(filename, out var _);
+    }
+
+    internal static bool FileExistInPath(string filename, out string fullPath, CancellationToken? token = null)
+    {
+        fullPath = string.Empty;
+
+        if (File.Exists(filename))
+        {
+            token?.ThrowIfCancellationRequested();
+            fullPath = Path.GetFullPath(filename);
+            return true;
+        }
+        else
+        {
+            var values = Environment.GetEnvironmentVariable("PATH");
+            if (values != null)
             {
-                Title = m.Key,
+                foreach (var path in values.Split(';'))
+                {
+                    var path1 = Path.Combine(path, filename);
+                    if (File.Exists(path1))
+                    {
+                        fullPath = Path.GetFullPath(path1);
+                        return true;
+                    }
 
-                // Using CurrentCulture since this is user facing
-                Subtitle = Properties.Resources.cmd_plugin_name + ": " + string.Format(CultureInfo.CurrentCulture, CmdHasBeenExecutedTimes, m.Value),
-                Icon = Icons.HistoryIcon,
-            }).Take(5);
+                    token?.ThrowIfCancellationRequested();
 
-        return history.ToList();
+                    var path2 = Path.Combine(path, filename + ".exe");
+                    if (File.Exists(path2))
+                    {
+                        fullPath = Path.GetFullPath(path2);
+                        return true;
+                    }
+
+                    token?.ThrowIfCancellationRequested();
+                }
+
+                return false;
+            }
+            else
+            {
+                return false;
+            }
+        }
     }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Icons.cs

@@ -10,11 +10,9 @@ internal sealed class Icons
 {
     internal static IconInfo RunV2Icon { get; } = IconHelpers.FromRelativePath("Assets\\Run.svg");
 
-    internal static IconInfo HistoryIcon { get; } = new IconInfo("\uE81C"); // History
+    internal static IconInfo FolderIcon { get; } = new IconInfo("📁");
 
     internal static IconInfo AdminIcon { get; } = new IconInfo("\xE7EF"); // Admin Icon
 
     internal static IconInfo UserIcon { get; } = new IconInfo("\xE7EE"); // User Icon
-
-    internal static IconInfo ReturnIcon { get; } = new IconInfo("\uE751"); // Return Key Icon
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Microsoft.CmdPal.Ext.Shell.csproj

@@ -15,6 +15,10 @@
   <ItemGroup>
     <ProjectReference Include="..\..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.CommandLine" />
+  </ItemGroup>
+  
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DependentUpon>Resources.resx</DependentUpon>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Pages/RunExeItem.cs

@@ -0,0 +1,104 @@
+// 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 System;
+using System.Threading.Tasks;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+using Windows.Storage.Streams;
+
+namespace Microsoft.CmdPal.Ext.Shell.Pages;
+
+internal sealed partial class RunExeItem : ListItem
+{
+    private readonly Lazy<IconInfo> _icon;
+
+    public override IIconInfo? Icon { get => _icon.Value; set => base.Icon = value; }
+
+    internal string FullExePath { get; private set; }
+
+    internal string Exe { get; private set; }
+
+    private string _args = string.Empty;
+
+    public RunExeItem(string exe, string args, string fullExePath)
+    {
+        FullExePath = fullExePath;
+        Exe = exe;
+        var command = new AnonymousCommand(Run)
+        {
+            Name = Properties.Resources.generic_run_command,
+            Result = CommandResult.Dismiss(),
+        };
+        Command = command;
+        Subtitle = FullExePath;
+
+        _icon = new Lazy<IconInfo>(() =>
+        {
+            var t = FetchIcon();
+            t.Wait();
+            return t.Result;
+        });
+
+        UpdateArgs(args);
+
+        MoreCommands = [
+            new CommandContextItem(
+                new AnonymousCommand(RunAsAdmin)
+            {
+                Name = Properties.Resources.cmd_run_as_administrator,
+                Icon = Icons.AdminIcon,
+            }),
+            new CommandContextItem(
+                new AnonymousCommand(RunAsOther)
+            {
+                Name = Properties.Resources.cmd_run_as_user,
+                Icon = Icons.UserIcon,
+            }),
+        ];
+    }
+
+    internal void UpdateArgs(string args)
+    {
+        _args = args;
+        Title = string.IsNullOrEmpty(_args) ? Exe : Exe + " " + _args; // todo! you're smarter than this
+    }
+
+    public async Task<IconInfo> FetchIcon()
+    {
+        IconInfo? icon = null;
+
+        try
+        {
+            var stream = await ThumbnailHelper.GetThumbnail(FullExePath);
+            if (stream != null)
+            {
+                var data = new IconData(RandomAccessStreamReference.CreateFromStream(stream));
+                icon = new IconInfo(data, data);
+                ((AnonymousCommand?)Command)!.Icon = icon;
+            }
+        }
+        catch
+        {
+        }
+
+        icon = icon ?? new IconInfo(FullExePath);
+        return icon;
+    }
+
+    public void Run()
+    {
+        ShellHelpers.OpenInShell(FullExePath, _args);
+    }
+
+    public void RunAsAdmin()
+    {
+        ShellHelpers.OpenInShell(FullExePath, _args, runAs: ShellHelpers.ShellRunAsType.Administrator);
+    }
+
+    public void RunAsOther()
+    {
+        ShellHelpers.OpenInShell(FullExePath, _args, runAs: ShellHelpers.ShellRunAsType.OtherUser);
+    }
+}

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

@@ -2,6 +2,12 @@
 // 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.Threading;
+using System.Threading.Tasks;
 using Microsoft.CmdPal.Ext.Shell.Helpers;
 using Microsoft.CmdPal.Ext.Shell.Properties;
 using Microsoft.CommandPalette.Extensions;
@@ -9,20 +15,436 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.Shell.Pages;
 
-internal sealed partial class ShellListPage : DynamicListPage
+internal sealed partial class ShellListPage : DynamicListPage, IDisposable
 {
     private readonly ShellListPageHelpers _helper;
 
-    public ShellListPage(SettingsManager settingsManager)
+    private readonly List<ListItem> _topLevelItems = [];
+    private readonly List<ListItem> _historyItems = [];
+    private RunExeItem? _exeItem;
+    private List<ListItem> _pathItems = [];
+    private ListItem? _uriItem;
+
+    private CancellationTokenSource? _cancellationTokenSource;
+    private Task? _currentSearchTask;
+
+    public ShellListPage(SettingsManager settingsManager, bool addBuiltins = false)
     {
         Icon = Icons.RunV2Icon;
         Id = "com.microsoft.cmdpal.shell";
         Name = Resources.cmd_plugin_name;
         PlaceholderText = Resources.list_placeholder_text;
         _helper = new(settingsManager);
+
+        EmptyContent = new CommandItem()
+        {
+            Title = Resources.cmd_plugin_name,
+            Icon = Icons.RunV2Icon,
+            Subtitle = Resources.list_placeholder_text,
+        };
+
+        if (addBuiltins)
+        {
+            // here, we _could_ add built-in providers if we wanted. links to apps, calc, etc.
+            // That would be a truly run-first experience
+        }
     }
 
-    public override void UpdateSearchText(string oldSearch, string newSearch) => RaiseItemsChanged(0);
+    public override void UpdateSearchText(string oldSearch, string newSearch)
+    {
+        if (newSearch == oldSearch)
+        {
+            return;
+        }
 
-    public override IListItem[] GetItems() => [.. _helper.Query(SearchText)];
+        DoUpdateSearchText(newSearch);
+    }
+
+    private void DoUpdateSearchText(string newSearch)
+    {
+        // Cancel any ongoing search
+        _cancellationTokenSource?.Cancel();
+
+        _cancellationTokenSource = new CancellationTokenSource();
+        var cancellationToken = _cancellationTokenSource.Token;
+
+        IsLoading = true;
+
+        try
+        {
+            // Save the latest search task
+            _currentSearchTask = BuildListItemsForSearchAsync(newSearch, cancellationToken);
+        }
+        catch (OperationCanceledException)
+        {
+            // DO NOTHING HERE
+            return;
+        }
+        catch (Exception)
+        {
+            // Handle other exceptions
+            return;
+        }
+
+        // Await the task to ensure only the latest one gets processed
+        _ = ProcessSearchResultsAsync(_currentSearchTask, newSearch);
+    }
+
+    private async Task ProcessSearchResultsAsync(Task searchTask, string newSearch)
+    {
+        try
+        {
+            await searchTask;
+
+            // Ensure this is still the latest task
+            if (_currentSearchTask == searchTask)
+            {
+                // The search results have already been updated in BuildListItemsForSearchAsync
+                IsLoading = false;
+                RaiseItemsChanged();
+            }
+        }
+        catch (OperationCanceledException)
+        {
+            // Handle cancellation gracefully
+        }
+        catch (Exception)
+        {
+            // Handle other exceptions
+            IsLoading = false;
+        }
+    }
+
+    private async Task BuildListItemsForSearchAsync(string newSearch, CancellationToken cancellationToken)
+    {
+        // Check for cancellation at the start
+        cancellationToken.ThrowIfCancellationRequested();
+
+        // If the search text is the start of a path to a file (it might be a
+        // UNC path), then we want to list all the files that start with that text:
+
+        // 1. Check if the search text is a valid path
+        // 2. If it is, then list all the files that start with that text
+        var searchText = newSearch.Trim();
+
+        var expanded = Environment.ExpandEnvironmentVariables(searchText);
+
+        // Check for cancellation after environment expansion
+        cancellationToken.ThrowIfCancellationRequested();
+
+        // TODO we can be smarter about only re-reading the filesystem if the
+        // new search is just the oldSearch+some chars
+        if (string.IsNullOrEmpty(searchText) || string.IsNullOrWhiteSpace(searchText))
+        {
+            _pathItems.Clear();
+            _exeItem = null;
+            _uriItem = null;
+            return;
+        }
+
+        ParseExecutableAndArgs(expanded, out var exe, out var args);
+
+        // Check for cancellation before file system operations
+        cancellationToken.ThrowIfCancellationRequested();
+
+        // Reset the path resolution flag
+        var couldResolvePath = false;
+
+        var exeExists = false;
+        var fullExePath = string.Empty;
+        var pathIsDir = false;
+
+        try
+        {
+            // Create a timeout for file system operations (200ms)
+            using var timeoutCts = new CancellationTokenSource(TimeSpan.FromMilliseconds(200));
+            using var combinedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCts.Token);
+            var timeoutToken = combinedCts.Token;
+
+            // Use Task.Run with timeout - this will actually timeout even if the sync operations don't respond to cancellation
+            var pathResolutionTask = Task.Run(
+                () =>
+            {
+                // Don't check cancellation token here - let the Task timeout handle it
+                exeExists = ShellListPageHelpers.FileExistInPath(exe, out fullExePath);
+                pathIsDir = Directory.Exists(expanded);
+                couldResolvePath = true;
+            },
+                CancellationToken.None); // Use None here since we're handling timeout differently
+
+            // Wait for either completion or timeout
+            await pathResolutionTask.WaitAsync(timeoutToken);
+        }
+        catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
+        {
+            // Main cancellation token was cancelled, re-throw
+            throw;
+        }
+        catch (TimeoutException)
+        {
+            // Timeout occurred
+            couldResolvePath = false;
+        }
+        catch (OperationCanceledException)
+        {
+            // Timeout occurred (from WaitAsync)
+            couldResolvePath = false;
+        }
+        catch (Exception)
+        {
+            // Handle any other exceptions that might bubble up
+            couldResolvePath = false;
+        }
+
+        cancellationToken.ThrowIfCancellationRequested();
+
+        _pathItems.Clear();
+
+        // We want to show path items:
+        // * If there's no args, AND (the path doesn't exist OR the path is a dir)
+        if (string.IsNullOrEmpty(args)
+            && (!exeExists || pathIsDir)
+            && couldResolvePath)
+        {
+            await CreatePathItemsAsync(expanded, searchText, cancellationToken);
+        }
+
+        // Check for cancellation before creating exe items
+        cancellationToken.ThrowIfCancellationRequested();
+
+        if (couldResolvePath && exeExists)
+        {
+            CreateAndAddExeItems(exe, args, fullExePath);
+        }
+        else
+        {
+            _exeItem = null;
+        }
+
+        // Only create the URI item if we didn't make a file or exe item for it.
+        if (!exeExists && !pathIsDir)
+        {
+            CreateUriItems(searchText);
+        }
+        else
+        {
+            _uriItem = null;
+        }
+
+        // Final cancellation check
+        cancellationToken.ThrowIfCancellationRequested();
+    }
+
+    private static ListItem PathToListItem(string path, string originalPath, string args = "")
+    {
+        var pathItem = new PathListItem(path, originalPath);
+
+        // Is this path an executable? If so, then make a RunExeItem
+        if (IsExecutable(path))
+        {
+            var exeItem = new RunExeItem(Path.GetFileName(path), args, path);
+
+            exeItem.MoreCommands = [
+            .. exeItem.MoreCommands,
+            .. pathItem.MoreCommands];
+            return exeItem;
+        }
+
+        return pathItem;
+    }
+
+    public override IListItem[] GetItems()
+    {
+        var filteredTopLevel = ListHelpers.FilterList(_topLevelItems, SearchText);
+        List<ListItem> uriItems = _uriItem != null ? [_uriItem] : [];
+        List<ListItem> exeItems = _exeItem != null ? [_exeItem] : [];
+        return
+            exeItems
+            .Concat(filteredTopLevel)
+            .Concat(_historyItems)
+            .Concat(_pathItems)
+            .Concat(uriItems)
+            .ToArray();
+    }
+
+    internal static RunExeItem CreateExeItem(string exe, string args, string fullExePath)
+    {
+        // PathToListItem will return a RunExeItem if it can find a executable.
+        // It will ALSO add the file search commands to the RunExeItem.
+        return PathToListItem(fullExePath, exe, args) as RunExeItem ??
+               new RunExeItem(exe, args, fullExePath);
+    }
+
+    private void CreateAndAddExeItems(string exe, string args, string fullExePath)
+    {
+        // If we already have an exe item, and the exe is the same, we can just update it
+        if (_exeItem != null && _exeItem.FullExePath.Equals(fullExePath, StringComparison.OrdinalIgnoreCase))
+        {
+            _exeItem.UpdateArgs(args);
+        }
+        else
+        {
+            _exeItem = CreateExeItem(exe, args, fullExePath);
+        }
+    }
+
+    private static bool IsExecutable(string path)
+    {
+        // Is this path an executable?
+        // check all the extensions in PATHEXT
+        var extensions = Environment.GetEnvironmentVariable("PATHEXT")?.Split(';') ?? Array.Empty<string>();
+        return extensions.Any(ext => string.Equals(Path.GetExtension(path), ext, StringComparison.OrdinalIgnoreCase));
+    }
+
+    private async Task CreatePathItemsAsync(string searchPath, string originalPath, CancellationToken cancellationToken)
+    {
+        var directoryPath = string.Empty;
+        var searchPattern = string.Empty;
+
+        var startsWithQuote = searchPath.Length > 0 && searchPath[0] == '"';
+        var endsWithQuote = searchPath.Last() == '"';
+        var trimmed = (startsWithQuote && endsWithQuote) ? searchPath.Substring(1, searchPath.Length - 2) : searchPath;
+        var isDriveRoot = trimmed.Length == 2 && trimmed[1] == ':';
+
+        // we should also handle just drive roots, ala c:\ or d:\
+        // we need to handle this case first, because "C:" does exist, but we need to append the "\" in that case
+        if (isDriveRoot)
+        {
+            directoryPath = trimmed + "\\";
+            searchPattern = $"*";
+        }
+
+        // Easiest case: text is literally already a full directory
+        else if (Directory.Exists(trimmed))
+        {
+            directoryPath = trimmed;
+            searchPattern = $"*";
+        }
+
+        // Check if the search text is a valid path
+        else if (Path.IsPathRooted(trimmed) && Path.GetDirectoryName(trimmed) is string directoryName)
+        {
+            directoryPath = directoryName;
+            searchPattern = $"{Path.GetFileName(trimmed)}*";
+        }
+
+        // Check if the search text is a valid UNC path
+        else if (trimmed.StartsWith(@"\\", System.StringComparison.CurrentCultureIgnoreCase) &&
+                 trimmed.Contains(@"\\"))
+        {
+            directoryPath = trimmed;
+            searchPattern = $"*";
+        }
+
+        // Check for cancellation before directory operations
+        cancellationToken.ThrowIfCancellationRequested();
+
+        var dirExists = Directory.Exists(directoryPath);
+
+        // searchPath is fully expanded, and originalPath is not. We might get:
+        // * original: X%Y%Z\partial
+        // * search: X_foo_Z\partial
+        // and we want the result `X_foo_Z\partialOne` to use the suggestion `X%Y%Z\partialOne`
+        //
+        // To do this:
+        // * Get the directoryPath
+        // * trim that out of the beginning of searchPath -> searchPathTrailer
+        // * everything left from searchPath? remove searchPathTrailer from the end of originalPath
+        // that gets us the expanded original dir
+
+        // Check if the directory exists
+        if (dirExists)
+        {
+            // Check for cancellation before file system enumeration
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // Get all the files in the directory that start with the search text
+            // Run this on a background thread to avoid blocking
+            var files = await Task.Run(() => Directory.GetFileSystemEntries(directoryPath, searchPattern), cancellationToken);
+
+            // Check for cancellation after file enumeration
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var searchPathTrailer = trimmed.Remove(0, Math.Min(directoryPath.Length, trimmed.Length));
+            var originalBeginning = originalPath.Remove(originalPath.Length - searchPathTrailer.Length);
+            if (isDriveRoot)
+            {
+                originalBeginning = string.Concat(originalBeginning, '\\');
+            }
+
+            // Create a list of commands for each file
+            var commands = files.Select(f => PathToListItem(f, originalBeginning)).ToList();
+
+            // Final cancellation check before updating results
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // Add the commands to the list
+            _pathItems = commands;
+        }
+        else
+        {
+            _pathItems.Clear();
+        }
+    }
+
+    internal static void ParseExecutableAndArgs(string input, out string executable, out string arguments)
+    {
+        input = input.Trim();
+        executable = string.Empty;
+        arguments = string.Empty;
+
+        if (string.IsNullOrEmpty(input))
+        {
+            return;
+        }
+
+        if (input.StartsWith("\"", System.StringComparison.InvariantCultureIgnoreCase))
+        {
+            // Find the closing quote
+            var closingQuoteIndex = input.IndexOf('\"', 1);
+            if (closingQuoteIndex > 0)
+            {
+                executable = input.Substring(1, closingQuoteIndex - 1);
+                if (closingQuoteIndex + 1 < input.Length)
+                {
+                    arguments = input.Substring(closingQuoteIndex + 1).TrimStart();
+                }
+            }
+        }
+        else
+        {
+            // Executable ends at first space
+            var firstSpaceIndex = input.IndexOf(' ');
+            if (firstSpaceIndex > 0)
+            {
+                executable = input.Substring(0, firstSpaceIndex);
+                arguments = input[(firstSpaceIndex + 1)..].TrimStart();
+            }
+            else
+            {
+                executable = input;
+            }
+        }
+    }
+
+    internal void CreateUriItems(string searchText)
+    {
+        if (!System.Uri.TryCreate(searchText, UriKind.Absolute, out var uri))
+        {
+            _uriItem = null;
+            return;
+        }
+
+        var command = new OpenUrlCommand(searchText) { Result = CommandResult.Dismiss() };
+        _uriItem = new ListItem(command)
+        {
+            Title = searchText,
+        };
+    }
+
+    public void Dispose()
+    {
+        _cancellationTokenSource?.Cancel();
+        _cancellationTokenSource?.Dispose();
+    }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/PathListItem.cs

@@ -0,0 +1,68 @@
+// 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 System;
+using System.IO;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.Shell;
+
+internal sealed partial class PathListItem : ListItem
+{
+    private readonly Lazy<IconInfo> _icon;
+    private readonly bool _isDirectory;
+
+    public override IIconInfo? Icon { get => _icon.Value; set => base.Icon = value; }
+
+    public PathListItem(string path, string originalDir)
+        : base(new OpenUrlCommand(path))
+    {
+        var fileName = Path.GetFileName(path);
+        _isDirectory = Directory.Exists(path);
+        if (_isDirectory)
+        {
+            path = path + "\\";
+            fileName = fileName + "\\";
+        }
+
+        Title = fileName;
+        Subtitle = path;
+
+        // NOTE ME:
+        // If there are spaces on originalDir, trim them off, BEFORE combining originalDir and fileName.
+        // THEN add quotes at the end
+
+        // Trim off leading & trailing quote, if there is one
+        var trimmed = originalDir.Trim('"');
+        var originalPath = Path.Combine(trimmed, fileName);
+        var suggestion = originalPath;
+        var hasSpace = originalPath.Contains(' ');
+        if (hasSpace)
+        {
+            // wrap it in quotes
+            suggestion = string.Concat("\"", suggestion, "\"");
+        }
+
+        TextToSuggest = suggestion;
+        MoreCommands = [
+            new CommandContextItem(new CopyTextCommand(path) { Name = Properties.Resources.copy_path_command_name }) { }
+        ];
+
+        // MoreCommands = [
+        //    new CommandContextItem(new OpenWithCommand(indexerItem)),
+        //    new CommandContextItem(new ShowFileInFolderCommand(indexerItem.FullPath) { Name = Resources.Indexer_Command_ShowInFolder }),
+        //    new CommandContextItem(new CopyPathCommand(indexerItem)),
+        //    new CommandContextItem(new OpenInConsoleCommand(indexerItem)),
+        //    new CommandContextItem(new OpenPropertiesCommand(indexerItem)),
+        // ];
+        _icon = new Lazy<IconInfo>(() =>
+        {
+            var iconStream = ThumbnailHelper.GetThumbnail(path).Result;
+            var icon = iconStream != null ? IconInfo.FromStream(iconStream) :
+             _isDirectory ? Icons.FolderIcon : Icons.RunV2Icon;
+            return icon;
+        });
+    }
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Properties/Resources.Designer.cs

@@ -132,6 +132,15 @@ namespace Microsoft.CmdPal.Ext.Shell.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Copy path.
+        /// </summary>
+        public static string copy_path_command_name {
+            get {
+                return ResourceManager.GetString("copy_path_command_name", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Find and run the executable file.
         /// </summary>

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

@@ -190,4 +190,7 @@
   <data name="shell_command_display_title" xml:space="preserve">
     <value>Run commands</value>
   </data>
+  <data name="copy_path_command_name" xml:space="preserve">
+    <value>Copy path</value>
+  </data>
 </root>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/ShellCommandsProvider.cs

@@ -13,6 +13,7 @@ namespace Microsoft.CmdPal.Ext.Shell;
 public partial class ShellCommandsProvider : CommandProvider
 {
     private readonly CommandItem _shellPageItem;
+
     private readonly SettingsManager _settingsManager = new();
     private readonly FallbackCommandItem _fallbackItem;
 
@@ -39,4 +40,6 @@ public partial class ShellCommandsProvider : CommandProvider
     public override ICommandItem[] TopLevelCommands() => [_shellPageItem];
 
     public override IFallbackCommandItem[]? FallbackCommands() => [_fallbackItem];
+
+    public static bool SuppressFileFallbackIf(string query) => FallbackExecuteItem.SuppressFileFallbackIf(query);
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/FallbackExecuteSearchItem.cs

@@ -15,21 +15,26 @@ internal sealed partial class FallbackExecuteSearchItem : FallbackCommandItem
 {
     private readonly SearchWebCommand _executeItem;
     private static readonly CompositeFormat PluginOpen = System.Text.CompositeFormat.Parse(Properties.Resources.plugin_open);
+    private static readonly CompositeFormat SubtitleText = System.Text.CompositeFormat.Parse(Properties.Resources.web_search_fallback_subtitle);
+    private string _title;
 
     public FallbackExecuteSearchItem(SettingsManager settings)
         : base(new SearchWebCommand(string.Empty, settings) { Id = "com.microsoft.websearch.fallback" }, Resources.command_item_title)
     {
         _executeItem = (SearchWebCommand)this.Command!;
         Title = string.Empty;
+        Subtitle = string.Empty;
         _executeItem.Name = string.Empty;
-        Subtitle = string.Format(CultureInfo.CurrentCulture, PluginOpen, BrowserInfo.Name ?? BrowserInfo.MSEdgeName);
+        _title = string.Format(CultureInfo.CurrentCulture, PluginOpen, BrowserInfo.Name ?? BrowserInfo.MSEdgeName);
         Icon = Icons.WebSearch;
     }
 
     public override void UpdateQuery(string query)
     {
         _executeItem.Arguments = query;
-        _executeItem.Name = string.IsNullOrEmpty(query) ? string.Empty : Properties.Resources.open_in_default_browser;
-        Title = query;
+        var isEmpty = string.IsNullOrEmpty(query);
+        _executeItem.Name = isEmpty ? string.Empty : Properties.Resources.open_in_default_browser;
+        Title = isEmpty ? string.Empty : _title;
+        Subtitle = string.Format(CultureInfo.CurrentCulture, SubtitleText, query);
     }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Properties/Resources.Designer.cs

@@ -248,5 +248,14 @@ namespace Microsoft.CmdPal.Ext.WebSearch.Properties {
                 return ResourceManager.GetString("settings_page_name", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Search for &quot;{0}&quot;.
+        /// </summary>
+        public static string web_search_fallback_subtitle {
+            get {
+                return ResourceManager.GetString("web_search_fallback_subtitle", resourceCulture);
+            }
+        }
     }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Properties/Resources.resx

@@ -178,6 +178,9 @@
   <data name="settings_page_name" xml:space="preserve">
     <value>Settings</value>
   </data>
+  <data name="web_search_fallback_subtitle" xml:space="preserve">
+    <value>Search for "{0}"</value>
+  </data>
   <data name="open_url_fallback_title" xml:space="preserve">
     <value>Open URL</value>
   </data>

src/modules/peek/Peek.CLI/Peek.CLI.csproj

@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\..\Common.SelfContained.props" />
-  <PropertyGroup>
-    <RootNamespace>Peek.CLI</RootNamespace>
-    <Nullable>enable</Nullable>
-    <OutputType>Exe</OutputType> <!-- Exe to show console output -->
-    <AssemblyName>PowerToys.Peek.CLI</AssemblyName>
-    <OutputPath>..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps</OutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-  </PropertyGroup>
-</Project>

src/modules/peek/Peek.CLI/Program.cs

@@ -1,40 +0,0 @@
-// 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 System;
-using System.IO;
-using System.IO.Pipes;
-
-if (args.Length < 1)
-{
-    Console.WriteLine("Usage: PowerToys.Peek.CLI.exe <path>");
-    return 1; // Return error code
-}
-
-try
-{
-    using var pipe = new NamedPipeClientStream(".", "PeekPipe", PipeDirection.Out);
-    pipe.Connect(5000); // 5 second timeout
-
-    using var writer = new StreamWriter(pipe) { AutoFlush = true };
-    writer.WriteLine(args[0]);
-    return 0;
-}
-catch (Exception ex) when (IsConnectionError(ex))
-{
-    Console.WriteLine("Error: Could not connect to PowerToys. Make sure PowerToys Peek is running.");
-    return 2;
-}
-catch (Exception ex)
-{
-    Console.WriteLine($"Error: {ex.Message}");
-    return 3;
-}
-
-static bool IsConnectionError(Exception ex)
-{
-    return ex is TimeoutException ||
-           (ex is InvalidOperationException &&
-            (ex.Message.Contains("Pipe is broken") || ex.Message.Contains("timeout")));
-}

src/modules/peek/Peek.UI/MainWindowViewModel.cs

@@ -62,12 +62,6 @@ namespace Peek.UI
         [ObservableProperty]
         private IFileSystemItem? _currentItem;
 
-        /// <summary>
-        /// Work around missing navigation when peeking from CLI.
-        /// TODO: Implement navigation when peeking from CLI.
-        /// </summary>
-        private bool _isFromCli;
-
         partial void OnCurrentItemChanged(IFileSystemItem? value)
         {
             WindowTitle = value != null
@@ -135,24 +129,7 @@ namespace Peek.UI
             NavigationThrottleTimer.Interval = TimeSpan.FromMilliseconds(NavigationThrottleDelayMs);
         }
 
-        public void Initialize(SelectedItem selectedItem)
-        {
-            switch (selectedItem)
-            {
-                case SelectedItemByPath selectedItemByPath:
-                    InitializeFromCli(selectedItemByPath.Path);
-                    break;
-
-                case SelectedItemByWindowHandle selectedItemByWindowHandle:
-                    InitializeFromExplorer(selectedItemByWindowHandle.WindowHandle);
-                    break;
-
-                default:
-                    throw new NotImplementedException($"Invalid type of selected item: '{selectedItem.GetType().FullName}'");
-            }
-        }
-
-        private void InitializeFromExplorer(HWND foregroundWindowHandle)
+        public void Initialize(HWND foregroundWindowHandle)
         {
             try
             {
@@ -164,20 +141,10 @@ namespace Peek.UI
             }
 
             _currentIndex = DisplayIndex = 0;
-            _isFromCli = false;
 
             CurrentItem = (Items != null && Items.Count > 0) ? Items[0] : null;
         }
 
-        private void InitializeFromCli(string path)
-        {
-            // TODO: implement navigation
-            _isFromCli = true;
-            Items = null;
-            _currentIndex = DisplayIndex = 0;
-            CurrentItem = new FileItem(path, Path.GetFileName(path));
-        }
-
         public void Uninitialize()
         {
             _currentIndex = DisplayIndex = 0;
@@ -186,7 +153,6 @@ namespace Peek.UI
             Items = null;
             _navigationDirection = NavigationDirection.Forwards;
             IsErrorVisible = false;
-            _isFromCli = false;
         }
 
         public void AttemptPreviousNavigation() => Navigate(NavigationDirection.Backwards);
@@ -200,12 +166,6 @@ namespace Peek.UI
                 return;
             }
 
-            // TODO: implement navigation.
-            if (_isFromCli)
-            {
-                return;
-            }
-
             if (Items == null || Items.Count == _deletedItemIndexes.Count)
             {
                 _currentIndex = DisplayIndex = 0;

src/modules/peek/Peek.UI/Models/SelectedItemByPath.cs

@@ -1,21 +0,0 @@
-// 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 Peek.UI.Models
-{
-    public class SelectedItemByPath : SelectedItem
-    {
-        public string Path { get; }
-
-        public SelectedItemByPath(string path)
-        {
-            Path = path;
-        }
-
-        public override bool Matches(string? path)
-        {
-            return Path == path;
-        }
-    }
-}

src/modules/peek/Peek.UI/Models/SelectedItemByWindowHandle.cs

@@ -1,34 +0,0 @@
-// 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 Peek.UI.Extensions;
-using Peek.UI.Helpers;
-using Windows.Win32.Foundation;
-
-namespace Peek.UI.Models
-{
-    public class SelectedItemByWindowHandle : SelectedItem
-    {
-        public HWND WindowHandle { get; }
-
-        public SelectedItemByWindowHandle(HWND windowHandle)
-        {
-            WindowHandle = windowHandle;
-        }
-
-        public override bool Matches(string? path)
-        {
-            var selectedItems = FileExplorerHelper.GetSelectedItems(WindowHandle);
-            var selectedItemsCount = selectedItems?.GetCount() ?? 0;
-            if (selectedItems == null || selectedItemsCount == 0 || selectedItemsCount > 1)
-            {
-                return false;
-            }
-
-            var fileExplorerSelectedItemPath = selectedItems.GetItemAt(0).ToIFileSystemItem().Path;
-            var currentItemPath = path;
-            return fileExplorerSelectedItemPath != null && currentItemPath != null && fileExplorerSelectedItemPath != currentItemPath;
-        }
-    }
-}

src/modules/peek/Peek.UI/PeekXAML/App.xaml.cs

@@ -3,21 +3,16 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.IO;
-using System.IO.Pipes;
-using System.Threading;
-using System.Threading.Tasks;
+
 using ManagedCommon;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls.Primitives;
 using Peek.Common;
 using Peek.FilePreviewer;
 using Peek.FilePreviewer.Models;
 using Peek.FilePreviewer.Previewers;
-using Peek.UI.Models;
 using Peek.UI.Native;
 using Peek.UI.Telemetry.Events;
 using Peek.UI.Views;
@@ -28,7 +23,7 @@ namespace Peek.UI
     /// <summary>
     /// Provides application-specific behavior to supplement the default Application class.
     /// </summary>
-    public partial class App : Application, IApp, IDisposable
+    public partial class App : Application, IApp
     {
         public static int PowerToysPID { get; set; }
 
@@ -41,11 +36,6 @@ namespace Peek.UI
 
         private MainWindow? Window { get; set; }
 
-        private CancellationTokenSource _appCts = new CancellationTokenSource();
-        private bool _disposed;
-        private SelectedItem? _selectedItem;
-        private EventWaitHandle? _peekWaitHandle;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="App"/> class.
         /// Initializes the singleton application object.  This is the first line of authored code
@@ -119,15 +109,13 @@ namespace Peek.UI
                 }
             }
 
-            NativeEventWaiter.WaitForEventLoop(Constants.ShowPeekEvent(), OnShowPeek);
+            NativeEventWaiter.WaitForEventLoop(Constants.ShowPeekEvent(), OnPeekHotkey);
             NativeEventWaiter.WaitForEventLoop(Constants.TerminatePeekEvent(), () =>
             {
                 ShellPreviewHandlerPreviewer.ReleaseHandlerFactories();
                 EtwTrace?.Dispose();
                 Environment.Exit(0);
             });
-
-            Task.Run(() => ListenPipeLoop(_appCts.Token));
         }
 
         private void App_UnhandledException(object sender, Microsoft.UI.Xaml.UnhandledExceptionEventArgs e)
@@ -138,16 +126,11 @@ namespace Peek.UI
         /// <summary>
         /// Handle Peek hotkey
         /// </summary>
-        private void OnShowPeek()
+        private void OnPeekHotkey()
         {
-            // null means explorer, not null means CLI
-            if (_selectedItem == null)
-            {
-                // Need to read the foreground HWND before activating Peek to avoid focus stealing
-                // Foreground HWND must always be Explorer or Desktop
-                var foregroundWindowHandle = Windows.Win32.PInvoke_PeekUI.GetForegroundWindow();
-                _selectedItem = new SelectedItemByWindowHandle(foregroundWindowHandle);
-            }
+            // Need to read the foreground HWND before activating Peek to avoid focus stealing
+            // Foreground HWND must always be Explorer or Desktop
+            var foregroundWindowHandle = Windows.Win32.PInvoke_PeekUI.GetForegroundWindow();
 
             bool firstActivation = false;
 
@@ -157,71 +140,7 @@ namespace Peek.UI
                 Window = new MainWindow();
             }
 
-            Window.Toggle(firstActivation, _selectedItem);
-            _selectedItem = null;
-        }
-
-        private async Task ListenPipeLoop(CancellationToken token)
-        {
-            while (!token.IsCancellationRequested)
-            {
-                using (var server = new NamedPipeServerStream("PeekPipe", PipeDirection.In))
-                {
-                    await server.WaitForConnectionAsync(token);
-
-                    using (var reader = new StreamReader(server))
-                    {
-                        var path = await reader.ReadLineAsync(token);
-                        if (!string.IsNullOrWhiteSpace(path))
-                        {
-                            // Validate that the file or directory exists before proceeding
-                            if (File.Exists(path) || Directory.Exists(path))
-                            {
-                                _peekWaitHandle ??= EventWaitHandle.OpenExisting(Constants.ShowPeekEvent());
-
-                                _selectedItem = new SelectedItemByPath(path);
-                                _peekWaitHandle.Set();
-                            }
-                            else
-                            {
-                                Logger.LogError($"CLI requested file or directory does not exist: {path}");
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!_disposed)
-            {
-                if (disposing)
-                {
-                    // dispose managed state (managed objects)
-                    _peekWaitHandle?.Dispose();
-                    _appCts.Cancel();
-                    _appCts.Dispose();
-                }
-
-                // free unmanaged resources (unmanaged objects) and override finalizer
-                // set large fields to null
-                _disposed = true;
-            }
-        }
-
-        /* // override finalizer only if 'Dispose(bool disposing)' has code to free unmanaged resources
-        // ~App()
-        // {
-        //     // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
-        //     Dispose(disposing: false);
-        // } */
-
-        public void Dispose()
-        {
-            // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
-            Dispose(disposing: true);
-            GC.SuppressFinalize(this);
+            Window.Toggle(firstActivation, foregroundWindowHandle);
         }
     }
 }

src/modules/peek/Peek.UI/PeekXAML/MainWindow.xaml.cs

@@ -18,7 +18,6 @@ using Peek.FilePreviewer.Models;
 using Peek.FilePreviewer.Previewers;
 using Peek.UI.Extensions;
 using Peek.UI.Helpers;
-using Peek.UI.Models;
 using Peek.UI.Telemetry.Events;
 using Windows.Foundation;
 using WinUIEx;
@@ -117,12 +116,12 @@ namespace Peek.UI
         /// <summary>
         /// Toggling the window visibility and querying files when necessary.
         /// </summary>
-        public void Toggle(bool firstActivation, SelectedItem selectedItem)
+        public void Toggle(bool firstActivation, Windows.Win32.Foundation.HWND foregroundWindowHandle)
         {
             if (firstActivation)
             {
                 Activate();
-                Initialize(selectedItem);
+                Initialize(foregroundWindowHandle);
                 return;
             }
 
@@ -133,9 +132,9 @@ namespace Peek.UI
 
             if (AppWindow.IsVisible)
             {
-                if (IsNewSingleSelectedItem(selectedItem))
+                if (IsNewSingleSelectedItem(foregroundWindowHandle))
                 {
-                    Initialize(selectedItem);
+                    Initialize(foregroundWindowHandle);
                     Activate(); // Brings existing window into focus in case it was previously minimized
                 }
                 else
@@ -145,7 +144,7 @@ namespace Peek.UI
             }
             else
             {
-                Initialize(selectedItem);
+                Initialize(foregroundWindowHandle);
             }
         }
 
@@ -183,12 +182,12 @@ namespace Peek.UI
             Uninitialize();
         }
 
-        private void Initialize(SelectedItem selectedItem)
+        private void Initialize(Windows.Win32.Foundation.HWND foregroundWindowHandle)
         {
             var bootTime = new System.Diagnostics.Stopwatch();
             bootTime.Start();
 
-            ViewModel.Initialize(selectedItem);
+            ViewModel.Initialize(foregroundWindowHandle);
             ViewModel.ScalingFactor = this.GetMonitorScale();
             this.Content.KeyUp += Content_KeyUp;
 
@@ -273,11 +272,20 @@ namespace Peek.UI
             Uninitialize();
         }
 
-        private bool IsNewSingleSelectedItem(SelectedItem selectedItem)
+        private bool IsNewSingleSelectedItem(Windows.Win32.Foundation.HWND foregroundWindowHandle)
         {
             try
             {
-                return selectedItem.Matches(ViewModel.CurrentItem?.Path);
+                var selectedItems = FileExplorerHelper.GetSelectedItems(foregroundWindowHandle);
+                var selectedItemsCount = selectedItems?.GetCount() ?? 0;
+                if (selectedItems == null || selectedItemsCount == 0 || selectedItemsCount > 1)
+                {
+                    return false;
+                }
+
+                var fileExplorerSelectedItemPath = selectedItems.GetItemAt(0).ToIFileSystemItem().Path;
+                var currentItemPath = ViewModel.CurrentItem?.Path;
+                return fileExplorerSelectedItemPath != null && currentItemPath != null && fileExplorerSelectedItemPath != currentItemPath;
             }
             catch (Exception ex)
             {

tools/build/build-installer.ps1

@@ -81,7 +81,7 @@ function RunMSBuild {
 
     $base = @(
         $Solution
-        "/p:Platform=`"$Platform`""
+        "/p:Platform=$Platform"
         "/p:Configuration=$Configuration"
         "/p:CIBuild=true"
         '/verbosity:normal'
@@ -158,4 +158,4 @@ RunMSBuild 'installer\PowerToysSetup.sln' "/m /t:PowerToysInstaller /p:PerUser=$
 
 RunMSBuild 'installer\PowerToysSetup.sln' "/m /t:PowerToysBootstrapper /p:PerUser=$PerUser"
 
-Write-Host '[PIPELINE] Completed'
+Write-Host '[PIPELINE] Completed'