@diviops/mcp-server 0.2.28 → 1.0.0

package/dist/index.js

@@ -83,7 +83,7 @@ const server = new McpServer({
     version: SERVER_VERSION,
 });
 // ── Read Tools ───────────────────────────────────────────────────────
-server.registerTool("diviops_list_pages", {
+server.registerTool("diviops_page_list", {
     description: "List pages/posts in the WordPress site. Returns title, ID, URL, status, and whether each page uses Divi builder.",
     inputSchema: {
         post_type: z
@@ -99,7 +99,7 @@ server.registerTool("diviops_list_pages", {
         page: z.number().optional().default(1).describe("Page number"),
     },
 }, async ({ post_type, per_page, page }) => {
-    const result = await wp.request("/pages", {
+    const result = await wp.request("/page/list", {
         params: {
             post_type: post_type ?? "page",
             per_page: String(per_page ?? 20),
@@ -112,20 +112,20 @@ server.registerTool("diviops_list_pages", {
         ],
     };
 });
-server.registerTool("diviops_get_page", {
+server.registerTool("diviops_page_get", {
     description: "Get detailed info about a specific page including its raw Divi block content.",
     inputSchema: {
         page_id: z.number().describe("WordPress post/page ID"),
     },
 }, async ({ page_id }) => {
-    const result = await wp.request(`/page/${page_id}`);
+    const result = await wp.request(`/page/get/${page_id}`);
     return {
         content: [
             { type: "text", text: JSON.stringify(result) },
         ],
     };
 });
-server.registerTool("diviops_get_page_layout", {
+server.registerTool("diviops_page_get_layout", {
     description: "Get the parsed block tree for a page. Returns slim targeting metadata by default (block names, admin labels, text previews, auto_index). Use full: true for complete attrs (warning: can be very large on complex pages).",
     inputSchema: {
         page_id: z.number().describe("WordPress post/page ID"),
@@ -136,7 +136,7 @@ server.registerTool("diviops_get_page_layout", {
             .describe("Include full block attrs and raw content (default: false for slim mode)"),
     },
 }, async ({ page_id, full }) => {
-    const result = await wp.request(`/page/${page_id}/layout`, {
+    const result = await wp.request(`/page/get-layout/${page_id}`, {
         params: full ? { full: "true" } : {},
     });
     return {
@@ -145,17 +145,17 @@ server.registerTool("diviops_get_page_layout", {
         ],
     };
 });
-server.registerTool("diviops_list_modules", {
+server.registerTool("diviops_schema_list_modules", {
     description: "List all available Divi modules (block types) with their names, titles, and categories. Use this to discover what modules can be used in layouts.",
 }, async () => {
-    const result = await wp.request("/modules");
+    const result = await wp.request("/schema/modules");
     return {
         content: [
             { type: "text", text: JSON.stringify(result) },
         ],
     };
 });
-server.registerTool("diviops_get_module_schema", {
+server.registerTool("diviops_schema_get_module", {
     description: "Get the attribute schema for a Divi module. Returns optimized schema by default (~70% smaller) with content-relevant fields only. Use raw: true for the full schema including CSS selectors and VB metadata.",
     inputSchema: {
         module_name: z
@@ -168,7 +168,7 @@ server.registerTool("diviops_get_module_schema", {
             .describe("Return full schema including CSS selectors and VB metadata"),
     },
 }, async ({ module_name, raw }) => {
-    const result = await wp.request(`/module/${encodeURIComponent(module_name)}`);
+    const result = await wp.request(`/schema/module/${encodeURIComponent(module_name)}`);
     const output = raw ? result : optimizeSchema(result);
     return {
         content: [
@@ -176,28 +176,28 @@ server.registerTool("diviops_get_module_schema", {
         ],
     };
 });
-server.registerTool("diviops_get_settings", {
+server.registerTool("diviops_schema_get_settings", {
     description: "Get Divi site settings including theme options, site info, and builder version. Useful for understanding the site context before generating content.",
 }, async () => {
-    const result = await wp.request("/settings");
+    const result = await wp.request("/schema/settings");
     return {
         content: [
             { type: "text", text: JSON.stringify(result) },
         ],
     };
 });
-server.registerTool("diviops_get_global_colors", {
+server.registerTool("diviops_global_color_list", {
     description: "Get the global color palette defined in Divi. Returns all global colors that can be referenced by modules.",
 }, async () => {
-    const result = await wp.request("/global-colors");
+    const result = await wp.request("/global-color/list");
     return {
         content: [
             { type: "text", text: JSON.stringify(result) },
         ],
     };
 });
-server.registerTool("diviops_add_global_color", {
-    description: "Add a new global color to Divi's palette. Server mints a fresh `gcid-<uuid>` ID and writes to the et_global_data option in the canonical Divi shape `{color, folder, label, lastUpdated, status, usedInPosts}`. The color appears in the VB color picker after save and can be referenced via `$variable({type:color,value:{name:gcid-...}})$` tokens. Note: Divi's AI Agent bundle has a Zod schema gap that drops `label` on its own writes — our PHP path goes around that bug by writing directly to the option. CONCURRENCY: this is a read-modify-write on a single WP option with no conflict detection. If a Visual Builder session holds stale global data, its next save can clobber colors written here in the interim. Coordinate writes when VB sessions are active, or have the user reload VB after MCP color writes.",
+server.registerTool("diviops_global_color_create", {
+    description: "Add a new global color to Divi's palette. The plugin mints a fresh `gcid-<uuid>` ID (the server forwards the color entry without an id and the WP-side handler generates one) and writes to the et_global_data option in the canonical Divi shape `{color, folder, label, lastUpdated, status, usedInPosts}`. The color appears in the VB color picker after save and can be referenced via `$variable({type:color,value:{name:gcid-...}})$` tokens. Note: Divi's AI Agent bundle has a Zod schema gap that drops `label` on its own writes — our PHP path goes around that bug by writing directly to the option. CONCURRENCY: this is a read-modify-write on a single WP option with no conflict detection. If a Visual Builder session holds stale global data, its next save can clobber colors written here in the interim. Coordinate writes when VB sessions are active, or have the user reload VB after MCP color writes.",
     inputSchema: {
         color: z
             .string()
@@ -224,18 +224,18 @@ server.registerTool("diviops_add_global_color", {
         colorEntry.folder = folder;
     if (status)
         colorEntry.status = status;
-    const result = await wp.request("/global-colors", {
+    const result = await wp.request("/global-color/upsert", {
         method: "POST",
         body: { colors: [colorEntry], mode: "merge" },
     });
     return { content: [{ type: "text", text: JSON.stringify(result) }] };
 });
-server.registerTool("diviops_update_global_color", {
-    description: "Update an existing global color by gcid. Only provided fields are updated; omitted fields are preserved. The lastUpdated timestamp is bumped on every write. Use diviops_get_global_colors first to find the gcid for a color. CONCURRENCY: same VB-session race caveat as diviops_add_global_color — the write is read-modify-write on a single WP option, so an active VB session's next save can clobber this update.",
+server.registerTool("diviops_global_color_update", {
+    description: "Update an existing global color by gcid. Only provided fields are updated; omitted fields are preserved. The lastUpdated timestamp is bumped on every write. Use diviops_global_color_list first to find the gcid for a color. CONCURRENCY: same VB-session race caveat as diviops_global_color_create — the write is read-modify-write on a single WP option, so an active VB session's next save can clobber this update.",
     inputSchema: {
         gcid: z
             .string()
-            .describe('Global color ID, e.g. "gcid-abc123..." (must start with "gcid-"). Get from diviops_get_global_colors.'),
+            .describe('Global color ID, e.g. "gcid-abc123..." (must start with "gcid-"). Get from diviops_global_color_list.'),
         color: z
             .string()
             .optional()
@@ -263,14 +263,14 @@ server.registerTool("diviops_update_global_color", {
         colorEntry.folder = folder;
     if (status)
         colorEntry.status = status;
-    const result = await wp.request("/global-colors", {
+    const result = await wp.request("/global-color/upsert", {
         method: "POST",
         body: { colors: [colorEntry], mode: "merge" },
     });
     return { content: [{ type: "text", text: JSON.stringify(result) }] };
 });
-server.registerTool("diviops_delete_global_color", {
-    description: "Delete a global color from the registry by gcid. Refuses by default if the color is tracked as referenced by any post (per Divi's `usedInPosts` index — pass `force: true` to delete anyway; orphan refs will render as invalid CSS until pages are re-saved through VB). Always refuses to delete the 5 customizer-bound defaults (gcid-primary-color, gcid-secondary-color, gcid-heading-color, gcid-body-color, gcid-link-color) regardless of force — those must be edited via WP Customizer. CONCURRENCY: same VB-session race caveat as diviops_add_global_color — an active VB session's next save can re-introduce a color we just deleted if the session held stale data.",
+server.registerTool("diviops_global_color_delete", {
+    description: "Delete a global color from the registry by gcid. Refuses by default if the color is tracked as referenced by any post (per Divi's `usedInPosts` index — pass `force: true` to delete anyway; orphan refs will render as invalid CSS until pages are re-saved through VB). Always refuses to delete the 5 customizer-bound defaults (gcid-primary-color, gcid-secondary-color, gcid-heading-color, gcid-body-color, gcid-link-color) regardless of force — those must be edited via WP Customizer. CONCURRENCY: same VB-session race caveat as diviops_global_color_create — an active VB session's next save can re-introduce a color we just deleted if the session held stale data.",
     inputSchema: {
         gcid: z
             .string()
@@ -285,23 +285,23 @@ server.registerTool("diviops_delete_global_color", {
     const body = { gcid };
     if (force)
         body.force = true;
-    const result = await wp.request("/global-color-delete", {
+    const result = await wp.request("/global-color/delete", {
         method: "POST",
         body,
     });
     return { content: [{ type: "text", text: JSON.stringify(result) }] };
 });
-server.registerTool("diviops_get_global_fonts", {
+server.registerTool("diviops_global_font_list", {
     description: "Get the global font definitions from Divi settings.",
 }, async () => {
-    const result = await wp.request("/global-fonts");
+    const result = await wp.request("/global-font/list");
     return {
         content: [
             { type: "text", text: JSON.stringify(result) },
         ],
     };
 });
-server.registerTool("diviops_find_icon", {
+server.registerTool("diviops_meta_find_icon", {
     description: "Search for icons by keyword. Returns matching icons with unicode, type (fa/divi), and weight. Use the returned unicode/type/weight in Blurb icon or Icon module attributes.",
     inputSchema: {
         query: z
@@ -319,7 +319,7 @@ server.registerTool("diviops_find_icon", {
             .describe("Max results (default 10, max 50)"),
     },
 }, async ({ query, type, limit }) => {
-    const result = await wp.request(`/icons/search?q=${encodeURIComponent(query)}&type=${type ?? "all"}&limit=${limit ?? 10}`);
+    const result = await wp.request(`/meta/find-icon?q=${encodeURIComponent(query)}&type=${type ?? "all"}&limit=${limit ?? 10}`);
     return {
         content: [
             { type: "text", text: JSON.stringify(result) },
@@ -327,7 +327,7 @@ server.registerTool("diviops_find_icon", {
     };
 });
 // ── Write Tools ──────────────────────────────────────────────────────
-server.registerTool("diviops_update_page_content", {
+server.registerTool("diviops_page_update_content", {
     description: "Update the content of a page with Divi block markup. The content should be valid WordPress block markup using divi/* blocks. IMPORTANT: This overwrites the entire page content.",
     inputSchema: {
         page_id: z.number().describe("WordPress post/page ID to update"),
@@ -338,8 +338,8 @@ server.registerTool("diviops_update_page_content", {
 }, async ({ page_id, content }) => {
     const hits = findForeignVarRefs(content, "content");
     if (hits.length > 0)
-        return isolationErrorResult("diviops_update_page_content", hits);
-    const result = await wp.request(`/page/${page_id}/content`, {
+        return isolationErrorResult("diviops_page_update_content", hits);
+    const result = await wp.request(`/page/update-content/${page_id}`, {
         method: "POST",
         body: { content },
     });
@@ -371,7 +371,7 @@ server.registerTool("diviops_validate_blocks", {
         content: z.string().describe("Divi block markup to validate"),
     },
 }, async ({ content }) => {
-    const result = await wp.request("/validate", {
+    const result = await wp.request("/validate/blocks", {
         method: "POST",
         body: { content },
     });
@@ -381,7 +381,7 @@ server.registerTool("diviops_validate_blocks", {
         ],
     };
 });
-server.registerTool("diviops_append_section", {
+server.registerTool("diviops_section_append", {
     description: "Append a Divi section to an existing page without overwriting other content. Use this to incrementally build pages.",
     inputSchema: {
         page_id: z.number().describe("WordPress post/page ID"),
@@ -397,8 +397,8 @@ server.registerTool("diviops_append_section", {
 }, async ({ page_id, content, position }) => {
     const hits = findForeignVarRefs(content, "content");
     if (hits.length > 0)
-        return isolationErrorResult("diviops_append_section", hits);
-    const result = await wp.request(`/page/${page_id}/append`, {
+        return isolationErrorResult("diviops_section_append", hits);
+    const result = await wp.request(`/section/append/${page_id}`, {
         method: "POST",
         body: { content, position: position ?? "end" },
     });
@@ -408,7 +408,7 @@ server.registerTool("diviops_append_section", {
         ],
     };
 });
-server.registerTool("diviops_replace_section", {
+server.registerTool("diviops_section_replace", {
     description: "Replace a section on a page. Target by admin label OR text content. Use occurrence when multiple sections match.",
     inputSchema: {
         page_id: z.number().describe("WordPress post/page ID"),
@@ -434,13 +434,13 @@ server.registerTool("diviops_replace_section", {
 }, async ({ page_id, label, match_text, content, occurrence }) => {
     const hits = findForeignVarRefs(content, "content");
     if (hits.length > 0)
-        return isolationErrorResult("diviops_replace_section", hits);
+        return isolationErrorResult("diviops_section_replace", hits);
     const body = { content, occurrence };
     if (label)
         body.label = label;
     if (match_text)
         body.match_text = match_text;
-    const result = await wp.request(`/page/${page_id}/replace-section`, {
+    const result = await wp.request(`/section/replace/${page_id}`, {
         method: "POST",
         body,
     });
@@ -450,7 +450,7 @@ server.registerTool("diviops_replace_section", {
         ],
     };
 });
-server.registerTool("diviops_remove_section", {
+server.registerTool("diviops_section_remove", {
     description: "Remove a section from a page. Target by admin label OR text content. Use occurrence when multiple sections match.",
     inputSchema: {
         page_id: z.number().describe("WordPress post/page ID"),
@@ -476,7 +476,7 @@ server.registerTool("diviops_remove_section", {
         body.label = label;
     if (match_text)
         body.match_text = match_text;
-    const result = await wp.request(`/page/${page_id}/remove-section`, {
+    const result = await wp.request(`/section/remove/${page_id}`, {
         method: "POST",
         body,
     });
@@ -486,7 +486,7 @@ server.registerTool("diviops_remove_section", {
         ],
     };
 });
-server.registerTool("diviops_get_section", {
+server.registerTool("diviops_section_get", {
     description: "Get the raw block markup of a section. Target by admin label OR text content. Use occurrence when multiple sections match. Returns total_matches warning when duplicates exist.",
     inputSchema: {
         page_id: z.number().describe("WordPress post/page ID"),
@@ -513,15 +513,15 @@ server.registerTool("diviops_get_section", {
     if (match_text)
         params.match_text = match_text;
     const qs = new URLSearchParams(params).toString();
-    const result = await wp.request(`/page/${page_id}/get-section?${qs}`);
+    const result = await wp.request(`/section/get/${page_id}?${qs}`);
     return {
         content: [
             { type: "text", text: JSON.stringify(result) },
         ],
     };
 });
-server.registerTool("diviops_update_module", {
-    description: 'Update specific attributes of a module. Target by auto_index (e.g. "text:5"), admin label, or text content. Uses dot notation for attribute paths. Example: {"content.decoration.headingFont.h2.font.desktop.value.color": "#ff0000"}. Priority: auto_index > label > match_text. Use occurrence with label when duplicates exist.',
+server.registerTool("diviops_module_update", {
+    description: 'Update specific attributes of a module. Target by auto_index (e.g. "text:5"), admin label, or text content. Uses dot notation for attribute paths. Example: {"content.decoration.headingFont.h2.font.desktop.value.color": "#ff0000"}. For paths whose key segments contain literal dots — notably Composable Settings preset slots like groupPreset["title.decoration.spacing"] — escape the inner dots with `\\.` to keep the segment intact: {"groupPreset.title\\\\.decoration\\\\.spacing.presetId": ["uuid"]}. Priority: auto_index > label > match_text. Use occurrence with label when duplicates exist.',
     inputSchema: {
         page_id: z.number().describe("WordPress post/page ID"),
         label: z
@@ -535,7 +535,7 @@ server.registerTool("diviops_update_module", {
         auto_index: z
             .string()
             .optional()
-            .describe('Auto-index target in "type:N" format (e.g. "text:5", "icon:3"). Get from diviops_get_page_layout. Takes priority over label/match_text.'),
+            .describe('Auto-index target in "type:N" format (e.g. "text:5", "icon:3"). Get from diviops_page_get_layout. Takes priority over label/match_text.'),
         occurrence: z
             .number()
             .int()
@@ -550,7 +550,7 @@ server.registerTool("diviops_update_module", {
 }, async ({ page_id, label, match_text, auto_index, occurrence, attrs }) => {
     const hits = scanAttrsForForeignVarRefs(attrs);
     if (hits.length > 0)
-        return isolationErrorResult("diviops_update_module", hits);
+        return isolationErrorResult("diviops_module_update", hits);
     const body = { attrs };
     if (auto_index)
         body.auto_index = auto_index;
@@ -560,7 +560,7 @@ server.registerTool("diviops_update_module", {
         body.match_text = match_text;
     if (occurrence > 1)
         body.occurrence = occurrence;
-    const result = await wp.request(`/page/${page_id}/update-module`, {
+    const result = await wp.request(`/module/update/${page_id}`, {
         method: "POST",
         body,
     });
@@ -570,7 +570,7 @@ server.registerTool("diviops_update_module", {
         ],
     };
 });
-server.registerTool("diviops_move_module", {
+server.registerTool("diviops_module_move", {
     description: 'Move a module to a new position on the page. Specify source and target blocks using auto_index (e.g. "text:3"), admin label, or text content. Position "before" or "after" the target. Works with any block type including sections, rows, and modules. Both blocks are found in the original content, so auto_index values refer to positions before the move.',
     inputSchema: {
         page_id: z.number().describe("WordPress post/page ID"),
@@ -634,7 +634,7 @@ server.registerTool("diviops_move_module", {
         body.target_auto_index = target_auto_index;
     if (target_occurrence > 1)
         body.target_occurrence = target_occurrence;
-    const result = await wp.request(`/page/${page_id}/move-module`, {
+    const result = await wp.request(`/module/move/${page_id}`, {
         method: "POST",
         body,
     });
@@ -644,8 +644,8 @@ server.registerTool("diviops_move_module", {
         ],
     };
 });
-server.registerTool("diviops_lock_module", {
-    description: 'Lock a module so VB users cannot edit it. Sets attrs.locked = {desktop: {value: "on"}} per Divi\'s per-breakpoint convention (verified via VB-save probe). Locked modules render normally on frontend; only VB-side editing is gated. Same targeting pattern as diviops_update_module — pick one of label / match_text / auto_index. Use diviops_unlock_module to reverse.',
+server.registerTool("diviops_module_lock", {
+    description: 'Lock a module so VB users cannot edit it. Sets attrs.locked = {desktop: {value: "on"}} per Divi\'s per-breakpoint convention (verified via VB-save probe). Locked modules render normally on frontend; only VB-side editing is gated. Same targeting pattern as diviops_module_update — pick one of label / match_text / auto_index. Use diviops_module_unlock to reverse.',
     inputSchema: {
         page_id: z.number().describe("WordPress post/page ID"),
         label: z.string().optional().describe("Admin label of the module to lock (exact match)"),
@@ -663,11 +663,11 @@ server.registerTool("diviops_lock_module", {
         body.auto_index = auto_index;
     if (occurrence && occurrence > 1)
         body.occurrence = occurrence;
-    const result = await wp.request(`/page/${page_id}/lock-module`, { method: "POST", body });
+    const result = await wp.request(`/module/lock/${page_id}`, { method: "POST", body });
     return { content: [{ type: "text", text: JSON.stringify(result) }] };
 });
-server.registerTool("diviops_unlock_module", {
-    description: "Unlock a module by removing attrs.locked entirely. Matches Divi VB's convention: unlocked = attribute absent (NOT {value: 'off'}) — VB doesn't write a falsy value on unlock, it removes the field. Same targeting pattern as diviops_lock_module.",
+server.registerTool("diviops_module_unlock", {
+    description: "Unlock a module by removing attrs.locked entirely. Matches Divi VB's convention: unlocked = attribute absent (NOT {value: 'off'}) — VB doesn't write a falsy value on unlock, it removes the field. Same targeting pattern as diviops_module_lock.",
     inputSchema: {
         page_id: z.number().describe("WordPress post/page ID"),
         label: z.string().optional().describe("Admin label of the module to unlock (exact match)"),
@@ -685,11 +685,11 @@ server.registerTool("diviops_unlock_module", {
         body.auto_index = auto_index;
     if (occurrence && occurrence > 1)
         body.occurrence = occurrence;
-    const result = await wp.request(`/page/${page_id}/unlock-module`, { method: "POST", body });
+    const result = await wp.request(`/module/unlock/${page_id}`, { method: "POST", body });
     return { content: [{ type: "text", text: JSON.stringify(result) }] };
 });
-server.registerTool("diviops_clone_module", {
-    description: 'Clone a module by deep-copying its block JSON and inserting it next to the source within the same parent container. Position controls before/after placement (default "after"). Module IDs are reassigned by Divi at render time from the block tree position, so the clone gets fresh IDs automatically. Same targeting pattern as diviops_lock_module.',
+server.registerTool("diviops_module_clone", {
+    description: 'Clone a module by deep-copying its block JSON and inserting it next to the source within the same parent container. Position controls before/after placement (default "after"). Module IDs are reassigned by Divi at render time from the block tree position, so the clone gets fresh IDs automatically. Same targeting pattern as diviops_module_lock.',
     inputSchema: {
         page_id: z.number().describe("WordPress post/page ID"),
         label: z.string().optional().describe("Admin label of the module to clone (exact match)"),
@@ -710,10 +710,10 @@ server.registerTool("diviops_clone_module", {
         body.occurrence = occurrence;
     if (position)
         body.position = position;
-    const result = await wp.request(`/page/${page_id}/clone-module`, { method: "POST", body });
+    const result = await wp.request(`/module/clone/${page_id}`, { method: "POST", body });
     return { content: [{ type: "text", text: JSON.stringify(result) }] };
 });
-server.registerTool("diviops_create_page", {
+server.registerTool("diviops_page_create", {
     description: "Create a new WordPress page, optionally with Divi block content.",
     inputSchema: {
         title: z.string().describe("Page title"),
@@ -732,7 +732,7 @@ server.registerTool("diviops_create_page", {
     if (content) {
         const hits = findForeignVarRefs(content, "content");
         if (hits.length > 0)
-            return isolationErrorResult("diviops_create_page", hits);
+            return isolationErrorResult("diviops_page_create", hits);
     }
     const result = await wp.request("/page/create", {
         method: "POST",
@@ -748,7 +748,7 @@ server.registerTool("diviops_create_page", {
 server.registerTool("diviops_preset_audit", {
     description: "Audit all Divi presets (module + group). Each entry reports `block_ref_count` (page-content refs via modulePreset / groupPreset block markup), `group_ref_count` (in-registry chain refs from other presets — module presets via top-level `groupPresets.<slot>.presetId`, group presets via `attrs.groupPreset.<slot>.presetId`), and `referenced` (true if either > 0). Group presets that are chain-referenced also expose `referenced_by_presets` (UUIDs of the presets that wire them in — typically module presets, but type-agnostic). Use this before deleting — orphan-cleanup based only on page refs would silently wipe load-bearing chain-wired group presets (font, border, box-shadow, spacing, button). Also reports `orphan_default_pointers`: per-bucket `default` pointers that reference a UUID no longer present in `items[]` (caused by past unsafe deletes). Render-safe but blocks Divi's lazy recreate-on-VB-use path; clear via diviops_preset_set_default with unset=true on the affected module/group.",
 }, async () => {
-    const result = await wp.request("/preset-audit");
+    const result = await wp.request("/preset/audit");
     return {
         content: [
             { type: "text", text: JSON.stringify(result) },
@@ -791,7 +791,7 @@ server.registerTool("diviops_preset_cleanup", {
         body.prefix = prefix;
     if (action === "remove_orphans" && scope)
         body.scope = scope;
-    const result = await wp.request("/preset-cleanup", {
+    const result = await wp.request("/preset/cleanup", {
         method: "POST",
         body,
     });
@@ -824,7 +824,7 @@ server.registerTool("diviops_preset_update", {
         body.attrs = attrs;
     if (typeof priority === "number")
         body.priority = priority;
-    const result = await wp.request("/preset-update", {
+    const result = await wp.request("/preset/update", {
         method: "POST",
         body,
     });
@@ -847,7 +847,7 @@ server.registerTool("diviops_preset_delete", {
     const body = { preset_id };
     if (force !== undefined)
         body.force = force;
-    const result = await wp.request("/preset-delete", {
+    const result = await wp.request("/preset/delete", {
         method: "POST",
         body,
     });
@@ -909,7 +909,7 @@ server.registerTool("diviops_preset_create", {
         body.make_default = true;
     if (typeof priority === "number")
         body.priority = priority;
-    const result = await wp.request("/preset-create", { method: "POST", body });
+    const result = await wp.request("/preset/create", { method: "POST", body });
     return {
         content: [
             { type: "text", text: JSON.stringify(result) },
@@ -955,7 +955,7 @@ server.registerTool("diviops_preset_reassign", {
     };
     if (page_ids)
         body.page_ids = page_ids;
-    const result = await wp.request("/preset-reassign", {
+    const result = await wp.request("/preset/reassign", {
         method: "POST",
         body,
     });
@@ -968,7 +968,7 @@ server.registerTool("diviops_preset_reassign", {
 server.registerTool("diviops_preset_scan_orphans", {
     description: "Scan page content for modulePreset UUIDs that are not in the D5 registry. Categorizes as dangling orphans (preset was deleted, reference remains) or D4-legacy candidates (preset exists in the legacy builder_global_presets_ng option but not in D5). Use before diviops_preset_reassign to identify stale UUIDs for consolidation.",
 }, async () => {
-    const result = await wp.request("/preset-scan-orphans");
+    const result = await wp.request("/preset/scan-orphans");
     return {
         content: [
             { type: "text", text: JSON.stringify(result) },
@@ -1005,7 +1005,7 @@ server.registerTool("diviops_preset_set_default", {
         body.module = module;
     if (unset)
         body.unset = true;
-    const result = await wp.request("/preset-set-default", {
+    const result = await wp.request("/preset/set-default", {
         method: "POST",
         body,
     });
@@ -1016,7 +1016,7 @@ server.registerTool("diviops_preset_set_default", {
     };
 });
 // ── Library Tools ───────────────────────────────────────────────────
-server.registerTool("diviops_list_library", {
+server.registerTool("diviops_library_list", {
     description: "List saved Divi Library items. Filter by layout_type (section, row, module) and scope (global, non_global).",
     inputSchema: {
         layout_type: z
@@ -1041,27 +1041,27 @@ server.registerTool("diviops_list_library", {
         params.scope = scope;
     if (per_page)
         params.per_page = String(per_page);
-    const result = await wp.request("/library", { params });
+    const result = await wp.request("/library/items", { params });
     return {
         content: [
             { type: "text", text: JSON.stringify(result) },
         ],
     };
 });
-server.registerTool("diviops_get_library_item", {
-    description: "Get a Divi Library item's content by ID. Returns the raw block markup that can be used with diviops_append_section or diviops_update_page_content.",
+server.registerTool("diviops_library_get", {
+    description: "Get a Divi Library item's content by ID. Returns the raw block markup that can be used with diviops_section_append or diviops_page_update_content.",
     inputSchema: {
         item_id: z.number().describe("Library item ID"),
     },
 }, async ({ item_id }) => {
-    const result = await wp.request(`/library/${item_id}`);
+    const result = await wp.request(`/library/item/${item_id}`);
     return {
         content: [
             { type: "text", text: JSON.stringify(result) },
         ],
     };
 });
-server.registerTool("diviops_save_to_library", {
+server.registerTool("diviops_library_save", {
     description: 'Save Divi block markup to the Divi Library for reuse. Saved items appear in the VB\'s "Add From Library" panel.',
     inputSchema: {
         title: z.string().describe("Display name for the library item"),
@@ -1096,7 +1096,7 @@ server.registerTool("diviops_save_to_library", {
     };
 });
 // ── Theme Builder Tools ─────────────────────────────────────────────
-server.registerTool("diviops_list_tb_templates", {
+server.registerTool("diviops_tb_template_list", {
     description: "List all Theme Builder templates with their conditions, layout IDs, and enabled status. Shows which template applies to which pages/post types.",
     inputSchema: {
         per_page: z
@@ -1113,36 +1113,36 @@ server.registerTool("diviops_list_tb_templates", {
         params.per_page = String(per_page);
     if (page)
         params.page = String(page);
-    const result = await wp.request("/theme-builder/templates", { params });
+    const result = await wp.request("/theme-builder/template/list", { params });
     return {
         content: [
             { type: "text", text: JSON.stringify(result) },
         ],
     };
 });
-server.registerTool("diviops_get_tb_layout", {
-    description: "Get a Theme Builder layout's block markup content (header, body, or footer). Use the layout IDs from diviops_list_tb_templates.",
+server.registerTool("diviops_tb_layout_get", {
+    description: "Get a Theme Builder layout's block markup content (header, body, or footer). Use the layout IDs from diviops_tb_template_list.",
     inputSchema: {
         layout_id: z
             .number()
             .describe("Layout post ID (from template header_layout_id, body_layout_id, or footer_layout_id)"),
     },
 }, async ({ layout_id }) => {
-    const result = await wp.request(`/theme-builder/layout/${layout_id}`);
+    const result = await wp.request(`/theme-builder/layout/get/${layout_id}`);
     return {
         content: [
             { type: "text", text: JSON.stringify(result) },
         ],
     };
 });
-server.registerTool("diviops_update_tb_layout", {
+server.registerTool("diviops_tb_layout_update", {
     description: "Update a Theme Builder layout's block markup (header, body, or footer). Replaces the full content.",
     inputSchema: {
         layout_id: z.number().describe("Layout post ID to update"),
         content: z.string().describe("New block markup content"),
     },
 }, async ({ layout_id, content }) => {
-    const result = await wp.request(`/theme-builder/layout/${layout_id}`, {
+    const result = await wp.request(`/theme-builder/layout/update/${layout_id}`, {
         method: "PUT",
         body: { content },
     });
@@ -1152,7 +1152,7 @@ server.registerTool("diviops_update_tb_layout", {
         ],
     };
 });
-server.registerTool("diviops_create_tb_template", {
+server.registerTool("diviops_tb_template_create", {
     description: "Create a Theme Builder template with custom header and/or footer. Automatically creates layout posts, sets conditions, and links to Theme Builder.",
     inputSchema: {
         title: z.string().describe('Template name (e.g. "Landing Pages")'),
@@ -1171,7 +1171,7 @@ server.registerTool("diviops_create_tb_template", {
             .describe("Footer block markup (empty = inherit from default template)"),
     },
 }, async ({ title, condition, header_content, footer_content }) => {
-    const result = await wp.request("/theme-builder/template", {
+    const result = await wp.request("/theme-builder/template/create", {
         method: "POST",
         body: { title, condition, header_content, footer_content },
     });
@@ -1182,7 +1182,7 @@ server.registerTool("diviops_create_tb_template", {
     };
 });
 // ── Canvas Tools ────────────────────────────────────────────────────
-server.registerTool("diviops_create_canvas", {
+server.registerTool("diviops_canvas_create", {
     description: "Create a canvas (off-canvas workspace) linked to a page. Used for popups, off-canvas menus, modals. Content uses standard Divi block markup.",
     inputSchema: {
         title: z
@@ -1226,7 +1226,7 @@ server.registerTool("diviops_create_canvas", {
         ],
     };
 });
-server.registerTool("diviops_list_canvases", {
+server.registerTool("diviops_canvas_list", {
     description: "List canvases (off-canvas workspaces). Filter by parent page or list all.",
     inputSchema: {
         parent_page_id: z
@@ -1248,29 +1248,29 @@ server.registerTool("diviops_list_canvases", {
         params.parent_page_id = String(parent_page_id);
     if (per_page)
         params.per_page = String(per_page);
-    const result = await wp.request("/canvases", { params });
+    const result = await wp.request("/canvas/list", { params });
     return {
         content: [
             { type: "text", text: JSON.stringify(result) },
         ],
     };
 });
-server.registerTool("diviops_get_canvas", {
+server.registerTool("diviops_canvas_get", {
     description: "Get a canvas's block content and metadata.",
     inputSchema: {
         canvas_post_id: z
             .number()
-            .describe("Canvas post ID (from diviops_list_canvases)"),
+            .describe("Canvas post ID (from diviops_canvas_list)"),
     },
 }, async ({ canvas_post_id }) => {
-    const result = await wp.request(`/canvas/${canvas_post_id}`);
+    const result = await wp.request(`/canvas/get/${canvas_post_id}`);
     return {
         content: [
             { type: "text", text: JSON.stringify(result) },
         ],
     };
 });
-server.registerTool("diviops_update_canvas", {
+server.registerTool("diviops_canvas_update", {
     description: "Update a canvas's content and/or metadata. Content replaces the entire canvas.",
     inputSchema: {
         canvas_post_id: z.number().describe("Canvas post ID"),
@@ -1295,7 +1295,7 @@ server.registerTool("diviops_update_canvas", {
         body.append_to_main = append_to_main;
     if (z_index !== undefined)
         body.z_index = z_index;
-    const result = await wp.request(`/canvas/${canvas_post_id}`, {
+    const result = await wp.request(`/canvas/update/${canvas_post_id}`, {
         method: "POST",
         body,
     });
@@ -1305,14 +1305,14 @@ server.registerTool("diviops_update_canvas", {
         ],
     };
 });
-server.registerTool("diviops_delete_canvas", {
+server.registerTool("diviops_canvas_delete", {
     description: "Delete a canvas. This permanently removes the canvas post.",
     inputSchema: {
         canvas_post_id: z.number().describe("Canvas post ID to delete"),
     },
 }, async ({ canvas_post_id }) => {
-    const result = await wp.request(`/canvas/${canvas_post_id}`, {
-        method: "DELETE",
+    const result = await wp.request(`/canvas/delete/${canvas_post_id}`, {
+        method: "POST",
     });
     return {
         content: [
@@ -1321,8 +1321,8 @@ server.registerTool("diviops_delete_canvas", {
     };
 });
 // ── WP-CLI ──────────────────────────────────────────────────────────
-server.registerTool("diviops_wp_cli", {
-    description: "Run a WP-CLI command on the WordPress site. Requires WP_PATH env var (LOCAL_SITE_ID auto-detected from Local by Flywheel), or WP_CLI_CMD for containerized wrappers. Commands validated against a safety allowlist. Default tier covers read ops across options/posts/post-types/taxonomies/users/info/core/db, non-destructive writes (post/term create+update, post meta read/write, cache/rewrite/transient flush), ACF schema ops (export/import/list/get field-group), and WXR export. Extended tier (requires DIVIOPS_WP_CLI_ALLOW env var) adds destructive or bulk-modifying ops: option update, post/post meta/term delete, search-replace, import, plugin activate/deactivate, eval-file. Filesystem-touching commands (`wp export`, `acf export/import`) are additionally constrained: path arguments must resolve under a safe root (defaults to `<WP_PATH>/.diviops-tmp/`, overridable via DIVIOPS_WP_CLI_SAFE_FS_ROOT, disable via DIVIOPS_WP_CLI_UNSAFE_FS=1); `wp export` requires an explicit `--dir=<path>` (or `--stdout`). In WP_CLI_CMD wrapper mode, DIVIOPS_WP_CLI_SAFE_FS_ROOT is required for FS-sensitive commands. Use --format=json for structured output. Full allowlist + tier rationale + filesystem semantics in the MCP server README.",
+server.registerTool("diviops_meta_wp_cli", {
+    description: "Run a WP-CLI command on the WordPress site. Requires WP_PATH env var (LOCAL_SITE_ID auto-detected from Local by Flywheel), or WP_CLI_CMD for containerized wrappers. Commands validated against a safety allowlist. Default tier covers read ops across options/posts/post-types/taxonomies/users/info/core/db, non-destructive writes (post/term create+update, post meta read/write, cache/rewrite/transient flush), ACF/SCF schema ops (`acf export/import/field-group list/get` plus SCF 6.8.4+ `scf json {status,sync,import,export}` and the `acf json …` aliases), and WXR export. Extended tier (requires DIVIOPS_WP_CLI_ALLOW env var) adds destructive or bulk-modifying ops: option update, post/post meta/term delete, search-replace, import, plugin activate/deactivate, eval-file. Filesystem-touching commands (`wp export`, `acf export/import`, `scf|acf json export/import`) are additionally constrained: path arguments must resolve under a safe root (defaults to `<WP_PATH>/.diviops-tmp/`, overridable via DIVIOPS_WP_CLI_SAFE_FS_ROOT, disable via DIVIOPS_WP_CLI_UNSAFE_FS=1); `wp export` and `scf json export` require an explicit `--dir=<path>` (or `--stdout`). In WP_CLI_CMD wrapper mode, DIVIOPS_WP_CLI_SAFE_FS_ROOT is required for FS-sensitive commands. Prefer the typed `diviops_scf_*` wrappers for SCF round-trips — they're easier to invoke and accept the same safe-root scoping. Use --format=json for structured output. Full allowlist + tier rationale + filesystem semantics in the MCP server README.",
     inputSchema: {
         command: z
             .string()
@@ -1345,8 +1345,277 @@ server.registerTool("diviops_wp_cli", {
         : `Error: ${result.error}\n${result.output}`;
     return { content: [{ type: "text", text: output }] };
 });
+// ── SCF (Secure Custom Fields / ACF) wrappers ───────────────────────
+//
+// Typed wrappers over SCF 6.8.4+'s `wp scf json {status,sync,import,export}`
+// CLI family (also reachable as `wp acf json …`). The plugin file at
+// wp-content/plugins/secure-custom-fields/src/CLI/JsonCommand.php is the
+// upstream source of truth for flag shapes — keep these wrappers aligned.
+function ensureWpCli() {
+    if (!wpCli) {
+        return {
+            ok: false,
+            text: "WP-CLI not configured. Set WP_PATH (Local by Flywheel auto-detect) " +
+                "or WP_CLI_CMD (containerized wrappers) to enable SCF round-trip tools.",
+        };
+    }
+    return { ok: true };
+}
+function pushScfFlag(args, name, value) {
+    if (!value)
+        return;
+    // Each `--name=value` becomes a single argv entry — execFile handles spaces
+    // and quotes inside the value transparently. No string concatenation, no
+    // parseCommand round-trip, so values like "Bob's Group" or filenames with
+    // spaces flow through verbatim.
+    args.push(`--${name}=${value}`);
+}
+server.registerTool("diviops_scf_status", {
+    description: "Show SCF (Secure Custom Fields) sync status — how many field groups, post types, taxonomies, and options pages have JSON-on-disk newer than the database (or absent from DB). Read-only. Wraps `wp scf json status`. Requires SCF 6.8.4+ and WP_PATH or WP_CLI_CMD.",
+    inputSchema: {
+        type: z
+            .enum(["field-group", "post-type", "taxonomy", "options-page"])
+            .optional()
+            .describe("Limit to a single item type. Defaults to all types. options-page requires ACF PRO."),
+        detailed: z
+            .boolean()
+            .optional()
+            .describe("List the individual pending items (key/title/type/action) instead of just counts."),
+    },
+}, async ({ type, detailed }) => {
+    const gate = ensureWpCli();
+    if (!gate.ok) {
+        return { content: [{ type: "text", text: gate.text }] };
+    }
+    const args = ["scf", "json", "status", "--format=json"];
+    pushScfFlag(args, "type", type);
+    if (detailed)
+        args.push("--detailed");
+    const result = await wpCli.runArgs(args);
+    const output = result.success
+        ? result.output
+        : `Error: ${result.error}\n${result.output}`;
+    return { content: [{ type: "text", text: output }] };
+});
+server.registerTool("diviops_scf_export", {
+    description: "Export SCF field groups, post types, taxonomies, and options pages as JSON — to a directory under the safe-root (`<WP_PATH>/.diviops-tmp/` by default, override via DIVIOPS_WP_CLI_SAFE_FS_ROOT) or to stdout. Wraps `wp scf json export`. Either `dir` or `stdout: true` is required. Filters can be combined; without filters, all items are exported. Note: SCF writes a fixed filename `acf-export-YYYY-MM-DD.json` inside `dir` — two exports on the same day silently overwrite. Copy/rename if you're archiving baselines.",
+    inputSchema: {
+        dir: z
+            .string()
+            .optional()
+            .describe("Absolute output directory under the WP-CLI safe-root. Mutually exclusive with `stdout`. SCF writes a single `acf-export-YYYY-MM-DD.json` file inside this dir."),
+        stdout: z
+            .boolean()
+            .optional()
+            .describe("Print JSON to stdout instead of writing a file. Mutually exclusive with `dir`."),
+        field_groups: z
+            .string()
+            .optional()
+            .describe("Comma-separated field-group ACF keys (`group_abc123`) or admin titles (`My Field Group`). NOT WP post slugs — SCF matches against the def's `key` field or its `title` (case-insensitive). Use `diviops_scf_field_group_list` to discover keys (post_name column)."),
+        post_types: z
+            .string()
+            .optional()
+            .describe("Comma-separated SCF post-type def keys (`post_type_xxx`) or admin titles (`Programm`). IMPORTANT: this is the SCF def's identifier, NOT the registered post-type slug (`event`, `book`). The registered slug is what `wp post list` and REST URLs use, but SCF's filter matches against the def's `key` field or its `title`. To discover def keys, run `diviops_scf_export --stdout` (no filter) and inspect the top-level entries with `parent='post-type'`."),
+        taxonomies: z
+            .string()
+            .optional()
+            .describe("Comma-separated SCF taxonomy def keys (`taxonomy_xxx`) or admin titles. Same caveat as `post_types`: NOT the registered taxonomy slug — the SCF def's `key` or `title`. Discover via `diviops_scf_export --stdout`."),
+        options_pages: z
+            .string()
+            .optional()
+            .describe("Comma-separated options-page def keys or admin titles. Requires ACF PRO."),
+    },
+}, async ({ dir, stdout, field_groups, post_types, taxonomies, options_pages }) => {
+    const gate = ensureWpCli();
+    if (!gate.ok) {
+        return { content: [{ type: "text", text: gate.text }] };
+    }
+    if (!dir && !stdout) {
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: "Error: pass either `dir` (absolute path under DIVIOPS_WP_CLI_SAFE_FS_ROOT) or `stdout: true`.",
+                },
+            ],
+        };
+    }
+    if (dir && stdout) {
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: "Error: `dir` and `stdout` are mutually exclusive — pick one.",
+                },
+            ],
+        };
+    }
+    const args = ["scf", "json", "export"];
+    if (stdout)
+        args.push("--stdout");
+    pushScfFlag(args, "dir", dir);
+    pushScfFlag(args, "field-groups", field_groups);
+    pushScfFlag(args, "post-types", post_types);
+    pushScfFlag(args, "taxonomies", taxonomies);
+    pushScfFlag(args, "options-pages", options_pages);
+    const result = await wpCli.runArgs(args);
+    const output = result.success
+        ? result.output
+        : `Error: ${result.error}\n${result.output}`;
+    return { content: [{ type: "text", text: output }] };
+});
+server.registerTool("diviops_scf_import", {
+    description: "Import SCF field groups, post types, taxonomies, options pages from a JSON file. Mutates the database. File path must resolve under the safe-root (`<WP_PATH>/.diviops-tmp/` by default, override via DIVIOPS_WP_CLI_SAFE_FS_ROOT). Idempotent — existing items with matching keys are updated. Wraps `wp scf json import <file>`.",
+    inputSchema: {
+        file: z
+            .string()
+            .describe("Absolute path to the .json file to import. Must resolve under DIVIOPS_WP_CLI_SAFE_FS_ROOT."),
+    },
+}, async ({ file }) => {
+    const gate = ensureWpCli();
+    if (!gate.ok) {
+        return { content: [{ type: "text", text: gate.text }] };
+    }
+    const result = await wpCli.runArgs(["scf", "json", "import", file]);
+    const output = result.success
+        ? result.output
+        : `Error: ${result.error}\n${result.output}`;
+    return { content: [{ type: "text", text: output }] };
+});
+server.registerTool("diviops_scf_sync", {
+    description: "Apply pending JSON-on-disk SCF changes to the database. Reads JSON files from the theme/plugin acf-json directory and creates/updates DB entries. Defaults to `dry_run: true` for safety — caller must opt in to mutation. Wraps `wp scf json sync`.",
+    inputSchema: {
+        type: z
+            .enum(["field-group", "post-type", "taxonomy", "options-page"])
+            .optional()
+            .describe("Limit sync to a single item type."),
+        key: z
+            .string()
+            .optional()
+            .describe("Sync only the item with this ACF key (e.g. `group_abc123`)."),
+        dry_run: z
+            .boolean()
+            .optional()
+            .default(true)
+            .describe("Preview pending changes without mutating the database. Defaults to true. Pass `false` to commit."),
+    },
+}, async ({ type, key, dry_run }) => {
+    const gate = ensureWpCli();
+    if (!gate.ok) {
+        return { content: [{ type: "text", text: gate.text }] };
+    }
+    const args = ["scf", "json", "sync"];
+    pushScfFlag(args, "type", type);
+    pushScfFlag(args, "key", key);
+    if (dry_run !== false)
+        args.push("--dry-run");
+    const result = await wpCli.runArgs(args);
+    const output = result.success
+        ? result.output
+        : `Error: ${result.error}\n${result.output}`;
+    return { content: [{ type: "text", text: output }] };
+});
+server.registerTool("diviops_scf_field_group_list", {
+    description: "List all SCF/ACF field groups in the database (post_name = ACF key, post_title, post_status, post_modified). Read-only. Queries the underlying `acf-field-group` post type via `wp post list` — works on both SCF 6.8.4+ (which dropped the legacy `wp acf field-group …` family in favor of the `wp scf json` namespace) and older ACF installs.",
+}, async () => {
+    const gate = ensureWpCli();
+    if (!gate.ok) {
+        return { content: [{ type: "text", text: gate.text }] };
+    }
+    const result = await wpCli.runArgs([
+        "post",
+        "list",
+        "--post_type=acf-field-group",
+        "--post_status=any",
+        "--fields=ID,post_name,post_title,post_status,post_modified",
+        "--format=json",
+    ]);
+    const output = result.success
+        ? result.output
+        : `Error: ${result.error}\n${result.output}`;
+    return { content: [{ type: "text", text: output }] };
+});
+server.registerTool("diviops_scf_field_group_get", {
+    description: "Fetch a single SCF/ACF field group from the `acf-field-group` post type — by ACF key (`group_abc123`, looked up via `post_name`) or by numeric WP post ID. Returns the WP post fields (post_name, post_title, post_content with serialized fields blob, post_status, post_modified). For the parsed/structured field tree including nested fields, use `diviops_scf_export --field-groups=<key> --stdout` instead. Read-only. SCF 6.8.4 dropped the legacy `wp acf field-group get` command, so this wrapper queries the post type directly via `wp post`.",
+    inputSchema: {
+        key: z
+            .string()
+            .describe("ACF field-group key (`group_abc123`, matched against post_name) or numeric WP post ID."),
+    },
+}, async ({ key }) => {
+    const gate = ensureWpCli();
+    if (!gate.ok) {
+        return { content: [{ type: "text", text: gate.text }] };
+    }
+    // If the input looks like a numeric ID, hand it to `wp post get` directly.
+    // Otherwise treat it as an ACF key and resolve via post_name first.
+    const isNumericId = /^\d+$/.test(key);
+    if (isNumericId) {
+        const result = await wpCli.runArgs([
+            "post",
+            "get",
+            key,
+            "--format=json",
+        ]);
+        const output = result.success
+            ? result.output
+            : `Error: ${result.error}\n${result.output}`;
+        return { content: [{ type: "text", text: output }] };
+    }
+    // Resolve ACF key → post ID via `wp post list --name=<key>`. Single-row
+    // lookup; returns [] if the key isn't found.
+    const lookup = await wpCli.runArgs([
+        "post",
+        "list",
+        "--post_type=acf-field-group",
+        "--post_status=any",
+        `--name=${key}`,
+        "--fields=ID",
+        "--format=json",
+    ]);
+    if (!lookup.success) {
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: `Error looking up field-group key "${key}": ${lookup.error}\n${lookup.output}`,
+                },
+            ],
+        };
+    }
+    let postId = null;
+    try {
+        const rows = JSON.parse(lookup.output);
+        if (Array.isArray(rows) && rows.length > 0) {
+            postId = String(rows[0].ID);
+        }
+    }
+    catch {
+        // Fall through — postId stays null, return a clear "not found" error.
+    }
+    if (!postId) {
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: `No field-group found for key "${key}". Expected an ACF key (e.g. "group_5f8a1b2c3d4e5") or a numeric WP post ID (e.g. "287"). Use diviops_scf_field_group_list to see available keys (post_name field).`,
+                },
+            ],
+        };
+    }
+    const result = await wpCli.runArgs([
+        "post",
+        "get",
+        postId,
+        "--format=json",
+    ]);
+    const output = result.success
+        ? result.output
+        : `Error: ${result.error}\n${result.output}`;
+    return { content: [{ type: "text", text: output }] };
+});
 // ── Connection ──────────────────────────────────────────────────────
-server.registerTool("diviops_test_connection", {
+server.registerTool("diviops_meta_ping", {
     description: "Test the connection to the WordPress site and verify the Divi MCP plugin is active.",
 }, async () => {
     const result = await wp.testConnection();
@@ -1356,7 +1625,7 @@ server.registerTool("diviops_test_connection", {
         ],
     };
 });
-server.registerTool("diviops_server_info", {
+server.registerTool("diviops_meta_info", {
     description: "Returns DiviOps MCP server identity, version, license type, and available capabilities.",
 }, async () => {
     const info = {
@@ -1455,8 +1724,8 @@ Attributes are JSON in the block comment. Structure:
 - \`divi/cta\` — Call to action blocks
 
 ## Tips
-1. Always use \`diviops_get_module_schema\` to check exact attribute names before building markup.
-2. Use \`diviops_get_page_layout\` on existing pages to learn the format from real examples.
+1. Always use \`diviops_schema_get_module\` to check exact attribute names before building markup.
+2. Use \`diviops_page_get_layout\` on existing pages to learn the format from real examples.
 3. Use \`diviops_render_preview\` to validate markup before saving.
 `;
 // ── Template Resources ──────────────────────────────────────────────
@@ -1479,7 +1748,7 @@ function loadTemplates() {
 }
 const templates = loadTemplates();
 // Register a list tool so Claude can discover available templates
-server.registerTool("diviops_list_templates", {
+server.registerTool("diviops_template_list", {
     description: "List available Divi page section templates. Each template contains verified block markup patterns that can be used as a base for page generation.",
 }, async () => {
     const list = Array.from(templates.entries()).map(([name, t]) => ({
@@ -1492,7 +1761,7 @@ server.registerTool("diviops_list_templates", {
         content: [{ type: "text", text: JSON.stringify(list) }],
     };
 });
-server.registerTool("diviops_get_template", {
+server.registerTool("diviops_template_get", {
     description: "Get a specific Divi template with verified block markup, customizable variables, and usage notes. Use this to generate pages based on proven patterns.",
     inputSchema: {
         template_name: z
@@ -1519,7 +1788,7 @@ server.registerTool("diviops_get_template", {
     };
 });
 // ── Variable Manager CRUD ─────────────────────────────────────────────
-server.registerTool("diviops_list_variables", {
+server.registerTool("diviops_variable_list", {
     description: "List all design token variables from the Divi Variable Manager. Colors (gcid-*) come from et_global_data, numbers/strings/etc (gvid-*) from et_divi_global_variables. Filter by type or ID prefix.",
     inputSchema: {
         type: z
@@ -1537,14 +1806,14 @@ server.registerTool("diviops_list_variables", {
         params.type = type;
     if (prefix)
         params.prefix = prefix;
-    const result = await wp.request("/variables", { params });
+    const result = await wp.request("/variable/list", { params });
     return {
         content: [
             { type: "text", text: JSON.stringify(result) },
         ],
     };
 });
-server.registerTool("diviops_create_variable", {
+server.registerTool("diviops_variable_create", {
     description: 'Create a design token variable in the Divi Variable Manager. Colors (type "colors") use gcid-* IDs and hex values. Numbers/strings/etc use gvid-* IDs. For type="numbers" fluid tokens, pass min+max shorthand (anchors default to 320px/1920px) or explicit targets — server generates arithmetically-correct clamp() formulas. All-px inputs emit px (safe default, root-agnostic). Rem inputs OR rem output require explicit opt-in: pass output_unit="rem" (accepts the 1rem=16px default) or root_font_size_px:N (declares your site\'s actual root font-size for correct rem emission on non-16px-root sites). Mutually exclusive with value.',
     inputSchema: {
         type: z
@@ -1612,8 +1881,8 @@ server.registerTool("diviops_create_variable", {
         ],
     };
 });
-server.registerTool("diviops_create_fluid_system", {
-    description: "Batch-emit a fluid typography + spacing + radius variable set in one call — mirrors Divi 5.4.0's Variable Generator Modal at the algorithm level (clamp() math is identical to diviops_create_variable's fluid mode) but layers profile-selectable anchors over it. Each category is independent and optional. Use for: (1) bootstrapping a design system in one call instead of 20+ individual diviops_create_variable invocations; (2) mirroring ET's variable layout so your tokens coexist with VB-generated ones in the Variable Manager; (3) deterministic preflight via dry_run before committing the registry change. By default, refuses to overwrite existing IDs (returns them in `skipped`) — pass overwrite=true to update in place. Persists in a single atomic write to the variable registry; mid-batch failures roll back cleanly.",
+server.registerTool("diviops_variable_create_fluid_system", {
+    description: "Batch-emit a fluid typography + spacing + radius variable set in one call — mirrors Divi 5.4.0's Variable Generator Modal at the algorithm level (clamp() math is identical to diviops_variable_create's fluid mode) but layers profile-selectable anchors over it. Each category is independent and optional. Use for: (1) bootstrapping a design system in one call instead of 20+ individual diviops_variable_create invocations; (2) mirroring ET's variable layout so your tokens coexist with VB-generated ones in the Variable Manager; (3) deterministic preflight via dry_run before committing the registry change. By default, refuses to overwrite existing IDs (returns them in `skipped`) — pass overwrite=true to update in place. Persists in a single atomic write to the variable registry; mid-batch failures roll back cleanly.",
     inputSchema: {
         profile: z
             .enum(["divi-default", "wide", "custom"])
@@ -1770,7 +2039,7 @@ server.registerTool("diviops_create_fluid_system", {
         body.dry_run = dry_run;
     if (overwrite !== undefined)
         body.overwrite = overwrite;
-    const result = await wp.request("/variables-create-fluid-system", {
+    const result = await wp.request("/variable/create-fluid-system", {
         method: "POST",
         body,
     });
@@ -1780,8 +2049,8 @@ server.registerTool("diviops_create_fluid_system", {
         ],
     };
 });
-server.registerTool("diviops_delete_variable", {
-    description: "Delete a design token variable by ID. Auto-detects storage from ID prefix (gcid-* = colors, gvid-* = numbers/strings/etc). Returns HTTP 409 when live references exist unless force=true — run diviops_variables_scan_orphans to see where the references live. Returns HTTP 403 for Divi's customizer-bound defaults (gcid-primary-color, gcid-secondary-color, gcid-heading-color, gcid-body-color, gcid-link-color); those are managed via WP Customizer theme options and can't be deleted via this tool.",
+server.registerTool("diviops_variable_delete", {
+    description: "Delete a design token variable by ID. Auto-detects storage from ID prefix (gcid-* = colors, gvid-* = numbers/strings/etc). Returns HTTP 409 when live references exist unless force=true — run diviops_variable_scan_orphans to see where the references live. Returns HTTP 403 for Divi's customizer-bound defaults (gcid-primary-color, gcid-secondary-color, gcid-heading-color, gcid-body-color, gcid-link-color); those are managed via WP Customizer theme options and can't be deleted via this tool.",
     inputSchema: {
         id: z
             .string()
@@ -1790,7 +2059,7 @@ server.registerTool("diviops_delete_variable", {
             .boolean()
             .optional()
             .default(false)
-            .describe("Delete even if live references exist. Orphans will remain in page/preset content and render as invalid CSS on the frontend — run diviops_variables_scan_orphans afterwards to audit."),
+            .describe("Delete even if live references exist. Orphans will remain in page/preset content and render as invalid CSS on the frontend — run diviops_variable_scan_orphans afterwards to audit."),
     },
 }, async ({ id, force }) => {
     const result = await wp.request("/variable/delete", {
@@ -1803,18 +2072,18 @@ server.registerTool("diviops_delete_variable", {
         ],
     };
 });
-server.registerTool("diviops_variables_scan_orphans", {
+server.registerTool("diviops_variable_scan_orphans", {
     description: "Scan pages, Theme Builder layouts (header/body/footer), Divi Library items, canvas pages, and the preset registry for gvid-/gcid- references that have no backing entry in the Variable Manager (orphans), plus variables defined but referenced nowhere (unused). Orphans render as invalid CSS on the frontend — the $variable()$ resolver falls through with no fallback. Use after a deletion with force=true, or periodically as a hygiene check. Symmetric to diviops_preset_scan_orphans.",
 }, async () => {
-    const result = await wp.request("/variables-scan-orphans");
+    const result = await wp.request("/variable/scan-orphans");
     return {
         content: [
             { type: "text", text: JSON.stringify(result) },
         ],
     };
 });
-server.registerTool("diviops_variables_used_on_page", {
-    description: "Detect which numeric/font variable IDs a single page actually emits — the exact set Divi 5.4.0+ uses to scope selective `:root{--gvid-*}` CSS variable emission. Walks the same content stack the frontend assembles: post_content + active Theme Builder header/body/footer template content + appended canvas content (interaction targets etc.), plus presets referenced by that content. NOTE: this is `gvid-*` only — color variables (`gcid-*`) are emitted via a separate path (`GlobalData` color block) that is NOT scoped per-page in 5.4.0; this tool returns gvid IDs only. Use for per-page orphan validation (complements global diviops_variables_scan_orphans), preflight before bulk variable rename (know which pages are affected), or to debug why a numeric/font variable doesn't render on a specific page. Read-only. Returns variable_ids (sorted, deduped), count, and the tb_template_ids resolved for that post.",
+server.registerTool("diviops_variable_used_on_page", {
+    description: "Detect which numeric/font variable IDs a single page actually emits — the exact set Divi 5.4.0+ uses to scope selective `:root{--gvid-*}` CSS variable emission. Walks the same content stack the frontend assembles: post_content + active Theme Builder header/body/footer template content + appended canvas content (interaction targets etc.), plus presets referenced by that content. NOTE: this is `gvid-*` only — color variables (`gcid-*`) are emitted via a separate path (`GlobalData` color block) that is NOT scoped per-page in 5.4.0; this tool returns gvid IDs only. Use for per-page orphan validation (complements global diviops_variable_scan_orphans), preflight before bulk variable rename (know which pages are affected), or to debug why a numeric/font variable doesn't render on a specific page. Read-only. Returns variable_ids (sorted, deduped), count, and the tb_template_ids resolved for that post.",
     inputSchema: {
         post_id: z
             .number()
@@ -1823,14 +2092,14 @@ server.registerTool("diviops_variables_used_on_page", {
             .describe("WordPress post/page ID. The page does not need to be Divi-built — TB templates and canvases attached to non-Divi posts are still scanned."),
     },
 }, async ({ post_id }) => {
-    const result = await wp.request(`/variables-used-on-page/${post_id}`);
+    const result = await wp.request(`/variable/used-on-page/${post_id}`);
     return {
         content: [
             { type: "text", text: JSON.stringify(result) },
         ],
     };
 });
-server.registerTool("diviops_flush_static_cache", {
+server.registerTool("diviops_meta_flush_cache", {
     description: "Flush Divi's compiled static CSS cache under wp-content/et-cache/. wp cache flush does NOT touch these files — the frontend can keep serving stale CSS after a preset/variable/module mutation until the cache is cleared. Delegates to Divi's native ET_Core_PageResource::remove_static_resources when available (response backend: \"divi_native\"), which additionally clears Theme Builder CSS scattered across other post dirs, archive/taxonomy/home/notfound CSS, the object cache, module features cache, post features cache, Google Fonts cache, dynamic assets cache, and post meta caches. Falls back to a targeted filesystem walk of numeric-named et-cache subdirs when the Divi class is absent (backend: \"fs_fallback\"). Provide exactly one selector — no site-wide default to prevent accidental full flush. Idempotent: missing cache root returns 200 with empty list.",
     inputSchema: {
         post_id: z
@@ -1859,7 +2128,7 @@ server.registerTool("diviops_flush_static_cache", {
         body.all = true;
     if (after !== undefined)
         body.after = after;
-    const result = await wp.request("/flush-static-cache", {
+    const result = await wp.request("/meta/flush-cache", {
         method: "POST",
         body,
     });