Add image annotation support with region notes and viewer tools

crates/ai/src/traits.rs

@@ -50,6 +50,7 @@ pub struct ReviewerCapabilities {
 /// What the agent panel asks of a model: does this row describe this image, and where doesn't it.
 ///
 /// `row_data` is the row as JSON — column name to value — so a provider needs no notion of grids.
+#[allow(clippy::double_must_use)]
 #[async_trait]
 pub trait DataReviewer: Send + Sync {
     async fn initialize(&self) -> Result<()>;

crates/app/src/assets.rs

@@ -1,15 +1,16 @@
 //! Our own icons in front of `gpui_component_assets`, which is otherwise the only asset source.
 //! The bundled icon set has no filled panel glyphs (the title bar's "this dock is open" state) and
 //! no picture glyph (visual search), and none of the pop-out viewer's window, pin or missing-file
-//! glyphs, nor the viewer's fit-to-width glyph, so those SVGs are ours, copied from Lucide.
+//! glyphs, nor the viewer's fit-to-width or annotation glyphs, so those SVGs are ours, copied from
+//! Lucide.
 
 use std::borrow::Cow;
 
 use gpui::{AssetSource, Result, SharedString};
 
 pub struct Assets;
 
-const OWN: [(&str, &str); 10] = [
+const OWN: [(&str, &str); 16] = [
     (
         "icons/history.svg",
         include_str!("../../../assets/icons/history.svg"),
@@ -50,6 +51,30 @@ const OWN: [(&str, &str); 10] = [
         "icons/move-horizontal.svg",
         include_str!("../../../assets/icons/move-horizontal.svg"),
     ),
+    (
+        "icons/square-pen.svg",
+        include_str!("../../../assets/icons/square-pen.svg"),
+    ),
+    (
+        "icons/mouse-pointer-2.svg",
+        include_str!("../../../assets/icons/mouse-pointer-2.svg"),
+    ),
+    (
+        "icons/rectangle.svg",
+        include_str!("../../../assets/icons/rectangle.svg"),
+    ),
+    (
+        "icons/map-pin.svg",
+        include_str!("../../../assets/icons/map-pin.svg"),
+    ),
+    (
+        "icons/message-square.svg",
+        include_str!("../../../assets/icons/message-square.svg"),
+    ),
+    (
+        "icons/pencil.svg",
+        include_str!("../../../assets/icons/pencil.svg"),
+    ),
 ];
 
 impl AssetSource for Assets {

crates/app/src/export.rs

@@ -398,6 +398,9 @@ fn sheet_notes(file: &Path, grid: &ExportGrid) -> anyhow::Result<Vec<SheetNote>>
             message: note.message,
             created_at: note.created_at,
             author: note.author,
+            id: Some(note.id),
+            region: note.region.and_then(|r| serde_json::to_string(&r).ok()),
+            kind: note.kind.map(|kind| kind.key().to_string()),
         })
         .collect::<Vec<_>>();
     Ok(qrate_export::sheet_notes(

crates/app/src/status_items/plugin_bar.rs

@@ -33,6 +33,43 @@ impl PluginBar {
             _sub: cx.observe_global::<BarContributions>(|_, cx| cx.notify()),
         }
     }
+
+    /// Menu equivalents of the bar contributions, using the same command dispatcher.
+    pub fn overflow_menu(
+        bar: Bar,
+        menu: PopupMenu,
+        window: &mut Window,
+        cx: &mut Context<PopupMenu>,
+    ) -> PopupMenu {
+        let items = [Side::Left, Side::Right]
+            .into_iter()
+            .flat_map(|side| BarContributions::at(bar, side, cx))
+            .collect::<Vec<_>>();
+        if items.is_empty() {
+            return menu;
+        }
+        menu.submenu("Plugin controls", window, cx, move |menu, window, cx| {
+            items.iter().cloned().fold(menu, |menu, (plugin, item)| {
+                let mut actions = Vec::new();
+                for action in [item.left, item.right].into_iter().flatten() {
+                    match action {
+                        BarAction::Command(command) => actions.push((item.text.clone(), command)),
+                        BarAction::Menu(commands) => actions.extend(commands),
+                    }
+                }
+                // One command may be exposed by both mouse buttons.
+                let mut seen = std::collections::HashSet::new();
+                actions.retain(|(_, command)| seen.insert(command.clone()));
+                if actions.is_empty() {
+                    menu.label(item.text)
+                } else {
+                    menu.submenu(item.text, window, cx, move |menu, _, _| {
+                        entries(plugin.clone(), actions.clone(), menu)
+                    })
+                }
+            })
+        })
+    }
 }
 
 /// Run one of a plugin's commands against whatever the table has selected. The command answers on

crates/app/src/title_items/mod.rs

@@ -1,12 +1,14 @@
 pub mod launcher_bar;
 mod update_notice;
 
+use std::rc::Rc;
+
 use gpui::*;
 use gpui_component::{
     ActiveTheme,
     dock::{DockArea, DockPlacement},
     h_flex,
-    menu::AppMenuBar,
+    menu::{AppMenuBar, PopupMenu, PopupMenuItem},
 };
 use plugin_api::{Bar, Side};
 
@@ -39,6 +41,56 @@ impl Render for FeedbackButton {
 /// are registered on the left by default. Right: generic open/close buttons for each dock.
 pub fn build_title_bar_registry(cx: &mut App, dock: WeakEntity<DockArea>) -> TitleBarRegistry {
     let mut registry = TitleBarRegistry::default();
+    let menu_dock = dock.clone();
+    registry.overflow_menu = Some(Rc::new(move |menu, window, cx, focus| {
+        let menus = gpui_component::GlobalState::global(cx).app_menus().to_vec();
+        let menu = menus.into_iter().fold(menu, |menu, app_menu| {
+            let focus = focus.clone();
+            let submenu = PopupMenu::build(window, cx, move |menu, window, cx| {
+                append_menu_items(menu, app_menu.items, window, cx, focus)
+            });
+            menu.item(PopupMenuItem::submenu(app_menu.name, submenu).disabled(app_menu.disabled))
+        });
+        let menu = PluginBar::overflow_menu(Bar::Title, menu, window, cx);
+        let dock = menu_dock.clone();
+        let dock_focus = focus.clone();
+        let menu = menu
+            .separator()
+            .item(PopupMenuItem::new("Feedback").on_click(|_, _, cx| {
+                cx.open_url(&crate::logging::feedback_url(cx, None));
+            }))
+            .submenu("Panels", window, cx, move |menu, _, cx| {
+                let menu = match &dock_focus {
+                    Some(focus) => menu.action_context(focus.clone()),
+                    None => menu,
+                };
+                [
+                    (
+                        "Left dock",
+                        DockPlacement::Left,
+                        Box::new(ToggleLeftDock) as Box<dyn Action>,
+                    ),
+                    (
+                        "Bottom dock",
+                        DockPlacement::Bottom,
+                        Box::new(ToggleBottomDock),
+                    ),
+                    (
+                        "Right dock",
+                        DockPlacement::Right,
+                        Box::new(ToggleRightDock),
+                    ),
+                ]
+                .into_iter()
+                .fold(menu, |menu, (label, placement, action)| {
+                    let open = dock
+                        .upgrade()
+                        .is_some_and(|dock| dock.read(cx).is_dock_open(placement));
+                    menu.menu_with_check(label, open, action)
+                })
+            });
+        update_notice::overflow_menu(menu, cx)
+    }));
 
     // The library's menu bar, not a row of independent dropdowns: it holds the "a menu is open"
     // state that makes hovering a sibling switch to it, and arrow keys walk between them.
@@ -89,3 +141,37 @@ pub fn build_title_bar_registry(cx: &mut App, dock: WeakEntity<DockArea>) -> Tit
 
     registry
 }
+
+/// Convert the same owned menus AppMenuBar reads, preserving action, check, and disabled state.
+fn append_menu_items(
+    mut menu: PopupMenu,
+    items: Vec<OwnedMenuItem>,
+    window: &mut Window,
+    cx: &mut Context<PopupMenu>,
+    focus: Option<FocusHandle>,
+) -> PopupMenu {
+    if let Some(focus) = &focus {
+        menu = menu.action_context(focus.clone());
+    }
+    for item in items {
+        menu = match item {
+            OwnedMenuItem::Action {
+                name,
+                action,
+                checked,
+                disabled,
+                ..
+            } => menu.menu_with_check_and_disabled(name, checked, action.boxed_clone(), disabled),
+            OwnedMenuItem::Separator => menu.separator(),
+            OwnedMenuItem::Submenu(submenu) => {
+                let focus = focus.clone();
+                let child = PopupMenu::build(window, cx, move |menu, window, cx| {
+                    append_menu_items(menu, submenu.items, window, cx, focus)
+                });
+                menu.item(PopupMenuItem::submenu(submenu.name, child).disabled(submenu.disabled))
+            }
+            OwnedMenuItem::SystemMenu(_) => menu,
+        };
+    }
+    menu.scrollable(true)
+}

crates/app/src/title_items/update_notice.rs

@@ -8,6 +8,48 @@ use gpui_component::{
 };
 
 use crate::update_check::{AutoUpdater, UpdateStatus};
+use gpui_component::menu::{PopupMenu, PopupMenuItem};
+
+pub(super) fn overflow_menu(menu: PopupMenu, cx: &mut Context<PopupMenu>) -> PopupMenu {
+    let Some(updater) = AutoUpdater::get(cx) else {
+        return menu;
+    };
+    if !updater.read(cx).visible() {
+        return menu;
+    }
+    let status = updater.read(cx).status().clone();
+    let menu = menu.separator();
+    let menu = match &status {
+        UpdateStatus::Downloading { version, .. } => menu.item(
+            PopupMenuItem::new(format!(
+                "Downloading qrate v{version}… {}%",
+                status.progress_percent().unwrap_or_default()
+            ))
+            .disabled(true),
+        ),
+        UpdateStatus::Ready { .. } => {
+            menu.item(PopupMenuItem::new("Restart to update").on_click(crate::restart_for_update))
+        }
+        UpdateStatus::Restarting => menu.item(PopupMenuItem::new("Restarting…").disabled(true)),
+        UpdateStatus::Error { .. } => menu.item(
+            PopupMenuItem::new("Update failed — open About")
+                .on_click(|_, _, cx| crate::about::open_about_window(cx)),
+        ),
+        _ => return menu,
+    };
+    if matches!(
+        status,
+        UpdateStatus::Ready { .. } | UpdateStatus::Error { .. }
+    ) {
+        menu.item(
+            PopupMenuItem::new("Dismiss update notice").on_click(move |_, _, cx| {
+                updater.update(cx, |updater, cx| updater.dismiss(cx));
+            }),
+        )
+    } else {
+        menu
+    }
+}
 
 pub struct UpdateNotice {
     updater: Option<Entity<AutoUpdater>>,

crates/diagnostics/Cargo.toml

@@ -8,6 +8,7 @@ log.workspace = true
 gpui.workspace = true
 gpui-component.workspace = true
 settings = { path = "../settings" }
+window-wrapper = { path = "../window-wrapper" }
 
 [dev-dependencies]
 # `#[gpui::test]`, TestAppContext, and run_test are all behind this feature.

crates/diagnostics/src/fixes.rs

@@ -404,7 +404,7 @@ mod tests {
                 source: Source::Validator(source.into()),
                 message: "not a known term".into(),
                 group: None,
-                filed: None,
+                note: None,
             }],
             cx,
         );
@@ -516,15 +516,15 @@ mod tests {
                     source: Source::Validator("LCSH".into()),
                     message: "not a known term".into(),
                     group: None,
-                    filed: None,
+                    note: None,
                 },
                 Diagnostic {
                     location: location("Subject"),
                     severity: Severity::Warning,
                     source: Source::Validator("LCSH".into()),
                     message: "also deprecated".into(),
                     group: None,
-                    filed: None,
+                    note: None,
                 },
             ];
             Diagnostics::set(