@agent-native/core-corpus 0.221.0-nightly-20261027212258 → 0.221.0

package/corpus/README.md

@@ -32,4 +32,4 @@ rg -n "defineAction|useActionQuery" node_modules/@agent-native/core-corpus/corpu
 
 ## Generated Counts
 
-- template files: 15010
+- template files: 14961

package/corpus/templates/analytics/CHANGELOG.md

@@ -5,12 +5,23 @@ time from the command menu (Cmd+K → "What's new") or from Settings.
 
 ## 2026-10-24
 
+### Added
+
+- Pick dashboard panels for the agent with the Select button in the chat composer.
+
 ### Improved
 
+- An empty Ask page shows the large composer, and the agent panel opens on the app's default model
+- The Content dashboard ranks articles by signups, adds Authors, New and rising, and Sources tabs, and names missing data sources in one notice.
 - Organization roster searches now find row-level dbt membership data more reliably.
 
 ### Fixed
 
+- Analytics now clearly indicates incomplete Gong user lists and HubSpot deal pages.
+- Date columns in dashboard tables no longer show the previous day in time zones west of UTC.
+- Gong transcript reads preserve the transcript alias for existing callers.
+- Phones can open the agent from the top bar on every page outside Ask
+- HubSpot and Gong searches keep their filters and page totals visible.
 - Analytics avoids showing partial warehouse results when a metric or plan request is ambiguous.
 - Analytics preserves verified results from successful time ranges when another requested range is unavailable.
 - Analytics uses a warehouse fallback for a failed metric only when requested and supported by a complete metric definition and result.
@@ -18,8 +29,16 @@ time from the command menu (Cmd+K → "What's new") or from Settings.
 
 ## 2026-10-23
 
+### Improved
+
+- Metric tiles can show their change from the period before, tables give the spare width to their first text column and right-align numbers, and callouts read as a list with a severity icon per row, in dashboards and emailed reports.
+
 ### Fixed
 
+- Content pageviews use their own GA4 property without changing other dashboards.
+- Content signup collection keeps actual query usage and the configured cap, including when collection fails
+- External agents need approval before changing recurring index builds.
+- Query cost tracking distinguishes unknown BigQuery usage from zero-byte results.
 - Analytics figures require complete, scope-matched warehouse evidence
 - Analytics keeps malformed metric values out of verified summaries
 - Analytics keeps verified metrics available when another requested dbt metric is unavailable
@@ -29,8 +48,23 @@ time from the command menu (Cmd+K → "What's new") or from Settings.
 - Analytics withholds warehouse figures when an owner-defined dbt metric query fails.
 - Warehouse figures stay hidden when a failed dbt query cannot verify the calculation.
 
+## 2026-10-22
+
+### Added
+
+- Tables, metric tiles and charts can show a number of seconds as a duration such as 16 min or 7.4 hours, and duration columns sort by time.
+
+### Improved
+
+- Approval links from a connected agent, such as Claude Code, now open the review inside the app, in its own theme.
+- Extension panels on dashboards are as tall as their content, so a one-line extension no longer leaves an empty band below it
+
 ## 2026-10-21
 
+### Added
+
+- You can pin a shared chat just for yourself, or hide it from your list and undo that from the toast.
+
 ### Improved
 
 - Analytics recognizes questions about connected data, product analytics, sessions, dashboards, and charts.
@@ -43,6 +77,10 @@ time from the command menu (Cmd+K → "What's new") or from Settings.
 
 ## 2026-10-20
 
+### Added
+
+- Custom SQL charts can open configured record details on click
+
 ### Fixed
 
 - Blog signup attribution excludes signups before the first visit and URLs on unrelated hosts

package/corpus/templates/assets/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable user-facing changes to Assets are documented here. Open it any
 time from the command menu (Cmd+K → "What's new") or from Settings.
 
