@agent-native/core 0.82.0 → 0.84.0

package/corpus/templates/analytics/app/pages/adhoc/_shared/KpiChart.tsx

@@ -24,6 +24,13 @@ import {
   TooltipContent,
   TooltipTrigger,
 } from "@/components/ui/tooltip";
+import {
+  chartAxisStroke,
+  chartGridStroke,
+  chartTooltipContentStyle,
+  chartTooltipCursorFill,
+  chartTooltipCursorStroke,
+} from "@/lib/chart-theme";
 
 import { formatDate } from "./format";
 
@@ -122,31 +129,28 @@ export function KpiChart({
                 <BarChart data={data}>
                   <CartesianGrid
                     strokeDasharray="3 3"
-                    stroke="#27272a"
+                    stroke={chartGridStroke}
                     vertical={false}
                   />
                   <XAxis
                     dataKey="period"
-                    stroke="#52525b"
+                    stroke={chartAxisStroke}
                     fontSize={11}
                     tickLine={false}
                     axisLine={false}
                     tickFormatter={formatDate}
                   />
                   <YAxis
-                    stroke="#52525b"
+                    stroke={chartAxisStroke}
                     fontSize={11}
                     tickLine={false}
                     axisLine={false}
                     tickFormatter={formatY}
                   />
                   <Tooltip
-                    cursor={{ fill: "rgba(255,255,255,0.06)" }}
+                    cursor={{ fill: chartTooltipCursorFill }}
                     contentStyle={{
-                      backgroundColor: "#09090b",
-                      border: "1px solid #27272a",
-                      borderRadius: "8px",
-                      color: "#fafafa",
+                      ...chartTooltipContentStyle,
                       fontSize: "12px",
                     }}
                     labelFormatter={formatDate}
@@ -172,31 +176,28 @@ export function KpiChart({
                 <LineChart data={data}>
                   <CartesianGrid
                     strokeDasharray="3 3"
-                    stroke="#27272a"
+                    stroke={chartGridStroke}
                     vertical={false}
                   />
                   <XAxis
                     dataKey="period"
-                    stroke="#52525b"
+                    stroke={chartAxisStroke}
                     fontSize={11}
                     tickLine={false}
                     axisLine={false}
                     tickFormatter={formatDate}
                   />
                   <YAxis
-                    stroke="#52525b"
+                    stroke={chartAxisStroke}
                     fontSize={11}
                     tickLine={false}
                     axisLine={false}
                     tickFormatter={formatY}
                   />
                   <Tooltip
-                    cursor={{ stroke: "rgba(255,255,255,0.15)" }}
+                    cursor={{ stroke: chartTooltipCursorStroke }}
                     contentStyle={{
-                      backgroundColor: "#09090b",
-                      border: "1px solid #27272a",
-                      borderRadius: "8px",
-                      color: "#fafafa",
+                      ...chartTooltipContentStyle,
                       fontSize: "12px",
                     }}
                     labelFormatter={formatDate}
@@ -240,31 +241,28 @@ export function KpiChart({
                   </defs>
                   <CartesianGrid
                     strokeDasharray="3 3"
-                    stroke="#27272a"
+                    stroke={chartGridStroke}
                     vertical={false}
                   />
                   <XAxis
                     dataKey="period"
-                    stroke="#52525b"
+                    stroke={chartAxisStroke}
                     fontSize={11}
                     tickLine={false}
                     axisLine={false}
                     tickFormatter={formatDate}
                   />
                   <YAxis
-                    stroke="#52525b"
+                    stroke={chartAxisStroke}
                     fontSize={11}
                     tickLine={false}
                     axisLine={false}
                     tickFormatter={formatY}
                   />
                   <Tooltip
-                    cursor={{ stroke: "rgba(255,255,255,0.15)" }}
+                    cursor={{ stroke: chartTooltipCursorStroke }}
                     contentStyle={{
-                      backgroundColor: "#09090b",
-                      border: "1px solid #27272a",
-                      borderRadius: "8px",
-                      color: "#fafafa",
+                      ...chartTooltipContentStyle,
                       fontSize: "12px",
                     }}
                     labelFormatter={formatDate}

package/corpus/templates/analytics/changelog/2026-06-30-dashboard-charts-now-use-theme-aware-tooltip-and-grid-colors.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-06-30
+---
+
+Dashboard charts now use theme-aware tooltip and grid colors in light and dark mode.

package/corpus/templates/analytics/changelog/2026-06-30-fixed-ask-composer-spacing-so-the-chat-field-has-a-comfortab.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-06-30
+---
+
+Fixed Ask composer spacing so the chat field has a comfortable side inset.

package/corpus/templates/calendar/AGENTS.md

@@ -12,6 +12,10 @@ Detailed event, availability, booking, storage, and UI rules live in
 - Never hardcode API keys, tokens, webhook URLs, signing secrets, private Builder/internal data, customer data, or credential-looking literals. Use secrets/OAuth/runtime configuration and obvious placeholders in examples.
 - Use actions for events, availability, booking links, settings, navigation,
   Google Calendar connection, and sharing. Do not bypass app access checks.
+- Use `connect-google-calendar` when the user asks to connect or reconnect
+  Google Calendar. Return its link to the user; do not `fetch`
+  `/_agent-native/google/auth-url` from the agent backend because that route
+  requires the signed-in browser session.
 - In dev, call actions with `pnpm action <name>`; in production, use native
   tools. The action schema is authoritative.
 - Use the current date from runtime context, not a visible calendar date, when

package/corpus/templates/calendar/actions/connect-google-calendar.ts

@@ -0,0 +1,80 @@
+import { defineAction } from "@agent-native/core";
+import { getRequestUserEmail } from "@agent-native/core/server";
+import { z } from "zod";
+
+const CONNECT_PATH = "/_agent-native/google/auth-url";
+const ADD_ACCOUNT_PATH = "/_agent-native/google/add-account/auth-url";
+
+function normalizeReturnPath(value: string | undefined): string | undefined {
+  if (!value) return undefined;
+  try {
+    const url = new URL(value, "https://calendar.agent-native.local");
+    if (url.origin !== "https://calendar.agent-native.local") {
+      return undefined;
+    }
+    return `${url.pathname}${url.search}${url.hash}`;
+  } catch {
+    return undefined;
+  }
+}
+
+export default defineAction({
+  description:
+    "Create a user-clickable Google Calendar OAuth link. Use this when the user asks to connect or reconnect Google Calendar. Do not fetch the returned URL as an API; the signed-in user must open it in their browser.",
+  schema: z.object({
+    addAccount: z
+      .boolean()
+      .optional()
+      .describe(
+        "Use true only when adding another Google Calendar account to an already connected Calendar workspace.",
+      ),
+    returnPath: z
+      .string()
+      .optional()
+      .describe(
+        "Optional same-origin Calendar path to return to after the Google OAuth flow.",
+      ),
+  }),
+  http: { method: "GET" },
+  readOnly: true,
+  parallelSafe: true,
+  run: async (args) => {
+    const owner = getRequestUserEmail();
+    if (!owner) {
+      throw new Error("Sign in to Calendar before connecting Google Calendar.");
+    }
+
+    const path = args.addAccount ? ADD_ACCOUNT_PATH : CONNECT_PATH;
+    const params = new URLSearchParams({ redirect: "1" });
+    if (!args.addAccount) params.set("calendar", "1");
+
+    const returnPath = normalizeReturnPath(args.returnPath);
+    if (returnPath) params.set("return", returnPath);
+
+    const url = `${path}?${params.toString()}`;
+    const label = args.addAccount
+      ? "Add Google Calendar account"
+      : "Connect Google Calendar";
+    return {
+      provider: "google_calendar",
+      url,
+      label,
+      markdown: `[${label}](${url})`,
+      message:
+        "Open this link in the signed-in Calendar browser session to connect Google Calendar. Do not fetch it from the agent backend.",
+      requiresUserGesture: true,
+    };
+  },
+  link: ({ result }) => {
+    const url =
+      result && typeof result === "object"
+        ? (result as { url?: unknown }).url
+        : null;
+    if (typeof url !== "string" || !url) return null;
+    return {
+      url,
+      label: "Connect Google Calendar",
+      view: "settings",
+    };
+  },
+});

package/corpus/templates/calendar/changelog/2026-06-30-calendar-now-gives-the-agent-a-safe-google-connection-link-i.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-06-30
+---
+
+Calendar now gives the agent a safe Google connection link instead of surfacing a raw auth error.

package/corpus/templates/calendar/server/plugins/agent-chat.ts

@@ -70,6 +70,7 @@ const INITIAL_TOOL_NAMES = [
   "find-a-time",
   "search-people",
   "navigate",
+  "connect-google-calendar",
   "list-booking-links",
   "create-booking-link",
   "update-booking-link",
@@ -111,6 +112,7 @@ Provider-specific Calendar actions are shortcuts, not limits. If a first-class a
 - \`pnpm action navigate --view=calendar --date=YYYY-MM-DD\` — Navigate to a specific date
 - \`pnpm action navigate --view=availability\` — Show availability settings
 - \`pnpm action navigate --view=booking-links\` — Show booking links
+- \`pnpm action connect-google-calendar\` — Create a user-clickable Google Calendar OAuth link. Use this when the user asks to connect or reconnect Google Calendar. Do not fetch \`/_agent-native/google/auth-url\` yourself; OAuth must be opened by the signed-in user in their browser.
 - \`pnpm action update-calendar-visual-preferences --colorMode multi\` — Color the local app UI by meeting type without modifying Google Calendar events
 - \`pnpm action update-calendar-visual-preferences --colorMode single --singleColor '#5B9BD5'\` — Use one local display color for the user's Google events
 - \`pnpm action check-availability --date YYYY-MM-DD --duration 60\` — Check free slots
@@ -125,6 +127,8 @@ Use \`create-event\` or \`update-event --colorId 1..11\` when the user wants one
 ## Google Connection Check
 Before answering schedule questions, run view-screen first for context, then use list-events for the requested date range even if the user is currently on Settings, Booking Links, or another non-calendar page. Do not infer a Google Calendar connection problem just because the current page is Settings. Only ask the user to reconnect Google if list-events or the explicit Google status reports an auth/connection error.
 
+When the user explicitly asks you to connect or reconnect Google Calendar, call \`connect-google-calendar\` and give them the returned link. Do not call raw HTTP/fetch/web-request against \`/_agent-native/google/auth-url\`; that route depends on the user's browser session and will return 401 from the agent backend.
+
 For relationship-history or frequency questions such as "who have I met at Adobe?" or "how often do I meet with Mattel?", prefer the raw Google Calendar API through provider-api-request so you can choose the exact timeMin/timeMax, q, calendarId, maxResults, and pageToken behavior. Stage large paginated results before analysis. Do not conclude there are no recurring meetings from the visible range or from a convenience action alone.
 
 ## Context Awareness

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