@bettercms-ai/mcp 0.61.0 → 0.62.0

package/dist/index.js

@@ -1992,16 +1992,285 @@ var LAYOUT_SECTION_ICONS = Object.freeze([
 ]);
 var LAYOUT_SECTION_ICON_SET = new Set(LAYOUT_SECTION_ICONS);
 
+// ../types/src/dock-icon-names.ts
+var DOCK_ICON_NAMES = [
+  "access-denied",
+  "activity",
+  "add",
+  "add-circle",
+  "add-comment",
+  "add-document",
+  "add-user",
+  "api",
+  "archive",
+  "arrow-down",
+  "arrow-left",
+  "arrow-right",
+  "arrow-top-right",
+  "arrow-up",
+  "asterisk",
+  "bar-chart",
+  "basket",
+  "bell",
+  "bill",
+  "binary-document",
+  "block-content",
+  "block-element",
+  "blockquote",
+  "bold",
+  "bolt",
+  "book",
+  "bookmark",
+  "bookmark-filled",
+  "bottle",
+  "bug",
+  "bulb-filled",
+  "bulb-outline",
+  "calendar",
+  "case",
+  "chart-upward",
+  "checkmark",
+  "checkmark-circle",
+  "chevron-down",
+  "chevron-left",
+  "chevron-right",
+  "chevron-up",
+  "circle",
+  "clipboard",
+  "clipboard-image",
+  "clock",
+  "close",
+  "close-circle",
+  "code",
+  "code-block",
+  "cog",
+  "collapse",
+  "color-wheel",
+  "comment",
+  "component",
+  "compose",
+  "compose-sparkles",
+  "confetti",
+  "controls",
+  "copy",
+  "credit-card",
+  "crop",
+  "cube",
+  "dashboard",
+  "database",
+  "desktop",
+  "diamond",
+  "document",
+  "document-pdf",
+  "document-remove",
+  "document-sheet",
+  "document-text",
+  "document-video",
+  "document-word",
+  "document-zip",
+  "documents",
+  "dot",
+  "double-chevron-down",
+  "double-chevron-left",
+  "double-chevron-right",
+  "double-chevron-up",
+  "double-quote",
+  "download",
+  "drag-handle",
+  "drop",
+  "earth-americas",
+  "earth-globe",
+  "edit",
+  "ellipsis-horizontal",
+  "ellipsis-vertical",
+  "empty",
+  "enter",
+  "enter-right",
+  "envelope",
+  "equal",
+  "error-filled",
+  "error-outline",
+  "error-screen",
+  "expand",
+  "eye-closed",
+  "eye-open",
+  "face-happy",
+  "face-indifferent",
+  "face-sad",
+  "feedback",
+  "filter",
+  "folder",
+  "generate",
+  "github",
+  "groq",
+  "hash",
+  "heart",
+  "heart-filled",
+  "help-circle",
+  "highlight",
+  "home",
+  "ice-cream",
+  "image",
+  "image-remove",
+  "images",
+  "inbox",
+  "info-filled",
+  "info-outline",
+  "inline",
+  "inline-element",
+  "insert-above",
+  "insert-below",
+  "italic",
+  "joystick",
+  "json",
+  "launch",
+  "leave",
+  "lemon",
+  "link",
+  "link-removed",
+  "linkedin",
+  "list",
+  "lock",
+  "logo-js",
+  "logo-ts",
+  "marker",
+  "marker-removed",
+  "master-detail",
+  "menu",
+  "microphone",
+  "microphone-slash",
+  "mobile-device",
+  "moon",
+  "number",
+  "ok-hand",
+  "olist",
+  "overage",
+  "package",
+  "panel-left",
+  "panel-right",
+  "pause",
+  "pin",
+  "pin-filled",
+  "pin-removed",
+  "play",
+  "plug",
+  "presentation",
+  "progress-50",
+  "progress-75",
+  "projects",
+  "publish",
+  "read-only",
+  "redo",
+  "refresh",
+  "remove",
+  "remove-circle",
+  "reset",
+  "restore",
+  "retrieve",
+  "retry",
+  "revert",
+  "robot",
+  "rocket",
+  "schema",
+  "search",
+  "select",
+  "share",
+  "sort",
+  "sparkle",
+  "sparkles",
+  "spinner",
+  "split-horizontal",
+  "split-vertical",
+  "square",
+  "stack",
+  "stack-compact",
+  "star",
+  "star-filled",
+  "stop",
+  "strikethrough",
+  "string",
+  "sun",
+  "sync",
+  "tablet-device",
+  "tag",
+  "tags",
+  "target",
+  "task",
+  "terminal",
+  "text",
+  "th-large",
+  "th-list",
+  "thumbs-down",
+  "thumbs-up",
+  "tiers",
+  "timeline",
+  "toggle-arrow-right",
+  "token",
+  "transfer",
+  "translate",
+  "trash",
+  "trend-upward",
+  "triangle-outline",
+  "trolley",
+  "truncate",
+  "twitter",
+  "ulist",
+  "unarchive",
+  "underline",
+  "undo",
+  "unknown",
+  "unlink",
+  "unlock",
+  "unpublish",
+  "upload",
+  "user",
+  "users",
+  "versions",
+  "video",
+  "warning-filled",
+  "warning-outline",
+  "wrench"
+];
+var DOCK_ICON_NAME_SET = new Set(DOCK_ICON_NAMES);
+
 // src/tools.ts
 import { BetterCMSError } from "@bettercms-ai/sdk";
+
+// src/dock-icons.ts
+var DOCK_ICONS_URI = "bettercms://icons/dock";
+var DOCK_ICON_SET = DOCK_ICON_NAME_SET;
+var DOCK_ICONS_RESOURCE = {
+  uri: DOCK_ICONS_URI,
+  name: "dock-icons",
+  title: "BetterCMS dock icon names",
+  description: "Every name `ui.icon`, a fieldset's `icon` and a prop's `ui.group.icon` accept. Layout section icons are a different list (Lucide names).",
+  mimeType: "text/markdown"
+};
+var DOCK_ICONS_TEXT = `# Dock icon names
+
+\`ui.icon\` on a nesting field, \`icon\` on a fieldset and \`ui.group.icon\` on a component prop take ONE
+name from this list. Any other string is refused with a 400 that names this resource. A leaf field
+never carries an icon.
+
+Two vocabularies, on purpose: Layout section icons (update_layout \`add-section\`) stay Lucide names.
+A name from one list is not valid in the other.
+
+${DOCK_ICON_NAMES.length} names:
+
+${DOCK_ICON_NAMES.join(", ")}
+`;
+
+// src/tools.ts
 import { DeviceAuthPendingError } from "@bettercms-ai/device-auth";
 
 // src/structure-playbook.ts
 var STRUCTURE_PLAYBOOK_URI = "bettercms://playbook/structure";
 var STRUCTURE_DEFAULT_INSTRUCTION = `After you create collections or pages, organise them per the structure playbook: read ${STRUCTURE_PLAYBOOK_URI}, call suggest_content_structure (read-only), show the user its outline, then apply it with set_content_structure and the version it returned (the If-Match). A project that already has a structure keeps it: file only what you created, with move_to_folder, unless the user asks for a full re-organisation.`;
 var SKILLS_ROUTING_INSTRUCTION = "Before writing code in a repo that uses BetterCMS, explore the repo, then read the installed `bettercms` skill (`npx @bettercms-ai/install --project -y` adds it if missing): its table turns what you found into the one reference the task needs \u2014 read only that.";
+var DOCK_UI_ROUTING_INSTRUCTION = "How fields and props look in the editor (groups, tabs, rows, icons, item names) is playbook \xA714 or the `field-ui` prompt: write it with update_content_model field* or update_component prop* plus ifMatch, read it back, and finish when get_next_steps reports no dock-* step.";
 var RECEIPT_FIRST_INSTRUCTION = "Start every project with get_next_steps: its `receipt` lists what is already done (`done`), what is still missing (`missing`, each item citing the count it reacted to) and the one `nextAction`. Work from that receipt instead of re-reading the site, call get_next_steps again after each batch of edits, and before you tell the user you are finished. Fix what it lists, or say why you are leaving it.";
