@agent-native/core 0.82.0 → 0.83.0

package/corpus/README.md

@@ -28,4 +28,4 @@ rg -n "defineAction|useActionQuery" node_modules/@agent-native/core/corpus
 ## Generated Counts
 
 - core files: 2043
-- template files: 4807
+- template files: 4820

package/corpus/core/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @agent-native/core
 
+## 0.83.0
+
+### Minor Changes
+
+- 1a8d939: Add dynamic command menu results and an opt-in contenteditable Cmd+K shortcut path for editor-backed apps.
+
 ## 0.82.0
 
 ### Minor Changes

package/corpus/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.82.0",
+  "version": "0.83.0",
   "description": "Framework for agent-native application development — where AI agents and UI share SQL state, actions, and context",
   "homepage": "https://github.com/BuilderIO/agent-native#readme",
   "bugs": {

package/corpus/core/src/client/CommandMenu.tsx

@@ -261,6 +261,8 @@ export interface CommandMenuProps {
   open: boolean;
   onOpenChange: (open: boolean) => void;
   children: ReactNode;
+  /** Render app-specific dynamic results from the current search value. */
+  renderResults?: (search: string) => ReactNode;
   /** Placeholder text for the search input */
   placeholder?: string;
   /** Text shown when no results match (before showing agent fallback) */
@@ -291,6 +293,7 @@ export function CommandMenu({
   open,
   onOpenChange,
   children,
+  renderResults,
   placeholder = "Type a command or ask AI...",
   emptyText: _emptyText = "No commands found.",
   showAgentFallback = true,
@@ -325,8 +328,15 @@ export function CommandMenu({
     setTimeout(() => setChangelogOpen(true), 50);
   }, [onOpenChange, markChangelogSeen]);
 
-  // Focus input when opening
+  // Focus input when opening; clear search while closed so reopen never renders
+  // dynamic results for the previous query.
   useEffect(() => {
+    if (!open) {
+      setSearch("");
+      setSelectedIndex(0);
+      return;
+    }
+
     if (open) {
       setSearch("");
       setSelectedIndex(0);
@@ -497,6 +507,8 @@ export function CommandMenu({
       React.isValidElement(child) &&
       (child.type === CommandGroup || child.type === CommandDocsGroup),
   );
+  const dynamicResults = open ? renderResults?.(search) : null;
+  const hasDynamicResults = Boolean(dynamicResults);
 
   return (
     <>
@@ -528,6 +540,7 @@ export function CommandMenu({
 
               {/* Command list */}
               <div className="max-h-[300px] overflow-y-auto overflow-x-hidden">
+                {dynamicResults}
                 {hasResults && filteredChildren}
 
                 {/* What's new — built-in changelog entry */}
@@ -567,7 +580,9 @@ export function CommandMenu({
                 {/* Ask AI — always visible at the bottom */}
                 {showAgentFallback && (
                   <>
-                    {(hasResults || showChangelogRow) && <CommandSeparator />}
+                    {(hasResults || showChangelogRow || hasDynamicResults) && (
+                      <CommandSeparator />
+                    )}
                     <div className="p-1">
                       <div
                         className="relative flex cursor-pointer select-none items-center gap-2 rounded-sm px-2 py-2 text-sm outline-none"
@@ -658,16 +673,21 @@ CommandMenu.Separator = CommandSeparator;
 /**
  * Hook to handle Cmd+K (or Ctrl+K) to open the command menu
  */
-export function useCommandMenuShortcut(onOpen: () => void) {
+export function useCommandMenuShortcut(
+  onOpen: () => void,
+  options: { allowContentEditable?: boolean } = {},
+) {
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {
-      if ((e.metaKey || e.ctrlKey) && e.key === "k") {
-        // Don't trigger if user is typing in an input/textarea
-        const target = e.target as HTMLElement;
+      if ((e.metaKey || e.ctrlKey) && e.key.toLowerCase() === "k") {
+        // Don't trigger if user is typing in a native form control.
+        const target = e.target instanceof HTMLElement ? e.target : null;
+        const isContentEditable = target?.isContentEditable;
         if (
-          target.tagName === "INPUT" ||
-          target.tagName === "TEXTAREA" ||
-          target.isContentEditable
+          target?.tagName === "INPUT" ||
+          target?.tagName === "TEXTAREA" ||
+          target?.tagName === "SELECT" ||
+          (!options.allowContentEditable && isContentEditable)
         ) {
           return;
         }
@@ -675,9 +695,11 @@ export function useCommandMenuShortcut(onOpen: () => void) {
         onOpen();
       }
     };
-    document.addEventListener("keydown", handleKeyDown);
-    return () => document.removeEventListener("keydown", handleKeyDown);
-  }, [onOpen]);
+    const useCapture = Boolean(options.allowContentEditable);
+    document.addEventListener("keydown", handleKeyDown, useCapture);
+    return () =>
+      document.removeEventListener("keydown", handleKeyDown, useCapture);
+  }, [onOpen, options.allowContentEditable]);
 }
 
 export type {

package/corpus/templates/analytics/actions/hubspot-deals.ts

@@ -264,6 +264,12 @@ function hasStructuredFilters(filters: ReturnType<typeof buildFilterSummary>) {
 function buildGuidance(options: {
   query: string | undefined;
   structuredFilters: boolean;
+  truncated: boolean;
+  hasMore: boolean;
+  total: number;
+  returned: number;
+  offset: number;
+  limit: number;
 }) {
   const guidance: string[] = [];
 
@@ -285,6 +291,15 @@ function buildGuidance(options: {
     );
   }
 
+  if (options.truncated) {
+    const more = options.hasMore
+      ? `Fetch the next page with offset ${options.offset + options.returned}.`
+      : "This is the last page of the cohort.";
+    guidance.push(
+      `Returned ${options.returned} of ${options.total} matching deals (limit ${options.limit}, offset ${options.offset}). This is a partial slice — do NOT treat it as the full cohort. Use total for counts/aggregates. ${more} Narrow the filters or, for exhaustive cohort analysis, use provider-api-request with provider = hubspot and stageAs.`,
+    );
+  }
+
   return guidance.join(" ");
 }
 
@@ -293,7 +308,7 @@ export default defineAction({
   // reusable across continuation retries (no re-fetch on resume).
   readOnly: true,
   description:
-    "Get HubSpot deals with normalized stage, pipeline, owner, forecast, and NBM fields. This is a bounded deal analytics shortcut, not the full HubSpot capability surface. Use query for a specific customer/deal/account deep dive. For cohorts like products field = Publish, closed-won, pipeline = New Business, or close date in a range, use the structured product, pipeline, closedStatus, closedDateFrom, and closedDateTo filters instead of query when the answer is the deal list itself. If the cohort feeds a cross-source join, transcript/message/ticket search, exhaustive absence check, or downstream code/corpus workflow, prefer provider-api-catalog/provider-api-request with provider = hubspot and stageAs so the cohort is available as a staged dataset. For non-deal CRM records use hubspot-records; for arbitrary HubSpot endpoints, filters, associations, batch APIs, or payloads use provider-api-catalog/provider-api-docs/provider-api-request with provider = hubspot.",
+    "Get HubSpot deals with normalized stage, pipeline, owner, forecast, and NBM fields. This is a bounded deal analytics shortcut, not the full HubSpot capability surface. Use query for a specific customer/deal/account deep dive. For cohorts like products field = Publish, closed-won, pipeline = New Business, or close date in a range, use the structured product, pipeline, closedStatus, closedDateFrom, and closedDateTo filters instead of query when the answer is the deal list itself. If the cohort feeds a cross-source join, transcript/message/ticket search, exhaustive absence check, or downstream code/corpus workflow, prefer provider-api-catalog/provider-api-request with provider = hubspot and stageAs so the cohort is available as a staged dataset. Both paths are bounded: at most limit deals are returned (default 25, max 100). The structured-filter path returns total as the true matched count and a truncated flag; page with offset (or narrow filters) instead of expecting the whole cohort in one call, since a full enriched cohort can be several MB and overruns extension and context budgets. For non-deal CRM records use hubspot-records; for arbitrary HubSpot endpoints, filters, associations, batch APIs, or payloads use provider-api-catalog/provider-api-docs/provider-api-request with provider = hubspot.",
   schema: z.object({
     properties: StringListSchema.describe(
       "Optional comma-separated extra HubSpot deal property names to include.",
@@ -344,7 +359,17 @@ export default defineAction({
       .min(1)
       .max(100)
       .default(25)
-      .describe("Maximum records to return when query is provided."),
+      .describe(
+        "Maximum deals to return. Applies to BOTH full-text query results and structured-filter cohorts. The structured-filter path returns at most this many enriched deals (use total for the true matched count and offset to page).",
+      ),
+    offset: z.coerce
+      .number()
+      .int()
+      .min(0)
+      .default(0)
+      .describe(
+        "Number of structured-filter results to skip before returning limit deals. Use for paging through a large cohort; ignored when query is provided.",
+      ),
     after: z
       .string()
       .optional()
@@ -362,6 +387,7 @@ export default defineAction({
     closedDateTo,
     query,
     limit = 25,
+    offset = 0,
     after,
   }) => {
     const trimmedQuery = query?.trim();
@@ -414,7 +440,7 @@ export default defineAction({
       closedDateTo: closedDateTo?.trim(),
     });
     const structuredFilters = hasStructuredFilters(filters);
-    const deals = rawDeals
+    const matchedDeals = rawDeals
       .filter((d) => visibleIds.has(String(d.properties.pipeline)))
       .map((deal) => enrichDeal(deal, lookups, owners))
       .filter((deal) => {
@@ -435,18 +461,52 @@ export default defineAction({
         return matchesDateRange(deal, fromMs, toMs);
       });
 
+    // The full-text query path is already bounded by HubSpot's own `limit`.
+    // EVERY non-query call (with or without structured filters) scans the whole
+    // visible deal set, so bound the returned cohort here. This is deliberately
+    // NOT gated on `structuredFilters`: the unfiltered `hubspot-deals({})` call
+    // is the LARGEST payload of all (every visible deal), so it must be bounded
+    // too — a full enriched cohort can be multiple MB, which overruns the
+    // extension iframe bridge and the agent context. We
+    // keep `total` as the true matched count and signal partial slices via
+    // `truncated` so callers never mistake a page for the full cohort.
+    // `truncated` means "this response is only part of the cohort" (returned <
+    // total) and stays true on the LAST page of a paginated read too; pagination
+    // (is there a next page) is reported separately via `hasMore` / `nextOffset`.
+    const matchedTotal = matchedDeals.length;
+    const deals = trimmedQuery
+      ? matchedDeals
+      : matchedDeals.slice(offset, offset + limit);
+    const truncated = !trimmedQuery && deals.length < matchedTotal;
+    const hasMore = !trimmedQuery && offset + deals.length < matchedTotal;
+
     return {
       deals,
       stageLabels: lookups.stageLabels,
       pipelineLabels: lookups.pipelineLabels,
-      total: deals.length,
+      total: matchedTotal,
       count: deals.length,
       query: trimmedQuery || null,
       filters,
       nextAfter: Array.isArray(dealResult) ? null : dealResult.nextAfter,
+      ...(trimmedQuery
+        ? {}
+        : {
+            limit,
+            offset,
+            truncated,
+            hasMore,
+            nextOffset: hasMore ? offset + deals.length : null,
+          }),
       guidance: buildGuidance({
         query: trimmedQuery,
         structuredFilters,
+        truncated,
+        hasMore,
+        total: matchedTotal,
+        returned: deals.length,
+        offset,
+        limit,
       }),
       ...(Array.isArray(dealResult)
         ? {}

package/corpus/templates/content/.env.local.example

@@ -0,0 +1,6 @@
+# Local database-mode development for Builder/source testing.
+# Copy to .env.local or run `pnpm dev:database` to generate one.
+# These values are local-only. Do not use them for production deploys.
+
+AGENT_NATIVE_MODE=database
+BETTER_AUTH_SECRET=<generated-local-development-secret>

package/corpus/templates/content/AGENTS.md

@@ -113,10 +113,11 @@ cd templates/content && pnpm action <name> [args]
 | `attach-content-database-source`            | `--databaseId <id>` or `--documentId <id> [--sourceType mock\|builder-cms] [--sourceName] [--sourceTable] [--relationshipMode items\|details] [--join <json>]` | Attach a source binding; use `items` to add more rows and `details` to match a source onto existing rows                                |
 | `change-content-database-source-role`       | `--databaseId <id>` or `--documentId <id> --sourceId <id> --relationshipMode items\|details [--join <json>]`                                                   | Change an attached source between adding rows and adding matched detail columns without removing the source                             |
 | `refresh-content-database-source`           | `--databaseId <id>` or `--documentId <id>`                                                                                                                     | Refresh the read-only source status envelope; Builder CMS reads live entries only when configured                                       |
+| `process-builder-body-hydration`            | `--sourceId <id> [--documentId <id>] [--limit <n>]`                                                                                                            | Hydrate queued Builder article bodies into readable Content markdown with preserved source-component markers                            |
 | `set-content-database-source-write-mode`    | `--databaseId <id>` or `--documentId <id> --liveWritesEnabled true\|false [--allowedWriteModes <json>]`                                                        | Enable/disable per-source Builder live writes; enabling is allowed only for `agent-native-blog-article-test` with explicit modes        |
 | `stage-builder-revision`                    | `--databaseId <id>` or `--documentId <id>`                                                                                                                     | Stage pending local Builder CMS changes as a local-only save-revision record; never calls Builder                                       |
 | `review-content-database-source-change-set` | `--databaseId <id>` or `--documentId <id> --changeSetId <id> --decision approve\|reject [--note]`                                                              | Approve or reject a local source change-set review record without provider writes                                                       |
-| `prepare-builder-source-execution`          | `--databaseId <id>` or `--documentId <id> --changeSetId <id> [--pushModeConfirmation autosave\|draft\|publish]`                                                | Prepare a dry-run Builder execution gate with request semantics/idempotency key; never calls Builder                                    |
+| `prepare-builder-source-execution`          | `--databaseId <id>` or `--documentId <id> --changeSetId <id> [--pushModeConfirmation autosave\|draft\|publish]`                                                | Prepare a dry-run Builder execution gate for approved field/body changes with request semantics/idempotency key; never calls Builder    |
 | `validate-builder-source-execution`         | `--databaseId <id>` or `--documentId <id> --changeSetId <id> [--idempotencyKey <key>]`                                                                         | Validate/replay a prepared Builder execution gate locally as a dry run; never calls Builder                                             |
 | `execute-builder-source-execution`          | `--databaseId <id>` or `--documentId <id> --changeSetId <id> [--idempotencyKey <key>] [--pushModeConfirmation autosave\|draft\|publish]`                       | Execute a guarded live Builder write only when approved, validated, enabled, idempotent, and targeting `agent-native-blog-article-test` |
 | `add-database-item`                         | `--databaseId <id> [--title <text>] [--propertyValues <json>]`                                                                                                 | Add a page row to a database, optionally seeding property values                                                                        |
@@ -208,6 +209,14 @@ Content has two file workflows:
   Edit reusable symbol content in that emitted source file; do not retarget
   `entry`, `model`, or `source` in the parent MDX unless a dedicated Builder
   retargeting workflow is added.
+- **Builder source components:** Builder CMS database body hydration renders
+  unsupported provider-native body blocks as `<SourceComponent ... />` markers.
+  Treat these as read-only preservation anchors, not editable local blocks.
+  Agents may edit surrounding prose, but must not delete, duplicate, move, or
+  rewrite `rawRef`, `rawHash`, or marker ids unless a dedicated provider
+  conversion workflow exists. Guarded Builder write-back refuses missing,
+  tampered, or structurally moved markers so source-native components are not
+  lost.
 - **Picked folders and components:** browser-picked folders can be the
   source of truth for `.md`/`.mdx` files, but the browser does not expose an
   absolute path that Vite can compile. Component previews from a picked

package/corpus/templates/content/actions/_builder-cms-read-client.ts

@@ -5,6 +5,11 @@ import type {
   BuilderCmsModelSummary,
   BuilderCmsModelsResponse,
 } from "../shared/api.js";
+import {
+  builderBlocksHash,
+  builderEntryBlocks,
+  type BuilderContentEntry,
+} from "../shared/builder-mdx.js";
 import {
   normalizeBuilderCmsApiEntry,
   type BuilderCmsSourceEntry,
@@ -23,6 +28,7 @@ export interface BuilderCmsEntryLiveState {
   exists: boolean;
   published: "published" | "draft" | string | null;
   lastUpdated: number | string | null;
+  blocksHash: string | null;
   id: string | null;
 }
 
@@ -42,7 +48,7 @@ const BUILDER_CMS_MAX_READ_LIMIT = 1000;
 const BUILDER_CMS_PAGE_SIZE = 100;
 const BUILDER_CMS_READ_RETRIES = 2;
 const BUILDER_CMS_ENTRY_FIELDS =
-  "id,name,published,lastUpdated,createdDate,data.title,data.handle,data.url,data.slug,data.date,data.description,data.status,data.author,data.image";
+  "id,name,published,lastUpdated,createdDate,data.title,data.handle,data.url,data.slug,data.date,data.description,data.status,data.author,data.image,data.blocks,data.blocksString";
 
 function builderContentApiHost() {
   return (
@@ -76,6 +82,7 @@ function liveStateFromBuilderEntry(value: unknown): BuilderCmsEntryLiveState {
           exists: false,
           published: null,
           lastUpdated: null,
+          blocksHash: null,
           id: null,
         };
   }
@@ -84,6 +91,7 @@ function liveStateFromBuilderEntry(value: unknown): BuilderCmsEntryLiveState {
       exists: false,
       published: null,
       lastUpdated: null,
+      blocksHash: null,
       id: null,
     };
   }
@@ -97,6 +105,7 @@ function liveStateFromBuilderEntry(value: unknown): BuilderCmsEntryLiveState {
       exists: false,
       published: null,
       lastUpdated: null,
+      blocksHash: null,
       id: null,
     };
   }
@@ -116,10 +125,12 @@ function liveStateFromBuilderEntry(value: unknown): BuilderCmsEntryLiveState {
       exists: false,
       published: null,
       lastUpdated: null,
+      blocksHash: null,
       id: null,
     };
   }
 
+  const blocks = builderEntryBlocks(record as BuilderContentEntry);
   return {
     exists: true,
     published:
@@ -129,6 +140,7 @@ function liveStateFromBuilderEntry(value: unknown): BuilderCmsEntryLiveState {
       stringOrNumberFromUnknown(record.updatedDate) ??
       stringOrNumberFromUnknown(record.updatedAt) ??
       stringOrNumberFromUnknown(data.updatedAt),
+    blocksHash: blocks.length > 0 ? builderBlocksHash(blocks) : null,
     id,
   };
 }
@@ -618,6 +630,7 @@ export async function readBuilderCmsEntryLiveState(args: {
       exists: false,
       published: null,
       lastUpdated: null,
+      blocksHash: null,
       id: null,
     };
   }

package/corpus/templates/content/actions/_builder-cms-source-adapter.ts

@@ -3,6 +3,21 @@ import type {
   ContentDatabaseSourceFieldMapping,
   DocumentPropertyValue,
 } from "../shared/api.js";
+import {
+  builderBlocksHash,
+  builderEntryBlocks,
+  normalizeRemoteUpdatedAt,
+  type BuilderContentEntry,
+} from "../shared/builder-mdx.js";
+
+export const BUILDER_CMS_BODY_CONTENT_KEY = "__builder.body.content";
+export const BUILDER_CMS_BODY_BLOCKS_HASH_KEY = "__builder.body.blocksHash";
+export const BUILDER_CMS_BODY_SIDECARS_KEY = "__builder.body.sidecarsJson";
+export const BUILDER_CMS_BODY_LOSSLESS_CONTENT_KEY =
+  "__builder.body.losslessContent";
+export const BUILDER_CMS_BODY_READABLE_MAP_KEY =
+  "__builder.body.readableMapJson";
+export const BUILDER_CMS_BODY_BLOCK_COUNT_KEY = "__builder.body.blockCount";
 
 export interface BuilderCmsSourceEntry {
   id: string;
@@ -11,6 +26,7 @@ export interface BuilderCmsSourceEntry {
   urlPath: string;
   updatedAt: string;
   sourceValues: Record<string, DocumentPropertyValue>;
+  rawEntry?: BuilderContentEntry;
 }
 
 export interface ExistingBuilderSourceRowIdentity {
@@ -291,6 +307,7 @@ function builderSourceValuesFromRecord(args: {
   title: string;
   urlPath: string;
   updatedAt: string;
+  rawEntry: BuilderContentEntry;
 }) {
   const values: Record<string, DocumentPropertyValue> = {
     "data.title": args.title,
@@ -298,6 +315,7 @@ function builderSourceValuesFromRecord(args: {
     lastUpdated: args.updatedAt,
   };
   for (const [key, value] of Object.entries(args.data)) {
+    if (key === "blocks" || key === "blocksString") continue;
     values[`data.${key}`] = sourceValueFromUnknown(value);
   }
   for (const key of ["published", "createdDate", "updatedDate", "updatedAt"]) {
@@ -305,6 +323,11 @@ function builderSourceValuesFromRecord(args: {
       values[key] = sourceValueFromUnknown(args.record[key]);
     }
   }
+  const blocks = builderEntryBlocks(args.rawEntry);
+  if (blocks.length > 0) {
+    values[BUILDER_CMS_BODY_BLOCKS_HASH_KEY] = builderBlocksHash(blocks);
+    values[BUILDER_CMS_BODY_BLOCK_COUNT_KEY] = blocks.length;
+  }
   return values;
 }
 
@@ -342,6 +365,24 @@ export function normalizeBuilderCmsApiEntry(
     ]) ??
     timestampStringFromRecord(data, ["updatedAt"]) ??
     new Date().toISOString();
+  const rawEntry: BuilderContentEntry = {
+    ...record,
+    id,
+    model,
+    name:
+      typeof record.name === "string" && record.name.trim()
+        ? record.name.trim()
+        : title,
+    published:
+      typeof record.published === "string" ? record.published : undefined,
+    lastUpdated: normalizeRemoteUpdatedAt({
+      ...record,
+      id,
+      model,
+      data,
+    } as BuilderContentEntry),
+    data,
+  };
 
   return {
     id,
@@ -355,6 +396,8 @@ export function normalizeBuilderCmsApiEntry(
       title,
       urlPath,
       updatedAt,
+      rawEntry,
     }),
+    rawEntry,
   };
 }

package/corpus/templates/content/actions/_builder-cms-write-adapter.ts

@@ -194,6 +194,70 @@ function nestedBuilderPatch(
   return body;
 }
 
+function mergeBuilderPatch(
+  base: Record<string, unknown>,
+  patch: Record<string, unknown>,
+) {
+  const merged = { ...base };
+  for (const [key, value] of Object.entries(patch)) {
+    if (
+      key === "data" &&
+      value &&
+      typeof value === "object" &&
+      !Array.isArray(value)
+    ) {
+      merged.data = {
+        ...((merged.data && typeof merged.data === "object"
+          ? merged.data
+          : {}) as Record<string, unknown>),
+        ...(value as Record<string, unknown>),
+      };
+      continue;
+    }
+    merged[key] = value;
+  }
+  return merged;
+}
+
+function builderBodyPatch(changeSet: ContentDatabaseSourceChangeSet) {
+  const bodyChange = changeSet.bodyChange;
+  const checks: string[] = [];
+  const blockers: string[] = [];
+  if (!bodyChange) {
+    return { patch: {}, checks, blockers, hasBodyOperation: false };
+  }
+  if (!bodyChange.proposedBlocksJson) {
+    blockers.push(
+      "Builder body diff could not be converted to Builder blocks.",
+    );
+    return { patch: {}, checks, blockers, hasBodyOperation: false };
+  }
+  try {
+    const blocks = JSON.parse(bodyChange.proposedBlocksJson) as unknown;
+    if (!Array.isArray(blocks)) {
+      blockers.push("Builder body diff did not produce a blocks array.");
+      return { patch: {}, checks, blockers, hasBodyOperation: false };
+    }
+    checks.push("Includes converted Builder body blocks.");
+    for (const warning of bodyChange.warnings ?? []) {
+      checks.push(`Body conversion warning: ${warning}`);
+    }
+    return {
+      patch: {
+        data: {
+          blocks,
+        },
+      },
+      checks,
+      blockers,
+      hasBodyOperation: true,
+    };
+  } catch {
+    blockers.push("Builder body diff contains invalid converted blocks JSON.");
+    return { patch: {}, checks, blockers, hasBodyOperation: false };
+  }
+}
+
 function builderRequestForEffect(args: {
   effect: BuilderCmsWriteEffect;
   model: string;
@@ -272,18 +336,19 @@ function builderSafetyChecks(args: {
   entryId: string | null;
   syntheticFixtureTarget: boolean;
   operations: BuilderCmsExecutionOperation[];
+  hasBodyOperation: boolean;
+  bodyChecks: string[];
+  bodyBlockers: string[];
 }) {
   const checks = [
     "Requires explicit approval before execution.",
     "Uses the stored execution idempotency key.",
+    ...args.bodyChecks,
   ];
-  const blockers: string[] = [];
+  const blockers: string[] = [...args.bodyBlockers];
 
-  if (args.operations.length === 0) {
-    blockers.push("No field operations are available for this Builder change.");
-  }
-  if (args.changeSet.bodyChange) {
-    blockers.push("Builder body diffs are not executable in this slice.");
+  if (args.operations.length === 0 && !args.hasBodyOperation) {
+    blockers.push("No Builder operations are available for this change.");
   }
   if (args.effect === "autosave" || args.effect === "update_in_place") {
     const label = args.effect === "autosave" ? "Autosave" : "Update in place";
@@ -418,7 +483,11 @@ export function buildBuilderCmsExecutionPlan(args: {
     localFieldKey: field.localFieldKey,
     value: field.proposedValue,
   }));
-  const bodyPatch = nestedBuilderPatch(operations);
+  const bodyDiffPatch = builderBodyPatch(args.changeSet);
+  const bodyPatch = mergeBuilderPatch(
+    nestedBuilderPatch(operations),
+    bodyDiffPatch.patch,
+  );
   // State-preserving effects must not include `published` in the body. Builder
   // PATCH preserves omitted publication state, so only transition/create effects
   // are allowed to set it.
@@ -441,6 +510,9 @@ export function buildBuilderCmsExecutionPlan(args: {
       args.source.sourceTable === SAFE_WRITE_MODEL &&
       target?.isSyntheticFixture === true,
     operations,
+    hasBodyOperation: bodyDiffPatch.hasBodyOperation,
+    bodyChecks: bodyDiffPatch.checks,
+    bodyBlockers: bodyDiffPatch.blockers,
   });
   const state: ContentDatabaseSourceExecutionState =
     safety.blockers.length > 0