+## 2026-10-22
+
+### Improved
+
+- Approval links from a connected agent, such as Claude Code, now open the review inside the app, in its own theme.
+
+## 2026-10-21
+
+### Added
+
+- You can pin a shared chat just for yourself, or hide it from your list and undo that from the toast.
+
 ## 2026-10-19
 
 ### Changed

package/corpus/templates/calendar/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable user-facing changes to Agent-Native Calendar are documented here. Open it any
 time from the command menu (Cmd+K → "What's new") or from Settings.
 
+## 2026-10-27
+
+### Fixed
+
+- Calendar keeps successful invitation rules applied while another rule is retried.
+
+## 2026-10-26
+
+### Improved
+
+- Calendar event rules can use OpenAI when Jev is unavailable.
+
+## 2026-10-25
+
+### Fixed
+
+- Moving one event in a recurring series keeps the series on the right weekday after a time-zone change and at the right local time across daylight-saving changes
+
+## 2026-10-22
+
+### Improved
+
+- Approval links from a connected agent, such as Claude Code, now open the review inside the app, in its own theme.
+
 ## 2026-10-21
 
 ### Fixed

package/corpus/templates/clips/CHANGELOG.md

@@ -3,16 +3,74 @@
 All notable user-facing changes to Clips are documented here. Open it any time
 from the command menu (Cmd+K → "What's new") or from Settings.
 
+## 2026-10-27
+
+### Improved
+
+- First-run setup makes free credits the primary path while keeping personal API keys one click away
+
+### Fixed
+
+- Meeting transcripts follow their sharing settings and the linked Clip's access protections.
+- The Rewind consent dialog stays visible on shorter screens.
+- Thumbnails respect attached footage availability.
+- Workflow generation now shows updates while it runs, offers cancellation, and settles cleanly when an agent run ends.
+- Workflow generation avoids duplicate runs when its state is incomplete and reports rejected starts or ended runs clearly.
+- Workflow generation progress and cancellation stay tied to the viewer who started them
+
+## 2026-10-26
+
+### Improved
+
+- Agents reading a clip now get its recommended frames from storage instead of re-downloading the video on every request.
+- Clip cleanup waits for active transcripts and offers recovery when a transcript has failed.
+
+### Fixed
+
+- Opening a private clip while signed out goes straight to the Private clip screen, without a brief error first
+- Recording activity notifications follow Trash visibility.
+- Recording search and shared access respect expiry, and owners can delete their own saved comments while discussion is disabled.
+- Silence and filler-word cleanup wait until a transcript is ready
+- Silence cleanup waits for an in-progress transcript before offering regeneration
+- Agents now get frames spread across the whole clip, and the opening frame skips the black first moment.
+
+## 2026-10-25
+
+### Fixed
+
+- Long recordings remain scrollable in short desktop windows
+
+## 2026-10-23
+
+### Fixed
+
+- Video playback respects Clip availability.
+
+## 2026-10-22
+
+### Improved
+
+- Approval links from a connected agent, such as Claude Code, now open the review inside the app, in its own theme.
+
+### Fixed
+
+- Recording sharing and discussion settings apply consistently.
+- Turning comments off hides saved comments from viewers while keeping them available to the owner
+
 ## 2026-10-21
 
 ### Improved
 
+- Meeting notes check sooner when a meeting ends on the web and retry failed end checks
+- New meetings show their transcript on the share link by default; meetings you already have keep their setting.
+- The clip Share panel has People, Agents, Embed and Social tabs, and password, expiry and the meeting transcript setting now live under Advanced.
 - Share panels describe general access in a sentence and no longer open an empty people list when you click into them.
 
 ## 2026-10-20
 
 ### Fixed
 
+- Expired Clips hide comments from viewers while owners retain access
 - Locally saved desktop recordings now appear in the recovery list with upload and storage setup actions.
 
 ### Changed
@@ -21,6 +79,10 @@ from the command menu (Cmd+K → "What's new") or from Settings.
 
 ## 2026-10-19
 
