refactor: convert parameterless commands to CqrsRelayCommand<T> properties

- MainWindowViewModel: 5 [RelayCommand] methods → CqrsRelayCommand<bool> properties
  (CloseRequestDetails, OpenPreviewInBrowser, ToggleShowRawMarkdown, OpenAgentConfig, OpenPromptTemplates)
- ChatWindowViewModel: 2 [RelayCommand] methods → CqrsRelayCommand<ChatFileOpenResult>
  (OpenAgentConfig, OpenPromptTemplates)
- Added InitializeCqrsCommands() in MWVM called after Dispatcher is assigned
- Parameterized commands kept as [RelayCommand] (CqrsRelayCommand doesn't support AXAML params)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: sharpninja

src/McpServerManager.Core/ViewModels/ChatWindowViewModel.cs

@@ -5,6 +5,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using McpServer.Cqrs;
+using McpServer.Cqrs.Mvvm;
 using McpServerManager.Core.Commands;
 using McpServerManager.Core.Models;
 using McpServerManager.Core.Services;
@@ -38,6 +39,9 @@ public partial class ChatWindowViewModel : ViewModelBase
     [ObservableProperty]
     private ObservableCollection<PromptTemplate> _promptTemplates = new();
 
+    public CqrsRelayCommand<ChatFileOpenResult> OpenAgentConfigCommand { get; }
+    public CqrsRelayCommand<ChatFileOpenResult> OpenPromptTemplatesCommand { get; }
+
     public ChatWindowViewModel(
         McpServer.Cqrs.Dispatcher dispatcher,
         Func<string> getContext,
@@ -48,23 +52,14 @@ public ChatWindowViewModel(
         _getContext = getContext ?? (() => "");
         _initialModelFromConfig = initialModelFromConfig;
         _onModelChanged = onModelChanged;
+
+        OpenAgentConfigCommand = new CqrsRelayCommand<ChatFileOpenResult>(_dispatcher, () => new ChatOpenAgentConfigCommand());
+        OpenPromptTemplatesCommand = new CqrsRelayCommand<ChatFileOpenResult>(_dispatcher, () => new ChatOpenPromptTemplatesCommand());
     }
 
     /// <summary>Parameterless constructor for design-time only.</summary>
     public ChatWindowViewModel() : this(null!, () => "", null, null) { }
 
-    [RelayCommand]
-    private async Task OpenAgentConfig()
-    {
-        _ = await _dispatcher.SendAsync(new ChatOpenAgentConfigCommand()).ConfigureAwait(true);
-    }
-
-    [RelayCommand]
-    private async Task OpenPromptTemplates()
-    {
-        _ = await _dispatcher.SendAsync(new ChatOpenPromptTemplatesCommand()).ConfigureAwait(true);
-    }
-
     /// <summary>Loads prompt templates from agent config. Call when the chat window is opened.</summary>
     public void LoadPrompts() => _ = LoadPromptsAsync();
 

src/McpServerManager.Core/ViewModels/MainWindowViewModel.cs

@@ -19,6 +19,7 @@
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.Logging;
 using McpServer.Client;
+using McpServer.Cqrs.Mvvm;
 using McpServerManager.Core.Converters;
 using McpServerManager.Core.Models;
 using McpServerManager.Core.Models.Json;
@@ -81,6 +82,13 @@ public partial class MainWindowViewModel : ViewModelBase, Commands.ICommandTarge
     /// <summary>Raised when the active workspace path changes. Child VMs subscribe to refresh reactively.</summary>
     public event Action<string>? WorkspacePathChanged;
 
+    // ── CqrsRelayCommand properties (parameterless CQRS dispatches) ──
+    public CqrsRelayCommand<bool> CloseRequestDetailsCommand { get; private set; } = null!;
+    public CqrsRelayCommand<bool> OpenPreviewInBrowserCommand { get; private set; } = null!;
+    public CqrsRelayCommand<bool> ToggleShowRawMarkdownCommand { get; private set; } = null!;
+    public CqrsRelayCommand<bool> OpenAgentConfigCommand { get; private set; } = null!;
+    public CqrsRelayCommand<bool> OpenPromptTemplatesCommand { get; private set; } = null!;
+
     /// <summary>ViewModel for the Todo tab. Created lazily on first access.</summary>
     public TodoListViewModel TodoViewModel => _todoViewModel ??= CreateTodoViewModel();
     private TodoListViewModel? _todoViewModel;
@@ -442,6 +450,7 @@ private void InitializeMcpEndpoint(string mcpBaseUrl, string? initialApiKey = nu
                 ActiveWorkspacePath = _mcpClient.WorkspacePath ?? string.Empty
             });
         _dispatcher = _uiCoreRuntime.GetRequiredService<McpServer.Cqrs.Dispatcher>();
+        InitializeCqrsCommands();
 
         // Pre-populate the workspace picker with a placeholder.
         // No switch is triggered here — the real switch happens in LoadWorkspaceConnectionsAsync
@@ -471,6 +480,15 @@ private static string NormalizeMcpBaseUrl(string mcpBaseUrl)
         return uri.ToString().TrimEnd('/');
     }
 
