Merge branch 'worktree-agent-af1868dabbf03697e'

# Conflicts:
#	docs/parity.md

crates/engine/src/commands/frontend.rs

@@ -26,6 +26,9 @@ pub fn specs() -> Vec<CommandSpec> {
         ),
         fe!("app.gpuInfo", "GPU Information...", [], None, "{}", always),
         fe!("app.hide", "Hide EffectCraft", [], None, "{}", always),
+        // macOS: the native menu's Hide Others / Show All (the desktop app hides the other apps).
+        fe!("app.hideOthers", "Hide Others", [], None, "{}", always),
+        fe!("app.showAll", "Show All", [], None, "{}", always),
         fe!("app.quit", "Quit EffectCraft", [], Some("Cmd+Q"), "{}", always),
         fe!("app.commandPalette", "Quick Apply...", ["Edit"], Some("Cmd+Shift+Space"), "{query?}", always),
         fe!("app.keyboardShortcuts", "Keyboard Shortcuts", ["Edit"], Some("Cmd+Alt+'"), "{}", always),

crates/engine/src/commands/layer.rs

@@ -433,6 +433,20 @@ fn rename(s: &mut Session, p: &Value) -> Result<Value> {
     Ok(Value::Null)
 }
 
+/// The Timeline's Comment column.
+fn set_comment(s: &mut Session, p: &Value) -> Result<Value> {
+    let (cid, ids) = layers_p(s, p)?;
+    let text = str_p(p, "comment").ok_or_else(|| bad("layer.setComment", "missing `comment`"))?.to_string();
+    s.edit("Layer Comment", None, |proj, _| {
+        let comp = proj.comp_mut(cid).ok_or(EngineError::NoComp)?;
+        for l in comp.layers.iter_mut().filter(|l| ids.contains(&l.id)) {
+            l.comment = text.clone();
+        }
+        Ok(())
+    })?;
+    Ok(Value::Null)
+}
+
 fn blend(s: &mut Session, p: &Value) -> Result<Value> {
     let (cid, ids) = layers_p(s, p)?;
     let mode = str_p(p, "mode").and_then(BlendMode::from_name);
@@ -1073,6 +1087,7 @@ pub fn specs() -> Vec<CommandSpec> {
             set_switch
         ),
         cmd!("layer.rename", "Rename", [], Some("Enter"), "{layer?, name}", has_layers, rename),
+        cmd!("layer.setComment", "Layer Comment", [], None, "{layers?, comment}", has_layers, set_comment),
         cmd!("layer.setBlendMode", "Blending Mode", [], None, "{layers?, mode?: Normal|Multiply|Screen|…, step?: ±1}", has_layers, blend),
         cmd!(
             "layer.setTrackMatte",

crates/engine/src/commands/stubs.rs

@@ -17,9 +17,6 @@ macro_rules! stub {
 
 pub fn specs() -> Vec<CommandSpec> {
     vec![
-        // macOS application menu items handled by the OS.
-        stub!("app.hideOthers", "Hide Others", [], "{}"),
-        stub!("app.showAll", "Show All", [], "{}"),
         // Render queue / export (export milestone).
         stub!("file.createProxy", "Create Proxy", [], "{kind: still|movie}"),
         // Proxies (no proxy model yet).

crates/engine/src/menus.rs

@@ -17,7 +17,8 @@
 //!
 //! An entry's shortcut is the command's default shortcut unless the line gives one (needed for
 //! entries with bound parameters). Adobe-service entries (Team Projects, Libraries, Bridge, Media
-//! Encoder, Essential Graphics, Behance, Creative Cloud…) are intentionally absent.
+//! Encoder, Behance, Creative Cloud…) are intentionally absent; the Essential Graphics workspace
+//! uses the Properties panel.
 
 use std::sync::OnceLock;
 
@@ -909,16 +910,22 @@ View
   Enter Full Screen | view.fullScreen
 Window
   Workspace
+    Default | window.workspace {"name":"Default"} | Shift+F10
+    Review | window.workspace {"name":"Review"}
+    Learn | window.workspace {"name":"Learn"}
+    Small Screen | window.workspace {"name":"Small Screen"} | Shift+F12
+    Standard | window.workspace {"name":"Standard"} | Shift+F11
+    ---
     All Panels | window.workspace {"name":"All Panels"}
     Animation | window.workspace {"name":"Animation"}
-    Default | window.workspace {"name":"Default"} | Shift+F10
+    Color | window.workspace {"name":"Color"}
     Effects | window.workspace {"name":"Effects"}
+    Essential Graphics | window.workspace {"name":"Essential Graphics"}
     Minimal | window.workspace {"name":"Minimal"}
     Motion Tracking | window.workspace {"name":"Motion Tracking"}
     Paint | window.workspace {"name":"Paint"}
-    Small Screen | window.workspace {"name":"Small Screen"} | Shift+F12
-    Standard | window.workspace {"name":"Standard"} | Shift+F11
     Text | window.workspace {"name":"Text"}
+    Undocked Panels | window.workspace {"name":"Undocked Panels"}
     ---
     Reset to Saved Layout | window.resetWorkspace
     Save Changes to this Workspace | window.saveWorkspace

crates/engine/src/prefs.rs

@@ -115,6 +115,8 @@ page!(Appearance {
     use_label_color_for_tabs: bool = true,
     cycle_mask_colors: bool = true,
     use_gradients: bool = true,
+    /// macOS: draw the menu bar inside the window instead of the system menu bar.
+    in_window_menu_bar_mac: bool = false,
 });
 
 page!(Grids {
@@ -740,6 +742,8 @@ pub fn pages() -> Vec<Page> {
                 s("appearance.useLabelColorForTabs", "Use Label Color for Related Tabs", B, false),
                 s("appearance.cycleMaskColors", "Cycle Mask Colors", B, false),
                 s("appearance.useGradients", "Use Gradients", B, false),
+                Section("Menu Bar"),
+                s("appearance.inWindowMenuBarMac", "Use In-Window Menu Bar on macOS", B, true),
             ],
         },
         Page {