Fix typo in LightSwitchStateManager filename

Updated LightSwitch module documentation to clarify the role of LightSwitchService and LightSwitchStateManager.

.github/actions/spell-check/expect.txt

@@ -2,8 +2,8 @@ AAAAs
 abcdefghjkmnpqrstuvxyz
 abgr
 ABlocked
-ABORTIFHUNG
 ABOUTBOX
+ABORTIFHUNG
 Abug
 Acceleratorkeys
 ACCEPTFILES
@@ -56,7 +56,6 @@ ANull
 AOC
 aocfnapldcnfbofgmbbllojgocaelgdd
 AOklab
-aot
 APARTMENTTHREADED
 APeriod
 apicontract
@@ -98,8 +97,8 @@ ASSOCSTR
 ASYNCWINDOWPLACEMENT
 ASYNCWINDOWPOS
 atl
-ATRIOX
 ATX
+ATRIOX
 aumid
 authenticode
 AUTOBUDDY
@@ -118,10 +117,10 @@ azman
 azureaiinference
 azureinference
 azureopenai
-backticks
 bbwe
 BCIE
 bck
+backticks
 BESTEFFORT
 bezelled
 bhid
@@ -149,8 +148,8 @@ bmi
 BNumber
 BODGY
 BOklab
-BOOTSTRAPPERINSTALLFOLDER
 Bootstrappers
+BOOTSTRAPPERINSTALLFOLDER
 BOTTOMALIGN
 boxmodel
 BPBF
@@ -177,16 +176,17 @@ BYPOSITION
 CALCRECT
 CALG
 callbackptr
+cabstr
 calpwstr
+caub
 Cangjie
 CANRENAME
+Carlseibert
 Canvascustomlayout
 CAPTUREBLT
 CAPTURECHANGED
 CARETBLINKING
-Carlseibert
 CAtl
-caub
 CBN
 cch
 CCHDEVICENAME
@@ -206,9 +206,11 @@ changecursor
 CHILDACTIVATE
 CHILDWINDOW
 CHOOSEFONT
+CIBUILD
 cidl
 CIELCh
 cim
+claude
 CImage
 cla
 CLASSDC
@@ -262,6 +264,7 @@ CONFIGW
 CONFLICTINGMODIFIERKEY
 CONFLICTINGMODIFIERSHORTCUT
 CONOUT
+coreclr
 constexpr
 contentdialog
 contentfiles
@@ -273,7 +276,6 @@ copiedcolorrepresentation
 coppied
 copyable
 COPYPEN
-coreclr
 COREWINDOW
 Corpor
 cotaskmem
@@ -282,18 +284,18 @@ countof
 covrun
 cpcontrols
 cph
+cppcoreguidelines
 cplusplus
 CPower
-cppcoreguidelines
 cpptools
 cppvsdbg
 cppwinrt
 createdump
+creativecommons
 CREATEPROCESS
 CREATESCHEDULEDTASK
 CREATESTRUCT
 CREATEWINDOWFAILED
-creativecommons
 CRECT
 CRH
 critsec
@@ -329,6 +331,7 @@ CYSCREEN
 CYSMICON
 CYVIRTUALSCREEN
 Czechia
+cziplib
 Dac
 dacl
 DAffine
@@ -352,7 +355,9 @@ Deact
 debugbreak
 decryptor
 Dedup
+dfx
 Deduplicator
+Deeplink
 DEFAULTBOOTSTRAPPERINSTALLFOLDER
 DEFAULTCOLOR
 DEFAULTFLAGS
@@ -399,6 +404,7 @@ DISPLAYFREQUENCY
 displayname
 DISPLAYORIENTATION
 divyan
+djwsxzxb
 Dlg
 DLGFRAME
 DLGMODALFRAME
@@ -411,6 +417,7 @@ DONTVALIDATEPATH
 dotnet
 downsampled
 downsampling
+Downsampled
 downscale
 DPICHANGED
 DPIs
@@ -524,6 +531,7 @@ EXTRINSICPROPERTIES
 eyetracker
 FANCYZONESDRAWLAYOUTTEST
 FANCYZONESEDITOR
+FNumber
 FARPROC
 fdx
 fesf
@@ -555,8 +563,8 @@ FIXEDSYS
 flac
 flyouts
 FMask
+foundrylocal
 fmtid
-FNumber
 FOF
 FOFX
 FOLDERID
@@ -567,7 +575,6 @@ FORCEMINIMIZE
 FORMATDLGORD
 formatetc
 FORPARSING
-foundrylocal
 FRAMECHANGED
 frm
 FROMTOUCH
@@ -586,13 +593,13 @@ gdi
 gdiplus
 GDIPVER
 GDISCALED
-geolocator
 GETCLIENTAREAANIMATION
 GETCURSEL
 GETDESKWALLPAPER
 GETDLGCODE
 GETDPISCALEDSIZE
 getfilesiginforedist
+geolocator
 GETHOTKEY
 GETICON
 GETLBTEXT
@@ -603,12 +610,11 @@ GETSCREENSAVERRUNNING
 GETSECKEY
 GETSTICKYKEYS
 GETTEXTLENGTH
-GHND
+GIFs
 gitmodules
+GHND
 GMEM
 GNumber
-googleai
-googlegemini
 gpedit
 gpo
 GPOCA
@@ -625,6 +631,8 @@ GValue
 gwl
 GWLP
 GWLSTYLE
+googleai
+googlegemini
 hangeul
 Hanzi
 Hardlines
@@ -735,7 +743,9 @@ IDCANCEL
 IDD
 idk
 idl
+IIM
 idlist
+ifd
 IDOK
 IDOn
 IDR
@@ -744,16 +754,15 @@ ietf
 IEXPLORE
 IFACEMETHOD
 IFACEMETHODIMP
-ifd
 IGNOREUNKNOWN
 IGo
 iid
-IIM
 Iindex
 Ijwhost
 ILD
 IMAGEHLP
 IMAGERESIZERCONTEXTMENU
+IPTC
 IMAGERESIZEREXT
 imageresizerinput
 imageresizersettings
@@ -789,6 +798,7 @@ INSTALLFOLDERTOPREVIOUSINSTALLFOLDER
 INSTALLLOCATION
 INSTALLMESSAGE
 INSTALLPROPERTY
+installscopeperuser
 INSTALLSTARTMENUSHORTCUT
 INSTALLSTATE
 Inste
@@ -801,7 +811,6 @@ invokecommand
 ipcmanager
 IPREVIEW
 ipreviewhandlervisualssetfont
-IPTC
 irow
 irprops
 isbi
@@ -845,14 +854,15 @@ keyvault
 KILLFOCUS
 killrunner
 kmph
+ksa
 kvp
 Kybd
 LARGEICON
 lastcodeanalysissucceeded
 LASTEXITCODE
 LAYOUTRTL
-lbl
 LCh
+lbl
 lcid
 LCIDTo
 lcl
@@ -868,10 +878,10 @@ LExit
 lhwnd
 LIBFUZZER
 LIBID
-lightswitch
 LIMITSIZE
 LIMITTEXT
 lindex
+lightswitch
 linkid
 LINKOVERLAY
 LINQTo
@@ -882,7 +892,6 @@ LLKH
 llkhf
 LMEM
 LMENU
-lng
 LOADFROMFILE
 LOBYTE
 localappdata
@@ -892,14 +901,17 @@ LOCATIONCHANGE
 LOCKTYPE
 LOGFONT
 LOGFONTW
-LOGMSG
 logon
+lon
+LOGMSG
 LOGPIXELSX
 LOGPIXELSY
+lng
 lon
 longdate
 LONGNAMES
 lowlevel
+lquadrant
 LOWORD
 lparam
 LPBITMAPINFOHEADER
@@ -933,7 +945,6 @@ lpv
 LPW
 lpwcx
 lpwndpl
-lquadrant
 LReader
 LRESULT
 LSTATUS
@@ -960,7 +971,6 @@ MAKELONG
 MAKELPARAM
 makepri
 MAKEWPARAM
-Malware
 manifestdependency
 MAPPEDTOSAMEKEY
 MAPTOSAMESHORTCUT
@@ -983,8 +993,8 @@ MENUITEMINFO
 MENUITEMINFOW
 MERGECOPY
 MERGEPAINT
-metadatamatters
 Metadatas
+metadatamatters
 metafile
 mfc
 Mgmt
@@ -1030,6 +1040,9 @@ mousepointer
 mouseutils
 MOVESIZEEND
 MOVESIZESTART
+muxx
+muxxc
+muxxh
 MRM
 MRT
 mru
@@ -1058,14 +1071,10 @@ msrc
 msstore
 msvcp
 MT
-mstsc
 MTND
 MULTIPLEUSE
 multizone
 muxc
-muxx
-muxxc
-muxxh
 MVPs
 mvvm
 MVVMTK
@@ -1148,6 +1157,7 @@ nonstd
 NOOWNERZORDER
 NOPARENTNOTIFY
 NOPREFIX
+NPU
 NOREDIRECTIONBITMAP
 NOREDRAW
 NOREMOVE
@@ -1176,7 +1186,6 @@ nowarn
 NOZORDER
 NPH
 npmjs
-NPU
 NResize
 NTAPI
 ntdll
@@ -1201,17 +1210,15 @@ oldpath
 oldtheme
 oleaut
 OLECHAR
-ollama
 onebranch
-onnx
 OOBEUI
 openas
 opencode
 OPENFILENAME
-openrdp
 opensource
 openxmlformats
 ollama
+Olllama
 onnx
 OPTIMIZEFORINVOKE
 ORPHANEDDIALOGTITLE
@@ -1285,7 +1292,6 @@ pguid
 phbm
 phbmp
 phicon
-Photoshop
 phwnd
 pici
 pidl
@@ -1308,6 +1314,7 @@ pnid
 PNMLINK
 Poc
 Podcasts
+Photoshop
 POINTERID
 POINTERUPDATE
 Pokedex
@@ -1402,9 +1409,10 @@ pwsz
 pwtd
 QDC
 qit
+QNN
+Qualcomm
 QITAB
 QITABENT
-QNN
 qoi
 Quarternary
 QUERYENDSESSION
@@ -1414,8 +1422,8 @@ quickaccent
 QUNS
 RAII
 RAlt
-randi
 RAquadrant
+randi
 rasterization
 Rasterize
 RAWINPUTDEVICE
@@ -1425,8 +1433,6 @@ RAWPATH
 rbhid
 rclsid
 RCZOOMIT
-remotedesktop
-rdp
 RDW
 READMODE
 READOBJECTS
@@ -1444,7 +1450,9 @@ regfile
 REGISTERCLASSFAILED
 REGISTRYHEADER
 REGISTRYPREVIEWEXT
+registryroot
 regkey
+regroot
 regsvr
 REINSTALLMODE
 releaseblog
@@ -1497,6 +1505,7 @@ rstringalpha
 rstringdigit
 rtb
 RTLREADING
+rtm
 runas
 rundll
 rungameid
@@ -1553,8 +1562,8 @@ SETRULES
 SETSCREENSAVEACTIVE
 SETSTICKYKEYS
 SETTEXT
-SETTINGCHANGE
 settingscard
+SETTINGCHANGE
 SETTINGSCHANGED
 settingsheader
 settingshotkeycontrol
@@ -1699,7 +1708,6 @@ stringtable
 stringval
 Strm
 strret
-STRSAFE
 stscanf
 sttngs
 Stubless
@@ -1711,6 +1719,7 @@ sublang
 SUBMODULEUPDATE
 subresource
 Superbar
+suntimes
 sut
 svchost
 SVGIn
@@ -1744,6 +1753,7 @@ SYSTEMMODAL
 SYSTEMTIME
 TARG
 TARGETAPPHEADER
+TARGETDIR
 targetentrypoint
 TARGETHEADER
 targetver
@@ -1773,10 +1783,10 @@ textextractor
 TEXTINCLUDE
 tfopen
 tgz
-THEMECHANGED
 themeresources
 THH
 THICKFRAME
+THEMECHANGED
 THISCOMPONENT
 throughs
 TILEDWINDOW
@@ -1873,6 +1883,7 @@ USEINSTALLERFORTEST
 USESHOWWINDOW
 USESTDHANDLES
 USRDLL
+utm
 UType
 uuidv
 uwp
@@ -1945,11 +1956,11 @@ Wca
 WCE
 wcex
 WClass
-WCRAPI
 wcsicmp
 wcsncpy
 wcsnicmp
 WCT
+WCRAPI
 WDA
 wdm
 wdp
@@ -1977,7 +1988,6 @@ WINDOWPLACEMENT
 WINDOWPOSCHANGED
 WINDOWPOSCHANGING
 WINDOWSBUILDNUMBER
-windowsml
 windowssearch
 windowssettings
 WINDOWSTYLES
@@ -1993,8 +2003,9 @@ Winhook
 WINL
 winlogon
 winmd
-winml
 WINNT
+windowsml
+winml
 winres
 winrt
 winsdk
@@ -2056,21 +2067,20 @@ WTSAT
 Wubi
 WUX
 Wwanpp
-xap
 XAxis
 XButton
 xclip
 xcopy
+xap
 XDeployment
-xdf
 XDimension
+xdf
 XDocument
 XElement
 xfd
 XFile
 XIncrement
 XLoc
-xmp
 XNamespace
 Xoshiro
 XPels
@@ -2081,22 +2091,23 @@ xsi
 XSpeed
 XStr
 xstyler
+xmp
 XTimer
 XUP
 XVIRTUALSCREEN
 xxxxxx
 YAxis
 ycombinator
-YDimension
 YIncrement
+YDimension
 yinle
 yinyue
 YPels
 YPos
 YResolution
 YSpeed
-YStr
 YTimer
+YStr
 YVIRTUALSCREEN
 ZEROINIT
 zonability

.github/workflows/dependency-review.yml

@@ -21,6 +21,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@v4

.github/workflows/manual-batch-issue-deduplication.yml

@@ -27,7 +27,7 @@ jobs:
         issue: ${{ fromJson(github.event.inputs.issue_numbers) }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
 
       - name: Run GenAI Issue Deduplicator
         uses: pelikhan/action-genai-issue-dedup@v0

Directory.Packages.props

@@ -69,7 +69,7 @@
       This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
 	-->
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7175" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4948" />
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.250907003" />
     <PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="1.8.37" />
     <PackageVersion Include="Microsoft.WindowsAppSDK.Runtime" Version="1.8.250907003" />

PowerToys.sln

@@ -834,10 +834,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageModelProvider", "sr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.UI.ViewModels.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.UI.ViewModels.UnitTests\Microsoft.CmdPal.UI.ViewModels.UnitTests.csproj", "{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.RemoteDesktop", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.RemoteDesktop\Microsoft.CmdPal.Ext.RemoteDesktop.csproj", "{2B3FB837-23DE-629F-82C6-42304E7083C9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests\Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests.csproj", "{DB34808A-FF91-D06E-A426-AFB5A8BD583B}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -3040,22 +3036,6 @@ Global
 		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Release|ARM64.Build.0 = Release|ARM64
 		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Release|x64.ActiveCfg = Release|x64
 		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Release|x64.Build.0 = Release|x64
-		{2B3FB837-23DE-629F-82C6-42304E7083C9}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{2B3FB837-23DE-629F-82C6-42304E7083C9}.Debug|ARM64.Build.0 = Debug|ARM64
-		{2B3FB837-23DE-629F-82C6-42304E7083C9}.Debug|x64.ActiveCfg = Debug|x64
-		{2B3FB837-23DE-629F-82C6-42304E7083C9}.Debug|x64.Build.0 = Debug|x64
-		{2B3FB837-23DE-629F-82C6-42304E7083C9}.Release|ARM64.ActiveCfg = Release|ARM64
-		{2B3FB837-23DE-629F-82C6-42304E7083C9}.Release|ARM64.Build.0 = Release|ARM64
-		{2B3FB837-23DE-629F-82C6-42304E7083C9}.Release|x64.ActiveCfg = Release|x64
-		{2B3FB837-23DE-629F-82C6-42304E7083C9}.Release|x64.Build.0 = Release|x64
-		{DB34808A-FF91-D06E-A426-AFB5A8BD583B}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{DB34808A-FF91-D06E-A426-AFB5A8BD583B}.Debug|ARM64.Build.0 = Debug|ARM64
-		{DB34808A-FF91-D06E-A426-AFB5A8BD583B}.Debug|x64.ActiveCfg = Debug|x64
-		{DB34808A-FF91-D06E-A426-AFB5A8BD583B}.Debug|x64.Build.0 = Debug|x64
-		{DB34808A-FF91-D06E-A426-AFB5A8BD583B}.Release|ARM64.ActiveCfg = Release|ARM64
-		{DB34808A-FF91-D06E-A426-AFB5A8BD583B}.Release|ARM64.Build.0 = Release|ARM64
-		{DB34808A-FF91-D06E-A426-AFB5A8BD583B}.Release|x64.ActiveCfg = Release|x64
-		{DB34808A-FF91-D06E-A426-AFB5A8BD583B}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3387,8 +3367,6 @@ Global
 		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{45354F4F-1414-45CE-B600-51CD1209FD19} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
-		{2B3FB837-23DE-629F-82C6-42304E7083C9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{DB34808A-FF91-D06E-A426-AFB5A8BD583B} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

README.md

@@ -53,17 +53,17 @@ Go to the [PowerToys GitHub releases][github-release-link], click Assets to reve
 <!-- items that need to be updated release to release -->
 [github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.97%22
 [github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.96%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.1/PowerToysUserSetup-0.96.1-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.1/PowerToysUserSetup-0.96.1-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.1/PowerToysSetup-0.96.1-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.1/PowerToysSetup-0.96.1-arm64.exe
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.0/PowerToysUserSetup-0.96.0-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.0/PowerToysUserSetup-0.96.0-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.0/PowerToysSetup-0.96.0-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.0/PowerToysSetup-0.96.0-arm64.exe
  
 |  Description   | Filename |
 |----------------|----------|
-| Per user - x64       | [PowerToysUserSetup-0.96.1-x64.exe][ptUserX64] |
-| Per user - ARM64     | [PowerToysUserSetup-0.96.1-arm64.exe][ptUserArm64] |
-| Machine wide - x64   | [PowerToysSetup-0.96.1-x64.exe][ptMachineX64] |
-| Machine wide - ARM64 | [PowerToysSetup-0.96.1-arm64.exe][ptMachineArm64] |
+| Per user - x64       | [PowerToysUserSetup-0.96.0-x64.exe][ptUserX64] |
+| Per user - ARM64     | [PowerToysUserSetup-0.96.0-arm64.exe][ptUserArm64] |
+| Machine wide - x64   | [PowerToysSetup-0.96.0-x64.exe][ptMachineX64] |
+| Machine wide - ARM64 | [PowerToysSetup-0.96.0-arm64.exe][ptMachineArm64] |
 
 </details>
 

src/common/LanguageModelProvider/FoundryLocalModelProvider.cs

@@ -64,7 +64,7 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
 
         return new OpenAIClient(
             new ApiKeyCredential("none"),
-            new OpenAIClientOptions { Endpoint = endpointUri, NetworkTimeout = TimeSpan.FromMinutes(5) })
+            new OpenAIClientOptions { Endpoint = endpointUri })
             .GetChatClient(modelId)
             .AsIChatClient();
     }

src/common/ManagedCommon/Logger.cs

@@ -31,11 +31,6 @@ namespace ManagedCommon
         /// </summary>
         public static string CurrentVersionLogDirectoryPath { get; private set; }
 
-        /// <summary>
-        /// Gets the path to the current log file.
-        /// </summary>
-        public static string CurrentLogFile { get; private set; }
-
         /// <summary>
         /// Gets the path to the log directory for the app.
         /// </summary>
@@ -60,9 +55,7 @@ namespace ManagedCommon
             AppLogDirectoryPath = basePath;
             CurrentVersionLogDirectoryPath = versionedPath;
 
-            var logFile = "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".log";
-            var logFilePath = Path.Combine(versionedPath, logFile);
-            CurrentLogFile = logFilePath;
+            var logFilePath = Path.Combine(versionedPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".log");
 
             Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));
 

src/modules/AdvancedPaste/AdvancedPaste/Services/AdvancedAIKernelService.cs

@@ -215,6 +215,7 @@ public sealed class AdvancedAIKernelService : KernelServiceBase
         return new OpenAIPromptExecutionSettings
         {
             FunctionChoiceBehavior = FunctionChoiceBehavior.Auto(),
+            Temperature = 0.01,
         };
     }
 }

src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/FoundryLocalPasteProvider.cs

@@ -146,7 +146,6 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider
         var options = new ChatOptions
         {
             ModelId = modelReference,
-            MaxOutputTokens = 2048,
         };
 
         if (!string.IsNullOrWhiteSpace(systemPrompt))

src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/SemanticKernelPasteProvider.cs

@@ -157,6 +157,8 @@ namespace AdvancedPaste.Services.CustomActions
             {
                 AIServiceType.OpenAI or AIServiceType.AzureOpenAI => new OpenAIPromptExecutionSettings
                 {
+                    Temperature = 0.01,
+                    MaxTokens = 2000,
                     FunctionChoiceBehavior = null,
                 },
                 _ => new PromptExecutionSettings(),

src/modules/awake/Awake/Core/Manager.cs

@@ -350,7 +350,7 @@ namespace Awake.Core
                             TrayHelper.TimedIcon,
                             TrayIconAction.Update);
                     },
-                    () => HandleTimerCompletion("timed"),
+                    _ => HandleTimerCompletion("timed"),
                     _tokenSource.Token);
         }
 

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/CoreLogger.cs

