feat: update application name and enhance native menu structure

Author: lextm

src/ProjectRover/App.axaml

@@ -26,8 +26,11 @@
              xmlns:svg="clr-namespace:Avalonia.Svg.Skia;assembly=Avalonia.Svg.Skia"
              x:Class="ProjectRover.App"
              RequestedThemeVariant="Light"
-             Name="ProjectRover">
+             Name="Project Rover">
 
+    <NativeMenu.Menu>
+        <NativeMenu />
+    </NativeMenu.Menu>
     <Application.Styles>
         <FluentTheme />
         <dockThemes:DockFluentTheme />

src/ProjectRover/App.axaml.cs

@@ -55,6 +55,7 @@ public partial class App : Application
 
     public override void Initialize()
     {
+        Name = "Project Rover";
         AvaloniaXamlLoader.Load(this);
     }
 

src/ProjectRover/Controls/MainMenu.axaml.cs

@@ -738,6 +738,11 @@ static bool IsApiVisibilityMenuItem(MenuItem menuItem)
                 || string.Equals(menuItem.Tag as string, "ApiVisAll", StringComparison.Ordinal);
         }
 
+        static bool IsHelpMenuItem(MenuItem menuItem)
+        {
+            return string.Equals(menuItem.Tag as string, "_Help", StringComparison.Ordinal);
+        }
+
         static bool IsLanguageMenuItem(MenuItem menuItem)
         {
             var tag = menuItem.Tag as string;
@@ -980,8 +985,11 @@ void BuildNativeMenu(Menu mainMenu)
 
                 _nativeThemeMenuItems = new List<NativeMenuItem>();
 
-                var nativeRoot = new NativeMenu();
+                var windowMenu = new NativeMenu();
+                var appMenu = Application.Current != null ? NativeMenu.GetMenu(Application.Current) ?? new NativeMenu() : null;
+                appMenu?.Items.Clear();
                 var itemCount = 0;
+                MenuItem? helpMenu = null;
 
                 NativeMenuItem Convert(MenuItem m)
                 {
@@ -1004,6 +1012,15 @@ NativeMenuItem Convert(MenuItem m)
                         native.CommandParameter = m.CommandParameter;
                     }
 
+                    if (m.InputGesture != null)
+                    {
+                        native.Gesture = m.InputGesture;
+                    }
+                    else if (m.HotKey != null)
+                    {
+                        native.Gesture = m.HotKey;
+                    }
+
                     TryApplyNativeMenuIcon(native, m);
 
                     if (!suppressNativeToggle && m.ToggleType != MenuItemToggleType.None)
@@ -1091,34 +1108,51 @@ NativeMenuItem Convert(MenuItem m)
                 {
                     if (item is MenuItem mi)
                     {
-                        nativeRoot.Items.Add(Convert(mi));
+                        if (IsHelpMenuItem(mi))
+                        {
+                            helpMenu = mi;
+                            continue;
+                        }
+
+                        windowMenu.Items.Add(Convert(mi));
                     }
                 }
 
                 log.Debug("BuildNativeMenu: Converted {ItemCount} menu items total", itemCount);
 
-                // Insert an explicit application menu to avoid the platform/Avalonia
-                // falling back to a default menu (which can show "About Avalonia").
-                try
-                {
-                    var appName = Application.Current?.Name
-                                  ?? Assembly.GetEntryAssembly()?.GetName().Name
-                                  ?? "Project Rover";
-                    var appSub = new NativeMenu();
-                    // Optionally populate appSub with About/Preferences/Quit entries.
-                    var appMenuItem = new NativeMenuItem { Header = appName, Menu = appSub };
-                    nativeRoot.Items.Insert(0, appMenuItem);
-                    log.Debug("BuildNativeMenu: Inserted application menu '{AppName}' to override default app menu", appName);
-                }
-                catch (Exception ex)
+                // Fill the application menu with Help items (no extra "Project Rover" tier).
+                if (appMenu != null)
                 {
-                    log.Warning(ex, "BuildNativeMenu: Failed to insert application menu");
+                    try
+                    {
+                        if (helpMenu != null)
+                        {
+                            foreach (var child in helpMenu.Items)
+                            {
+                                switch (child)
+                                {
+                                    case Separator:
+                                        appMenu.Items.Add(new NativeMenuItemSeparator());
+                                        break;
+                                    case MenuItem childMi:
+                                        appMenu.Items.Add(Convert(childMi));
+                                        break;
+                                }
+                            }
+                        }
+
+                        log.Debug("BuildNativeMenu: Filled app menu with {Count} items", appMenu.Items.Count);
+                    }
+                    catch (Exception ex)
+                    {
+                        log.Warning(ex, "BuildNativeMenu: Failed to fill application menu");
+                    }
                 }
 
                 // Always set a fresh native menu; avoid reusing existing items to prevent parent conflicts.
                 // Some native backends may throw when attempting to update menus that are still
                 // referenced by the platform. Always clear existing menu first before setting new one.
-                void TrySetNativeMenu(AvaloniaObject target)
+                void TrySetNativeMenu(AvaloniaObject target, NativeMenu menu)
                 {
                     try
                     {
@@ -1137,7 +1171,7 @@ void TrySetNativeMenu(AvaloniaObject target)
                             }
                         }
 
-                        NativeMenu.SetMenu(target, nativeRoot);
+                        NativeMenu.SetMenu(target, menu);
                         log.Debug("BuildNativeMenu: Successfully set native menu on target");
                     }
                     catch (Exception ex)
@@ -1149,7 +1183,7 @@ void TrySetNativeMenu(AvaloniaObject target)
                             try
                             {
                                 log.Debug("BuildNativeMenu: Trying Application.Current as fallback");
-                                NativeMenu.SetMenu(Application.Current, nativeRoot);
+                                NativeMenu.SetMenu(Application.Current, menu);
                                 log.Debug("BuildNativeMenu: Fallback succeeded");
                             }
                             catch (Exception fallbackEx)
@@ -1160,10 +1194,12 @@ void TrySetNativeMenu(AvaloniaObject target)
                     }
                 }
 
-                // Set native menu only on the window (rootObj); setting on both window and
-                // Application.Current causes "menu does not match" errors on macOS
+                // Set window menu on the window and app menu on Application.Current.
                 if (rootObj != null)
-                    TrySetNativeMenu(rootObj);
+                    TrySetNativeMenu(rootObj, windowMenu);
+
+                if (Application.Current != null && appMenu != null)
+                    TrySetNativeMenu(Application.Current, appMenu);
 
                 log.Debug("BuildNativeMenu: Native menu set successfully");
                 MainMenuThemeHelpers.UpdateNativeThemeChecks(_nativeThemeMenuItems, settingsService?.SessionSettings?.Theme ?? ThemeManager.Current.Theme);