@cplace/mcp-server 1.7.10 → 1.8.5

package/dist/tools/layout.js

@@ -3,7 +3,9 @@ import { debugLogWithTag } from "../logger.js";
 import { checkResponseSize } from "../utils.js";
 import { applyStrReplace } from '../str-replace-utils.js';
 import { determineApiEndpoint, buildRequestParams, findWidgetById } from './widget-tool-helpers.js';
-export const LayoutContextSchema = z.union([
+import { jsonStringToObject } from './common-schemas.js';
+import { decodeRichStringsInLayout, decodeRichStringsInScript, encodeRichStringsInScript, containsRawBase64Tag, DecodedWidgetParseError } from './layout-richstring-translator.js';
+export const LayoutContextSchema = jsonStringToObject(z.union([
     z.object({
         type: z.literal("page"),
         pageUID: z.string().describe("Page UID (e.g., 'page/abc123')")
@@ -14,26 +16,46 @@ export const LayoutContextSchema = z.union([
         typeInternalName: z.string().describe("Type internal name (e.g., 'cf.example.myType')"),
         alternativeLayoutName: z.string().optional().describe("Alternative layout name (optional)")
     })
-]).describe("Layout target - specify whether operating on page or type layout (pass as a JSON object, NOT a JSON string)");
-const TOOL_DEFINE_LAYOUT = 'cplace_define_layout';
+]).describe("Layout target - specify whether operating on page or type layout"));
+const TOOL_EXECUTE_LAYOUT_SCRIPT = 'cplace_execute_layout_script';
 const TOOL_GET_LAYOUT_OVERVIEW = 'cplace_get_layout_overview';
 const TOOL_GET_LAYOUT_WIDGET_DETAILS = 'cplace_get_layout_widget_details';
-const TOOL_GET_LAYOUT_DEFINITION = 'cplace_get_layout_definition';
+const TOOL_GET_LAYOUT_SCRIPT = 'cplace_get_layout_script';
 const TOOL_EDIT_LAYOUT = 'cplace_edit_layout';
 export const LAYOUT_TOOL_DEFINITIONS = {
-    [TOOL_DEFINE_LAYOUT]: {
-        description: `Define a complete page or type layout atomically using a layout.define() low-code script.
+    [TOOL_EXECUTE_LAYOUT_SCRIPT]: {
+        description: `Execute a layout script — either a full layout.define() replacement or per-widget edit verbs.
 
-WHEN TO USE:
-- Use this tool when you know the full layout structure upfront
-- Replaces the entire layout in a single atomic operation (no partial updates)
-- More efficient than sequential add-row/add-widget calls for complete layouts
+TWO MODES (determined by script content):
 
-KEY BEHAVIORS:
+MODE 1 — FULL REPLACE (layout.define):
+- Script calls layout.define() exactly once to declare the complete layout structure
+- Replaces the entire layout atomically
+- Same behavior as before
+
+MODE 2 — EDIT VERBS (per-widget):
+- Script calls one or more edit methods: layout.updateWidget(), layout.addWidget(), layout.removeWidget(), layout.moveWidget(), layout.addRow(), layout.compact()
+- Each call collects an operation; all operations commit atomically or fail together
+- Cannot mix layout.define() with edit verbs in the same script
+
+EDIT VERBS:
+  layout.updateWidget("widgetId", { "cf.cplace.x": newValue })  — partial config merge (only specified keys change)
+  layout.addWidget({ widgetType: "cf.platform.wiki", position: { rowIndex: 0, columnIndex: 0, widgetIndex: 0 }, configuration: { ... } })
+  layout.removeWidget("widgetId")
+  layout.moveWidget("widgetId", { rowIndex: 1, columnIndex: 0, widgetIndex: 0 })
+  layout.addRow(rowIndex, [6, 6])  — column proportions must sum to 12
+  layout.compact()  — remove empty rows
+
+WORKFLOW for per-widget edit:
+1. Read: cplace_get_layout_script with widgetIds to get layout.updateWidget() fragments
+2. Edit: modify the config values in the fragment
+3. Execute: post the modified script via this tool
+
+KEY BEHAVIORS (for layout.define mode):
 - The script must call layout.define() exactly once
 - The entire layout is atomically replaced — previous layout is fully overwritten
 - Script timeout: 30 seconds
-- Widget IDs: auto-generated if omitted; if provided without '_' prefix, '_' is prepended automatically
+- Widget IDs: MUST be omitted from layout.define. Ids are assigned by the server and returned in the response. Use the returned id in subsequent layout.updateWidget() calls.
 
 RESPONSE OUTCOMES:
 - VALID_COMPLETE: Layout saved, all widgets fully configured
@@ -57,12 +79,35 @@ cf.platform.connectedMatrix, cf.platform.connectedTableFilter,
 cf.platform.incomingReferences, cf.platform.comments, cf.platform.files,
 cf.cplace.visualizations.scriptingHighcharts
 
-For app-dependent widgets not in this list, call cplace_list_widget_definitions with embeddingContext "AS_WIDGET".`,
+For app-dependent widgets not in this list, call cplace_list_widget_definitions with embeddingContext "AS_WIDGET".
+
+RICHSTRING WIDGETS AND EMBEDDED WIDGETS (decoded form):
+RichString widgets (cf.platform.richString, cf.cplace.demoWidgets.demoRichString)
+hold HTML in their 'content' config. Embedded widgets inside that HTML are
+expressed in decoded form:
+  <embeddedwidget id="id_w1" type="cf.platform.singleAttribute">{"properties":{"attribute":"name"}}</embeddedwidget>
+
+Semantics when submitting a script:
+  • Tag with an existing id + same type → update (properties replace current)
+  • Tag without id → insert new embedded widget (backend assigns id)
+  • Existing id omitted from new content → delete
+  • Unknown id, duplicate id, or type change for same id → error
+
+Raw base64 <embeddedwidget>BASE64</embeddedwidget> tags are REJECTED on writes.
+Fetch current decoded form via cplace_get_layout_script.
+
+IMPORTANT: Decoded <embeddedwidget> tags must appear directly inline in a content: value.
+Do NOT build the tag in a variable and pass it — the parser rejects tags outside content: literals.
+  ✅ layout.updateWidget("id", { content: '<embeddedwidget type="...">...</embeddedwidget>' });
+  ❌ var tag = '<embeddedwidget ...>...</embeddedwidget>'; layout.updateWidget("id", { content: tag });
+
+For atomic single-embedded-widget edits without rewriting the full script,
+see cplace_layout_richstring_* tools.`,
         inputSchema: {
             context: LayoutContextSchema,
-            script: z.string().describe(`JavaScript code that calls layout.define() exactly once to declare the complete layout structure.
+            script: z.string().describe(`JavaScript code that calls layout.define() exactly once OR one or more edit verbs.
 
-LAYOUT SPECIFICATION FORMAT:
+FULL REPLACE — layout.define() FORMAT:
 layout.define({
   rows: [
     {
@@ -71,7 +116,6 @@ layout.define({
           proportion: 6,        // Column width: integer 3-12, all columns in a row must sum to 12
           widgets: [
             {
-              id: "myWidget",   // Optional: explicit widget ID (auto-prefixed with '_' if missing prefix)
               type: "cf.platform.embeddedSearchAsTable",  // Required: widget type identifier
               config: {         // Optional: widget configuration key-value pairs (use {en: "...", de: "..."} for localized strings)
                 title: { en: "My Table", de: "Meine Tabelle" },
@@ -90,13 +134,21 @@ layout.define({
   ]
 });
 
+EDIT VERBS — per-widget operations:
+layout.updateWidget("widgetId", { "configKey": newValue });
+layout.addWidget({ widgetType: "cf.platform.wiki", position: { rowIndex: 0, columnIndex: 0, widgetIndex: 0 } });
+layout.removeWidget("widgetId");
+layout.moveWidget("widgetId", { rowIndex: 1, columnIndex: 0, widgetIndex: 0 });
+layout.addRow(0, [6, 6]);
+layout.compact();
+
 COLUMN PROPORTION RULES:
 - Each column proportion must be between 3 and 12
 - All column proportions in a row must sum to exactly 12
 - Common patterns: [12] (full width), [6,6] (two equal), [4,4,4] (three equal), [8,4] (main + sidebar), [3,9] (sidebar + main)
 
-WIDGET FIELDS:
-- id (optional): Explicit widget ID. Auto-prefixed with '_' if it doesn't start with '_'. Auto-generated if omitted.
+WIDGET FIELDS (for layout.define):
+- id: Do NOT provide. Ids are assigned by the server and returned in the response.
 - type (required): Widget type identifier (e.g., 'cf.platform.wiki', 'cf.platform.embeddedSearchAsTable', 'cf.platform.comments', 'cf.platform.files')
 - config (optional): Key-value object of widget configuration. Keys are config attribute names from cplace_get_widget_definition. IMPORTANT: Attribute names vary per widget type — some use short names (e.g., 'search', 'height'), others use fully-qualified names (e.g., 'cf.cplace.platform.attributesGroup.localizedTitle'). Do NOT guess attribute names — call cplace_get_widget_definition with includeDetails: true first. Omit 'cf.platform.entity' entirely (it defaults to the current page; passing empty causes errors). Values are strings, numbers, booleans, or objects. For localizedString attributes, use locale keys: { en: "English", de: "German" }.
 - embeddedLayouts (optional): Object mapping layout attribute names to nested layout specs. Used for container widgets (tab groups, attributes groups).
@@ -140,62 +192,15 @@ layout.define({
   ]
 });
 
-Multi-row layout with explicit widget IDs and localized title:
-layout.define({
-  rows: [
-    { columns: [{ proportion: 12, widgets: [{ id: "header", type: "cf.platform.wiki" }] }] },
-    {
-      columns: [
-        { proportion: 6, widgets: [{ id: "tasks", type: "cf.platform.embeddedSearchAsTable", config: { title: { en: "Tasks", de: "Aufgaben" }, height: 400, search: '{"filters":[{"typeNames":["cf.project.Task"]}]}' } }] },
-        { proportion: 6, widgets: [{ id: "milestones", type: "cf.platform.embeddedSearchAsTable", config: { title: { en: "Milestones", de: "Meilensteine" }, height: 400, search: '{"filters":[{"typeNames":["cf.project.Milestone"]}]}' } }] }
-      ]
-    },
-    { columns: [{ proportion: 12, widgets: [{ id: "comments", type: "cf.platform.comments" }] }] }
-  ]
-});
-
-Widget with embedded layout (container widget):
-layout.define({
-  rows: [
-    {
-      columns: [
-        {
-          proportion: 12,
-          widgets: [
-            {
-              type: "cf.cplace.platform.attributesGroup",
-              config: { "cf.cplace.platform.attributesGroup.localizedTitle": { en: "Details Section", de: "Detailbereich" } },
-              embeddedLayouts: {
-                "widgetsLayout": {
-                  rows: [
-                    {
-                      columns: [
-                        { proportion: 6, widgets: [{ type: "cf.platform.wiki" }] },
-                        { proportion: 6, widgets: [{ type: "cf.platform.files" }] }
-                      ]
-                    }
-                  ]
-                }
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-});
+Per-widget edit example:
+layout.updateWidget("myTable", { "height": 800 });
 
-Dynamic layout using search APIs:
-var search = new Search();
-search.add(Filters.type("cf.project.Dashboard"));
-var count = search.getResultCount();
-var widgets = [{ type: "cf.platform.wiki" }];
-if (count > 0) {
-  widgets.push({ type: "cf.platform.embeddedSearchAsTable", config: { height: 400, search: '{"filters":[{"typeNames":["cf.project.Dashboard"]}]}' } });
-}
-layout.define({ rows: [{ columns: [{ proportion: 12, widgets: widgets }] }] });`)
+EMBEDDED WIDGET CONSTRAINT:
+<embeddedwidget> tags must appear directly inline in content: string literals — not in variables.
+  ✅ layout.updateWidget("id", { content: '<embeddedwidget ...>...</embeddedwidget>' });
+  ❌ var tag = '<embeddedwidget ...>'; layout.updateWidget("id", { content: tag });`)
         },
-        annotations: { title: "Define Layout" }
+        annotations: { title: "Execute Layout Script" }
     },
     [TOOL_GET_LAYOUT_OVERVIEW]: {
         description: "Get layout structure for page or type. Provides an overview of the layout grid including rows, columns, and widget summaries for both page and type layouts.",
@@ -205,36 +210,39 @@ layout.define({ rows: [{ columns: [{ proportion: 12, widgets: widgets }] }] });`
         annotations: { title: "Get Layout Overview" }
     },
     [TOOL_GET_LAYOUT_WIDGET_DETAILS]: {
-        description: "Get detailed widget configuration from page or type layout. Extracts specific widget information from the layout structure.",
+        description: "Get detailed widget configuration from page or type layout. Extracts specific widget information from the layout structure.\n\nRichString widget content appears in decoded form: `<embeddedwidget id=\"…\" type=\"…\">{\"properties\":{…}}</embeddedwidget>` — no base64.",
         inputSchema: {
             context: LayoutContextSchema,
             widgetId: z.string().describe("The unique widget identifier to get details for")
         },
         annotations: { title: "Get Layout Widget Details" }
     },
-    [TOOL_GET_LAYOUT_DEFINITION]: {
-        description: `Get the current layout as a layout.define() JavaScript definition for a page or type layout.
+    [TOOL_GET_LAYOUT_SCRIPT]: {
+        description: `Get the current layout as an executable script for a page or type layout.
 
-WHEN TO USE:
-- To read the current layout before modifying it (read-edit-write workflow)
-- To inspect the full layout definition including widget configurations and embedded layouts
-- To copy a layout from one page/type to another
+TWO MODES (determined by widgetIds parameter):
 
-RETURNS:
-- The layout as a layout.define({...}) definition string, ready to be modified and posted back via cplace_define_layout
-- Widget config values are in the INPUT format accepted by cplace_define_layout (references as UID strings, rich strings as markup strings, localized strings as {locale: value} maps)
+WITHOUT widgetIds: Returns the full layout as a layout.define({...}) script (same as before).
+
+WITH widgetIds: Returns layout.updateWidget("id", {config}) fragments for just the specified widgets.
+The output is directly executable — post it back via cplace_execute_layout_script.
 
 ROUND-TRIP WORKFLOW:
-1. GET: Use this tool to retrieve the current layout definition
-2. EDIT: Modify the definition as needed
-3. APPLY: Use cplace_define_layout to apply the modified definition`,
+1. GET: Use this tool (with widgetIds for selective read, without for full layout)
+2. EDIT: Modify the script as needed
+3. APPLY: Use cplace_execute_layout_script to apply
+
+RichString widget content is returned in decoded form:
+  <embeddedwidget id="…" type="…">{"properties":{…}}</embeddedwidget>
+The output is directly executable — base64 tags are never emitted.`,
         inputSchema: {
-            context: LayoutContextSchema
+            context: LayoutContextSchema,
+            widgetIds: z.array(z.string()).optional().describe("Optional list of widget IDs to read. When provided, returns layout.updateWidget() fragments for just those widgets instead of the full layout.define() script. Widget IDs can be found via cplace_get_layout_overview.")
         },
-        annotations: { title: "Get Layout Definition" }
+        annotations: { title: "Get Layout Script" }
     },
     [TOOL_EDIT_LAYOUT]: {
-        description: "Edit a layout using str_replace — find an exact text match and replace it. Reads the current layout.define() definition, applies the replacement, and writes back. Use this instead of cplace_define_layout when making small changes to large layouts to avoid reproducing the entire definition.",
+        description: "Edit a layout using str_replace — find an exact text match and replace it. Reads the current layout.define() definition, applies the replacement, and writes back. Use this instead of cplace_execute_layout_script when making small changes to large layouts to avoid reproducing the entire definition.\n\nRichString widget content is in decoded form. `old_str` must match the decoded form exactly as returned by cplace_get_layout_script. Raw base64 <embeddedwidget> tags are rejected in both `old_str` and `new_str`.",
         inputSchema: {
             context: LayoutContextSchema,
             old_str: z.string().describe("The exact text to find in the layout definition (must match exactly, including whitespace and line breaks)"),
@@ -251,17 +259,18 @@ async function getLayoutOverview(client, context) {
     return await client.makeApiRequest(endpoint, 'GET', requestParams);
 }
 export function registerLayoutTools(server, client) {
-    server.registerTool(TOOL_DEFINE_LAYOUT, LAYOUT_TOOL_DEFINITIONS[TOOL_DEFINE_LAYOUT], async ({ context, script }) => {
-        debugLogWithTag('DEFINE_LAYOUT', `Defining ${context.type} layout (${script.length} chars)`);
+    server.registerTool(TOOL_EXECUTE_LAYOUT_SCRIPT, LAYOUT_TOOL_DEFINITIONS[TOOL_EXECUTE_LAYOUT_SCRIPT], async ({ context, script }) => {
+        debugLogWithTag('EXECUTE_LAYOUT_SCRIPT', `Executing ${context.type} layout script (${script.length} chars)`);
         try {
             const endpoint = context.type === "page"
                 ? "json/page/layoutScript"
                 : "json/type/layoutScript";
+            const encodedScript = await encodeRichStringsInScript(client, context, script);
             let requestBody;
             if (context.type === "page") {
                 requestBody = {
                     pageUID: context.pageUID,
-                    script
+                    script: encodedScript
                 };
             }
             else {
@@ -269,15 +278,18 @@ export function registerLayoutTools(server, client) {
                     workspaceId: context.workspaceId,
                     typeInternalName: context.typeInternalName,
                     ...(context.alternativeLayoutName && { alternativeLayoutName: context.alternativeLayoutName }),
-                    script
+                    script: encodedScript
                 };
             }
             const rawResponse = await client.makeRawApiRequest(endpoint, 'POST', undefined, requestBody);
-            debugLogWithTag('DEFINE_LAYOUT', `Raw response success: ${rawResponse.success}, status: ${rawResponse.status || 'N/A'}`);
+            debugLogWithTag('EXECUTE_LAYOUT_SCRIPT', `Raw response success: ${rawResponse.success}, status: ${rawResponse.status || 'N/A'}`);
             let response;
             if (rawResponse.success === true) {
+                if (rawResponse.result) {
+                    await decodeRichStringsInLayout(client, rawResponse.result);
+                }
                 response = {
-                    operation: "DEFINE_LAYOUT",
+                    operation: "EXECUTE_LAYOUT_SCRIPT",
                     success: true,
                     status: rawResponse.status,
                     context,
@@ -287,7 +299,7 @@ export function registerLayoutTools(server, client) {
             }
             else if (rawResponse.errors) {
                 response = {
-                    operation: "DEFINE_LAYOUT",
+                    operation: "EXECUTE_LAYOUT_SCRIPT",
                     success: false,
                     status: "VALIDATION_ERROR",
                     context,
@@ -297,7 +309,7 @@ export function registerLayoutTools(server, client) {
             }
             else {
                 response = {
-                    operation: "DEFINE_LAYOUT",
+                    operation: "EXECUTE_LAYOUT_SCRIPT",
                     success: false,
                     status: "ERROR",
                     context,
@@ -311,7 +323,7 @@ export function registerLayoutTools(server, client) {
                     response.resultNote = "Layout was persisted successfully. Result omitted due to size. Use cplace_get_layout_overview to inspect.";
                     const sizeCheck2 = checkResponseSize(response);
                     if (sizeCheck2.tooLarge) {
-                        debugLogWithTag('DEFINE_LAYOUT', `Response still too large after stripping result: ${sizeCheck2.actualSize} chars`);
+                        debugLogWithTag('EXECUTE_LAYOUT_SCRIPT', `Response still too large after stripping result: ${sizeCheck2.actualSize} chars`);
                         return {
                             content: [{
                                     type: "text",
@@ -322,7 +334,7 @@ export function registerLayoutTools(server, client) {
                     }
                 }
                 else {
-                    debugLogWithTag('DEFINE_LAYOUT', `Error response too large: ${sizeCheck.actualSize} chars`);
+                    debugLogWithTag('EXECUTE_LAYOUT_SCRIPT', `Error response too large: ${sizeCheck.actualSize} chars`);
                     return {
                         content: [{
                                 type: "text",
@@ -332,18 +344,24 @@ export function registerLayoutTools(server, client) {
                     };
                 }
             }
-            debugLogWithTag('DEFINE_LAYOUT', `Returning response with success=${response.success}, status=${response.status}`);
+            debugLogWithTag('EXECUTE_LAYOUT_SCRIPT', `Returning response with success=${response.success}, status=${response.status}`);
             return {
                 content: [{ type: "text", text: JSON.stringify(response, null, 2) }],
                 ...(!response.success ? { isError: true } : {})
             };
         }
         catch (error) {
-            debugLogWithTag('DEFINE_LAYOUT', `Error: ${error instanceof Error ? error.message : String(error)}`);
+            debugLogWithTag('EXECUTE_LAYOUT_SCRIPT', `Error: ${error instanceof Error ? error.message : String(error)}`);
+            if (error instanceof DecodedWidgetParseError) {
+                return {
+                    content: [{ type: "text", text: error.message }],
+                    isError: true
+                };
+            }
             return {
                 content: [{
                         type: "text",
-                        text: `Error defining layout: ${error instanceof Error ? error.message : String(error)}`
+                        text: `Error executing layout script: ${error instanceof Error ? error.message : String(error)}`
                     }],
                 isError: true
             };
@@ -389,6 +407,7 @@ export function registerLayoutTools(server, client) {
         debugLogWithTag('LAYOUT', `Getting widget details for ${widgetId} from ${context.type} layout`);
         try {
             const layoutResult = await getLayoutOverview(client, context);
+            await decodeRichStringsInLayout(client, layoutResult);
             const foundWidget = findWidgetById(layoutResult.rows, widgetId);
             if (!foundWidget) {
                 return {
@@ -417,33 +436,38 @@ export function registerLayoutTools(server, client) {
             };
         }
     });
-    server.registerTool(TOOL_GET_LAYOUT_DEFINITION, LAYOUT_TOOL_DEFINITIONS[TOOL_GET_LAYOUT_DEFINITION], async ({ context }) => {
-        debugLogWithTag('LAYOUT', `Getting layout definition for ${context.type} layout`);
+    server.registerTool(TOOL_GET_LAYOUT_SCRIPT, LAYOUT_TOOL_DEFINITIONS[TOOL_GET_LAYOUT_SCRIPT], async ({ context, widgetIds }) => {
+        debugLogWithTag('GET_LAYOUT_SCRIPT', `Getting layout script for ${context.type} layout${widgetIds ? ` (widgets: ${widgetIds.join(', ')})` : ''}`);
         try {
             const endpoint = context.type === "page"
                 ? "json/page/layoutScript"
                 : "json/type/layoutScript";
-            const params = buildRequestParams(context);
+            const params = {
+                ...buildRequestParams(context),
+                ...(widgetIds && widgetIds.length > 0 && { widgetIds })
+            };
             const rawResponse = await client.makeRawApiRequest(endpoint, 'GET', params);
             if (rawResponse.success !== true) {
                 return {
                     content: [{
                             type: "text",
-                            text: `Error getting ${context.type} layout definition: ${rawResponse.errorMessage || "Unknown error"}`
+                            text: `Error getting ${context.type} layout script: ${rawResponse.errorMessage || "Unknown error"}`
                         }],
                     isError: true
                 };
             }
+            const decodedScript = await decodeRichStringsInScript(client, rawResponse.script);
             const response = {
                 context,
-                script: rawResponse.script
+                ...(widgetIds && { widgetIds }),
+                script: decodedScript
             };
             const sizeCheck = checkResponseSize(response);
             if (sizeCheck.tooLarge) {
                 return {
                     content: [{
                             type: "text",
-                            text: `Layout definition response too large (${sizeCheck.actualSize} characters). Use cplace_get_layout_overview to inspect the layout structure instead.`
+                            text: `Layout script response too large (${sizeCheck.actualSize} characters). ${widgetIds ? 'Try requesting fewer widgets.' : 'Use cplace_get_layout_overview to inspect the layout structure instead, or use widgetIds to request specific widgets.'}`
                         }],
                     isError: true
                 };
@@ -453,11 +477,11 @@ export function registerLayoutTools(server, client) {
             };
         }
         catch (error) {
-            debugLogWithTag('LAYOUT', `Error getting layout definition: ${error instanceof Error ? error.message : String(error)}`);
+            debugLogWithTag('GET_LAYOUT_SCRIPT', `Error: ${error instanceof Error ? error.message : String(error)}`);
             return {
                 content: [{
                         type: "text",
-                        text: `Error getting ${context.type} layout definition: ${error instanceof Error ? error.message : String(error)}`
+                        text: `Error getting ${context.type} layout script: ${error instanceof Error ? error.message : String(error)}`
                     }],
                 isError: true
             };
@@ -466,6 +490,15 @@ export function registerLayoutTools(server, client) {
     server.registerTool(TOOL_EDIT_LAYOUT, LAYOUT_TOOL_DEFINITIONS[TOOL_EDIT_LAYOUT], async ({ context, old_str, new_str, replace_all = false }) => {
         debugLogWithTag('EDIT_LAYOUT', `Editing ${context.type} layout`);
         try {
+            if (containsRawBase64Tag(old_str) || containsRawBase64Tag(new_str)) {
+                return {
+                    content: [{
+                            type: "text",
+                            text: 'Raw base64 <embeddedwidget> tags are not accepted in str_replace. Use the decoded form:\n  <embeddedwidget id="…" type="…">{"properties":{…}}</embeddedwidget>\nFetch the current decoded form via cplace_get_layout_script.'
+                        }],
+                    isError: true
+                };
+            }
             const readEndpoint = context.type === "page"
                 ? "json/page/layoutScript"
                 : "json/type/layoutScript";
@@ -477,10 +510,10 @@ export function registerLayoutTools(server, client) {
                     isError: true
                 };
             }
-            const currentScript = rawResponse.script;
+            const currentScript = await decodeRichStringsInScript(client, rawResponse.script);
             if (currentScript === undefined || currentScript === null || currentScript === '') {
                 return {
-                    content: [{ type: "text", text: `Error: No layout definition found for this ${context.type}. Use cplace_define_layout to create a new layout.` }],
+                    content: [{ type: "text", text: `Error: No layout definition found for this ${context.type}. Use cplace_execute_layout_script to create a new layout.` }],
                     isError: true
                 };
             }
@@ -491,16 +524,17 @@ export function registerLayoutTools(server, client) {
                     isError: true
                 };
             }
+            const encodedNewScript = await encodeRichStringsInScript(client, context, result.newContent);
             let writeBody;
             if (context.type === "page") {
-                writeBody = { pageUID: context.pageUID, script: result.newContent };
+                writeBody = { pageUID: context.pageUID, script: encodedNewScript };
             }
             else {
                 writeBody = {
                     workspaceId: context.workspaceId,
                     typeInternalName: context.typeInternalName,
                     ...(context.alternativeLayoutName && { alternativeLayoutName: context.alternativeLayoutName }),
-                    script: result.newContent
+                    script: encodedNewScript
                 };
             }
             const writeResponse = await client.makeRawApiRequest(readEndpoint, 'POST', undefined, writeBody);
@@ -523,6 +557,12 @@ export function registerLayoutTools(server, client) {
         }
         catch (error) {
             debugLogWithTag('EDIT_LAYOUT', `Error: ${error instanceof Error ? error.message : String(error)}`);
+            if (error instanceof DecodedWidgetParseError) {
+                return {
+                    content: [{ type: "text", text: error.message }],
+                    isError: true
+                };
+            }
             return {
                 content: [{ type: "text", text: `Error editing layout: ${error instanceof Error ? error.message : String(error)}` }],
                 isError: true

package/dist/tools/layout.js.map

@@ -1 +1 @@
-{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/tools/layout.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/tools/layout.ts"],"names":[],"mappings":"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"}

package/dist/tools/pages.d.ts

@@ -60,8 +60,8 @@ export declare const PAGE_TOOL_DEFINITIONS: {
             readonly name: z.ZodOptional<z.ZodString>;
             readonly parentUID: z.ZodOptional<z.ZodString>;
             readonly content: z.ZodOptional<z.ZodString>;
-            readonly attributes: z.ZodOptional<z.ZodAny>;
-            readonly builtinAttributes: z.ZodOptional<z.ZodAny>;
+            readonly attributes: z.ZodEffects<z.ZodOptional<z.ZodAny>, any, unknown>;
+            readonly builtinAttributes: z.ZodEffects<z.ZodOptional<z.ZodAny>, any, unknown>;
         };
         readonly annotations: {
             readonly title: "Manage Page";

package/dist/tools/pages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pages.d.ts","sourceRoot":"","sources":["../../src/tools/pages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAc5C,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwFxB,CAAC;AAEX,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,QAuY3E"}
+{"version":3,"file":"pages.d.ts","sourceRoot":"","sources":["../../src/tools/pages.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAc5C,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwFxB,CAAC;AAEX,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,QA4X3E"}

package/dist/tools/pages.js

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { debugLogWithTag } from "../logger.js";
 import { checkResponseSize } from '../utils.js';
-import { DATE_TIME_FORMAT_DESCRIPTION, validateNotJsonString } from "./common-schemas.js";
+import { DATE_TIME_FORMAT_DESCRIPTION, jsonStringToObject } from "./common-schemas.js";
 import { applyStrReplace } from '../str-replace-utils.js';
 const TOOL_DELETE_PAGE = 'cplace_delete_page';
 const TOOL_DELETE_PAGE_WITH_CHILDREN = 'cplace_delete_page_with_children';
@@ -59,7 +59,7 @@ export const PAGE_TOOL_DEFINITIONS = {
             name: z.string().optional().describe("Page name. For create operations: optional if type has name generation pattern (auto-generates from pattern), otherwise required. For update operations: optional. Name generation pattern syntax: <attributeName> for attribute values, {###} for sequential counter, {0000} for zero-padded counter. Example: '<title>-{0000}' generates 'ProjectAlpha-0001'. Provide explicit name to override pattern. Use cplace_get_type_datamodel to check if type supports name generation."),
             parentUID: z.string().optional().describe("Parent page UID for hierarchy. For create: sets initial parent. For update: moves page (use empty string to remove parent)."),
             content: z.string().optional().describe("HTML content for the page. Use HTML markup, not markdown - e.g. '<strong>bold</strong>' not '**bold**'. For update: use empty string to remove content."),
-            attributes: z.any().optional().describe(`Pass as a JSON object (NOT \`customAttributes\`, NOT a JSON string). Custom attribute values as key-value pairs. 🔍 IMPORTANT: Use 'cplace_get_type_datamodel' tool first to understand attribute requirements and constraints. Supports:
+            attributes: jsonStringToObject(z.any().optional()).describe(`Pass as a JSON object (NOT \`customAttributes\`, NOT a JSON string). Custom attribute values as key-value pairs. 🔍 IMPORTANT: Use 'cplace_get_type_datamodel' tool first to understand attribute requirements and constraints. Supports:
 - String values: "text"
 - Numeric values: 42 or 3.14
 - Boolean values: true/false
@@ -76,7 +76,7 @@ The system automatically detects attribute types from the page type definition a
 - Proper multiplicity validation (single vs multi-valued)
 - Automatic type conversion and validation
 - Enhanced error messages with attribute-specific details`),
-            builtinAttributes: z.any().optional().describe(`Builtin/mixin-provided attributes (optional for schedules). Supports:
+            builtinAttributes: jsonStringToObject(z.any().optional()).describe(`Builtin/mixin-provided attributes (optional for schedules). Supports:
 - owner: Person UID as string (e.g., "person/123abc456") - Sets/updates the page owner for schedules
 - For update only: Use null to remove builtin attribute values
 
@@ -104,15 +104,6 @@ export function registerPageTools(server, client) {
     server.registerTool(TOOL_MANAGE_PAGE, PAGE_TOOL_DEFINITIONS[TOOL_MANAGE_PAGE], async (params) => {
         const { operation } = params;
         debugLogWithTag('MANAGE_PAGE', `${operation} page operation`);
-        for (const [paramName, value] of [
-            ['attributes', params.attributes],
-            ['builtinAttributes', params.builtinAttributes],
-        ]) {
-            const jsonStringError = validateNotJsonString(value, paramName, 'object');
-            if (jsonStringError) {
-                return { content: [{ type: "text", text: jsonStringError.message }], isError: true };
-            }
-        }
         try {
             if (operation === "create") {
                 if (!params.workspaceId || !params.typeInternalName) {