@@ -0,0 +1,62 @@
+// 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;
+
+namespace Microsoft.CmdPal.Core.Common;
+
+public static class CoreLogger
+{
+    public static void InitializeLogger(ILogger implementation)
+    {
+        _logger = implementation;
+    }
+
+    private static ILogger? _logger;
+
+    public static void LogError(string message, Exception ex, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        _logger?.LogError(message, ex, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public static void LogError(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        _logger?.LogError(message, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public static void LogWarning(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        _logger?.LogWarning(message, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public static void LogInfo(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        _logger?.LogInfo(message, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public static void LogDebug(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        _logger?.LogDebug(message, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public static void LogTrace([System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        _logger?.LogTrace(memberName, sourceFilePath, sourceLineNumber);
+    }
+}
+
+public interface ILogger
+{
+    void LogError(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0);
+
+    void LogError(string message, Exception ex, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0);
+
+    void LogWarning(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0);
+
+    void LogInfo(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0);
+
+    void LogDebug(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0);
+
+    void LogTrace([System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0);
+}

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

@@ -4,9 +4,9 @@
 
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using Microsoft.CmdPal.Core.Common;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using Microsoft.Extensions.Logging;
 using Windows.Foundation;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
@@ -14,7 +14,6 @@ namespace Microsoft.CmdPal.Core.ViewModels;
 public abstract partial class AppExtensionHost : IExtensionHost
 {
     private static readonly GlobalLogPageContext _globalLogPageContext = new();
-    private readonly ILogger _logger;
 
     private static ulong _hostingHwnd;
 
@@ -28,11 +27,6 @@ public abstract partial class AppExtensionHost : IExtensionHost
 
     public static void SetHostHwnd(ulong hostHwnd) => _hostingHwnd = hostHwnd;
 
-    public AppExtensionHost(ILogger logger)
-    {
-        _logger = logger;
-    }
-
     public void DebugLog(string message)
     {
 #if DEBUG
@@ -66,7 +60,7 @@ public abstract partial class AppExtensionHost : IExtensionHost
             return Task.CompletedTask.AsAsyncAction();
         }
 
-        Log_DebugMessage(message.Message);
+        CoreLogger.LogDebug(message.Message);
 
         _ = Task.Run(() =>
         {
@@ -102,7 +96,7 @@ public abstract partial class AppExtensionHost : IExtensionHost
 
     public void ProcessLogMessage(ILogMessage message)
     {
-        var vm = new LogMessageViewModel(message, _globalLogPageContext, _logger);
+        var vm = new LogMessageViewModel(message, _globalLogPageContext);
         vm.SafeInitializePropertiesSynchronous();
 
         Task.Factory.StartNew(
@@ -133,7 +127,7 @@ public abstract partial class AppExtensionHost : IExtensionHost
             return;
         }
 
-        var vm = new StatusMessageViewModel(message, new(_globalLogPageContext), _logger);
+        var vm = new StatusMessageViewModel(message, new(_globalLogPageContext));
         vm.SafeInitializePropertiesSynchronous();
 
         Task.Factory.StartNew(
@@ -164,11 +158,6 @@ public abstract partial class AppExtensionHost : IExtensionHost
     }
 
     public abstract string? GetExtensionDisplayName();
-
-    public abstract AppExtensionHost GetHostForCommand(object? context, AppExtensionHost? currentHost);
-
-    [LoggerMessage(Level = LogLevel.Debug, Message = "{Message}")]
-    partial void Log_DebugMessage(string message);
 }
 
 public interface IAppHostService

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

@@ -5,12 +5,12 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
+using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
 [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
-public partial class CommandContextItemViewModel(ICommandContextItem contextItem, WeakReference<IPageContext> context, ILogger logger) : CommandItemViewModel(new(contextItem), context, logger), IContextItemViewModel
+public partial class CommandContextItemViewModel(ICommandContextItem contextItem, WeakReference<IPageContext> context) : CommandItemViewModel(new(contextItem), context), IContextItemViewModel
 {
     private readonly KeyChord nullKeyChord = new(0, 0, 0);
 

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

@@ -3,19 +3,17 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.CmdPal.Core.Common;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
 [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBarContext
 {
-    private readonly ILogger logger;
-
     public ExtensionObject<ICommandItem> Model => _commandItemModel;
 
     private readonly ExtensionObject<ICommandItem> _commandItemModel = new(null);
@@ -88,12 +86,11 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         _errorIcon.InitializeProperties();
     }
 
-    public CommandItemViewModel(ExtensionObject<ICommandItem> item, WeakReference<IPageContext> errorContext, ILogger logger)
-        : base(errorContext, logger)
+    public CommandItemViewModel(ExtensionObject<ICommandItem> item, WeakReference<IPageContext> errorContext)
+        : base(errorContext)
     {
         _commandItemModel = item;
-        this.logger = logger;
-        Command = new(null, errorContext, Logger);
+        Command = new(null, errorContext);
     }
 
     public void FastInitializeProperties()
@@ -109,7 +106,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
             return;
         }
 
-        Command = new(model.Command, PageContext, Logger);
+        Command = new(model.Command, PageContext);
         Command.FastInitializeProperties();
 
         _itemTitle = model.Title;
@@ -187,7 +184,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
             MoreCommands = more
                 .Select<IContextItem, IContextItemViewModel>(item =>
                 {
-                    return item is ICommandContextItem contextItem ? new CommandContextItemViewModel(contextItem, PageContext, Logger) : new SeparatorViewModel();
+                    return item is ICommandContextItem contextItem ? new CommandContextItemViewModel(contextItem, PageContext) : new SeparatorViewModel();
                 })
                 .ToList();
         }
@@ -204,7 +201,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
 
         if (!string.IsNullOrEmpty(model.Command?.Name))
         {
-            _defaultCommandContextItemViewModel = new CommandContextItemViewModel(new CommandContextItem(model.Command!), PageContext, Logger)
+            _defaultCommandContextItemViewModel = new CommandContextItemViewModel(new CommandContextItem(model.Command!), PageContext)
             {
                 _itemTitle = Name,
                 Subtitle = Subtitle,
@@ -234,8 +231,8 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         }
         catch (Exception ex)
         {
-            Log_ErrorFastInitializingCommandItemViewModel(ex);
-            Command = new(null, PageContext, Logger);
+            CoreLogger.LogError("error fast initializing CommandItemViewModel", ex);
+            Command = new(null, PageContext);
             _itemTitle = "Error";
             Subtitle = "Item failed to load";
             MoreCommands = [];
@@ -256,7 +253,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         catch (Exception ex)
         {
             Initialized |= InitializedState.Error;
-            Log_ErrorSlowInitializingCommandItemViewModel(ex);
+            CoreLogger.LogError("error slow initializing CommandItemViewModel", ex);
         }
 
         return false;
@@ -271,8 +268,8 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         }
         catch (Exception ex)
         {
-            Log_ErrorInitializingCommandItemViewModel(ex);
-            Command = new(null, PageContext, Logger);
+            CoreLogger.LogError("error initializing CommandItemViewModel", ex);
+            Command = new(null, PageContext);
             _itemTitle = "Error";
             Subtitle = "Item failed to load";
             MoreCommands = [];
@@ -307,7 +304,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         {
             case nameof(Command):
                 Command.PropertyChanged -= Command_PropertyChanged;
-                Command = new(model.Command, PageContext, Logger);
+                Command = new(model.Command, PageContext);
                 Command.InitializeProperties();
                 Command.PropertyChanged += Command_PropertyChanged;
 
@@ -354,7 +351,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
                     var newContextMenu = more
                         .Select<IContextItem, IContextItemViewModel>(item =>
                         {
-                            return item is ICommandContextItem contextItem ? new CommandContextItemViewModel(contextItem, PageContext, Logger) : new SeparatorViewModel();
+                            return item is ICommandContextItem contextItem ? new CommandContextItemViewModel(contextItem, PageContext) : new SeparatorViewModel();
                         })
                         .ToList();
                     lock (MoreCommands)
@@ -467,15 +464,6 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         base.SafeCleanup();
         Initialized |= InitializedState.CleanedUp;
     }
-
-    [LoggerMessage(level: LogLevel.Error, message: "error fast initializing CommandItemViewModel")]
-    partial void Log_ErrorFastInitializingCommandItemViewModel(Exception ex);
-
-    [LoggerMessage(level: LogLevel.Error, message: "error slow initializing CommandItemViewModel")]
-    partial void Log_ErrorSlowInitializingCommandItemViewModel(Exception ex);
-
-    [LoggerMessage(level: LogLevel.Error, message: "error initializing CommandItemViewModel")]
-    partial void Log_ErrorInitializingCommandItemViewModel(Exception ex);
 }
 
 [Flags]

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

@@ -4,7 +4,6 @@
 
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
@@ -39,8 +38,8 @@ public partial class CommandViewModel : ExtensionObjectViewModel
 
     public IReadOnlyDictionary<string, ExtensionObject<object>>? Properties => _properties?.AsReadOnly();
 
-    public CommandViewModel(ICommand? command, WeakReference<IPageContext> pageContext, ILogger logger)
-        : base(pageContext, logger)
+    public CommandViewModel(ICommand? command, WeakReference<IPageContext> pageContext)
+        : base(pageContext)
     {
         Model = new(command);
         Icon = new(null);

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

@@ -4,12 +4,11 @@
 
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
-public partial class ConfirmResultViewModel(IConfirmationArgs _args, WeakReference<IPageContext> context, ILogger logger) :
-    ExtensionObjectViewModel(context, logger)
+public partial class ConfirmResultViewModel(IConfirmationArgs _args, WeakReference<IPageContext> context) :
+    ExtensionObjectViewModel(context)
 {
     public ExtensionObject<IConfirmationArgs> Model { get; } = new(_args);
 
@@ -21,7 +20,7 @@ public partial class ConfirmResultViewModel(IConfirmationArgs _args, WeakReferen
 
     public bool IsPrimaryCommandCritical { get; private set; }
 
-    public CommandViewModel PrimaryCommand { get; private set; } = new(null, context, logger);
+    public CommandViewModel PrimaryCommand { get; private set; } = new(null, context);
 
     public override void InitializeProperties()
     {
@@ -34,7 +33,7 @@ public partial class ConfirmResultViewModel(IConfirmationArgs _args, WeakReferen
         Title = model.Title;
         Description = model.Description;
         IsPrimaryCommandCritical = model.IsPrimaryCommandCritical;
-        PrimaryCommand = new(model.PrimaryCommand, PageContext, Logger);
+        PrimaryCommand = new(model.PrimaryCommand, PageContext);
         PrimaryCommand.InitializeProperties();
 
         UpdateProperty(nameof(Title));

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

@@ -11,7 +11,6 @@ using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
@@ -48,8 +47,8 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
 
     // Remember - "observable" properties from the model (via PropChanged)
     // cannot be marked [ObservableProperty]
-    public ContentPageViewModel(IContentPage model, TaskScheduler scheduler, AppExtensionHost host, ILogger logger)
-        : base(model, scheduler, host, logger)
+    public ContentPageViewModel(IContentPage model, TaskScheduler scheduler, AppExtensionHost host)
+        : base(model, scheduler, host)
     {
         _model = new(model);
     }
@@ -116,7 +115,7 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
                 {
                     if (item is ICommandContextItem contextItem)
                     {
-                        return new CommandContextItemViewModel(contextItem, PageContext, Logger);
+                        return new CommandContextItemViewModel(contextItem, PageContext);
                     }
                     else
                     {
@@ -136,7 +135,7 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
         var extensionDetails = model.Details;
         if (extensionDetails is not null)
         {
-            Details = new(extensionDetails, PageContext, Logger);
+            Details = new(extensionDetails, PageContext);
             Details.InitializeProperties();
         }
 
@@ -175,7 +174,7 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
                             {
                                 if (item is ICommandContextItem contextItem)
                                 {
-                                    return new CommandContextItemViewModel(contextItem, PageContext, Logger) as IContextItemViewModel;
+                                    return new CommandContextItemViewModel(contextItem, PageContext) as IContextItemViewModel;
                                 }
                                 else
                                 {
@@ -217,7 +216,7 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
                 break;
             case nameof(Details):
                 var extensionDetails = model.Details;
-                Details = extensionDetails is not null ? new(extensionDetails, PageContext, Logger) : null;
+                Details = extensionDetails is not null ? new(extensionDetails, PageContext) : null;
                 UpdateDetails();
                 break;
         }

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ContentViewModel.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 Microsoft.Extensions.Logging;
-
 namespace Microsoft.CmdPal.Core.ViewModels;
 
-public abstract partial class ContentViewModel(WeakReference<IPageContext> context, ILogger logger) :
-    ExtensionObjectViewModel(context, logger)
+public abstract partial class ContentViewModel(WeakReference<IPageContext> context) :
+    ExtensionObjectViewModel(context)
 {
     public bool OnlyControlOnPage { get; internal set; }
 }

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

@@ -5,6 +5,7 @@
 using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.CmdPal.Core.Common;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -138,6 +139,10 @@ public partial class ContextMenuViewModel : ObservableObject,
             {
                 var key = cmd.RequestedShortcut ?? new KeyChord(0, 0, 0);
                 var added = result.TryAdd(key, cmd);
+                if (!added)
+                {
+                    CoreLogger.LogWarning($"Ignoring duplicate keyboard shortcut {KeyChordHelpers.FormatForDebug(key)} on command '{cmd.Title ?? cmd.Name ?? "(unknown)"}'");
+                }
             }
         }
 

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

@@ -4,14 +4,12 @@
 
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
 public partial class DetailsCommandsViewModel(
     IDetailsElement _detailsElement,
-    WeakReference<IPageContext> context,
-    ILogger logger) : DetailsElementViewModel(_detailsElement, context, logger)
+    WeakReference<IPageContext> context) : DetailsElementViewModel(_detailsElement, context)
 {
     public List<CommandViewModel> Commands { get; private set; } = [];
 
@@ -33,7 +31,7 @@ public partial class DetailsCommandsViewModel(
             .Commands?
             .Select(c =>
             {
-                var vm = new CommandViewModel(c, PageContext, Logger);
+                var vm = new CommandViewModel(c, PageContext);
                 vm.InitializeProperties();
                 return vm;
             })

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

@@ -2,10 +2,11 @@
 // 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.Extensions.Logging;
+using Microsoft.CmdPal.Core.ViewModels.Models;
+using Microsoft.CommandPalette.Extensions;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
-public abstract partial class DetailsDataViewModel(IPageContext context, ILogger logger) : ExtensionObjectViewModel(context, logger)
+public abstract partial class DetailsDataViewModel(IPageContext context) : ExtensionObjectViewModel(context)
 {
 }

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

@@ -4,11 +4,10 @@
 
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
-public abstract partial class DetailsElementViewModel(IDetailsElement _detailsElement, WeakReference<IPageContext> context, ILogger logger) : ExtensionObjectViewModel(context, logger)
+public abstract partial class DetailsElementViewModel(IDetailsElement _detailsElement, WeakReference<IPageContext> context) : ExtensionObjectViewModel(context)
 {
     private readonly ExtensionObject<IDetailsElement> _model = new(_detailsElement);
 

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

@@ -6,14 +6,12 @@ using CommunityToolkit.Mvvm.Input;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
 public partial class DetailsLinkViewModel(
     IDetailsElement _detailsElement,
-    WeakReference<IPageContext> context,
-    ILogger logger) : DetailsElementViewModel(_detailsElement, context, logger)
+    WeakReference<IPageContext> context) : DetailsElementViewModel(_detailsElement, context)
 {
     private static readonly string[] _initProperties = [
         nameof(Text),

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

@@ -4,14 +4,12 @@
 
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
 public partial class DetailsSeparatorViewModel(
     IDetailsElement _detailsElement,
-    WeakReference<IPageContext> context,
-    ILogger logger) : DetailsElementViewModel(_detailsElement, context, logger)
+    WeakReference<IPageContext> context) : DetailsElementViewModel(_detailsElement, context)
 {
     private readonly ExtensionObject<IDetailsSeparator> _dataModel =
         new(_detailsElement.Data as IDetailsSeparator);

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

@@ -4,14 +4,12 @@
 
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
 public partial class DetailsTagsViewModel(
     IDetailsElement _detailsElement,
-    WeakReference<IPageContext> context,
-    ILogger logger) : DetailsElementViewModel(_detailsElement, context, logger)
+    WeakReference<IPageContext> context) : DetailsElementViewModel(_detailsElement, context)
 {
     public List<TagViewModel> Tags { get; private set; } = [];
 
@@ -33,7 +31,7 @@ public partial class DetailsTagsViewModel(
             .Tags?
             .Select(t =>
         {
-            var vm = new TagViewModel(t, PageContext, Logger);
+            var vm = new TagViewModel(t, PageContext);
             vm.InitializeProperties();
             return vm;
         })

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

@@ -4,11 +4,10 @@
 
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
-public partial class DetailsViewModel(IDetails _details, WeakReference<IPageContext> context, ILogger logger) : ExtensionObjectViewModel(context, logger)
+public partial class DetailsViewModel(IDetails _details, WeakReference<IPageContext> context) : ExtensionObjectViewModel(context)
 {
     private readonly ExtensionObject<IDetails> _detailsModel = new(_details);
 
@@ -48,10 +47,10 @@ public partial class DetailsViewModel(IDetails _details, WeakReference<IPageCont
             {
                 DetailsElementViewModel? vm = element.Data switch
                 {
-                    IDetailsSeparator => new DetailsSeparatorViewModel(element, this.PageContext, Logger),
-                    IDetailsLink => new DetailsLinkViewModel(element, this.PageContext, Logger),
-                    IDetailsCommands => new DetailsCommandsViewModel(element, this.PageContext, Logger),
-                    IDetailsTags => new DetailsTagsViewModel(element, this.PageContext, Logger),
+                    IDetailsSeparator => new DetailsSeparatorViewModel(element, this.PageContext),
+                    IDetailsLink => new DetailsLinkViewModel(element, this.PageContext),
+                    IDetailsCommands => new DetailsCommandsViewModel(element, this.PageContext),
+                    IDetailsTags => new DetailsTagsViewModel(element, this.PageContext),
                     _ => null,
                 };
                 if (vm is not null)

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

@@ -3,29 +3,23 @@
 // See the LICENSE file in the project root for more information.
 
 using CommunityToolkit.Mvvm.ComponentModel;
-using Microsoft.Extensions.Logging;
+using Microsoft.CmdPal.Core.Common;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
 public abstract partial class ExtensionObjectViewModel : ObservableObject
 {
-    private readonly ILogger _logger;
-
-    public ILogger Logger => _logger;
-
     public WeakReference<IPageContext> PageContext { get; set; }
 
-    internal ExtensionObjectViewModel(IPageContext? context, ILogger logger)
+    internal ExtensionObjectViewModel(IPageContext? context)
     {
         var realContext = context ?? (this is IPageContext c ? c : throw new ArgumentException("You need to pass in an IErrorContext"));
-        _logger = logger;
         PageContext = new(realContext);
     }
 
-    internal ExtensionObjectViewModel(WeakReference<IPageContext> context, ILogger logger)
+    internal ExtensionObjectViewModel(WeakReference<IPageContext> context)
     {
         PageContext = context;
-        _logger = logger;
     }
 
     public async virtual Task InitializePropertiesAsync()
@@ -120,10 +114,7 @@ public abstract partial class ExtensionObjectViewModel : ObservableObject
         }
         catch (Exception ex)
         {
-            Log_CleanupException(ex);
+            CoreLogger.LogDebug(ex.ToString());
         }
     }
-
-    [LoggerMessage(Level = LogLevel.Debug)]
-    partial void Log_CleanupException(Exception exception);
 }

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

@@ -4,7 +4,6 @@
 
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
@@ -24,8 +23,8 @@ public partial class FilterItemViewModel : ExtensionObjectViewModel, IFilterItem
 
     public bool IsInErrorState => Initialized.HasFlag(InitializedState.Error);
 
-    public FilterItemViewModel(IFilter filter, WeakReference<IPageContext> context, ILogger logger)
-        : base(context, logger)
+    public FilterItemViewModel(IFilter filter, WeakReference<IPageContext> context)
+        : base(context)
     {
         _model = new(filter);
     }

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

@@ -2,9 +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.Collections.Generic;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
+using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
@@ -20,8 +21,8 @@ public partial class FiltersViewModel : ExtensionObjectViewModel
 
     public bool ShouldShowFilters => Filters.Length > 0;
 
-    public FiltersViewModel(ExtensionObject<IFilters> filters, WeakReference<IPageContext> context, ILogger logger)
-        : base(context, logger)
+    public FiltersViewModel(ExtensionObject<IFilters> filters, WeakReference<IPageContext> context)
+        : base(context)
     {
         _filtersModel = filters;
     }
@@ -70,7 +71,7 @@ public partial class FiltersViewModel : ExtensionObjectViewModel
         {
             if (filter is IFilter filterItem)
             {
-                var filterItemViewModel = new FilterItemViewModel(filterItem, PageContext, Logger);
+                var filterItemViewModel = new FilterItemViewModel(filterItem, PageContext);
                 filterItemViewModel.InitializeProperties();
 
                 if (firstFilterItem is null)

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

@@ -11,15 +11,15 @@ public class GalleryGridPropertiesViewModel : IGridPropertiesViewModel
 {
     private readonly ExtensionObject<IGalleryGridLayout> _model;
 
-    public bool ShowTitle { get; private set; }
-
-    public bool ShowSubtitle { get; private set; }
-
     public GalleryGridPropertiesViewModel(IGalleryGridLayout galleryGridLayout)
     {
         _model = new(galleryGridLayout);
     }
 
+    public bool ShowTitle { get; set; }
+
+    public bool ShowSubtitle { get; set; }
+
     public void InitializeProperties()
     {
         var model = _model.Unsafe;

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

@@ -6,9 +6,5 @@ namespace Microsoft.CmdPal.Core.ViewModels;
 
 public interface IGridPropertiesViewModel
 {
-    bool ShowTitle { get; }
-
-    bool ShowSubtitle { get; }
-
     void InitializeProperties();
 }

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

@@ -7,13 +7,13 @@ using Microsoft.CmdPal.Core.ViewModels.Commands;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
-public partial class ListItemViewModel : CommandItemViewModel
+public partial class ListItemViewModel(IListItem model, WeakReference<IPageContext> context)
+    : CommandItemViewModel(new(model), context)
 {
-    public new ExtensionObject<IListItem> Model { get; }
+    public new ExtensionObject<IListItem> Model { get; } = new(model);
 
     public List<TagViewModel>? Tags { get; set; }
 
@@ -32,40 +32,6 @@ public partial class ListItemViewModel : CommandItemViewModel
 
     public string AccessibleName { get; private set; } = string.Empty;
 
-    public bool ShowTitle { get; private set; }
-
-    public bool ShowSubtitle { get; private set; }
-
-    public bool LayoutShowsTitle
-    {
-        get;
-        set
-        {
-            if (SetProperty(ref field, value))
-            {
-                UpdateShowsTitle();
-            }
-        }
-    }
-
-    public bool LayoutShowsSubtitle
-    {
-        get;
-        set
-        {
-            if (SetProperty(ref field, value))
-            {
-                UpdateShowsSubtitle();
-            }
-        }
-    }
-
-    public ListItemViewModel(IListItem model, WeakReference<IPageContext> context, ILogger logger)
-        : base(new(model), context, logger)
-    {
-        Model = new ExtensionObject<IListItem>(model);
-    }
-
     public override void InitializeProperties()
     {
         if (IsInitialized)
@@ -103,7 +69,7 @@ public partial class ListItemViewModel : CommandItemViewModel
         var extensionDetails = model.Details;
         if (extensionDetails is not null)
         {
-            Details = new(extensionDetails, PageContext, Logger);
+            Details = new(extensionDetails, PageContext);
             Details.InitializeProperties();
             UpdateProperty(nameof(Details));
             UpdateProperty(nameof(HasDetails));
@@ -127,43 +93,33 @@ public partial class ListItemViewModel : CommandItemViewModel
 
         switch (propertyName)
         {
-            case nameof(model.Tags):
+            case nameof(Tags):
                 UpdateTags(model.Tags);
                 break;
-            case nameof(model.TextToSuggest):
-                TextToSuggest = model.TextToSuggest ?? string.Empty;
-                UpdateProperty(nameof(TextToSuggest));
+            case nameof(TextToSuggest):
+                this.TextToSuggest = model.TextToSuggest ?? string.Empty;
                 break;
-            case nameof(model.Section):
-                Section = model.Section ?? string.Empty;
-                UpdateProperty(nameof(Section));
+            case nameof(Section):
+                this.Section = model.Section ?? string.Empty;
                 break;
-            case nameof(model.Details):
+            case nameof(Details):
                 var extensionDetails = model.Details;
-                Details = extensionDetails is not null ? new(extensionDetails, PageContext, Logger) : null;
+                Details = extensionDetails is not null ? new(extensionDetails, PageContext) : null;
                 Details?.InitializeProperties();
                 UpdateProperty(nameof(Details));
                 UpdateProperty(nameof(HasDetails));
                 UpdateShowDetailsCommand();
                 break;
-            case nameof(model.MoreCommands):
-                UpdateProperty(nameof(MoreCommands));
+            case nameof(MoreCommands):
                 AddShowDetailsCommands();
                 break;
-            case nameof(model.Title):
-                UpdateProperty(nameof(Title));
-                UpdateShowsTitle();
+            case nameof(Title):
+            case nameof(Subtitle):
                 UpdateAccessibleName();
                 break;
-            case nameof(model.Subtitle):
-                UpdateProperty(nameof(Subtitle));
-                UpdateShowsSubtitle();
-                UpdateAccessibleName();
-                break;
-            default:
-                UpdateProperty(propertyName);
-                break;
         }
+
+        UpdateProperty(propertyName);
     }
 
     // TODO: Do we want filters to match descriptions and other properties? Tags, etc... Yes?
@@ -190,7 +146,7 @@ public partial class ListItemViewModel : CommandItemViewModel
                 // Create the view model for the show details command
                 var showDetailsCommand = new ShowDetailsCommand(Details);
                 var showDetailsContextItem = new CommandContextItem(showDetailsCommand);
-                var showDetailsContextItemViewModel = new CommandContextItemViewModel(showDetailsContextItem, PageContext, Logger);
+                var showDetailsContextItemViewModel = new CommandContextItemViewModel(showDetailsContextItem, PageContext);
                 showDetailsContextItemViewModel.SlowInitializeProperties();
                 MoreCommands.Add(showDetailsContextItemViewModel);
             }
@@ -224,7 +180,7 @@ public partial class ListItemViewModel : CommandItemViewModel
             // Create the view model for the show details command
             var showDetailsCommand = new ShowDetailsCommand(Details);
             var showDetailsContextItem = new CommandContextItem(showDetailsCommand);
-            var showDetailsContextItemViewModel = new CommandContextItemViewModel(showDetailsContextItem, PageContext, Logger);
+            var showDetailsContextItemViewModel = new CommandContextItemViewModel(showDetailsContextItem, PageContext);
             showDetailsContextItemViewModel.SlowInitializeProperties();
             MoreCommands.Add(showDetailsContextItemViewModel);
 
@@ -237,7 +193,7 @@ public partial class ListItemViewModel : CommandItemViewModel
     {
         var newTags = newTagsFromModel?.Select(t =>
         {
-            var vm = new TagViewModel(t, PageContext, Logger);
+            var vm = new TagViewModel(t, PageContext);
             vm.InitializeProperties();
             return vm;
         })
@@ -250,32 +206,11 @@ public partial class ListItemViewModel : CommandItemViewModel
                 // many COM exception issues.
                 Tags = [.. newTags];
 
-                // We're already in UI thread, so just raise the events
-                OnPropertyChanged(nameof(Tags));
-                OnPropertyChanged(nameof(HasTags));
+                UpdateProperty(nameof(Tags));
+                UpdateProperty(nameof(HasTags));
             });
     }
 
-    private void UpdateShowsTitle()
-    {
-        var oldShowTitle = ShowTitle;
-        ShowTitle = LayoutShowsTitle;
-        if (oldShowTitle != ShowTitle)
-        {
-            UpdateProperty(nameof(ShowTitle));
-        }
-    }
-
-    private void UpdateShowsSubtitle()
-    {
-        var oldShowSubtitle = ShowSubtitle;
-        ShowSubtitle = LayoutShowsSubtitle && !string.IsNullOrWhiteSpace(Subtitle);
-        if (oldShowSubtitle != ShowSubtitle)
-        {
-            UpdateProperty(nameof(ShowSubtitle));
-        }
-    }
-
     protected override void UnsafeCleanup()
     {
         base.UnsafeCleanup();

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

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.ObjectModel;
+using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Core.Common.Helpers;
@@ -10,20 +11,21 @@ using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using Microsoft.Extensions.Logging;
 using Windows.Foundation;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
 public partial class ListViewModel : PageViewModel, IDisposable
 {
+    // private readonly HashSet<ListItemViewModel> _itemCache = [];
     private readonly TaskFactory filterTaskFactory = new(new ConcurrentExclusiveSchedulerPair().ExclusiveScheduler);
 
     // TODO: Do we want a base "ItemsPageViewModel" for anything that's going to have items?
 
     // Observable from MVVM Toolkit will auto create public properties that use INotifyPropertyChange change
     // https://learn.microsoft.com/dotnet/communitytoolkit/mvvm/observablegroupedcollections for grouping support
-    public ObservableCollection<ListItemViewModel> FilteredItems { get; } = [];
+    [ObservableProperty]
+    public partial ObservableCollection<ListItemViewModel> FilteredItems { get; set; } = [];
 
     public FiltersViewModel? Filters { get; set; }
 
@@ -88,11 +90,11 @@ public partial class ListViewModel : PageViewModel, IDisposable
         }
     }
 
-    public ListViewModel(IListPage model, TaskScheduler scheduler, AppExtensionHost host, ILogger logger)
-        : base(model, scheduler, host, logger)
+    public ListViewModel(IListPage model, TaskScheduler scheduler, AppExtensionHost host)
+        : base(model, scheduler, host)
     {
         _model = new(model);
-        EmptyContent = new(new(null), PageContext, Logger);
+        EmptyContent = new(new(null), PageContext);
     }
 
     private void FiltersPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
@@ -222,8 +224,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
             // TODO we can probably further optimize this by also keeping a
             // HashSet of every ExtensionObject we currently have, and only
             // building new viewmodels for the ones we haven't already built.
-            var showsTitle = GridProperties?.ShowTitle ?? true;
-            var showsSubtitle = GridProperties?.ShowSubtitle ?? true;
             foreach (var item in newItems)
             {
                 // Check for cancellation during item processing
@@ -232,13 +232,11 @@ public partial class ListViewModel : PageViewModel, IDisposable
                     return;
                 }
 
-                ListItemViewModel viewModel = new(item, new(this), Logger);
+                ListItemViewModel viewModel = new(item, new(this));
 
                 // If an item fails to load, silently ignore it.
                 if (viewModel.SafeFastInit())
                 {
-                    viewModel.LayoutShowsTitle = showsTitle;
-                    viewModel.LayoutShowsSubtitle = showsSubtitle;
                     newViewModels.Add(viewModel);
                 }
             }
@@ -585,7 +583,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
         GridProperties = LoadGridPropertiesViewModel(model.GridProperties);
         GridProperties?.InitializeProperties();
         UpdateProperty(nameof(GridProperties));
-        ApplyLayoutToItems();
 
         ShowDetails = model.ShowDetails;
         UpdateProperty(nameof(ShowDetails));
@@ -597,11 +594,11 @@ public partial class ListViewModel : PageViewModel, IDisposable
         UpdateProperty(nameof(SearchText));
         UpdateProperty(nameof(InitialSearchText));
 
-        EmptyContent = new(new(model.EmptyContent), PageContext, Logger);
+        EmptyContent = new(new(model.EmptyContent), PageContext);
         EmptyContent.SlowInitializeProperties();
 
         Filters?.PropertyChanged -= FiltersPropertyChanged;
-        Filters = new(new(model.Filters), PageContext, Logger);
+        Filters = new(new(model.Filters), PageContext);
         Filters?.PropertyChanged += FiltersPropertyChanged;
 
         Filters?.InitializeProperties();
@@ -611,15 +608,22 @@ public partial class ListViewModel : PageViewModel, IDisposable
         model.ItemsChanged += Model_ItemsChanged;
     }
 
-    private static IGridPropertiesViewModel? LoadGridPropertiesViewModel(IGridProperties? gridProperties)
+    private IGridPropertiesViewModel? LoadGridPropertiesViewModel(IGridProperties? gridProperties)
     {
-        return gridProperties switch
+        if (gridProperties is IMediumGridLayout mediumGridLayout)
         {
-            IMediumGridLayout mediumGridLayout => new MediumGridPropertiesViewModel(mediumGridLayout),
-            IGalleryGridLayout galleryGridLayout => new GalleryGridPropertiesViewModel(galleryGridLayout),
-            ISmallGridLayout smallGridLayout => new SmallGridPropertiesViewModel(smallGridLayout),
-            _ => null,
-        };
+            return new MediumGridPropertiesViewModel(mediumGridLayout);
+        }
+        else if (gridProperties is IGalleryGridLayout galleryGridLayout)
+        {
+            return new GalleryGridPropertiesViewModel(galleryGridLayout);
+        }
+        else if (gridProperties is ISmallGridLayout smallGridLayout)
+        {
+            return new SmallGridPropertiesViewModel(smallGridLayout);
+        }
+
+        return null;
     }
 
     public void LoadMoreIfNeeded()
@@ -681,7 +685,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
                 GridProperties = LoadGridPropertiesViewModel(model.GridProperties);
                 GridProperties?.InitializeProperties();
                 UpdateProperty(nameof(IsGridView));
-                ApplyLayoutToItems();
                 break;
             case nameof(ShowDetails):
                 ShowDetails = model.ShowDetails;
@@ -693,12 +696,12 @@ public partial class ListViewModel : PageViewModel, IDisposable
                 SearchText = model.SearchText;
                 break;
             case nameof(EmptyContent):
-                EmptyContent = new(new(model.EmptyContent), PageContext, Logger);
+                EmptyContent = new(new(model.EmptyContent), PageContext);
                 EmptyContent.SlowInitializeProperties();
                 break;
             case nameof(Filters):
                 Filters?.PropertyChanged -= FiltersPropertyChanged;
-                Filters = new(new(model.Filters), PageContext, Logger);
+                Filters = new(new(model.Filters), PageContext);
                 Filters?.PropertyChanged += FiltersPropertyChanged;
                 Filters?.InitializeProperties();
                 break;
@@ -727,21 +730,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
            });
     }
 
-    private void ApplyLayoutToItems()
-    {
-        lock (_listLock)
-        {
-            var showsTitle = GridProperties?.ShowTitle ?? true;
-            var showsSubtitle = GridProperties?.ShowSubtitle ?? true;
-
-            foreach (var item in Items)
-            {
-                item.LayoutShowsTitle = showsTitle;
-                item.LayoutShowsSubtitle = showsSubtitle;
-            }
-        }
-    }
-
     public void Dispose()
     {
         GC.SuppressFinalize(this);
@@ -763,7 +751,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
         base.UnsafeCleanup();
 
         EmptyContent?.SafeCleanup();
-        EmptyContent = new(new(null), PageContext, Logger); // necessary?
+        EmptyContent = new(new(null), PageContext); // necessary?
 
         _cancellationTokenSource?.Cancel();
         filterCancellationTokenSource?.Cancel();

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

@@ -3,14 +3,13 @@
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
 public partial class LoadingPageViewModel : PageViewModel
 {
-    public LoadingPageViewModel(IPage? model, TaskScheduler scheduler, AppExtensionHost host, ILogger logger)
-        : base(model, scheduler, host, logger)
+    public LoadingPageViewModel(IPage? model, TaskScheduler scheduler, AppExtensionHost host)
+        : base(model, scheduler, host)
     {
         ModelIsLoading = true;
         IsInitialized = false;

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

@@ -4,7 +4,6 @@
 
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
@@ -14,8 +13,8 @@ public partial class LogMessageViewModel : ExtensionObjectViewModel
 
     public string Message { get; private set; } = string.Empty;
 
-    public LogMessageViewModel(ILogMessage message, IPageContext context, ILogger logger)
-        : base(context, logger)
+    public LogMessageViewModel(ILogMessage message, IPageContext context)
+        : base(context)
     {
         _model = new(message);
     }

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

@@ -11,15 +11,13 @@ public class MediumGridPropertiesViewModel : IGridPropertiesViewModel
 {
     private readonly ExtensionObject<IMediumGridLayout> _model;
 
-    public bool ShowTitle { get; private set; }
-
-    public bool ShowSubtitle => false;
-
     public MediumGridPropertiesViewModel(IMediumGridLayout mediumGridLayout)
     {
         _model = new(mediumGridLayout);
     }
 
+    public bool ShowTitle { get; set; }
+
     public void InitializeProperties()
     {
         var model = _model.Unsafe;

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

@@ -3,7 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System.ComponentModel;
+using Microsoft.CmdPal.Core.Common;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 
@@ -46,6 +48,10 @@ public interface IContextMenuContext : INotifyPropertyChanged
             {
                 var key = cmd.RequestedShortcut ?? new KeyChord(0, 0, 0);
                 var added = result.TryAdd(key, cmd);
+                if (!added)
+                {
+                    CoreLogger.LogWarning($"Ignoring duplicate keyboard shortcut {KeyChordHelpers.FormatForDebug(key)} on command '{cmd.Title ?? cmd.Name ?? "(unknown)"}'");
+                }
             }
         }
 

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

@@ -2,9 +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 Microsoft.Extensions.Logging;
-
 namespace Microsoft.CmdPal.Core.ViewModels;
 
-internal sealed partial class NullPageViewModel(TaskScheduler scheduler, AppExtensionHost extensionHost, ILogger logger)
-    : PageViewModel(null, scheduler, extensionHost, logger);
+internal sealed partial class NullPageViewModel(TaskScheduler scheduler, AppExtensionHost extensionHost)
+    : PageViewModel(null, scheduler, extensionHost);

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

@@ -8,7 +8,6 @@ using CommunityToolkit.Mvvm.Input;
 using Microsoft.CmdPal.Core.Common.Helpers;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
@@ -77,8 +76,8 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
 
     public IconInfoViewModel Icon { get; protected set; }
 
-    public PageViewModel(IPage? model, TaskScheduler scheduler, AppExtensionHost extensionHost, ILogger logger)
-        : base((IPageContext?)null, logger)
+    public PageViewModel(IPage? model, TaskScheduler scheduler, AppExtensionHost extensionHost)
+        : base((IPageContext?)null)
     {
         _pageModel = new(model);
         Scheduler = scheduler;
@@ -275,7 +274,6 @@ public interface IPageViewModelFactoryService
     /// <param name="page">The page for which to create the view model.</param>
     /// <param name="nested">Indicates whether the page is not the top-level page.</param>
     /// <param name="host">The command palette host that will host the page (for status messages)</param>
-    /// <param name="logger">The logger to use for logging.</param>
     /// <returns>A new instance of the page view model.</returns>
-    PageViewModel? TryCreatePageViewModel(IPage page, bool nested, AppExtensionHost host, ILogger logger);
+    PageViewModel? TryCreatePageViewModel(IPage page, bool nested, AppExtensionHost host);
 }

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

@@ -4,7 +4,6 @@
 
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
@@ -16,8 +15,8 @@ public partial class ProgressViewModel : ExtensionObjectViewModel
 
     public uint ProgressPercent { get; private set; }
 
-    public ProgressViewModel(IProgressState progress, WeakReference<IPageContext> context, ILogger logger)
-        : base(context, logger)
+    public ProgressViewModel(IProgressState progress, WeakReference<IPageContext> context)
+        : base(context)
     {
         Model = new(progress);
     }

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

@@ -6,10 +6,10 @@ using System.ComponentModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.CmdPal.Core.Common;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
@@ -18,11 +18,10 @@ public partial class ShellViewModel : ObservableObject,
     IRecipient<HandleCommandResultMessage>
 {
     private readonly IRootPageService _rootPageService;
-    private readonly AppExtensionHost _appHost;
+    private readonly IAppHostService _appHostService;
     private readonly TaskScheduler _scheduler;
     private readonly IPageViewModelFactoryService _pageViewModelFactory;
     private readonly Lock _invokeLock = new();
-    private readonly ILogger _logger;
     private Task? _handleInvokeTask;
 
     // Cancellation token source for page loading/navigation operations
@@ -61,7 +60,7 @@ public partial class ShellViewModel : ObservableObject,
                     }
                     catch (Exception ex)
                     {
-                        Log_Exception(ex);
+                        CoreLogger.LogError(ex.ToString());
                     }
                 }
             }
@@ -88,17 +87,15 @@ public partial class ShellViewModel : ObservableObject,
         TaskScheduler scheduler,
         IRootPageService rootPageService,
         IPageViewModelFactoryService pageViewModelFactory,
-        AppExtensionHost appHost,
-        ILogger logger)
+        IAppHostService appHostService)
     {
         _pageViewModelFactory = pageViewModelFactory;
         _scheduler = scheduler;
         _rootPageService = rootPageService;
-        _appHost = appHost;
-        _logger = logger;
+        _appHostService = appHostService;
 
-        NullPage = new NullPageViewModel(_scheduler, appHost, _logger);
-        _currentPage = new LoadingPageViewModel(null, _scheduler, appHost, _logger);
+        NullPage = new NullPageViewModel(_scheduler, appHostService.GetDefaultHost());
+        _currentPage = new LoadingPageViewModel(null, _scheduler, appHostService.GetDefaultHost());
 
         // Register to receive messages
         WeakReferenceMessenger.Default.Register<PerformCommandMessage>(this);
@@ -165,7 +162,7 @@ public partial class ShellViewModel : ObservableObject,
                     {
                         if (viewModel.InitializeCommand.ExecutionTask.Exception is AggregateException ex)
                         {
-                            Log_Exception(ex);
+                            CoreLogger.LogError(ex.ToString());
                         }
                     }
                     else
@@ -183,7 +180,7 @@ public partial class ShellViewModel : ObservableObject,
                                         }
                                         catch (Exception ex)
                                         {
-                                            Log_Exception(ex);
+                                            CoreLogger.LogError(ex.ToString());
                                         }
                                     }
 
@@ -213,7 +210,7 @@ public partial class ShellViewModel : ObservableObject,
                     }
                     catch (Exception ex)
                     {
-                        Log_Exception(ex);
+                        CoreLogger.LogError(ex.ToString());
                     }
                 }
 
@@ -243,7 +240,7 @@ public partial class ShellViewModel : ObservableObject,
             }
             catch (Exception ex)
             {
-                Log_Exception(ex);
+                CoreLogger.LogError(ex.ToString());
             }
             finally
             {
@@ -259,7 +256,7 @@ public partial class ShellViewModel : ObservableObject,
             return;
         }
 
-        var host = _appHost.GetHostForCommand(message.Context, CurrentPage.ExtensionHost);
+        var host = _appHostService.GetHostForCommand(message.Context, CurrentPage.ExtensionHost);
 
         _rootPageService.OnPerformCommand(message.Context, !CurrentPage.IsNested, host);
 
@@ -267,16 +264,16 @@ public partial class ShellViewModel : ObservableObject,
         {
             if (command is IPage page)
             {
-                Log_NavigateToPage();
+                CoreLogger.LogDebug($"Navigating to page");
 
                 var isMainPage = command == _rootPage;
                 _isNested = !isMainPage;
 
                 // Construct our ViewModel of the appropriate type and pass it the UI Thread context.
-                var pageViewModel = _pageViewModelFactory.TryCreatePageViewModel(page, _isNested, host, _logger);
+                var pageViewModel = _pageViewModelFactory.TryCreatePageViewModel(page, _isNested, host);
                 if (pageViewModel is null)
                 {
-                    Log_FailedToCreateViewModel(page.GetType().Name);
+                    CoreLogger.LogError($"Failed to create ViewModel for page {page.GetType().Name}");
                     throw new NotSupportedException();
                 }
 
@@ -306,7 +303,7 @@ public partial class ShellViewModel : ObservableObject,
             }
             else if (command is IInvokableCommand invokable)
             {
-                Log_InvokingCommand();
+                CoreLogger.LogDebug($"Invoking command");
 
                 WeakReferenceMessenger.Default.Send<BeginInvokeMessage>();
                 StartInvoke(message, invokable, host);
@@ -372,7 +369,7 @@ public partial class ShellViewModel : ObservableObject,
         }
 
         var kind = result.Kind;
-        Log_HandlingCommandResult(kind.ToString());
+        CoreLogger.LogDebug($"handling {kind.ToString()}");
 
         WeakReferenceMessenger.Default.Send<CmdPalInvokeResultMessage>(new(kind));
         switch (kind)
@@ -463,19 +460,4 @@ public partial class ShellViewModel : ObservableObject,
     {
         _navigationCts?.Cancel();
     }
-
-    [LoggerMessage(Level = LogLevel.Error)]
-    partial void Log_Exception(Exception exception);
-
-    [LoggerMessage(Level = LogLevel.Debug, Message = "Navigating to page")]
-    partial void Log_NavigateToPage();
-
-    [LoggerMessage(Level = LogLevel.Error, Message = "Failed to create ViewModel for page {PageTypeName}")]
-    partial void Log_FailedToCreateViewModel(string pageTypeName);
-
-    [LoggerMessage(Level = LogLevel.Debug, Message = "Invoking command")]
-    partial void Log_InvokingCommand();
-
-    [LoggerMessage(Level = LogLevel.Debug, Message = "Handling {CommandResultKind}")]
-    partial void Log_HandlingCommandResult(string commandResultKind);
 }

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

@@ -11,10 +11,6 @@ public class SmallGridPropertiesViewModel : IGridPropertiesViewModel
 {
     private readonly ExtensionObject<ISmallGridLayout> _model;
 
-    public bool ShowTitle => false;
-
-    public bool ShowSubtitle => false;
-
     public SmallGridPropertiesViewModel(ISmallGridLayout smallGridLayout)
     {
         _model = new(smallGridLayout);

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

@@ -4,7 +4,6 @@
 
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
@@ -20,8 +19,8 @@ public partial class StatusMessageViewModel : ExtensionObjectViewModel
 
     public bool HasProgress => Progress is not null;
 
-    public StatusMessageViewModel(IStatusMessage message, WeakReference<IPageContext> context, ILogger logger)
-        : base(context, logger)
+    public StatusMessageViewModel(IStatusMessage message, WeakReference<IPageContext> context)
+        : base(context)
     {
         Model = new(message);
     }
@@ -39,7 +38,7 @@ public partial class StatusMessageViewModel : ExtensionObjectViewModel
         var modelProgress = model.Progress;
         if (modelProgress is not null)
         {
-            Progress = new(modelProgress, this.PageContext, this.Logger);
+            Progress = new(modelProgress, this.PageContext);
             Progress.InitializeProperties();
             UpdateProperty(nameof(HasProgress));
         }
@@ -79,7 +78,7 @@ public partial class StatusMessageViewModel : ExtensionObjectViewModel
                 var modelProgress = model.Progress;
                 if (modelProgress is not null)
                 {
-                    Progress = new(modelProgress, this.PageContext, this.Logger);
+                    Progress = new(modelProgress, this.PageContext);
                     Progress.InitializeProperties();
                 }
                 else

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

@@ -4,11 +4,10 @@
 
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
-public partial class TagViewModel(ITag _tag, WeakReference<IPageContext> context, ILogger logger) : ExtensionObjectViewModel(context, logger)
+public partial class TagViewModel(ITag _tag, WeakReference<IPageContext> context) : ExtensionObjectViewModel(context)
 {
     private readonly ExtensionObject<ITag> _tagModel = new(_tag);
 

src/modules/cmdpal/Microsoft.CmdPal.UI.Core/Microsoft.CmdPal.UI.Core.csproj

@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <RootNamespace>Microsoft.CmdPal.UI.Core</RootNamespace>
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-    <UseWinUI>true</UseWinUI>
-    <WinUISDKReferences>false</WinUISDKReferences>
-  </PropertyGroup>
-  
-</Project>

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

@@ -6,18 +6,18 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 
-namespace Microsoft.CmdPal.UI.ViewModels.Services;
+namespace Microsoft.CmdPal.UI.ViewModels;
 
-public partial class AliasService : ObservableObject
+public partial class AliasManager : ObservableObject
 {
-    private readonly TopLevelCommandService _topLevelCommandService;
+    private readonly TopLevelCommandManager _topLevelCommandManager;
 
     // REMEMBER, CommandAlias.SearchPrefix is what we use as keys
     private readonly Dictionary<string, CommandAlias> _aliases;
 
-    public AliasService(TopLevelCommandService tlcService, SettingsModel settings)
+    public AliasManager(TopLevelCommandManager tlcManager, SettingsModel settings)
     {
-        _topLevelCommandService = tlcService;
+        _topLevelCommandManager = tlcManager;
         _aliases = settings.Aliases;
 
         if (_aliases.Count == 0)
@@ -34,7 +34,7 @@ public partial class AliasService : ObservableObject
         {
             try
             {
-                var topLevelCommand = _topLevelCommandService.LookupCommand(alias.CommandId);
+                var topLevelCommand = _topLevelCommandManager.LookupCommand(alias.CommandId);
                 if (topLevelCommand is not null)
                 {
                     WeakReferenceMessenger.Default.Send<ClearSearchMessage>();
@@ -112,7 +112,7 @@ public partial class AliasService : ObservableObject
                 toRemove.Add(kv.Value);
 
                 // Remove alias from other TopLevelViewModels it may be assigned to
-                var topLevelCommand = _topLevelCommandService.LookupCommand(kv.Value.CommandId);
+                var topLevelCommand = _topLevelCommandManager.LookupCommand(kv.Value.CommandId);
                 if (topLevelCommand is not null)
                 {
                     topLevelCommand.AliasText = string.Empty;

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

@@ -9,7 +9,6 @@ using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using CommunityToolkit.Mvvm.ComponentModel;
 using ManagedCommon;
-using Microsoft.CmdPal.UI.ViewModels.Services;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.Foundation;
 
@@ -26,7 +25,7 @@ public partial class AppStateModel : ObservableObject
     // STATE HERE
     // Make sure that you make the setters public (JsonSerializer.Deserialize will fail silently otherwise)!
     // Make sure that any new types you add are added to JsonSerializationContext!
-    public RecentCommandsService RecentCommands { get; set; } = new();
+    public RecentCommandsManager RecentCommands { get; set; } = new();
 
     public List<string> RunHistory { get; set; } = [];
 

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

@@ -4,27 +4,23 @@
 
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.UI.ViewModels;
 
 public partial class CommandPaletteContentPageViewModel : ContentPageViewModel
 {
-    private readonly ILogger logger;
-
-    public CommandPaletteContentPageViewModel(IContentPage model, TaskScheduler scheduler, AppExtensionHost host, ILogger logger)
-        : base(model, scheduler, host, logger)
+    public CommandPaletteContentPageViewModel(IContentPage model, TaskScheduler scheduler, AppExtensionHost host)
+        : base(model, scheduler, host)
     {
-        this.logger = logger;
     }
 
     public override ContentViewModel? ViewModelFromContent(IContent content, WeakReference<IPageContext> context)
     {
         ContentViewModel? viewModel = content switch
         {
-            IFormContent form => new ContentFormViewModel(form, context, logger),
-            IMarkdownContent markdown => new ContentMarkdownViewModel(markdown, context, logger),
-            ITreeContent tree => new ContentTreeViewModel(tree, context, logger),
+            IFormContent form => new ContentFormViewModel(form, context),
+            IMarkdownContent markdown => new ContentMarkdownViewModel(markdown, context),
+            ITreeContent tree => new ContentTreeViewModel(tree, context),
             _ => null,
         };
         return viewModel;

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

@@ -5,7 +5,6 @@
 using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.UI.ViewModels;
 
@@ -13,24 +12,22 @@ public sealed partial class CommandPaletteHost : AppExtensionHost, IExtensionHos
 {
     // Static singleton, so that we can access this from anywhere
     // Post MVVM - this should probably be like, a dependency injection thing.
-    // public static CommandPaletteHost Instance { get; } = new();
+    public static CommandPaletteHost Instance { get; } = new();
+
     public IExtensionWrapper? Extension { get; }
 
     private readonly ICommandProvider? _builtInProvider;
 
-    private CommandPaletteHost(ILogger logger)
-        : base(logger)
+    private CommandPaletteHost()
     {
     }
 
-    public CommandPaletteHost(IExtensionWrapper source, ILogger logger)
-        : base(logger)
+    public CommandPaletteHost(IExtensionWrapper source)
     {
         Extension = source;
     }
 
-    public CommandPaletteHost(ICommandProvider builtInProvider, ILogger logger)
-        : base(logger)
+    public CommandPaletteHost(ICommandProvider builtInProvider)
     {
         _builtInProvider = builtInProvider;
     }
@@ -39,15 +36,4 @@ public sealed partial class CommandPaletteHost : AppExtensionHost, IExtensionHos
     {
         return Extension?.ExtensionDisplayName;
     }
-
-    public override AppExtensionHost GetHostForCommand(object? context, AppExtensionHost? currentHost)
-    {
-        AppExtensionHost? topLevelHost = null;
-        if (context is TopLevelViewModel topLevelViewModel)
-        {
-            topLevelHost = topLevelViewModel.ExtensionHost;
-        }
-
-        return topLevelHost ?? currentHost ?? this;
-    }
 }

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

@@ -4,7 +4,6 @@
 
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.UI.ViewModels;
 
@@ -18,12 +17,12 @@ public class CommandPalettePageViewModelFactory
         _scheduler = scheduler;
     }
 
-    public PageViewModel? TryCreatePageViewModel(IPage page, bool nested, AppExtensionHost host, ILogger logger)
+    public PageViewModel? TryCreatePageViewModel(IPage page, bool nested, AppExtensionHost host)
     {
         return page switch
         {
-            IListPage listPage => new ListViewModel(listPage, _scheduler, host, logger) { IsNested = nested },
-            IContentPage contentPage => new CommandPaletteContentPageViewModel(contentPage, _scheduler, host, logger),
+            IListPage listPage => new ListViewModel(listPage, _scheduler, host) { IsNested = nested },
+            IContentPage contentPage => new CommandPaletteContentPageViewModel(contentPage, _scheduler, host),
             _ => null,
         };
     }

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

@@ -2,22 +2,19 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using ManagedCommon;
 using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Models;
-using Microsoft.CmdPal.UI.ViewModels.Services;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.DependencyInjection;
+
 using Windows.Foundation;
 
 namespace Microsoft.CmdPal.UI.ViewModels;
 
-public sealed partial class CommandProviderWrapper
+public sealed class CommandProviderWrapper
 {
-    private readonly ILogger logger;
-    private readonly HotkeyService _hotkeyService;
-    private readonly AliasService _aliasService;
-
     public bool IsExtension => Extension is not null;
 
     private readonly bool isValid;
@@ -54,18 +51,15 @@ public sealed partial class CommandProviderWrapper
         }
     }
 
-    public CommandProviderWrapper(ICommandProvider provider, TaskScheduler mainThread, ILogger logger, AliasService aliasService, HotkeyService hotkeyService)
+    public CommandProviderWrapper(ICommandProvider provider, TaskScheduler mainThread)
     {
         // This ctor is only used for in-proc builtin commands. So the Unsafe!
         // calls are pretty dang safe actually.
         _commandProvider = new(provider);
         _taskScheduler = mainThread;
-        this.logger = logger;
-        _aliasService = aliasService;
-        _hotkeyService = hotkeyService;
 
         // Hook the extension back into us
-        ExtensionHost = new CommandPaletteHost(provider, logger);
+        ExtensionHost = new CommandPaletteHost(provider);
         _commandProvider.Unsafe!.InitializeWithHost(ExtensionHost);
 
         _commandProvider.Unsafe!.ItemsChanged += CommandProvider_ItemsChanged;
@@ -78,20 +72,16 @@ public sealed partial class CommandProviderWrapper
 
         // Note: explicitly not InitializeProperties()ing the settings here. If
         // we do that, then we'd regress GH #38321
-        Settings = new(provider.Settings, this, _taskScheduler, logger);
+        Settings = new(provider.Settings, this, _taskScheduler);
 
-        Log_CommandProviderInitialized(ProviderId);
+        Logger.LogDebug($"Initialized command provider {ProviderId}");
     }
 
-    public CommandProviderWrapper(IExtensionWrapper extension, TaskScheduler mainThread, ILogger logger, AliasService aliasService, HotkeyService hotkeyService)
+    public CommandProviderWrapper(IExtensionWrapper extension, TaskScheduler mainThread)
     {
         _taskScheduler = mainThread;
-        this.logger = logger;
-        _aliasService = aliasService;
-        _hotkeyService = hotkeyService;
-
         Extension = extension;
-        ExtensionHost = new CommandPaletteHost(extension, logger);
+        ExtensionHost = new CommandPaletteHost(extension);
         if (!Extension.IsRunning())
         {
             throw new ArgumentException("You forgot to start the extension. This is a CmdPal error - we need to make sure to call StartExtensionAsync");
@@ -116,11 +106,13 @@ public sealed partial class CommandProviderWrapper
 
             isValid = true;
 
-            Log_ExtensionInitialized(Extension.PackageFamilyName, Extension.ExtensionUniqueId);
+            Logger.LogDebug($"Initialized extension command provider {Extension.PackageFamilyName}:{Extension.ExtensionUniqueId}");
         }
         catch (Exception e)
         {
-            Log_FailedToInitializeCommandProviderForExtension(Extension!.PackageFamilyName, e);
+            Logger.LogError("Failed to initialize CommandProvider for extension.");
+            Logger.LogError($"Extension was {Extension!.PackageFamilyName}");
+            Logger.LogError(e.ToString());
         }
 
         isValid = true;
@@ -131,7 +123,7 @@ public sealed partial class CommandProviderWrapper
         return settings.GetProviderSettings(this);
     }
 
-    public async Task LoadTopLevelCommands(SettingsModel settings, WeakReference<IPageContext> pageContext)
+    public async Task LoadTopLevelCommands(IServiceProvider serviceProvider, WeakReference<IPageContext> pageContext)
     {
         if (!isValid)
         {
@@ -139,6 +131,8 @@ public sealed partial class CommandProviderWrapper
             return;
         }
 
+        var settings = serviceProvider.GetService<SettingsModel>()!;
+
         IsActive = GetProviderSettings(settings).IsEnabled;
         if (!IsActive)
         {
@@ -171,27 +165,30 @@ public sealed partial class CommandProviderWrapper
 
             // Note: explicitly not InitializeProperties()ing the settings here. If
             // we do that, then we'd regress GH #38321
-            Settings = new(model.Settings, this, _taskScheduler, logger);
+            Settings = new(model.Settings, this, _taskScheduler);
 
             // We do need to explicitly initialize commands though
-            InitializeCommands(commands, fallbacks, settings, pageContext);
+            InitializeCommands(commands, fallbacks, serviceProvider, pageContext);
 
-            Log_LoadedCommandsFromExtension(DisplayName, ProviderId);
+            Logger.LogDebug($"Loaded commands from {DisplayName} ({ProviderId})");
         }
         catch (Exception e)
         {
-            Log_FailedToLoadCommandsFromProvider(Extension!.PackageFamilyName, e);
+            Logger.LogError("Failed to load commands from extension");
+            Logger.LogError($"Extension was {Extension!.PackageFamilyName}");
+            Logger.LogError(e.ToString());
         }
     }
 
-    private void InitializeCommands(ICommandItem[] commands, IFallbackCommandItem[] fallbacks, SettingsModel settings, WeakReference<IPageContext> pageContext)
+    private void InitializeCommands(ICommandItem[] commands, IFallbackCommandItem[] fallbacks, IServiceProvider serviceProvider, WeakReference<IPageContext> pageContext)
     {
+        var settings = serviceProvider.GetService<SettingsModel>()!;
         var providerSettings = GetProviderSettings(settings);
 
         Func<ICommandItem?, bool, TopLevelViewModel> makeAndAdd = (ICommandItem? i, bool fallback) =>
         {
-            CommandItemViewModel commandItemViewModel = new(new(i), pageContext, logger);
-            TopLevelViewModel topLevelViewModel = new(commandItemViewModel, fallback, ExtensionHost, ProviderId, settings, _hotkeyService, _aliasService, providerSettings);
+            CommandItemViewModel commandItemViewModel = new(new(i), pageContext);
+            TopLevelViewModel topLevelViewModel = new(commandItemViewModel, fallback, ExtensionHost, ProviderId, settings, providerSettings, serviceProvider);
             topLevelViewModel.InitializeProperties();
 
             return topLevelViewModel;
@@ -214,12 +211,12 @@ public sealed partial class CommandProviderWrapper
     private void UnsafePreCacheApiAdditions(ICommandProvider2 provider)
     {
         var apiExtensions = provider.GetApiExtensionStubs();
-        Log_ProviderCount(apiExtensions.Length);
+        Logger.LogDebug($"Provider supports {apiExtensions.Length} extensions");
         foreach (var a in apiExtensions)
         {
             if (a is IExtendedAttributesProvider command2)
             {
-                Log_IExtendedAttributesProviderFound(ProviderId);
+                Logger.LogDebug($"{ProviderId}: Found an IExtendedAttributesProvider");
             }
         }
     }
@@ -231,31 +228,10 @@ public sealed partial class CommandProviderWrapper
     private void CommandProvider_ItemsChanged(object sender, IItemsChangedEventArgs args) =>
 
         // We don't want to handle this ourselves - we want the
-        // TopLevelCommandService to know about this, so they can remove
+        // TopLevelCommandManager to know about this, so they can remove
         // our old commands from their own list.
         //
         // In handling this, a call will be made to `LoadTopLevelCommands` to
         // retrieve the new items.
         this.CommandsChanged?.Invoke(this, args);
-
-    [LoggerMessage(Level = LogLevel.Debug, Message = "Initialized CommandProvider '{ProviderId}'")]
-    partial void Log_CommandProviderInitialized(string providerId);
-
-    [LoggerMessage(Level = LogLevel.Debug, Message = "{ProviderId}: Found an IExtendedAttributesProvider")]
-    partial void Log_IExtendedAttributesProviderFound(string providerId);
-
-    [LoggerMessage(Level = LogLevel.Debug, Message = "Provider exposed {Count} API extensions")]
-    partial void Log_ProviderCount(int count);
-
-    [LoggerMessage(Level = LogLevel.Debug, Message = "Initialized CommandProvider from extension '{PackageFamilyName}' ({ExtensionId})")]
-    partial void Log_ExtensionInitialized(string packageFamilyName, string extensionId);
-
-    [LoggerMessage(Level = LogLevel.Debug, Message = "Loaded commands from {DisplayName} ({ProviderId})")]
-    partial void Log_LoadedCommandsFromExtension(string displayName, string providerId);
-
-    [LoggerMessage(Level = LogLevel.Error, Message = "Failed to load commands from extension '{PackageFamilyName}'")]
-    partial void Log_FailedToLoadCommandsFromProvider(string packageFamilyName, Exception exception);
-
-    [LoggerMessage(Level = LogLevel.Error, Message = "Failed to initialize CommandProvider for extension '{PackageFamilyName}'")]
-    partial void Log_FailedToInitializeCommandProviderForExtension(string packageFamilyName, Exception exception);
 }

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

@@ -2,17 +2,16 @@
 // 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.Core.Common;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.UI.ViewModels;
 
-public partial class CommandSettingsViewModel(ICommandSettings? _unsafeSettings, CommandProviderWrapper provider, TaskScheduler mainThread, ILogger logger)
+public partial class CommandSettingsViewModel(ICommandSettings? _unsafeSettings, CommandProviderWrapper provider, TaskScheduler mainThread)
 {
     private readonly ExtensionObject<ICommandSettings> _model = new(_unsafeSettings);
-    private readonly ILogger _logger = logger;
 
     public ContentPageViewModel? SettingsPage { get; private set; }
 
@@ -32,7 +31,7 @@ public partial class CommandSettingsViewModel(ICommandSettings? _unsafeSettings,
 
         if (model.SettingsPage is not null)
         {
-            SettingsPage = new CommandPaletteContentPageViewModel(model.SettingsPage, mainThread, provider.ExtensionHost, _logger);
+            SettingsPage = new CommandPaletteContentPageViewModel(model.SettingsPage, mainThread, provider.ExtensionHost);
             SettingsPage.InitializeProperties();
         }
     }
@@ -45,7 +44,7 @@ public partial class CommandSettingsViewModel(ICommandSettings? _unsafeSettings,
         }
         catch (Exception ex)
         {
-            Log_FailedToLoadSettingsPage(ex);
+            CoreLogger.LogError($"Failed to load settings page", ex: ex);
         }
 
         Initialized = true;
@@ -59,7 +58,4 @@ public partial class CommandSettingsViewModel(ICommandSettings? _unsafeSettings,
             TaskCreationOptions.None,
             mainThread);
     }
-
-    [LoggerMessage(Level = LogLevel.Error, Message = "Failed to load settings page")]
-    partial void Log_FailedToLoadSettingsPage(Exception ex);
 }

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

@@ -14,9 +14,9 @@ using Microsoft.CmdPal.Ext.Apps.Programs;
 using Microsoft.CmdPal.Ext.Apps.State;
 using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.CmdPal.UI.ViewModels.Properties;
-using Microsoft.CmdPal.UI.ViewModels.Services;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.CmdPal.UI.ViewModels.MainPage;
 
@@ -36,13 +36,10 @@ public partial class MainListPage : DynamicListPage,
         "com.microsoft.cmdpal.builtin.websearch",
         "com.microsoft.cmdpal.builtin.windowssettings",
         "com.microsoft.cmdpal.builtin.datetime",
-        "com.microsoft.cmdpal.builtin.remotedesktop",
     ];
 
-    private readonly TopLevelCommandService _tlcService;
-    private readonly SettingsModel _settingsModel;
-    private readonly AliasService _aliasService;
-    private readonly AppStateModel _appStateModel;
+    private readonly IServiceProvider _serviceProvider;
+    private readonly TopLevelCommandManager _tlcManager;
     private List<Scored<IListItem>>? _filteredItems;
     private List<Scored<IListItem>>? _filteredApps;
     private List<Scored<IListItem>>? _fallbackItems;
@@ -56,22 +53,16 @@ public partial class MainListPage : DynamicListPage,
 
     private CancellationTokenSource? _cancellationTokenSource;
 
-    public MainListPage(
-        TopLevelCommandService topLevelCommandService,
-        SettingsModel settingsModel,
-        AliasService aliasService,
-        AppStateModel appStateModel)
+    public MainListPage(IServiceProvider serviceProvider)
     {
         Title = Resources.builtin_home_name;
         Icon = IconHelpers.FromRelativePath("Assets\\StoreLogo.scale-200.png");
         PlaceholderText = Properties.Resources.builtin_main_list_page_searchbar_placeholder;
+        _serviceProvider = serviceProvider;
 
-        _aliasService = aliasService;
-        _appStateModel = appStateModel;
-
-        _tlcService = topLevelCommandService;
-        _tlcService.PropertyChanged += TlcManager_PropertyChanged;
-        _tlcService.TopLevelCommands.CollectionChanged += Commands_CollectionChanged;
+        _tlcManager = _serviceProvider.GetService<TopLevelCommandManager>()!;
+        _tlcManager.PropertyChanged += TlcManager_PropertyChanged;
+        _tlcManager.TopLevelCommands.CollectionChanged += Commands_CollectionChanged;
 
         // The all apps page will kick off a BG thread to start loading apps.
         // We just want to know when it is done.
@@ -87,10 +78,10 @@ public partial class MainListPage : DynamicListPage,
         WeakReferenceMessenger.Default.Register<ClearSearchMessage>(this);
         WeakReferenceMessenger.Default.Register<UpdateFallbackItemsMessage>(this);
 
-        _settingsModel = settingsModel;
-        _settingsModel.SettingsChanged += SettingsChangedHandler;
-        HotReloadSettings(_settingsModel);
-        _includeApps = _tlcService.IsProviderActive(AllAppsCommandProvider.WellKnownId);
+        var settings = _serviceProvider.GetService<SettingsModel>()!;
+        settings.SettingsChanged += SettingsChangedHandler;
+        HotReloadSettings(settings);
+        _includeApps = _tlcManager.IsProviderActive(AllAppsCommandProvider.WellKnownId);
 
         IsLoading = true;
     }
@@ -105,7 +96,7 @@ public partial class MainListPage : DynamicListPage,
 
     private void Commands_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
     {
-        _includeApps = _tlcService.IsProviderActive(AllAppsCommandProvider.WellKnownId);
+        _includeApps = _tlcManager.IsProviderActive(AllAppsCommandProvider.WellKnownId);
         if (_includeApps != _filteredItemsIncludesApps)
         {
             ReapplySearchInBackground();
@@ -134,7 +125,7 @@ public partial class MainListPage : DynamicListPage,
             do
             {
                 _refreshRequested.Clear();
-                lock (_tlcService.TopLevelCommands)
+                lock (_tlcManager.TopLevelCommands)
                 {
                     if (_filteredItemsIncludesApps == _includeApps)
                     {
@@ -165,9 +156,9 @@ public partial class MainListPage : DynamicListPage,
     {
         if (string.IsNullOrEmpty(SearchText))
         {
-            lock (_tlcService.TopLevelCommands)
+            lock (_tlcManager.TopLevelCommands)
             {
-                return _tlcService
+                return _tlcManager
                     .TopLevelCommands
                     .Where(tlc => !string.IsNullOrEmpty(tlc.Title))
                     .ToArray();
@@ -175,7 +166,7 @@ public partial class MainListPage : DynamicListPage,
         }
         else
         {
-            lock (_tlcService.TopLevelCommands)
+            lock (_tlcManager.TopLevelCommands)
             {
                 var limitedApps = new List<Scored<IListItem>>();
 
@@ -228,16 +219,18 @@ public partial class MainListPage : DynamicListPage,
         // Handle changes to the filter text here
         if (!string.IsNullOrEmpty(SearchText))
         {
+            var aliases = _serviceProvider.GetService<AliasManager>()!;
+
             if (token.IsCancellationRequested)
             {
                 return;
             }
 
-            if (_aliasService.CheckAlias(newSearch))
+            if (aliases.CheckAlias(newSearch))
             {
                 if (_filteredItemsIncludesApps != _includeApps)
                 {
-                    lock (_tlcService.TopLevelCommands)
+                    lock (_tlcManager.TopLevelCommands)
                     {
                         _filteredItemsIncludesApps = _includeApps;
                         ClearResults();
@@ -253,7 +246,7 @@ public partial class MainListPage : DynamicListPage,
             return;
         }
 
-        var commands = _tlcService.TopLevelCommands;
+        var commands = _tlcManager.TopLevelCommands;
         lock (commands)
         {
             if (token.IsCancellationRequested)
@@ -395,7 +388,7 @@ public partial class MainListPage : DynamicListPage,
                 }
             }
 
-            var history = _appStateModel.RecentCommands!;
+            var history = _serviceProvider.GetService<AppStateModel>()!.RecentCommands!;
             Func<string, IListItem, int> scoreItem = (a, b) => { return ScoreTopLevelItem(a, b, history); };
 
             // Produce a list of everything that matches the current filter.
@@ -490,14 +483,15 @@ public partial class MainListPage : DynamicListPage,
 
     private bool ActuallyLoading()
     {
+        var tlcManager = _serviceProvider.GetService<TopLevelCommandManager>()!;
         var allApps = AllAppsCommandProvider.Page;
-        return allApps.IsLoading || _tlcService.IsLoading;
+        return allApps.IsLoading || tlcManager.IsLoading;
     }
 
     // Almost verbatim ListHelpers.ScoreListItem, but also accounting for the
     // fact that we want fallback handlers down-weighted, so that they don't
     // _always_ show up first.
-    internal static int ScoreTopLevelItem(string query, IListItem topLevelOrAppItem, IRecentCommandsService history)
+    internal static int ScoreTopLevelItem(string query, IListItem topLevelOrAppItem, IRecentCommandsManager history)
     {
         var title = topLevelOrAppItem.Title;
         if (string.IsNullOrWhiteSpace(title))
@@ -586,9 +580,10 @@ public partial class MainListPage : DynamicListPage,
     public void UpdateHistory(IListItem topLevelOrAppItem)
     {
         var id = IdForTopLevelOrAppItem(topLevelOrAppItem);
-        var history = _appStateModel.RecentCommands;
+        var state = _serviceProvider.GetService<AppStateModel>()!;
+        var history = state.RecentCommands;
         history.AddHistoryItem(id);
-        AppStateModel.SaveState(_appStateModel);
+        AppStateModel.SaveState(state);
     }
 
     private static string IdForTopLevelOrAppItem(IListItem topLevelOrAppItem)
@@ -606,7 +601,7 @@ public partial class MainListPage : DynamicListPage,
 
     public void Receive(ClearSearchMessage message) => SearchText = string.Empty;
 
-    public void Receive(UpdateFallbackItemsMessage message) => RaiseItemsChanged(_tlcService.TopLevelCommands.Count);
+    public void Receive(UpdateFallbackItemsMessage message) => RaiseItemsChanged(_tlcManager.TopLevelCommands.Count);
 
     private void SettingsChangedHandler(SettingsModel sender, object? args) => HotReloadSettings(sender);
 
@@ -617,12 +612,13 @@ public partial class MainListPage : DynamicListPage,
         _cancellationTokenSource?.Cancel();
         _cancellationTokenSource?.Dispose();
 
-        _tlcService.PropertyChanged -= TlcManager_PropertyChanged;
-        _tlcService.TopLevelCommands.CollectionChanged -= Commands_CollectionChanged;
+        _tlcManager.PropertyChanged -= TlcManager_PropertyChanged;
+        _tlcManager.TopLevelCommands.CollectionChanged -= Commands_CollectionChanged;
 
-        if (_settingsModel is not null)
+        var settings = _serviceProvider.GetService<SettingsModel>();
+        if (settings is not null)
         {
-            _settingsModel.SettingsChanged -= SettingsChangedHandler;
+            settings.SettingsChanged -= SettingsChangedHandler;
         }
 
         WeakReferenceMessenger.Default.UnregisterAll(this);

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

@@ -7,26 +7,19 @@ using System.Text.Json;
 using AdaptiveCards.ObjectModel.WinUI3;
 using AdaptiveCards.Templating;
 using CommunityToolkit.Mvvm.Messaging;
+using ManagedCommon;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 using Windows.Data.Json;
 
 namespace Microsoft.CmdPal.UI.ViewModels;
 
-public partial class ContentFormViewModel : ContentViewModel
+public partial class ContentFormViewModel(IFormContent _form, WeakReference<IPageContext> context) :
+    ContentViewModel(context)
 {
-    private readonly ExtensionObject<IFormContent> _formModel;
-    private readonly ILogger _logger;
-
-    public ContentFormViewModel(IFormContent _form, WeakReference<IPageContext> context, ILogger logger)
-        : base(context, logger)
-    {
-        _formModel = new(_form);
-        _logger = logger;
-    }
+    private readonly ExtensionObject<IFormContent> _formModel = new(_form);
 
     // Remember - "observable" properties from the model (via PropChanged)
     // cannot be marked [ObservableProperty]
@@ -45,8 +38,7 @@ public partial class ContentFormViewModel : ContentViewModel
         string templateJson,
         string dataJson,
         out AdaptiveCardParseResult? card,
-        out Exception? error,
-        ILogger logger)
+        out Exception? error)
     {
         card = null;
         error = null;
@@ -60,7 +52,7 @@ public partial class ContentFormViewModel : ContentViewModel
         }
         catch (Exception ex)
         {
-            Log_ErrorBuildindCard(logger, ex);
+            Logger.LogError("Error building card from template", ex);
             error = ex;
             return false;
         }
@@ -78,7 +70,7 @@ public partial class ContentFormViewModel : ContentViewModel
         StateJson = model.StateJson;
         DataJson = model.DataJson;
 
-        if (TryBuildCard(TemplateJson, DataJson, out var builtCard, out var renderingError, _logger))
+        if (TryBuildCard(TemplateJson, DataJson, out var builtCard, out var renderingError))
         {
             Card = builtCard;
             UpdateProperty(nameof(Card));
@@ -95,7 +87,7 @@ public partial class ContentFormViewModel : ContentViewModel
     }
     """;
 
-        if (TryBuildCard(ErrorCardJson, errorPayload, out var errorCard, out var _, _logger))
+        if (TryBuildCard(ErrorCardJson, errorPayload, out var errorCard, out var _))
         {
             Card = errorCard;
             UpdateProperty(nameof(Card));
@@ -181,7 +173,4 @@ public partial class ContentFormViewModel : ContentViewModel
     ]
 }
 """;
-
-    [LoggerMessage(Level = LogLevel.Error, Message = "Error building adaptive card for form.")]
-    static partial void Log_ErrorBuildindCard(ILogger logger, Exception ex);
 }

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

@@ -5,12 +5,11 @@
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.UI.ViewModels;
 
-public partial class ContentMarkdownViewModel(IMarkdownContent _markdown, WeakReference<IPageContext> context, ILogger logger) :
-    ContentViewModel(context, logger)
+public partial class ContentMarkdownViewModel(IMarkdownContent _markdown, WeakReference<IPageContext> context) :
+    ContentViewModel(context)
 {
     public ExtensionObject<IMarkdownContent> Model { get; } = new(_markdown);
 

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

@@ -7,12 +7,11 @@ using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.CmdPal.UI.ViewModels;
 
-public partial class ContentTreeViewModel(ITreeContent _tree, WeakReference<IPageContext> context, ILogger logger) :
-    ContentViewModel(context, logger)
+public partial class ContentTreeViewModel(ITreeContent _tree, WeakReference<IPageContext> context) :
+    ContentViewModel(context)
 {
     public ExtensionObject<ITreeContent> Model { get; } = new(_tree);
 
@@ -56,9 +55,9 @@ public partial class ContentTreeViewModel(ITreeContent _tree, WeakReference<IPag
     {
         ContentViewModel? viewModel = content switch
         {
-            IFormContent form => new ContentFormViewModel(form, context, Logger),
-            IMarkdownContent markdown => new ContentMarkdownViewModel(markdown, context, Logger),
-            ITreeContent tree => new ContentTreeViewModel(tree, context, Logger),
+            IFormContent form => new ContentFormViewModel(form, context),
+            IMarkdownContent markdown => new ContentMarkdownViewModel(markdown, context),
+            ITreeContent tree => new ContentTreeViewModel(tree, context),
             _ => null,
         };
         return viewModel;

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

@@ -5,16 +5,16 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.CmdPal.UI.ViewModels.Settings;
 
-namespace Microsoft.CmdPal.UI.ViewModels.Services;
+namespace Microsoft.CmdPal.UI.ViewModels;
 
-public partial class HotkeyService : ObservableObject
+public partial class HotkeyManager : ObservableObject
 {
-    private readonly TopLevelCommandService _topLevelCommandService;
+    private readonly TopLevelCommandManager _topLevelCommandManager;
     private readonly List<TopLevelHotkey> _commandHotkeys;
 
-    public HotkeyService(TopLevelCommandService topLevelCommandService, SettingsModel settings)
+    public HotkeyManager(TopLevelCommandManager tlcManager, SettingsModel settings)
     {
-        _topLevelCommandService = topLevelCommandService;
+        _topLevelCommandManager = tlcManager;
         _commandHotkeys = settings.CommandHotkeys;
     }
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Microsoft.CmdPal.UI.ViewModels.csproj

@@ -27,7 +27,7 @@
     <PackageReference Include="AdaptiveCards.ObjectModel.WinUI3" GeneratePathProperty="true">
       <ExcludeAssets>compile</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="AdaptiveCards.Rendering.WinUI3" GeneratePathProperty="True">
+    <PackageReference Include="AdaptiveCards.Rendering.WinUI3" GeneratePathProperty="True" >
       <ExcludeAssets>compile</ExcludeAssets>
     </PackageReference>
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionService.cs

@@ -2,16 +2,15 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using ManagedCommon;
 using Microsoft.CmdPal.Core.Common.Services;
-using Microsoft.CmdPal.UI.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.AppExtensions;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
 
-namespace Microsoft.CmdPal.UI.ViewModels.Services;
+namespace Microsoft.CmdPal.UI.ViewModels.Models;
 
 public partial class ExtensionService : IExtensionService, IDisposable
 {
@@ -23,7 +22,6 @@ public partial class ExtensionService : IExtensionService, IDisposable
     private static readonly Lock _lock = new();
     private readonly SemaphoreSlim _getInstalledExtensionsLock = new(1, 1);
     private readonly SemaphoreSlim _getInstalledWidgetsLock = new(1, 1);
-    private readonly ILogger _logger;
 
     // private readonly ILocalSettingsService _localSettingsService;
     private bool _disposedValue;
@@ -34,9 +32,8 @@ public partial class ExtensionService : IExtensionService, IDisposable
     private static readonly List<IExtensionWrapper> _installedExtensions = [];
     private static readonly List<IExtensionWrapper> _enabledExtensions = [];
 
-    public ExtensionService(ILogger logger)
+    public ExtensionService()
     {
-        _logger = logger;
         _catalog.PackageInstalling += Catalog_PackageInstalling;
         _catalog.PackageUninstalling += Catalog_PackageUninstalling;
         _catalog.PackageUpdating += Catalog_PackageUpdating;
@@ -95,14 +92,14 @@ public partial class ExtensionService : IExtensionService, IDisposable
         var extension = isCmdPalExtensionResult.Extension;
         if (isExtension && extension is not null)
         {
-            Log_ExtensionInstalled(extension.DisplayName);
+            CommandPaletteHost.Instance.DebugLog($"Installed new extension app {extension.DisplayName}");
 
             Task.Run(async () =>
             {
                 await _getInstalledExtensionsLock.WaitAsync();
                 try
                 {
-                    var wrappers = await CreateWrappersForExtension(extension, _logger);
+                    var wrappers = await CreateWrappersForExtension(extension);
 
                     UpdateExtensionsListsFromWrappers(wrappers);
 
@@ -123,7 +120,7 @@ public partial class ExtensionService : IExtensionService, IDisposable
         {
             if (extension.PackageFullName == package.Id.FullName)
             {
-                Log_ExtensionUninstalled(extension.PackageDisplayName);
+                CommandPaletteHost.Instance.DebugLog($"Uninstalled extension app {extension.PackageDisplayName}");
 
                 removedExtensions.Add(extension);
             }
@@ -202,7 +199,7 @@ public partial class ExtensionService : IExtensionService, IDisposable
                 var extensions = await GetInstalledAppExtensionsAsync();
                 foreach (var extension in extensions)
                 {
-                    var wrappers = await CreateWrappersForExtension(extension, _logger);
+                    var wrappers = await CreateWrappersForExtension(extension);
                     UpdateExtensionsListsFromWrappers(wrappers);
                 }
             }
@@ -236,7 +233,7 @@ public partial class ExtensionService : IExtensionService, IDisposable
         }
     }
 
-    private static async Task<List<ExtensionWrapper>> CreateWrappersForExtension(AppExtension extension, ILogger logger)
+    private static async Task<List<ExtensionWrapper>> CreateWrappersForExtension(AppExtension extension)
     {
         var (cmdPalProvider, classIds) = await GetCmdPalExtensionPropertiesAsync(extension);
 
@@ -248,14 +245,14 @@ public partial class ExtensionService : IExtensionService, IDisposable
         List<ExtensionWrapper> wrappers = [];
         foreach (var classId in classIds)
         {
-            var extensionWrapper = CreateExtensionWrapper(extension, cmdPalProvider, classId, logger);
+            var extensionWrapper = CreateExtensionWrapper(extension, cmdPalProvider, classId);
             wrappers.Add(extensionWrapper);
         }
 
         return wrappers;
     }
 
-    private static ExtensionWrapper CreateExtensionWrapper(AppExtension extension, IPropertySet cmdPalProvider, string classId, ILogger logger)
+    private static ExtensionWrapper CreateExtensionWrapper(AppExtension extension, IPropertySet cmdPalProvider, string classId)
     {
         var extensionWrapper = new ExtensionWrapper(extension, classId);
 
@@ -272,7 +269,7 @@ public partial class ExtensionService : IExtensionService, IDisposable
                 else
                 {
                     // log warning  that extension declared unsupported extension interface
-                    Log_InvalidExtensionInterface(logger, extension.DisplayName, supportedInterface.Key);
+                    CommandPaletteHost.Instance.DebugLog($"Extension {extension.DisplayName} declared an unsupported interface: {supportedInterface.Key}");
                 }
             }
         }
@@ -291,8 +288,7 @@ public partial class ExtensionService : IExtensionService, IDisposable
         var installedExtensions = await GetInstalledExtensionsAsync();
         foreach (var installedExtension in installedExtensions)
         {
-            Log_SignalingDispose(installedExtension.ExtensionUniqueId);
-
+            Logger.LogDebug($"Signaling dispose to {installedExtension.ExtensionUniqueId}");
             try
             {
                 if (installedExtension.IsRunning())
@@ -302,7 +298,7 @@ public partial class ExtensionService : IExtensionService, IDisposable
             }
             catch (Exception ex)
             {
-                Log_ErrorSignalingDispose(installedExtension.ExtensionUniqueId, ex);
+                Logger.LogError($"Failed to send dispose signal to extension {installedExtension.ExtensionUniqueId}", ex);
             }
         }
     }
@@ -404,20 +400,23 @@ public partial class ExtensionService : IExtensionService, IDisposable
         _enabledExtensions.Remove(extension.First());
     }
 
-    [LoggerMessage(Level = LogLevel.Information, Message = "Installed new extension app {ExtensionName}")]
-    partial void Log_ExtensionInstalled(string extensionName);
-
-    [LoggerMessage(Level = LogLevel.Information, Message = "Uninstalled extension app {ExtensionName}")]
-    partial void Log_ExtensionUninstalled(string extensionName);
-
-    [LoggerMessage(Level = LogLevel.Debug, Message = "Signaling dispose to {ExtensionUniqueId}")]
-    partial void Log_SignalingDispose(string extensionUniqueId);
-
-    [LoggerMessage(Level = LogLevel.Error, Message = "Failed to send dispose signal to extension {ExtensionUniqueId}")]
-    partial void Log_ErrorSignalingDispose(string extensionUniqueId, Exception exception);
-
-    [LoggerMessage(Level = LogLevel.Warning, Message = "Extension {ExtensionName} declared unsupported extension interface: {InterfaceName}")]
-    static partial void Log_InvalidExtensionInterface(ILogger logger, string extensionName, string interfaceName);
+    /*
+    ///// <inheritdoc cref="IExtensionService.DisableExtensionIfWindowsFeatureNotAvailable(IExtensionWrapper)"/>
+    //public async Task<bool> DisableExtensionIfWindowsFeatureNotAvailable(IExtensionWrapper extension)
+    //{
+    //    // Only attempt to disable feature if its available.
+    //    if (IsWindowsOptionalFeatureAvailableForExtension(extension.ExtensionClassId))
+    //    {
+    //        return false;
+    //    }
+    //    _log.Warning($"Disabling extension: '{extension.ExtensionDisplayName}' because its feature is absent or unknown");
+    //    // Remove extension from list of enabled extensions to prevent Dev Home from re-querying for this extension
+    //    // for the rest of its process lifetime.
+    //    DisableExtension(extension.ExtensionUniqueId);
+    //    // Update the local settings so the next time the user launches Dev Home the extension will be disabled.
+    //    await _localSettingsService.SaveSettingAsync(extension.ExtensionUniqueId + "-ExtensionDisabled", true);
+    //    return true;
+    //} */
 }
 
 internal record struct IsExtensionResult(bool IsExtension, AppExtension? Extension)

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

@@ -5,15 +5,19 @@
 using System.Text.Json.Serialization;
 using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace Microsoft.CmdPal.UI.ViewModels.Services;
+namespace Microsoft.CmdPal.UI.ViewModels;
 
-public partial class RecentCommandsService : ObservableObject, IRecentCommandsService
+public partial class RecentCommandsManager : ObservableObject, IRecentCommandsManager
 {
     [JsonInclude]
     internal List<HistoryItem> History { get; set; } = [];
 
     private readonly Lock _lock = new();
 
+    public RecentCommandsManager()
+    {
+    }
+
     public int GetCommandHistoryWeight(string commandId)
     {
         lock (_lock)
@@ -77,7 +81,7 @@ public partial class RecentCommandsService : ObservableObject, IRecentCommandsSe
     }
 }
 
-public interface IRecentCommandsService
+public interface IRecentCommandsManager
 {
     int GetCommandHistoryWeight(string commandId);
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Services/LogWrapper.cs

@@ -1,195 +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.Runtime.InteropServices;
-using ManagedCommon;
-using Microsoft.Extensions.Logging;
-using Windows.Win32;
-using Windows.Win32.Foundation;
-
-namespace Microsoft.CmdPal.UI.ViewModels.Services;
-
-// Adapter implementing Microsoft.Extensions.Logging.ILogger,
-// delegating to ManagedCommon.Logger.
-internal sealed partial class LogWrapper : ILogger
-{
-    private static readonly AsyncLocal<Stack<object>> _scopeStack = new();
-    private readonly LogLevel _minLevel;
-
-    public string CurrentVersionLogDirectoryPath => Logger.CurrentVersionLogDirectoryPath;
-
-    public string CurrentLogFile => Logger.CurrentLogFile;
-
-    public LogWrapper(LogLevel minLevel = LogLevel.Information)
-    {
-        _minLevel = minLevel;
-
-        // Ensure underlying logger initialized (idempotent if already done elsewhere).
-        try
-        {
-            Logger.InitializeLogger("\\CmdPal\\Logs\\");
-        }
-        catch (COMException e)
-        {
-            // This is unexpected. For the sake of debugging:
-            // pop a message box
-            PInvoke.MessageBox(
-                (HWND)IntPtr.Zero,
-                $"Failed to initialize the logger. COMException: \r{e.Message}",
-                "Command Palette",
-                MESSAGEBOX_STYLE.MB_OK | MESSAGEBOX_STYLE.MB_ICONERROR);
-        }
-        catch (Exception e2)
-        {
-            // This is unexpected. For the sake of debugging:
-            // pop a message box
-            PInvoke.MessageBox(
-                (HWND)IntPtr.Zero,
-                $"Failed to initialize the logger. Unknown Exception: \r{e2.Message}",
-                "Command Palette",
-                MESSAGEBOX_STYLE.MB_OK | MESSAGEBOX_STYLE.MB_ICONERROR);
-        }
-    }
-
-    public bool IsEnabled(LogLevel logLevel) => logLevel != LogLevel.None && logLevel >= _minLevel;
-
-    public IDisposable? BeginScope<TState>(TState state)
-        where TState : notnull
-    {
-        var stack = _scopeStack.Value;
-        if (stack is null)
-        {
-            stack = new Stack<object>();
-            _scopeStack.Value = stack;
-        }
-
-        stack.Push(state);
-        return new Scope(stack);
-    }
-
-    public void Log<TState>(
-        LogLevel logLevel,
-        EventId eventId,
-        TState state,
-        Exception? exception,
-        Func<TState, Exception?, string> formatter)
-    {
-        if (!IsEnabled(logLevel))
-        {
-            return;
-        }
-
-        ArgumentNullException.ThrowIfNull(formatter);
-        var message = formatter(state, exception);
-        if (string.IsNullOrEmpty(message) && exception is null)
-        {
-            return;
-        }
-
-        var scopeSuffix = BuildScopeSuffix();
-        var eventPrefix = eventId.Id != 0 ? $"[{eventId.Id}/{eventId.Name}] " : string.Empty;
-        var finalMessage = $"{eventPrefix}{message}{scopeSuffix}";
-
-        switch (logLevel)
-        {
-            case LogLevel.Trace:
-                // Existing stack: Trace logs an empty line; append message via Debug.
-                Logger.LogTrace();
-
-                if (!string.IsNullOrEmpty(message))
-                {
-                    Logger.LogDebug(finalMessage);
-                }
-
-                if (exception is not null)
-                {
-                    Logger.LogError(exception.Message, exception);
-                }
-
-                break;
-
-            case LogLevel.Debug:
-                Logger.LogDebug(finalMessage);
-
-                if (exception is not null)
-                {
-                    Logger.LogError(exception.Message, exception);
-                }
-
-                break;
-
-            case LogLevel.Information:
-                Logger.LogInfo(finalMessage);
-
-                if (exception is not null)
-                {
-                    Logger.LogError(exception.Message, exception);
-                }
-
-                break;
-
-            case LogLevel.Warning:
-                Logger.LogWarning(finalMessage);
-
-                if (exception is not null)
-                {
-                    Logger.LogError(exception.Message, exception);
-                }
-
-                break;
-
-            case LogLevel.Error:
-            case LogLevel.Critical:
-                if (exception is not null)
-                {
-                    Logger.LogError(finalMessage, exception);
-                }
-                else
-                {
-                    Logger.LogError(finalMessage);
-                }
-
-                break;
-
-            case LogLevel.None:
-            default:
-                break;
-        }
-    }
-
-    private static string BuildScopeSuffix()
-    {
-        var stack = _scopeStack.Value;
-        if (stack is null || stack.Count == 0)
-        {
-            return string.Empty;
-        }
-
-        // Show most-recent first.
-        return $" [Scopes: {string.Join(" => ", stack.ToArray())}]";
-    }
-
-    private sealed partial class Scope : IDisposable
-    {
-        private readonly Stack<object> _stack;
-        private bool _disposed;
-
-        public Scope(Stack<object> stack) => _stack = stack;
-
-        public void Dispose()
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            if (_stack.Count > 0)
-            {
-                _stack.Pop();
-            }
-
-            _disposed = true;
-        }
-    }
-}

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

@@ -6,9 +6,7 @@ using System.Diagnostics;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
-using System.Text.Json.Serialization.Metadata;
 using CommunityToolkit.Mvvm.ComponentModel;
-using ManagedCommon;
 using Microsoft.CmdPal.UI.ViewModels.Settings;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.Foundation;
@@ -17,8 +15,6 @@ namespace Microsoft.CmdPal.UI.ViewModels;
 
 public partial class SettingsModel : ObservableObject
 {
-    private const string DeprecatedHotkeyGoesHomeKey = "HotkeyGoesHome";
-
     [JsonIgnore]
     public static readonly string FilePath;
 
@@ -34,6 +30,8 @@ public partial class SettingsModel : ObservableObject
 
     public bool ShowAppDetails { get; set; }
 
+    public bool HotkeyGoesHome { get; set; }
+
     public bool BackspaceGoesBack { get; set; }
 
     public bool SingleClickActivates { get; set; }
@@ -58,8 +56,6 @@ public partial class SettingsModel : ObservableObject
 
     public WindowPosition? LastWindowPosition { get; set; }
 
-    public TimeSpan AutoGoHomeInterval { get; set; } = Timeout.InfiniteTimeSpan;
-
     // END SETTINGS
     ///////////////////////////////////////////////////////////////////////////
 
@@ -102,29 +98,12 @@ public partial class SettingsModel : ObservableObject
         {
             // Read the JSON content from the file
             var jsonContent = File.ReadAllText(FilePath);
-            var loaded = JsonSerializer.Deserialize<SettingsModel>(jsonContent, JsonSerializationContext.Default.SettingsModel) ?? new();
 
-            var migratedAny = false;
-            try
-            {
-                if (JsonNode.Parse(jsonContent) is JsonObject root)
-                {
-                    migratedAny |= ApplyMigrations(root, loaded);
-                }
-            }
-            catch (Exception ex)
-            {
-                Debug.WriteLine($"Migration check failed: {ex}");
-            }
+            var loaded = JsonSerializer.Deserialize<SettingsModel>(jsonContent, JsonSerializationContext.Default.SettingsModel);
 
-            Debug.WriteLine("Loaded settings file");
+            Debug.WriteLine(loaded is not null ? "Loaded settings file" : "Failed to parse");
 
-            if (migratedAny)
-            {
-                SaveSettings(loaded);
-            }
-
-            return loaded;
+            return loaded ?? new();
         }
         catch (Exception ex)
         {
@@ -134,51 +113,6 @@ public partial class SettingsModel : ObservableObject
         return new();
     }
 
-    private static bool ApplyMigrations(JsonObject root, SettingsModel model)
-    {
-        var migrated = false;
-
-        // Migration #1: HotkeyGoesHome (bool) -> AutoGoHomeInterval (TimeSpan)
-        // The old 'HotkeyGoesHome' boolean indicated whether the "go home" action should happen immediately (true) or never (false).
-        // The new 'AutoGoHomeInterval' uses a TimeSpan: 'TimeSpan.Zero' means immediate, 'Timeout.InfiniteTimeSpan' means never.
-        migrated |= TryMigrate(
-            "Migration #1: HotkeyGoesHome (bool) -> AutoGoHomeInterval (TimeSpan)",
-            root,
-            model,
-            nameof(AutoGoHomeInterval),
-            DeprecatedHotkeyGoesHomeKey,
-            (settingsModel, goesHome) => settingsModel.AutoGoHomeInterval = goesHome ? TimeSpan.Zero : Timeout.InfiniteTimeSpan,
-            JsonSerializationContext.Default.Boolean);
-
-        return migrated;
-    }
-
-    private static bool TryMigrate<T>(string migrationName, JsonObject root, SettingsModel model, string newKey, string oldKey, Action<SettingsModel, T> apply, JsonTypeInfo<T> jsonTypeInfo)
-    {
-        try
-        {
-            // If new key already present, skip migration
-            if (root.ContainsKey(newKey) && root[newKey] is not null)
-            {
-                return false;
-            }
-
-            // If old key present, try to deserialize and apply
-            if (root.TryGetPropertyValue(oldKey, out var oldNode) && oldNode is not null)
-            {
-                var value = oldNode.Deserialize<T>(jsonTypeInfo);
-                apply(model, value!);
-                return true;
-            }
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"Error during migration {migrationName}.", ex);
-        }
-
-        return false;
-    }
-
     public static void SaveSettings(SettingsModel model)
     {
         if (string.IsNullOrEmpty(FilePath))
@@ -205,9 +139,6 @@ public partial class SettingsModel : ObservableObject
                         savedSettings[item.Key] = item.Value?.DeepClone();
                     }
 
-                    // Remove deprecated keys
-                    savedSettings.Remove(DeprecatedHotkeyGoesHomeKey);
-
                     var serialized = savedSettings.ToJsonString(JsonSerializationContext.Default.Options);
                     File.WriteAllText(FilePath, serialized);
 

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

@@ -11,19 +11,6 @@ namespace Microsoft.CmdPal.UI.ViewModels;
 
 public partial class SettingsViewModel : INotifyPropertyChanged
 {
-    private static readonly List<TimeSpan> AutoGoHomeIntervals =
-    [
-        Timeout.InfiniteTimeSpan,
-        TimeSpan.Zero,
-        TimeSpan.FromSeconds(10),
-        TimeSpan.FromSeconds(20),
-        TimeSpan.FromSeconds(30),
-        TimeSpan.FromSeconds(60),
-        TimeSpan.FromSeconds(90),
-        TimeSpan.FromSeconds(120),
-        TimeSpan.FromSeconds(180),
-    ];
-
     private readonly SettingsModel _settings;
     private readonly IServiceProvider _serviceProvider;
 
@@ -71,6 +58,16 @@ public partial class SettingsViewModel : INotifyPropertyChanged
         }
     }
 
+    public bool HotkeyGoesHome
+    {
+        get => _settings.HotkeyGoesHome;
+        set
+        {
+            _settings.HotkeyGoesHome = value;
+            Save();
+        }
+    }
+
     public bool BackspaceGoesBack
     {
         get => _settings.BackspaceGoesBack;
@@ -141,25 +138,6 @@ public partial class SettingsViewModel : INotifyPropertyChanged
         }
     }
 
-    public int AutoGoBackIntervalIndex
-    {
-        get
-        {
-            var index = AutoGoHomeIntervals.IndexOf(_settings.AutoGoHomeInterval);
-            return index >= 0 ? index : 0;
-        }
-
-        set
-        {
-            if (value >= 0 && value < AutoGoHomeIntervals.Count)
-            {
-                _settings.AutoGoHomeInterval = AutoGoHomeIntervals[value];
-            }
-
-            Save();
-        }
-    }
-
     public ObservableCollection<ProviderSettingsViewModel> CommandProviders { get; } = [];
 
     public SettingsExtensionsViewModel Extensions { get; }
@@ -185,7 +163,7 @@ public partial class SettingsViewModel : INotifyPropertyChanged
 
     private IEnumerable<CommandProviderWrapper> GetCommandProviders()
     {
-        var manager = _serviceProvider.GetService<TopLevelCommandService>()!;
+        var manager = _serviceProvider.GetService<TopLevelCommandManager>()!;
         var allProviders = manager.CommandProviders;
         return allProviders;
     }

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

@@ -15,23 +15,17 @@ using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.CmdPal.UI.ViewModels.Services;
+namespace Microsoft.CmdPal.UI.ViewModels;
 
-public partial class TopLevelCommandService : ObservableObject,
+public partial class TopLevelCommandManager : ObservableObject,
     IRecipient<ReloadCommandsMessage>,
     IPageContext,
     IDisposable
 {
+    private readonly IServiceProvider _serviceProvider;
     private readonly TaskScheduler _taskScheduler;
-    private readonly ILogger logger;
-    private readonly AppExtensionHost _commandPaletteHost;
-    private readonly IExtensionService _extensionService;
-    private readonly IEnumerable<ICommandProvider> _builtInProviders;
-    private readonly SettingsModel _settingsModel;
-    private readonly AliasService _aliasService;
-    private readonly HotkeyService _hotkeyService;
 
     private readonly List<CommandProviderWrapper> _builtInCommands = [];
     private readonly List<CommandProviderWrapper> _extensionCommandProviders = [];
@@ -40,24 +34,10 @@ public partial class TopLevelCommandService : ObservableObject,
 
     TaskScheduler IPageContext.Scheduler => _taskScheduler;
 
-    public TopLevelCommandService(
-        TaskScheduler taskScheduler,
-        AppExtensionHost commandPaletteHost,
-        IExtensionService extensionService,
-        IEnumerable<ICommandProvider> builtInProviders,
-        SettingsModel settingsModel,
-        AliasService aliasService,
-        HotkeyService hotkeyService,
-        ILogger logger)
+    public TopLevelCommandManager(IServiceProvider serviceProvider)
     {
-        this.logger = logger;
-        _commandPaletteHost = commandPaletteHost;
-        _extensionService = extensionService;
-        _builtInProviders = builtInProviders;
-        _settingsModel = settingsModel;
-        _aliasService = aliasService;
-        _hotkeyService = hotkeyService;
-        _taskScheduler = taskScheduler;
+        _serviceProvider = serviceProvider;
+        _taskScheduler = _serviceProvider.GetService<TaskScheduler>()!;
         WeakReferenceMessenger.Default.Register<ReloadCommandsMessage>(this);
         _reloadCommandsGate = new(ReloadAllCommandsAsyncCore);
     }
@@ -90,9 +70,10 @@ public partial class TopLevelCommandService : ObservableObject,
 
         // Load built-In commands first. These are all in-proc, and
         // owned by our ServiceProvider.
-        foreach (var provider in _builtInProviders)
+        var builtInCommands = _serviceProvider.GetServices<ICommandProvider>();
+        foreach (var provider in builtInCommands)
         {
-            CommandProviderWrapper wrapper = new(provider, _taskScheduler, logger, _aliasService, _hotkeyService);
+            CommandProviderWrapper wrapper = new(provider, _taskScheduler);
             lock (_commandProvidersLock)
             {
                 _builtInCommands.Add(wrapper);
@@ -110,7 +91,7 @@ public partial class TopLevelCommandService : ObservableObject,
 
         s.Stop();
 
-        Log_BuiltInsLoaded(s.ElapsedMilliseconds);
+        Logger.LogDebug($"Loading built-ins took {s.ElapsedMilliseconds}ms");
 
         return true;
     }
@@ -120,7 +101,7 @@ public partial class TopLevelCommandService : ObservableObject,
     {
         WeakReference<IPageContext> weakSelf = new(this);
 
-        await commandProvider.LoadTopLevelCommands(_settingsModel, weakSelf);
+        await commandProvider.LoadTopLevelCommands(_serviceProvider, weakSelf);
 
         var commands = await Task.Factory.StartNew(
             () =>
@@ -168,7 +149,7 @@ public partial class TopLevelCommandService : ObservableObject,
     private async Task UpdateCommandsForProvider(CommandProviderWrapper sender, IItemsChangedEventArgs args)
     {
         WeakReference<IPageContext> weakSelf = new(this);
-        await sender.LoadTopLevelCommands(_settingsModel, weakSelf);
+        await sender.LoadTopLevelCommands(_serviceProvider, weakSelf);
 
         List<TopLevelViewModel> newItems = [.. sender.TopLevelItems];
         foreach (var i in sender.FallbackItems)
@@ -235,7 +216,8 @@ public partial class TopLevelCommandService : ObservableObject,
     private async Task ReloadAllCommandsAsyncCore(CancellationToken cancellationToken)
     {
         IsLoading = true;
-        await _extensionService.SignalStopExtensionsAsync();
+        var extensionService = _serviceProvider.GetService<IExtensionService>()!;
+        await extensionService.SignalStopExtensionsAsync();
 
         lock (TopLevelCommands)
         {
@@ -256,10 +238,12 @@ public partial class TopLevelCommandService : ObservableObject,
     [RelayCommand]
     public async Task<bool> LoadExtensionsAsync()
     {
-        _extensionService.OnExtensionAdded -= ExtensionService_OnExtensionAdded;
-        _extensionService.OnExtensionRemoved -= ExtensionService_OnExtensionRemoved;
+        var extensionService = _serviceProvider.GetService<IExtensionService>()!;
 
-        var extensions = (await _extensionService.GetInstalledExtensionsAsync()).ToImmutableList();
+        extensionService.OnExtensionAdded -= ExtensionService_OnExtensionAdded;
+        extensionService.OnExtensionRemoved -= ExtensionService_OnExtensionRemoved;
+
+        var extensions = (await extensionService.GetInstalledExtensionsAsync()).ToImmutableList();
         lock (_commandProvidersLock)
         {
             _extensionCommandProviders.Clear();
@@ -270,8 +254,8 @@ public partial class TopLevelCommandService : ObservableObject,
             await StartExtensionsAndGetCommands(extensions);
         }
 
-        _extensionService.OnExtensionAdded += ExtensionService_OnExtensionAdded;
-        _extensionService.OnExtensionRemoved += ExtensionService_OnExtensionRemoved;
+        extensionService.OnExtensionAdded += ExtensionService_OnExtensionAdded;
+        extensionService.OnExtensionRemoved += ExtensionService_OnExtensionRemoved;
 
         IsLoading = false;
 
@@ -335,7 +319,7 @@ public partial class TopLevelCommandService : ObservableObject,
         try
         {
             await extension.StartExtensionAsync().WaitAsync(TimeSpan.FromSeconds(10));
-            return new CommandProviderWrapper(extension, _taskScheduler, logger, _aliasService, _hotkeyManager);
+            return new CommandProviderWrapper(extension, _taskScheduler);
         }
         catch (Exception ex)
         {
@@ -429,8 +413,8 @@ public partial class TopLevelCommandService : ObservableObject,
 
     void IPageContext.ShowException(Exception ex, string? extensionHint)
     {
-        var message = DiagnosticsHelper.BuildExceptionMessage(ex, extensionHint ?? "TopLevelCommandService");
-        _commandPaletteHost.Log(message);
+        var message = DiagnosticsHelper.BuildExceptionMessage(ex, extensionHint ?? "TopLevelCommandManager");
+        CommandPaletteHost.Instance.Log(message);
     }
 
     internal bool IsProviderActive(string id)
@@ -447,22 +431,4 @@ public partial class TopLevelCommandService : ObservableObject,
         _reloadCommandsGate.Dispose();
         GC.SuppressFinalize(this);
     }
-
-    [LoggerMessage(Level = LogLevel.Debug, Message = "Loading built-ins took {ElapsedMilliseconds}ms")]
-    partial void Log_BuiltInsLoaded(long elapsedMilliseconds);
-
-    [LoggerMessage(Level = LogLevel.Debug, Message = "Loading extensions took {ElapsedMilliseconds}ms")]
-    partial void Log_ExtensionsLoaded(long elapsedMilliseconds);
-
-    [LoggerMessage(Level = LogLevel.Error, Message = "Failed to load commands for extension {ExtensionName}")]
-    partial void Log_FailedToLoadCommandsForExtension(string? extensionName, Exception exception);
-
-    [LoggerMessage(Level = LogLevel.Warning, Message = "Loading commands for extension {ExtensionName} timed out")]
-    partial void Log_LoadingCommandsTimedOut(string? extensionName);
-
-    [LoggerMessage(Level = LogLevel.Error, Message = "Failed to start extension {ExtensionName}")]
-    partial void Log_FailedToStartExtension(string extensionName, Exception exception);
-
-    [LoggerMessage(Level = LogLevel.Debug, Message = "Starting extension {ExtensionName}")]
-    partial void Log_StartingExtension(string extensionName);
 }

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

@@ -9,10 +9,10 @@ using ManagedCommon;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.UI.ViewModels.Messages;
-using Microsoft.CmdPal.UI.ViewModels.Services;
 using Microsoft.CmdPal.UI.ViewModels.Settings;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.Extensions.DependencyInjection;
 using Windows.Foundation;
 using WyHash;
 
@@ -22,9 +22,8 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
 {
     private readonly SettingsModel _settings;
     private readonly ProviderSettings _providerSettings;
+    private readonly IServiceProvider _serviceProvider;
     private readonly CommandItemViewModel _commandItemViewModel;
-    private readonly HotkeyService _hotkeyService;
-    private readonly AliasService _aliasService;
 
     private readonly string _commandProviderId;
 
@@ -100,7 +99,7 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
         get => _hotkey;
         set
         {
-            _hotkeyService.UpdateHotkey(Id, value);
+            _serviceProvider.GetService<HotkeyManager>()!.UpdateHotkey(Id, value);
             UpdateHotkey();
             UpdateTags();
             Save();
@@ -177,16 +176,14 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
         CommandPaletteHost extensionHost,
         string commandProviderId,
         SettingsModel settings,
-        HotkeyService hotkeyService,
-        AliasService aliasService,
-        ProviderSettings providerSettings)
+        ProviderSettings providerSettings,
+        IServiceProvider serviceProvider)
     {
+        _serviceProvider = serviceProvider;
         _settings = settings;
-        _aliasService = aliasService;
         _providerSettings = providerSettings;
         _commandProviderId = commandProviderId;
         _commandItemViewModel = item;
-        _hotkeyService = hotkeyService;
 
         IsFallback = isFallback;
         ExtensionHost = extensionHost;
@@ -226,7 +223,7 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
             {
                 GenerateId();
 
-                FetchAliasFromAliasService();
+                FetchAliasFromAliasManager();
                 UpdateHotkey();
                 UpdateTags();
                 UpdateInitialIcon();
@@ -271,15 +268,16 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
                 ? null
                 : new CommandAlias(Alias.Alias, Alias.CommandId, Alias.IsDirect);
 
-        _aliasService.UpdateAlias(Id, commandAlias);
+        _serviceProvider.GetService<AliasManager>()!.UpdateAlias(Id, commandAlias);
         UpdateTags();
     }
 
-    private void FetchAliasFromAliasService()
+    private void FetchAliasFromAliasManager()
     {
-        if (_aliasService is not null)
+        var am = _serviceProvider.GetService<AliasManager>();
+        if (am is not null)
         {
-            var commandAlias = _aliasService.AliasFromId(Id);
+            var commandAlias = am.AliasFromId(Id);
             if (commandAlias is not null)
             {
                 // Decouple from the alias manager alias object

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

@@ -2,52 +2,21 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Windows.Graphics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace Microsoft.CmdPal.UI.ViewModels;
 
 public sealed class WindowPosition
 {
-    /// <summary>
-    /// Gets or sets left position in device pixels.
-    /// </summary>
     public int X { get; set; }
 
-    /// <summary>
-    /// Gets or sets top position in device pixels.
-    /// </summary>
     public int Y { get; set; }
 
-    /// <summary>
-    /// Gets or sets width in device pixels.
-    /// </summary>
     public int Width { get; set; }
 
-    /// <summary>
-    /// Gets or sets height in device pixels.
-    /// </summary>
     public int Height { get; set; }
-
-    /// <summary>
-    /// Gets or sets width of the screen in device pixels where the window is located.
-    /// </summary>
-    public int ScreenWidth { get; set; }
-
-    /// <summary>
-    /// Gets or sets height of the screen in device pixels where the window is located.
-    /// </summary>
-    public int ScreenHeight { get; set; }
-
-    /// <summary>
-    /// Gets or sets DPI (dots per inch) of the display where the window is located.
-    /// </summary>
-    public int Dpi { get; set; }
-
-    /// <summary>
-    /// Converts the window position properties to a <see cref="RectInt32"/> structure representing the physical window rectangle.
-    /// </summary>
-    public RectInt32 ToPhysicalWindowRectangle()
-    {
-        return new RectInt32(X, Y, Width, Height);
-    }
 }

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

@@ -2,6 +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.
 
+using ManagedCommon;
+using Microsoft.CmdPal.Core.Common;
 using Microsoft.CmdPal.Core.Common.Helpers;
 using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Core.ViewModels;
@@ -11,7 +13,6 @@ using Microsoft.CmdPal.Ext.Calc;
 using Microsoft.CmdPal.Ext.ClipboardHistory;
 using Microsoft.CmdPal.Ext.Indexer;
 using Microsoft.CmdPal.Ext.Registry;
-using Microsoft.CmdPal.Ext.RemoteDesktop;
 using Microsoft.CmdPal.Ext.Shell;
 using Microsoft.CmdPal.Ext.System;
 using Microsoft.CmdPal.Ext.TimeDate;
@@ -22,13 +23,11 @@ using Microsoft.CmdPal.Ext.WindowsTerminal;
 using Microsoft.CmdPal.Ext.WindowWalker;
 using Microsoft.CmdPal.Ext.WinGet;
 using Microsoft.CmdPal.UI.Helpers;
-using Microsoft.CmdPal.UI.Services;
 using Microsoft.CmdPal.UI.ViewModels;
 using Microsoft.CmdPal.UI.ViewModels.BuiltinCommands;
 using Microsoft.CmdPal.UI.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI.Xaml;
 
@@ -41,8 +40,7 @@ namespace Microsoft.CmdPal.UI;
 /// </summary>
 public partial class App : Application
 {
-    private readonly GlobalErrorHandler _globalErrorHandler;
-    private readonly ILogger _logger;
+    private readonly GlobalErrorHandler _globalErrorHandler = new();
 
     /// <summary>
     /// Gets the current <see cref="App"/> instance in use.
@@ -63,11 +61,8 @@ public partial class App : Application
     /// Initializes the singleton application object.  This is the first line of authored code
     /// executed, and as such is the logical equivalent of main() or WinMain().
     /// </summary>
-    public App(ILogger logger)
+    public App()
     {
-        _logger = logger;
-        _globalErrorHandler = new(logger);
-
 #if !CMDPAL_DISABLE_GLOBAL_ERROR_HANDLER
         _globalErrorHandler.Register(this);
 #endif
@@ -86,6 +81,11 @@ public partial class App : Application
                 AppWindow?.Close();
                 Environment.Exit(0);
             });
+
+        // Connect the PT logging to the core project's logging.
+        // This way, log statements from the core project will be captured by the PT logs
+        var logWrapper = new LogWrapper();
+        CoreLogger.InitializeLogger(logWrapper);
     }
 
     /// <summary>
@@ -103,21 +103,14 @@ public partial class App : Application
     /// <summary>
     /// Configures the services for the application
     /// </summary>
-    private ServiceProvider ConfigureServices()
+    private static ServiceProvider ConfigureServices()
     {
         // TODO: It's in the Labs feed, but we can use Sergio's AOT-friendly source generator for this: https://github.com/CommunityToolkit/Labs-Windows/discussions/463
         ServiceCollection services = new();
 
         // Root services
-        services.AddSingleton<ILogger>(_logger);
         services.AddSingleton(TaskScheduler.FromCurrentSynchronizationContext());
 
-        // Load settings and state
-        var sm = SettingsModel.LoadSettings();
-        services.AddSingleton(sm);
-        var state = AppStateModel.LoadState();
-        services.AddSingleton(state);
-
         // Built-in Commands. Order matters - this is the order they'll be presented by default.
         var allApps = new AllAppsCommandProvider();
         var files = new IndexerCommandsProvider();
@@ -147,7 +140,8 @@ public partial class App : Application
         }
         catch (Exception ex)
         {
-            Log_FailureToLoadWinget(ex);
+            Logger.LogError("Couldn't load winget");
+            Logger.LogError(ex.ToString());
         }
 
         services.AddSingleton<ICommandProvider, WindowsTerminalCommandsProvider>();
@@ -157,18 +151,21 @@ public partial class App : Application
         services.AddSingleton<ICommandProvider, BuiltInsCommandProvider>();
         services.AddSingleton<ICommandProvider, TimeDateCommandsProvider>();
         services.AddSingleton<ICommandProvider, SystemCommandExtensionProvider>();
-        services.AddSingleton<ICommandProvider, RemoteDesktopCommandProvider>();
 
         // Models
-        services.AddSingleton<TopLevelCommandService>();
-        services.AddSingleton<AliasService>();
-        services.AddSingleton<HotkeyService>();
+        services.AddSingleton<TopLevelCommandManager>();
+        services.AddSingleton<AliasManager>();
+        services.AddSingleton<HotkeyManager>();
+        var sm = SettingsModel.LoadSettings();
+        services.AddSingleton(sm);
+        var state = AppStateModel.LoadState();
+        services.AddSingleton(state);
         services.AddSingleton<IExtensionService, ExtensionService>();
         services.AddSingleton<TrayIconService>();
         services.AddSingleton<IRunHistoryService, RunHistoryService>();
 
         services.AddSingleton<IRootPageService, PowerToysRootPageService>();
-        services.AddSingleton<AppExtensionHost, CommandPaletteHost>();
+        services.AddSingleton<IAppHostService, PowerToysAppHostService>();
         services.AddSingleton<ITelemetryService, TelemetryForwarder>();
 
         // ViewModels
@@ -177,7 +174,4 @@ public partial class App : Application
 
         return services.BuildServiceProvider();
     }
-
-    [LoggerMessage(Level = LogLevel.Error, Message = "Couldn't load winget")]
-    partial void Log_FailureToLoadWinget(Exception ex);
 }

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

@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<UserControl
-    x:Class="Microsoft.CmdPal.UI.Controls.DevRibbon"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
-    xmlns:converters="using:CommunityToolkit.WinUI.Converters"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:viewModels="using:Microsoft.CmdPal.UI.ViewModels"
-    mc:Ignorable="d">
-
-    <UserControl.Resources>
-        <DataTemplate x:Key="LogEntryTemplate" x:DataType="viewModels:LogEntryViewModel">
-            <controls:SettingsExpander Description="{x:Bind Description}" Header="{x:Bind Header}">
-                <controls:SettingsExpander.HeaderIcon>
-                    <FontIcon Glyph="{x:Bind SeverityGlyph}" />
-                </controls:SettingsExpander.HeaderIcon>
-                <controls:SettingsExpander.Items>
-                    <controls:SettingsCard HorizontalContentAlignment="Stretch" ContentAlignment="Vertical">
-                        <ScrollViewer
-                            MaxWidth="1160"
-                            HorizontalScrollMode="Auto"
-                            VerticalScrollMode="Auto">
-                            <TextBlock
-                                FontFamily="Consolas"
-                                FontSize="11"
-                                Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
-                                IsTextSelectionEnabled="True"
-                                Text="{x:Bind Details}"
-                                TextWrapping="NoWrap" />
-                        </ScrollViewer>
-                    </controls:SettingsCard>
-                </controls:SettingsExpander.Items>
-            </controls:SettingsExpander>
-        </DataTemplate>
-
-        <converters:BoolToVisibilityConverter
-            x:Key="InvertedBoolToVisibilityConverter"
-            FalseValue="Visible"
-            TrueValue="Collapsed" />
-
-    </UserControl.Resources>
-
-    <Grid>
-        <Border
-            x:Name="RootBorder"
-            Height="26"
-            HorizontalAlignment="Right"
-            VerticalAlignment="Top"
-            Background="{ThemeResource SettingsCardBackground}"
-            BorderBrush="{ThemeResource SurfaceStrokeColorFlyoutBrush}"
-            BorderThickness="1,0,1,1"
-            CornerRadius="0,0,8,8"
-            Opacity="0.3">
-            <Button
-                Padding="0"
-                CornerRadius="0,0,8,8"
-                FontSize="11"
-                PointerEntered="DevRibbonButton_PointerEntered"
-                PointerExited="DevRibbonButton_PointerExited">
-                <StackPanel Orientation="Horizontal">
-                    <StackPanel
-                        Padding="8,4"
-                        VerticalAlignment="Center"
-                        Background="DarkOrange"
-                        Orientation="Horizontal"
-                        Visibility="{x:Bind VisibleIfGreaterThanZero(ViewModel.WarningCount), Mode=OneWay}">
-                        <FontIcon
-                            Margin="0,0,8,0"
-                            VerticalAlignment="Center"
-                            FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                            FontSize="12"
-                            Glyph="&#xE7BA;" />
-                        <TextBlock VerticalAlignment="Center">
-                            <Run Text="{x:Bind ViewModel.WarningCount, Mode=OneWay}" />
-                        </TextBlock>
-                    </StackPanel>
-                    <StackPanel
-                        Padding="8,4"
-                        VerticalAlignment="Center"
-                        Background="Maroon"
-                        Orientation="Horizontal"
-                        Visibility="{x:Bind VisibleIfGreaterThanZero(ViewModel.ErrorCount), Mode=OneWay}">
-                        <FontIcon
-                            Margin="0,0,8,0"
-                            VerticalAlignment="Center"
-                            FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                            FontSize="12"
-                            Glyph="&#xEA39;" />
-                        <TextBlock VerticalAlignment="Center">
-                            <Run Text="{x:Bind ViewModel.ErrorCount, Mode=OneWay}" />
-                        </TextBlock>
-                    </StackPanel>
-                    <Border Padding="8,4">
-                        <Border.Background>
-                            <SolidColorBrush Color="{x:Bind ViewModel.TagColor}" />
-                        </Border.Background>
-                        <TextBlock Padding="4" VerticalAlignment="Center">
-                            <Run Text="{x:Bind ViewModel.Tag}" />
-                        </TextBlock>
-                    </Border>
-                </StackPanel>
-
-                <Button.Flyout>
-                    <Flyout
-                        Placement="Bottom"
-                        ShouldConstrainToRootBounds="False"
-                        SystemBackdrop="{ThemeResource AcrylicBackgroundFillColorDefaultBackdrop}">
-                        <Flyout.FlyoutPresenterStyle>
-                            <Style BasedOn="{StaticResource DefaultFlyoutPresenterStyle}" TargetType="FlyoutPresenter">
-                                <Setter Property="MinWidth" Value="600" />
-                                <Setter Property="MaxWidth" Value="1200" />
-                                <Setter Property="Padding" Value="0" />
-                            </Style>
-                        </Flyout.FlyoutPresenterStyle>
-
-                        <Grid x:Name="FlyoutContent">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-
-                            <StackPanel Padding="16" Spacing="8">
-
-                                <!--  Logs section  -->
-                                <TextBlock
-                                    Margin="1,0,0,6"
-                                    Style="{ThemeResource SettingsSectionHeaderTextBlockStyle}"
-                                    Text="Logs" />
-                                <ItemsControl ItemTemplate="{StaticResource LogEntryTemplate}" ItemsSource="{x:Bind ViewModel.LatestLogs, Mode=OneWay}" />
-                                <StackPanel Orientation="Horizontal" Spacing="8">
-                                    <Button Command="{x:Bind ViewModel.OpenLogFileCommand}" Content="Open Log File" />
-                                    <Button Command="{x:Bind ViewModel.OpenLogFolderCommand}" Content="Open Log Folder" />
-                                    <Button Command="{x:Bind ViewModel.ResetErrorCountersCommand}" Content="Clear Counters" />
-                                </StackPanel>
-
-                                <!--  Build info section  -->
-                                <TextBlock Style="{ThemeResource SettingsSectionHeaderTextBlockStyle}" Text="Build Info" />
-                                <Border
-                                    Padding="16"
-                                    Background="{ThemeResource SettingsCardBackground}"
-                                    BorderBrush="{ThemeResource SettingsCardBorderBrush}"
-                                    BorderThickness="1">
-                                    <Grid ColumnSpacing="8">
-                                        <Grid.Resources>
-                                            <Style
-                                                x:Key="KeyTextBlockStyle"
-                                                BasedOn="{StaticResource CaptionTextBlockStyle}"
-                                                TargetType="TextBlock">
-                                                <Setter Property="IsTextSelectionEnabled" Value="True" />
-                                                <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
-                                            </Style>
-                                            <Style
-                                                x:Key="ValueTextBlockStyle"
-                                                BasedOn="{StaticResource CaptionTextBlockStyle}"
-                                                TargetType="TextBlock">
-                                                <Setter Property="IsTextSelectionEnabled" Value="True" />
-                                                <Setter Property="TextAlignment" Value="Right" />
-                                            </Style>
-                                        </Grid.Resources>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*" />
-                                            <ColumnDefinition Width="Auto" />
-                                        </Grid.ColumnDefinitions>
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition />
-                                            <RowDefinition />
-                                            <RowDefinition />
-                                        </Grid.RowDefinitions>
-                                        <TextBlock
-                                            Grid.Row="0"
-                                            Grid.Column="0"
-                                            Style="{StaticResource KeyTextBlockStyle}"
-                                            Text="Configuration:" />
-                                        <TextBlock
-                                            Grid.Row="0"
-                                            Grid.Column="1"
-                                            Style="{StaticResource ValueTextBlockStyle}"
-                                            Text="{x:Bind ViewModel.BuildConfiguration, Mode=OneWay}" />
-
-                                        <TextBlock
-                                            Grid.Row="1"
-                                            Grid.Column="0"
-                                            Style="{StaticResource KeyTextBlockStyle}"
-                                            Text="AOT:" />
-                                        <TextBlock
-                                            Grid.Row="1"
-                                            Grid.Column="1"
-                                            Style="{StaticResource ValueTextBlockStyle}"
-                                            Text="{x:Bind ViewModel.IsAot, Mode=OneWay}" />
-
-                                        <TextBlock
-                                            Grid.Row="2"
-                                            Grid.Column="0"
-                                            Style="{StaticResource KeyTextBlockStyle}"
-                                            Text="Trimmed:" />
-                                        <TextBlock
-                                            Grid.Row="2"
-                                            Grid.Column="1"
-                                            Style="{StaticResource ValueTextBlockStyle}"
-                                            Text="{x:Bind ViewModel.IsPublishTrimmed, Mode=OneWay}" />
-
-                                    </Grid>
-                                </Border>
-                            </StackPanel>
-
-                            <!--  Footer  -->
-                            <Border
-                                Grid.Row="1"
-                                Padding="16"
-                                Background="{ThemeResource SettingsCardBackground}"
-                                BorderBrush="{ThemeResource SettingsCardBorderBrush}"
-                                BorderThickness="1"
-                                CornerRadius="{ThemeResource ControlCornerRadius}"
-                                Visibility="{x:Bind ViewModel.IsAotReleaseConfiguration, Mode=OneWay, Converter={StaticResource InvertedBoolToVisibilityConverter}}">
-                                <TextBlock Text="Warning: Test in Release/AOT configuration to verify everything works." TextWrapping="Wrap" />
-                            </Border>
-
-                        </Grid>
-                    </Flyout>
-                </Button.Flyout>
-            </Button>
-        </Border>
-        <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="PointerOver">
-                    <Storyboard>
-                        <DoubleAnimation
-                            Storyboard.TargetName="RootBorder"
-                            Storyboard.TargetProperty="Opacity"
-                            To="1.0"
-                            Duration="0:0:0.1" />
-                    </Storyboard>
-                </VisualState>
-            </VisualStateGroup>
-            <VisualStateGroup x:Name="SeverityStates">
-                <VisualState x:Name="NoLog" />
-                <VisualState x:Name="WarningLog">
-                    <Storyboard>
-                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SeverityIcon" Storyboard.TargetProperty="Glyph">
-                            <DiscreteObjectKeyFrame KeyTime="0" Value="&#xE7BA;" />
-                        </ObjectAnimationUsingKeyFrames>
-                    </Storyboard>
-                </VisualState>
-                <VisualState x:Name="ErrorLog">
-                    <Storyboard>
-                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SeverityIcon" Storyboard.TargetProperty="Glyph">
-                            <DiscreteObjectKeyFrame KeyTime="0" Value="&#xEA39;" />
-                        </ObjectAnimationUsingKeyFrames>
-                    </Storyboard>
-                </VisualState>
-            </VisualStateGroup>
-        </VisualStateManager.VisualStateGroups>
-    </Grid>
-</UserControl>

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/DevRibbon.xaml.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 Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Input;
-
-namespace Microsoft.CmdPal.UI.Controls;
-
-internal sealed partial class DevRibbon : UserControl
-{
-    public ViewModels.DevRibbonViewModel ViewModel { get; }
-
-    public DevRibbon()
-    {
-        InitializeComponent();
-        ViewModel = new ViewModels.DevRibbonViewModel();
-
-        if (FlyoutContent != null)
-        {
-            FlyoutContent.DataContext = ViewModel;
-        }
-    }
-
-    private void DevRibbonButton_PointerEntered(object sender, PointerRoutedEventArgs e)
-    {
-        VisualStateManager.GoToState(this, "PointerOver", true);
-    }
-
-    private void DevRibbonButton_PointerExited(object sender, PointerRoutedEventArgs e)
-    {
-        VisualStateManager.GoToState(this, "Normal", true);
-    }
-
-    private Visibility VisibleIfGreaterThanZero(int value)
-    {
-        return value > 0 ? Visibility.Visible : Visibility.Collapsed;
-    }
-}

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/IconBox.cs

@@ -2,10 +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 ManagedCommon;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.UI.Deferred;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
+using Microsoft.Terminal.UI;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -21,7 +21,6 @@ namespace Microsoft.CmdPal.UI.Controls;
 public partial class IconBox : ContentControl
 {
     private readonly DispatcherQueue _queue = DispatcherQueue.GetForCurrentThread();
-    private readonly ILogger logger;
 
     /// <summary>
     /// Gets or sets the <see cref="IconSource"/> to display within the <see cref="IconBox"/>. Overwritten, if <see cref="SourceKey"/> is used instead.
@@ -60,8 +59,6 @@ public partial class IconBox : ContentControl
         IsTabStop = false;
         HorizontalContentAlignment = HorizontalAlignment.Center;
         VerticalContentAlignment = VerticalAlignment.Center;
-
-        logger = App.Current.Services.GetService<ILogger>()!;
     }
 
     private static void OnSourcePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -171,13 +168,10 @@ public partial class IconBox : ContentControl
                     {
                         // Exception from TryEnqueue bypasses the global error handler,
                         // and crashes the app.
-                        Log_FailedToSetIcon(@this.logger, ex);
+                        Logger.LogError("Failed to set icon", ex);
                     }
                 });
             }
         }
     }
-
-    [LoggerMessage(Level = LogLevel.Error, Message = "Failed to set icon")]
-    static partial void Log_FailedToSetIcon(ILogger logger, Exception ex);
 }

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

@@ -7,6 +7,7 @@ using CommunityToolkit.WinUI;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Commands;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
+using Microsoft.CmdPal.UI.Messages;
 using Microsoft.CmdPal.UI.Views;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Input;
@@ -238,6 +239,7 @@ public sealed partial class SearchBar : UserControl,
                 FilterBox.Text = _lastText ?? string.Empty;
                 FilterBox.Select(FilterBox.Text.Length, 0);
 
+                // Logger.LogInfo("deleting suggestion");
                 _inSuggestion = false;
                 _lastText = null;
 
@@ -264,6 +266,7 @@ public sealed partial class SearchBar : UserControl,
                 return;
             }
 
+            // Logger.LogInfo("leaving suggestion");
             _inSuggestion = false;
             _lastText = null;
         }
@@ -280,6 +283,8 @@ public sealed partial class SearchBar : UserControl,
 
     private void FilterBox_TextChanged(object sender, TextChangedEventArgs e)
     {
+        // Logger.LogInfo($"FilterBox_TextChanged: {FilterBox.Text}");
+
         // TERRIBLE HACK TODO GH #245
         // There's weird wacky bugs with debounce currently. We're trying
         // to get them ingested, but while we wait for the toolkit feeds to
@@ -294,6 +299,7 @@ public sealed partial class SearchBar : UserControl,
 
         if (InSuggestion)
         {
+            // Logger.LogInfo($"-- skipping, in suggestion --");
             return;
         }
 
@@ -315,6 +321,7 @@ public sealed partial class SearchBar : UserControl,
     {
         if (InSuggestion)
         {
+            // Logger.LogInfo($"--- skipping ---");
             return;
         }
 
@@ -378,6 +385,7 @@ public sealed partial class SearchBar : UserControl,
 
             if (clearSuggestion && _inSuggestion)
             {
+                // Logger.LogInfo($"Cleared suggestion \"{_lastText}\" to {suggestion}");
                 _inSuggestion = false;
                 FilterBox.Text = _lastText ?? string.Empty;
                 _lastText = null;
@@ -403,6 +411,14 @@ public sealed partial class SearchBar : UserControl,
 
             _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;

src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/GridItemContainerStyleSelector.cs

@@ -1,31 +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 Microsoft.CmdPal.Core.ViewModels;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-
-namespace Microsoft.CmdPal.UI;
-
-internal sealed partial class GridItemContainerStyleSelector : StyleSelector
-{
-    public IGridPropertiesViewModel? GridProperties { get; set; }
-
-    public Style? Small { get; set; }
-
-    public Style? Medium { get; set; }
-
-    public Style? Gallery { get; set; }
-
-    protected override Style? SelectStyleCore(object item, DependencyObject container)
-    {
-        return GridProperties switch
-        {
-            SmallGridPropertiesViewModel => Small,
-            MediumGridPropertiesViewModel => Medium,
-            GalleryGridPropertiesViewModel => Gallery,
-            _ => Medium,
-        };
-    }
-}

src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/GridItemTemplateSelector.cs

@@ -20,12 +20,21 @@ internal sealed partial class GridItemTemplateSelector : DataTemplateSelector
 
     protected override DataTemplate? SelectTemplateCore(object item, DependencyObject dependencyObject)
     {
-        return GridProperties switch
+        DataTemplate? dataTemplate = Medium;
+
+        if (GridProperties is SmallGridPropertiesViewModel)
         {
-            SmallGridPropertiesViewModel => Small,
-            MediumGridPropertiesViewModel => Medium,
-            GalleryGridPropertiesViewModel => Gallery,
-            _ => Medium,
-        };
+            dataTemplate = Small;
+        }
+        else if (GridProperties is MediumGridPropertiesViewModel)
+        {
+            dataTemplate = Medium;
+        }
+        else if (GridProperties is GalleryGridPropertiesViewModel)
+        {
+            dataTemplate = Gallery;
+        }
+
+        return dataTemplate;
     }
 }

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

@@ -5,151 +5,33 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:cmdpalUI="using:Microsoft.CmdPal.UI"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:converters="using:CommunityToolkit.WinUI.Converters"
     xmlns:coreViewModels="using:Microsoft.CmdPal.Core.ViewModels"
     xmlns:cpcontrols="using:Microsoft.CmdPal.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:help="using:Microsoft.CmdPal.UI.Helpers"
+    xmlns:local="using:Microsoft.CmdPal.UI"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI"
+    xmlns:viewModels="using:Microsoft.CmdPal.UI.ViewModels"
     x:Name="PageRoot"
     Background="Transparent"
     DataContext="{x:Bind ViewModel, Mode=OneWay}"
     mc:Ignorable="d">
 
     <Page.Resources>
+        <!--  TODO: Figure out what we want to do here for filtering/grouping and where  -->
+        <!--  https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.data.collectionviewsource  -->
+        <!--<CollectionViewSource
+            x:Name="ItemsCVS"
+            IsSourceGrouped="True"
+            Source="{x:Bind ViewModel.Items, Mode=OneWay}" />-->
 
-        <!--
-            GridViewItemCornerRadius is the corner radius defined in GridView template; make
-            it bigger to match the radii of the gallery
-        -->
-        <CornerRadius x:Key="GalleryGridViewItemContainerCornerRadius">6</CornerRadius>
-        <CornerRadius x:Key="IconGridViewItemContainerCornerRadius">4</CornerRadius>
-        <CornerRadius x:Key="GalleryGridViewItemRadius">4</CornerRadius>
-        <CornerRadius x:Key="SmallGridViewItemCornerRadius">8</CornerRadius>
-        <CornerRadius x:Key="MediumGridViewItemCornerRadius">8</CornerRadius>
-
-        <Style x:Key="IconGridViewItemStyle" TargetType="GridViewItem">
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="GridViewItem">
-                        <ListViewItemPresenter
-                            x:Name="Root"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            CheckBoxBorderBrush="{ThemeResource GridViewItemCheckBoxBorderBrush}"
-                            CheckBoxBrush="{ThemeResource GridViewItemCheckBoxBrush}"
-                            CheckBoxCornerRadius="{ThemeResource GridViewItemCheckBoxCornerRadius}"
-                            CheckBoxDisabledBorderBrush="{ThemeResource GridViewItemCheckBoxDisabledBorderBrush}"
-                            CheckBoxDisabledBrush="{ThemeResource GridViewItemCheckBoxDisabledBrush}"
-                            CheckBoxPointerOverBorderBrush="{ThemeResource GridViewItemCheckBoxPointerOverBorderBrush}"
-                            CheckBoxPointerOverBrush="{ThemeResource GridViewItemCheckBoxPointerOverBrush}"
-                            CheckBoxPressedBorderBrush="{ThemeResource GridViewItemCheckBoxPressedBorderBrush}"
-                            CheckBoxPressedBrush="{ThemeResource GridViewItemCheckBoxPressedBrush}"
-                            CheckBoxSelectedBrush="{ThemeResource GridViewItemCheckBoxSelectedBrush}"
-                            CheckBoxSelectedDisabledBrush="{ThemeResource GridViewItemCheckBoxSelectedDisabledBrush}"
-                            CheckBoxSelectedPointerOverBrush="{ThemeResource GridViewItemCheckBoxSelectedPointerOverBrush}"
-                            CheckBoxSelectedPressedBrush="{ThemeResource GridViewItemCheckBoxSelectedPressedBrush}"
-                            CheckBrush="{ThemeResource GridViewItemCheckBrush}"
-                            CheckDisabledBrush="{ThemeResource GridViewItemCheckDisabledBrush}"
-                            CheckMode="{ThemeResource GridViewItemCheckMode}"
-                            CheckPressedBrush="{ThemeResource GridViewItemCheckPressedBrush}"
-                            ContentMargin="{TemplateBinding Padding}"
-                            ContentTransitions="{TemplateBinding ContentTransitions}"
-                            Control.IsTemplateFocusTarget="True"
-                            CornerRadius="{StaticResource IconGridViewItemContainerCornerRadius}"
-                            DisabledOpacity="{ThemeResource ListViewItemDisabledThemeOpacity}"
-                            DragBackground="{ThemeResource GridViewItemDragBackground}"
-                            DragForeground="{ThemeResource GridViewItemDragForeground}"
-                            DragOpacity="{ThemeResource ListViewItemDragThemeOpacity}"
-                            FocusBorderBrush="{ThemeResource GridViewItemFocusBorderBrush}"
-                            FocusVisualMargin="{TemplateBinding FocusVisualMargin}"
-                            FocusVisualPrimaryBrush="{TemplateBinding FocusVisualPrimaryBrush}"
-                            FocusVisualPrimaryThickness="{TemplateBinding FocusVisualPrimaryThickness}"
-                            FocusVisualSecondaryBrush="{TemplateBinding FocusVisualSecondaryBrush}"
-                            FocusVisualSecondaryThickness="{TemplateBinding FocusVisualSecondaryThickness}"
-                            PlaceholderBackground="{ThemeResource GridViewItemPlaceholderBackground}"
-                            PointerOverBackground="{ThemeResource GridViewItemBackgroundPointerOver}"
-                            PointerOverBorderBrush="{ThemeResource GridViewItemPointerOverBorderBrush}"
-                            PointerOverForeground="{ThemeResource GridViewItemForegroundPointerOver}"
-                            PressedBackground="{ThemeResource GridViewItemBackgroundPressed}"
-                            ReorderHintOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
-                            SelectedBackground="{ThemeResource GridViewItemBackgroundSelected}"
-                            SelectedBorderBrush="{ThemeResource GridViewItemSelectedBorderBrush}"
-                            SelectedBorderThickness="{ThemeResource GridViewItemSelectedBorderThickness}"
-                            SelectedDisabledBackground="{ThemeResource GridViewItemBackgroundSelectedDisabled}"
-                            SelectedDisabledBorderBrush="{ThemeResource GridViewItemSelectedDisabledBorderBrush}"
-                            SelectedForeground="{ThemeResource GridViewItemForegroundSelected}"
-                            SelectedInnerBorderBrush="{ThemeResource GridViewItemSelectedInnerBorderBrush}"
-                            SelectedPointerOverBackground="{ThemeResource GridViewItemBackgroundSelectedPointerOver}"
-                            SelectedPointerOverBorderBrush="{ThemeResource GridViewItemSelectedPointerOverBorderBrush}"
-                            SelectedPressedBackground="{ThemeResource GridViewItemBackgroundSelectedPressed}"
-                            SelectedPressedBorderBrush="{ThemeResource GridViewItemSelectedPressedBorderBrush}"
-                            SelectionCheckMarkVisualEnabled="{ThemeResource GridViewItemSelectionCheckMarkVisualEnabled}" />
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <Style x:Key="GalleryGridViewItemStyle" TargetType="GridViewItem">
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="GridViewItem">
-                        <ListViewItemPresenter
-                            x:Name="Root"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            CheckBoxBorderBrush="{ThemeResource GridViewItemCheckBoxBorderBrush}"
-                            CheckBoxBrush="{ThemeResource GridViewItemCheckBoxBrush}"
-                            CheckBoxCornerRadius="{ThemeResource GridViewItemCheckBoxCornerRadius}"
-                            CheckBoxDisabledBorderBrush="{ThemeResource GridViewItemCheckBoxDisabledBorderBrush}"
-                            CheckBoxDisabledBrush="{ThemeResource GridViewItemCheckBoxDisabledBrush}"
-                            CheckBoxPointerOverBorderBrush="{ThemeResource GridViewItemCheckBoxPointerOverBorderBrush}"
-                            CheckBoxPointerOverBrush="{ThemeResource GridViewItemCheckBoxPointerOverBrush}"
-                            CheckBoxPressedBorderBrush="{ThemeResource GridViewItemCheckBoxPressedBorderBrush}"
-                            CheckBoxPressedBrush="{ThemeResource GridViewItemCheckBoxPressedBrush}"
-                            CheckBoxSelectedBrush="{ThemeResource GridViewItemCheckBoxSelectedBrush}"
-                            CheckBoxSelectedDisabledBrush="{ThemeResource GridViewItemCheckBoxSelectedDisabledBrush}"
-                            CheckBoxSelectedPointerOverBrush="{ThemeResource GridViewItemCheckBoxSelectedPointerOverBrush}"
-                            CheckBoxSelectedPressedBrush="{ThemeResource GridViewItemCheckBoxSelectedPressedBrush}"
-                            CheckBrush="{ThemeResource GridViewItemCheckBrush}"
-                            CheckDisabledBrush="{ThemeResource GridViewItemCheckDisabledBrush}"
-                            CheckMode="{ThemeResource GridViewItemCheckMode}"
-                            CheckPressedBrush="{ThemeResource GridViewItemCheckPressedBrush}"
-                            ContentMargin="{TemplateBinding Padding}"
-                            ContentTransitions="{TemplateBinding ContentTransitions}"
-                            Control.IsTemplateFocusTarget="True"
-                            CornerRadius="{StaticResource GalleryGridViewItemContainerCornerRadius}"
-                            DisabledOpacity="{ThemeResource ListViewItemDisabledThemeOpacity}"
-                            DragBackground="{ThemeResource GridViewItemDragBackground}"
-                            DragForeground="{ThemeResource GridViewItemDragForeground}"
-                            DragOpacity="{ThemeResource ListViewItemDragThemeOpacity}"
-                            FocusBorderBrush="{ThemeResource GridViewItemFocusBorderBrush}"
-                            FocusVisualMargin="{TemplateBinding FocusVisualMargin}"
-                            FocusVisualPrimaryBrush="{TemplateBinding FocusVisualPrimaryBrush}"
-                            FocusVisualPrimaryThickness="{TemplateBinding FocusVisualPrimaryThickness}"
-                            FocusVisualSecondaryBrush="{TemplateBinding FocusVisualSecondaryBrush}"
-                            FocusVisualSecondaryThickness="{TemplateBinding FocusVisualSecondaryThickness}"
-                            PlaceholderBackground="{ThemeResource GridViewItemPlaceholderBackground}"
-                            PointerOverBackground="{ThemeResource GridViewItemBackgroundPointerOver}"
-                            PointerOverBorderBrush="{ThemeResource GridViewItemPointerOverBorderBrush}"
-                            PointerOverForeground="{ThemeResource GridViewItemForegroundPointerOver}"
-                            PressedBackground="{ThemeResource GridViewItemBackgroundPressed}"
-                            ReorderHintOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
-                            SelectedBackground="{ThemeResource GridViewItemBackgroundSelected}"
-                            SelectedBorderBrush="{ThemeResource GridViewItemSelectedBorderBrush}"
-                            SelectedBorderThickness="{ThemeResource GridViewItemSelectedBorderThickness}"
-                            SelectedDisabledBackground="{ThemeResource GridViewItemBackgroundSelectedDisabled}"
-                            SelectedDisabledBorderBrush="{ThemeResource GridViewItemSelectedDisabledBorderBrush}"
-                            SelectedForeground="{ThemeResource GridViewItemForegroundSelected}"
-                            SelectedInnerBorderBrush="{ThemeResource GridViewItemSelectedInnerBorderBrush}"
-                            SelectedPointerOverBackground="{ThemeResource GridViewItemBackgroundSelectedPointerOver}"
-                            SelectedPointerOverBorderBrush="{ThemeResource GridViewItemSelectedPointerOverBorderBrush}"
-                            SelectedPressedBackground="{ThemeResource GridViewItemBackgroundSelectedPressed}"
-                            SelectedPressedBorderBrush="{ThemeResource GridViewItemSelectedPressedBorderBrush}"
-                            SelectionCheckMarkVisualEnabled="{ThemeResource GridViewItemSelectionCheckMarkVisualEnabled}" />
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
+        <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+        <converters:StringVisibilityConverter
+            x:Key="StringVisibilityConverter"
+            EmptyValue="Collapsed"
+            NotEmptyValue="Visible" />
 
         <DataTemplate x:Key="TagTemplate" x:DataType="coreViewModels:TagViewModel">
             <cpcontrols:Tag
@@ -166,17 +48,10 @@
             x:Key="GridItemTemplateSelector"
             x:DataType="coreViewModels:ListItemViewModel"
             Gallery="{StaticResource GalleryGridItemViewModelTemplate}"
-            GridProperties="{x:Bind ViewModel.GridProperties, Mode=OneWay}"
+            GridProperties="{x:Bind ViewModel.GridProperties}"
             Medium="{StaticResource MediumGridItemViewModelTemplate}"
             Small="{StaticResource SmallGridItemViewModelTemplate}" />
 
-        <cmdpalUI:GridItemContainerStyleSelector
-            x:Key="GridItemContainerStyleSelector"
-            Gallery="{StaticResource GalleryGridViewItemStyle}"
-            GridProperties="{x:Bind ViewModel.GridProperties, Mode=OneWay}"
-            Medium="{StaticResource IconGridViewItemStyle}"
-            Small="{StaticResource IconGridViewItemStyle}" />
-
         <!--  https://learn.microsoft.com/windows/apps/design/controls/itemsview#specify-the-look-of-the-items  -->
         <DataTemplate x:Key="ListItemViewModelTemplate" x:DataType="coreViewModels:ListItemViewModel">
             <Grid
@@ -219,7 +94,7 @@
                         Text="{x:Bind Subtitle, Mode=OneWay}"
                         TextTrimming="CharacterEllipsis"
                         TextWrapping="NoWrap"
-                        Visibility="{x:Bind ShowSubtitle, Mode=OneWay}" />
+                        Visibility="{x:Bind Subtitle, Mode=OneWay, Converter={StaticResource StringVisibilityConverter}}" />
                 </StackPanel>
 
                 <ItemsControl
@@ -249,11 +124,11 @@
                 Padding="8,16"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
-                AutomationProperties.Name="{x:Bind Title, Mode=OneWay}"
+                AutomationProperties.Name="{x:Bind Title}"
                 BorderThickness="0"
-                CornerRadius="{StaticResource SmallGridViewItemCornerRadius}"
+                CornerRadius="8"
                 Orientation="Vertical"
-                ToolTipService.ToolTip="{x:Bind Title, Mode=OneWay}">
+                ToolTipService.ToolTip="{x:Bind Title}">
 
                 <cpcontrols:IconBox
                     x:Name="GridIconBorder"
@@ -270,22 +145,23 @@
         </DataTemplate>
 
         <DataTemplate x:Key="MediumGridItemViewModelTemplate" x:DataType="coreViewModels:ListItemViewModel">
-            <Grid
+            <StackPanel
                 Width="100"
                 Height="100"
-                Padding="8"
-                AutomationProperties.Name="{x:Bind Title, Mode=OneWay}"
-                CornerRadius="{StaticResource MediumGridViewItemCornerRadius}"
-                ToolTipService.ToolTip="{x:Bind Title, Mode=OneWay}">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="*" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
+                Padding="8,16"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                AutomationProperties.Name="{x:Bind Title}"
+                BorderThickness="0"
+                CornerRadius="8"
+                Orientation="Vertical"
+                ToolTipService.ToolTip="{x:Bind Title}">
+
                 <cpcontrols:IconBox
                     x:Name="GridIconBorder"
-                    Grid.Row="0"
                     Width="36"
                     Height="36"
+                    Margin="0"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     CharacterSpacing="12"
@@ -293,20 +169,21 @@
                     Foreground="{ThemeResource TextFillColorPrimary}"
                     SourceKey="{x:Bind Icon, Mode=OneWay}"
                     SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
+
                 <TextBlock
                     x:Name="TitleTextBlock"
-                    Grid.Row="1"
-                    Height="32"
-                    Margin="0,8,0,0"
+                    MaxHeight="40"
+                    Margin="0,8,0,4"
                     HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
                     CharacterSpacing="12"
                     FontSize="12"
-                    Text="{x:Bind Title, Mode=OneWay}"
+                    Text="{x:Bind Title}"
                     TextAlignment="Center"
                     TextTrimming="WordEllipsis"
                     TextWrapping="Wrap"
-                    Visibility="{x:Bind LayoutShowsTitle, Mode=OneWay}" />
-            </Grid>
+                    Visibility="{Binding ElementName=PageRoot, Path=DataContext.GridProperties.ShowTitle, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+            </StackPanel>
         </DataTemplate>
 
         <DataTemplate x:Key="GalleryGridItemViewModelTemplate" x:DataType="coreViewModels:ListItemViewModel">
@@ -316,11 +193,11 @@
                 Padding="0"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
-                AutomationProperties.Name="{x:Bind Title, Mode=OneWay}"
+                AutomationProperties.Name="{x:Bind Title}"
                 BorderThickness="0"
-                CornerRadius="{StaticResource GalleryGridViewItemRadius}"
+                CornerRadius="4"
                 Orientation="Vertical"
-                ToolTipService.ToolTip="{x:Bind Title, Mode=OneWay}">
+                ToolTipService.ToolTip="{x:Bind Title}">
 
                 <Grid
                     Width="160"
@@ -328,8 +205,12 @@
                     Margin="0"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    CornerRadius="{StaticResource GalleryGridViewItemRadius}">
+                    CornerRadius="4">
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
                     <Viewbox
+                        Grid.Row="1"
                         HorizontalAlignment="Center"
                         Stretch="UniformToFill"
                         StretchDirection="Both">
@@ -341,39 +222,35 @@
                     </Viewbox>
                 </Grid>
 
-                <StackPanel
-                    Padding="4"
-                    Orientation="Vertical"
-                    Spacing="4"
-                    Visibility="{x:Bind help:BindTransformers.VisibleWhenAny(ShowTitle, ShowSubtitle)}">
+                <StackPanel Padding="4" Orientation="Vertical">
                     <TextBlock
                         x:Name="TitleTextBlock"
                         MaxWidth="152"
                         MaxHeight="40"
+                        Margin="0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         CharacterSpacing="12"
                         FontSize="14"
                         Foreground="{ThemeResource TextFillColorPrimary}"
-                        Text="{x:Bind Title, Mode=OneWay}"
+                        Text="{x:Bind Title}"
                         TextAlignment="Center"
                         TextTrimming="WordEllipsis"
-                        TextWrapping="NoWrap"
-                        Visibility="{x:Bind ShowTitle, Mode=OneWay}" />
+                        TextWrapping="NoWrap" />
                     <TextBlock
                         x:Name="SubTitleTextBlock"
                         MaxWidth="152"
                         MaxHeight="40"
+                        Margin="0,4,0,0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         CharacterSpacing="11"
                         FontSize="11"
                         Foreground="{ThemeResource TextFillColorTertiary}"
-                        Text="{x:Bind Subtitle, Mode=OneWay}"
+                        Text="{x:Bind Subtitle}"
                         TextAlignment="Center"
                         TextTrimming="WordEllipsis"
-                        TextWrapping="NoWrap"
-                        Visibility="{x:Bind ShowSubtitle, Mode=OneWay}" />
+                        TextWrapping="NoWrap" />
                 </StackPanel>
             </StackPanel>
         </DataTemplate>
@@ -418,7 +295,6 @@
                             IsDoubleTapEnabled="True"
                             IsItemClickEnabled="True"
                             ItemClick="Items_ItemClick"
-                            ItemContainerStyleSelector="{StaticResource GridItemContainerStyleSelector}"
                             ItemTemplateSelector="{StaticResource GridItemTemplateSelector}"
                             ItemsSource="{x:Bind ViewModel.FilteredItems, Mode=OneWay}"
                             RightTapped="Items_RightTapped"
@@ -426,7 +302,6 @@
                             <GridView.ItemContainerTransitions>
                                 <TransitionCollection />
                             </GridView.ItemContainerTransitions>
-                            <GridView.ItemContainerStyle />
                         </GridView>
                     </controls:Case>
                 </controls:SwitchPresenter>

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

@@ -4,6 +4,7 @@
 
 using System.Diagnostics;
 using CommunityToolkit.Mvvm.Messaging;
+using ManagedCommon;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Commands;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
@@ -11,7 +12,6 @@ using Microsoft.CmdPal.UI.Helpers;
 using Microsoft.CmdPal.UI.Messages;
 using Microsoft.CmdPal.UI.ViewModels;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
@@ -32,7 +32,6 @@ public sealed partial class ListPage : Page,
     IRecipient<ActivateSecondaryCommandMessage>
 {
     private InputSource _lastInputSource;
-    private ILogger logger = App.Current.Services.GetService<ILogger>()!;
 
     internal ListViewModel? ViewModel
     {
@@ -457,7 +456,7 @@ public sealed partial class ListPage : Page,
             }
             else if (e.NewValue is null)
             {
-                Log_ClearedViewModel(@this.logger);
+                Logger.LogDebug("cleared view model");
             }
         }
     }
@@ -577,7 +576,4 @@ public sealed partial class ListPage : Page,
         Keyboard,
         Pointer,
     }
-
-    [LoggerMessage(Level = LogLevel.Debug, Message = "Cleared view model")]
-    static partial void Log_ClearedViewModel(ILogger logger);
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/BindTransformers.cs

@@ -15,7 +15,4 @@ internal static class BindTransformers
 
     public static Visibility EmptyOrWhitespaceToCollapsed(string? input)
         => string.IsNullOrWhiteSpace(input) ? Visibility.Collapsed : Visibility.Visible;
-
-    public static Visibility VisibleWhenAny(bool value1, bool value2)
-        => (value1 || value2) ? Visibility.Visible : Visibility.Collapsed;
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/BuildInfo.cs

@@ -1,36 +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.Reflection;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.CmdPal.UI.Helpers;
-
-internal static class BuildInfo
-{
-#if DEBUG
-    public const string Configuration = "Debug";
-#else
-    public const string Configuration = "Release";
-#endif
-
-    // Runtime AOT detection
-    public static bool IsNativeAot => !RuntimeFeature.IsDynamicCodeSupported;
-
-    // From assembly metadata (build-time values)
-    public static bool PublishTrimmed => GetBoolMetadata("PublishTrimmed", false);
-
-    // From assembly metadata (build-time values)
-    public static bool PublishAot => GetBoolMetadata("PublishAot", false);
-
-    public static bool IsCiBuild => GetBoolMetadata("CIBuild", false);
-
-    private static string? GetMetadata(string key) =>
-        Assembly.GetExecutingAssembly()
-            .GetCustomAttributes<AssemblyMetadataAttribute>()
-            .FirstOrDefault(a => a.Key == key)?.Value;
-
-    private static bool GetBoolMetadata(string key, bool defaultValue) =>
-        bool.TryParse(GetMetadata(key), out var result) ? result : defaultValue;
-}

src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/GlobalErrorHandler.cs

@@ -2,8 +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.
 
+using ManagedCommon;
 using Microsoft.CmdPal.Core.Common.Helpers;
-using Microsoft.Extensions.Logging;
 using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.UI.WindowsAndMessaging;
@@ -17,13 +17,6 @@ namespace Microsoft.CmdPal.UI.Helpers;
 /// </summary>
 internal sealed partial class GlobalErrorHandler
 {
-    private readonly ILogger _logger;
-
-    public GlobalErrorHandler(ILogger logger)
-    {
-        _logger = logger;
-    }
-
     // GlobalErrorHandler is designed to be self-contained; it can be registered and invoked before a service provider is available.
     internal void Register(App app)
     {
@@ -61,9 +54,9 @@ internal sealed partial class GlobalErrorHandler
         HandleException(e.Exception, Context.UnobservedTaskException);
     }
 
-    private void HandleException(Exception ex, Context context)
+    private static void HandleException(Exception ex, Context context)
     {
-        Log_UnhandledException(ex, context);
+        Logger.LogError($"Unhandled exception detected ({context})", ex);
 
         if (context == Context.MainThreadException)
         {
@@ -100,7 +93,7 @@ internal sealed partial class GlobalErrorHandler
         }
     }
 
-    private string? StoreReport(string report, bool storeOnDesktop)
+    private static string? StoreReport(string report, bool storeOnDesktop)
     {
         // Generate a unique name for the report file; include timestamp and a random zero-padded number to avoid collisions
         // in case of crash storm.
@@ -108,16 +101,15 @@ internal sealed partial class GlobalErrorHandler
 
         // Always store a copy in log directory, this way it is available for Bug Report Tool
         string? reportPath = null;
-
-        // if (!string.IsNullOrEmpty(logWrapper.CurrentVersionLogDirectoryPath))
-        // {
-        //    reportPath = Save(report, name, logWrapper.CurrentVersionLogDirectoryPath);
-        // s}
+        if (Logger.CurrentVersionLogDirectoryPath != null)
+        {
+            reportPath = Save(report, name, static () => Logger.CurrentVersionLogDirectoryPath);
+        }
 
         // Optionally store a copy on the desktop for user (in)convenience
         if (storeOnDesktop)
         {
-            var path = Save(report, name, Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory));
+            var path = Save(report, name, static () => Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory));
 
             // show the desktop copy if both succeeded
             if (path != null)
@@ -128,10 +120,11 @@ internal sealed partial class GlobalErrorHandler
 
         return reportPath;
 
-        string? Save(string reportContent, string reportFileName, string logDirectory)
+        static string? Save(string reportContent, string reportFileName, Func<string> directory)
         {
             try
             {
+                var logDirectory = directory();
                 Directory.CreateDirectory(logDirectory);
                 var reportFilePath = Path.Combine(logDirectory, reportFileName);
                 File.WriteAllText(reportFilePath, reportContent);
@@ -139,7 +132,7 @@ internal sealed partial class GlobalErrorHandler
             }
             catch (Exception ex)
             {
-                Log_FailureToStoreExceptionReport(ex);
+                Logger.LogError("Failed to store exception report", ex);
                 return null;
             }
         }
@@ -153,10 +146,4 @@ internal sealed partial class GlobalErrorHandler
         UnobservedTaskException,
         AppDomainUnhandledException,
     }
-
-    [LoggerMessage(level: LogLevel.Error, Message = "Failed to store exception report")]
-    partial void Log_FailureToStoreExceptionReport(Exception ex);
-
-    [LoggerMessage(level: LogLevel.Error, message: "Unhandled exception detected ({Context})")]
-    partial void Log_UnhandledException(Exception ex, Context context);
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/LocalKeyboardListener.cs

@@ -2,8 +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.
 
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
+using ManagedCommon;
+
 using Windows.System;
 using Windows.Win32;
 using Windows.Win32.Foundation;
@@ -16,8 +16,6 @@ namespace Microsoft.CmdPal.UI.Helpers;
 /// </summary>
 internal sealed partial class LocalKeyboardListener : IDisposable
 {
-    private readonly ILogger logger = App.Current.Services.GetRequiredService<ILogger>()!;
-
     /// <summary>
     /// Event that is raised when a key is pressed down.
     /// </summary>
@@ -70,7 +68,7 @@ internal sealed partial class LocalKeyboardListener : IDisposable
         }
         catch (Exception ex)
         {
-            Log_FailureToRegisterHook(ex);
+            Logger.LogError("Failed to register hook", ex);
             return false;
         }
     }
@@ -123,7 +121,7 @@ internal sealed partial class LocalKeyboardListener : IDisposable
         }
         catch (Exception ex)
         {
-            Log_FailureOnKeyDown(ex);
+            Logger.LogError("Failed when invoking key down keyboard hook event", ex);
         }
 
         // Call next hook in chain - pass null as first parameter for current hook
@@ -156,10 +154,4 @@ internal sealed partial class LocalKeyboardListener : IDisposable
             _disposed = true;
         }
     }
-
-    [LoggerMessage(Level = LogLevel.Error, Message = "Failed to register hook")]
-    private partial void Log_FailureToRegisterHook(Exception ex);
-
-    [LoggerMessage(Level = LogLevel.Error, Message = "Failed when invoking key down keyboard hook event")]
-    private partial void Log_FailureOnKeyDown(Exception ex);
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/ImageProvider.cs

@@ -3,8 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using CommunityToolkit.WinUI.Controls;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
+using ManagedCommon;
 using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.CmdPal.UI.Helpers.MarkdownImageProviders;
@@ -32,8 +31,7 @@ internal sealed partial class ImageProvider : IImageProvider
         }
         catch (Exception ex)
         {
-            var logger = App.Current.Services.GetRequiredService<ILogger>();
-            Log_ImageProviderError(logger, url, ex);
+            Logger.LogError($"Failed to provide an image from URI '{url}'", ex);
             return null!;
         }
     }
@@ -42,7 +40,4 @@ internal sealed partial class ImageProvider : IImageProvider
     {
         return _compositeProvider.ShouldUseThisProvider(url);
     }
-
-    [LoggerMessage(Level = LogLevel.Error, Message = "Failed to provide an image from URI '{Url}'")]
-    static partial void Log_ImageProviderError(ILogger logger, string url, Exception ex);
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/LogWrapper.cs

@@ -0,0 +1,41 @@
+// 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 ManagedCommon;
+using Microsoft.CmdPal.Core.Common;
+
+namespace Microsoft.CmdPal.UI;
+
+internal sealed class LogWrapper : ILogger
+{
+    public void LogError(string message, Exception ex, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        Logger.LogError(message, ex, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public void LogError(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        Logger.LogError(message, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public void LogWarning(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        Logger.LogWarning(message, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public void LogInfo(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        Logger.LogInfo(message, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public void LogDebug(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        Logger.LogDebug(message, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public void LogTrace([System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        Logger.LogTrace(memberName, sourceFilePath, sourceLineNumber);
+    }
+}

src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml

@@ -14,7 +14,5 @@
     Activated="MainWindow_Activated"
     Closed="MainWindow_Closed"
     mc:Ignorable="d">
-    <Grid x:Name="RootElement">
-        <pages:ShellPage />
-    </Grid>
+    <pages:ShellPage x:Name="RootShellPage" />
 </winuiex:WindowEx>

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

@@ -6,20 +6,18 @@ using System.Diagnostics;
 using System.Runtime.InteropServices;
 using CmdPalKeyboardService;
 using CommunityToolkit.Mvvm.Messaging;
+using ManagedCommon;
 using Microsoft.CmdPal.Core.Common.Helpers;
 using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Ext.ClipboardHistory.Messages;
-using Microsoft.CmdPal.UI.Controls;
 using Microsoft.CmdPal.UI.Events;
 using Microsoft.CmdPal.UI.Helpers;
 using Microsoft.CmdPal.UI.Messages;
 using Microsoft.CmdPal.UI.ViewModels;
 using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Microsoft.PowerToys.Telemetry;
-using Microsoft.UI;
 using Microsoft.UI.Composition;
 using Microsoft.UI.Composition.SystemBackdrops;
 using Microsoft.UI.Input;
@@ -35,8 +33,6 @@ using Windows.UI.WindowManagement;
 using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.Graphics.Dwm;
-using Windows.Win32.Graphics.Gdi;
-using Windows.Win32.UI.HiDpi;
 using Windows.Win32.UI.Input.KeyboardAndMouse;
 using Windows.Win32.UI.WindowsAndMessaging;
 using WinRT;
@@ -52,26 +48,20 @@ public sealed partial class MainWindow : WindowEx,
     IRecipient<QuitMessage>,
     IDisposable
 {
-    private const int DefaultWidth = 800;
-    private const int DefaultHeight = 480;
-
     [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "Stylistically, window messages are WM_")]
     [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1306:Field names should begin with lower-case letter", Justification = "Stylistically, window messages are WM_")]
     private readonly uint WM_TASKBAR_RESTART;
     private readonly HWND _hwnd;
-    private readonly DispatcherTimer _autoGoHomeTimer;
     private readonly WNDPROC? _hotkeyWndProc;
     private readonly WNDPROC? _originalWndProc;
     private readonly List<TopLevelHotkey> _hotkeys = [];
     private readonly KeyboardListener _keyboardListener;
     private readonly LocalKeyboardListener _localKeyboardListener;
     private readonly HiddenOwnerWindowBehavior _hiddenOwnerBehavior = new();
-    private readonly ILogger logger = App.Current.Services.GetRequiredService<ILogger>();
     private bool _ignoreHotKeyWhenFullScreen = true;
 
     private DesktopAcrylicController? _acrylicController;
     private SystemBackdropConfiguration? _configurationSource;
-    private TimeSpan _autoGoHomeInterval = Timeout.InfiniteTimeSpan;
 
     private WindowPosition _currentWindowPosition = new();
 
@@ -79,9 +69,6 @@ public sealed partial class MainWindow : WindowEx,
     {
         InitializeComponent();
 
-        _autoGoHomeTimer = new DispatcherTimer();
-        _autoGoHomeTimer.Tick += OnAutoGoHomeTimerOnTick;
-
         _hwnd = new HWND(WinRT.Interop.WindowNative.GetWindowHandle(this).ToInt32());
 
         unsafe
@@ -115,7 +102,7 @@ public sealed partial class MainWindow : WindowEx,
         ExtendsContentIntoTitleBar = true;
         AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Collapsed;
         SizeChanged += WindowSizeChanged;
-        RootElement.Loaded += RootElementLoaded;
+        RootShellPage.Loaded += RootShellPage_Loaded;
 
         WM_TASKBAR_RESTART = PInvoke.RegisterWindowMessage("TaskbarCreated");
 
@@ -132,7 +119,7 @@ public sealed partial class MainWindow : WindowEx,
         App.Current.Services.GetService<SettingsModel>()!.SettingsChanged += SettingsChangedHandler;
 
         // Make sure that we update the acrylic theme when the OS theme changes
-        RootElement.ActualThemeChanged += (s, e) => DispatcherQueue.TryEnqueue(UpdateAcrylic);
+        RootShellPage.ActualThemeChanged += (s, e) => DispatcherQueue.TryEnqueue(UpdateAcrylic);
 
         // Hardcoding event name to avoid bringing in the PowerToys.interop dependency. Event name must match CMDPAL_SHOW_EVENT from shared_constants.h
         NativeEventWaiter.WaitForEventLoop("Local\\PowerToysCmdPal-ShowEvent-62336fcd-8611-4023-9b30-091a6af4cc5a", () =>
@@ -148,15 +135,6 @@ public sealed partial class MainWindow : WindowEx,
         HideWindow();
     }
 
-    private void OnAutoGoHomeTimerOnTick(object? s, object e)
-    {
-        _autoGoHomeTimer.Stop();
-
-        // BEAR LOADING: Focus Search must be suppressed here; otherwise it may steal focus (for example, from the system tray icon)
-        // and prevent the user from opening its context menu.
-        WeakReferenceMessenger.Default.Send(new GoHomeMessage(WithAnimation: false, FocusSearch: false));
-    }
-
     private static void LocalKeyboardListener_OnKeyPressed(object? sender, LocalKeyboardListenerKeyPressedEventArgs e)
     {
         if (e.Key == VirtualKey.GoBack)
@@ -167,18 +145,11 @@ public sealed partial class MainWindow : WindowEx,
 
     private void SettingsChangedHandler(SettingsModel sender, object? args) => HotReloadSettings();
 
-    private void RootElementLoaded(object sender, RoutedEventArgs e)
-    {
+    private void RootShellPage_Loaded(object sender, RoutedEventArgs e) =>
+
         // Now that our content has loaded, we can update our draggable regions
         UpdateRegionsForCustomTitleBar();
 
-        // Add dev ribbon if enabled
-        if (!BuildInfo.IsCiBuild)
-        {
-            RootElement.Children.Add(new DevRibbon { Margin = new Thickness(-1, -1, 120, -1) });
-        }
-    }
-
     private void WindowSizeChanged(object sender, WindowSizeChangedEventArgs args) => UpdateRegionsForCustomTitleBar();
 
     private void PositionCentered()
@@ -202,8 +173,22 @@ public sealed partial class MainWindow : WindowEx,
             return;
         }
 
-        var newRect = EnsureWindowIsVisible(savedPosition.ToPhysicalWindowRectangle(), new SizeInt32(savedPosition.ScreenWidth, savedPosition.ScreenHeight), savedPosition.Dpi);
-        AppWindow.MoveAndResize(newRect);
+        AppWindow.Resize(new SizeInt32 { Width = savedPosition.Width, Height = savedPosition.Height });
+
+        var savedRect = new RectInt32(savedPosition.X, savedPosition.Y, savedPosition.Width, savedPosition.Height);
+        var displayArea = DisplayArea.GetFromRect(savedRect, DisplayAreaFallback.Nearest);
+        var workArea = displayArea.WorkArea;
+
+        var maxX = workArea.X + Math.Max(0, workArea.Width - savedPosition.Width);
+        var maxY = workArea.Y + Math.Max(0, workArea.Height - savedPosition.Height);
+
+        var targetPoint = new PointInt32
+        {
+            X = Math.Clamp(savedPosition.X, workArea.X, maxX),
+            Y = Math.Clamp(savedPosition.Y, workArea.Y, maxY),
+        };
+
+        AppWindow.Move(targetPoint);
     }
 
     private void PositionCentered(DisplayArea displayArea)
@@ -222,16 +207,12 @@ public sealed partial class MainWindow : WindowEx,
 
     private void UpdateWindowPositionInMemory()
     {
-        var displayArea = DisplayArea.GetFromWindowId(AppWindow.Id, DisplayAreaFallback.Nearest) ?? DisplayArea.Primary;
         _currentWindowPosition = new WindowPosition
         {
             X = AppWindow.Position.X,
             Y = AppWindow.Position.Y,
             Width = AppWindow.Size.Width,
             Height = AppWindow.Size.Height,
-            Dpi = (int)this.GetDpiForWindow(),
-            ScreenWidth = displayArea.WorkArea.Width,
-            ScreenHeight = displayArea.WorkArea.Height,
         };
     }
 
@@ -243,9 +224,6 @@ public sealed partial class MainWindow : WindowEx,
         App.Current.Services.GetService<TrayIconService>()!.SetupTrayIcon(settings.ShowSystemTrayIcon);
 
         _ignoreHotKeyWhenFullScreen = settings.IgnoreShortcutWhenFullscreen;
-
-        _autoGoHomeInterval = settings.AutoGoHomeInterval;
-        _autoGoHomeTimer.Interval = _autoGoHomeInterval;
     }
 
     // We want to use DesktopAcrylicKind.Thin and custom colors as this is the default material
@@ -305,8 +283,6 @@ public sealed partial class MainWindow : WindowEx,
 
     private void ShowHwnd(IntPtr hwndValue, MonitorBehavior target)
     {
-        StopAutoGoHome();
-
         var hwnd = new HWND(hwndValue != 0 ? hwndValue : _hwnd);
 
         // Remember, IsIconic == "minimized", which is entirely different state
@@ -324,8 +300,8 @@ public sealed partial class MainWindow : WindowEx,
 
         if (target == MonitorBehavior.ToLast)
         {
-            var newRect = EnsureWindowIsVisible(_currentWindowPosition.ToPhysicalWindowRectangle(), new SizeInt32(_currentWindowPosition.ScreenWidth, _currentWindowPosition.ScreenHeight), _currentWindowPosition.Dpi);
-            AppWindow.MoveAndResize(newRect);
+            AppWindow.Resize(new SizeInt32 { Width = _currentWindowPosition.Width, Height = _currentWindowPosition.Height });
+            AppWindow.Move(new PointInt32 { X = _currentWindowPosition.X, Y = _currentWindowPosition.Y });
         }
         else
         {
@@ -354,114 +330,6 @@ public sealed partial class MainWindow : WindowEx,
         PInvoke.SetWindowPos(hwnd, HWND.HWND_TOPMOST, 0, 0, 0, 0, SET_WINDOW_POS_FLAGS.SWP_NOMOVE | SET_WINDOW_POS_FLAGS.SWP_NOSIZE);
     }
 
-    /// <summary>
-    /// Ensures that the window rectangle is visible on-screen.
-    /// </summary>
-    /// <param name="windowRect">The window rectangle in physical pixels.</param>
-    /// <param name="originalScreen">The desktop area the window was positioned on.</param>
-    /// <param name="originalDpi">The window's original DPI.</param>
-    /// <returns>
-    /// A window rectangle in physical pixels, moved to the nearest display and resized
-    /// if the DPI has changed.
-    /// </returns>
-    private RectInt32 EnsureWindowIsVisible(RectInt32 windowRect, SizeInt32 originalScreen, int originalDpi)
-    {
-        var displayArea = DisplayArea.GetFromRect(windowRect, DisplayAreaFallback.Nearest);
-        if (displayArea is null)
-        {
-            return windowRect;
-        }
-
-        var workArea = displayArea.WorkArea;
-        if (workArea.Width <= 0 || workArea.Height <= 0)
-        {
-            // Fallback, nothing reasonable to do
-            return windowRect;
-        }
-
-        var effectiveDpi = GetEffectiveDpiFromDisplayId(displayArea);
-        if (originalDpi <= 0)
-        {
-            originalDpi = effectiveDpi; // use current DPI as baseline (no scaling adjustment needed)
-        }
-
-        var hasInvalidSize = windowRect.Width <= 0 || windowRect.Height <= 0;
-        if (hasInvalidSize)
-        {
-            windowRect = new RectInt32(windowRect.X, windowRect.Y, DefaultWidth, DefaultHeight);
-        }
-
-        // If we have a DPI change, scale the window rectangle accordingly
-        if (effectiveDpi != originalDpi)
-        {
-            var scalingFactor = effectiveDpi / (double)originalDpi;
-            windowRect = new RectInt32(
-                (int)Math.Round(windowRect.X * scalingFactor),
-                (int)Math.Round(windowRect.Y * scalingFactor),
-                (int)Math.Round(windowRect.Width * scalingFactor),
-                (int)Math.Round(windowRect.Height * scalingFactor));
-        }
-
-        var targetWidth = Math.Min(windowRect.Width, workArea.Width);
-        var targetHeight = Math.Min(windowRect.Height, workArea.Height);
-
-        // Ensure at least some minimum visible area (e.g., 100 pixels)
-        // This helps prevent the window from being entirely offscreen, regardless of display scaling.
-        const int minimumVisibleSize = 100;
-        var isOffscreen =
-            windowRect.X + minimumVisibleSize > workArea.X + workArea.Width ||
-            windowRect.X + windowRect.Width - minimumVisibleSize < workArea.X ||
-            windowRect.Y + minimumVisibleSize > workArea.Y + workArea.Height ||
-            windowRect.Y + windowRect.Height - minimumVisibleSize < workArea.Y;
-
-        // if the work area size has changed, re-center the window
-        var workAreaSizeChanged =
-            originalScreen.Width != workArea.Width ||
-            originalScreen.Height != workArea.Height;
-
-        int targetX;
-        int targetY;
-        var recenter = isOffscreen || workAreaSizeChanged || hasInvalidSize;
-        if (recenter)
-        {
-            targetX = workArea.X + ((workArea.Width - targetWidth) / 2);
-            targetY = workArea.Y + ((workArea.Height - targetHeight) / 2);
-        }
-        else
-        {
-            targetX = windowRect.X;
-            targetY = windowRect.Y;
-        }
-
-        return new RectInt32(targetX, targetY, targetWidth, targetHeight);
-    }
-
-    private int GetEffectiveDpiFromDisplayId(DisplayArea displayArea)
-    {
-        var effectiveDpi = 96;
-
-        var hMonitor = (HMONITOR)Win32Interop.GetMonitorFromDisplayId(displayArea.DisplayId);
-        if (!hMonitor.IsNull)
-        {
-            var hr = PInvoke.GetDpiForMonitor(hMonitor, MONITOR_DPI_TYPE.MDT_EFFECTIVE_DPI, out var dpiX, out _);
-            if (hr == 0)
-            {
-                effectiveDpi = (int)dpiX;
-            }
-            else
-            {
-                LogWarning_GetDpiForMonitorFailed(hr, displayArea);
-            }
-        }
-
-        if (effectiveDpi <= 0)
-        {
-            effectiveDpi = 96;
-        }
-
-        return effectiveDpi;
-    }
-
     private DisplayArea GetScreen(HWND currentHwnd, MonitorBehavior target)
     {
         // Leaving a note here, in case we ever need it:
@@ -561,25 +429,6 @@ public sealed partial class MainWindow : WindowEx,
             // If the window was not cloaked, then leave it hidden.
             // Sure, it's not ideal, but at least it's not visible.
         }
-
-        // Start auto-go-home timer
-        RestartAutoGoHome();
-    }
-
-    private void StopAutoGoHome()
-    {
-        _autoGoHomeTimer.Stop();
-    }
-
-    private void RestartAutoGoHome()
-    {
-        if (_autoGoHomeInterval == Timeout.InfiniteTimeSpan)
-        {
-            return;
-        }
-
-        _autoGoHomeTimer.Stop();
-        _autoGoHomeTimer.Start();
     }
 
     private bool Cloak()
@@ -591,7 +440,7 @@ public sealed partial class MainWindow : WindowEx,
             var hr = PInvoke.DwmSetWindowAttribute(_hwnd, DWMWINDOWATTRIBUTE.DWMWA_CLOAK, &value, (uint)sizeof(BOOL));
             if (hr.Failed)
             {
-                Log_DwmCloakingFailed(hr);
+                Logger.LogWarning($"DWM cloaking of the main window failed. HRESULT: {hr.Value}.");
             }
 
             wasCloaked = hr.Succeeded;
@@ -630,9 +479,6 @@ public sealed partial class MainWindow : WindowEx,
                 Y = _currentWindowPosition.Y,
                 Width = _currentWindowPosition.Width,
                 Height = _currentWindowPosition.Height,
-                Dpi = _currentWindowPosition.Dpi,
-                ScreenWidth = _currentWindowPosition.ScreenWidth,
-                ScreenHeight = _currentWindowPosition.ScreenHeight,
             };
 
             SettingsModel.SaveSettings(settings);
@@ -667,28 +513,28 @@ public sealed partial class MainWindow : WindowEx,
     private void UpdateRegionsForCustomTitleBar()
     {
         // Specify the interactive regions of the title bar.
-        var scaleAdjustment = RootElement.XamlRoot.RasterizationScale;
+        var scaleAdjustment = RootShellPage.XamlRoot.RasterizationScale;
 
         // Get the rectangle around our XAML content. We're going to mark this
         // rectangle as "Passthrough", so that the normal window operations
         // (resizing, dragging) don't apply in this space.
-        var transform = RootElement.TransformToVisual(null);
+        var transform = RootShellPage.TransformToVisual(null);
 
         // Reserve 16px of space at the top for dragging.
         var topHeight = 16;
         var bounds = transform.TransformBounds(new Rect(
             0,
             topHeight,
-            RootElement.ActualWidth,
-            RootElement.ActualHeight));
+            RootShellPage.ActualWidth,
+            RootShellPage.ActualHeight));
         var contentRect = GetRect(bounds, scaleAdjustment);
         var rectArray = new RectInt32[] { contentRect };
         var nonClientInputSrc = InputNonClientPointerSource.GetForWindowId(this.AppWindow.Id);
         nonClientInputSrc.SetRegionRects(NonClientRegionKind.Passthrough, rectArray);
 
         // Add a drag-able region on top
-        var w = RootElement.ActualWidth;
-        _ = RootElement.ActualHeight;
+        var w = RootShellPage.ActualWidth;
+        _ = RootShellPage.ActualHeight;
         var dragSides = new RectInt32[]
         {
             GetRect(new Rect(0, 0, w, topHeight), scaleAdjustment), // the top, {topHeight=16} tall
@@ -781,12 +627,12 @@ public sealed partial class MainWindow : WindowEx,
                             var settings = App.Current.Services.GetService<SettingsModel>();
                             if (settings?.AllowExternalReload == true)
                             {
-                                Log_ExternalReloadTriggered();
+                                Logger.LogInfo("External Reload triggered");
                                 WeakReferenceMessenger.Default.Send<ReloadCommandsMessage>(new());
                             }
                             else
                             {
-                                Log_ExternalReloadDisabled();
+                                Logger.LogInfo("External Reload is disabled");
                             }
 
                             return;
@@ -805,11 +651,17 @@ public sealed partial class MainWindow : WindowEx,
             // if the args are not valid or not passed correctly.
             if (ex.HResult is RPC_S_SERVER_UNAVAILABLE or RPC_S_CALL_FAILED)
             {
-                Log_COMExceptionAccessingActivationArguments(ex.HResult);
+                Logger.LogWarning(
+                    $"COM exception (HRESULT {ex.HResult}) when accessing activation arguments. " +
+                    $"This might be due to the calling application not passing them correctly or exiting before we could read them. " +
+                    $"The application will continue running and fall back to showing the Command Palette window.");
             }
             else
             {
-                Log_COMExceptionActivationApplication(ex.HResult);
+                Logger.LogError(
+                    $"COM exception (HRESULT {ex.HResult}) when activating the application. " +
+                    $"The application will continue running and fall back to showing the Command Palette window.",
+                    ex);
             }
         }
 
@@ -996,26 +848,4 @@ public sealed partial class MainWindow : WindowEx,
         _localKeyboardListener.Dispose();
         DisposeAcrylic();
     }
-
-    [LoggerMessage(level: LogLevel.Warning, Message = "GetDpiForMonitor failed with HRESULT: 0x{hr.Value:X8} on display {DisplayArea.DisplayId}")]
-    partial void LogWarning_GetDpiForMonitorFailed(HRESULT hr, DisplayArea displayArea);
-
-    [LoggerMessage(level: LogLevel.Warning, Message = "DWM cloaking of the main window failed. HRESULT: {hr.Value}.")]
-    partial void Log_DwmCloakingFailed(HRESULT hr);
-
-    [LoggerMessage(level: LogLevel.Information, Message = "External Reload triggered")]
-    partial void Log_ExternalReloadTriggered();
-
-    [LoggerMessage(level: LogLevel.Information, Message = "External Reload is disabled")]
-    partial void Log_ExternalReloadDisabled();
-
-    [LoggerMessage(
-        level: LogLevel.Error,
-        Message = "COM exception (HRESULT {HResult}) when accessing activation arguments. This might be due to the calling application not passing them correctly or exiting before we could read them. The application will continue running and fall back to showing the Command Palette window.")]
-    partial void Log_COMExceptionAccessingActivationArguments(int hResult);
-
-    [LoggerMessage(
-        level: LogLevel.Error,
-        Message = "COM exception (HRESULT {HResult}) when activating the application. The application will continue running and fall back to showing the Command Palette window.")]
-    partial void Log_COMExceptionActivationApplication(int hResult);
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj

@@ -15,7 +15,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
-  <LangVersion>preview</LangVersion>
 
     <Version>$(CmdPalVersion)</Version>
 
@@ -26,10 +25,10 @@
   </PropertyGroup>
   
   <!-- For debugging purposes, uncomment this block to enable AOT builds -->
-   <!--<PropertyGroup>
+  <!-- <PropertyGroup>
     <EnableCmdPalAOT>true</EnableCmdPalAOT>
-    <GeneratePackageLocally>true</GeneratePackageLocally>
-  </PropertyGroup>--> 
+    <CIBuild>true</CIBuild>
+  </PropertyGroup> -->
 
   <PropertyGroup Condition="'$(EnableCmdPalAOT)' == 'true'">
     <SelfContained>true</SelfContained>
@@ -38,7 +37,7 @@
     <PublishAot>true</PublishAot>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(CIBuild)' == 'true' or '$(GeneratePackageLocally)' == 'true'">
+  <PropertyGroup Condition="'$(CIBuild)'=='true'">
     <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
     <AppxBundle>Never</AppxBundle>
     <AppxPackageTestDir>$(OutputPath)\AppPackages\Microsoft.CmdPal.UI_$(Version)_Test\</AppxPackageTestDir>
@@ -67,7 +66,6 @@
 
   <ItemGroup>
     <None Remove="Controls\ActionBar.xaml" />
-    <None Remove="Controls\DevRibbon.xaml" />
     <None Remove="Controls\KeyVisual\KeyCharPresenter.xaml" />
     <None Remove="Controls\SearchBar.xaml" />
     <None Remove="IsEnabledTextBlock.xaml" />
@@ -120,7 +118,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.ClipboardHistory\Microsoft.CmdPal.Ext.ClipboardHistory.csproj" />
-    <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.RemoteDesktop\Microsoft.CmdPal.Ext.RemoteDesktop.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.System\Microsoft.CmdPal.Ext.System.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WebSearch\Microsoft.CmdPal.Ext.WebSearch.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Indexer\Microsoft.CmdPal.Ext.Indexer.csproj" />
@@ -170,9 +167,6 @@
     <Page Update="Controls\SearchBar.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Update="Controls\DevRibbon.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Update="Styles\TextBox.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
     </Page>
@@ -240,24 +234,4 @@
   </ItemGroup>
   <!-- </AdaptiveCardsWorkaround> -->
 
-  <!-- Metadata for build information  -->
-  <ItemGroup>
-    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
-      <_Parameter1>PublishTrimmed</_Parameter1>
-      <_Parameter2>$(PublishTrimmed)</_Parameter2>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
-      <_Parameter1>PublishAot</_Parameter1>
-      <_Parameter2>$(PublishAot)</_Parameter2>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
-      <_Parameter1>CIBuild</_Parameter1>
-      <_Parameter2>$(CIBuild)</_Parameter2>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
-      <_Parameter1>CommandPaletteBranding</_Parameter1>
-      <_Parameter2>$(CommandPaletteBranding)</_Parameter2>
-    </AssemblyAttribute>
-  </ItemGroup>
-
 </Project>

src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs

@@ -7,7 +7,7 @@ using System.Globalization;
 using System.Text;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.WinUI;
-
+using ManagedCommon;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.UI.Events;
@@ -17,7 +17,6 @@ using Microsoft.CmdPal.UI.Settings;
 using Microsoft.CmdPal.UI.ViewModels;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Input;
@@ -51,8 +50,6 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
     INotifyPropertyChanged,
     IDisposable
 {
-    private readonly ILogger logger = App.Current.Services.GetService<ILogger>()!;
-
     private readonly DispatcherQueue _queue = DispatcherQueue.GetForCurrentThread();
 
     private readonly DispatcherQueueTimer _debounceTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
@@ -182,7 +179,7 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
             }
             catch (Exception ex)
             {
-                Log_Exception(ex);
+                Logger.LogError(ex.ToString());
             }
         });
     }
@@ -203,7 +200,7 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
             return;
         }
 
-        ConfirmResultViewModel vm = new(args, new(ViewModel.CurrentPage), logger);
+        ConfirmResultViewModel vm = new(args, new(ViewModel.CurrentPage));
         var initializeDialogTask = Task.Run(() => { InitializeConfirmationDialog(vm); });
         await initializeDialogTask;
 
@@ -348,7 +345,7 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
             // Depending on the settings, either
             // * Go home, or
             // * Select the search text (if we should remain open on this page)
-            if (settings.AutoGoHomeInterval == TimeSpan.Zero)
+            if (settings.HotkeyGoesHome)
             {
                 GoHome(false);
             }
@@ -363,7 +360,7 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
             {
                 // For a hotkey bound to a command, first lookup the
                 // command from our list of toplevel commands.
-                var tlcManager = App.Current.Services.GetService<TopLevelCommandService>()!;
+                var tlcManager = App.Current.Services.GetService<TopLevelCommandManager>()!;
                 var topLevelCommand = tlcManager.LookupCommand(commandId);
                 if (topLevelCommand is not null)
                 {
@@ -491,13 +488,13 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
                     break;
                 default:
                     ViewModel.CurrentPage = ViewModel.NullPage;
-                    Log_InvalidNavigationTarget(nameof(AsyncNavigationRequest.TargetViewModel), nameof(PageViewModel));
+                    Logger.LogWarning($"Invalid navigation target: AsyncNavigationRequest.{nameof(AsyncNavigationRequest.TargetViewModel)} must be {nameof(PageViewModel)}");
                     break;
             }
         }
         else
         {
-            Log_UnrecognizedNavigationTarget(e.Parameter);
+            Logger.LogWarning("Unrecognized target for shell navigation: " + e.Parameter);
         }
 
         if (e.Content is Page element)
@@ -583,7 +580,7 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
                     }
                     catch (Exception ex)
                     {
-                        Log_ErrorDuringFocusAfterLoaded(ex);
+                        Logger.LogError("Error during FocusAfterLoaded async focus work", ex);
                     }
                 },
                 token);
@@ -712,7 +709,7 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
         }
         catch (Exception ex)
         {
-            Log_ErrorHandlingMouseEvent(ex);
+            Logger.LogError("Error handling mouse button press event", ex);
         }
     }
 
@@ -722,19 +719,4 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
         _focusAfterLoadedCts?.Dispose();
         _focusAfterLoadedCts = null;
     }
-
-    [LoggerMessage(Level = LogLevel.Error)]
-    partial void Log_Exception(Exception ex);
-
-    [LoggerMessage(Level = LogLevel.Error, Message = "Error handling mouse button press event")]
-    partial void Log_ErrorHandlingMouseEvent(Exception ex);
-
-    [LoggerMessage(Level = LogLevel.Error, Message = "Error during FocusAfterLoaded async focus work")]
-    partial void Log_ErrorDuringFocusAfterLoaded(Exception ex);
-
-    [LoggerMessage(Level = LogLevel.Warning, Message = "Unrecognized target for shell navigation: {parameter}")]
-    partial void Log_UnrecognizedNavigationTarget(object? parameter);
-
-    [LoggerMessage(Level = LogLevel.Error, Message = "Invalid navigation target: AsyncNavigationRequest.{targetViewModel} must be {pageViewModel}")]
-    partial void Log_InvalidNavigationTarget(string targetViewModel, string pageViewModel);
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/PowerToysAppHostService.cs

@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CmdPal.Core.ViewModels;
+using Microsoft.CmdPal.UI.ViewModels;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+namespace Microsoft.CmdPal.UI;
+
+internal sealed class PowerToysAppHostService : IAppHostService
+{
+    public AppExtensionHost GetDefaultHost()
+    {
+        return CommandPaletteHost.Instance;
+    }
+
+    public AppExtensionHost GetHostForCommand(object? context, AppExtensionHost? currentHost)
+    {
+        AppExtensionHost? topLevelHost = null;
+        if (context is TopLevelViewModel topLevelViewModel)
+        {
+            topLevelHost = topLevelViewModel.ExtensionHost;
+        }
+
+        return topLevelHost ?? currentHost ?? CommandPaletteHost.Instance;
+    }
+}

src/modules/cmdpal/Microsoft.CmdPal.UI/PowerToysRootPageService.cs

@@ -4,57 +4,55 @@
 
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
+using ManagedCommon;
 using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Core.ViewModels;
+using Microsoft.CmdPal.UI.ViewModels;
 using Microsoft.CmdPal.UI.ViewModels.MainPage;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.DependencyInjection;
 using WinRT;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
-namespace Microsoft.CmdPal.UI.ViewModels.Services;
+namespace Microsoft.CmdPal.UI;
 
-internal sealed partial class PowerToysRootPageService : IRootPageService
+internal sealed class PowerToysRootPageService : IRootPageService
 {
-    private readonly ILogger logger;
-    private readonly TopLevelCommandService _topLevelCommandService;
+    private readonly IServiceProvider _serviceProvider;
     private IExtensionWrapper? _activeExtension;
     private Lazy<MainListPage> _mainListPage;
 
-    public PowerToysRootPageService(
-        TopLevelCommandService topLevelCommandService,
-        AliasService aliasService,
-        SettingsModel settingsModel,
-        AppStateModel appStateModel,
-        ILogger logger)
+    public PowerToysRootPageService(IServiceProvider serviceProvider)
     {
-        this.logger = logger;
-        _topLevelCommandService = topLevelCommandService;
+        _serviceProvider = serviceProvider;
 
         _mainListPage = new Lazy<MainListPage>(() =>
         {
-            return new MainListPage(_topLevelCommandService, settingsModel, aliasService, appStateModel);
+            return new MainListPage(_serviceProvider);
         });
     }
 
     public async Task PreLoadAsync()
     {
-        await _topLevelCommandService.LoadBuiltinsAsync();
+        var tlcManager = _serviceProvider.GetService<TopLevelCommandManager>()!;
+        await tlcManager.LoadBuiltinsAsync();
     }
 
-    public IPage GetRootPage()
+    public Microsoft.CommandPalette.Extensions.IPage GetRootPage()
     {
         return _mainListPage.Value;
     }
 
     public async Task PostLoadRootPageAsync()
     {
-        // After loading built-ins, and starting navigation, kick off a thread to load extensions.
-        _topLevelCommandService.LoadExtensionsCommand.Execute(null);
+        var tlcManager = _serviceProvider.GetService<TopLevelCommandManager>()!;
 
-        await _topLevelCommandService.LoadExtensionsCommand.ExecutionTask!;
-        if (_topLevelCommandService.LoadExtensionsCommand.ExecutionTask.Status != TaskStatus.RanToCompletion)
+        // After loading built-ins, and starting navigation, kick off a thread to load extensions.
+        tlcManager.LoadExtensionsCommand.Execute(null);
+
+        await tlcManager.LoadExtensionsCommand.ExecutionTask!;
+        if (tlcManager.LoadExtensionsCommand.ExecutionTask.Status != TaskStatus.RanToCompletion)
         {
             // TODO: Handle failure case
         }
@@ -71,7 +69,8 @@ internal sealed partial class PowerToysRootPageService : IRootPageService
         }
         catch (Exception ex)
         {
-            Log_ErrorUpdatingHistory(ex);
+            Logger.LogError("Failed to update history in PowerToysRootPageService");
+            Logger.LogError(ex.ToString());
         }
     }
 
@@ -112,13 +111,13 @@ internal sealed partial class PowerToysRootPageService : IRootPageService
                         var hr = Native.CoAllowSetForegroundWindow(intPtr);
                         if (hr != 0)
                         {
-                            Log_FailureToGiveForegroundRights(hr);
+                            Logger.LogWarning($"Error giving foreground rights: 0x{hr.Value:X8}");
                         }
                     }
                 }
                 catch (Exception ex)
                 {
-                    Log_ErrorSettingActiveExtension(ex);
+                    ManagedCommon.Logger.LogError(ex.ToString());
                 }
             }
         }
@@ -142,13 +141,4 @@ internal sealed partial class PowerToysRootPageService : IRootPageService
         [SupportedOSPlatform("windows5.0")]
         internal static extern unsafe global::Windows.Win32.Foundation.HRESULT CoAllowSetForegroundWindow(nint pUnk, [Optional] void* lpvReserved);
     }
-
-    [LoggerMessage(Level = LogLevel.Error)]
-    partial void Log_ErrorSettingActiveExtension(Exception ex);
-
-    [LoggerMessage(Level = LogLevel.Error, Message = "Failed to update history in PowerToysRootPageService")]
-    partial void Log_ErrorUpdatingHistory(Exception ex);
-
-    [LoggerMessage(Level = LogLevel.Warning, Message = "Error giving foreground rights: 0x{hr.Value:X8}")]
-    partial void Log_FailureToGiveForegroundRights(global::Windows.Win32.Foundation.HRESULT hr);
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/Program.cs

@@ -2,26 +2,26 @@
 // 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.Runtime.InteropServices;
+using ManagedCommon;
 using Microsoft.CmdPal.UI.Events;
-using Microsoft.CmdPal.UI.Services;
-using Microsoft.Extensions.Logging;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI.Dispatching;
 using Microsoft.Windows.AppLifecycle;
 using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.System.Com;
+using Windows.Win32.UI.WindowsAndMessaging;
 
 namespace Microsoft.CmdPal.UI;
 
 // cribbed heavily from
 //
 // https://github.com/microsoft/WindowsAppSDK-Samples/tree/main/Samples/AppLifecycle/Instancing/cs2/cs-winui-packaged/CsWinUiDesktopInstancing
-internal sealed partial class Program
+internal sealed class Program
 {
     private static DispatcherQueueSynchronizationContext? uiContext;
     private static App? app;
-    private static ILogger logger = new LogWrapper();
 
     // LOAD BEARING
     //
@@ -37,7 +37,34 @@ internal sealed partial class Program
             return 0;
         }
 
-        Log_StartingAt(logger, DateTime.UtcNow);
+        try
+        {
+            Logger.InitializeLogger("\\CmdPal\\Logs\\");
+        }
+        catch (COMException e)
+        {
+            // This is unexpected. For the sake of debugging:
+            // pop a message box
+            PInvoke.MessageBox(
+                (HWND)IntPtr.Zero,
+                $"Failed to initialize the logger. COMException: \r{e.Message}",
+                "Command Palette",
+                MESSAGEBOX_STYLE.MB_OK | MESSAGEBOX_STYLE.MB_ICONERROR);
+            return 0;
+        }
+        catch (Exception e2)
+        {
+            // This is unexpected. For the sake of debugging:
+            // pop a message box
+            PInvoke.MessageBox(
+                (HWND)IntPtr.Zero,
+                $"Failed to initialize the logger. Unknown Exception: \r{e2.Message}",
+                "Command Palette",
+                MESSAGEBOX_STYLE.MB_OK | MESSAGEBOX_STYLE.MB_ICONERROR);
+            return 0;
+        }
+
+        Logger.LogDebug($"Starting at {DateTime.UtcNow}");
         PowerToysTelemetry.Log.WriteEvent(new CmdPalProcessStarted());
 
         WinRT.ComWrappersSupport.InitializeComWrappers();
@@ -48,7 +75,7 @@ internal sealed partial class Program
             {
                 uiContext = new DispatcherQueueSynchronizationContext(DispatcherQueue.GetForCurrentThread());
                 SynchronizationContext.SetSynchronizationContext(uiContext);
-                app = new App(logger);
+                app = new App();
             });
         }
 
@@ -95,11 +122,11 @@ internal sealed partial class Program
             }
             catch (OperationCanceledException)
             {
-                Log_FailedToActivate(logger, redirectTimeout);
+                Logger.LogError($"Failed to activate existing instance; timed out after {redirectTimeout}.");
             }
             catch (Exception ex)
             {
-                Log_ActivateError(logger, ex);
+                Logger.LogError("Failed to activate existing instance", ex);
             }
             finally
             {
@@ -128,13 +155,4 @@ internal sealed partial class Program
             mainWindow.HandleLaunchNonUI(args);
         }
     }
-
-    [LoggerMessage(Level = LogLevel.Debug, Message = "Starting at {UtcNow}.")]
-    private static partial void Log_StartingAt(ILogger logger, DateTime utcNow);
-
-    [LoggerMessage(Level = LogLevel.Error, Message = "Failed to activate existing instance; timed out after {RedirectTimeout}.")]
-    private static partial void Log_FailedToActivate(ILogger logger, TimeSpan redirectTimeout);
-
-    [LoggerMessage(Level = LogLevel.Error, Message = "Failed to activate existing instance")]
-    private static partial void Log_ActivateError(ILogger logger, Exception ex);
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml

@@ -51,18 +51,8 @@
                             </controls:SettingsCard>
                         </controls:SettingsExpander.Items>
                     </controls:SettingsExpander>
-                    <controls:SettingsCard x:Uid="Settings_GeneralPage_AutoGoHome_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE80F;}">
-                        <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind viewModel.AutoGoBackIntervalIndex, Mode=TwoWay}">
-                            <ComboBoxItem x:Uid="Settings_GeneralPage_AutoGoHome_Item_Never" />
-                            <ComboBoxItem x:Uid="Settings_GeneralPage_AutoGoHome_Item_Immediately" />
-                            <ComboBoxItem x:Uid="Settings_GeneralPage_AutoGoHome_Item_After10Seconds" />
-                            <ComboBoxItem x:Uid="Settings_GeneralPage_AutoGoHome_Item_After20Seconds" />
-                            <ComboBoxItem x:Uid="Settings_GeneralPage_AutoGoHome_Item_After30Seconds" />
-                            <ComboBoxItem x:Uid="Settings_GeneralPage_AutoGoHome_Item_After60Seconds" />
-                            <ComboBoxItem x:Uid="Settings_GeneralPage_AutoGoHome_Item_After90Seconds" />
-                            <ComboBoxItem x:Uid="Settings_GeneralPage_AutoGoHome_Item_After120Seconds" />
-                            <ComboBoxItem x:Uid="Settings_GeneralPage_AutoGoHome_Item_After180Seconds" />
-                        </ComboBox>
+                    <controls:SettingsCard x:Uid="Settings_GeneralPage_GoHome_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE80F;}">
+                        <ToggleSwitch IsOn="{x:Bind viewModel.HotkeyGoesHome, Mode=TwoWay}" />
                     </controls:SettingsCard>
                     <controls:SettingsCard x:Uid="Settings_GeneralPage_HighlightSearch_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE933;}">
                         <ToggleSwitch IsOn="{x:Bind viewModel.HighlightSearchOnActivate, Mode=TwoWay}" />

src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw

@@ -344,6 +344,12 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="Settings_GeneralPage_IgnoreShortcutWhenFullscreen_SettingsCard.Description" xml:space="preserve">
     <value>Preventing disruption of the program running in fullscreen by unintentional activation of shortcut</value>
   </data>
+  <data name="Settings_GeneralPage_GoHome_SettingsCard.Header" xml:space="preserve">
+    <value>Go home when activated</value>
+  </data>
+  <data name="Settings_GeneralPage_GoHome_SettingsCard.Description" xml:space="preserve">
+    <value>Automatically opens the home page upon activation</value>
+  </data>
   <data name="Settings_GeneralPage_HighlightSearch_SettingsCard.Header" xml:space="preserve">
     <value>Highlight search on activate</value>
   </data>
@@ -517,37 +523,4 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="GlobalErrorHandler_CrashMessageBox_Caption" xml:space="preserve">
     <value>Command Palette - Fatal error</value>
   </data>
-  <data name="Settings_GeneralPage_AutoGoHome_Item_Never.Content" xml:space="preserve">
-    <value>Never</value>
-  </data>
-  <data name="Settings_GeneralPage_AutoGoHome_Item_Immediately.Content" xml:space="preserve">
-    <value>Immediately</value>
-  </data>
-  <data name="Settings_GeneralPage_AutoGoHome_Item_After10Seconds.Content" xml:space="preserve">
-    <value>10 seconds</value>
-  </data>
-  <data name="Settings_GeneralPage_AutoGoHome_Item_After20Seconds.Content" xml:space="preserve">
-    <value>20 seconds</value>
-  </data>
-  <data name="Settings_GeneralPage_AutoGoHome_Item_After30Seconds.Content" xml:space="preserve">
-    <value>30 seconds</value>
-  </data>
-  <data name="Settings_GeneralPage_AutoGoHome_Item_After60Seconds.Content" xml:space="preserve">
-    <value>60 seconds</value>
-  </data>
-  <data name="Settings_GeneralPage_AutoGoHome_Item_After90Seconds.Content" xml:space="preserve">
-    <value>90 seconds</value>
-  </data>
-  <data name="Settings_GeneralPage_AutoGoHome_Item_After120Seconds.Content" xml:space="preserve">
-    <value>2 minutes</value>
-  </data>
-  <data name="Settings_GeneralPage_AutoGoHome_Item_After180Seconds.Content" xml:space="preserve">
-    <value>3 minutes</value>
-  </data>
-  <data name="Settings_GeneralPage_AutoGoHome_SettingsCard.Header" xml:space="preserve">
-    <value>Automatically return home</value>
-  </data>
-  <data name="Settings_GeneralPage_AutoGoHome_SettingsCard.Description" xml:space="preserve">
-    <value>Automatically returns to home page after a period of inactivity when Command Palette is closed</value>
-  </data>
 </root>

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

@@ -4,7 +4,7 @@
 
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.WinUI;
-
+using ManagedCommon;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.UI.Helpers;
 using Microsoft.CmdPal.UI.ViewModels.Messages;
@@ -12,6 +12,9 @@ using Microsoft.UI.Dispatching;
 using Microsoft.UI.Windowing;
 using Windows.Win32;
 using Windows.Win32.Foundation;
+using Windows.Win32.Graphics.Dwm;
+using Windows.Win32.Graphics.Gdi;
+using Windows.Win32.UI.HiDpi;
 using Windows.Win32.UI.WindowsAndMessaging;
 using WinUIEx;
 using RS_ = Microsoft.CmdPal.UI.Helpers.ResourceLoaderInstance;
@@ -21,7 +24,6 @@ namespace Microsoft.CmdPal.UI;
 public sealed partial class ToastWindow : WindowEx,
     IRecipient<QuitMessage>
 {
-    // private readonly ILogger logger = App.Current.Services.GetRequiredService<ILogger>();
     private readonly HWND _hwnd;
     private readonly DispatcherQueueTimer _debounceTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
     private readonly HiddenOwnerWindowBehavior _hiddenOwnerWindowBehavior = new();
@@ -45,20 +47,21 @@ public sealed partial class ToastWindow : WindowEx,
         WeakReferenceMessenger.Default.Register<QuitMessage>(this);
     }
 
-    // private static double GetScaleFactor(HWND hwnd)
-    // {
-    //    try
-    //    {
-    //        var monitor = PInvoke.MonitorFromWindow(hwnd, MONITOR_FROM_FLAGS.MONITOR_DEFAULTTONEAREST);
-    //        _ = PInvoke.GetDpiForMonitor(monitor, MONITOR_DPI_TYPE.MDT_EFFECTIVE_DPI, out var dpiX, out _);
-    //        return dpiX / 96.0;
-    //    }
-    //    catch (Exception ex)
-    //    {
-    //        Log_FailedToGetScaleFactor(ex);
-    //        return 1.0;
-    //    }
-    // }
+    private static double GetScaleFactor(HWND hwnd)
+    {
+        try
+        {
+            var monitor = PInvoke.MonitorFromWindow(hwnd, MONITOR_FROM_FLAGS.MONITOR_DEFAULTTONEAREST);
+            _ = PInvoke.GetDpiForMonitor(monitor, MONITOR_DPI_TYPE.MDT_EFFECTIVE_DPI, out var dpiX, out _);
+            return dpiX / 96.0;
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError($"Failed to get scale factor, error: {ex.Message}");
+            return 1.0;
+        }
+    }
+
     private void PositionCentered()
     {
         this.SetWindowSize(ToastText.ActualWidth, ToastText.ActualHeight);
@@ -103,7 +106,4 @@ public sealed partial class ToastWindow : WindowEx,
         // This might come in on a background thread
         DispatcherQueue.TryEnqueue(() => Close());
     }
-
-    // [LoggerMessage(Level = LogLevel.Warning, Message = "Failed to get scale factor")]
-    // static partial void Log_FailedToGetScaleFactor(Exception ex);
 }

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

@@ -1,199 +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.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Text.RegularExpressions;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-
-using Microsoft.CmdPal.UI.Helpers;
-using Microsoft.CmdPal.UI.Services;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.UI;
-using Windows.System;
-using Windows.UI;
-using DispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue;
-
-namespace Microsoft.CmdPal.UI.ViewModels;
-
-internal sealed partial class DevRibbonViewModel : ObservableObject
-{
-    private readonly LogWrapper logger;
-
-    private const int MaxLogEntries = 2;
-    private const string Release = "Release";
-    private const string Debug = "Debug";
-
-    private static readonly Color ReleaseAotColor = ColorHelper.FromArgb(255, 124, 58, 237);
-    private static readonly Color ReleaseColor = ColorHelper.FromArgb(255, 51, 65, 85);
-    private static readonly Color DebugAotColor = ColorHelper.FromArgb(255, 99, 102, 241);
-    private static readonly Color DebugColor = ColorHelper.FromArgb(255, 107, 114, 128);
-
-    private readonly DispatcherQueue _dispatcherQueue;
-
-    public DevRibbonViewModel()
-    {
-        logger = (LogWrapper)App.Current.Services.GetRequiredService<ILogger>();
-        _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
-        Trace.Listeners.Add(new DevRibbonTraceListener(this));
-
-        var configLabel = BuildConfiguration == Release ? "RLS" : "DBG"; /* #no-spell-check-line */
-        var aotLabel = BuildInfo.IsNativeAot ? "⚡AOT" : "NO AOT";
-        Tag = $"{configLabel} | {aotLabel}";
-
-        TagColor = (BuildConfiguration, BuildInfo.IsNativeAot) switch
-        {
-            (Release, true) => ReleaseAotColor,
-            (Release, false) => ReleaseColor,
-            (Debug, true) => DebugAotColor,
-            (Debug, false) => DebugColor,
-            _ => Colors.Fuchsia,
-        };
-    }
-
-    public string BuildConfiguration => BuildInfo.Configuration;
-
-    public bool IsAotReleaseConfiguration => BuildConfiguration == Release && BuildInfo.IsNativeAot;
-
-    public bool IsAot => BuildInfo.IsNativeAot;
-
-    public bool IsPublishTrimmed => BuildInfo.PublishTrimmed;
-
-    public ObservableCollection<LogEntryViewModel> LatestLogs { get; } = [];
-
-    [ObservableProperty]
-    public partial int WarningCount { get; private set; }
-
-    [ObservableProperty]
-    public partial int ErrorCount { get; private set; }
-
-    [ObservableProperty]
-    public partial string Tag { get; private set; }
-
-    [ObservableProperty]
-    public partial Color TagColor { get; private set; }
-
-    [RelayCommand]
-    private async Task OpenLogFileAsync()
-    {
-        var logPath = logger.CurrentLogFile;
-        if (File.Exists(logPath))
-        {
-            await Launcher.LaunchUriAsync(new Uri(logPath));
-        }
-    }
-
-    [RelayCommand]
-    private async Task OpenLogFolderAsync()
-    {
-        var logFolderPath = logger.CurrentVersionLogDirectoryPath;
-        if (Directory.Exists(logFolderPath))
-        {
-            await Launcher.LaunchFolderPathAsync(logFolderPath);
-        }
-    }
-
-    [RelayCommand]
-    private void ResetErrorCounters()
-    {
-        WarningCount = 0;
-        ErrorCount = 0;
-        LatestLogs.Clear();
-    }
-
-    private sealed partial class DevRibbonTraceListener(DevRibbonViewModel viewModel) : TraceListener
-    {
-        private const string TimestampFormat = "yyyy-MM-dd HH:mm:ss.fff";
-
-        [GeneratedRegex(@"^\[(?<timestamp>.*?)\] \[(?<severity>.*?)\] (?<message>.*)")]
-        private static partial Regex LogRegex();
-
-        private readonly Lock _lock = new();
-        private LogEntryViewModel? _latestLogEntry;
-
-        public override void Write(string? message)
-        {
-            // Not required for this scenario.
-        }
-
-        public override void WriteLine(string? message)
-        {
-            if (message is null)
-            {
-                return;
-            }
-
-            lock (_lock)
-            {
-                var match = LogRegex().Match(message);
-                if (match.Success)
-                {
-                    var severity = match.Groups["severity"].Value;
-                    var isWarning = severity.Equals("Warning", StringComparison.OrdinalIgnoreCase);
-                    var isError = severity.Equals("Error", StringComparison.OrdinalIgnoreCase);
-
-                    if (isWarning || isError)
-                    {
-                        var timestampStr = match.Groups["timestamp"].Value;
-                        var timestamp = DateTimeOffset.TryParseExact(
-                            timestampStr,
-                            TimestampFormat,
-                            CultureInfo.InvariantCulture,
-                            DateTimeStyles.AssumeLocal,
-                            out var parsed)
-                            ? parsed
-                            : DateTimeOffset.Now;
-
-                        var logEntry = new LogEntryViewModel(
-                            timestamp,
-                            severity,
-                            match.Groups["message"].Value,
-                            string.Empty);
-
-                        _latestLogEntry = logEntry;
-
-                        viewModel._dispatcherQueue.TryEnqueue(() =>
-                        {
-                            if (isWarning)
-                            {
-                                viewModel.WarningCount++;
-                            }
-                            else
-                            {
-                                viewModel.ErrorCount++;
-                            }
-
-                            viewModel.LatestLogs.Insert(0, logEntry);
-
-                            while (viewModel.LatestLogs.Count > MaxLogEntries)
-                            {
-                                viewModel.LatestLogs.RemoveAt(viewModel.LatestLogs.Count - 1);
-                            }
-                        });
-                    }
-                    else
-                    {
-                        _latestLogEntry = null;
-                    }
-
-                    return;
-                }
-
-                if (IndentLevel > 0 && _latestLogEntry is { } latest)
-                {
-                    viewModel._dispatcherQueue.TryEnqueue(() =>
-                    {
-                        latest.AppendDetails(message);
-                    });
-                }
-            }
-        }
-    }
-
-    [LoggerMessage(level: LogLevel.Information, Message = "DevRibbonViewModel initialized.")]
-    public partial void LogInitialized();
-}

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

@@ -1,77 +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.Globalization;
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace Microsoft.CmdPal.UI.ViewModels;
-
-internal sealed partial class LogEntryViewModel : ObservableObject
-{
-    private const int HeaderMaxLength = 80;
-    private const string WarningGlyph = "\uE7BA";
-    private const string ErrorGlyph = "\uEA39";
-    private const string TimestampFormat = "HH:mm:ss";
-
-    private DateTimeOffset Timestamp { get; }
-
-    private string Severity { get; }
-
-    private string Message { get; }
-
-    private string FormattedTimestamp { get; }
-
-    public string SeverityGlyph { get; }
-
-    [ObservableProperty]
-    public partial string Header { get; private set; }
-
-    [ObservableProperty]
-    public partial string Description { get; private set; }
-
-    [ObservableProperty]
-    public partial string Details { get; private set; }
-
-    public LogEntryViewModel(DateTimeOffset timestamp, string severity, string message, string details)
-    {
-        Timestamp = timestamp;
-        Severity = severity;
-        Message = message;
-        Details = details;
-
-        SeverityGlyph = severity.ToUpperInvariant() switch
-        {
-            "WARNING" => WarningGlyph,
-            "ERROR" => ErrorGlyph,
-            _ => string.Empty,
-        };
-
-        FormattedTimestamp = timestamp.ToString(TimestampFormat, CultureInfo.CurrentCulture);
-        Description = $"{FormattedTimestamp} • {Message}";
-        Header = Message;
-    }
-
-    public void AppendDetails(string? message)
-    {
-        if (string.IsNullOrEmpty(message))
-        {
-            return;
-        }
-
-        Details += Environment.NewLine + message;
-
-        // Make header the second line of details (because that's actually the message itself):
-        var detailsLines = Details.Split([Environment.NewLine], StringSplitOptions.None);
-        if (detailsLines.Length < 2)
-        {
-            return;
-        }
-
-        Header = detailsLines[1].Trim();
-        if (Header.Length > HeaderMaxLength)
-        {
-            Header = Header[..(HeaderMaxLength - 1)] + "…";
-        }
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/FallbackRemoteDesktopItemTests.cs

@@ -1,125 +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.Globalization;
-using System.Reflection;
-using System.Text;
-using Microsoft.CmdPal.Ext.RemoteDesktop.Commands;
-using Microsoft.CmdPal.Ext.RemoteDesktop.Helper;
-using Microsoft.CmdPal.Ext.RemoteDesktop.Properties;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests;
-
-[TestClass]
-public class FallbackRemoteDesktopItemTests
-{
-    private static readonly CompositeFormat OpenHostCompositeFormat = CompositeFormat.Parse(Resources.remotedesktop_open_host);
-
-    [TestMethod]
-    public void UpdateQuery_WhenMatchingConnectionExists_UsesConnectionName()
-    {
-        var connectionName = "my-rdp-server";
-
-        // Arrange
-        var setup = CreateFallback(connectionName);
-        var fallback = setup.Fallback;
-
-        // Act
-        fallback.UpdateQuery("my-rdp-server");
-
-        // Assert
-        Assert.AreEqual(connectionName, fallback.Title);
-        var expectedSubtitle = string.Format(CultureInfo.CurrentCulture, OpenHostCompositeFormat, connectionName);
-        Assert.AreEqual(expectedSubtitle, fallback.Subtitle);
-
-        var command = fallback.Command as OpenRemoteDesktopCommand;
-        Assert.IsNotNull(command);
-        Assert.AreEqual(Resources.remotedesktop_command_connect, command.Name);
-        Assert.AreEqual(connectionName, GetCommandHost(command));
-    }
-
-    [TestMethod]
-    public void UpdateQuery_WhenQueryIsValidHostWithoutExistingConnection_UsesQuery()
-    {
-        // Arrange
-        var setup = CreateFallback();
-        var fallback = setup.Fallback;
-        const string hostname = "test.corp";
-
-        // Act
-        fallback.UpdateQuery(hostname);
-
-        // Assert
-        var expectedTitle = string.Format(CultureInfo.CurrentCulture, OpenHostCompositeFormat, hostname);
-        Assert.AreEqual(expectedTitle, fallback.Title);
-        Assert.AreEqual(Resources.remotedesktop_title, fallback.Subtitle);
-
-        var command = fallback.Command as OpenRemoteDesktopCommand;
-        Assert.IsNotNull(command);
-        Assert.AreEqual(Resources.remotedesktop_command_connect, command.Name);
-        Assert.AreEqual(hostname, GetCommandHost(command));
-    }
-
-    [TestMethod]
-    public void UpdateQuery_WhenQueryIsWhitespace_ResetsCommand()
-    {
-        // Arrange
-        var setup = CreateFallback("rdp-server-two");
-        var fallback = setup.Fallback;
-
-        // Act
-        fallback.UpdateQuery("   ");
-
-        // Assert
-        Assert.AreEqual(Resources.remotedesktop_command_open, fallback.Title);
-        Assert.AreEqual(string.Empty, fallback.Subtitle);
-
-        var command = fallback.Command as OpenRemoteDesktopCommand;
-        Assert.IsNotNull(command);
-        Assert.AreEqual(Resources.remotedesktop_command_open, command.Name);
-        Assert.AreEqual(string.Empty, GetCommandHost(command));
-    }
-
-    [TestMethod]
-    public void UpdateQuery_WhenQueryIsInvalidHost_ClearsCommand()
-    {
-        // Arrange
-        var setup = CreateFallback("rdp-server-three");
-        var fallback = setup.Fallback;
-
-        // Act
-        fallback.UpdateQuery("not a valid host");
-
-        // Assert
-        Assert.AreEqual(Resources.remotedesktop_command_open, fallback.Title);
-        Assert.AreEqual(string.Empty, fallback.Subtitle);
-
-        var command = fallback.Command as OpenRemoteDesktopCommand;
-        Assert.IsNotNull(command);
-        Assert.AreEqual(Resources.remotedesktop_command_open, command.Name);
-        Assert.AreEqual(string.Empty, GetCommandHost(command));
-    }
-
-    private static string GetCommandHost(OpenRemoteDesktopCommand command)
-    {
-        var field = typeof(OpenRemoteDesktopCommand).GetField("_rdpHost", BindingFlags.NonPublic | BindingFlags.Instance);
-        if (field is null)
-        {
-            return string.Empty;
-        }
-
-        return field.GetValue(command) as string ?? string.Empty;
-    }
-
-    private static (FallbackRemoteDesktopItem Fallback, IRdpConnectionsManager Manager) CreateFallback(params string[] connectionNames)
-    {
-        var settingsManager = new MockSettingsManager(connectionNames);
-        var connectionsManager = new MockRdpConnectionsManager(settingsManager);
-
-        var fallback = new FallbackRemoteDesktopItem(connectionsManager);
-
-        return (fallback, connectionsManager);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests.csproj

@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- Look at Directory.Build.props in root for common stuff as well -->
-  <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-    <RootNamespace>Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests</RootNamespace>
-    <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal\tests\</OutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-	<Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Moq" />
-    <PackageReference Include="MSTest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\ext\Microsoft.CmdPal.Ext.RemoteDesktop\Microsoft.CmdPal.Ext.RemoteDesktop.csproj" />
-    <ProjectReference Include="..\Microsoft.CmdPal.Ext.UnitTestsBase\Microsoft.CmdPal.Ext.UnitTestBase.csproj" />
-  </ItemGroup>
-</Project>

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/MockRdpConnectionsManager.cs

@@ -1,23 +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.Collections.Generic;
-using System.Linq;
-using Microsoft.CmdPal.Ext.RemoteDesktop.Commands;
-using Microsoft.CmdPal.Ext.RemoteDesktop.Helper;
-using Microsoft.CmdPal.Ext.RemoteDesktop.Settings;
-
-namespace Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests;
-
-internal sealed class MockRdpConnectionsManager : IRdpConnectionsManager
-{
-    private readonly List<ConnectionListItem> _connections = new();
-
-    public IReadOnlyCollection<ConnectionListItem> Connections => _connections.AsReadOnly();
-
-    public MockRdpConnectionsManager(ISettingsInterface settingsManager)
-    {
-        _connections.AddRange(settingsManager.PredefinedConnections.Select(ConnectionHelpers.MapToResult));
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/MockSettingsManager.cs

@@ -1,23 +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.Collections.Generic;
-using Microsoft.CmdPal.Ext.RemoteDesktop.Settings;
-using ToolkitSettings = Microsoft.CommandPalette.Extensions.Toolkit.Settings;
-
-namespace Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests;
-
-internal sealed class MockSettingsManager : ISettingsInterface
-{
-    private readonly List<string> _connections;
-
-    public IReadOnlyCollection<string> PredefinedConnections => _connections;
-
-    public ToolkitSettings Settings { get; } = new();
-
-    public MockSettingsManager(params string[] predefinedConnections)
-    {
-        _connections = new(predefinedConnections);
-    }
-}

src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests/RdpConnectionsManagerTests.cs

@@ -1,52 +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.Linq;
-using Microsoft.CmdPal.Ext.RemoteDesktop.Commands;
-using Microsoft.CmdPal.Ext.RemoteDesktop.Helper;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.RemoteDesktop.UnitTests;
-
-[TestClass]
-public class RdpConnectionsManagerTests
-{
-    [TestMethod]
-    public void Constructor_AddsOpenCommandItem()
-    {
-        // Act
-        var manager = new RdpConnectionsManager(new MockSettingsManager(["test.local"]));
-
-        // Assert
-        Assert.IsTrue(manager.Connections.Any(item => string.IsNullOrEmpty(item.ConnectionName)));
-    }
-
-    [TestMethod]
-    public void FindConnection_ReturnsExactMatch()
-    {
-        // Arrange
-        var connectionName = "rdp-test";
-        var connection = new ConnectionListItem(connectionName);
-
-        // Act
-        var result = ConnectionHelpers.FindConnection(connectionName, new[] { connection });
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(connectionName, result.ConnectionName);
-    }
-
-    [TestMethod]
-    public void FindConnection_ReturnsNullForWhitespaceQuery()
-    {
-        // Arrange
-        var connection = new ConnectionListItem("rdp-test");
-
-        // Act
-        var result = ConnectionHelpers.FindConnection("   ", new[] { connection });
-
-        // Assert
-        Assert.IsNull(result);
-    }
-}