-var NEXT_STEPS_DESCRIPTION = `Call this FIRST on a project. Returns \`receipt\` \u2014 \`done\` (what the platform already sees as finished: live release, bound elements, conversion coverage, pages composed from components, published components and Layout), \`missing\` and \`nextAction\` \u2014 plus \`data\`, the unfinished items: pages without a meta description, drafts never published, collections with no entries, forms nobody is notified about, writes waiting for human approval, bindings or sections the build has not stamped. Each item cites the count it reacted to. Call it again AFTER a batch of edits to catch what you left behind, and before telling the user you are done. When it lists \`organise-content\`, the project's pages and collections are in no folder: read ${STRUCTURE_PLAYBOOK_URI}, call suggest_content_structure and apply it with set_content_structure once the user agrees.`;
+var NEXT_STEPS_DESCRIPTION = `Call this FIRST on a project. Returns \`receipt\` \u2014 \`done\` (live release, bound elements, conversion coverage, composed pages, published components and Layout), \`missing\`, \`nextAction\` and \`notes\` (unjudged: unknown, not done) \u2014 plus \`data\`, the unfinished items: missing meta descriptions, drafts, empty collections, unnotified forms, writes awaiting approval, unstamped bindings or sections, \`authoring-undecided\` and the Layout lane (\`layout-write-blocked\`, \`layout-field-unread\`, \`layout-locator-stale\`, \`layout-rebuild-required\`, \`chrome-duplicated\`). Each item cites its count and may carry \`payload\` {rows, total}, at most 20 rows. Call it again after a batch of edits and before telling the user you are done. \`organise-content\`: pages and collections are in no folder \u2014 read ${STRUCTURE_PLAYBOOK_URI}, call suggest_content_structure and, once the user agrees, set_content_structure.`;
+var LAYOUT_CHROME_INSTRUCTION = 'When the user asks to make the navigation, footer or other site chrome editable, or get_next_steps lists a `layout-*` or `chrome-duplicated` item: this is playbook \xA711 item 3. Chrome is the project Layout, never page fields: in the source, wrap each Section in `data-bcms-layout-section` (the slot, its base slug) and mark each value `data-bcms-layout-field="layout:<sections[slug].id>:<fieldId>"`, never `data-bcms-field` inside it, then push; the strip removes the page copies, never delete them by hand. On a site BetterCMS serves, publish_layout writes Layout VALUES into the live pages; a structure change waits for a Rebuild.';
 var STRUCTURE_EXAMPLE_PAYLOAD = {
   version: 0,
   doc: {
@@ -2264,24 +2533,37 @@ var fieldType = z.enum([
 ]);
 var slug = z.string().regex(/^[a-z0-9-]+$/, "lowercase letters, numbers, and hyphens only");
 var fieldKey = z.string().regex(/^[a-zA-Z0-9_]+$/, "letters, numbers, and underscores only");
-var uiObject = z.object({
+var uiObject = z.strictObject({
   collapsed: z.boolean().optional().describe("start this panel collapsed. Use it for long optional sections."),
-  preview: z.object({
+  preview: z.strictObject({
     title: z.string().min(1).optional().describe("CHILD KEY whose value titles a collapsed row"),
     subtitle: z.string().min(1).optional().describe("CHILD KEY whose value is the row's second line (e.g. 'level' \u2192 'Heading \xB7 h2')"),
     media: z.string().min(1).optional().describe("CHILD KEY whose value is the row's thumbnail (image/file/url all work)")
   }).optional().describe(
     "how ONE ITEM summarises itself when collapsed. Every slot names a CHILD KEY of THIS field/prop \u2014 not a value, not a dotted path. Without it a repeater of testimonials reads 'Item 1, Item 2, Item 3'; with {title:'author', media:'avatar'} it reads the names with their faces."
   ),
-  layout: z.enum(["list", "grid"]).optional().describe(
-    "how the ITEMS are arranged. Omit (\u2261 'list') for rows of text; 'grid' for items whose thumbnail is the thing you scan \u2014 a gallery, a logo wall, a team. Same placement rule as `preview`."
+  layout: z.enum(["list", "grid", "table"]).optional().describe(
+    "how the ITEMS are arranged. Omit (\u2261 'list') for rows of text; 'grid' for items whose thumbnail is the thing you scan \u2014 a gallery, a logo wall, a team; 'table' for up to 3 scalar columns. Same placement rule as `preview`."
   ),
   reorderable: z.boolean().optional().describe(
     "omit (\u2261 true) unless the order is PART OF THE MEANING. `false` LOCKS the list \u2014 a 'three steps' band that must stay three steps in that order, a nav whose order is semantic, a timeline. Valid only where there is a list to lock."
   ),
   control: z.enum(["segmented", "slider"]).optional().describe(
     "editor control for a LEAF. Omit for the default. 'segmented' on a select with a few short options (alignment, theme, size); 'slider' on a number that has config.min < config.max (opacity, columns). Anything else is refused with the rule named."
-  )
+  ),
+  // A refine, not an enum: 236 names inlined into every schema that carries `ui` would be paid on
+  // every tools/list. The layoutIcon precedent; the server's z.enum is the guard.
+  icon: z.string().min(1).max(40).refine((v) => DOCK_ICON_SET.has(v), `not a dock icon, see ${DOCK_ICONS_URI}`).optional().describe(`the branch row's icon, a name from ${DOCK_ICONS_URI}. Nesting fields only.`),
+  itemLabel: z.string().min(1).max(24).optional().describe("what ONE item is called ('Slide'): the add button, crumbs and empty state. Nesting fields only.")
+});
+var propUiObject = uiObject.extend({
+  group: z.strictObject({
+    id: z.string().min(1).max(40),
+    label: z.string().min(1).max(32).optional(),
+    kind: z.enum(["group", "row"]).optional(),
+    icon: uiObject.shape.icon,
+    collapsed: z.boolean().optional()
+  }).optional().describe("the group this prop sits in. The FIRST prop of a group defines {id, label, kind?, icon?, collapsed?}; later props send only {id}.")
 });
 var fieldShape = {
   key: fieldKey.describe(
@@ -2345,14 +2627,23 @@ var urlPatternArg = z.string().nullable().optional().describe(
   "the public URL of one entry, e.g. '/blog/:slug'. Must start with '/' and contain ':slug' exactly once ('{slug}' is refused). Drives RSS item links and the automatic 301 when an entry's slug changes. null clears it."
 );
 var fieldsetsArg = z.array(
-  z.object({
+  z.strictObject({
     id: z.string().min(1),
     name: z.string().min(1).max(60),
-    description: z.string().max(500).optional()
+    description: z.string().max(500).optional(),
+    kind: z.enum(["group", "row", "tab"]).optional(),
+    tab: z.string().min(1).optional(),
+    icon: uiObject.shape.icon,
+    collapsed: z.boolean().optional(),
+    // Server-owned provenance, as get_content_model returns it: an echo parses and is dropped
+    // before the write (dropProvenance), never refused.
+    uiOrigin: z.unknown().optional(),
+    uiBefore: z.unknown().optional()
   })
 ).max(30).optional().describe(
-  "the model's editor cards: [{id, name, description?}], at most 30, ids unique, order = array index. `description` is one line under the card title. A field joins one with `fieldsetId`. Editor-only: never changes what is stored or delivered."
+  "the model's editor cards: [{id, name, description?, kind?, tab?, icon?, collapsed?}], at most 30, ids unique, order = array index. kind 'group' is a disclosure, 'row' puts up to 3 short scalars on one line, 'tab' is a tab (at most 3, top-level fields only; untabbed fields stay pinned above the tabs; a group's `tab` names its tab). A field joins one with `fieldsetId`. Editor-only: never changes what is stored or delivered."
 );
+var dropProvenance = (sets) => sets?.map(({ uiOrigin: _origin, uiBefore: _before, ...set }) => set) ?? sets;
 var RICH_TEXT_NOTE = "\u{1F534} A field of type 'text' is created as RICH TEXT unless you send `richText: false` on it. Send `richText: false` for every value that is not prose: a name used as a title, a URL, slug, id, SKU, email, phone, CSS class or icon name.";
 var PAGES_NOT_COLLECTIONS_NOTE = "A collection is only for items one template route repeats (/blog/:slug: set urlPattern). A single page's copy (home, about, contact, pricing, legal) is page fields in sections (add_page_field / set_page_content), never a one-entry collection.";
 function flatFieldKeys(fields) {
@@ -2437,7 +2728,25 @@ function toField(f) {
   };
 }
 var BRAND_KIT_NOTE = "`brandKit` (colors, typography, radius and any typeScale/spacing/elevation/motion/graphics) is edited in the BetterCMS dashboard AND by set_brand_assets and set_brand_graphics; every write is a version a person can restore. ASSETS: a media asset OF THIS PROJECT by id; null clears one; a slot a person chose needs `replace: true`. GRAPHICS: `kind`, optional `angle`, 2-8 stops naming `colors.*` or `extras` keys \u2014 never a CSS string and never a hex. CONSUME, DO NOT COPY: a hosted page exposes `--brand-color-<key>`, `--brand-shadow-<key>` and `--brand-gradient-<key>`; style sections with their `style` tokens (`nav.backgroundGradient` and `footer.backgroundGradient` take a gradient key), never copied values. Never invent brand facts: read them from get_project.";
-var MODEL_IF_MATCH_NOTE = "optimisticVersion from get_content_model. When sent, the update applies only if the model is still at that version; a 409 means someone changed it since \u2014 read it again and re-apply, never retry blindly. Omitted, the last write wins.";
+var UPDATE_MODEL_DESCRIPTION = "Edit a content model: rename it, change description/slug/urlPattern, set its `fieldsets`, or reshape how its EXISTING fields look in the editor. Never adds, removes or retypes a field (use add_field). Send modelId, or pageId for the model a page's schema lives in. `fieldsets` REPLACES the list (null drops all); a field joins one with fieldFieldset or add_field's `fieldsetId`. The field* args address fields by dotted key path ('hero.title'). A taken slug is 409 `slug_taken`. Section 14 of bettercms://playbook/schema.";
+var MODEL_IF_MATCH_NOTE = "optimisticVersion from get_content_model (with pageId: get_page backingModel). The write applies only at that version; a 409 version-conflict means it changed since: read it again and re-apply, never retry blindly. REQUIRED with field*, override or a fieldset kind/tab/icon/collapsed (428 without); otherwise, omitted, the last write wins.";
+var COMPONENT_IF_MATCH_NOTE = "optimisticVersion from get_component. The write applies only at that version; a 409 version-conflict means it changed since: read it again and re-apply. REQUIRED with prop*, override or a prop ui icon/itemLabel/group (428 without).";
+var PROP_UI_ARG_NOTE = "top-level prop key \u2192 ui patch, the same vocabulary as a prop's `ui`: each key merges, a null key clears it, null clears the whole ui";
+var OVERRIDE_NOTE = "replace chrome a person set (otherwise 409 ui_human_owned names those paths). Send it only on the user's word.";
+var FIELD_UI_ARG_NOTE = "path \u2192 ui patch, a field's `ui` vocabulary: each key merges, a null key clears it, null clears the whole ui";
+var MODEL_UPDATE_KEYS = [
+  "name",
+  "slug",
+  "description",
+  "urlPattern",
+  "fieldsets",
+  "fieldUi",
+  "fieldFieldset",
+  "fieldOrder",
+  "fieldLabel",
+  "fieldHelpText",
+  "override"
+];
 var ENTRY_META_NOTE = "SEO is native: set this entry's metaTitle, metaDescription, noindex, canonical, og, twitter, schemaType or schema in `meta` (never as model fields). `meta` MERGES into what is stored: a key you leave out is kept, null or an empty string clears it.";
 var PAGE_HEAD_NOTE = "noindex, canonical, og and twitter set the page's head extras; each MERGES into what is stored (a key you leave out is kept, null or an empty string clears it).";
 var STRUCTURE_NOTE = 'ORGANISATION ONLY: Content sidebar folders never change a URL, slug, content or publish state; URL folders (page folders) are set in the dashboard. Folders nest at most 4 levels deep. Icons are lucide names (a-z, 0-9, dashes); null clears one. SYSTEM FOLDERS "home:pages" (Other pages), "home:collections" (Shared) and "home:globals" (Settings) always exist and can never be moved or deleted (400 NAV_SYSTEM_FOLDER); rename_folder and set_icon work on them. TYPE PURITY (400 NAV_TYPE_MISMATCH): Other pages holds only pages at any depth, Shared only collections, Settings neither \u2014 globals are not sidebar items. ACCESS: changing the structure needs Admin or Developer, reading only content access; a 403 SCHEMA_ACCESS_REQUIRED means neither: stop and tell the user, do not retry. PINS sit above the folders in their own order, pages or collections; in a document a pin is folderId "home:root", a virtual id with no folder record (a folder record with that id is 400 NAV_SYSTEM_FOLDER). set_content_structure never refuses a kind mismatch: it returns `warnings` and `kindMismatches` (the single writes do \u2014 see `kind`). PAGE-BOUND MODELS: a page with fields has a bound model that is NOT a collection: never listed or filed, and the writes refuse it with 400 NAV_PAGE_BOUND_MODEL naming its page. Organise the PAGE instead, by its page id. ';
@@ -2594,6 +2903,7 @@ var LISTING_TAIL = /* @__PURE__ */ new Set([
   "set_authoring_preference",
   "set_media_delivery",
   "delete_form_submission",
+  "remove_page_fields",
   // The ABM campaign lane: a marketer's dashboard surface, plus the worker tools a task runner
   // claims with. Ten more tools than the tail was written for, and a connector that truncates
   // would otherwise lose `get_deploy_status` and the GitHub lane to make room for them.
@@ -2663,7 +2973,7 @@ function buildToolDefs(deps) {
     ]).describe("block type; section/slider/tabs/columns nest child blocks"),
     id: z.string().min(1).describe("stable unique block id"),
     props: z.record(z.string(), z.unknown()).describe(
-      "per-type props: heading {text, level}; text/richtext {html} (NOT {text}), and both also take level 1-6, rendering the html AS that <hN> with inline marks kept (one line of inline copy only) \u2014 use it for a title that carries a styled span; image {src, alt}; button {text, href}; spacer {height}; video {url}; form {formId}; component {componentId, overrides?}; navbar {links:[{label,href}], logo?, cta?}; footer {columns, copyright?}; section {children: block[]}; columns {columns: block[][], gap} \u2014 a column may NOT hold columns/section/slider/tabs; slider {slides:[{id,children}]}; tabs {tabs:[{id,label,children}]}; collection {cardComponentId?, detailComponentId?, titleField?, excerptField?, limit?, order?, emptyText?} \u2014 lists this page's published entries as cards, and renders ONE entry on /<page>/<entrySlug>"
+      "per-type props: heading {text, level}; text/richtext {html} (NOT {text}), and both also take level 1-6, rendering the html AS that <hN> with inline marks kept (one line of inline copy only) \u2014 use it for a title that carries a styled span; image {src, alt}; button {text, href, variant? primary|secondary, size? sm|md|lg (default md), fullWidth? boolean}; spacer {height}; video {url}; form {formId}; component {componentId, overrides?}; navbar {links:[{label,href}], logo?, cta?}; footer {columns, copyright?}; section {children: block[]}; columns {columns: block[][], gap} \u2014 a column may NOT hold columns/section/slider/tabs; slider {slides:[{id,children}]}; tabs {tabs:[{id,label,children}]}; collection {cardComponentId?, detailComponentId?, titleField?, excerptField?, limit?, order?, emptyText?} \u2014 lists this page's published entries as cards, and renders ONE entry on /<page>/<entrySlug>"
     ),
     style: z.record(z.string(), z.unknown()).optional().describe(
       "design tokens: theme, bg (none|surface|muted|accent|dark|custom), bgCustom hex, paddingTop/paddingBottom/paddingSides px, contentWidth (narrow|default|wide|full), align, corner, shadow, borderTop/borderBottom, border (all four sides, in the text colour). A real marketing band is a `section` block carrying bg + padding + contentWidth."
@@ -2907,7 +3217,7 @@ function buildToolDefs(deps) {
     // ⚠ A STRIP SITE, exactly like OutField above: this is a `z.object`, so a key the model
     // sends and this shape does not declare is dropped BEFORE the request leaves — a 200 with
     // the declaration gone. `ui` rode through the backend's looseObject `config` and died here.
-    ui: uiObject.optional().describe(
+    ui: propUiObject.optional().describe(
       "AUTHORING CHROME for this prop's control in the inspector \u2014 never a delivery effect, and the same object a FIELD's `ui` takes. `preview` and `layout` are valid on 'group', 'table' and 'slot' only; `reorderable` on 'table' ALONE, the one prop type whose value is a LIST (a 'group' is one object, a 'slot' one component instance). preview keys name a SUB-FIELD of this prop's config.fields and are checked against them (on a 'slot' the shape is checked but the keys cannot be \u2014 they belong to whichever component fills it). An unknown key inside `ui` is a 400, not a silent strip. Read it back with get_component: a prop whose `ui` is absent there was not stored."
     )
   });
@@ -3003,7 +3313,12 @@ function buildToolDefs(deps) {
     blockJson: z.array(blockObject).optional().describe("REPLACES the block tree"),
     props: z.array(componentPropObject).optional().describe(
       "REPLACES the prop array \u2014 include every prop you want to keep, WITH its stored `ui`, or that prop's authoring chrome is dropped along with the prop. Read get_component first."
-    )
+    ),
+    propUi: z.record(z.string(), z.record(z.string(), z.unknown()).nullable()).optional().describe(PROP_UI_ARG_NOTE),
+    propGroup: z.record(z.string(), z.record(z.string(), z.unknown()).nullable()).optional().describe("prop key \u2192 its ui.group ({id, label?, kind?, icon?, collapsed?}), null takes it out"),
+    propLabel: z.record(z.string(), z.string().min(1).max(255)).optional().describe("prop key \u2192 label"),
+    override: z.boolean().optional().describe(OVERRIDE_NOTE),
+    ifMatch: z.number().int().min(0).optional().describe(COMPONENT_IF_MATCH_NOTE)
   });
   const setComponentSourceInput = z.object({
     componentId: z.string().min(1).describe("component id (from list_components)"),
@@ -3530,7 +3845,7 @@ ${d.outline}` : "Proposed Content structure.", d);
       def(
         "set_authoring_preference",
         "Set the site's authoring architecture",
-        "Record which authoring architecture this site uses \u2014 'components' (RECOMMENDED: reusable section components placed as blocks; editors add, reorder and swap sections without touching a schema \u2014 recommend it for every marketing, landing, agency or product site) or 'fields' (a typed field schema per page \u2014 only for a blog, catalogue or directory where many rows share one shape). ASK THE USER; do not pick for them. Called without `preference`, this tool asks them directly (or hands you the question to ask). deploy_project, deploy_from_upload and promote_project all refuse with 409 AUTHORING_DECISION_REQUIRED until it is set, and that refusal carries this project's real page counts to show the user. On a site whose pages were DERIVED at import, answering 'components' redoes nothing: after set_authoring_preference, get_componentize_plan proposes one component per section (it reads the PUBLISHED pages \u2014 no deploy needed to reach it), you confirm it with the user, then componentize_sections places them with `props.bind` (dry run first \u2014 they land as drafts and the page keeps its fields, values and bindings, so click-to-edit and the coverage meter are unchanged), then publish_component each one, publish the pages, run `npx @bettercms-ai/convert --componentize` in the repo, and deploy. Recommend components unless the user says the site is schema-first. Asked once per project; re-callable if the user changes their mind.",
+        "Record which authoring architecture this site uses \u2014 'components' (RECOMMENDED: reusable section components placed as blocks; editors add, reorder and swap sections without touching a schema \u2014 recommend it for every marketing, landing, agency or product site) or 'fields' (a typed field schema per page \u2014 only for a blog, catalogue or directory where many rows share one shape). ASK THE USER; do not pick for them. Called without `preference`, this tool asks them directly (or hands you the question to ask). deploy_project, deploy_from_upload and promote_project all refuse with 409 AUTHORING_DECISION_REQUIRED until it is set, carrying this project's real page counts to show the user. Unset, the release lane already acts as `components`; only `fields` stops it. On a site whose pages were DERIVED at import, answering 'components' redoes nothing: after set_authoring_preference, get_componentize_plan proposes one component per section (it reads the PUBLISHED pages \u2014 no deploy needed to reach it), you confirm it with the user, then componentize_sections places them with `props.bind` (dry run first \u2014 they land as drafts and the page keeps its fields, values and bindings, so click-to-edit and the coverage meter are unchanged), then publish_component each one, publish the pages, run `npx @bettercms-ai/convert --componentize` in the repo, and deploy. Asked once per project; re-callable if the user changes their mind.",
         // Optional in the schema for exactly the reason `framework` is above: a required arg is
         // rejected by the SDK before the handler runs, which would kill the elicitation below
         // and leave the model guessing. Optional here, answered by a human there. The backend
@@ -3620,17 +3935,39 @@ ${d.outline}` : "Proposed Content structure.", d);
       def(
         "update_content_model",
         "Update a content model's metadata",
-        "Rename a content model, edit its description/slug/urlPattern, or set its `fieldsets`. Never touches `fields`: use add_field to extend the schema. Provide modelId plus what to change. `fieldsets` REPLACES the list (send null to drop them all); then put a field in one with add_field's `fieldsetId`. `urlPattern` is the collection's entry URL, e.g. '/blog/:slug' (null clears it). A slug already used in this project and branch is refused with 409 `slug_taken`.",
-        z.object({ modelId: z.string().min(1), name: z.string().optional(), slug: z.string().optional(), description: z.string().optional(), urlPattern: urlPatternArg, fieldsets: fieldsetsArg.nullable(), ifMatch: z.number().int().min(0).optional().describe(MODEL_IF_MATCH_NOTE) }).shape,
+        UPDATE_MODEL_DESCRIPTION,
+        z.object({
+          modelId: z.string().min(1).optional().describe("content model id (from list_content_models); or send pageId"),
+          pageId: z.string().min(1).optional().describe("instead of modelId: the page whose schema model to edit; ifMatch is get_page backingModel.optimisticVersion"),
+          name: z.string().optional(),
+          slug: z.string().optional(),
+          description: z.string().optional(),
+          urlPattern: urlPatternArg,
+          fieldsets: fieldsetsArg.nullable(),
+          fieldUi: z.record(z.string(), z.record(z.string(), z.unknown()).nullable()).optional().describe(FIELD_UI_ARG_NOTE),
+          fieldFieldset: z.record(z.string(), z.string().min(1).nullable()).optional().describe("path \u2192 fieldset id, null takes it out"),
+          fieldOrder: z.strictObject({ parentPath: z.string().min(1).optional(), order: z.array(z.string().min(1)).min(1).max(200) }).optional().describe("the full new order of one parent's child keys (top level without parentPath)"),
+          fieldLabel: z.record(z.string(), z.string().min(1).max(255)).optional().describe("path \u2192 label"),
+          fieldHelpText: z.record(z.string(), z.string().max(500).nullable()).optional().describe("path \u2192 help text, null clears it"),
+          override: z.boolean().optional().describe(OVERRIDE_NOTE),
+          ifMatch: z.number().int().min(0).optional().describe(MODEL_IF_MATCH_NOTE)
+        }).shape,
         // `fields` is deliberately not sent: the PATCH replaces `fields` wholesale when present.
-        async (c, a) => ok(
-          "Updated content model.",
-          (await c.fetchJSON(c.url(`/management/content/models/${s(a.modelId)}`), {
-            method: "PATCH",
-            body: JSON.stringify({ name: a.name, slug: a.slug, description: a.description, urlPattern: a.urlPattern, fieldsets: a.fieldsets }),
-            ...a.ifMatch !== void 0 ? { headers: { "if-match": `W/"${a.ifMatch}"` } } : {}
-          })).data
-        )
+        async (c, a) => {
+          if (Boolean(a.modelId) === Boolean(a.pageId)) return fail("Send exactly one of modelId or pageId.");
+          const path = a.pageId ? `/management/pages/${s(a.pageId)}/model` : `/management/content/models/${s(a.modelId)}`;
+          const body = Object.fromEntries(
+            MODEL_UPDATE_KEYS.filter((k) => a[k] !== void 0).map((k) => [k, k === "fieldsets" ? dropProvenance(a[k]) : a[k]])
+          );
+          return ok(
+            "Updated content model.",
+            (await c.fetchJSON(c.url(path), {
+              method: "PATCH",
+              body: JSON.stringify(body),
+              ...a.ifMatch !== void 0 ? { headers: { "if-match": `W/"${a.ifMatch}"` } } : {}
+            })).data
+          );
+        }
       ),
       def(
         "get_content_types",
@@ -3640,6 +3977,25 @@ ${d.outline}` : "Proposed Content structure.", d);
         async (c) => ok("Content types.", await data(c, "GET", `/management/content/types`))
       ),
       // ── Pages (metadata edit; parity with remote /mcp) ──
+      def(
+        "remove_page_fields",
+        "Remove fields from a page",
+        "Delete page fields and their stored values (draft, published, every repeater row) in one transaction. Dry run by default: returns removedKeys, entriesWithContent, keysWithContent, liveCopyChanges and writes nothing. A field holding content needs discardContent:true (409 FIELDS_HOLD_CONTENT otherwise). keys: exact get_page keys, dotted for a group/repeater child (`features.icon`). Changing the live copy needs publish permission. Never use it to rename a field.",
+        z.object({
+          pageId: z.string().min(1).describe("page id (from list_pages)"),
+          keys: z.array(z.string().min(1)).min(1).describe("field keys to remove"),
+          dryRun: z.boolean().optional().describe("default true"),
+          discardContent: z.boolean().optional().describe("delete fields that hold content, and the content")
+        }).shape,
+        // The whole body: a dry run answers with the report and no `data`.
+        async (c, a) => {
+          const res = await c.fetchJSON(c.url(`/management/pages/${s(a.pageId)}/fields/remove`), {
+            method: "POST",
+            body: JSON.stringify({ keys: a.keys, dryRun: a.dryRun, discardContent: a.discardContent })
+          });
+          return ok(res.dryRun ? "Dry run \u2014 nothing removed." : "Removed fields.", res);
+        }
+      ),
       def(
         "update_page",
         "Edit a page",
@@ -3811,7 +4167,7 @@ ${res.warnings.join("\n")}` : summary, res.data);
       def(
         "get_binding_report",
         "Check what on the live site is editable",
-        "The receipt for 'is this site actually EDITABLE?'. Every release scans the built HTML for the element that renders each CMS field value; per slot this returns `mode` ('text-match' = bindings guessed from rendered text, 'declared' = the template declares them), what was bound, and `unmatched` \u2014 each path with its reason (not-declared / ambiguous-text / no-element). DEPLOY FIRST: before any release there is no report (pages 0, mode null, refreshRequired true). `refreshReason`: `never-generated` \u2014 only a release BetterCMS builds and serves writes a report, so a HEADLESS site never gets one, redeploy or not (verify it by fetching it); `outdated` \u2014 the next release rewrites it. It certifies only that every non-empty field has SOME element carrying its path; it cannot see copy that was never modelled, so diff each route's visible text against its entry values before calling a page done. `unaddressable` is that measure: visible text on the live site no field owns, measured server-side on every inspected page each release, by route and bucket, biggest first. Over `count / visible > 0.02` is copy the CMS cannot see: fix it in the SOURCE (wrap the run in an element the codemod can bind, or declare `<BcmsField path=\u2026>`), deploy, re-read \u2014 playbook section 11. `builtRoutes` lists the routes the live build has HTML for (null = cannot say). `canvas.lane` is the editor's live-preview lane \u2014 `bridge`, `draft-route` or `none` (then get_next_steps carries the recipe). `skipReasons` says why pages were not inspected; `coverage.error` = `nothing-bound` means no element of this build carries a binding, so the percentage beside it describes a site this build is not.",
+        "The receipt for 'is this site actually EDITABLE?'. Each release scans the built HTML for the element rendering each CMS field value; per slot this returns `mode` ('text-match' = guessed from rendered text, 'declared' = template-declared), what was bound, and `unmatched`: each path with its reason \u2014 not-declared, ambiguous-text, no-element, declared-only, needs-wrap, refused, layout-owned, page-owned, layout-locator-stale, locale-unvarianted, svg-unavailable, report-outdated. DEPLOY FIRST: before any release there is no report (pages 0, mode null, refreshRequired true). `refreshReason`: `never-generated` \u2014 only a release BetterCMS builds and serves writes a report, so a HEADLESS site never gets one, redeploy or not; `outdated` \u2014 the next release rewrites it. It certifies only that every non-empty field has SOME element carrying its path. `unaddressable` is the copy it cannot see: visible live text no field owns, by route and bucket, biggest first (null = unmeasured: diff visible text against entry values). Over `count / visible > 0.02`, fix it in the SOURCE (wrap the run in an element the codemod can bind, or declare `<BcmsField path=\u2026>`), deploy, re-read \u2014 playbook \xA711. `builtRoutes`: routes the live build has HTML for (null = cannot say). `layoutIncomplete`: Layout paths the last content apply could not write (their publish waits); `layoutUnread`: Layout fields no route reads (`layoutUnreadJudged` false = not judged). `canvas.lane`: the editor's live-preview lane (`bridge`, `draft-route`; `none` \u2192 get_next_steps). `coverage.error` `nothing-bound`: no element of this build is bound, so its percentage describes another site.",
         z.object({ slot: z.enum(["current", "staging"]).optional().describe("which release tree to read \u2014 everything here, `unaddressable` included, is measured PER SLOT, so on a promote-gated project pass 'current' to read the tree the editor frames. Defaults to the slot this project's releases land in. The response's `sha` is the build the report describes; `refreshRequired` is true when that is not the build this slot serves.") }).shape,
         async (c, a) => ok("Binding report.", await data(c, "GET", `/management/projects/current/binding-report${q({ slot: a.slot })}`))
       ),
@@ -3853,18 +4209,19 @@ ${res.warnings.join("\n")}` : summary, res.data);
       def(
         "componentize_sections",
         "Turn this site's derived sections into components",
-        "Turn this site's derived sections into components. CONFIRM WITH THE USER FIRST: show them get_componentize_plan's sections, how many components it will create and which pages it will rewrite; `dryRun` first. It creates each proposed component as a DRAFT and replaces each page's DRAFT blocks with ordered `component` instances, one per group, each carrying `props.bind: \"<groupKey>\"` \u2014 the page field group that already holds the copy. Nothing is copied or moved: the page keeps its `fields`, values and bindings, so click-to-edit and the coverage meter do not change (`copy: \"instance\"` moves the words onto each placement instead \u2014 see `copy`). Pass the plan's `digest`; a 409 `stale-plan` means the site changed: read the plan again, show the user what changed and confirm again. Read `components.wouldDuplicate` before applying: each id is an existing same-family component this run would sit a NEW one beside, because reuse is by identity and slug, never by family. Re-running is safe: an already-placed group returns in `sections.pending` as ALREADY_COMPONENTIZED, with no second component. DRAFTS ONLY \u2014 an unpublished component renders as an EMPTY STRING on the live site, so publish_component each one and publish the pages, then run `npx @bettercms-ai/convert --componentize` in the repo so its templates render these sections from `pages[].blocks`. Every component it CREATES is filed into a Component Group (see `group`). When the user says a proposed group is NOT a section, pass `decline: true` with those `sections` (and `pageIds`): nothing is componentized, the plan reports them `NOT_A_SECTION` / `DECLINED` and stops proposing them, and a plan that proposes nothing undeclined is done; `decline: false` offers them again.",
+        "Turn this site's derived sections into components. CONFIRM WITH THE USER FIRST: show them get_componentize_plan's sections, how many components it will create and which pages it will rewrite; `dryRun` first. It creates each proposed component as a DRAFT and replaces each page's DRAFT blocks with ordered `component` instances, one per group, each carrying `props.bind: \"<groupKey>\"` \u2014 the page field group that already holds the copy. Nothing is copied or moved: the page keeps its `fields`, values and bindings, so click-to-edit and the coverage meter do not change (`copy: \"instance\"` moves the words onto each placement instead \u2014 see `copy`). Pass the plan's `digest`; a 409 `stale-plan` means the site changed: read the plan again, show the user what changed and confirm again. Read `components.wouldDuplicate` first: each id is an existing same-family component a NEW one would sit beside (reuse is by identity and slug, never family). Re-running is safe: a placed group returns as ALREADY_COMPONENTIZED. DRAFTS ONLY \u2014 an unpublished component renders as an EMPTY STRING on the live site, so publish_component each one and publish the pages, then run `npx @bettercms-ai/convert --componentize` in the repo so its templates render these sections from `pages[].blocks`. Every component it CREATES is filed into a Component Group (see `group`). When the user says a proposed group is NOT a section, pass `decline: true` with those `sections` (and `pageIds`): nothing is componentized, the plan reports them `NOT_A_SECTION` / `DECLINED` and stops proposing them, and a plan that proposes nothing undeclined is done.",
         z.object({
           digest: z.string().min(1).describe("The `digest` get_componentize_plan returned. A different one is refused with 409 stale-plan."),
           pageIds: z.array(z.string().min(1)).optional().describe("Componentize only these pages (ids from the plan). Omit for every page the plan lists."),
           pages: z.array(z.string().min(1)).optional().describe("The same page filter under the name the dashboard uses. Unioned with pageIds; an EMPTY list is refused rather than treated as every page."),
-          sections: z.array(z.string().min(1)).optional().describe("Act only on these section groupKeys (from the plan). Every other section on the page keeps the placement it already has."),
-          copy: z.enum(["bind", "instance"]).optional().describe("Who owns each section's copy. 'bind' (default) leaves it in the page fields. 'instance' is the page-builder model: each placement takes that group's CURRENT draft values into its own `props.overrides` (a repeater becomes one table prop holding every row), records which page path each came from in `props.source`, and drops `props.bind`; the page's fields are KEPT and marked `origin: \"componentized\"`, so nothing is lost and the editor stops showing a second place to type the same words."),
+          sections: z.array(z.string().min(1)).optional().describe("Act only on these section groupKeys (from the plan); every other section keeps its placement."),
+          copy: z.enum(["bind", "instance"]).optional().describe("Who owns each section's copy. 'bind' (default) leaves it in the page fields. 'instance' is the page-builder model: each placement takes that group's CURRENT draft values into its own `props.overrides` (a repeater becomes one table prop holding every row), records which page path each came from in `props.source`, and drops `props.bind`; the page's fields are KEPT and marked `origin: \"componentized\"`."),
           dryRun: z.boolean().optional().describe("true = return the receipt without writing anything. Do this first."),
           group: z.string().min(1).max(100).optional().describe("File the components this run creates into this Component Group (a folder of the dashboard's Components tab; by NAME, created when missing), else its section family: nav, header, footer or menu \u2192 Layout, an unnamed section \u2192 Sections, otherwise the family name (Hero, FAQ). A reused component keeps its Group; the receipt's `components.groups` lists the Groups filed into."),
-          decline: z.boolean().optional().describe("true = record `sections` as NOT sections (nothing is componentized; the plan stops proposing them). false = offer them again. Needs `sections`.")
+          decline: z.boolean().optional().describe("true = record `sections` as NOT sections (nothing is componentized; the plan stops proposing them). false = offer them again. Needs `sections`."),
+          joinTwins: z.boolean().optional().describe("true = move each locale copy (`/fr`) still on its own component onto its twin's (`bindPaths` keeps its fields). A dry run lists each in `joins`. Whole plan only.")
         }).shape,
-        async (c, a) => ok("Componentized the sections.", await data(c, "POST", `/management/projects/current/componentize`, { digest: a.digest, pageIds: a.pageIds, pages: a.pages, sections: a.sections, copy: a.copy, dryRun: a.dryRun, group: a.group, decline: a.decline }))
+        async (c, a) => ok("Componentized the sections.", await data(c, "POST", `/management/projects/current/componentize`, { digest: a.digest, pageIds: a.pageIds, pages: a.pages, sections: a.sections, copy: a.copy, dryRun: a.dryRun, group: a.group, decline: a.decline, joinTwins: a.joinTwins }))
       ),
       def(
         "get_analytics_overview",
@@ -4310,7 +4667,7 @@ ${notes.join("\n")}` : summary, created);
             ...args.description !== void 0 ? { description: args.description } : {},
             ...args.urlPattern !== void 0 ? { urlPattern: args.urlPattern } : {},
             ...args.kind !== void 0 ? { kind: args.kind } : {},
-            ...args.fieldsets !== void 0 ? { fieldsets: args.fieldsets } : {},
+            ...args.fieldsets !== void 0 ? { fieldsets: dropProvenance(args.fieldsets) } : {},
             fields: toFields(args.fields)
           });
           return ok(
@@ -4667,7 +5024,7 @@ ${notes.join("\n")}` : summary, created);
       name: "publish_layout",
       config: {
         title: "Publish the Global Layout draft",
-        description: "Publish the connected project's GLOBAL Layout draft (navigation, footer, every reserved section) so the live site builds from it. Until this is called the layout stays draft and get_layout copy:'published' answers PUBLISHED_LAYOUT_UNAVAILABLE \u2014 site chrome authored with update_layout is NOT live. Read get_layout first and pass its revision as ifMatch; a stale revision returns 409 \u2014 re-read, never retry blindly. A 422 lists validation issues to fix with update_layout first. A new project's chrome is draft: publish_component navigation-default and footer-default first (each can publish while the other is draft), then publish_layout. navigation.logo is a REQUIRED image \u2014 new projects get a generated one; if it is empty (required_value) or not a stored asset (image_asset_missing), upload one and set it with update_layout as { id, url, name, altText }. Verify with get_layout copy:'published' and check the copy echo \u2014 this tool's own response is the write's echo, not a receipt. Page overrides go live with the page (update_page status:'published'). A 403 PUBLISH_NOT_GRANTED means this connection can author drafts but cannot publish \u2014 say so and let the user allow publishing or publish from the dashboard.",
+        description: "Publish the connected project's GLOBAL Layout draft (navigation, footer, every reserved section). On a site BetterCMS serves, a Layout publish never builds: it writes the VALUES into the live pages, and a STRUCTURE change (Sections added, removed, moved) waits for a Rebuild or a push (`layout-rebuild-required`); a custom host gets its deploy hook. Until published, get_layout copy:'published' answers PUBLISHED_LAYOUT_UNAVAILABLE. Pass get_layout's `revision` as ifMatch; a stale one returns 409 \u2014 re-read, never retry blindly. A 422 lists validation issues (global, or per page override: pageSlug, copy) to fix with update_layout. A new project's chrome is draft: publish_component navigation-default and footer-default first (each independently). navigation.logo is optional: empty, the nav shows the brand mark (set_brand_assets) or the site name. Never add a logo the site does not have. Verify with get_layout copy:'published' \u2014 this response is the write's echo, not a receipt. Page Layout overrides go live with the page (update_page status:'published'). 403 PUBLISH_NOT_GRANTED: this connection may author drafts, not publish \u2014 say so; the user allows it or publishes from the dashboard.",
         inputSchema: publishLayoutInput.shape
       },
       handler: guard(async (args) => withClient(async (client) => {
@@ -4907,8 +5264,8 @@ ${lines.join("\n")}`, found);
       },
       handler: guard(
         async (args) => withClient(async (client) => {
-          const { componentId, ...input } = args;
-          const cmp = await client.updateComponent(componentId, input);
+          const { componentId, ifMatch, ...input } = args;
+          const cmp = await client.updateComponent(componentId, input, { ifMatch });
           return ok(`Updated component '${cmp.name}' (id ${cmp.id}).`, cmp);
         })
       )
@@ -5370,6 +5727,12 @@ AUTHORING_DECISION_REQUIRED** until a human has chosen this project's architectu
 asked ONCE per project, ever. It is not an error to retry or route around: read the message
 out, let the user pick, call \`set_authoring_preference\`, then deploy again.
 
+Until someone answers, the release lane behaves as \`components\`: the preference is null, and
+each release still componentizes the derived pages in bind mode. \`fields\` is the only answer
+that stops it. And a run over the WHOLE plan splits a section component an earlier run placed on
+2 pages into one per page (the first page keeps it, the others get a clone), so two pages' heroes
+stop editing each other; a run narrowed to one page or section never splits.
+
 It exists because an imported site arrives **field-driven whether anyone chose that or not**
 \u2014 a crawl-based import (Webflow, a starter, a template) emits pages with a typed field schema
 and an empty block tree, because that is all a crawl can infer. Nobody decided it. On a
@@ -5385,11 +5748,14 @@ component placement, and the page keeps its fields, its values and its bindings.
     2. get_componentize_plan    one component per section, computed live; creates nothing. It
                                 reads this project's PUBLISHED pages, so no deploy is needed
                                 to reach it \u2014 the deploy is the last step, not the first.
-                                On a site DERIVED at import the release hook has already run
-                                this plan in bind mode and PUBLISHED what it created, so
-                                expect ALREADY_COMPONENTIZED and skip to step 6 (publish the
-                                pages) \u2014 the lane publishes the COMPONENTS, not the placements,
-                                which are still draft blocks on the pages
+                                On a site DERIVED at import, each release after this answer
+                                runs this plan in bind mode for NEW sections (it never splits
+                                or joins a placement, and runs nothing while the answer is
+                                unset) and PUBLISHES what it created, so after one expect
+                                ALREADY_COMPONENTIZED and skip to step 6 (publish the pages) \u2014
+                                the lane publishes the COMPONENTS, not the placements, which
+                                are still draft blocks on the pages. A /fr still on its own
+                                components joins its twin's with \`joinTwins: true\` (step 4)
     3. show the user the plan and CONFIRM \u2014 it says how many components and which pages
     4. componentize_sections    \`dryRun: true\` first, then for real; components land as DRAFTS
                                 and each placement carries \`props.bind\` to the page's field
@@ -5502,7 +5868,7 @@ renders. Three consequences, each load-bearing:
        Binding only one copy leaves the others showing the old text until the next rebuild.
     3. Make the chrome ITSELF editable by speaking the layout grammar: the nav/footer
        elements declare \`data-bcms-layout-section="navigation"\` / \`"footer"\`, and each
-       CMS-backed text inside them a \`data-bcms-layout-field="layout:<sectionId>:<fieldId>"\`
+       CMS-backed text inside them a \`data-bcms-layout-field="layout:<sections[slug].id>:<fieldId>"\`
        marker (fieldId is the field's REAL id, verbatim \u2014 production layout ids are
        section-prefixed and dotted, e.g. \`footer.tagline\`, so the marker reads
        \`layout:footer:footer.tagline\`) \u2014 the canvas then gives them hover chrome, the
@@ -5512,18 +5878,31 @@ renders. Three consequences, each load-bearing:
        sub appends its slug (\`layout:navigation:navigation.cta.label\`), a repeater row its
        STORED index then the slug (\`layout:navigation:navigation.links.0.label\`), nesting
        as deep as the schema goes (\`layout:footer:footer.link-groups.0.links.1.label\`).
-       Three rules, each one a measured defect when broken:
+       Five rules, each one a measured defect when broken:
        a. a field rendered by TWO elements gets a marker on BOTH \u2014 the editor keeps the copies
           in sync, and a marker on only one leaves the other stale;
        b. PROVENANCE \u2014 mark an element only when the LAYOUT supplied its value; a marker
           over a fallback/singleton-sourced string opens an editor for a row that does not
           exist;
        c. row markers use the value's STORED index (a row you filtered out of the render
-          still occupies its slot), or the edit lands on the wrong row.
+          still occupies its slot), or the edit lands on the wrong row;
+       d. the address names the DELIVERED entry's id, \`sections[slug].id\`, never the slug \u2014 a
+          Section created in the dashboard has a UUID id. On a translated route address the
+          entry that fills the slot, by ITS own id: a page's own \`layout\` already delivers it
+          at \`sections['navigation']\`, the Global Layout carries it beside the base at
+          \`sections['navigation--fr']\`; the \`data-bcms-layout-section\` wrapper still names
+          the SLOT, the base slug (\`navigation\`);
+       e. ONE OWNER PER ELEMENT: never a \`data-bcms-field\` inside a Layout-declared region.
+          The report will not flag one you write: it binds, and the element gets two writers.
+          \`layout-owned\` names only the page copies left with no element, which the strip removes.
        Text/longtext leaves edit inline; link/select/image leaves are side-panel-only by
        design (their formats need a real control). THE DOCTRINE: every string a marketer
        can see must be addressable \u2014 no marker means read-only on the canvas, so an
        unmarked CMS-backed string is a defect, not a style choice.
+       On a site BetterCMS serves, a Layout publish never builds: it writes the new VALUES into
+       the live pages, and a STRUCTURE change (a Section added, removed or moved) waits for a
+       Rebuild or a push \u2014 get_next_steps says \`layout-rebuild-required\` until a build ships
+       it. A custom host gets its deploy hook instead.
     4. Keep chrome semantic \u2014 \`<nav>\`, \`<footer>\`, page content inside \`<main>\`, mastheads
        as a top-level \`<header>\`. Chrome is edited through the project Layout, not the page,
        and semantic landmarks are how the editor keeps a nav edit from being written into page
@@ -5571,7 +5950,7 @@ below is one heading of that ask.
 **1. Global elements.** Navbar, mobile nav, header and footer are the LAYOUT, not page content:
 \`get_layout\` then \`update_layout\`, and a chrome COMPONENT is placed into a Layout section with
 the \`add-component\` command. CTA buttons are \`button\` BLOCKS inside the section that uses them,
-exposed as \`text\` + \`url\` props \u2014 variant, size and icon are that block's own props and
+exposed as \`text\` + \`url\` props \u2014 variant, size and fullWidth are that block's own props and
 \`style\`, never a standalone Button component. Rich text is a \`richtext\` prop over a
 \`richtext\`/\`text\` block. Forms are \`create_form\` plus a \`form\` block, and form FIELDS are the
 one place the platform models \`required\`, \`placeholder\`, \`helpText\` and real \`validation\`
@@ -5590,8 +5969,8 @@ still gets its own component: its own family, plus \`allowedOn: ["slug:<page>"]\
 with NO \`sectionType\` never appears in the editor's "Add a section" picker. Start from the
 builtin blueprints \`list_components\` returns (\`builtin:*\`) instead of hand-writing block JSON.
 On a DERIVED site run \`get_componentize_plan\` \u2192 \`componentize_sections\` FIRST \u2014 it does most
-of this in one call, and on a site derived at IMPORT the release hook has already run it in bind
-mode and published the components, so expect ALREADY_COMPONENTIZED \u2014 the placements it wrote are
+of this in one call, and once \`components\` is recorded each release of a site derived at IMPORT
+runs it in bind mode and publishes the components, so expect ALREADY_COMPONENTIZED \u2014 the placements it wrote are
 still DRAFT blocks on the pages, so publish the pages, then \`npx @bettercms-ai/convert
 --componentize\`.
 
@@ -5889,7 +6268,7 @@ delivered value \u2014 they change editor chrome only.
 \`\`\`jsonc
 { "key": "testimonials", "label": "Testimonials", "type": "repeater",
   "ui": { "collapsed": true, "preview": { "title": "author", "media": "avatar" },
-          "layout": "grid", "reorderable": true },
+          "layout": "grid", "icon": "double-quote", "itemLabel": "Testimonial" },
   "helpText": "Three to five. Shortest quotes read best.",
   "fields": [ { "key": "author", ... }, { "key": "avatar", "type": "image", ... }, ... ] }
 \`\`\`
@@ -5919,6 +6298,11 @@ delivered value \u2014 they change editor chrome only.
   \`select\` with a few short options (alignment, theme, size: one click instead of a dropdown);
   \`'slider'\` on a \`number\` with \`config.min\` < \`config.max\` (opacity, columns). Anywhere else it
   is refused with the rule named.
+- **\`ui.icon\`** \u2014 the branch row's icon: ONE name from \`bettercms://icons/dock\` (read that resource;
+  any other string is a 400). Nesting fields, fieldsets and a prop's \`ui.group\` only. Layout
+  section icons are a different vocabulary (Lucide names), so a name valid there may be refused here.
+- **\`ui.itemLabel\`** \u2014 what ONE item of a list is called ("Slide", "Person"), at most 24 characters:
+  the add button, the crumbs and the empty state say it. Nesting fields only.
 
 **Six refusals, all deliberate, all 400 with the fix in the message.**
 1. An unknown key inside \`ui\` is REJECTED, not stripped. \`ui\` is a strict object precisely so
@@ -5942,7 +6326,10 @@ only prop whose value is a list (a \`group\` is one object, a \`slot\` one compo
 prop's \`preview\` keys name a SUB-FIELD from its own \`config.fields\` and are checked against
 them \u2014 except on a \`slot\`, whose children belong to whichever component fills it and therefore
 cannot be resolved at save time. \`update_component\` REPLACES the whole \`props\` array, so echo
-back each prop's stored \`ui\` or you delete it along with the prop.
+back each prop's stored \`ui\` or you delete it along with the prop. Props have no fieldsets, so a
+prop joins a group with \`ui.group\`: the FIRST prop of a group defines \`{ id, label, kind?, icon?,
+collapsed? }\` (kind \`group\` or \`row\`, never \`tab\`), and every later prop sends \`{ id }\` only. A
+FIELD never takes \`ui.group\`; it joins a fieldset with \`fieldsetId\`.
 
 \`\`\`jsonc
 { "key": "slides", "label": "Slides", "type": "table",
@@ -5952,11 +6339,92 @@ back each prop's stored \`ui\` or you delete it along with the prop.
                           { "key": "caption", "type": "text", ... } ] } }
 \`\`\`
 
+**Patterns \u2014 what the dock draws, and the key that asks for it.**
+- **leaf** \u2014 one field, one control. Nothing to declare; \`ui.control\` only when the default is wrong.
+- **group** \u2014 a \`kind: 'group'\` fieldset (a prop: \`ui.group\`): a disclosure that shows two values
+  when closed. \`collapsed: true\` starts it closed.
+- **row** \u2014 a \`kind: 'row'\` fieldset: at most 3 short scalars (number, color, boolean, date,
+  datetime, select) on one line. No \`ui.control\` on a row member.
+- **branch** \u2014 a nesting field drawn as a drill-in row with its \`ui.icon\` and a summary.
+- **list** \u2014 repeatable items named by \`ui.itemLabel\` and \`ui.preview\`.
+- **grid** \u2014 \`layout: 'grid'\`, media-led: the field needs an image or file child for \`preview.media\`.
+- **table** \u2014 \`layout: 'table'\`: at most 3 scalar columns (text, number, select, boolean, date,
+  datetime, slug, email).
+- **section header** \u2014 a fieldset's \`name\` and \`description\` over its fields.
+- **conditional** \u2014 \`showIf\`, placed AFTER the field it reads.
+
+**Budgets, per dock screen.** \`get_next_steps\` measures them (\`dock-budget\`):
+- at most **8 ungrouped leaves** at rest (the pinned fields plus any one tab);
+- at most **12 leaves in a group**, and branches at most **3 levels** deep;
+- **any value within 2 activations** of its section screen. A collapsed group, a non-first tab and a
+  branch each cost 1, so a group inside tab 2 already costs 2: leave groups in non-first tabs open.
+Importance orders a screen: required fields first, then array order.
+
+**Recipes \u2014 named key presets, never code.** Pick the one the section is; adapt the child keys.
+
+| Recipe | Keys |
+|---|---|
+| Gallery | \`layout:'grid'\`, \`preview:{media:'image', title:'caption'}\`, \`itemLabel:'Image'\`, \`icon:'images'\` |
+| Logo wall | \`layout:'grid'\`, \`preview:{media:'logo', title:'name'}\`, \`itemLabel:'Logo'\`, \`icon:'image'\` |
+| Team | \`layout:'grid'\`, \`preview:{media:'photo', title:'name', subtitle:'role'}\`, \`itemLabel:'Person'\`, \`icon:'users'\` |
+| Testimonials | \`preview:{title:'author', subtitle:'role', media:'avatar'}\`, \`itemLabel:'Testimonial'\`, \`icon:'double-quote'\` |
+| Steps | \`preview:{title:'title'}\`, \`itemLabel:'Step'\`, \`icon:'olist'\`; \`reorderable:false\` only on Tier-1 evidence |
+| Pricing tiers | \`preview:{title:'name', subtitle:'price'}\`, \`itemLabel:'Tier'\`, \`icon:'tiers'\` |
+| FAQ | \`preview:{title:'question'}\`, \`itemLabel:'Question'\`, \`icon:'help-circle'\` |
+| Nav links | \`preview:{title:'label', subtitle:'href'}\`, \`itemLabel:'Link'\`, \`icon:'link'\` (never a table: a label and its href are one link) |
+| Stats | \`layout:'table'\` over \u22643 scalar columns (value, label, suffix), \`itemLabel:'Stat'\`, \`icon:'bar-chart'\` |
+| CTA | one \`kind:'group'\` fieldset holding the heading, text, button label AND href (a button's pair shares one fieldset), \`icon:'launch'\` |
+| Dimensions | one \`kind:'row'\` fieldset of up to 3 numbers (width, height, gap) |
+
+**Tabs.** A \`kind: 'tab'\` fieldset is a tab:
+- at most **3** tabs, names at most 20 characters and unique;
+- top-level fields only: tabs never nest and props never take them;
+- untabbed fields stay PINNED above the strip;
+- a group or row fieldset joins a tab with \`tab: '<tab id>'\`; groups in a non-first tab default open;
+- with fewer than 2 non-empty tabs no strip renders, so a tab for one fieldset is noise.
+
+\`\`\`jsonc
+"fieldsets": [
+  { "id": "content", "name": "Content", "kind": "tab" },
+  { "id": "style", "name": "Style", "kind": "tab" },
+  { "id": "cta", "name": "Button", "kind": "group", "tab": "content", "icon": "launch" },
+  { "id": "size", "name": "Size", "kind": "row", "tab": "style" }
+]
+\`\`\`
+
+**The write path \u2014 existing fields, by path, with If-Match.**
+- A model's fields: \`update_content_model\` with \`fieldUi\`, \`fieldFieldset\`, \`fieldOrder\`,
+  \`fieldLabel\`, \`fieldHelpText\` (keyed by dotted key path, \`'hero.title'\`) and \`fieldsets\`. A page's
+  schema: the same call with \`pageId\` instead of \`modelId\`, and the version from \`get_page\`'s
+  \`backingModel\`.
+- A component's props: \`update_component\` with \`propUi\`, \`propGroup\`, \`propLabel\` (keyed by prop key).
+  They write the DRAFT props; no publish is needed for the editor to show them.
+- Always send \`ifMatch\`, the \`optimisticVersion\` you read.
+- A NEW field carries its chrome in the same \`add_field\` / \`add_page_field\` call.
+
+**The dock's refusals, each named in the message.**
+- **428** \`precondition-required\` \u2014 a chrome key without \`ifMatch\`. Read, then send it.
+- **409** \`version-conflict\` \u2014 someone wrote since your read. Read again, re-apply; never retry blindly.
+- **409** \`ui_human_owned\` \u2014 a person shaped those paths. Leave them, or send \`override: true\`, and
+  only when the user said so.
+- \`tab_unknown\`, \`tab_nested\`, \`tab_props\`, \`tab_max\`, \`tab_name\`, \`tab_depth\` \u2014 the tab rules above.
+- \`fieldset_unknown\` / \`fieldset_orphan\` \u2014 a \`fieldsetId\` naming no fieldset, or a list that drops a
+  fieldset its fields still name.
+- \`row_member_type\`, \`row_member_count\`, \`row_member_control\` \u2014 the row rule.
+- \`pair_split\` \u2014 a button's label and href in different fieldsets.
+- \`ui.icon\` or \`ui.itemLabel\` on a leaf; an icon name not in \`bettercms://icons/dock\`.
+- \`layout_grid\` \u2014 a grid with no image or file child. \`layout_table\` \u2014 more than 3 columns, or a
+  column that is not a scalar.
+- \`prop_group_unknown\` / \`prop_group_redefined\` \u2014 the \`ui.group\` define-once rule.
+- \`field_path_unknown\` / \`field_path_ambiguous\` / \`field_order_not_permutation\` \u2014 a path that names
+  no field or two, or an order that is not exactly the parent's keys.
+
 **THE RECEIPT \u2014 read it back.** There is no separate verification tool and no mode to flip.
 \`get_content_model\` (and \`get_page\` / \`get_component\`) return each field's \u2014 and each component
 prop's \u2014 stored \`ui\`, \`helpText\` and \`showIf\`. A prop that is ABSENT from that response was not
-stored, whatever the write returned \u2014 \xA711 RECEIPTS rule 3, applied to this feature. Declare, then read
-back, then say it works.
+stored, whatever the write returned \u2014 \xA711 RECEIPTS rule 3, applied to this feature. For a page, read
+\`get_page\` and its \`backingModel\`. Then call \`get_next_steps\`: \`dock-budget\`, \`dock-repeater-unnamed\`
+and \`dock-showif-order\` must all be gone. Declare, then read back, then say it works.
 
 **No \`order\` property. Ever.** A field's order IS its index in \`fields\`. To put a new field
 somewhere other than the end, pass \`after: '<existing top-level field key>'\` to \`add_field\` /
@@ -6032,6 +6500,35 @@ Do not stop at the plan or at a partial receipt \u2014 finish the whole site, ne
    reads mode "declared", unmatched 0, bound above 0, \`coverage.pending\` empty. Send me that report.
 10. Ask me whether to commit and push to my repository, commit only, or leave it uncommitted (unpushed, the
    next rebuild from my repo drops it). Touch git only as I answer.`;
+var FIELD_UI_PROMPT = {
+  title: "Declare how fields LOOK in the editor (guided)",
+  description: "Set the editor chrome of an existing schema and its component props: groups, tabs, rows, icons, item names, what titles and thumbnails a list's rows, help text, conditional visibility. Derives it from your source, then from the field shapes, and asks only what it cannot know.",
+  request: "scope, e.g. 'the Team and Testimonials models' or 'the whole project'"
+};
+var FIELD_UI_TEXT = (request) => `Declare the editor UI for my BetterCMS fields and component props.${request ? ` Scope: "${request}".` : ""}
+
+Read bettercms://playbook/schema section 14 first: the vocabulary, patterns, budgets, recipes, the
+tabs rule, every refusal, and the three tiers that decide each value (my source, then the field
+shape, then ask me, once and batched). Icon names are in bettercms://icons/dock.
+
+**Order of work**
+1. \`get_next_steps\`: its dock-budget, dock-repeater-unnamed and dock-showif-order steps name the
+   screens to fix. Read each target with \`get_content_model\`, \`get_page\` (its \`backingModel\`) or
+   \`get_component\`; note its \`optimisticVersion\` and the chrome a person already set.
+2. Decide each field's chrome by the \xA714 tiers and write down which tier answered.
+3. Apply one write per model or component, always with \`ifMatch\` (428 without it; 409
+   version-conflict when stale: read again and re-apply, never retry blindly):
+   - fields that exist: \`update_content_model\` fieldUi / fieldFieldset / fieldOrder / fieldLabel /
+     fieldHelpText by field path, plus \`fieldsets\`. A singleton page: send \`pageId\` instead of
+     modelId, with its backingModel's version;
+   - component props: \`update_component\` propUi / propGroup / propLabel;
+   - a NEW field: ui / helpText / showIf in the same \`add_field\` / \`add_page_field\` call, with \`after\`.
+   A 409 \`ui_human_owned\` names chrome a person set: leave it, or ask me and send \`override: true\`
+   only on my word.
+4. **RECEIPT, non-negotiable.** Re-read every target and confirm the stored chrome matches what you
+   sent: a key ABSENT from the read was not stored, whatever the write said. Call \`get_next_steps\`
+   until no dock-* step is left. Report per field the tier that decided it, what you set, and that
+   the read-back confirmed it; say plainly what you could not confirm.`;
 var SCHEMA_PROPOSAL_FLOW = `### Whole-project design (confirm-first) \u2192 \`create_component\` / \`create_page\` / \`create_content_model\`
 Design the WHOLE project from its brief or its code, and **confirm the shape with the user
 BEFORE creating anything**. Never silently guess.
@@ -6576,104 +7073,12 @@ On 401/403, the MCP key needs (re)authorizing.`
   server.registerPrompt(
     "field-ui",
     {
-      title: "Declare how fields LOOK in the editor (guided)",
-      description: "Set the authoring chrome on an existing schema \u2014 collapsed panels, what titles and thumbnails a repeater's rows, help text, conditional visibility. Derives it from your site's source where there is source, from the field shapes where there isn't, and only asks you about the three things it genuinely cannot know.",
-      argsSchema: {
-        request: z2.string().optional().describe("scope, e.g. 'the Team and Testimonials models' or 'the whole project'")
-      }
+      title: FIELD_UI_PROMPT.title,
+      description: FIELD_UI_PROMPT.description,
+      argsSchema: { request: z2.string().optional().describe(FIELD_UI_PROMPT.request) }
     },
     ({ request }) => ({
-      messages: [
-        {
-          role: "user",
-          content: {
-            type: "text",
-            text: `Declare the editor UI for my BetterCMS fields.${request ? ` Scope: "${request}".` : ""}
-
-Read bettercms://playbook/schema section 14 first \u2014 it has the exact prop shapes and the refusals.
-
-**What you are setting** (all of these ride on any field, on create_content_model / create_page /
-add_field / add_page_field; none of them affect delivery):
-  ui.collapsed              start a nesting field's panel closed
-  ui.preview {title,subtitle,media}  which CHILD FIELD KEY titles a collapsed row, its second line, its thumb
-  ui.layout 'list'|'grid'|'table'   how its items are arranged; table is for repeatable row schemas; omit for list
-  ui.reorderable            omit (= true) unless the ORDER IS THE MEANING; false LOCKS the list
-  ui.control 'segmented'|'slider'   a LEAF's control: segmented on a select, slider on a number with config.min < max
-  helpText                  one line under the field: what to WRITE here
-  showIf                    hide a field until another field has a value
-
-**The same \`ui\` rides on COMPONENT PROPS** \u2014 create_component / update_component, one per entry
-of \`props\`. Placement differs because the vocabulary does: preview/layout on 'group', 'table'
-and 'slot'; reorderable on 'table' ALONE (the only prop whose value is a list). A prop's preview
-keys name a SUB-FIELD from its own config.fields. If this scope includes components, do them in
-the same pass \u2014 but note update_component REPLACES the whole props array, so read get_component
-first and echo every prop back WITH its stored ui.
-
-**Work the three tiers in order. Stop at the first that answers \u2014 do not escalate what a tier
-below already settled.**
-
-TIER 1 \u2014 DERIVE FROM SOURCE, if and only if you have a checkout of the site.
-  Read the component that renders each field. \`<img src={item.photo}>\` next to
-  \`<h3>{item.name}</h3>\` in the map over a list IS the answer: preview {title:'name',
-  media:'photo'}. A block inside \`<details>\` or behind a "Show more" is collapsed:true.
-  A \`grid-cols-*\` wrapper around the map is layout:'grid'. A FIXED-ARITY render \u2014
-  steps[0]/steps[1]/steps[2], or copy that names positions ("Step 1", "finally") \u2014 is
-  reorderable:false, and it is the ONLY evidence that earns that key.
-  \u{1F534} THE SERVER NEVER READS YOUR SOURCE. \`pull_project_source\` / \`get_conversion_brief\` hand
-  the repo to YOU; add_field does not look at it. This tier is your own reading, in your own
-  checkout, before you call any tool. ON A GREENFIELD SCHEMA-FIRST PROJECT THERE IS NO SOURCE \u2014
-  Tier 1 does not apply and TIER 2 IS THE FLOOR. Do not stall waiting for code that will
-  never exist.
-
-TIER 2 \u2014 DERIVE FROM THE FIELD SHAPE, when the code is silent or absent.
-  One image-ish child in a repeater \u2192 that is \`media\`. The first required short-text child
-  (name/title/heading/label) \u2192 that is \`title\`. More than ~6 children, or a label that reads
-  optional ("Advanced", "Extras") \u2192 collapsed:true. A repeatable whose item is mostly its
-  image (gallery, logos, team) \u2192 layout:'grid'; everything else stays list, so OMIT layout.
-  \`reorderable\` has NO Tier-2 guess \u2014 leave it absent. The default is true, and locking a
-  list the user did not ask to lock silently removes something they could do yesterday.
-  GUESS HERE otherwise. A wrong preview costs one edit; a question per repeater costs the
-  user the session.
-
-TIER 3 \u2014 ASK ME, and ONLY for these three. Batch them into ONE AskUserQuestion at the end,
-  never one field at a time:
-  a) A panel with MANY fields, where grouping and order depend on which content I treat as
-     primary \u2014 you cannot infer my priorities.
-  b) CONDITIONAL VISIBILITY (showIf) \u2014 it is business logic about when a field is irrelevant.
-     Never invent a rule.
-  c) VARIANTS SHARING A sectionType \u2014 their prop keys must match, or swapping the layout loses
-     content. Confirm the shared key set before declaring per-variant chrome.
-
-**Order of work**
-1. \`list_content_models\` / \`list_pages\`, then \`get_content_model\` / \`get_page\` for each target.
-   Note which fields ALREADY carry ui/helpText/showIf \u2014 do not overwrite a human's choice
-   without asking.
-2. Decide each field's chrome by the tiers above. Write down which tier answered; you will
-   report it.
-3. Apply. For a field that already exists, the declaration goes with the field: use the
-   dashboard or a model update \u2014 \`add_field\` APPENDS and refuses an existing key, so it is
-   the wrong tool for editing one. For a NEW field, pass ui/helpText/showIf in the same
-   \`add_field\` / \`add_page_field\` call, and pass \`after: '<existing key>'\` if it belongs
-   somewhere other than the bottom.
-4. **RECEIPT \u2014 non-negotiable.** Re-read every target with \`get_content_model\` / \`get_page\` /
-   \`get_component\` and
-   confirm the stored \`ui\` matches what you sent. A prop ABSENT from that response was NOT
-   stored, whatever the write said. Report per field: the tier that decided it, what you set,
-   and that the read-back confirmed it. Anything you could not confirm, say so plainly.
-
-**Refusals you should expect and must not work around:** an unknown key inside \`ui\` is a 400
-(it is strict on purpose \u2014 that is your typo, named); \`ui.preview\` or \`ui.layout\` on a leaf
-field is a 400 (both describe ITEMS); \`ui.reorderable\` anywhere without a LIST is a 400 \u2014 a
-\`group\` and a non-repeatable zone hold one item, so only \`repeater\`, an \`array\` with
-config.zones.repeatable, and \`modular\` take it; a preview key that is not a child of that field
-is a 400 listing the valid child keys. Fix the declaration; never retry without it and call that
-success.
-
-There is deliberately NO \`order\` property and no mode to turn on \u2014 order is the array index,
-and \`ui\` only changes editor chrome, so there is nothing to flip.`
-          }
-        }
-      ]
+      messages: [{ role: "user", content: { type: "text", text: FIELD_UI_TEXT(request) } }]
     })
   );
 }
@@ -6697,9 +7102,9 @@ function buildServer(deps) {
       // 🔴 The plain-language ask, routed — the stdio twin of the hosted connector's line
       // (src/routes/mcp/index.ts MCP_INSTRUCTIONS). "Make my site editable" has one recipe and
       // one definition of done; without this an agent converts the page it landed on and stops.
-      instructions: RECEIPT_FIRST_INSTRUCTION + " When the user asks to make a site or all of its pages editable, to convert it, or to bind its fields: this is playbook \xA713. Read `bettercms://playbook/schema` \xA713, call get_binding_report and get_conversion_brief { complete: true }, convert EVERY route the brief lists, and finish only when get_binding_report shows coverage.pending empty on every route \u2014 not when the first page works. On a workspace-wide connection pass projectId on every call; never ask the user to re-scope the connection. When the user asks to componentize the whole site, to turn every section into a component, or to build a component library from the site: this is playbook \xA712. Read `bettercms://playbook/schema` \xA712, start with get_site_composition, and use the batch tools \u2014 create_components, compose_pages, update_layout with `commands`, publish_components \u2014 rather than one call per component. Finish with get_site_composition and tell the user what the platform does not model (cookie banners, modals, breadcrumbs, pagination) and which components still need the owner's approval in the dashboard before they can be published. BetterCMS never executes a customer's Section renderer or app code. An ordinary MCP connection is not a push runner: explicitly poll list_section_validation_requests, claim one request at an exact git commit, run implementation and responsive checks inside the user's own repository and real app shell, then submit manifest + validation with that requestId and complete it\u2014or truthfully fail it when implementation/evidence is missing. Never invent a manifest, a passing validation, or visual evidence; these tools cannot grant the separate human Visual Approval required for publication. " + // The default after authoring (the structure standard): organise what you made. Same
+      instructions: RECEIPT_FIRST_INSTRUCTION + " When the user asks to make a site or all of its pages editable, to convert it, or to bind its fields: this is playbook \xA713. Read `bettercms://playbook/schema` \xA713, call get_binding_report and get_conversion_brief { complete: true }, convert EVERY route the brief lists, and finish only when get_binding_report shows coverage.pending empty on every route \u2014 not when the first page works. On a workspace-wide connection pass projectId on every call; never ask the user to re-scope the connection. " + LAYOUT_CHROME_INSTRUCTION + " When the user asks to componentize the whole site, to turn every section into a component, or to build a component library from the site: this is playbook \xA712. Read `bettercms://playbook/schema` \xA712, start with get_site_composition, and use the batch tools \u2014 create_components, compose_pages, update_layout with `commands`, publish_components \u2014 rather than one call per component. Finish with get_site_composition and tell the user what the platform does not model (cookie banners, modals, breadcrumbs, pagination) and which components still need the owner's approval in the dashboard before they can be published. BetterCMS never executes a customer's Section renderer or app code. An ordinary MCP connection is not a push runner: explicitly poll list_section_validation_requests, claim one request at an exact git commit, run implementation and responsive checks inside the user's own repository and real app shell, then submit manifest + validation with that requestId and complete it\u2014or truthfully fail it when implementation/evidence is missing. Never invent a manifest, a passing validation, or visual evidence; these tools cannot grant the separate human Visual Approval required for publication. " + // The default after authoring (the structure standard): organise what you made. Same
       // sentence as the hosted connector's MCP_INSTRUCTIONS.
-      STRUCTURE_DEFAULT_INSTRUCTION + " " + SKILLS_ROUTING_INSTRUCTION
+      STRUCTURE_DEFAULT_INSTRUCTION + " " + SKILLS_ROUTING_INSTRUCTION + " " + DOCK_UI_ROUTING_INSTRUCTION
     }
   );
   server.registerResource(
@@ -6726,6 +7131,10 @@ function buildServer(deps) {
       contents: [{ uri: PLAYBOOK_URI, mimeType: "text/markdown", text: SCHEMA_PLAYBOOK }]
     })
   );
+  const { uri: dockIconsUri, name: dockIconsName, ...dockIconsMeta } = DOCK_ICONS_RESOURCE;
+  server.registerResource(dockIconsName, dockIconsUri, dockIconsMeta, () => ({
+    contents: [{ uri: dockIconsUri, mimeType: dockIconsMeta.mimeType, text: DOCK_ICONS_TEXT }]
+  }));
   registerTools(server, {
     auth: deps.auth,
     // `project` is the per-call target of a workspace-wide grant; the SDK sends it as