From fb5587245068a444f551eb6e414483ea19c09668 Mon Sep 17 00:00:00 2001 From: Filip Strajnar Date: Fri, 6 Nov 2026 12:17:11 +0100 Subject: [PATCH] M9: one auto layout edit on each side of a branch is one conflict (#2026) A padding changed on both sides of a branch gave a conflict for every size and place auto layout worked out from it: the component's, each instance's and their hugging parents' width and height, each instance's layout, and every child's position (10 in a file with one instance, 138 with 15). The merge was refused until each had a side, yet the merged file laid itself out again from the padding whatever they got. A `layout` conflict also took all auto layout fields together, so a gap changed only on the branch was lost when main won the padding. `merge::plan` now leaves out properties both sides changed to values both files work out for themselves (`Plan::derived`): a hugging auto layout frame's or a filling child's size, text sizing to its characters, an auto layout child's place (when both sides turn and scale it the same way), and a value a layer in an instance has as its main's layer has it. 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 (or the same way on both) merges, and each field changed both ways is a conflict of its own (`Key::Field`, `/layout.padding`), written whole from the merged fields and each picked side's value. The review shows it as "auto layout padding" with both sides' values ("8, 8, 8, 8"). Tests: `branch_tests::one_conflicting_auto_layout_edit_is_one_conflict` (the issue's file: one conflict, either side laid out as if set directly), `auto_layout_fields_changed_one_way_survive_a_conflict` (merge and update from main), `sizes_auto_layout_works_out_never_conflict`; the merge fuzz test leaves worked-out values out of what each side must show. Docs: collaboration-parity.md, mcp.md, ROADMAP.md. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01LvG6E2LxvJ6MuFmiLA6Zqm --- ROADMAP.md | 3 +- crates/collab/src/merge.rs | 217 ++++++++++++++++++++++++-- crates/engine/src/branch_tests.rs | 116 +++++++++++++- crates/engine/src/sharing/branches.rs | 20 +++ docs/collaboration-parity.md | 5 +- docs/mcp.md | 5 +- 6 files changed, 347 insertions(+), 19 deletions(-) diff --git a/ROADMAP.md b/ROADMAP.md index 60f5962d2..a8fe24715 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -2,7 +2,7 @@ **Stage: alpha** · next: beta, ~26 points and ~162–292 h away (one Opus 5.5 agent; ~33–67 h wall-clock with 5 agents) -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-02 · **Change:** minor (glass bends towards its core, and rounded rectangles work it out in closed form; glass's light is a line on its bevel and splay turns the bend towards the centre; glass bends with a thick-lens profile and splits its colours over 8 steps; glass effects take variables and keep their frost within 0–100; web host bridge: `?host=parent` or `data-host="page"` hands a page the app's files, documented in the hosting guide; 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 tap on a plugin panel's button keeps what was typed in its fields; a Dash cap setting (none, round or square) on Dash and Custom strokes, drawn on both ends of every dash; library analytics list how many layers and files use each style and variable; the Controller menu names each button as PlayStation and Switch controllers do; widgets draw lines and SVG pictures (plugin API 6); a connector end dropped along a side of a shape attaches to that side (#1708); regression tests pin a rounded shape's one-sided stroke and SVG ids and font families without XML-forbidden characters (#1351, #1124); a damaged image is refused with a reason instead of showing as an empty box (#1474); an image copied in another app pastes again on the desktop, and in the browser for the first time (#492); SwiftUI and Compose code names a bound variable by its iOS or Android code syntax; the colour picker's Image tab shows a placeholder and Upload from computer, an asset preview, and a file dropped on it replaces the image, keeping the fill mode, crop and position (#1682); the Frame tool's Phone presets have the iPhone 17 family (#1691); Show in folder works in the Flatpak build and selects the file on Linux (#1701); a dashed line starts and ends with a half-length dash, on the canvas and in exports; the Pages, Layers and Assets search fields keep their text in the middle of the field (#1703); 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; library analytics count insertions and show insertions and detachments over the past 30 days, 90 days or year; a stroke's Custom style takes a dash pattern of any length as a comma-separated list (#1681); a control request can set its own timeout, up to 10 minutes (`timeoutMs`; `figcraft-cli mcp --attach PORT --timeout SECONDS`) (#1696); gap 6: a widget opens its plugin's panel (plugin API 5), whose callbacks redraw it; the keyboard's Menu key opens the context menu, as Shift+F10 does; an Open link action can open in place of the prototype, with "Open in new tab" off (gap 15); a collection of this file can be extended (Extend collection on its row, `variable.extendCollection`), its extension following its edits at once, and extended collections extend again in the file; the eyedropper with Cmd/Ctrl+Shift makes a colour style or variable of what it picks; a live session's welcome sends the document compressed to clients that read it, about seven times smaller (#1665); a control request that times out says truthfully whether it was dropped or is still running and will take effect, and only screenshots and input blame the window (#1673); a board keeps earlier votes' results, listed newest first in Results and deleted one at a time; the object a stamp will stick to is outlined while the stamp tool is over it or a stamp is dragged over it, and board objects take no drops (gap 24); a server can list the files shared from it now for everyone who reaches it, Home ▸ Online shows them and their links carry no secret (`team_files`, part of #742); team library analytics count detached instances per component and file (gap 10); skipping the Open link notice by command is saved with the preferences at once (gap 15); a selected connector's bar on a board sets its start and end points, solid or dashed, its weight and any colour (#1596); cells copied from a spreadsheet paste onto a board as a table; a long layer name stays on one line in the Export button and the Dev Mode header, ending with an ellipsis, and no longer covers the Design panel (#1650); with hundreds of layers selected, the Design panel and the selection overlays stop going over the whole selection on every frame, so dragging 648 layers averages about 1.1 ms of UI per frame (#1571); plugin panels show pictures: an `image` control, base64 within 256 KB and 4,096 px a side, named by its label (gap 6); `.fig` connector labels without a saved snapshot are kept, centred on their line (gap 1); a drag moving many layers re-runs only what sits around them, not each layer's bindings, sizing, text and instance checks, on every move (#1571); damaged font tracking table offsets are checked instead of wrapping on 32-bit targets, and font indexing makes its existing offset bounds explicit (#1125); Bosnian (`bs`) draft catalog; text style dedupe is O(spans) via a last-two cache and fingerprint buckets (#1102); pasted layers whose image the clipboard lacks are named and show a placeholder that reads as missing (#1646); paint-style colours on layers pasted from another design app keep their style instead of turning black (#1638); progress docs cleaned of what merges left twice: rows merged into one, repeated status items removed, and `cargo xtask docs` (in `ci`) fails on a repeated table row or status item; a name typed for a variable or collection finds the one with that exact id before one named like it, and stored mode ids, font family variables and the panels' labels read exact ids (#1613); plugin widgets have hover styles: a layer's `hover` fill, stroke, opacity or text colour shows while the pointer is over it (gap 6); `.fig` elbowed and curved connectors without a saved path are routed like board connectors instead of drawn straight (gap 1); every file a command reads whole by path is a regular file within a cap that fits it: documents 16 GiB, placed images 256 MiB, CLI scripts 1 GiB; `figcraft-cli connect publish` publishes a code repository's code connect mappings to a design file (gap 16); while a drag only moves a large selection, its outlines, box, slots, spacing and Design panel values are worked out once and shifted, not rebuilt on every move (#1571); Shift+Cmd/Ctrl+Enter on a selected board shape adds the next shape already joined to it, and goes on typing (#1597); an imported or pasted file finds an installed family under the other names its fonts give it, and with other case and spacing, instead of reporting it missing (#1292); a development example generates figcraft-cli's shell completions and man pages from its clap definitions (part of #1396); `.fig` ZIP image reads share a total byte budget and count skipped images in the import warnings (#1076); German terminology corrections (M10): gradient stops, OpenType stylistic sets and the Home-screen preference; a component set's property rows fit the 240 px right panel: variant values wrap two to a line there and every + and − stays in view; the server key is checked by comparing SHA-256 hashes of the presented and the kept key, as the deployment guide says (#1130); opening a file contacts no team library server it names until you check it (#1097); a hostile server can no longer grow a client's memory with made-up people, and a session remembers a bounded number of deleted layer ids (#1121); `doc.list` gives AI agents and plugins the open files' names, not their paths (#1117); with a large selection, frames where nothing changed reuse the selection's outlines, box and slots and the Design panel's instance and position values instead of working them out again (#1571); team libraries and plugins larger than the 16 MiB download burst can be downloaded again, more slowly (#1089); a batch keeps one undo snapshot, not one per step (#1099); files nested 256 levels deep import on the browser's 1 MB stack (#1101); SVG and PDF exports count pattern sources and the renders they embed from the layer's depth, so one cap bounds a whole export (#1082); an explicit variables file path (`variable.import`, the `variables` of `file.open` and `file.import`) is refused past 256 MiB or when it isn't a regular file, as the sibling `variables.json` already was (part of #1114); joining and leaving a file nobody is editing reads and writes nothing on the server: it stays loaded a minute after everyone leaves (#1074); opening a `.figcraft` file unpacks at most 6 GiB in all (2 GiB in the browser), every area together (#1079); hovering the canvas hit-tests once per pointer move, not on every frame, and moving an auto layout frame no longer lays out its contents again on every move (#1571); `.fig` instance expansion no longer walks variable nodes for every instance or copies every outer override row into each nested instance (#1077); `comment.people` lists names that were only @mentioned, and `comment.next` and `comment.prompt` carry the mentions too (#1415); grid auto-placement looks for free cells a 64-bit word at a time and skips what blocks it, with the same placements (#1083); with the pen out, Enter or a double-click ends the path and edits the vector with the Move tool instead of drawing on (#1430); a recovery copy made while a version is previewed holds the file, not the version shown; a FigJam `.jam` file opens as a board (#1342); the Actions palette offers only commands that run from it, and no second row reading like a menu item: Place image opens the file dialog (#1574); share links can comment: a third access level beside edit and view, whose holder sees the file live and adds, replies to, reacts to and resolves comments but can't change the design; Preferences ▸ Scroll wheel zoom: a mouse wheel zooms the canvas about the pointer and Cmd/Ctrl+wheel scrolls (#1390); `comment.list {mentions}` lists only the threads that @mention a name (#1415); in the browser an internal error that stops the page keeps its unsaved files, which open again on reload (#1123); boolean operations refuse input past their caps, and a boolean group past them draws without its result (#1104); figcraft-cli parses its arguments with clap, following RFC-0012 (#1396); the selection and hover outlines of rounded rectangles and frames follow their corners (#1506); component properties keep the order they were made in when one is renamed, and Make slot asks for the slot's name first (#1536, #1537); the browser build publishes files to a server, so Share ▸ Online and Publish to server work there (#917); the browser build uses the fonts installed on the computer once asked, each read when text uses it (#1051); SVG import reads `color()` and `color-mix()` colours, with a note and a grey for those it can't (#1550); the portable Windows zip keeps its settings, recovery copies and plugins in `config\` beside the executable, starting with an installed copy's preferences; the window starts on other graphics when its first ones fail before the first frame: Direct3D 12 compiles with FXC and no device compiles wgpu's indirect-validation shaders, then Vulkan, OpenGL and lower requirements on the power-saving GPU (#965, #1438); Thai, Lao, Khmer and Burmese lines break between words (#1219); an AI agent attached over MCP shows where it works (#1416); a manual overlay's position can be dragged on the canvas (#405); one name for live sessions and comments: Preferences ▸ Your name, in the Join dialog too, kept in the browser, and a rename shows at once in the sessions you are in (#1380); requests that change a server's files have a budget per address, the server key's too, and join codes are found by their hash (#1075); the Join dialog shows a join from the click until its file is ready, with Cancel, and a failed join with Try again (#1381); SVG import draws each pattern tile once per scale, within the layer budget (#1080); Vietnamese letters typed with combining marks (decomposed) take one font that has every mark, instead of missing-glyph boxes beside the letter (#1478); comment.list reports each message's @mentions (#1415); mask groups draw only over the area they can paint, and nested isolated layers share one memory budget (#1061); components can't contain their own instances, directly or through other components; `edit.duplicate` returns an id map with `map: true` (#995); the batches kept for reconnecting apps are bounded in bytes by default, and `figcraft-server` takes `max_log_mb` (#1069); MCP and control calls name their document (#998); sibling placement in live sessions searches instead of counting (#1065); an AI agent attached over MCP comments under its own name, with an Agent label (#1414); the instance-swap menus have a search field (#1338); a refused batch's fixes take time linear in the batch (#1063); the connector tool shows the connector it will make while dragging, ends snapping to attach points (#1387); large images on the canvas draw from a smaller copy, so two 16k images no longer lag (#1483); a file's JPEG thumbnail can't crash the home screen (#1491's progressive JPEG check, now shared); `.fig` import: library text styles linked by asset key, and override rows restating a nested level (#1234); `.fig` import keeps the file's saved line breaks while the text and its box are unedited (#1236); Download a missing free font from the Missing fonts window (`font.download`, #754); the web build's wasm back under its 24 MiB gate (#1472); shadows of images with transparent pixels follow their alpha (#1289); Crop image: Object ▸ Crop image, the right-click menu and the image fill row enter crop mode (`image.crop`, #1464); offline Penpot 2.x import/export (#1143); optional batch continue-on-error with per-step outcomes (#1386); the Design panel's sections on one grid (#858); FigJam outer shape outlines and sticky body fallback beside author text (#1341, #1397); images placed at their own size, 2x screenshots in points (#1360); the toolbar on one 32 pt grid, without its Resources button (#1210); M4: zero-length round-capped dashes draw dots; dash expansion uses the existing safety budget; extracted from #1143; Arabic draft catalog; scaled instances keep their scale when their main is rebuilt (#922); .fig embedded images are copied once per blob, not once per hash (#1059); page ruler guides survive save and reopen (#1476); colour picker LCH and OKLCH models; non-ASCII layer names transliterate in code export (#1235); branches in live sessions and branch history entries, gap 17; plugin widgets take text input and a property menu (plugin API 4); boards: templates and tables; boards: a shared timer and voting sessions; boards: the dot grid, connector ends dragged to re-attach, curved connectors; Installed weights of an embedded font family (#1246); `.sketch` import, best effort (Sketch 48 and newer); CJK line breaking: JIS X 4051's line-start and line-end sets completed with the halfwidth small kana, the halfwidth and spacing (semi-)voiced sound marks, the iteration marks 〱–〵 and the halfwidth parentheses, with behaviour cases for each; Adobe Fonts found on macOS (#298); egui 0.37 hidden-capture deadline contract; Dev Mode measurements kept on the canvas and a read-only layers panel; boards: a board area row and progress entry; community fixes in #507, #510, #529 and #530: auto-save, a text box by dragging, batch step references, removing someone from a live session, Russian and Turkish catalogs reviewed, Czech and Indonesian drafts, the Japanese draft completed, zoom previews, the web clipboard, Alt-drag snapping and Cmd+D repeat, recovery copies, crash and rollback fixes, colour emoji, `.fig` import fixes; earlier changes are in the revision history below) · **Target:** Figma Design (desktop app 126.10.7) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-06 · **Change:** patch (one auto layout edit on each side of a branch is one conflict, its field: auto layout settings merge field by field, and sizes and places auto layout works out, or values an instance takes from its main, no longer conflict (#2026); glass bends towards its core, and rounded rectangles work it out in closed form; glass's light is a line on its bevel and splay turns the bend towards the centre; glass bends with a thick-lens profile and splits its colours over 8 steps; glass effects take variables and keep their frost within 0–100; web host bridge: `?host=parent` or `data-host="page"` hands a page the app's files, documented in the hosting guide; 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 tap on a plugin panel's button keeps what was typed in its fields; a Dash cap setting (none, round or square) on Dash and Custom strokes, drawn on both ends of every dash; library analytics list how many layers and files use each style and variable; the Controller menu names each button as PlayStation and Switch controllers do; widgets draw lines and SVG pictures (plugin API 6); a connector end dropped along a side of a shape attaches to that side (#1708); regression tests pin a rounded shape's one-sided stroke and SVG ids and font families without XML-forbidden characters (#1351, #1124); a damaged image is refused with a reason instead of showing as an empty box (#1474); an image copied in another app pastes again on the desktop, and in the browser for the first time (#492); SwiftUI and Compose code names a bound variable by its iOS or Android code syntax; the colour picker's Image tab shows a placeholder and Upload from computer, an asset preview, and a file dropped on it replaces the image, keeping the fill mode, crop and position (#1682); the Frame tool's Phone presets have the iPhone 17 family (#1691); Show in folder works in the Flatpak build and selects the file on Linux (#1701); a dashed line starts and ends with a half-length dash, on the canvas and in exports; the Pages, Layers and Assets search fields keep their text in the middle of the field (#1703); 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; library analytics count insertions and show insertions and detachments over the past 30 days, 90 days or year; a stroke's Custom style takes a dash pattern of any length as a comma-separated list (#1681); a control request can set its own timeout, up to 10 minutes (`timeoutMs`; `figcraft-cli mcp --attach PORT --timeout SECONDS`) (#1696); gap 6: a widget opens its plugin's panel (plugin API 5), whose callbacks redraw it; the keyboard's Menu key opens the context menu, as Shift+F10 does; an Open link action can open in place of the prototype, with "Open in new tab" off (gap 15); a collection of this file can be extended (Extend collection on its row, `variable.extendCollection`), its extension following its edits at once, and extended collections extend again in the file; the eyedropper with Cmd/Ctrl+Shift makes a colour style or variable of what it picks; a live session's welcome sends the document compressed to clients that read it, about seven times smaller (#1665); a control request that times out says truthfully whether it was dropped or is still running and will take effect, and only screenshots and input blame the window (#1673); a board keeps earlier votes' results, listed newest first in Results and deleted one at a time; the object a stamp will stick to is outlined while the stamp tool is over it or a stamp is dragged over it, and board objects take no drops (gap 24); a server can list the files shared from it now for everyone who reaches it, Home ▸ Online shows them and their links carry no secret (`team_files`, part of #742); team library analytics count detached instances per component and file (gap 10); skipping the Open link notice by command is saved with the preferences at once (gap 15); a selected connector's bar on a board sets its start and end points, solid or dashed, its weight and any colour (#1596); cells copied from a spreadsheet paste onto a board as a table; a long layer name stays on one line in the Export button and the Dev Mode header, ending with an ellipsis, and no longer covers the Design panel (#1650); with hundreds of layers selected, the Design panel and the selection overlays stop going over the whole selection on every frame, so dragging 648 layers averages about 1.1 ms of UI per frame (#1571); plugin panels show pictures: an `image` control, base64 within 256 KB and 4,096 px a side, named by its label (gap 6); `.fig` connector labels without a saved snapshot are kept, centred on their line (gap 1); a drag moving many layers re-runs only what sits around them, not each layer's bindings, sizing, text and instance checks, on every move (#1571); damaged font tracking table offsets are checked instead of wrapping on 32-bit targets, and font indexing makes its existing offset bounds explicit (#1125); Bosnian (`bs`) draft catalog; text style dedupe is O(spans) via a last-two cache and fingerprint buckets (#1102); pasted layers whose image the clipboard lacks are named and show a placeholder that reads as missing (#1646); paint-style colours on layers pasted from another design app keep their style instead of turning black (#1638); progress docs cleaned of what merges left twice: rows merged into one, repeated status items removed, and `cargo xtask docs` (in `ci`) fails on a repeated table row or status item; a name typed for a variable or collection finds the one with that exact id before one named like it, and stored mode ids, font family variables and the panels' labels read exact ids (#1613); plugin widgets have hover styles: a layer's `hover` fill, stroke, opacity or text colour shows while the pointer is over it (gap 6); `.fig` elbowed and curved connectors without a saved path are routed like board connectors instead of drawn straight (gap 1); every file a command reads whole by path is a regular file within a cap that fits it: documents 16 GiB, placed images 256 MiB, CLI scripts 1 GiB; `figcraft-cli connect publish` publishes a code repository's code connect mappings to a design file (gap 16); while a drag only moves a large selection, its outlines, box, slots, spacing and Design panel values are worked out once and shifted, not rebuilt on every move (#1571); Shift+Cmd/Ctrl+Enter on a selected board shape adds the next shape already joined to it, and goes on typing (#1597); an imported or pasted file finds an installed family under the other names its fonts give it, and with other case and spacing, instead of reporting it missing (#1292); a development example generates figcraft-cli's shell completions and man pages from its clap definitions (part of #1396); `.fig` ZIP image reads share a total byte budget and count skipped images in the import warnings (#1076); German terminology corrections (M10): gradient stops, OpenType stylistic sets and the Home-screen preference; a component set's property rows fit the 240 px right panel: variant values wrap two to a line there and every + and − stays in view; the server key is checked by comparing SHA-256 hashes of the presented and the kept key, as the deployment guide says (#1130); opening a file contacts no team library server it names until you check it (#1097); a hostile server can no longer grow a client's memory with made-up people, and a session remembers a bounded number of deleted layer ids (#1121); `doc.list` gives AI agents and plugins the open files' names, not their paths (#1117); with a large selection, frames where nothing changed reuse the selection's outlines, box and slots and the Design panel's instance and position values instead of working them out again (#1571); team libraries and plugins larger than the 16 MiB download burst can be downloaded again, more slowly (#1089); a batch keeps one undo snapshot, not one per step (#1099); files nested 256 levels deep import on the browser's 1 MB stack (#1101); SVG and PDF exports count pattern sources and the renders they embed from the layer's depth, so one cap bounds a whole export (#1082); an explicit variables file path (`variable.import`, the `variables` of `file.open` and `file.import`) is refused past 256 MiB or when it isn't a regular file, as the sibling `variables.json` already was (part of #1114); joining and leaving a file nobody is editing reads and writes nothing on the server: it stays loaded a minute after everyone leaves (#1074); opening a `.figcraft` file unpacks at most 6 GiB in all (2 GiB in the browser), every area together (#1079); hovering the canvas hit-tests once per pointer move, not on every frame, and moving an auto layout frame no longer lays out its contents again on every move (#1571); `.fig` instance expansion no longer walks variable nodes for every instance or copies every outer override row into each nested instance (#1077); `comment.people` lists names that were only @mentioned, and `comment.next` and `comment.prompt` carry the mentions too (#1415); grid auto-placement looks for free cells a 64-bit word at a time and skips what blocks it, with the same placements (#1083); with the pen out, Enter or a double-click ends the path and edits the vector with the Move tool instead of drawing on (#1430); a recovery copy made while a version is previewed holds the file, not the version shown; a FigJam `.jam` file opens as a board (#1342); the Actions palette offers only commands that run from it, and no second row reading like a menu item: Place image opens the file dialog (#1574); share links can comment: a third access level beside edit and view, whose holder sees the file live and adds, replies to, reacts to and resolves comments but can't change the design; Preferences ▸ Scroll wheel zoom: a mouse wheel zooms the canvas about the pointer and Cmd/Ctrl+wheel scrolls (#1390); `comment.list {mentions}` lists only the threads that @mention a name (#1415); in the browser an internal error that stops the page keeps its unsaved files, which open again on reload (#1123); boolean operations refuse input past their caps, and a boolean group past them draws without its result (#1104); figcraft-cli parses its arguments with clap, following RFC-0012 (#1396); the selection and hover outlines of rounded rectangles and frames follow their corners (#1506); component properties keep the order they were made in when one is renamed, and Make slot asks for the slot's name first (#1536, #1537); the browser build publishes files to a server, so Share ▸ Online and Publish to server work there (#917); the browser build uses the fonts installed on the computer once asked, each read when text uses it (#1051); SVG import reads `color()` and `color-mix()` colours, with a note and a grey for those it can't (#1550); the portable Windows zip keeps its settings, recovery copies and plugins in `config\` beside the executable, starting with an installed copy's preferences; the window starts on other graphics when its first ones fail before the first frame: Direct3D 12 compiles with FXC and no device compiles wgpu's indirect-validation shaders, then Vulkan, OpenGL and lower requirements on the power-saving GPU (#965, #1438); Thai, Lao, Khmer and Burmese lines break between words (#1219); an AI agent attached over MCP shows where it works (#1416); a manual overlay's position can be dragged on the canvas (#405); one name for live sessions and comments: Preferences ▸ Your name, in the Join dialog too, kept in the browser, and a rename shows at once in the sessions you are in (#1380); requests that change a server's files have a budget per address, the server key's too, and join codes are found by their hash (#1075); the Join dialog shows a join from the click until its file is ready, with Cancel, and a failed join with Try again (#1381); SVG import draws each pattern tile once per scale, within the layer budget (#1080); Vietnamese letters typed with combining marks (decomposed) take one font that has every mark, instead of missing-glyph boxes beside the letter (#1478); comment.list reports each message's @mentions (#1415); mask groups draw only over the area they can paint, and nested isolated layers share one memory budget (#1061); components can't contain their own instances, directly or through other components; `edit.duplicate` returns an id map with `map: true` (#995); the batches kept for reconnecting apps are bounded in bytes by default, and `figcraft-server` takes `max_log_mb` (#1069); MCP and control calls name their document (#998); sibling placement in live sessions searches instead of counting (#1065); an AI agent attached over MCP comments under its own name, with an Agent label (#1414); the instance-swap menus have a search field (#1338); a refused batch's fixes take time linear in the batch (#1063); the connector tool shows the connector it will make while dragging, ends snapping to attach points (#1387); large images on the canvas draw from a smaller copy, so two 16k images no longer lag (#1483); a file's JPEG thumbnail can't crash the home screen (#1491's progressive JPEG check, now shared); `.fig` import: library text styles linked by asset key, and override rows restating a nested level (#1234); `.fig` import keeps the file's saved line breaks while the text and its box are unedited (#1236); Download a missing free font from the Missing fonts window (`font.download`, #754); the web build's wasm back under its 24 MiB gate (#1472); shadows of images with transparent pixels follow their alpha (#1289); Crop image: Object ▸ Crop image, the right-click menu and the image fill row enter crop mode (`image.crop`, #1464); offline Penpot 2.x import/export (#1143); optional batch continue-on-error with per-step outcomes (#1386); the Design panel's sections on one grid (#858); FigJam outer shape outlines and sticky body fallback beside author text (#1341, #1397); images placed at their own size, 2x screenshots in points (#1360); the toolbar on one 32 pt grid, without its Resources button (#1210); M4: zero-length round-capped dashes draw dots; dash expansion uses the existing safety budget; extracted from #1143; Arabic draft catalog; scaled instances keep their scale when their main is rebuilt (#922); .fig embedded images are copied once per blob, not once per hash (#1059); page ruler guides survive save and reopen (#1476); colour picker LCH and OKLCH models; non-ASCII layer names transliterate in code export (#1235); branches in live sessions and branch history entries, gap 17; plugin widgets take text input and a property menu (plugin API 4); boards: templates and tables; boards: a shared timer and voting sessions; boards: the dot grid, connector ends dragged to re-attach, curved connectors; Installed weights of an embedded font family (#1246); `.sketch` import, best effort (Sketch 48 and newer); CJK line breaking: JIS X 4051's line-start and line-end sets completed with the halfwidth small kana, the halfwidth and spacing (semi-)voiced sound marks, the iteration marks 〱–〵 and the halfwidth parentheses, with behaviour cases for each; Adobe Fonts found on macOS (#298); egui 0.37 hidden-capture deadline contract; Dev Mode measurements kept on the canvas and a read-only layers panel; boards: a board area row and progress entry; community fixes in #507, #510, #529 and #530: auto-save, a text box by dragging, batch step references, removing someone from a live session, Russian and Turkish catalogs reviewed, Czech and Indonesian drafts, the Japanese draft completed, zoom previews, the web clipboard, Alt-drag snapping and Cmd+D repeat, recovery copies, crash and rollback fixes, colour emoji, `.fig` import fixes; earlier changes are in the revision history below) · **Target:** Figma Design (desktop app 126.10.7) FigCraft is a clean-room, open-source, pure-Rust reimplementation of the Figma design workflow, native on macOS, Windows, Linux and FreeBSD and in the browser, fully drivable by agents through @@ -358,6 +358,7 @@ Ranked; detail and milestones in [`docs/roadmap.md`](docs/roadmap.md). | Date | Change | Summary | |---|---|---| +| 2026-11-06 | patch | M9, #2026: a branch merge counts one conflict per auto layout field changed both ways, not one for every size and place auto layout works out from it; values an instance takes from its main no longer conflict, and auto layout settings changed one way survive a conflict on another field. 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`. Numbers unchanged | | 2026-11-02 | patch | M8, #1885: a glass whose shape is too big to keep whole at the zoom (past `MAX_SHAPE_PX` with its core's margin) bends along its edge normals instead of working out a core, so its fields never cover more pixels than a kept shape's, and the core's feature transform holds 16 bytes a pixel. The edge normals are box-blurred twice again and the bend directions once, as documented. Test: `glass::tests::a_shape_too_big_to_keep_bends_along_its_normals`. Numbers unchanged | | 2026-11-02 | minor | M3, #1885: glass bends the backdrop towards its core, the shape shrunk by `depth` and the bevel, as the reference tool's: round a sharp corner the bend turns smoothly instead of meeting along the diagonal, and a part thinner than twice that (a capsule, a letter's stroke) bends across itself towards its own middle (pixels about as deep as any within 2 px). Rectangles, frames, components, instances and sections whose corners aren't smoothed work their glass out in closed form, with nothing to rasterise, transform or keep: a zoom frame draws in 40 ms instead of 54 and a resize frame in 46 instead of 67 (`glass_render_timings`, release, 2×). Other shapes keep their fields, with the bend directions for the last two depths asked for beside them, so dragging the Depth slider works out only those again. Tests: `glass::tests::a_sharp_corner_bends_round_towards_the_core`, `glass::tests::a_thin_part_bends_across_itself`, `glass::tests::neighbouring_strokes_bend_towards_their_own_middles`, `glass::tests::a_rounded_rectangle_in_closed_form_matches_its_distance_transform`, `glass_cut_tests::what_the_shape_depends_on_works_it_out_again_and_nothing_else_does`. Numbers unchanged | | 2026-11-02 | minor | M3, #1885: glass's light is a line on its 1-unit bevel added to the backdrop, as the reference tool's: fully where the edge faces the light, none below 0.35 of facing it and 0.6 as much on the opposite side, with a faint gradient across the curve, 5% darker facing the light and lighter opposite (it was a glow mixed towards white, as deep as `splay` made it). `splay` turns the bend from along the edge's normal towards the way away from the layer's centre, as the reference tool's does, and no longer widens the light: files with a splay above 0 look different. The direction to the centre is worked out in the shape's own frame, so cut renders match. Tests: `glass::tests::the_light_lies_on_the_bevel_and_the_gradient_across_the_curve`, `backdrop_tests::splay_turns_the_bend_towards_the_centre`, `glass_cut_tests::the_light_is_a_line_on_the_bevel`. Numbers unchanged | diff --git a/crates/collab/src/merge.rs b/crates/collab/src/merge.rs index 9c21a56ad..3b6ebdce8 100644 --- a/crates/collab/src/merge.rs +++ b/crates/collab/src/merge.rs @@ -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 { 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(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, pub conflicts: Vec, + /// 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, + /// Layer properties ([`Key::Node`]) merged field by field with fields in conflict. + fields: BTreeMap, 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, + branch: Map, + main: Map, +} + /// 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 { }) } +/// The changes (indexes) in `changes` grouped by what they write ([`key_of`]). fn by_key(changes: &[Change]) -> BTreeMap> { let mut out: BTreeMap> = 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 { + 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 { + 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 = 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 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 &BTreeSet { + &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) -> Vec { + 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 = 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)) diff --git a/crates/engine/src/branch_tests.rs b/crates/engine/src/branch_tests.rs index f0e8a72e5..fc6159537 100644 --- a/crates/engine/src/branch_tests.rs +++ b/crates/engine/src/branch_tests.rs @@ -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![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 { + 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 { diff --git a/crates/engine/src/sharing/branches.rs b/crates/engine/src/sharing/branches.rs index c4a5b7b09..e29e18359 100644 --- a/crates/engine/src/sharing/branches.rs +++ b/crates/engine/src/sharing/branches.rs @@ -611,6 +611,21 @@ fn doc_change(plan: &Plan, c: &Change) -> Option { 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::>().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()) diff --git a/docs/collaboration-parity.md b/docs/collaboration-parity.md index fb54a8d55..6c08edf53 100644 --- a/docs/collaboration-parity.md +++ b/docs/collaboration-parity.md @@ -1,6 +1,6 @@ # Collaboration parity -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-10-31 · **Change:** minor (a live session's welcome sends the document compressed to clients that read it, about seven times smaller (#1665); a server can list the files shared from it now for everyone who reaches it, Home ▸ Online shows them and their links carry no secret (`team_files`, part of #742); `figcraft-server` checks the server key by comparing SHA-256 digests, not the raw keys (#1130); joining and leaving a file nobody is editing reads and writes nothing on the server: it stays loaded a minute after everyone leaves (#1074); `comment.people` lists names that were only @mentioned, and `comment.next` and `comment.prompt` carry the mentions too (#1415); share links can comment: a third access level beside edit and view, whose holder sees the file live and adds, replies to, reacts to and resolves comments but can't change the design; `comment.list {mentions}` lists only the threads that @mention a name (#1415); the browser build publishes files to a server, so Share ▸ Online and Publish to server work there (#917); an AI agent attached over MCP shows where it works (#1416); one name for live sessions and comments: Preferences ▸ Your name, in the Join dialog too, kept in the browser, and a rename shows at once in the sessions you are in (#1380); the Join dialog shows a join from the click until its file is ready, with Cancel, and a failed join with Try again (#1381); requests that change a server's files have a budget per address, the server key's too, and join codes are found by their hash (#1075); comment.list reports each message's @mentions (#1415); the batches kept for reconnecting apps are bounded in bytes by default, and `figcraft-server` takes `max_log_mb` (#1069); sibling placement in live sessions searches instead of counting (#1065); an AI agent attached over MCP comments under its own name, with an Agent label (#1414); a refused batch's fixes take time linear in the batch (#1063); image entries are checked as they apply; branches in live sessions and branch history entries; server message limits follow `max_file_mb`; a damaged log generation field keeps flushed edits; the web build joins from a `#join=` link; removing someone from a live session; live-session revert guard; live sessions per document; a public figcraft-server: open hosting, owner tokens, per-address limits, idle expiry, moderation, install.sh; cursor chat and spotlight in live sessions; branch version history and finer list merges; comments and version history behaviour suite and fixes; hosting the server: `wss://` in the desktop app, server releases, deployment guide; team libraries on the server and swap library; branches: create, update from main, review and merge; wording: the standalone server with share links to edit or view; numbers unchanged) · **Target:** Figma Design (desktop app 126.10.7) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-06 · **Change:** patch (one auto layout edit on each side of a branch is one conflict, its field: auto layout settings merge field by field, and sizes and places auto layout works out, or values an instance takes from its main, no longer conflict (#2026); a live session's welcome sends the document compressed to clients that read it, about seven times smaller (#1665); a server can list the files shared from it now for everyone who reaches it, Home ▸ Online shows them and their links carry no secret (`team_files`, part of #742); `figcraft-server` checks the server key by comparing SHA-256 digests, not the raw keys (#1130); joining and leaving a file nobody is editing reads and writes nothing on the server: it stays loaded a minute after everyone leaves (#1074); `comment.people` lists names that were only @mentioned, and `comment.next` and `comment.prompt` carry the mentions too (#1415); share links can comment: a third access level beside edit and view, whose holder sees the file live and adds, replies to, reacts to and resolves comments but can't change the design; `comment.list {mentions}` lists only the threads that @mention a name (#1415); the browser build publishes files to a server, so Share ▸ Online and Publish to server work there (#917); an AI agent attached over MCP shows where it works (#1416); one name for live sessions and comments: Preferences ▸ Your name, in the Join dialog too, kept in the browser, and a rename shows at once in the sessions you are in (#1380); the Join dialog shows a join from the click until its file is ready, with Cancel, and a failed join with Try again (#1381); requests that change a server's files have a budget per address, the server key's too, and join codes are found by their hash (#1075); comment.list reports each message's @mentions (#1415); the batches kept for reconnecting apps are bounded in bytes by default, and `figcraft-server` takes `max_log_mb` (#1069); sibling placement in live sessions searches instead of counting (#1065); an AI agent attached over MCP comments under its own name, with an Agent label (#1414); a refused batch's fixes take time linear in the batch (#1063); image entries are checked as they apply; branches in live sessions and branch history entries; server message limits follow `max_file_mb`; a damaged log generation field keeps flushed edits; the web build joins from a `#join=` link; removing someone from a live session; live-session revert guard; live sessions per document; a public figcraft-server: open hosting, owner tokens, per-address limits, idle expiry, moderation, install.sh; cursor chat and spotlight in live sessions; branch version history and finer list merges; comments and version history behaviour suite and fixes; hosting the server: `wss://` in the desktop app, server releases, deployment guide; team libraries on the server and swap library; branches: create, update from main, review and merge; wording: the standalone server with share links to edit or view; numbers unchanged) · **Target:** Figma Design (desktop app 126.10.7) 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; 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 (`/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 (`/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-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 (`#join=…`). A browser build served beside its server names it with ``, 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 | | 2026-10-30 | minor | M9, #1130: `figcraft-server` compares the SHA-256 digests of the presented and the kept server key instead of the raw strings, as `docs/server.md` says; the key file, `figcraft-server key` and rotation are unchanged. Numbers unchanged. | diff --git a/docs/mcp.md b/docs/mcp.md index b5e49e749..a0c967ef9 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -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, `/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`, with `deletedBy`), or a document-level entry or setting changed on both sides (`style/`, `variable/`, `comment/`, `doc/`…). - `branch.merge {id?, resolutions?}` merges the branch into the main file as one undo step,