Implement fix for menus

Author: Jordonbc

Backend/src/core/ui.rs

@@ -5,6 +5,16 @@
 
 use serde::{Deserialize, Serialize};
 
+/// Menu surface target for rendering.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
+pub enum MenuSurface {
+    /// Menu appears in the main menubar.
+    Menubar,
+    /// Menu appears in the settings modal.
+    Settings,
+}
+
 /// Menu descriptor contributed by a plugin.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Menu {
@@ -15,6 +25,8 @@ pub struct Menu {
     /// Optional display ordering hint.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub order: Option<u32>,
+    /// Required render target surface ('menubar' or 'settings').
+    pub surface: MenuSurface,
     /// Renderable UI elements under the menu.
     pub elements: Vec<UiElement>,
 }

Backend/src/tauri_commands/plugins.rs

@@ -1,7 +1,7 @@
 // Copyright © 2025-2026 OpenVCS Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later
 use crate::core::settings::{SettingKv, SettingValue};
-use crate::core::ui::{Menu, UiElement};
+use crate::core::ui::{Menu, MenuSurface, UiElement};
 use crate::plugin_bundles::{InstalledPluginIndex, PluginBundleStore};
 use crate::plugin_runtime::instance::PluginRuntimeInstance;
 use crate::plugin_runtime::settings_store;
@@ -63,6 +63,8 @@ pub struct PluginMenuPayload {
     pub id: String,
     /// User-visible label.
     pub label: String,
+    /// Render target surface.
+    pub surface: MenuSurface,
     /// Renderable menu elements.
     pub elements: Vec<Value>,
 }
@@ -420,6 +422,7 @@ fn menu_to_payload(plugin_id: &str, menu: Menu) -> PluginMenuPayload {
         plugin_id: plugin_id.to_string(),
         id: menu.id,
         label: menu.label,
+        surface: menu.surface,
         elements,
     }
 }

Frontend/src/scripts/features/settings.ts

@@ -21,6 +21,7 @@ interface PluginMenuPayload {
     plugin_id: string;
     id: string;
     label: string;
+    surface: 'menubar' | 'settings';
     elements: Array<{
         type: 'text' | 'button' | string;
         id?: string;
@@ -300,6 +301,10 @@ async function renderPluginMenus(modal: HTMLElement): Promise<void> {
     };
 
     for (const menu of menus) {
+        // Only render settings-surface menus in the settings modal.
+        const surface = String(menu.surface || 'menubar').toLowerCase();
+        if (surface !== 'settings') continue;
+
         const section = pluginSectionId(menu.plugin_id, menu.id);
         const navLi = document.createElement('li');
         navLi.dataset.pluginMenu = 'true';

Frontend/src/scripts/ui/menubar.ts

@@ -11,6 +11,7 @@ interface PluginMenuPayload {
     plugin_id: string;
     id: string;
     label: string;
+    surface: 'menubar' | 'settings';
     elements: Array<{
         type: 'text' | 'button' | string;
         id?: string;
@@ -57,6 +58,10 @@ export async function refreshPluginMenubarMenus(): Promise<void> {
     }
 
     for (const menu of Array.isArray(menus) ? menus : []) {
+        // Only render menubar-surface menus in the menubar.
+        const surface = String(menu.surface || 'menubar').toLowerCase();
+        if (surface !== 'menubar') continue;
+
         const menuId = String(menu?.id || '').trim();
         const list = getMenuList(menuId);
         if (!menuId || !list) continue;

docs/plugin architecture.md

@@ -48,6 +48,13 @@ match built-in top-level menus such as `repository` are projected into the main
 menubar. For VCS backend plugins, these items therefore appear only after the
 repository-scoped runtime has started.
 
+Menu surfaces can be explicitly targeted using the `surface` option:
+
+- `getOrCreateMenu('repository', 'Repository', { surface: 'menubar' })` - renders in the top menubar
+- `getOrCreateMenu('my-settings', 'My Settings', { surface: 'settings' })` - renders in the Settings modal
+
+The `surface` option is required. Plugin authors must explicitly specify where their menus should appear.
+
 Core plugin-to-host notifications:
 
 - `host.log`