From a3212affd72aa9bec222c5cab6a1d9f8dd4b3c96 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 12 Jun 2025 16:16:47 +0800
Subject: [PATCH] Dynamically find wt.exe

---
 Plugins/Flow.Launcher.Plugin.Shell/Main.cs | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
index bcc5c470e..a00319c79 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -42,11 +42,9 @@ namespace Flow.Launcher.Plugin.Shell
             Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), @"scoop\apps\pwsh\current\pwsh.exe") // if using Scoop
         };
 
-        private static readonly string[] possibleWTPowerShellPaths = new[]
+        private static readonly List<string> possibleWindowsTerminalPaths = new()
         {
             Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"Microsoft\WindowsApps\wt.exe"),
-            // if using Windows Terminal from Microsoft Store
-            Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), @"WindowsApps\Microsoft.WindowsTerminal_*\wt.exe")
         };
 
         private Settings _settings;
@@ -406,6 +404,21 @@ namespace Flow.Launcher.Plugin.Shell
             Context = context;
             _settings = context.API.LoadSettingJsonStorage<Settings>();
             context.API.RegisterGlobalKeyboardCallback(API_GlobalKeyboardEvent);
+
+            // Search for all folders with Microsoft.WindowsTerminal_ prefix
+            var windowsAppsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "WindowsApps");
+            var windowsTerminalFolders = Directory.EnumerateDirectories(windowsAppsPath, "Microsoft.WindowsTerminal_*",
+                SearchOption.TopDirectoryOnly);
+
+            // Find wt.exe among them
+            foreach (var windowsTerminalFolder in windowsTerminalFolders)
+            {
+                var windowsTerminalPath = Path.Combine(windowsTerminalFolder, "wt.exe");
+                if (File.Exists(windowsTerminalPath))
+                {
+                    possibleWindowsTerminalPaths.Insert(0, windowsTerminalPath);
+                }
+            }
         }
 
         bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state)