+### Added
+
+- Agents connected over MCP can import video links, update Clip chapters, read comments and reply in threads
+
 ### Fixed
 
 - Agents see a clip's frames as soon as it finishes processing instead of a cached "still processing" answer.
@@ -1554,74 +1616,4 @@ from the command menu (Cmd+K → "What's new") or from Settings.
 - Shared clips now start playing and scrub instantly instead of buffering — recordings are made seekable on upload, and you can repair older clips
 - Stalled clip uploads now update in the library and surface as failed instead of staying stuck as uploading.
 
-## 2026-06-30
-
-### Fixed
-
-- Chrome extension recordings no longer show an upload failure when the clip finished saving successfully.
-- Longer Chrome extension recordings now keep saving reliably instead of getting stuck or showing a second countdown.
-
-## 2026-06-29
-
-### Added
-
-- Screen Memory keeps a local rolling screen buffer and recent app/window context for local agent context.
-
-### Fixed
-
-- Meeting detail layouts now adapt cleanly when the agent sidebar narrows the app.
-- Video chat is easier to find on recording pages and S3 setup saves from onboarding.
-
-## 2026-06-28
-
-### Improved
-
-- Builder.io credit pauses now show friendly upgrade guidance for backup transcription, transcript cleanup, summaries, and AI titles.
-- Left sidebar footer controls now use less divider chrome.
-
-### Fixed
-
-- Transcription now auto-detects spoken language instead of following the app or system locale.
-- Video uploads now finish even when the browser cannot read exact duration metadata.
-
-## 2026-06-27
-
-### Improved
-
-- Desktop recording now guides you to connect storage with a friendly setup flow instead of a red error.
-- Recorder download options now show the Chrome extension and desktop app choices without extra setup copy.
-- Recorder setup keeps screen-capture choices desktop-only on mobile and tones down the selected mode highlight.
-
-### Fixed
-
-- Clips no longer shows desktop app prompts on mobile screens.
-- Traditional Chinese copy now uses Taiwan terminology and clearer technical wording.
-
-## 2026-06-26
-
-### Added
-
-- Bug-report recordings can keep redacted host-app context with the clip.
-- Bug report widgets can launch Clips recordings from embedded product surfaces.
-
-### Improved
-
-- Shared clip links now guide agents through processing transcripts and exhausted transcription credits.
-- Storage setup now explains why Clips needs connected storage and guides saved desktop or Chrome uploads back to Builder.io.
-- The Clips library now matches the shared recessed shell styling.
-
-### Fixed
-
-- Brief network blips no longer block recording or wrongly prompt you to reconnect storage in the desktop app.
-- Desktop recording keeps connected users out of the storage setup flow when a status check is indeterminate.
-- Desktop recordings recover more reliably when macOS reports a finalization error.
-- If a recording can't be uploaded, the Chrome extension now saves it to your downloads so it's never lost.
-- Long desktop recordings are checkpointed so macOS finalization failures can recover the saved portions.
-- Non-Mac desktop recordings now try Web Speech transcripts before falling back to upload transcription.
-- The recording details button stays at the far right on small screens.
-- S3-compatible storage keys now save securely from Clips Settings without requiring deployment env vars.
-- Slack unfurls now recognize recording dashboard links pasted from Clips.
-- The agent sidebar now slides in smoothly without duplicate edge borders.
-- The clip details sidebar now collapses into a slide-out panel on smaller screens.
-
 For the full list of updates, see the [changelog folder](./changelog/).

package/corpus/templates/clips/app/routes/_app.r.$recordingId.tsx

@@ -505,6 +505,28 @@ export function buildRecordingBreadcrumbItems({
   ];
 }
 
