Fix Window Walker 'Close Window' to respect stay open setting

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Commands/CloseWindowCommand.cs

@@ -2,12 +2,10 @@
 // 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.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Ext.WindowWalker.Components;
+using Microsoft.CmdPal.Ext.WindowWalker.Helpers;
+using Microsoft.CmdPal.Ext.WindowWalker.Messages;
 using Microsoft.CmdPal.Ext.WindowWalker.Properties;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -33,6 +31,14 @@ public override ICommandResult Invoke()
         }
 
         _window.CloseThisWindow();
+
+        if (SettingsManager.Instance.OpenAfterKillAndClose)
+        {
+            // Send message to refresh window list after closing
+            WeakReferenceMessenger.Default.Send(new RefreshWindowsMessage());
+            return CommandResult.KeepOpen();
+        }
+
         return CommandResult.Dismiss();
     }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Commands/EndTaskCommand.cs

@@ -3,12 +3,10 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Ext.WindowWalker.Components;
 using Microsoft.CmdPal.Ext.WindowWalker.Helpers;
+using Microsoft.CmdPal.Ext.WindowWalker.Messages;
 using Microsoft.CmdPal.Ext.WindowWalker.Properties;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -70,11 +68,15 @@ private static bool KillProcess(Window window)
 
     public override ICommandResult Invoke()
     {
-        if (KillProcess(_window))
+        var shouldDismiss = KillProcess(_window);
+
+        if (shouldDismiss)
         {
             return CommandResult.Dismiss();
         }
 
+        // Send message to refresh window list after killing process
+        WeakReferenceMessenger.Default.Send(new RefreshWindowsMessage());
         return CommandResult.KeepOpen();
     }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Messages/RefreshWindowsMessage.cs

@@ -0,0 +1,14 @@
+// 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.Ext.WindowWalker.Messages;
+
+/// <summary>
+/// Message sent when the window list needs to be refreshed.
+/// Used by CloseWindowCommand and EndTaskCommand to notify
+/// WindowWalkerListPage to refresh after closing/killing a window.
+/// </summary>
+internal sealed class RefreshWindowsMessage
+{
+}

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

@@ -13,6 +13,9 @@
   <ItemGroup>
     <None Remove="Assets\WindowWalker.svg" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Mvvm" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
   	<ProjectReference Include="..\..\..\..\common\ManagedCsWin32\ManagedCsWin32.csproj" />

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Pages/WindowWalkerListPage.cs

@@ -5,14 +5,16 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Ext.WindowWalker.Components;
+using Microsoft.CmdPal.Ext.WindowWalker.Messages;
 using Microsoft.CmdPal.Ext.WindowWalker.Properties;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.WindowWalker.Pages;
 
-internal sealed partial class WindowWalkerListPage : DynamicListPage, IDisposable
+internal sealed partial class WindowWalkerListPage : DynamicListPage, IDisposable, IRecipient<RefreshWindowsMessage>
 {
     private System.Threading.CancellationTokenSource _cancellationTokenSource = new();
 
@@ -31,6 +33,22 @@ public WindowWalkerListPage()
             Title = Resources.window_walker_top_level_command_title,
             Subtitle = Resources.windowwalker_NoResultsMessage,
         };
+
+        // Register to receive refresh messages
+        WeakReferenceMessenger.Default.Register(this);
+    }
+
+    /// <summary>
+    /// Handle the RefreshWindowsMessage to refresh the window list
+    /// after a window is closed or a process is killed.
+    /// </summary>
+    public void Receive(RefreshWindowsMessage message)
+    {
+        // Small delay to allow Windows to actually close the window
+        System.Threading.Tasks.Task.Delay(100).ContinueWith(_ =>
+        {
+            RaiseItemsChanged(0);
+        });
     }
 
     public override void UpdateSearchText(string oldSearch, string newSearch) =>
@@ -66,6 +84,7 @@ public void Dispose(bool disposing)
         {
             if (disposing)
             {
+                WeakReferenceMessenger.Default.Unregister<RefreshWindowsMessage>(this);
                 _cancellationTokenSource?.Dispose();
                 _disposed = true;
             }