@agent-native/core 0.92.11 → 0.92.12

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

@@ -59,9 +59,75 @@ const BUILDER_CMS_DEFAULT_READ_LIMIT = 500;
 const BUILDER_CMS_MAX_READ_LIMIT = 1000;
 const BUILDER_CMS_PAGE_SIZE = 100;
 const BUILDER_CMS_READ_RETRIES = 2;
-const BUILDER_CMS_METADATA_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";
-const BUILDER_CMS_BODY_ENTRY_FIELDS = `${BUILDER_CMS_METADATA_ENTRY_FIELDS},data.blocks,data.blocksString`;
+const BUILDER_CMS_METADATA_ENTRY_FIELD_PATHS = [
+  "id",
+  "name",
+  "published",
+  "lastUpdated",
+  "createdDate",
+  "data.title",
+  "data.handle",
+  "data.url",
+  "data.slug",
+  "data.date",
+  "data.description",
+  "data.status",
+  "data.author",
+  "data.image",
+] as const;
+const BUILDER_CMS_TOP_LEVEL_METADATA_FIELDS = new Set(
+  BUILDER_CMS_METADATA_ENTRY_FIELD_PATHS.filter(
+    (fieldPath) => !fieldPath.startsWith("data."),
+  ).map((fieldPath) => fieldPath.toLowerCase()),
+);
+const BUILDER_CMS_HEAVY_BODY_FIELD_PATHS = [
+  "data.blocks",
+  "data.blocksString",
+] as const;
+const BUILDER_CMS_FIELD_PATH_PATTERN =
+  /^[A-Za-z0-9_$-]+(?:\.[A-Za-z0-9_$-]+)*$/;
+
+function normalizeBuilderCmsListFieldPath(fieldPath: string) {
+  const trimmed = fieldPath.trim();
+  if (!trimmed || !BUILDER_CMS_FIELD_PATH_PATTERN.test(trimmed)) return null;
+  const normalized = trimmed.includes(".")
+    ? trimmed
+    : BUILDER_CMS_TOP_LEVEL_METADATA_FIELDS.has(trimmed.toLowerCase())
+      ? trimmed
+      : `data.${trimmed}`;
+  const lower = normalized.toLowerCase();
+  if (
+    BUILDER_CMS_HEAVY_BODY_FIELD_PATHS.some((heavyFieldPath) => {
+      const heavyLower = heavyFieldPath.toLowerCase();
+      return lower === heavyLower || lower.startsWith(`${heavyLower}.`);
+    })
+  ) {
+    return null;
+  }
+  if (
+    normalized.includes(".") &&
+    !normalized.toLowerCase().startsWith("data.")
+  ) {
+    return null;
+  }
+  return normalized;
+}
+
+export function builderCmsListEntryFields(fieldPaths: readonly string[] = []) {
+  const fields = new Map<string, string>();
+  for (const fieldPath of [
+    ...BUILDER_CMS_METADATA_ENTRY_FIELD_PATHS,
+    ...fieldPaths,
+  ]) {
+    const normalized = normalizeBuilderCmsListFieldPath(fieldPath);
+    if (!normalized) continue;
+    if (!fields.has(normalized)) fields.set(normalized, normalized);
+  }
+  return Array.from(fields.values()).join(",");
+}
+
+const BUILDER_CMS_METADATA_ENTRY_FIELDS = builderCmsListEntryFields();
+const BUILDER_CMS_BODY_ENTRY_FIELDS = `${BUILDER_CMS_METADATA_ENTRY_FIELDS},${BUILDER_CMS_HEAVY_BODY_FIELD_PATHS.join(",")}`;
 
 function builderContentApiHost() {
   return (
@@ -444,6 +510,7 @@ async function initializeBuilderMcp(args: {
 
 async function readBuilderCmsContentEntriesViaMcp(args: {
   model: string;
+  fieldPaths?: readonly string[];
   limit?: number;
   maxPages?: number;
   offset?: number;
@@ -464,6 +531,7 @@ async function readBuilderCmsContentEntriesViaMcp(args: {
       ? Math.max(0, Math.floor(args.offset))
       : 0;
   const contentEntries: BuilderCmsSourceEntry[] = [];
+  const fields = builderCmsListEntryFields(args.fieldPaths);
   const seenContentIds = new Set<string>();
   let pagesRead = 0;
   let hasMore = false;
@@ -490,7 +558,7 @@ async function readBuilderCmsContentEntriesViaMcp(args: {
             modelName: args.model,
             limit: pageLimit,
             offset,
-            fields: BUILDER_CMS_METADATA_ENTRY_FIELDS,
+            fields,
             enrich: true,
           },
         },
@@ -600,7 +668,7 @@ async function readBuilderCmsContentEntriesViaMcp(args: {
             modelName: args.model,
             limit: 1,
             query: { id: entry.id },
-            fields: BUILDER_CMS_METADATA_ENTRY_FIELDS,
+            fields,
             enrich: true,
           },
         },
@@ -633,6 +701,7 @@ async function readBuilderCmsContentEntriesViaMcp(args: {
 
 async function readBuilderCmsContentEntriesViaContentApi(args: {
   model: string;
+  fieldPaths?: readonly string[];
   limit?: number;
   maxPages?: number;
   offset?: number;
@@ -650,7 +719,7 @@ async function readBuilderCmsContentEntriesViaContentApi(args: {
   // bare reference id.
   url.searchParams.set("enrich", "true");
   url.searchParams.set("noCache", "true");
-  url.searchParams.set("fields", BUILDER_CMS_METADATA_ENTRY_FIELDS);
+  url.searchParams.set("fields", builderCmsListEntryFields(args.fieldPaths));
 
   const limit = readLimit(args.limit);
   const startOffset =
@@ -902,7 +971,10 @@ export async function readBuilderCmsModelFields(args: {
   fetchImpl?: FetchLike;
 }): Promise<BuilderCmsModelFieldSummary[]> {
   const models = await listBuilderCmsModels({ fetchImpl: args.fetchImpl });
-  if (models.state !== "live") return [];
+  if (models.state === "unconfigured") return [];
+  if (models.state === "error") {
+    throw new Error(models.message ?? "Builder CMS model discovery failed.");
+  }
   const modelName = args.model.trim().toLowerCase();
   return (
     models.models.find((model) => {
@@ -917,6 +989,7 @@ export async function readBuilderCmsModelFields(args: {
 
 export async function readBuilderCmsContentEntries(args: {
   model: string;
+  fieldPaths?: readonly string[];
   limit?: number;
   maxPages?: number;
   offset?: number;
@@ -929,6 +1002,7 @@ export async function readBuilderCmsContentEntries(args: {
   if (publicKey) {
     const contentApiRead = await readBuilderCmsContentEntriesViaContentApi({
       model: args.model,
+      fieldPaths: args.fieldPaths,
       limit: args.limit,
       maxPages: args.maxPages,
       offset: args.offset,
@@ -945,6 +1019,7 @@ export async function readBuilderCmsContentEntries(args: {
     try {
       return await readBuilderCmsContentEntriesViaMcp({
         model: args.model,
+        fieldPaths: args.fieldPaths,
         limit: args.limit,
         maxPages: args.maxPages,
         offset: args.offset,

package/corpus/templates/content/actions/_database-source-utils.ts

@@ -128,6 +128,7 @@ type SourceMetadataRecord = {
   lastReadPartial?: boolean;
   lastReadHasMore?: boolean;
   lastReadNextOffset?: number;
+  lastReadSuspiciousEmpty?: boolean;
   activeReadSourceRowIds?: string[];
   sourceFetchState?: "idle" | "fetching" | "error" | string;
   allowDraftWrites?: boolean;
@@ -336,6 +337,48 @@ const HEAVY_BUILDER_BODY_SOURCE_VALUE_KEYS = new Set([
   BUILDER_CMS_BODY_SIDECARS_KEY,
 ]);
 
+const SOURCE_VALUES_JSON_COLUMN =
+  '"content_database_source_rows"."source_values_json"';
+
+export function sourceSnapshotValuesJsonProjectionSql(dialect: Dialect) {
+  const keys = Array.from(HEAVY_BUILDER_BODY_SOURCE_VALUE_KEYS);
+  if (dialect === "postgres") {
+    return `COALESCE((${SOURCE_VALUES_JSON_COLUMN}::jsonb${keys
+      .map((key) => ` - '${key}'`)
+      .join("")})::text, '{}')`;
+  }
+  const paths = keys.map((key) => `'$."${key}"'`);
+  return `COALESCE(json_remove(${SOURCE_VALUES_JSON_COLUMN}, ${paths.join(", ")}), '{}')`;
+}
+
+function sourceSnapshotRowSelection(args: {
+  stripHeavyBuilderBodyValues: boolean;
+}) {
+  const row = schema.contentDatabaseSourceRows;
+  return {
+    id: row.id,
+    ownerEmail: row.ownerEmail,
+    sourceId: row.sourceId,
+    databaseItemId: row.databaseItemId,
+    documentId: row.documentId,
+    sourceRowId: row.sourceRowId,
+    sourceQualifiedId: row.sourceQualifiedId,
+    sourceDisplayKey: row.sourceDisplayKey,
+    sourceValuesJson: args.stripHeavyBuilderBodyValues
+      ? sql<string>`${sql.raw(
+          sourceSnapshotValuesJsonProjectionSql(getDialect()),
+        )}`
+      : row.sourceValuesJson,
+    provenance: row.provenance,
+    syncState: row.syncState,
+    freshness: row.freshness,
+    lastSyncedAt: row.lastSyncedAt,
+    lastSourceUpdatedAt: row.lastSourceUpdatedAt,
+    createdAt: row.createdAt,
+    updatedAt: row.updatedAt,
+  };
+}
+
 export function sourceValuesForSnapshot(
   sourceValues: Record<string, DocumentPropertyValue>,
   options: { includeHeavyBuilderBodyValues?: boolean } = {},
@@ -2389,10 +2432,16 @@ async function readSourceSnapshotRowsOnce(args: {
   source: ContentDatabaseSourceRowDb;
   database: ContentDatabaseRow | ContentDatabase;
   isBuilderSource: boolean;
+  includeHeavyBuilderBodyValues: boolean;
 }) {
   const db = getDb();
   const rowRows = await db
-    .select()
+    .select(
+      sourceSnapshotRowSelection({
+        stripHeavyBuilderBodyValues:
+          args.isBuilderSource && !args.includeHeavyBuilderBodyValues,
+      }),
+    )
     .from(schema.contentDatabaseSourceRows)
     .where(eq(schema.contentDatabaseSourceRows.sourceId, args.source.id))
     .orderBy(asc(schema.contentDatabaseSourceRows.createdAt));
@@ -2467,6 +2516,7 @@ async function sourceSnapshotConsistencyMarker(args: {
   source: ContentDatabaseSourceRowDb;
   database: ContentDatabaseRow | ContentDatabase;
   isBuilderSource: boolean;
+  includeHeavyBuilderBodyValues: boolean;
 }) {
   const db = getDb();
   const [rows] = await db
@@ -2518,6 +2568,7 @@ async function loadSourceSnapshotRowsOptimistically(args: {
   source: ContentDatabaseSourceRowDb;
   database: ContentDatabaseRow | ContentDatabase;
   isBuilderSource: boolean;
+  includeHeavyBuilderBodyValues: boolean;
 }) {
   let latest: Awaited<ReturnType<typeof readSourceSnapshotRowsOnce>> | null =
     null;
@@ -2616,6 +2667,7 @@ async function loadSourceSnapshot(
     source,
     database,
     isBuilderSource,
+    includeHeavyBuilderBodyValues: options.includeHeavyBuilderBodyValues,
   });
   const rows = rowRows.map((row) =>
     serializeSourceRowRecord(row, {
@@ -2722,7 +2774,7 @@ async function loadSourceSnapshot(
     string,
     ContentDatabaseSourceBodyChange
   >();
-  if (isBuilderSource) {
+  if (isBuilderSource && options.includeHeavyBuilderBodyValues) {
     const sourceRowByDocumentId = new Map(
       rowRows.map((row) => [row.documentId, row]),
     );
@@ -2860,6 +2912,10 @@ async function loadSourceSnapshot(
         typeof metadata.lastReadNextOffset === "number"
           ? metadata.lastReadNextOffset
           : undefined,
+      lastReadSuspiciousEmpty:
+        typeof metadata.lastReadSuspiciousEmpty === "boolean"
+          ? metadata.lastReadSuspiciousEmpty
+          : undefined,
       sourceFetchState:
         metadata.sourceFetchState === "idle" ||
         metadata.sourceFetchState === "fetching" ||
@@ -3019,6 +3075,7 @@ export function serializeBuilderCmsSourceReadMetadataRecord(args: {
   progress?: BuilderCmsReadProgress;
   sourceFetchState?: "idle" | "fetching" | "error";
   activeReadSourceRowIds?: string[];
+  suspiciousEmpty?: boolean;
   builderModelFields?: BuilderCmsModelFieldSummary[];
   existingMetadataJson?: string | null;
 }) {
@@ -3038,7 +3095,10 @@ export function serializeBuilderCmsSourceReadMetadataRecord(args: {
     lastReadPartial: args.progress?.partial,
     lastReadHasMore: args.progress?.hasMore,
     lastReadNextOffset: args.progress?.nextOffset,
-    activeReadSourceRowIds: args.activeReadSourceRowIds,
+    lastReadSuspiciousEmpty: args.suspiciousEmpty === true,
+    activeReadSourceRowIds: args.suspiciousEmpty
+      ? []
+      : args.activeReadSourceRowIds,
     sourceFetchState:
       args.sourceFetchState ??
       (args.progress?.partial
@@ -3122,6 +3182,11 @@ export async function seedMockSourceFields(args: {
 }) {
   const db = getDb();
   const isBuilder = args.sourceType === "builder-cms";
+  const existingBuilderFieldByPropertyId = new Map(
+    (args.existingFields ?? [])
+      .filter((field) => isBuilder && field.propertyId)
+      .map((field) => [field.propertyId!, field]),
+  );
   const rows = [
     {
       id: crypto.randomUUID(),
@@ -3224,10 +3289,12 @@ export async function seedMockSourceFields(args: {
         propertyId: property.definition.id,
         localFieldKey: property.definition.id,
         sourceFieldKey: isBuilder
-          ? builderCmsSourceFieldKey(
+          ? (existingBuilderFieldByPropertyId.get(property.definition.id)
+              ?.sourceFieldKey ??
+            builderCmsSourceFieldKey(
               property.definition.id,
               property.definition.name,
-            )
+            ))
           : `fields.${slugifySourceField(property.definition.name)}`,
         sourceFieldLabel: property.definition.name,
         sourceFieldType: property.definition.type,
@@ -3259,15 +3326,19 @@ export async function seedMockSourceFields(args: {
         updatedAt: args.now,
       })),
   ];
+  const sourceFieldIdentityKey = (sourceFieldKey: string) => {
+    const trimmed = sourceFieldKey.trim();
+    return isBuilder ? trimmed : trimmed.toLowerCase();
+  };
   if (isBuilder) {
     const existingSourceFieldKeys = new Set(
-      rows.map((row) => row.sourceFieldKey.trim().toLowerCase()),
+      rows.map((row) => sourceFieldIdentityKey(row.sourceFieldKey)),
     );
     for (const field of args.builderModelFields ?? []) {
       const fieldName = field.name.trim();
       if (!fieldName) continue;
       const sourceFieldKey = `data.${fieldName}`;
-      const normalizedKey = sourceFieldKey.toLowerCase();
+      const normalizedKey = sourceFieldIdentityKey(sourceFieldKey);
       if (existingSourceFieldKeys.has(normalizedKey)) continue;
       existingSourceFieldKeys.add(normalizedKey);
       rows.push({
@@ -3292,7 +3363,7 @@ export async function seedMockSourceFields(args: {
     for (const entry of args.builderSampleEntries ?? []) {
       for (const sourceFieldKey of Object.keys(entry.sourceValues)) {
         if (!sourceFieldKey.startsWith("data.")) continue;
-        const normalizedKey = sourceFieldKey.toLowerCase();
+        const normalizedKey = sourceFieldIdentityKey(sourceFieldKey);
         if (existingSourceFieldKeys.has(normalizedKey)) continue;
         existingSourceFieldKeys.add(normalizedKey);
         const value = entry.sourceValues[sourceFieldKey];
@@ -3329,13 +3400,13 @@ export async function seedMockSourceFields(args: {
 
   const existingFieldBySourceKey = new Map(
     (args.existingFields ?? []).map((field) => [
-      field.sourceFieldKey.trim().toLowerCase(),
+      sourceFieldIdentityKey(field.sourceFieldKey),
       field,
     ]),
   );
   const mergedRows = rows.map((row) => {
     const existing = existingFieldBySourceKey.get(
-      row.sourceFieldKey.trim().toLowerCase(),
+      sourceFieldIdentityKey(row.sourceFieldKey),
     );
     if (!existing) return row;
     return {
@@ -4152,8 +4223,33 @@ export async function resyncBuilderCmsSourceSnapshot(args: {
     sourceMetadata.lastReadNextOffset > 0
       ? sourceMetadata.lastReadNextOffset
       : 0;
+  const existingFields = await db
+    .select()
+    .from(schema.contentDatabaseSourceFields)
+    .where(eq(schema.contentDatabaseSourceFields.sourceId, args.source.id));
+  let builderModelFields: BuilderCmsModelFieldSummary[] | undefined;
+  let builderModelFieldsReadFailed = false;
+  try {
+    builderModelFields = await readBuilderCmsModelFields({
+      model: args.source.sourceTable,
+    });
+  } catch (error) {
+    builderModelFieldsReadFailed = true;
+    const message = error instanceof Error ? error.message : String(error);
+    console.warn(
+      `[content] Builder model field read failed for ${args.source.sourceTable}; continuing source row sync without model field metadata. ${message}`,
+    );
+  }
+  const projectionModelFields =
+    builderModelFields && builderModelFields.length > 0
+      ? builderModelFields
+      : (sourceMetadata.builderModelFields ?? []);
   const builderRead = await readBuilderCmsContentEntries({
     model: args.source.sourceTable,
+    fieldPaths: [
+      ...existingFields.map((field) => field.sourceFieldKey),
+      ...projectionModelFields.map((field) => `data.${field.name}`),
+    ],
     maxPages: args.runFullRefresh
       ? undefined
       : BUILDER_CMS_REFRESH_INITIAL_PAGES,
@@ -4170,15 +4266,41 @@ export async function resyncBuilderCmsSourceSnapshot(args: {
     .select()
     .from(schema.contentDatabaseSourceRows)
     .where(eq(schema.contentDatabaseSourceRows.sourceId, args.source.id));
+  const readStartOffset = builderRead.progress?.startOffset ?? 0;
+  const activeReadSourceRowIdSet = new Set(activeReadSourceRowIds);
+  const suspiciousEmptyRead =
+    builderRead.state === "live" &&
+    builderRead.entries.length === 0 &&
+    existingRows.length > 0 &&
+    (readStartOffset === 0 ||
+      existingRows.some(
+        (row) => !activeReadSourceRowIdSet.has(row.sourceRowId),
+      ));
+  if (suspiciousEmptyRead) {
+    const message =
+      "Builder CMS returned no entries for a source with existing rows. The previous snapshot was preserved; retry the refresh before treating the source as empty.";
+    await updateBuilderCmsSourceReadMetadata({
+      sourceId: args.source.id,
+      sourceTable: args.source.sourceTable,
+      readState: builderRead.state,
+      entryCount: builderRead.entries.length,
+      matchedRowCount: 0,
+      fetchedAt: builderRead.fetchedAt,
+      now: args.now,
+      message,
+      builderModelFields,
+      progress: builderRead.progress,
+      sourceFetchState: "error",
+      syncState: "error",
+      suspiciousEmpty: true,
+    });
+    return;
+  }
   await enqueueEmptyHydratedBuilderBodiesFromStoredRows({
     source: args.source,
     now: args.now,
   });
   let importedEntriesByDocumentId = new Map<string, BuilderCmsSourceEntry>();
-  const existingFields = await db
-    .select()
-    .from(schema.contentDatabaseSourceFields)
-    .where(eq(schema.contentDatabaseSourceFields.sourceId, args.source.id));
   if (builderRead.state === "live") {
     const importResult = await importBuilderCmsEntriesAsDatabaseItems({
       database: args.database,
@@ -4196,19 +4318,6 @@ export async function resyncBuilderCmsSourceSnapshot(args: {
         .where(eq(schema.contentDatabaseSourceRows.sourceId, args.source.id));
     }
   }
-  let builderModelFields: BuilderCmsModelFieldSummary[] | undefined;
-  let builderModelFieldsReadFailed = false;
-  try {
-    builderModelFields = await readBuilderCmsModelFields({
-      model: args.source.sourceTable,
-    });
-  } catch (error) {
-    builderModelFieldsReadFailed = true;
-    const message = error instanceof Error ? error.message : String(error);
-    console.warn(
-      `[content] Builder model field read failed for ${args.source.sourceTable}; continuing source row sync without model field metadata. ${message}`,
-    );
-  }
   const builderEntriesByDocumentId =
     builderRead.state === "live"
       ? mapBuilderCmsEntriesToLocalItems({
@@ -4797,12 +4906,14 @@ export async function updateBuilderCmsSourceReadMetadata(args: {
   activeReadSourceRowIds?: string[];
   syncState?: ContentDatabaseSourceSyncState;
   builderModelFields?: BuilderCmsModelFieldSummary[];
+  suspiciousEmpty?: boolean;
 }) {
   const db = getDb();
   const [currentSource] = await db
     .select({
       capabilitiesJson: schema.contentDatabaseSources.capabilitiesJson,
       metadataJson: schema.contentDatabaseSources.metadataJson,
+      lastSourceUpdatedAt: schema.contentDatabaseSources.lastSourceUpdatedAt,
     })
     .from(schema.contentDatabaseSources)
     .where(eq(schema.contentDatabaseSources.id, args.sourceId))
@@ -4820,6 +4931,7 @@ export async function updateBuilderCmsSourceReadMetadata(args: {
       progress: args.progress,
       sourceFetchState: args.sourceFetchState,
       activeReadSourceRowIds: args.activeReadSourceRowIds,
+      suspiciousEmpty: args.suspiciousEmpty,
       builderModelFields: args.builderModelFields,
       existingMetadataJson: currentSource?.metadataJson,
     }),
@@ -4829,14 +4941,21 @@ export async function updateBuilderCmsSourceReadMetadata(args: {
     .set({
       syncState: args.syncState ?? "linked",
       freshness:
-        args.readState === "error" || args.progress?.partial
+        args.readState === "error" ||
+        args.progress?.partial ||
+        args.suspiciousEmpty
           ? "stale"
           : "fresh",
       capabilitiesJson: nextJson.capabilitiesJson,
       metadataJson: nextJson.metadataJson,
       lastRefreshedAt: args.now,
-      lastSourceUpdatedAt: args.fetchedAt,
-      lastError: args.readState === "error" ? args.message : null,
+      lastSourceUpdatedAt: args.suspiciousEmpty
+        ? (currentSource?.lastSourceUpdatedAt ?? null)
+        : args.fetchedAt,
+      lastError:
+        args.readState === "error" || args.suspiciousEmpty
+          ? args.message
+          : null,
       updatedAt: args.now,
     })
     .where(eq(schema.contentDatabaseSources.id, args.sourceId));

package/corpus/templates/content/actions/add-content-database-source-field-property.ts

@@ -201,10 +201,7 @@ export function sourceFieldPropertyOptions(args: {
 }
 
 function builderFieldNameForSourceKey(sourceFieldKey: string) {
-  return sourceFieldKey
-    .replace(/^data\./, "")
-    .trim()
-    .toLowerCase();
+  return sourceFieldKey.replace(/^data\./, "").trim();
 }
 
 function builderModelFieldsFromMetadata(
@@ -231,15 +228,15 @@ function builderModelFieldsFromMetadata(
   }
 }
 
-function builderMetadataForSourceField(args: {
+export function builderMetadataForSourceField(args: {
   sourceFieldKey: string;
   sourceMetadataJson: string | null | undefined;
 }) {
   const fieldName = builderFieldNameForSourceKey(args.sourceFieldKey);
-  const sourceFieldKey = args.sourceFieldKey.trim().toLowerCase();
+  const sourceFieldKey = args.sourceFieldKey.trim();
   return (
     builderModelFieldsFromMetadata(args.sourceMetadataJson).find((field) => {
-      const name = field.name.trim().toLowerCase();
+      const name = field.name.trim();
       return name === fieldName || `data.${name}` === sourceFieldKey;
     }) ?? null
   );

package/corpus/templates/content/actions/attach-content-database-source.ts

@@ -48,13 +48,41 @@ const BUILDER_CMS_ATTACH_INITIAL_PAGES = 1;
 export async function readInitialBuilderCmsAttachEntries(
   sourceTable: string,
   readEntries: typeof readBuilderCmsContentEntries = readBuilderCmsContentEntries,
+  fieldPaths: readonly string[] = [],
 ) {
   return readEntries({
     model: sourceTable,
+    fieldPaths,
     maxPages: BUILDER_CMS_ATTACH_INITIAL_PAGES,
   });
 }
 
+export async function readInitialBuilderCmsAttachSource(
+  sourceTable: string,
+  dependencies: {
+    readModelFields?: typeof readBuilderCmsModelFields;
+    readEntries?: typeof readBuilderCmsContentEntries;
+  } = {},
+) {
+  const readModelFields =
+    dependencies.readModelFields ?? readBuilderCmsModelFields;
+  const readEntries = dependencies.readEntries ?? readBuilderCmsContentEntries;
+  let modelFields: BuilderCmsModelFieldSummary[] = [];
+  let modelFieldsError: unknown = null;
+  try {
+    modelFields = await readModelFields({ model: sourceTable });
+  } catch (error) {
+    modelFieldsError = error;
+  }
+  const read = await readInitialBuilderCmsAttachEntries(
+    sourceTable,
+    readEntries,
+    modelFields.map((field) => `data.${field.name}`),
+  );
+  if (modelFieldsError) throw modelFieldsError;
+  return { read, modelFields };
+}
+
 function builderReadHasMore(read: BuilderCmsReadResult | null | undefined) {
   return read?.state === "live" && read.progress?.hasMore === true;
 }
@@ -238,9 +266,10 @@ export default defineAction({
       let modelFields: BuilderCmsModelFieldSummary[];
       let builderRead: BuilderCmsReadResult | null = null;
       if (sourceType === "builder-cms") {
-        builderRead = await readInitialBuilderCmsAttachEntries(sourceTable);
+        const initial = await readInitialBuilderCmsAttachSource(sourceTable);
+        modelFields = initial.modelFields;
+        builderRead = initial.read;
         entries = builderRead.state === "live" ? builderRead.entries : [];
-        modelFields = await readBuilderCmsModelFields({ model: sourceTable });
       } else if (sourceType === "local-table") {
         // sourceTable carries the target database id for a local-table source.
         ({ entries, modelFields } = await readLocalTableEntries(sourceTable, {
@@ -327,13 +356,12 @@ export default defineAction({
       if (await databaseSourceExistsForTable(database.id, sourceTable)) {
         throw new Error(`"${sourceTable}" is already attached as a source.`);
       }
-      const additionalRead =
-        await readInitialBuilderCmsAttachEntries(sourceTable);
+      const additionalInitial =
+        await readInitialBuilderCmsAttachSource(sourceTable);
+      const additionalModelFields = additionalInitial.modelFields;
+      const additionalRead = additionalInitial.read;
       const additionalEntries =
         additionalRead.state === "live" ? additionalRead.entries : [];
-      const additionalModelFields = await readBuilderCmsModelFields({
-        model: sourceTable,
-      });
       const additionalSourceId = await insertSecondarySource({
         database,
         sourceType,
@@ -436,6 +464,10 @@ export default defineAction({
     const existingSourceRows = existingSource
       ? await getSourceRows(existingSource.id)
       : [];
+    const builderInitial =
+      sourceType === "builder-cms"
+        ? await readInitialBuilderCmsAttachSource(sourceTable)
+        : null;
     const sourceId = await replaceSourceMetadata({
       database,
       source: existingSource,
@@ -444,18 +476,10 @@ export default defineAction({
       sourceTable,
       now,
     });
-    const builderRead =
-      sourceType === "builder-cms"
-        ? await readInitialBuilderCmsAttachEntries(sourceTable)
-        : null;
+    const builderModelFields = builderInitial?.modelFields ?? [];
+    const builderRead = builderInitial?.read ?? null;
     const builderEntries =
       builderRead?.state === "live" ? builderRead.entries : [];
-    const builderModelFields =
-      sourceType === "builder-cms"
-        ? await readBuilderCmsModelFields({
-            model: sourceTable,
-          })
-        : [];
     let importedEntriesByDocumentId = new Map<string, BuilderCmsSourceEntry>();
     if (builderRead?.state === "live") {
       const importResult = await importBuilderCmsEntriesAsDatabaseItems({