+    private void InitializeCqrsCommands()
+    {
+        CloseRequestDetailsCommand = new CqrsRelayCommand<bool>(_dispatcher, () => new Commands.CloseRequestDetailsCommand());
+        OpenPreviewInBrowserCommand = new CqrsRelayCommand<bool>(_dispatcher, () => new Commands.OpenPreviewInBrowserCommand());
+        ToggleShowRawMarkdownCommand = new CqrsRelayCommand<bool>(_dispatcher, () => new Commands.ToggleShowRawMarkdownCommand());
+        OpenAgentConfigCommand = new CqrsRelayCommand<bool>(_dispatcher, () => new Commands.OpenAgentConfigCommand());
+        OpenPromptTemplatesCommand = new CqrsRelayCommand<bool>(_dispatcher, () => new Commands.OpenPromptTemplatesCommand());
+    }
+
     private void ApplyActiveMcpBaseUrl(string mcpBaseUrl, string? mcpApiKey = null, string? workspaceRootPath = null)
     {
         _activeMcpBaseUrl = NormalizeMcpBaseUrl(mcpBaseUrl);
@@ -1905,8 +1923,6 @@ public void SelectSearchEntryInternal(SearchableEntry entry)
             SelectedSearchEntry = entry;
     }
 
-    [RelayCommand]
-    private void CloseRequestDetails() => _ = _dispatcher.SendAsync(new Commands.CloseRequestDetailsCommand());
 
     public void CloseRequestDetailsInternal()
     {
@@ -2683,8 +2699,6 @@ private void OpenHtmlInDefaultBrowser(string htmlFilePath)
         }
     }
 
-    [RelayCommand]
-    private void OpenPreviewInBrowser() => _ = _dispatcher.SendAsync(new Commands.OpenPreviewInBrowserCommand());
 
     public void OpenPreviewInBrowserInternal()
     {
@@ -2696,25 +2710,19 @@ public void OpenPreviewInBrowserInternal()
         SetStatus("HTML preview is disabled.");
     }
 
-    [RelayCommand]
-    private void ToggleShowRawMarkdown() => _ = _dispatcher.SendAsync(new Commands.ToggleShowRawMarkdownCommand());
 
     public void ToggleShowRawMarkdownInternal()
     {
         ShowMarkdownAsRawText = !ShowMarkdownAsRawText;
     }
 
-    [RelayCommand]
-    private void OpenAgentConfig() => _ = _dispatcher.SendAsync(new Commands.OpenAgentConfigCommand());
 
     public void OpenAgentConfigInternal()
     {
         AgentConfigIo.EnsureExists();
         OpenFileInDefaultEditor(AgentConfigIo.GetFilePath(), "config");
     }
 
-    [RelayCommand]
-    private void OpenPromptTemplates() => _ = _dispatcher.SendAsync(new Commands.OpenPromptTemplatesCommand());
 
     public void OpenPromptTemplatesInternal()
     {