Merge the maintainer's merge of main (origin/feat/suggest-auto-layout-1823) into the local branch

2026-11-08 02:30:05 +00:00 · 2026-11-06 20:42:46 -05:00
parent dd8b8ffac5 55c6d214f5
commit 52ba2d31f9
21 changed files with 532 additions and 74 deletions
@@ -9,16 +9,20 @@
 //! interactions, accessibility annotations, Dev Mode resources and measurements) merge item by
 //! item: both sides changing different items of the list (or one adding items at its end) is no
 //! conflict, only the same item changed both ways or the list shortened on a side while the other
-//! changed it. Nothing that conflicts is merged until it is resolved: each conflict is resolved for
-//! one side, and the other side's changes to it are left out. Everything else from both sides is
-//! kept.
+//! changed it. Auto layout settings (a frame's and a child's) merge field by field: each field
+//! changed both ways is a conflict of its own, and the other fields merge. Values a file works out
+//! for itself (a size or place auto layout gives a layer, text sizing to its characters, a value a
+//! layer in an instance takes from its main component) never conflict: the merged file works them
+//! out again from what they follow. Nothing that conflicts is merged until it is resolved: each
+//! conflict is resolved for one side, and the other side's changes to it are left out. Everything
+//! else from both sides is kept.

 use std::collections::{BTreeMap, BTreeSet};
 use std::fmt;

-use figcraft_doc::{Document, NodeId};
+use figcraft_doc::{Document, Node, NodeId, NodeKind, Sizing, TextAutoResize};
 use serde::{Deserialize, Serialize};
-use serde_json::Value;
+use serde_json::{Map, Value};

 use crate::change::{Change, DocProp, Entry, Json, Prop};
 use crate::replica::{Mode, Positions, Replica, create_change};