+/**
+ * What the page shows for its player-data read. "share" hands the visitor to
+ * RecordingShareRedirect, which paints only the skeleton until the share page
+ * lands.
+ */
+export function recordingAccessView({
+  isPending,
+  accessStatus,
+  signedIn,
+}: {
+  isPending: boolean;
+  accessStatus: number | undefined;
+  signedIn: boolean;
+}): "pending" | "share" | "retry" | "page" {
+  if (isPending) return "pending";
+  if (accessStatus === 403 || (accessStatus === 401 && !signedIn)) {
+    return "share";
+  }
+  if (accessStatus === 401) return "retry";
+  return "page";
+}
+
 export function meta() {
   return [{ title: enMessages.recordingRoute.pageTitle }];
 }
@@ -918,20 +940,11 @@ export default function RecordingPage() {
   const playerDataAccessStatus = playerDataQ.isError
     ? (playerDataQ.error as { status?: number } | undefined)?.status
     : undefined;
-  const playerDataUnauthorized = playerDataAccessStatus === 401;
-  const playerDataForbidden = playerDataAccessStatus === 403;
-
-  const shouldFallbackToShare =
-    playerDataForbidden || (playerDataUnauthorized && !session);
-  useEffect(() => {
-    if (!recordingId || !shouldFallbackToShare) return;
-    void navigate(
-      `/share/${encodeURIComponent(recordingId)}?${legacyShareQuery}`,
-      {
-        replace: true,
-      },
-    );
-  }, [legacyShareQuery, recordingId, shouldFallbackToShare, navigate]);
+  const accessView = recordingAccessView({
+    isPending: playerDataQ.isPending,
+    accessStatus: playerDataAccessStatus,
+    signedIn: Boolean(session),
+  });
 
   const recording = playerDataQ.data?.recording;
   const hostedFailureCode = (recording as any)?.failureCode;
@@ -2637,11 +2650,17 @@ export default function RecordingPage() {
 
   if (!recordingId) return null;
 
-  if (playerDataQ.isPending || playerDataForbidden) {
-    return <RecordingWorkspaceSkeleton />;
+  if (accessView === "pending") return <RecordingWorkspaceSkeleton />;
+
+  if (accessView === "share") {
+    return (
+      <RecordingShareRedirect
+        to={`/share/${encodeURIComponent(recordingId)}?${legacyShareQuery}`}
+      />
+    );
   }
 
-  if (playerDataUnauthorized) {
+  if (accessView === "retry") {
     return (
       <Empty className="min-h-[calc(100dvh-3.5rem)] rounded-none border-0">
         <EmptyHeader>
@@ -3828,6 +3847,18 @@ export default function RecordingPage() {
   return viewer;
 }
 
+// The redirect runs only from here so the page can't send the visitor to the
+// share page while painting anything but the skeleton; a redirect and a
+// skeleton read from different checks is how a signed-out private Clip
+// flashed "Something went wrong".
+export function RecordingShareRedirect({ to }: { to: string }) {
+  const navigate = useNavigate();
+  useEffect(() => {
+    void navigate(to, { replace: true });
+  }, [navigate, to]);
+  return <RecordingWorkspaceSkeleton />;
+}
+
 function RecordingWorkspaceSkeleton() {
   return (
     <div className="flex h-full min-h-0 flex-col">

package/corpus/templates/clips/changelog/2026-10-23-video-playback-respects-clip-availability.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-10-23
+---
+
+Video playback respects Clip availability.

package/corpus/templates/clips/changelog/2026-10-26-opening-a-private-clip-while-signed-out-goes-straight-to-the.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-10-26
+---
+
+Opening a private clip while signed out goes straight to the Private clip screen, without a brief error first

package/corpus/templates/clips/server/routes/api/video/[recordingId].get.ts

@@ -441,7 +441,10 @@ export default defineEventHandler(async (event: H3Event) => {
         rec = footage as RecordingRow;
       }
 
-      if (rec.failureCode === "taken_down") {
+      if (
+        gate.failureCode === "taken_down" ||
+        rec.failureCode === "taken_down"
+      ) {
         setResponseStatus(event, 404);
         return { error: "Not found" };
       }

package/corpus/templates/content/CHANGELOG.md

@@ -3,14 +3,80 @@
 All notable user-facing changes to Agent-Native Content are documented here. Open it any
 time from the command menu (Cmd+K → "What's new").
 
+## 2026-10-27
+
+### Fixed
+
+- An agent's Accept on words someone is still typing in returns the suggestion to pending instead of failing with a server error
+- Opening a page you can't access goes straight to the no-access screen without a brief error first, including when you come back to it
+
+## 2026-10-26
+
+### Fixed
+
+- Document reads preserve bodies containing ordinary prose about starting an embed.
+
+## 2026-10-25
+
+### Fixed
+
+- A GitHub folder linked into a Personal space now fills its collection, instead of saying GitHub isn't connected for the person who linked it
+- Changes an agent makes at the end of a page, such as adding an item to a closing list, now stay when you have the page open instead of being saved over. So does a block an agent adds right before or after one you're editing.
+- In Suggesting mode, Accept and Reject show at once on a suggestion you just typed or added to, and the session's other suggestions stay on screen
+- Web addresses in collections and page properties open in a new tab when you click the link, and clicking the rest of the cell still edits them.
+- While suggesting, the struck-out word no longer blinks off with each keystroke
+
+## 2026-10-24
+
+### Added
+
+- Agents can register webhooks that send a signed event when a property changes on a collection row or page, or when a comment is created or resolved.
+- Agents can write a property only while it still holds the value they read, even when someone changed it and changed it back in between. Each value also carries a change ID, so an agent can act once per change.
+- Pick Published or Draft in a Builder entry's status to stage a publish or unpublish; the source review sends it.
+
+### Improved
+
+- Content responds sooner after a quiet spell, because a newly started server loads and prepares less code before its first response
+
+### Fixed
+
+- A copied block that holds data, such as an inline database, keeps its data when pasted instead of disappearing on save.
+- Cmd+Z and Cmd+Shift+Z undo and redo a change to a toggle's title while you're typing in it.
+- Deleting a property no longer leaves filters or sorts on it in shared views or your personal views, so a filter on a deleted property no longer hides every page.
+- Document saves no longer mistake closed editor sessions for active editors
+- Refreshing a Builder collection keeps edits Content has not pushed yet, and the review flags the ones Builder changed too.
+- Resolving a comment from its card in the margin closes the card. In a stack of comments, the next one opens in its place.
+
+## 2026-10-23
+
+### Added
+
+- Builder collections show each entry's Builder status (Published, Draft, or Unpublished changes) in the table, board, and page info.
+
+### Improved
+
+- A folded comment stack's new front card now comes up over the old one, and an opened stack's clicked comment sits level with its text
+
+### Fixed
+
+- A comment on a video now stays attached to that video, sits beside it in the margin, and opens it when clicked, instead of showing Highlight unavailable.
+- A local-folder sync no longer overwrites an edit saved while it runs or leaves that edit out of a conflict it reports, and a file that comes back to the folder no longer offers to unlink its page.
+- Public pages show each block's name while the page is still loading, instead of the block's source.
+- Pushing a Builder update from a large collection now ends on Pushed instead of Checked and Ready to send to Builder.
+- You can comment on text selected across paragraphs and other blocks, and its quote reads with a space where the blocks meet.
+
 ## 2026-10-22
 
 ### Added
 
+- Collection filters add does not contain, starts with, ends with, on or before, and on or after. Date filters can use relative days like today, and is within picks a range the way Notion does, such as the past 2 weeks or this month. A date without a time now counts as the whole day, so "on or before today" keeps rows from later today.
 - Blocks with several comment threads fold into one stack in the margin, which opens in place when you click it or a highlight
 
 ### Improved
 
+- Approval links from a connected agent, such as Claude Code, now open the review inside the app, in its own theme.
+- Tables get Header row, Header column and Fit to width in their block menu, colours for rows and columns, and menus that close the moment you press Escape.
+- The block menu turns a block into another kind, colours it and comments on it, filters as you type, and shows each action’s shortcut. It says why a locked block can’t be duplicated or deleted, and a click beside the page lets go of a selected block.
 - A big GitHub folder fills its collection much faster, and keeps filling while the collection is open rather than waiting for the next background sync
 - Collections with large select or multi-select properties open faster and use less memory, because each property definition is sent once instead of with every row
 - Pressing Escape while writing a comment, reply or edit cancels it, and asks first if you've written something.
@@ -20,6 +86,9 @@ time from the command menu (Cmd+K → "What's new").
 
 ### Fixed
 
+- A comment on the start of a block no longer highlights blocks added just above it.
+- Saving a Builder entry from Content no longer snaps back on the next refresh, and draft entries get a plain save that Builder shows right away.
+- The Page stays editable while Accept, Reject, Accept remaining, and Reject remaining save, and a failed save returns only that decision to pending
 - A GitHub folder sync keeps going when file storage fails, filling pages without their images and adding them on a later sync
 - Opening a page no longer saves an edit again after another open tab's save already stored it.
 - Changes made from a menu or popover, such as an image's alt text, are always saved.
@@ -40,6 +109,7 @@ time from the command menu (Cmd+K → "What's new").
 
 ### Fixed
 
+- Undoing a slash command now turns the block back in one step, keeps its text, and leaves the caret where it was
 - Blocks fields keep unconfirmed saves visible, and agent reads handle changing collection fields and older editors reliably
 - Compact HTML table row groups keep their cells, and unsupported block colors are reported during Markdown checks.
 - Suggestions keep refusing unmatched emphasis in stored Markdown

package/corpus/templates/content/actions/_builder-cms-unpublished-changes.ts

@@ -56,6 +56,36 @@ export type BuilderCmsPublicationIntentRead =
   | { state: "staged"; transition: BuilderCmsPublicationTransitionIntent }
   | { state: "invalid" };
 
+/**
+ * The source fields Builder changed after Content edited them, while the
+ * edit waits for a push. A refresh keeps Content's edit, so the review flags
+ * these until the edit is pushed or matches Builder.
+ */
+export const BUILDER_CMS_EDIT_CONFLICTS_KEY =
+  "__agent_native_builder_edit_conflicts";
+
+/**
+ * The page title's entry in the edit-conflict record. A property named
+ * "Title" maps to Builder's `data.title` too, so the title keeps its own
+ * entry and neither writer clears the other's.
+ */
+export const BUILDER_CMS_TITLE_CONFLICT_KEY = "__builder.title";
+
+/** The edit-conflict entry a field change settles when it is pushed. */
+export function builderCmsEditConflictKey(change: {
+  localFieldKey: string;
+  sourceFieldKey: string;
+}) {
+  return change.localFieldKey === "title"
+    ? BUILDER_CMS_TITLE_CONFLICT_KEY
+    : change.sourceFieldKey;
+}
+
+export type BuilderCmsEditConflictsRead =
+  | { state: "none" }
+  | { state: "recorded"; sourceFieldKeys: string[] }
+  | { state: "invalid" };
+
 export type BuilderCmsUnpublishedChangesRead =
   | { state: "none" }
   | { state: "pending"; changes: BuilderCmsUnpublishedChanges }
@@ -230,6 +260,41 @@ export function withBuilderCmsPublicationIntent(
   return next;
 }
 
+export function readBuilderCmsEditConflicts(
+  sourceValues: Record<string, DocumentPropertyValue> | null | undefined,
+): BuilderCmsEditConflictsRead {
+  const raw = sourceValues?.[BUILDER_CMS_EDIT_CONFLICTS_KEY];
+  if (raw === undefined || raw === null) return { state: "none" };
+  return Array.isArray(raw) &&
+    raw.length > 0 &&
+    raw.every((key) => typeof key === "string" && key)
+    ? { state: "recorded", sourceFieldKeys: raw }
+    : { state: "invalid" };
+}
+
+/**
+ * Replaces one writer's keys in the edit-conflicts record: a refresh's fields,
+ * its title, a body read, and a push each own theirs and keep the others'. An
+ * unreadable record is replaced; the review flagged it until then.
+ */
+export function withBuilderCmsEditConflicts(
+  sourceValues: Record<string, DocumentPropertyValue>,
+  args: { ownedKeys: Iterable<string>; conflictedKeys: Iterable<string> },
+): Record<string, DocumentPropertyValue> {
+  const read = readBuilderCmsEditConflicts(sourceValues);
+  const owned = new Set(args.ownedKeys);
+  const keys = new Set(
+    read.state === "recorded"
+      ? read.sourceFieldKeys.filter((key) => !owned.has(key))
+      : [],
+  );
+  for (const key of args.conflictedKeys) keys.add(key);
+  const next = { ...sourceValues };
+  if (keys.size > 0) next[BUILDER_CMS_EDIT_CONFLICTS_KEY] = [...keys].sort();
+  else delete next[BUILDER_CMS_EDIT_CONFLICTS_KEY];
+  return next;
+}
+
 /**
  * Builder's own status words for an entry, as its content list shows them.
  * Unpublished changes are Content's saves or Builder's own autosaves. An
@@ -366,7 +431,7 @@ export function builderSourceValuesKeepingUnpublishedChanges(
   args: KeepingUnpublishedChangesArgs,
 ): Record<string, DocumentPropertyValue> {
   const refreshed = sourceValuesKeepingUnpublishedChanges(args);
-  return withBuilderCmsPublicationIntent(
+  const next = withBuilderCmsPublicationIntent(
     refreshed,
     publicationIntentAfterRead({
       existing: args.existing,
@@ -374,6 +439,10 @@ export function builderSourceValuesKeepingUnpublishedChanges(
       builderValues: args.builderValues,
     }),
   );
+  // Only the writer that compares an edit with Builder settles its conflict.
+  const conflicts = args.existing?.[BUILDER_CMS_EDIT_CONFLICTS_KEY];
+  if (conflicts !== undefined) next[BUILDER_CMS_EDIT_CONFLICTS_KEY] = conflicts;
+  return next;
 }
 
 interface KeepingUnpublishedChangesArgs {

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

@@ -957,6 +957,19 @@ export function buildBuilderCmsExecutionPlan(args: {
       fieldBlockers.push(converted.blocker);
       continue;
     }
+    // The page title and a property mapped to Builder's title field are
+    // separate edits to one Builder field, and the patch keeps only one value.
+    const sameField = operations.find(
+      (operation) => operation.sourceFieldKey === field.sourceFieldKey,
+    );
+    if (sameField) {
+      if (stableJson(sameField.value) !== stableJson(converted.value)) {
+        fieldBlockers.push(
+          `Two changes set Builder's ${builderFieldName(field.sourceFieldKey)} field to different values. Set one of them back before pushing.`,
+        );
+      }
+      continue;
+    }
     operations.push({
       sourceFieldKey: field.sourceFieldKey,
       localFieldKey: field.localFieldKey,

package/corpus/templates/content/actions/_builder-status-property.ts

@@ -359,6 +359,10 @@ export async function removeBuilderStatusPropertyWithoutSource(
   await db
     .delete(schema.documentPropertyValues)
     .where(eq(schema.documentPropertyValues.propertyId, propertyId));
+  // After the values: deleting them records a tombstone for each one.
+  await db
+    .delete(schema.documentPropertyValueTombstones)
+    .where(eq(schema.documentPropertyValueTombstones.propertyId, propertyId));
   await db
     .delete(schema.contentDatabaseItemKeyClaims)
     .where(