@@ -33,6 +37,7 @@ pub enum Side {
 }

 impl Side {
+    /// The side that isn't `self`.
    pub fn other(self) -> Side {
        match self {
            Side::Branch => Side::Main,
@@ -48,6 +53,7 @@ impl Side {
        }
    }

+    /// The side `"branch"` or `"main"` names (`None` for anything else).
    pub fn parse(s: &str) -> Option<Side> {
        match s {
            "branch" => Some(Side::Branch),
@@ -62,6 +68,9 @@ impl Side {
 pub enum Key {
    /// A layer property. A layer's parent and position are one property (where it is).
    Node(NodeId, Prop),
+    /// One field of a layer property that merges field by field ([`PER_FIELD`]): `padding` of
+    /// `layout`, `sizing_h` of `childLayout`…
+    Field(NodeId, Prop, String),
    /// A layer deleted on one side and edited (it or what's inside it) on the other.
    Layer(NodeId),
    /// A document-level property.
@@ -78,11 +87,13 @@ fn camel<T: Serialize>(v: &T) -> String {
    }
 }

-/// `12/fills`, `12/layer`, `doc/styleOrder`, `style/S:3`, `comment/7`… (the keys resolutions use).
+/// `12/fills`, `12/layout.padding`, `12/layer`, `doc/styleOrder`, `style/S:3`, `comment/7`… (the
+/// keys resolutions use).
 impl fmt::Display for Key {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        match self {
            Key::Node(id, prop) => write!(f, "{id}/{}", camel(prop)),
+            Key::Field(id, prop, field) => write!(f, "{id}/{}.{field}", camel(prop)),
            Key::Layer(id) => write!(f, "{id}/layer"),
            Key::Doc(prop) => write!(f, "doc/{}", camel(prop)),
            Key::Entry(e) => match e {
@@ -129,10 +140,25 @@ pub struct Plan {
    /// The main file's changes since the base.
    pub main: Vec<Change>,
    pub conflicts: Vec<Conflict>,
+    /// Layer properties changed both ways to values both files work out for themselves
+    /// ([`computed`]): no conflict, and a merge leaves the file merged into its own value.
+    derived: BTreeSet<Key>,
+    /// Layer properties ([`Key::Node`]) merged field by field with fields in conflict.
+    fields: BTreeMap<Key, Fields>,
    branch_positions: Positions,
    main_positions: Positions,
 }

+/// A layer property merged field by field ([`merge_fields`]): the value with every field changed
+/// one way (or the same way on both sides) merged, and each side's values of the fields changed
+/// both ways (`Null` for a field a side left out).
+#[derive(Clone, Debug, Default, PartialEq)]
+struct Fields {
+    merged: Map<String, Value>,
+    branch: Map<String, Value>,
+    main: Map<String, Value>,
+}
+
 /// Document-level properties that belong to each copy, not to the work: the file name (a branch
 /// is named after itself) and the page it opens on.
 fn merges(c: &Change) -> bool {
@@ -152,6 +178,7 @@ fn key_of(c: &Change) -> Option<Key> {
    })
 }

+/// The changes (indexes) in `changes` grouped by what they write ([`key_of`]).
 fn by_key(changes: &[Change]) -> BTreeMap<Key, Vec<usize>> {
    let mut out: BTreeMap<Key, Vec<usize>> = BTreeMap::new();
    for (i, c) in changes.iter().enumerate() {
@@ -193,6 +220,108 @@ fn merged_list(base: &Document, key: &Key, b: Option<&Change>, m: Option<&Change
    merge_items(o.0.as_array()?, bv.0.as_array()?, mv.0.as_array()?).map(|v| Json(Value::Array(v)))
 }

+/// Layer properties whose fields merge one by one: auto layout settings, a frame's (`layout`) and
+/// a child's (`childLayout`). Changing the padding on one side and the gap on the other is no
+/// conflict, and each field changed both ways is a conflict of its own ([`Key::Field`]).
+const PER_FIELD: &[Prop] = &[Prop::Layout, Prop::ChildLayout];
+
+/// Three-way merge of object `o` changed to `b` on one side and `m` on the other, field by field:
+/// a field changed on one side takes that side's value, and one changed both ways (differently)
+/// is in conflict. `None` when any of them isn't an object (auto layout added or removed).
+fn merge_fields(o: &Value, b: &Value, m: &Value) -> Option<Fields> {
+    let (o, b, m) = (o.as_object()?, b.as_object()?, m.as_object()?);
+    let names: BTreeSet<&String> = o.keys().chain(b.keys()).chain(m.keys()).collect();
+    let mut out = Fields::default();
+    for name in names {
+        let (base, x, y) = (o.get(name), b.get(name), m.get(name));
+        let kept = if x == base {
+            y
+        } else if y == base || x == y {
+            x
+        } else {
+            out.branch.insert(name.clone(), x.cloned().unwrap_or(Value::Null));
+            out.main.insert(name.clone(), y.cloned().unwrap_or(Value::Null));
+            base
+        };
+        if let Some(v) = kept {
+            out.merged.insert(name.clone(), v.clone());
+        }
+    }
+    Some(out)
+}
+
+/// Both sides' writes `b` and `m` of property `key` (one of [`PER_FIELD`]) merged field by field
+/// against the base; `None` when `key` isn't such a property or a value isn't an object.
+fn merged_fields(base: &Document, key: &Key, b: Option<&Change>, m: Option<&Change>) -> Option<Fields> {
+    let Key::Node(id, prop) = key else { return None };
+    let (Some(Change::Set { value: bv, .. }), Some(Change::Set { value: mv, .. })) = (b, m) else { return None };
+    if !PER_FIELD.contains(prop) {
+        return None;
+    }
+    let o = prop.get(base.node(*id)?).ok()?;
+    merge_fields(&o.0, &bv.0, &mv.0)
+}
+
+/// Whether layer `n` of `doc` is placed by its parent's auto layout (not absolute).
+fn in_flow(doc: &Document, n: &Node) -> bool {
+    !n.child_layout.absolute && n.parent.and_then(|p| doc.node(p)).is_some_and(|p| p.layout.is_some())
+}
+
+/// Whether auto layout or text works out layer `n`'s width (`horizontal`) or height: an auto layout
+/// frame hugging its contents, a child filling its auto layout parent, or text sizing to its
+/// characters.
+fn sized_for_itself(doc: &Document, n: &Node, horizontal: bool) -> bool {
+    let sizing = if horizontal { n.child_layout.sizing_h } else { n.child_layout.sizing_v };
+    let by_layout = match sizing {
+        Sizing::Hug => n.layout.is_some(),
+        Sizing::Fill => in_flow(doc, n),
+        Sizing::Fixed => false,
+    };
+    let by_text = match &n.kind {
+        NodeKind::Text(t) => t.auto_resize == TextAutoResize::WidthAndHeight || (!horizontal && t.auto_resize == TextAutoResize::Height),
+        _ => false,
+    };
+    by_layout || by_text
+}
+
+/// Whether layer `n` of `doc` (an instance, or a layer inside one) has property `prop` as its main
+/// component's layer has it: it follows the main rather than overriding it.
+fn follows_main(doc: &Document, n: &Node, prop: Prop) -> bool {
+    let main = match &n.kind {
+        NodeKind::Instance { component, .. } => Some(*component),
+        _ => n.source,
+    };
+    Prop::FIELDS.contains(&prop) && main.and_then(|m| doc.node(m)).is_some_and(|m| !prop.differs(n, m))
+}
+
+/// Whether layer property `key` holds a value `doc` works out for itself rather than one set on
+/// the layer: a size auto layout or text gives it ([`sized_for_itself`]), its place in an auto
+/// layout parent, or a value it takes from its main component ([`follows_main`]).
+fn computed(doc: &Document, key: &Key) -> bool {
+    let Key::Node(id, prop) = key else { return false };
+    let Some(n) = doc.node(*id) else { return false };
+    let by_layout = match prop {
+        Prop::Width => sized_for_itself(doc, n, true),
+        Prop::Height => sized_for_itself(doc, n, false),
+        Prop::Transform => in_flow(doc, n),
+        _ => false,
+    };
+    by_layout || follows_main(doc, n, *prop)
+}
+
+/// Whether property `key`, changed both ways, is one both files work out for themselves
+/// ([`computed`]), so neither side's value is a choice to make. A place given by auto layout is
+/// only that when both sides also turn and scale the layer the same way (a rotation is set on the
+/// layer, not worked out).
+fn derived_on_both(branch: &Document, main: &Document, key: &Key) -> bool {
+    if !(computed(branch, key) && computed(main, key)) {
+        return false;
+    }
+    let Key::Node(id, Prop::Transform) = key else { return true };
+    let linear = |doc: &Document| doc.node(*id).map(|n| n.transform.as_coeffs()).map(|c| [c[0], c[1], c[2], c[3]]);
+    linear(branch) == linear(main)
+}
+
 /// The change at the only index in `c`.
 fn only<'a>(c: &[usize], all: &'a [Change]) -> Option<&'a Change> {
    match c {
@@ -265,6 +394,8 @@ pub fn plan(base: &Document, branch: &Document, main: &Document) -> Result<Plan,
    let mut mc: Vec<Change> = m.changes.into_iter().filter(merges).collect();
    let mut conflicts = Vec::new();
    let mut lists = Vec::new();
+    let mut derived = BTreeSet::new();
+    let mut fields = BTreeMap::new();
    let km = by_key(&mc);
    for (k, bi) in by_key(&bc) {
        // Deletions conflict with edits (below); images are content-addressed, so never differ.
@@ -279,13 +410,28 @@ pub fn plan(base: &Document, branch: &Document, main: &Document) -> Result<Plan,
        if same {
            continue;
        }
-        match merged_list(base, &k, only(&bi, &bc), only(mi, &mc)) {
-            Some(value) => lists.push((bi, mi.clone(), value)),
-            None => conflicts.push(Conflict { key: k, deleted_by: None, branch: bi, main: mi.clone() }),
+        if derived_on_both(branch, main, &k) {
+            derived.insert(k);
+            continue;
+        }
+        if let Some(value) = merged_list(base, &k, only(&bi, &bc), only(mi, &mc)) {
+            lists.push((bi, mi.clone(), value));
+            continue;
+        }
+        match (&k, merged_fields(base, &k, only(&bi, &bc), only(mi, &mc))) {
+            (_, Some(f)) if f.branch.is_empty() => lists.push((bi, mi.clone(), Json(Value::Object(f.merged)))),
+            (Key::Node(id, prop), Some(f)) => {
+                for name in f.branch.keys() {
+                    let key = Key::Field(*id, *prop, name.clone());
+                    conflicts.push(Conflict { key, deleted_by: None, branch: bi.clone(), main: mi.clone() });
+                }
+                fields.insert(k, f);
+            }
+            _ => conflicts.push(Conflict { key: k, deleted_by: None, branch: bi, main: mi.clone() }),
        }
    }
-    // Both sides' writes of a list merged item by item become the merged list, so merging either
-    // way writes it.
+    // Both sides' writes of a list merged item by item (or of auto layout settings merged field by
+    // field) become the merged value, so merging either way writes it.
    for (bi, mi, value) in lists {
        for (changes, at) in [(&mut bc, bi), (&mut mc, mi)] {
            for i in at {
@@ -313,6 +459,8 @@ pub fn plan(base: &Document, branch: &Document, main: &Document) -> Result<Plan,
        branch: bc,
        main: mc,
        conflicts,
+        derived,
+        fields,
        branch_positions: b.replica.positions().clone(),
        main_positions: m.replica.positions().clone(),
    })
@@ -332,6 +480,42 @@ impl Plan {
        }
    }

+    /// Layer properties both sides changed to values both files work out for themselves (a size or
+    /// place auto layout gives, a value an instance takes from its main): not conflicts, and
+    /// merging leaves the file merged into its own value for the merged file to work out again.
+    pub fn derived(&self) -> &BTreeSet<Key> {
+        &self.derived
+    }
+
+    /// The branch's and main's values of field conflict `key` ([`Key::Field`]); `None` for other
+    /// keys.
+    pub fn field_values(&self, key: &Key) -> Option<(&Value, &Value)> {
+        let Key::Field(id, prop, name) = key else { return None };
+        let f = self.fields.get(&Key::Node(*id, *prop))?;
+        Some((f.branch.get(name)?, f.main.get(name)?))
+    }
+
+    /// The side `pick` chose for each field in conflict of every property merged field by field,
+    /// written into the value merged from the other fields: the writes that replace both sides'
+    /// own writes of those properties.
+    fn field_writes(&self, pick: &dyn Fn(&Key) -> Option<Side>) -> Vec<Change> {
+        let mut out = Vec::new();
+        for (key, f) in &self.fields {
+            let Key::Node(id, prop) = key else { continue };
+            let mut value = f.merged.clone();
+            for name in f.branch.keys() {
+                let won = if pick(&Key::Field(*id, *prop, name.clone())) == Some(Side::Branch) { &f.branch } else { &f.main };
+                match won.get(name) {
+                    Some(Value::Null) | None => value.remove(name),
+                    Some(v) => value.insert(name.clone(), v.clone()),
+                };
+            }
+            out.push(Change::Set { id: *id, prop: *prop, value: Json(Value::Object(value)) });
+        }
+        out
+    }
+
+    /// `side`'s positions (fractional keys) of the layers, for applying its changes elsewhere.
    fn positions(&self, side: Side) -> &Positions {
        match side {
            Side::Branch => &self.branch_positions,
@@ -355,7 +539,10 @@ impl Plan {
        let mut skip: BTreeSet<usize> = BTreeSet::new();
        let mut batch = Vec::new();
        for c in &self.conflicts {
-            if pick(&c.key) != Some(from) {
+            if matches!(c.key, Key::Field(..)) {
+                // Written whole below, each field from the side picked for it.
+                skip.extend(c.changes(from));
+            } else if pick(&c.key) != Some(from) {
                skip.extend(c.changes(from));
            } else if let (Key::Layer(id), Some(by)) = (&c.key, c.deleted_by)
                && by != from
@@ -372,7 +559,11 @@ impl Plan {
        // shortcut: images a side stopped using are kept (unused ones cost file size only); drop
        // them if files grow.
        let kept = |c: &Change| !matches!(c, Change::Remove { entry: Entry::Image(_) });
-        batch.extend(self.changes(from).iter().enumerate().filter(|(i, c)| !skip.contains(i) && kept(c)).map(|(_, c)| c.clone()));
+        // Values both files work out for themselves stay as `into` has them; normalising the merged
+        // file works them out again from what changed.
+        let own = |c: &Change| key_of(c).is_some_and(|k| self.derived.contains(&k));
+        batch.extend(self.changes(from).iter().enumerate().filter(|(i, c)| !skip.contains(i) && kept(c) && !own(c)).map(|(_, c)| c.clone()));
+        batch.extend(self.field_writes(pick));
        let mut r = Replica::from_parts(into.clone(), self.positions(from.other()).clone());
        let applied = r.apply(&batch, Mode::Strict)?;
        Ok((r.document().clone(), applied.touched))
@@ -28,9 +28,15 @@ impl RouteEnd {
 /// How far an elbow connector going around the objects it joins keeps from them.
 const ROOM: f64 = 24.0;

-/// The points a connector runs through from `from` to `to`: from the middle of the side of each
-/// box facing the other end (or the side it names), straight, in right angles, or (curved) its two
-/// ends with the curve's two control points between them. `None` when a point isn't finite.
+/// How far outside the border a connector attached to a side starts and ends (#1916): the stroke's
+/// round cap never lies on the fill, and elbows leaving one side share their first run along the
+/// side's normal (curves leave tangent to it), as FigJam's connectors do.
+pub const END_GAP: f64 = 4.0;
+
+/// The points a connector runs through from `from` to `to`: from [`END_GAP`] outside the middle of
+/// the side of each box facing the other end (or the side it names), straight, in right angles, or
+/// (curved) its two ends with the curve's two control points between them. `None` when a point isn't
+/// finite.
 pub fn route_points(from: RouteEnd, to: RouteEnd, routing: Routing) -> Option<Vec<Point>> {
    let (p0, s0) = attach(from, to.centre());
    let (p1, s1) = attach(to, from.centre());
@@ -169,8 +175,9 @@ fn attach(e: RouteEnd, other: Point) -> (Point, Option<Side>) {
        RouteEnd::Point(p) => (p, None),
        RouteEnd::Box(b, side) => {
            let side = named_or_facing(b, side, other);
-            (side.point(b), Some(side))
+            (side.point(b) + side.normal() * END_GAP, Some(side))
        }
+        // Placed by hand: the point is the user's, gap or not.
        RouteEnd::On(b, side, p) => (p, Some(named_or_facing(b, side, other))),
    }
 }
@@ -0,0 +1,49 @@
+//! Connector routes (`board_route`): where an end attached to a side starts (#1916).
+
+use figcraft_geom::{Point, Rect};
+
+use crate::board::{Routing, Side};
+use crate::board_route::{END_GAP, RouteEnd, route_points};
+
+fn shape(x: f64, y: f64) -> Rect {
+    Rect::new(x, y, x + 100.0, y + 60.0)
+}
+
+/// An end attached to a side starts `END_GAP` outside the middle of that side, not on the border,
+/// so the stroke never lies on the fill (#1916: FigJam starts the line a few pixels outside).
+#[test]
+fn an_attached_end_starts_outside_the_border() {
+    let (a, b) = (shape(0.0, 0.0), shape(300.0, 0.0));
+    for routing in [Routing::Straight, Routing::Elbow, Routing::Curved] {
+        let pts = route_points(RouteEnd::Box(a, Side::Auto), RouteEnd::Box(b, Side::Auto), routing).unwrap();
+        assert_eq!(pts.first().copied(), Some(Point::new(100.0 + END_GAP, 30.0)), "{routing:?}: leaves the right side");
+        assert_eq!(pts.last().copied(), Some(Point::new(300.0 - END_GAP, 30.0)), "{routing:?}: arrives at the left side");
+    }
+    // A named side, and the gap along its own normal.
+    let pts = route_points(RouteEnd::Box(a, Side::Bottom), RouteEnd::Point(Point::new(50.0, 200.0)), Routing::Straight).unwrap();
+    assert_eq!(pts.first().copied(), Some(Point::new(50.0, 60.0 + END_GAP)));
+}
+
+/// Elbows leaving one side share their first run along its normal, and curves leave tangent to it:
+/// the second point of each lies straight out of the side.
+#[test]
+fn connectors_from_one_side_leave_together() {
+    let a = shape(0.0, 0.0);
+    let (up, down) = (RouteEnd::Box(shape(300.0, -200.0), Side::Auto), RouteEnd::Box(shape(300.0, 200.0), Side::Auto));
+    for routing in [Routing::Elbow, Routing::Curved] {
+        let p = route_points(RouteEnd::Box(a, Side::Right), up, routing).unwrap();
+        let q = route_points(RouteEnd::Box(a, Side::Right), down, routing).unwrap();
+        assert_eq!(p[0], q[0], "{routing:?}: the same start");
+        assert_eq!(p[1].y, p[0].y, "{routing:?}: out along the side's normal first");
+        assert_eq!(q[1].y, q[0].y, "{routing:?}: out along the side's normal first");
+    }
+}
+
+/// A point placed by hand on the object (`RouteEnd::On`) is the user's: no gap is added.
+#[test]
+fn a_hand_placed_end_keeps_its_point() {
+    let a = shape(0.0, 0.0);
+    let on = Point::new(80.0, 60.0);
+    let pts = route_points(RouteEnd::On(a, Side::Bottom, on), RouteEnd::Point(Point::new(80.0, 200.0)), Routing::Straight).unwrap();
+    assert_eq!(pts.first().copied(), Some(on));
+}
@@ -27,7 +27,7 @@ pub mod vector_faces;
 pub mod vector_regions;

 pub use board::*;
-pub use board_route::{RouteEnd, attached_sides, path_handles, reshaped, route_along, route_points};
+pub use board_route::{END_GAP, RouteEnd, attached_sides, path_handles, reshaped, route_along, route_points};
 pub use colors::*;
 pub use comments::*;
 pub use facilitation::*;
@@ -598,7 +598,14 @@ impl Document {
        let Some(n) = self.node(id) else { return Affine::IDENTITY };
        let mut t = n.transform;
        let mut parent = n.parent;
+        // More hops than nodes means the parent chain loops (a restored snapshot can leave one):
+        // stop rather than spin.
+        let mut hops = 0;
        while let Some(p) = parent.and_then(|p| self.node(p)).filter(|p| p.kind.bounds_follow_children()) {
+            hops += 1;
+            if hops > self.nodes.len() {
+                break;
+            }
            t = p.transform * t;
            parent = p.parent;
        }
@@ -1303,6 +1310,8 @@ fn remap_action(a: &mut proto::Action, map: &BTreeMap<NodeId, NodeId>) {
 #[cfg(test)]
 mod blur_tests;
 #[cfg(test)]
+mod board_route_tests;
+#[cfg(test)]
 mod board_shape_tests;
 #[cfg(test)]
 mod boolean_hit_tests;
@@ -861,6 +861,19 @@ fn the_colour_walker_visits_calculation_literals() {
    assert_eq!(literal.a, 0.5, "the mix's stored literal was converted like every other colour");
 }

+#[test]
+fn frame_relative_ends_on_a_looping_parent_chain() {
+    let mut d = Document::new("x");
+    let p = page(&d);
+    let f = d.create(p, NodeKind::Group, "F", 0.0, 0.0, 100.0, 100.0).unwrap();
+    let g = d.create(f, NodeKind::Group, "G", 0.0, 0.0, 10.0, 10.0).unwrap();
+    let mut v = serde_json::to_value(&d).unwrap();
+    // F's parent is its own child G (as a restored snapshot can leave things).
+    v["nodes"][f.to_string()]["parent"] = serde_json::json!(g);
+    let bad: Document = serde_json::from_value(v).unwrap();
+    let _ = bad.frame_relative(g);
+}
+
 #[test]
 fn remove_children_removes_every_subtree_and_keeps_the_parent() {
    let mut doc = Document::new("T");
@@ -2,7 +2,7 @@
 //! command and a drag of the selected connector's end), curved connectors, and elbows that go
 //! around the objects they join.

-use figcraft_doc::{BoardItem, End, NodeKind, Routing, Side};
+use figcraft_doc::{BoardItem, END_GAP, End, NodeKind, Routing, Side};
 use figcraft_geom::{Point, Rect};
 use serde_json::json;

@@ -27,7 +27,7 @@ fn reattach_moves_one_end_and_undoes() {
    s.execute("board.reattach", &json!({"id": k, "end": "to", "target": c, "side": "top"})).unwrap();
    assert_eq!(connector(&s, k).to, End::Node { node: c, side: Side::Top, at: None });
    assert_eq!(connector(&s, k).from.node(), Some(a));
-    assert!(near(*drawn(&s, k).last().unwrap(), Point::new(650.0, 0.0)), "arrives on c's top: {:?}", drawn(&s, k));
+    assert!(near(*drawn(&s, k).last().unwrap(), Point::new(650.0, -END_GAP)), "arrives END_GAP above c's top: {:?}", drawn(&s, k));
    s.execute("edit.undo", &json!({})).unwrap();
    assert_eq!(connector(&s, k).to.node(), Some(b), "one undo step");
    // Off into the canvas: the end stays there, free. The selection is the default connector.
@@ -107,9 +107,9 @@ fn curved_connectors_leave_and_arrive_along_the_sides() {
    let NodeKind::Vector { network } = &n.kind else { panic!("a vector") };
    assert_eq!((network.vertices.len(), network.segments.len()), (2, 1));
    assert!(!network.segments[0].is_straight(), "one curve");
-    assert_eq!(drawn(&s, k), vec![Point::new(100.0, 50.0), Point::new(300.0, 50.0)]);
+    assert_eq!(drawn(&s, k), vec![Point::new(104.0, 50.0), Point::new(296.0, 50.0)]);
    // Side to side in a line: the curve's control points lie on that line, so its box is flat.
-    assert!(n.height.abs() < 1e-9 && (n.width - 200.0).abs() < 1e-9, "{} × {}", n.width, n.height);
+    assert!(n.height.abs() < 1e-9 && (n.width - 192.0).abs() < 1e-9, "{} × {}", n.width, n.height);
    // From a's bottom to c's top: out downwards and in from above; the box holds the whole curve.
    let k2 = id(
        &s.execute("board.connector", &json!({"from": a, "to": c, "fromSide": "bottom", "toSide": "top", "style": "curved", "label": "x"})).unwrap(),
@@ -146,18 +146,18 @@ fn elbows_go_around_the_objects_they_join() {
    let pts = drawn(&s, k2);
    let (ra, rb) = (Rect::new(0.0, 0.0, 100.0, 100.0), Rect::new(300.0, 0.0, 400.0, 100.0));
    assert!(!through(&pts, ra) && !through(&pts, rb), "{pts:?}");
-    assert_eq!(pts.first().copied(), Some(Point::new(0.0, 50.0)));
-    assert_eq!(pts.last().copied(), Some(Point::new(400.0, 50.0)));
+    assert_eq!(pts.first().copied(), Some(Point::new(-END_GAP, 50.0)));
+    assert_eq!(pts.last().copied(), Some(Point::new(400.0 + END_GAP, 50.0)));
    assert_eq!(pts.len(), 6, "out, over, down and in: {pts:?}");
    assert!(pts.iter().all(|p| p.y <= 50.0), "over the top, the nearer way round: {pts:?}");
    assert!(pts.windows(2).all(|w| w[0].x == w[1].x || w[0].y == w[1].y), "right angles only");
    // Facing each other, the short way stays.
-    assert_eq!(drawn(&s, k), vec![Point::new(100.0, 50.0), Point::new(300.0, 50.0)]);
+    assert_eq!(drawn(&s, k), vec![Point::new(104.0, 50.0), Point::new(296.0, 50.0)]);
    // An end at the bottom of b leaving towards a above it: around b's side and up.
    s.execute("board.reattach", &json!({"id": k2, "end": "to", "target": b, "side": "bottom"})).unwrap();
    let pts = drawn(&s, k2);
    assert!(!through(&pts, ra) && !through(&pts, rb), "{pts:?}");
-    assert_eq!(pts.last().copied(), Some(Point::new(350.0, 100.0)));
+    assert_eq!(pts.last().copied(), Some(Point::new(350.0, 100.0 + END_GAP)));
 }

 #[test]
@@ -202,8 +202,12 @@ fn the_connector_being_drawn_is_the_one_made() {
                // Over b: its four attach points, the one the end is at lit, and b outlined.
                assert_eq!(ov.drop_target, Some(b));
                let lit: Vec<[f64; 2]> = ov.attach.iter().filter(|a| a.1).map(|a| a.0).collect();
+                // The lit attach point is the side's middle, on the border; the route's end sits
+                // END_GAP outside it along the side's normal (#1916).
                let end = *drawn(&s, drawing.id).last().unwrap();
-                assert_eq!((ov.attach.len(), lit), (4, vec![[end.x, end.y]]), "{style}");
+                assert_eq!(ov.attach.len(), 4, "{style}");
+                let [lit] = lit.as_slice() else { panic!("{style}: one lit attach point, got {lit:?}") };
+                assert!(((lit[0] - end.x).abs() + (lit[1] - end.y).abs() - END_GAP).abs() < 1e-9, "{style}: {lit:?} is END_GAP inside {end:?}");
            } else {
                assert!(ov.attach.is_empty() && ov.drop_target.is_none(), "a free end");
            }
@@ -259,7 +263,7 @@ fn an_end_dropped_along_a_side_attaches_to_that_side() {
        s.pointer(&ev(PointerKind::Up, drop)).unwrap();
        assert_eq!(connector(&s, k).from, End::Node { node: a, side, at: None }, "{drop:?}");
        if side != Side::Auto {
-            assert_eq!(drawn(&s, k)[0], side.point(bounds), "the route leaves from that side");
+            assert_eq!(drawn(&s, k)[0], side.point(bounds) + side.normal() * END_GAP, "the route leaves from that side, END_GAP out");
        }
    }
 }
@@ -307,5 +311,5 @@ fn a_connector_end_snaps_to_the_attach_point_under_the_pointer() {
        (connector(&s, k).from, connector(&s, k).to),
        (End::Node { node: a, side: Side::Right, at: None }, End::Node { node: b, side: Side::Top, at: None })
    );
-    assert_eq!(drawn(&s, k), vec![Point::new(100.0, 50.0), Point::new(350.0, 200.0)]);
+    assert_eq!(drawn(&s, k), vec![Point::new(104.0, 50.0), Point::new(350.0, 196.0)]);
 }
@@ -11,8 +11,8 @@ use crate::board::{route, selected_connector_handles};
 use crate::board_tests::{board, connector, drawn, id, near};
 use crate::tools::{PointerEvent, PointerKind};

-const A: Point = Point::new(100.0, 50.0);
-const B: Point = Point::new(300.0, 250.0);
+const A: Point = Point::new(104.0, 50.0);
+const B: Point = Point::new(296.0, 250.0);

 /// Shapes a (at the origin) and b (down and to the right), 100 × 100, joined side to side.
 fn joined(style: &str) -> (Session, NodeId, NodeId, NodeId) {
@@ -80,11 +80,11 @@ fn a_reshaped_connector_keeps_the_sides_it_left_by() {
 fn the_first_and_last_runs_gain_a_run_and_stay_on_their_ends() {
    let (mut s, _, _, k) = joined("elbow");
    reshape(&mut s, k, 0.0, 150.0, 120.0).unwrap();
-    assert_eq!(drawn(&s, k), [A, pt(124.0, 50.0), pt(124.0, 120.0), pt(200.0, 120.0), pt(200.0, 250.0), B]);
+    assert_eq!(drawn(&s, k), [A, pt(128.0, 50.0), pt(128.0, 120.0), pt(200.0, 120.0), pt(200.0, 250.0), B]);
    let last = drawn(&s, k).len() - 2;
    reshape(&mut s, k, last as f64, 250.0, 200.0).unwrap();
    let pts = drawn(&s, k);
-    assert_eq!(pts, [A, pt(124.0, 50.0), pt(124.0, 120.0), pt(200.0, 120.0), pt(200.0, 200.0), pt(276.0, 200.0), pt(276.0, 250.0), B]);
+    assert_eq!(pts, [A, pt(128.0, 50.0), pt(128.0, 120.0), pt(200.0, 120.0), pt(200.0, 200.0), pt(272.0, 200.0), pt(272.0, 250.0), B]);
    assert!(right_angled(&pts));
 }

@@ -97,8 +97,8 @@ fn a_lone_run_gains_a_run_at_each_end() {
    let k = id(&s.execute("board.connector", &json!({"from": a, "to": b, "style": "elbow"})).unwrap(), "id");
    assert_eq!(drawn(&s, k).len(), 2);
    reshape(&mut s, k, 0.0, 200.0, -40.0).unwrap();
-    let (l, r) = (pt(100.0, 50.0), pt(300.0, 50.0));
-    assert_eq!(drawn(&s, k), [l, pt(124.0, 50.0), pt(124.0, -40.0), pt(276.0, -40.0), pt(276.0, 50.0), r]);
+    let (l, r) = (pt(104.0, 50.0), pt(296.0, 50.0));
+    assert_eq!(drawn(&s, k), [l, pt(128.0, 50.0), pt(128.0, -40.0), pt(272.0, -40.0), pt(272.0, 50.0), r]);
 }

 #[test]
@@ -168,7 +168,7 @@ fn connectors_follow_what_they_join_and_undo_with_it() {
    let b = id(&s.execute("board.sticky", &json!({"x": 400, "y": 0})).unwrap(), "id");
    let c = id(&s.execute("board.connector", &json!({"from": a, "to": b, "style": "straight", "label": "then"})).unwrap(), "id");
    let pts = drawn(&s, c);
-    assert!(near(pts[0], Point::new(200.0, 100.0)) && near(pts[1], Point::new(400.0, 100.0)), "{pts:?}");
+    assert!(near(pts[0], Point::new(204.0, 100.0)) && near(pts[1], Point::new(396.0, 100.0)), "{pts:?}");
    assert_eq!(node(&s, c).stroke.cap_end, StrokeCap::TriangleArrow);
    // Its label sits at the middle.
    let label = crate::board::label_of(s.doc().unwrap(), c).unwrap();
@@ -178,19 +178,19 @@ fn connectors_follow_what_they_join_and_undo_with_it() {
    s.execute("board.setStyle", &json!({"ids": [c], "style": "elbow"})).unwrap();
    s.execute("transform.move", &json!({"ids": [b], "dx": 0, "dy": 300})).unwrap();
    let pts = drawn(&s, c);
-    assert!(near(pts[0], Point::new(200.0, 100.0)) && near(*pts.last().unwrap(), Point::new(400.0, 400.0)), "{pts:?}");
+    assert!(near(pts[0], Point::new(204.0, 100.0)) && near(*pts.last().unwrap(), Point::new(396.0, 400.0)), "{pts:?}");
    assert!(pts.windows(2).all(|w| w[0].x == w[1].x || w[0].y == w[1].y), "right angles: {pts:?}");
    // Undo takes the move back and the route with it.
    s.execute("edit.undo", &json!({})).unwrap();
-    assert!(near(*drawn(&s, c).last().unwrap(), Point::new(400.0, 100.0)));
+    assert!(near(*drawn(&s, c).last().unwrap(), Point::new(396.0, 100.0)));
    // A deleted end stays where it was, as a point.
    s.execute("edit.delete", &json!({"ids": [b]})).unwrap();
    assert!(matches!(connector(&s, c).to, End::Point { .. }));
-    assert!(near(*drawn(&s, c).last().unwrap(), Point::new(400.0, 100.0)));
+    assert!(near(*drawn(&s, c).last().unwrap(), Point::new(396.0, 100.0)));
    // A connector moved on its own takes its free end along; the attached one stays.
    s.execute("transform.move", &json!({"ids": [c], "dx": 0, "dy": 50})).unwrap();
-    assert!(matches!(connector(&s, c).to, End::Point { x, y } if x == 400.0 && y == 150.0), "{:?}", connector(&s, c));
-    assert!(near(drawn(&s, c)[0], Point::new(200.0, 100.0)));
+    assert!(matches!(connector(&s, c).to, End::Point { x, y } if x == 396.0 && y == 150.0), "{:?}", connector(&s, c));
+    assert!(near(drawn(&s, c)[0], Point::new(204.0, 100.0)));
    // Deleting the connector takes its label.
    s.execute("edit.delete", &json!({"ids": [c]})).unwrap();
    assert!(!s.doc().unwrap().contains(label));
@@ -210,8 +210,8 @@ fn routes_are_the_same_for_the_same_document() {
    let doc = s.doc().unwrap();
    let r = route(doc, &c).unwrap();
    assert_eq!(r, route(&doc.clone(), &c).unwrap());
-    // Down out of the bottom, across halfway, down into the point.
-    assert_eq!(r, vec![Point::new(80.0, 160.0), Point::new(80.0, 330.0), Point::new(300.0, 330.0), Point::new(300.0, 500.0)]);
+    // Down out of the bottom (END_GAP below it), across halfway, down into the point.
+    assert_eq!(r, vec![Point::new(80.0, 164.0), Point::new(80.0, 332.0), Point::new(300.0, 332.0), Point::new(300.0, 500.0)]);
 }

 #[test]
@@ -338,7 +338,7 @@ fn boards_sync_in_live_sessions() {
    let doc = room.server.document();
    let NodeKind::Vector { network } = &doc.node(c).unwrap().kind else { panic!("not a vector") };
    let end = doc.world_transform(c) * network.vertices.last().unwrap().point();
-    assert_eq!(end, Point::new(400.0, 350.0), "to the moved sticky's facing side");
+    assert_eq!(end, Point::new(396.0, 350.0), "to END_GAP before the moved sticky's facing side");
    assert_eq!(doc.node(a).unwrap().fills[0].solid_color(), board_color("violet"));
 }

@@ -410,7 +410,9 @@ fn a_press_on_a_stickys_background_picks_and_drags_it() {
    s.pointer(&PointerEvent::at(PointerKind::Up, 100.0, 450.0, 1.0)).unwrap();
    assert_eq!(s.selection(), vec![a]);
    assert_eq!(node(&s, a).transform.translation().y, 300.0);
-    assert!(near(drawn(&s, c)[0], Point::new(200.0, 400.0)), "the connector followed the drag: {:?}", drawn(&s, c));
+    // Its own connector's start, END_GAP outside its edge, is no snap target for it (#1916).
+    assert_eq!(node(&s, a).transform.translation().x, 0.0, "not nudged sideways by its own connector");
+    assert!(near(drawn(&s, c)[0], Point::new(204.0, 400.0)), "the connector followed the drag: {:?}", drawn(&s, c));
 }

 #[test]
@@ -100,18 +100,18 @@ fn routes_take_named_sides_and_free_points() {
    let side = |n, side| End::Node { node: n, side, at: None };
    let p = |x, y| End::Point { x, y };
    let pt = Point::new;
-    // Side to side: out, across halfway, in.
-    assert_eq!(elbow(side(a, Side::Right), side(b, Side::Left)), vec![pt(100.0, 50.0), pt(200.0, 50.0), pt(200.0, 350.0), pt(300.0, 350.0)]);
+    // Side to side: out (from END_GAP outside each side), across halfway, in.
+    assert_eq!(elbow(side(a, Side::Right), side(b, Side::Left)), vec![pt(104.0, 50.0), pt(200.0, 50.0), pt(200.0, 350.0), pt(296.0, 350.0)]);
    // A side and a top or bottom: one turn.
-    assert_eq!(elbow(side(a, Side::Right), side(b, Side::Top)), vec![pt(100.0, 50.0), pt(350.0, 50.0), pt(350.0, 300.0)]);
-    assert_eq!(elbow(side(a, Side::Bottom), side(b, Side::Left)), vec![pt(50.0, 100.0), pt(50.0, 350.0), pt(300.0, 350.0)]);
+    assert_eq!(elbow(side(a, Side::Right), side(b, Side::Top)), vec![pt(104.0, 50.0), pt(350.0, 50.0), pt(350.0, 296.0)]);
+    assert_eq!(elbow(side(a, Side::Bottom), side(b, Side::Left)), vec![pt(50.0, 104.0), pt(50.0, 350.0), pt(296.0, 350.0)]);
    // Two free points: the longer way first; in a line, no turns.
    assert_eq!(elbow(p(0.0, 0.0), p(100.0, 40.0)), vec![pt(0.0, 0.0), pt(50.0, 0.0), pt(50.0, 40.0), pt(100.0, 40.0)]);
    assert_eq!(elbow(p(0.0, 0.0), p(100.0, 0.0)), vec![pt(0.0, 0.0), pt(100.0, 0.0)]);
    // An automatic side faces the other end.
    let straight =
        route(doc, &figcraft_doc::Connector { from: side(a, Side::Auto), to: p(50.0, 500.0), routing: figcraft_doc::Routing::Straight, path: None });
-    assert_eq!(straight.unwrap(), vec![pt(50.0, 100.0), pt(50.0, 500.0)]);
+    assert_eq!(straight.unwrap(), vec![pt(50.0, 104.0), pt(50.0, 500.0)]);
    assert_eq!(Side::from_id("TOP"), Some(Side::Top));
    assert_eq!(Side::from_id("inside"), None);
    // The same place twice is refused, as are a side that doesn't exist and a point without numbers.
@@ -128,10 +128,10 @@ fn a_connector_follows_a_layer_whose_section_moves_and_ignores_unrelated_edits()
    let a = id(&s.execute("board.sticky", &json!({"x": 50, "y": 50, "parent": sec})).unwrap(), "id");
    let b = id(&s.execute("board.stamp", &json!({"x": 800, "y": 150})).unwrap(), "id");
    let c = id(&s.execute("board.connector", &json!({"from": a, "to": b, "style": "straight"})).unwrap(), "id");
-    assert!(near(drawn(&s, c)[0], Point::new(250.0, 150.0)));
+    assert!(near(drawn(&s, c)[0], Point::new(254.0, 150.0)));
    // Only the section is edited; the sticky inside it moves with it, and so does the connector.
    s.execute("transform.move", &json!({"ids": [sec], "dx": 0, "dy": 100})).unwrap();
-    assert!(near(drawn(&s, c)[0], Point::new(250.0, 250.0)), "{:?}", drawn(&s, c));
+    assert!(near(drawn(&s, c)[0], Point::new(254.0, 250.0)), "{:?}", drawn(&s, c));
    // An edit that touches neither end leaves the connector as it was.
    let before = s.doc().unwrap().node_arc(c).cloned().unwrap();
    s.execute("board.sticky", &json!({"x": 0, "y": 900})).unwrap();
@@ -276,3 +276,29 @@ fn a_board_tool_left_on_presses_as_move_in_a_design_file() {
    assert_eq!(s.tool.tool, ToolId::Move);
    assert_eq!(s.selection(), vec![r], "the press selected as Move does");
 }
+
+/// #1916: a connector's start, END_GAP outside the layer it leaves, is a snap line for other layers
+/// but not for that layer, nor for a section holding it (both carry the connector along), and nor
+/// is the connector's label.
+#[test]
+fn a_connector_joined_to_a_moving_layer_or_its_section_is_no_snap_target() {
+    let mut s = board();
+    let sec = id(&s.execute("node.create", &json!({"type": "section", "x": 0, "y": 0, "width": 300, "height": 300})).unwrap(), "id");
+    let a = id(&s.execute("board.sticky", &json!({"x": 50, "y": 50, "parent": sec})).unwrap(), "id");
+    let b = id(&s.execute("board.stamp", &json!({"x": 800, "y": 150})).unwrap(), "id");
+    let c = id(&s.execute("board.connector", &json!({"from": a, "to": b, "style": "straight", "label": "to"})).unwrap(), "id");
+    // A layer the connector has nothing to do with.
+    let d = id(&s.execute("board.sticky", &json!({"x": 0, "y": 900})).unwrap(), "id");
+    let page = s.page().unwrap();
+    let start = drawn(&s, c)[0].x;
+    let label = crate::board::label_of(s.doc().unwrap(), c).unwrap();
+    let lx = s.doc().unwrap().world_bounds(label).unwrap().x0;
+    // A box whose left edge is 1 past a line snaps back by 1 when the line is a target.
+    let pull = |s: &Session, moving: &[NodeId], x: f64| {
+        let t = crate::snap::Targets::gather(s.doc().unwrap(), page, moving);
+        t.snap_rect(figcraft_geom::Rect::new(x + 1.0, 600.0, x + 9.0, 610.0), 4.0).0
+    };
+    assert_eq!((pull(&s, &[d], start), pull(&s, &[d], lx)), (-1.0, -1.0), "for an unrelated layer, the connector and its label snap");
+    assert_eq!(pull(&s, &[b], start), 0.0, "not for the layer it arrives at");
+    assert_eq!((pull(&s, &[sec], start), pull(&s, &[sec], lx)), (0.0, 0.0), "not for the section the connector leaves from");
+}
@@ -133,13 +133,19 @@ impl Session {
        (to.node().is_none() || to.node() != from.node()).then_some(to)
    }

-    /// The object `end` is on (if any) outlined, with its attach points; the one the end is at
-    /// (`at`, else its named side's) lit.
+    /// The object `end` is on (if any) outlined, with its attach points (the side middles, on the
+    /// border); the one the end is at lit: the nearest to `at` (a route's end sits `END_GAP` outside
+    /// its side's middle, #1916), else its named side's.
    fn show_attach(&mut self, end: Option<End>, at: Option<Point>) {
        let attach = match end {
            Some(End::Node { node, side, .. }) => self.doc().ok().and_then(|d| d.world_bounds(node)).map(|b| {
                let on = at.or_else(|| (side != Side::Auto).then(|| side.point(b)));
-                SIDES.map(|s| s.point(b)).map(|p| ([p.x, p.y], on.is_some_and(|o| (o - p).hypot() < 1e-6))).to_vec()
+                let pts = SIDES.map(|s| s.point(b));
+                let lit = on.and_then(|o| {
+                    let near = pts.iter().enumerate().map(|(i, p)| (i, (o - *p).hypot())).filter(|(_, d)| *d <= figcraft_doc::END_GAP + 1e-6);
+                    near.min_by(|x, y| x.1.total_cmp(&y.1)).map(|(i, _)| i)
+                });
+                pts.iter().enumerate().map(|(i, p)| ([p.x, p.y], lit == Some(i))).collect()
            }),
            _ => None,
        };
@@ -193,6 +193,109 @@ fn branch_commands_refuse_what_makes_no_sense() {
    assert!(s.execute("branch.merge", &json!({"id": "nope"})).is_err());
 }

+/// Node id `v` of a command's answer (`{"id": …}` or a bare id).
+fn idv(v: &Value) -> NodeId {
+    NodeId(v.get("id").unwrap_or(v).as_u64().unwrap())
+}
+
+/// The issue #2026 file, with a branch of it made and shown: a component `Card` (horizontal auto
+/// layout hugging its contents, padding 12, one 40×20 rectangle) and an instance of it in a
+/// vertical auto layout frame hugging its contents. Returns (session, branch id, card, instance,
+/// frame, rectangle).
+fn card_file() -> (Session, String, NodeId, NodeId, NodeId, NodeId) {
+    let mut s = Session::with_document(Document::new("Cards"));
+    let props = json!({"layout": "horizontal", "padding": 12, "sizingH": "hug", "sizingV": "hug"});
+    let frame = idv(&ok(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 100, "height": 50, "name": "Card", "props": props})));
+    let rect = idv(&ok(&mut s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 40, "height": 20, "parent": frame})));
+    let card = idv(&ok(&mut s, "component.create", json!({"ids": [frame]})));
+    let props = json!({"layout": "vertical", "padding": 0, "sizingH": "hug", "sizingV": "hug"});
+    let stack = idv(&ok(&mut s, "frame.create", json!({"x": 0, "y": 200, "width": 100, "height": 100, "name": "Stack", "props": props})));
+    let inst = idv(&ok(&mut s, "instance.create", json!({"component": card, "parent": stack})));
+    let b = ok(&mut s, "branch.create", json!({"name": "padding 8"}));
+    (s, b["id"].as_str().unwrap().to_string(), card, inst, stack, rect)
+}
+
+/// Size and place of every layer of `doc` (what auto layout works out).
+fn geometry(doc: &Document) -> Vec<(NodeId, [f64; 8])> {
+    doc.nodes()
+        .map(|n| {
+            let c = n.transform.as_coeffs();
+            (n.id, [n.width, n.height, c[0], c[1], c[2], c[3], c[4], c[5]])
+        })
+        .collect()
+}
+
+/// Issue #2026: one auto layout edit on each side is one conflict (the field changed both ways),
+/// not one for every size and place auto layout works out from it; the merged file lays out
+/// from the padding picked.
+#[test]
+fn one_conflicting_auto_layout_edit_is_one_conflict() {
+    for (pick, padding) in [("branch", 8.0), ("main", 16.0)] {
+        let (mut s, id, card, inst, _, _) = card_file();
+        ok(&mut s, "node.set", json!({"id": card, "props": {"padding": 8}}));
+        ok(&mut s, "doc.switch", json!({"index": 0}));
+        ok(&mut s, "node.set", json!({"id": card, "props": {"padding": 16}}));
+        // What main looks like with the picked padding set directly.
+        let mut direct = Session::with_document(s.doc().unwrap().clone());
+        ok(&mut direct, "node.set", json!({"id": card, "props": {"padding": padding}}));
+        let review = ok(&mut s, "branch.review", json!({"id": id}));
+        let conflicts = review["conflicts"].as_array().unwrap();
+        assert_eq!(conflicts.len(), 1, "{review}");
+        let key = format!("{card}/layout.padding");
+        assert_eq!(conflicts[0]["key"], key.as_str());
+        assert_eq!(
+            (&conflicts[0]["property"], &conflicts[0]["branch"], &conflicts[0]["main"]),
+            (&json!("auto layout padding"), &json!("8, 8, 8, 8"), &json!("16, 16, 16, 16"))
+        );
+        let err = s.execute("branch.merge", &json!({"id": id})).unwrap_err().to_string();
+        assert!(err.contains(&key) && !err.contains("width"), "{err}");
+        ok(&mut s, "branch.merge", json!({"id": id, "resolutions": {&key: pick}}));
+        let doc = s.doc().unwrap();
+        for n in [card, inst] {
+            assert_eq!(doc.node(n).unwrap().layout.as_ref().unwrap().padding, [padding; 4], "{pick} wins");
+        }
+        assert_eq!(geometry(doc), geometry(direct.doc().unwrap()), "{pick} wins: laid out from the padding picked");
+    }
+}
+
+/// Auto layout merges field by field: a gap changed only on the branch is kept whichever side's
+/// padding wins, both when merging and when updating the branch from main.
+#[test]
+fn auto_layout_fields_changed_one_way_survive_a_conflict() {
+    for (cmd, pick, padding) in [("branch.merge", "main", 16.0), ("branch.merge", "branch", 8.0), ("branch.updateFromMain", "main", 16.0)] {
+        let (mut s, id, card, _, _, _) = card_file();
+        ok(&mut s, "node.set", json!({"id": card, "props": {"padding": 8, "gap": 30}}));
+        ok(&mut s, "doc.switch", json!({"index": 0}));
+        ok(&mut s, "node.set", json!({"id": card, "props": {"padding": 16, "mainAlign": "center"}}));
+        let key = format!("{card}/layout.padding");
+        let review = ok(&mut s, "branch.review", json!({"id": id}));
+        assert_eq!(review["conflicts"].as_array().unwrap().iter().map(|c| c["key"].clone()).collect::<Vec<_>>(), vec![json!(key)], "{review}");
+        ok(&mut s, cmd, json!({"id": id, "resolutions": {&key: pick}}));
+        if cmd == "branch.updateFromMain" {
+            ok(&mut s, "doc.switch", json!({"index": 1}));
+        }
+        let layout = s.doc().unwrap().node(card).unwrap().layout.clone().unwrap();
+        assert_eq!((layout.padding, layout.gap, layout.main_align), ([padding; 4], 30.0, figcraft_doc::MainAlign::Center), "{cmd}, {pick} wins");
+    }
+}
+
+/// Auto layout on one side and a hugging frame's size on both: the sizes auto layout works out
+/// on each side are no conflict, and merging leaves no stale size behind.
+#[test]
+fn sizes_auto_layout_works_out_never_conflict() {
+    let (mut s, id, card, _, stack, rect) = card_file();
+    ok(&mut s, "node.set", json!({"id": rect, "props": {"width": 60}}));
+    ok(&mut s, "doc.switch", json!({"index": 0}));
+    ok(&mut s, "node.set", json!({"id": card, "props": {"padding": 4}}));
+    let review = ok(&mut s, "branch.review", json!({"id": id}));
+    assert_eq!(review["conflicts"], json!([]), "{review}");
+    let mut direct = Session::with_document(s.doc().unwrap().clone());
+    ok(&mut direct, "node.set", json!({"id": rect, "props": {"width": 60}}));
+    ok(&mut s, "branch.merge", json!({"id": id}));
+    assert_eq!(s.doc().unwrap().node(stack).unwrap().width, 60.0 + 8.0);
+    assert_eq!(geometry(s.doc().unwrap()), geometry(direct.doc().unwrap()));
+}
+
 /// Every change a side made (that the other side didn't overwrite) shows in `doc`.
 fn shows(changes: &[Change], doc: &Document) -> Result<(), String> {
    let r = Replica::new(doc.clone());
@@ -282,16 +385,25 @@ fn random_edits_on_both_sides_merge() {
            let none = |_: &figcraft_collab::merge::Key| None;
            let (into_main, _) = p.merge(&m, Side::Branch, &none).unwrap_or_else(|e| panic!("seed {seed}: {e}"));
            let (into_branch, _) = p.merge(&b, Side::Main, &none).unwrap_or_else(|e| panic!("seed {seed}: {e}"));
+            // Values both sides work out for themselves (sizes and places auto layout gives) stay
+            // as the file merged into has them.
+            let chosen = |changes: &[Change]| -> Vec<Change> {
+                changes
+                    .iter()
+                    .filter(|c| !matches!(c, Change::Set { id, prop, .. } if p.derived().contains(&Key::Node(*id, *prop))))
+                    .cloned()
+                    .collect()
+            };
            let mut both = Replica::new(start.clone());
            both.apply(&p.main, Mode::Strict).unwrap();
-            both.apply(&p.branch, Mode::Strict).unwrap();
+            both.apply(&chosen(&p.branch), Mode::Strict).unwrap();
            let mut want = both.document().clone();
            (want.name, want.current_page) = (m.name.clone(), m.current_page);
            assert_eq!(into_main, want, "seed {seed}");
            for doc in [&into_main, &into_branch] {
                assert!(doc.validate().is_empty(), "seed {seed}: {:?}", doc.validate());
                for side in [&p.branch, &p.main] {
-                    shows(side, doc).unwrap_or_else(|c| panic!("seed {seed}: lost {c}"));
+                    shows(&chosen(side), doc).unwrap_or_else(|c| panic!("seed {seed}: lost {c}"));
                }
            }
        } else {
@@ -4,7 +4,7 @@
 //! guide lines (with spacing labels) for the canvas to draw in red. Vector points also snap to
 //! other points (see `vectoredit::snap`); landing on one shows a marker (a zero-length guide).

-use figcraft_doc::{Document, NodeId};
+use figcraft_doc::{BoardItem, Document, NodeId};
 use figcraft_geom::{Affine, Point, Rect, Vec2, transform_rect_bbox};
 use serde::Serialize;

@@ -94,10 +94,23 @@ impl Targets {
                t.ys.push((y, b.x0, b.x1));
            }
        }
-        // Siblings and, at the top level, all top-level layers.
+        // Siblings and, at the top level, all top-level layers. A board connector joined to a
+        // moving layer, or to one inside it (a section carries its stickies), re-routes with it, as
+        // does its label: no snapping to where its own route starts (#1916).
+        let carried = |e: NodeId| moving.contains(&e) || doc.ancestors(e).iter().any(|a| moving.contains(a));
+        let follows = |id: NodeId| match doc.node(id).and_then(|n| n.board.as_ref()) {
+            Some(BoardItem::Connector(k)) => [k.from.node(), k.to.node()].into_iter().flatten().any(carried),
+            _ => false,
+        };
        if let Some(p) = doc.node(parent) {
            for c in &p.children {
-                if moving.contains(c) || !doc.node(*c).is_some_and(|n| n.visible) {
+                let Some(n) = doc.node(*c).filter(|n| n.visible) else { continue };
+                let joined = match n.board.as_ref() {
+                    Some(BoardItem::Connector(_)) => follows(*c),
+                    Some(BoardItem::Label { connector }) => follows(*connector),
+                    _ => false,
+                };
+                if moving.contains(c) || joined {
                    continue;
                }
                if let Some(b) = bbox(*c) {
@@ -46,7 +46,7 @@ fn without_cmd_an_end_keeps_snapping_to_a_side() {
    let end = *drawn(&s, k).last().unwrap();
    drag_end(&mut s, end, Point::new(650.0, 25.0), false);
    assert_eq!(connector(&s, k).to, End::Node { node: b, side: Side::Right, at: None });
-    assert!(near(*drawn(&s, k).last().unwrap(), Point::new(700.0, 50.0)));
+    assert!(near(*drawn(&s, k).last().unwrap(), Point::new(700.0 + figcraft_doc::END_GAP, 50.0)), "END_GAP outside the side");
 }

 #[test]
@@ -611,6 +611,21 @@ fn doc_change(plan: &Plan, c: &Change) -> Option<DocChange> {
    Some(DocChange { what, change: entry_change(plan, c) })
 }

+/// One side's value of an auto layout field in conflict, in words: `16`, `8, 8, 8, 8`, `min`,
+/// `on`, `none`.
+fn field_text(v: &Value) -> String {
+    match v {
+        Value::Null => "none".to_string(),
+        Value::Bool(on) => if *on { "on" } else { "off" }.to_string(),
+        Value::Number(n) => n.as_f64().map_or_else(|| n.to_string(), |x| x.to_string()),
+        Value::String(s) => words(s),
+        Value::Array(items) => items.iter().map(field_text).collect::<Vec<_>>().join(", "),
+        Value::Object(_) => v.to_string(),
+    }
+}
+
+/// The review's row for conflict `c`: the layer (or file entry) and property, and what each side
+/// changed it to.
 fn conflict_row(plan: &Plan, c: &Conflict, base: &Document, head: &Document, main: &Document) -> ConflictRow {
    let layer = |id: NodeId| main.node(id).or(head.node(id)).or(base.node(id)).map_or_else(|| id.to_string(), |n| n.name.clone());
    let text = |side: Side| match c.changes(side).first().and_then(|i| plan.changes(side).get(*i)) {
@@ -627,6 +642,11 @@ fn conflict_row(plan: &Plan, c: &Conflict, base: &Document, head: &Document, mai
            let property = if *prop == Prop::Parent { "place in layers".to_string() } else { words(prop) };
            (Some(*id), layer(*id), property, b, m)
        }
+        Key::Field(id, prop, field) => {
+            let (b, m) = plan.field_values(&c.key).map_or_else(|| ("changed".into(), "changed".into()), |(b, m)| (field_text(b), field_text(m)));
+            let owner = if *prop == Prop::Layout { "auto layout".to_string() } else { words(prop) };
+            (Some(*id), layer(*id), format!("{owner} {}", field.replace('_', " ")), b, m)
+        }
        Key::Layer(id) => {
            let (b, m) = if c.deleted_by == Some(Side::Branch) { ("deleted", "edited") } else { ("edited", "deleted") };
            (Some(*id), layer(*id), "layer".to_string(), b.to_string(), m.to_string())
@@ -619,7 +619,7 @@ fn other_layer_kinds_import_as_the_closest_layers() {
    let world = doc.world_transform(link.id);
    let ends: Vec<(f64, f64)> =
        network_of(&doc, "Link").vertices.iter().map(|v| world * figcraft_doc::geom::Point::new(v.x, v.y)).map(|p| (p.x, p.y)).collect();
-    assert_eq!(ends, [(0.0, 300.0), (200.0, 300.0), (200.0, 50.0), (400.0, 50.0)]);
+    assert_eq!(ends, [(0.0, 300.0), (198.0, 300.0), (198.0, 50.0), (396.0, 50.0)]);
    assert_eq!(link.stroke.cap_end, StrokeCap::TriangleArrow);
    // A table: a frame.
    assert!(matches!(named(&doc, "Grid").kind, NodeKind::Frame));
@@ -656,9 +656,9 @@ fn connectors_without_a_saved_path_follow_their_line_style() {
    // Curved: one curve from A's right side to B's left, leaving and arriving level.
    let curve = network_of(&doc, "Curve");
    let ends: Vec<_> = curve.vertices.iter().map(|v| world("Curve") * figcraft_doc::geom::Point::new(v.x, v.y)).collect();
-    assert_eq!(ends.iter().map(|p| (p.x, p.y)).collect::<Vec<_>>(), [(100.0, 650.0), (300.0, 650.0)]);
+    assert_eq!(ends.iter().map(|p| (p.x, p.y)).collect::<Vec<_>>(), [(104.0, 650.0), (296.0, 650.0)], "END_GAP outside the sides");
    assert_eq!(curve.segments.len(), 1);
-    assert_eq!((curve.segments[0].ta, curve.segments[0].tb), ((100.0, 0.0), (-100.0, 0.0)), "the curve leaves and arrives along the sides");
+    assert_eq!((curve.segments[0].ta, curve.segments[0].tb), ((96.0, 0.0), (-96.0, 0.0)), "the curve leaves and arrives along the sides");
    // Straight: unchanged, to the points the file gives on the layers.
    let line: Vec<_> =
        network_of(&doc, "Line").vertices.iter().map(|v| world("Line") * figcraft_doc::geom::Point::new(v.x, v.y)).map(|p| (p.x, p.y)).collect();
@@ -290,7 +290,7 @@ fn a_selected_connector_shows_its_ends_as_handles() {
    let b = u.app.session.execute("board.sticky", &json!({"x": 400, "y": 0})).unwrap()["id"].clone();
    u.app.session.execute("board.connector", &json!({"from": a, "to": b, "style": "straight"})).unwrap();
    let shapes = flat(&u.frame_output(vec![]).shapes);
-    let ends = [u.app.to_screen(200.0, 100.0), u.app.to_screen(400.0, 100.0)];
+    let ends = [u.app.to_screen(204.0, 100.0), u.app.to_screen(396.0, 100.0)];
    for end in ends {
        let ring = shapes.iter().any(|s| matches!(s, egui::Shape::Circle(c) if (c.center - end).length() < 0.5 && c.radius == 5.0));
        assert!(ring, "a handle at {end:?}");
@@ -92,7 +92,7 @@ Status: **pass** (a case in the suite holds), **fixed** (the suite found a diver
 | Arrow keys move children one place (flows, rows, columns, grid cells, into neighbours) | done | `al_keys_tests.rs` |
 | Constraints: left, right, left and right, centre, scale; top/bottom likewise | done | |
 | Layout grids: columns, rows, grid; stretch/left/centre/right; variables bound | done | |
-| Suggest auto layout | done | "Figma will try to determine which objects in a frame or component should be placed in an auto layout frame, then adds as many auto layout frames as needed to make the full design responsive. These auto layout frames are created all at once, while attempting to preserve the placement of your designs" ([Toggle on auto layout in designs](https://help.figma.com/hc/en-us/articles/5731482952599-Toggle-on-auto-layout-in-designs)). `layout.suggest` used to run `layout.add` and made one row of everything (#1823). Now it splits a frame's layers, by their boxes in the frame, along the vertical axis first: sorted by top edge, a layer joins the current row while it starts above the row's bottom (or together with it), and a gap, even a zero one, between the row and the next layer starts a new row. With two or more rows the frame becomes a Vertical auto layout whose items are the rows; otherwise the same split by columns gives a Horizontal one; if the layers overlap along both axes the frame gets no auto layout and the result carries a warning. A row or column of several layers goes into a new frame without fill or clipping, sized to it and inserted in its place (it hugs its content), and the split repeats inside it, to a depth of 16 and for up to 1,000 layers per frame (past that, or when a mask is among the layers, the layers are laid out in one list as Add auto layout does, with a warning). The frame keeps its size, Fixed: the gap is the distance between the bands, the padding along the flow is the first band's offset and the room left after the last, across the flow the smallest offset (alignment start), so with equal gaps and bands that start at the same offset every layer keeps its box exactly. When the gaps differ by more than 0.5 px the smallest is used and `warnings` says the later bands move; when the bands start at different offsets across the flow (a centred title above a card) they line up at the smallest, which moves the others, and `warnings` says so. Instances and layers inside them are refused with the error Convert to group gives, before anything changes; a main component works. `direction` sets the top level only. A single group becomes a frame in place and several layers are wrapped in a frame (both hug), as Add auto layout does; a frame with fewer than two layers is laid out as Add auto layout does. One undo step. Tests in `crates/engine/src/layout_suggest_tests.rs`: `two_rows_of_two_squares_become_a_vertical_frame_of_two_horizontal_rows`, `suggesting_auto_layout_is_one_undo_step`, `three_squares_in_a_row_get_one_horizontal_layout_without_nesting`, `three_squares_in_a_column_get_one_vertical_layout_without_nesting`, `a_header_above_two_columns_of_squares_gives_a_row_per_line`, `a_header_above_a_tall_layer_beside_a_column_nests_three_levels`, `unequal_gaps_use_the_smallest_and_say_so`, `overlapping_layers_leave_the_frame_without_auto_layout_and_say_so`, `a_group_becomes_a_frame_in_place_and_follows_the_rules`, `several_layers_are_wrapped_in_a_frame_that_is_then_split`, `a_direction_forces_the_top_level_and_nested_frames_follow_the_gaps`, `a_frame_with_one_layer_is_laid_out_like_add_auto_layout`, `add_auto_layout_still_makes_a_single_row`, `a_centred_title_above_a_card_is_lined_up_at_the_card_edge_with_a_warning`, `instances_and_layers_inside_them_are_refused_and_a_main_component_works`. Not attempted: overlapping layers, keeping uneven offsets across the flow (they line up at the smallest, with a warning), grids |
+| Suggest auto layout | done | The target works out which layers belong together and adds as many auto layout frames as the design needs, in one step, keeping the placement. `layout.suggest` used to run `layout.add` and made one row of everything (#1823). Now it splits a frame's layers, by their boxes in the frame, along the vertical axis first: sorted by top edge, a layer joins the current row while it starts above the row's bottom (or together with it), and a gap, even a zero one, between the row and the next layer starts a new row. With two or more rows the frame becomes a Vertical auto layout whose items are the rows; otherwise the same split by columns gives a Horizontal one; if the layers overlap along both axes the frame gets no auto layout and the result carries a warning. A row or column of several layers goes into a new frame without fill or clipping, sized to it and inserted in its place (it hugs its content), and the split repeats inside it, to a depth of 16 and for up to 1,000 layers per frame (past that, or when a mask is among the layers, the layers are laid out in one list as Add auto layout does, with a warning). The frame keeps its size, Fixed: the gap is the distance between the bands, the padding along the flow is the first band's offset and the room left after the last, across the flow the smallest offset (alignment start), so with equal gaps and bands that start at the same offset every layer keeps its box exactly. When the gaps differ by more than 0.5 px the smallest is used and `warnings` says the later bands move; when the bands start at different offsets across the flow (a centred title above a card) they line up at the smallest, which moves the others, and `warnings` says so. Instances and layers inside them are refused with the error Convert to group gives, before anything changes; a main component works. `direction` sets the top level only. A single group becomes a frame in place and several layers are wrapped in a frame (both hug), as Add auto layout does; a frame with fewer than two layers is laid out as Add auto layout does. One undo step. Tests in `crates/engine/src/layout_suggest_tests.rs`: `two_rows_of_two_squares_become_a_vertical_frame_of_two_horizontal_rows`, `suggesting_auto_layout_is_one_undo_step`, `three_squares_in_a_row_get_one_horizontal_layout_without_nesting`, `three_squares_in_a_column_get_one_vertical_layout_without_nesting`, `a_header_above_two_columns_of_squares_gives_a_row_per_line`, `a_header_above_a_tall_layer_beside_a_column_nests_three_levels`, `unequal_gaps_use_the_smallest_and_say_so`, `overlapping_layers_leave_the_frame_without_auto_layout_and_say_so`, `a_group_becomes_a_frame_in_place_and_follows_the_rules`, `several_layers_are_wrapped_in_a_frame_that_is_then_split`, `a_direction_forces_the_top_level_and_nested_frames_follow_the_gaps`, `a_frame_with_one_layer_is_laid_out_like_add_auto_layout`, `add_auto_layout_still_makes_a_single_row`, `a_centred_title_above_a_card_is_lined_up_at_the_card_edge_with_a_warning`, `instances_and_layers_inside_them_are_refused_and_a_main_component_works`. Not attempted: overlapping layers, keeping uneven offsets across the flow (they line up at the smallest, with a warning), grids |
 | "Add auto layout" on a selection | done | the Layout sidebar exposes Add auto layout (+) for groups and frames using the same `layout.add` command as the context menu; a single group becomes a frame in place, keeping its id, name and direct children; adding auto layout to an empty frame keeps its size, Fixed (it collapsed to 20×20); a frame with content still hugs it, as does a new frame wrapped around a selection (#369). `node.set` with auto layout keys on a mix of layers applies them to the frames and warns about the rest instead of failing the whole call (#603) |
 | Real Figma files laid out identically | **not checked** | needs `.fig` or REST import of real files ([gaps](gaps.md) #1, #3) |
 | Performance: re-flow only where sizes or places changed | done | measured in `cargo xtask bench` (components at scale) |
@@ -101,7 +101,7 @@ Status: **pass** (a case in the suite holds), **fixed** (the suite found a diver

 | Date | Change | Summary |
 |---|---|---|
-| 2026-11-05 | patch | M2, #1823: Suggest auto layout is no longer Add auto layout under another name. "Figma will try to determine which objects in a frame or component should be placed in an auto layout frame, then adds as many auto layout frames as needed to make the full design responsive ... while attempting to preserve the placement of your designs" (Toggle on auto layout in designs): `layout.suggest` splits a frame's layers into rows (Vertical) or else columns (Horizontal) by the gaps between their boxes, wraps each band of several layers in a new frame without fill or clipping that hugs it, and repeats inside it (16 levels, 1,000 layers per frame at most). The frame keeps its size; gap and padding come from the bands, so layers keep their boxes where the gaps are even and the bands start at the same offset; instances and layers inside them are refused; uneven gaps (smallest used), bands that start at different offsets across the flow (lined up at the smallest) and layers that overlap along both axes come back as `warnings`. `direction` sets the top level only; one undo step; `layout.add` is unchanged. Tests in `layout_suggest_tests.rs` |
+| 2026-11-05 | patch | M2, #1823: Suggest auto layout is no longer Add auto layout under another name: `layout.suggest` splits a frame's layers into rows (Vertical) or else columns (Horizontal) by the gaps between their boxes, wraps each band of several layers in a new frame without fill or clipping that hugs it, and repeats inside it (16 levels, 1,000 layers per frame at most). The frame keeps its size; gap and padding come from the bands, so layers keep their boxes where the gaps are even and the bands start at the same offset; instances and layers inside them are refused; uneven gaps (smallest used), bands that start at different offsets across the flow (lined up at the smallest) and layers that overlap along both axes come back as `warnings`. `direction` sets the top level only; one undo step; `layout.add` is unchanged. Tests in `layout_suggest_tests.rs` |
 | 2026-11-02 | patch | M2, #1824: fill container children share the free space by their content area: each one's own insets (padding and an included inside stroke, from the same `insets` the frame uses) come off the free space before the equal split and go back on its share, so a child with more padding or a thicker inside stroke takes a little more and the content areas match ("Figma distributes space amongst fill container children by the children's content area instead of by their size, matching the CSS border-box model", Use auto layout with CSS Flexbox in mind). Min and max still clamp the outer sizes and the frozen-share loop is as it was; children without insets split as before. Test: `nested_tests::fill_children_share_by_content_area` |
 | 2026-11-02 | patch | M2, #1838: a double-click on an edge of an auto layout frame's bounding box sets Hug contents on that axis, Alt+double-click on an edge of a child's Fill container ("Double-click the vertical or horizontal edge of an auto layout object's bounding box to set it to Hug contents", "Hold ⌥ Option or Alt and double-click ... to set it to Fill container", Guide to auto layout); a vertical edge sizes the width, a horizontal one the height; the Keyboard shortcuts panel lists both gestures. Test: `double_click_tests::a_double_click_on_an_auto_layout_edge_hugs_and_with_alt_fills`. Numbers unchanged. |
 | 2026-11-02 | patch | M2: a child of an auto layout frame resized to the full space available to it on an axis (the frame's size less its padding: across the flow for any child, along the flow for a lone child) becomes Fill container on that axis, whether by `transform.resize`, the W/H fields or a canvas handle ("Child objects of an auto layout frame will also be set to Fill container if they are manually resized to the full available space of the parent frame", Guide to auto layout). Any other size keeps the axis Fixed as before; beside siblings along the flow, in a hugging or wrapping frame, in a grid and for a layer that ignores the layout nothing changes. Test: `al_behaviour_tests::a_child_resized_to_the_full_available_space_becomes_fill` |
@@ -1,6 +1,6 @@
 # Boards parity

-> **Last reviewed:** 2026-10-24 · **Last updated:** 2026-10-31 · **Change:** minor (a connector end moved with Cmd/Ctrl held goes on any part of an object, and stays there as the object moves or resizes; a connector end dropped along a side of a shape attaches to that side (#1708); a board connector's path can be reshaped by dragging its path handles (#1710); boards have 16 more shapes (arrows, polygons, star, plus and flowchart symbols), in pickers that lay them out in a grid; a board keeps earlier votes' results, listed newest first in Results and deleted one at a time; a connector's bar sets its start and end points, dashes, weight and any colour (#1596); cells copied from a spreadsheet paste onto a board as a table; Shift+Cmd/Ctrl+Enter on a selected board shape adds the next shape already joined to it, and goes on typing (#1597); "+" handles beside a selected sticky or shape make the next one, joined by a connector (#1597); a FigJam `.jam` file opens as a board (#1342); board grid settings: dots, lines, graph paper or none, spacing, size and contrast; the connector tool shows the connector it will make while dragging, ends snapping to attach points (#1387); templates and tables; facilitation: a shared timer and voting sessions; the dot grid, dragging a connector's end to re-attach it, curved connectors, elbows that go around what they join) · **Target:** the incumbent's whiteboard product (behaviour from its public help centre)
+> **Last reviewed:** 2026-10-24 · **Last updated:** 2026-11-04 · **Change:** minor (a connector attached to a side starts 4 pt outside the border, so its stroke never lies on the fill (#1916); a connector end moved with Cmd/Ctrl held goes on any part of an object, and stays there as the object moves or resizes; a connector end dropped along a side of a shape attaches to that side (#1708); a board connector's path can be reshaped by dragging its path handles (#1710); boards have 16 more shapes (arrows, polygons, star, plus and flowchart symbols), in pickers that lay them out in a grid; a board keeps earlier votes' results, listed newest first in Results and deleted one at a time; a connector's bar sets its start and end points, dashes, weight and any colour (#1596); cells copied from a spreadsheet paste onto a board as a table; Shift+Cmd/Ctrl+Enter on a selected board shape adds the next shape already joined to it, and goes on typing (#1597); "+" handles beside a selected sticky or shape make the next one, joined by a connector (#1597); a FigJam `.jam` file opens as a board (#1342); board grid settings: dots, lines, graph paper or none, spacing, size and contrast; the connector tool shows the connector it will make while dragging, ends snapping to attach points (#1387); templates and tables; facilitation: a shared timer and voting sessions; the dot grid, dragging a connector's end to re-attach it, curved connectors, elbows that go around what they join) · **Target:** the incumbent's whiteboard product (behaviour from its public help centre)

 **Breadth ~47%, ready ~29% (estimated, erring low).** A board is a FigCraft file of its own kind
 (`file.newBoard`) with a dot grid on the page, sticky notes, shapes with text, connectors that
@@ -34,10 +34,10 @@ all end with the same geometry.
 | Sticky options: hide the author, change size presets, sticky stacks | partial | `board.sticky {author: false}`; no size presets or stacks |
 | Shapes with text | done | rectangle, rounded rectangle, ellipse, diamond, triangle, speech bubble, chevron; text centred and wrapping inside the outline; shape type and text size from the contextual bar |
 | Shape auto-fit to its text, more shapes (cylinder, cross, star…), shape libraries | missing | |
-| Connectors | done | from a layer's side (the facing one, or one named) to another layer or a free point, straight, elbow or curved, arrowheads (the stroke's caps), a label in the middle of the route by length (double-click to add); while one is dragged out it shows as it will be made (route, line and arrowhead), the object under the pointer outlined with its four attach points (side middles), the one the end goes to ringed; an end dropped on the outer half of an object takes the side it is towards (a drop along a whole edge chooses that edge), one in the middle takes the facing side; re-routed when either end moves or resizes; a deleted end stays where it was |
+| Connectors | done | from a layer's side (the facing one, or one named) to another layer or a free point, straight, elbow or curved, arrowheads (the stroke's caps), a label in the middle of the route by length (double-click to add); while one is dragged out it shows as it will be made (route, line and arrowhead), the object under the pointer outlined with its four attach points (side middles), the one the end goes to ringed; an end dropped on the outer half of an object takes the side it is towards (a drop along a whole edge chooses that edge), one in the middle takes the facing side; re-routed when either end moves or resizes; a deleted end stays where it was; an end attached to a side starts 4 pt outside the border (`board_route::END_GAP`), so the stroke never lies on the fill; elbows leaving one side share their first run along its normal and curves leave tangent to it (#1916) |
 | Shapes with text | done | 23 outlines: rectangle, rounded rectangle, ellipse, diamond, triangle up and down, parallelogram right and left, trapezoid, pentagon, hexagon, octagon, star, plus, arrow left and right, chevron, speech bubble, and the flowchart symbols database, document, predefined process, manual input and internal storage; text centred and wrapping inside the outline; shape type and text size from the contextual bar |
 | Shape auto-fit to its text, the advanced shape libraries (engineering and other icon shapes) | missing | |
-| Connectors | done | from a layer's side (the facing one, or one named) to another layer or a free point, straight, elbow or curved, arrowheads (the stroke's caps), a label in the middle of the route by length (double-click to add); while one is dragged out it shows as it will be made (route, line and arrowhead), the object under the pointer outlined with its four attach points (side middles), the one the end goes to ringed, and within 10 px of one the end keeps that side; re-routed when either end moves or resizes; a deleted end stays where it was |
+| Connectors | done | from a layer's side (the facing one, or one named) to another layer or a free point, straight, elbow or curved, arrowheads (the stroke's caps), a label in the middle of the route by length (double-click to add); while one is dragged out it shows as it will be made (route, line and arrowhead), the object under the pointer outlined with its four attach points (side middles), the one the end goes to ringed, and within 10 px of one the end keeps that side; re-routed when either end moves or resizes; a deleted end stays where it was; an end attached to a side starts 4 pt outside the border (`board_route::END_GAP`), so the stroke never lies on the fill; elbows leaving one side share their first run along its normal and curves leave tangent to it (#1916) |
 | Create the next shape already connected | done | a selected sticky or shape shows a "+" beside each side; hovering one shows where the next goes, clicking makes one of the same kind, size and colour there, joined by a connector as the Connector tool makes one, and starts typing in it; one undo step (`board.addConnected {id?, side?, edit?}`, #1597). Shift+Cmd/Ctrl+Enter on a selected (or edited) shape adds the next shape on its right, joined the same way, and goes on typing; on a sticky it adds a sticky beside it without a connector, as before |
 | Curved connectors, elbows around objects, dragging an end to re-attach | done | `board.setStyle {style: curved}` (and the contextual bar): one curve leaving and arriving along the sides; an elbow whose short way would cross what it joins goes around their boxes, 24 units clear; a selected connector shows its two ends as handles, and dragging one onto an object attaches it there (the object is outlined while dragging), onto empty canvas leaves it free (`board.reattach {id, end, target, side?}`, one undo step) |
 | A connector end on any part of an object | done | holding Cmd/Ctrl while moving an end places it where the pointer is on the object, as a share of its box, so it follows moves and resizes; the line leaves by the side facing the other end. Without the key an end snaps to a side |
@@ -70,6 +70,7 @@ all end with the same geometry.

 | Date | Change | Summary |
 |---|---|---|
+| 2026-11-04 | minor | M12, #1916: a connector end attached to a side starts 4 pt outside the border (`board_route::END_GAP`), as FigJam's do (the issue's screenshots: the line starts a few pixels outside, with a round cap), so the stroke never lies on the fill; elbows leaving one side share their first run along its normal, curves leave tangent to it and straight ones fan out from the same point; the `.jam` importer's routes, re-attached ends, path handles and labels follow the route's points; an end placed by hand with Cmd/Ctrl held keeps its exact point. Tests: `board_route_tests` (three). Numbers unchanged. |
 | 2026-10-31 | minor | M12: as the help describes, holding Cmd/Ctrl while moving a connector's end places it on any part of an object instead of snapping to a side. It keeps that spot as a fraction of the object's box, so it follows the object when it moves or resizes, and without the key an end snaps as before. `board.connector {fromAt, toAt}` and `board.reattach {at}` take it; saved only when set. Numbers unchanged |
 | 2026-10-31 | patch | M12, #1708: a connector end dropped on the outer half of a shape takes the side it is towards, instead of only within 10 px of a side's middle, so a drop anywhere along an edge chooses that edge (dragging a selected connector's end and with the connector tool, ring included); a drop in the middle of a shape still takes the facing side. |
 | 2026-10-31 | minor | M12, #1710: a selected elbow or curved connector shows path handles. Dragging a run moves it and a first or last run gains an extra run to stay on its end; a curve's middle goes where it is dragged (`board.reshape`, one undo step). The shape travels with what the connector joins, is saved with the file, and goes back to routing itself when the style changes or an end moves to something else. |
@@ -1,6 +1,6 @@
 # Collaboration parity

-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-06 · **Change:** minor (a file shared on the local network can be shared to look at only: a view-only code next to the edit code, picked in the Share popover before or while sharing)
+> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-06 · **Change:** minor (; a file shared on the local network can be shared to look at only: a view-only code next to the edit code, picked in the Share popover before or while sharing)

 Figma is multiplayer first; FigCraft is local first. **Ready ~13% (estimated):** comments, version
 history and branches (review and merge) work inside one file; the real-time collaboration core landed in #103 (sync model,
@@ -18,7 +18,7 @@ cursors, selections, text carets, cursor chat and spotlights shown live ([`colla
 | Share links, permissions (view / edit), teams and projects | yes | **partial**: sharing with a join code from the Share popover (online: the file goes to the server in Preferences and the server names its edit, comment and view links with short codes; local network: the app hosts and the code carries its address, with an edit code and a view-only code, picked before or while sharing, whose holders see every change and can't make one; one field joins with a code or a link, in the popover and on the home screen, and the Join dialog then shows the join until its file is ready (Cancel), or why it failed (Try again, #1381); the browser build also joins from a link in its URL's fragment, `#join=…`, which never reaches the web host's logs, capped at 6 KiB and checked like a `figcraft://` link (#712; unit-tested, not run in a browser), and shares online and publishes to a server as the desktop app does, though not on the local network (#917; the owner token of a file it puts on an open server lasts as long as the page)); `figcraft-server` share links per file with edit, comment or view access (a viewer sees changes and presence, a "View only" badge and only the moving tools; a commenter also adds, replies to, reacts to and resolves comment threads, with a "Can comment" badge and the comment tool, #1525; the server refuses their other edits), revocable at once, tokens stored as hashes; managed from the app's Share popover (first links), the server's command line or a managing connection. On a server open to the public, whoever published a file manages it with its owner token (links, name, removal: `collab.manageFile`), which the app remembers: Home ▸ Online lists your online files (open again as owner, start and stop sharing, copy the code, rename, remove, forget), with one request per server for what became of them; anyone in a file can report it, and the operator blocks addresses. The person hosting a session, or a file's owner, removes someone from it (right-click their avatar, `collab.removePerson`): they are disconnected and their address can't join that file again while it runs. The list is per computer; a server only a team reaches can also list the files shared from it now for everyone (`team_files`): Home ▸ Online shows that team list for the server in Preferences, a row joins its file, and its links (`figcraft://join?server=…&file=…&team=1`, or the browser build's) carry no secret and stop working with the share. No accounts, teams or projects | 8–17 |
 | Comments: pins on frames and layers, threads, reactions, @mentions, resolve, unread, search and filters, links, in the presenter | yes (shared) | **done, local**: stored in the file, your name from Preferences (an AI agent attached over MCP comments as its own name, marked Agent); a behaviour suite from the documentation (pinning and following layers, threads, own edits and deletes, mentions, reactions, C and Shift+C, stepping, filters, saving, copy and paste); restoring a version keeps them. `comment.list` (CLI, MCP) gives each message its `mentions` (`{name, known, you}`, by the highlighting rule). In a live session threads sync and anyone in it can reply, react and resolve (no accounts: a name is who you are) | (shared once multiplayer lands) |
 | Version history: named versions, autosave checkpoints, view before restore, restore, duplicate | yes (cloud) | **done**, saved in the `.figcraft` file: restoring keeps the replaced design as an autosave first, a titled autosave becomes a named version, merging a branch records the file before and after. Versions are per person in a live session (a shared history needs accounts); no comparing two versions (Dev Mode compares a ready-for-dev layer with its state when marked) | — |
-| Branching and merging | yes (paid plans) | **done, also in live sessions**: branches saved in the `.figcraft` file, each opened in its own tab; Review and merge shows both sides' changes since the branch was made and the conflicts (the same property on both sides, or a layer deleted on one side and edited on the other), each resolved for the branch or main; merge as one undo step (the branch is archived, the main file's history gets a version for the merge), update from main, archive. Each branch keeps its own version history (saved, viewed and restored on the branch tab, kept when it is merged or archived; entries for its creation and updates from main); fills, strokes, effects, layout grids, export settings, guides, interactions, annotations and Dev Mode resources merge item by item. In a live session a branch stays with its author (its ids in their own client space, far above the main file's) and merging it is one edit everyone gets; peers' edits merge against the branch's own base and conflicts resolve as offline; a view link refuses merging. Left: others in the session can't see or open your branches (the server would have to keep them); text runs conflict as a whole; a branch made offline that adds layers merges only outside a session | 1–2 |
+| Branching and merging | yes (paid plans) | **done, also in live sessions**: branches saved in the `.figcraft` file, each opened in its own tab; Review and merge shows both sides' changes since the branch was made and the conflicts (the same property on both sides, or a layer deleted on one side and edited on the other), each resolved for the branch or main; merge as one undo step (the branch is archived, the main file's history gets a version for the merge), update from main, archive. Each branch keeps its own version history (saved, viewed and restored on the branch tab, kept when it is merged or archived; entries for its creation and updates from main); fills, strokes, effects, layout grids, export settings, guides, interactions, annotations and Dev Mode resources merge item by item. Auto layout settings (a frame's and a child's) merge field by field, each field changed both ways a conflict of its own (`<id>/layout.padding`), and sizes and places auto layout works out (hugging, filling, a child's place) or that an instance takes from its main are no conflict: the merged file lays them out again. In a live session a branch stays with its author (its ids in their own client space, far above the main file's) and merging it is one edit everyone gets; peers' edits merge against the branch's own base and conflicts resolve as offline; a view link refuses merging. Left: others in the session can't see or open your branches (the server would have to keep them); text runs conflict as a whole; a branch made offline that adds layers merges only outside a session | 1–2 |
 | Team / organization libraries | yes | **partial**: a file's library is published to `figcraft-server` under the file and enabled in other files by a share link (per-asset versions, background update checks, overrides kept), usage counts per component and file, swapping a library by names ([components-parity](components-parity.md), [server.md](server.md#team-libraries)). No team-wide library list, accounts or analytics over time | 4–8 |
 | Notifications, activity | yes | no | with sharing |

@@ -26,6 +26,7 @@ cursors, selections, text carets, cursor chat and spotlights shown live ([`colla

 | Date | Change | Summary |
 |---|---|---|
+| 2026-11-06 | patch | M9, #2026: one conflicting auto layout edit added a conflict for every size and place it moved (a padding changed on both sides of a file with one instance gave 10, with 15 instances 138), and a `layout` conflict took all auto layout fields together, so a gap changed only on the branch was lost if main won the padding. `merge::plan` now leaves out values both sides work out for themselves: a hugging frame's or a filling child's size, text sizing to its characters, an auto layout child's place (when both sides turn it the same way) and a value a layer in an instance takes from its main; merging keeps the file merged into's own value and normalising lays it out from the merged inputs. `layout` and `childLayout` merge field by field: a field changed on one side merges, each field changed both ways is its own conflict (`<id>/layout.padding`, shown as auto layout padding with both sides' values). Tests: `branch_tests::one_conflicting_auto_layout_edit_is_one_conflict`, `branch_tests::auto_layout_fields_changed_one_way_survive_a_conflict`, `branch_tests::sizes_auto_layout_works_out_never_conflict`; the merge fuzz test leaves worked-out values out of what each side must show |
 | 2026-11-06 | minor | M9: a file shared on the local network can be shared read-only. The session the app hosts has a second secret, so a view-only code next to the edit code (same address and port, a 44-bit secret of its own); whoever joins with it is welcomed as a viewer, sees every change and presence, gets the "View only" badge and only the moving tools, and the session refuses their edits. The Share popover offers Can edit / Can view under Local network before sharing starts (the edit code then never shows) and while sharing; `collab.share {via: "local", access: "view"}` does the same (its `link` and `url`, like its `code`, are the view-only way in), and `share` in `collab.peers` lists both codes and links. No comment code on the local network. Numbers unchanged. |
 | 2026-10-31 | patch | M9, #1665: the document in a live session's welcome goes compressed (deflate) to clients whose hello announces `packed`, about seven times smaller on the wire (a synthetic file of 4,040 layers: 397 KB to 53 KB); older clients keep getting it uncompressed, and the client reads a packed document only up to the size an uncompressed welcome could have had. |
 | 2026-10-30 | minor | M9, part of #742: a team list on `figcraft-server`. With `team_files = "edit"` (or `comment`, `view`) everyone who reaches the server sees the files shared from it now (a link of theirs has a join code: Share ▸ Start sharing) and joins them by a team list link, `figcraft://join?server=…&file=…&team=1`, which carries no secret: the server hands out the file's team link while it stays shared (`ResolveTeam`, answered like a join code), and Stop sharing revokes it with the others, disconnecting whoever joined with it. Turning the list off or changing its access refuses the old team links at once. `collab.files {refresh}` asks the server in Preferences for its list (`Admin::Team`; not the public server FigCraft ships with), and Home ▸ Online shows it below your own files: a row joins its file, its menu copies the link for the app or, with the server's `web_url`, for the browser build (`<web_url>#join=…`). A browser build served beside its server names it with `<meta name="figcraft-server">`, the page's default for sharing, codes and the team list. No accounts: the list is for a server only your team reaches. Tests: `team_tests` (the server and apps over loopback), `code_tests` (links and the browser's driver), `online_tests` (the Online section), `query_tests` (the page's server). Percentages and hours unchanged |
@@ -1353,7 +1353,10 @@ branches). Driven with `run_command`:
  export settings, guides, prototype interactions, annotations and Dev Mode resources compare item
  by item, so changing different items of one list on each side, or adding items at its end on one
  side, merges without a conflict; other lists, such as code links, compare whole; a layer's parent
-  and position are one property, `parent`), a layer deleted on one side while the other edited it or what's inside it
+  and position are one property, `parent`; auto layout settings, `layout` and `childLayout`, compare
+  field by field, each field changed both ways its own conflict, `<layer id>/layout.padding`; sizes and
+  places auto layout works out, and values a layer in an instance takes from its main, are never
+  conflicts: the merged file works them out again), a layer deleted on one side while the other edited it or what's inside it
  (`<layer id>/layer`, with `deletedBy`), or a document-level entry or setting changed on both sides
  (`style/<id>`, `variable/<id>`, `comment/<id>`, `doc/<property>`…).
 - `branch.merge {id?, resolutions?}` merges the branch into the main file as one undo step,