@agent-native/core 0.90.1 → 0.90.3

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

@@ -30,10 +30,12 @@ type DatabaseMembershipRow = {
   item: typeof schema.contentDatabaseItems.$inferSelect;
   database: typeof schema.contentDatabases.$inferSelect;
   sourceId?: string | null;
+  bodyHydrationQueueId?: string | null;
 };
 
 export function serializeBodyHydration(
   item: typeof schema.contentDatabaseItems.$inferSelect,
+  options: { queued?: boolean } = {},
 ): ContentDatabaseBodyHydration {
   const status = item.bodyHydrationStatus;
   return {
@@ -43,7 +45,9 @@ export function serializeBodyHydration(
       status === "hydrated" ||
       status === "error"
         ? status
-        : "hydrated",
+        : options.queued
+          ? "pending"
+          : "hydrated",
     attemptedAt: item.bodyHydrationAttemptedAt,
     error: item.bodyHydrationError,
     version: item.bodyHydrationVersion,
@@ -59,7 +63,9 @@ export function serializeDatabaseMembership(
     databaseTitle: row.database.title || "Untitled database",
     position: row.item.position,
     sourceId: row.sourceId ?? null,
-    bodyHydration: serializeBodyHydration(row.item),
+    bodyHydration: serializeBodyHydration(row.item, {
+      queued: !!row.bodyHydrationQueueId,
+    }),
   };
 }
 
@@ -190,17 +196,43 @@ export async function getContentDatabaseResponse(
           )
       : [];
   const documentById = new Map(documents.map((doc) => [doc.id, doc]));
+  const queuedBodyHydrationItemIds =
+    items.length > 0
+      ? new Set(
+          (
+            await db
+              .select({
+                databaseItemId:
+                  schema.contentDatabaseBodyHydrationQueue.databaseItemId,
+              })
+              .from(schema.contentDatabaseBodyHydrationQueue)
+              .where(
+                inArray(
+                  schema.contentDatabaseBodyHydrationQueue.databaseItemId,
+                  items.map((item) => item.id),
+                ),
+              )
+          ).map((row) => row.databaseItemId),
+        )
+      : new Set<string>();
 
   const serializedItems = [];
   for (const item of items) {
     const document = documentById.get(item.documentId);
     if (!document) continue;
+    const bodyHydrationQueued = queuedBodyHydrationItemIds.has(item.id);
     serializedItems.push({
       id: item.id,
       databaseId: item.databaseId,
-      document: serializeDocument(document, { item, database }),
+      document: serializeDocument(document, {
+        item,
+        database,
+        bodyHydrationQueueId: bodyHydrationQueued ? item.id : null,
+      }),
       position: item.position,
-      bodyHydration: serializeBodyHydration(item),
+      bodyHydration: serializeBodyHydration(item, {
+        queued: bodyHydrationQueued,
+      }),
       properties: await listPropertiesForDatabase(databaseId, document),
     });
   }
@@ -312,6 +344,7 @@ export async function getDatabaseItemByDocumentId(
       item: schema.contentDatabaseItems,
       database: schema.contentDatabases,
       sourceId: schema.contentDatabaseSourceRows.sourceId,
+      bodyHydrationQueueId: schema.contentDatabaseBodyHydrationQueue.id,
     })
     .from(schema.contentDatabaseItems)
     .innerJoin(
@@ -325,6 +358,13 @@ export async function getDatabaseItemByDocumentId(
         schema.contentDatabaseItems.id,
       ),
     )
+    .leftJoin(
+      schema.contentDatabaseBodyHydrationQueue,
+      eq(
+        schema.contentDatabaseBodyHydrationQueue.databaseItemId,
+        schema.contentDatabaseItems.id,
+      ),
+    )
     .where(and(...clauses));
   return row ?? null;
 }

package/corpus/templates/content/actions/_notion-action-utils.ts

@@ -24,7 +24,11 @@ export async function getNotionDocumentOwner(documentId: string) {
 }
 
 export function resolveDocumentId(args: { documentId?: string; id?: string }) {
-  const documentId = args.documentId || args.id;
-  if (!documentId) throw new Error("documentId is required");
+  const documentId = args.documentId?.trim() || args.id?.trim();
+  if (!documentId) {
+    throw Object.assign(new Error("documentId is required"), {
+      statusCode: 400,
+    });
+  }
   return documentId;
 }

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

@@ -80,6 +80,14 @@ export default defineAction({
     databaseId: z.string().optional().describe("Database ID"),
     documentId: z.string().optional().describe("Database document/page ID"),
     sourceFieldId: z.string().describe("Source field mapping ID"),
+    sourceId: z
+      .string()
+      .optional()
+      .describe("Source ID for stale field ID fallback"),
+    sourceFieldKey: z
+      .string()
+      .optional()
+      .describe("Stable source field key for stale field ID fallback"),
   }),
   run: async (
     args: AddContentDatabaseSourceFieldPropertyRequest,
@@ -89,10 +97,24 @@ export default defineAction({
     await assertAccess("document", database.documentId, "editor");
 
     const db = getDb();
-    const [field] = await db
+    let [field] = await db
       .select()
       .from(schema.contentDatabaseSourceFields)
       .where(eq(schema.contentDatabaseSourceFields.id, args.sourceFieldId));
+    if (!field && args.sourceId && args.sourceFieldKey) {
+      [field] = await db
+        .select()
+        .from(schema.contentDatabaseSourceFields)
+        .where(
+          and(
+            eq(schema.contentDatabaseSourceFields.sourceId, args.sourceId),
+            eq(
+              schema.contentDatabaseSourceFields.sourceFieldKey,
+              args.sourceFieldKey,
+            ),
+          ),
+        );
+    }
     if (!field) throw new Error("Source field not found.");
 
     const [source] = await db

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

@@ -12,6 +12,7 @@ import { sanitizeNormalizationFormula } from "../shared/properties.js";
 import {
   readBuilderCmsContentEntries,
   readBuilderCmsModelFields,
+  type BuilderCmsReadResult,
 } from "./_builder-cms-read-client.js";
 import type { BuilderCmsSourceEntry } from "./_builder-cms-source-adapter.js";
 import {
@@ -42,6 +43,54 @@ import {
 const sourceTypeSchema = z
   .enum(["mock-local", "builder-cms", "local-table"])
   .default("mock-local");
+const BUILDER_CMS_ATTACH_INITIAL_PAGES = 1;
+
+export async function readInitialBuilderCmsAttachEntries(
+  sourceTable: string,
+  readEntries: typeof readBuilderCmsContentEntries = readBuilderCmsContentEntries,
+) {
+  return readEntries({
+    model: sourceTable,
+    maxPages: BUILDER_CMS_ATTACH_INITIAL_PAGES,
+  });
+}
+
+function builderReadHasMore(read: BuilderCmsReadResult | null | undefined) {
+  return read?.state === "live" && read.progress?.hasMore === true;
+}
+
+function builderReadActiveSourceRowIds(
+  read: BuilderCmsReadResult | null | undefined,
+) {
+  if (read?.state !== "live" || read.progress?.hasMore !== true) {
+    return undefined;
+  }
+  return read.entries.map((entry) => entry.id);
+}
+
+function builderReadSyncState(read: BuilderCmsReadResult) {
+  if (read.state === "error") return "error";
+  return builderReadHasMore(read) ? "refreshing" : "linked";
+}
+
+export function builderCmsAttachReadMetadata(read: BuilderCmsReadResult) {
+  const sourceFetchState: "idle" | "fetching" | "error" = builderReadHasMore(
+    read,
+  )
+    ? "fetching"
+    : read.state === "error"
+      ? "error"
+      : "idle";
+  const syncState: "linked" | "refreshing" | "error" =
+    builderReadSyncState(read);
+
+  return {
+    progress: read.progress,
+    sourceFetchState,
+    activeReadSourceRowIds: builderReadActiveSourceRowIds(read),
+    syncState,
+  };
+}
 
 // Per-source key mapping the UI commits after the canonical-key confirm step.
 const normalizationFormulaSchema = z
@@ -187,9 +236,10 @@ export default defineAction({
       }
       let entries: BuilderCmsSourceEntry[];
       let modelFields: BuilderCmsModelFieldSummary[];
+      let builderRead: BuilderCmsReadResult | null = null;
       if (sourceType === "builder-cms") {
-        const read = await readBuilderCmsContentEntries({ model: sourceTable });
-        entries = read.state === "live" ? read.entries : [];
+        builderRead = await readInitialBuilderCmsAttachEntries(sourceTable);
+        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.
@@ -224,6 +274,19 @@ export default defineAction({
         sampleEntry: entries[0],
         now,
       });
+      if (sourceType === "builder-cms" && builderRead) {
+        await updateBuilderCmsSourceReadMetadata({
+          sourceId: secondaryId,
+          sourceTable,
+          readState: builderRead.state,
+          entryCount: builderRead.entries.length,
+          matchedRowCount: entries.length,
+          fetchedAt: builderRead.fetchedAt,
+          now,
+          message: builderRead.message,
+          ...builderCmsAttachReadMetadata(builderRead),
+        });
+      }
       await writeSourceFederation({
         sourceId: secondaryId,
         federation: identityFederation(
@@ -263,9 +326,8 @@ export default defineAction({
       if (await databaseSourceExistsForTable(database.id, sourceTable)) {
         throw new Error(`"${sourceTable}" is already attached as a source.`);
       }
-      const additionalRead = await readBuilderCmsContentEntries({
-        model: sourceTable,
-      });
+      const additionalRead =
+        await readInitialBuilderCmsAttachEntries(sourceTable);
       const additionalEntries =
         additionalRead.state === "live" ? additionalRead.entries : [];
       const additionalModelFields = await readBuilderCmsModelFields({
@@ -284,8 +346,12 @@ export default defineAction({
       const priorDocumentIds = new Set(
         beforeSetup.response.items.map((item) => item.document.id),
       );
+      let importedEntriesByDocumentId = new Map<
+        string,
+        BuilderCmsSourceEntry
+      >();
       if (additionalRead.state === "live") {
-        await importBuilderCmsEntriesAsDatabaseItems({
+        const importResult = await importBuilderCmsEntriesAsDatabaseItems({
           database,
           entries: additionalEntries,
           now,
@@ -293,6 +359,7 @@ export default defineAction({
           existingSourceRows: [],
           skipTitleDedup: true,
         });
+        importedEntriesByDocumentId = importResult.importedEntriesByDocumentId;
       }
       const additionalSetup = await sourceSetupPayload(database.id);
       // Only the items this collection just created — exclude the primary's.
@@ -309,6 +376,9 @@ export default defineAction({
               existingRows: [],
             })
           : undefined;
+      for (const [documentId, entry] of importedEntriesByDocumentId) {
+        additionalEntriesByDocumentId?.set(documentId, entry);
+      }
       await seedMockSourceFields({
         sourceId: additionalSourceId,
         ownerEmail: database.ownerEmail,
@@ -347,7 +417,7 @@ export default defineAction({
         fetchedAt: additionalRead.fetchedAt,
         now,
         message: additionalRead.message,
-        syncState: "linked",
+        ...builderCmsAttachReadMetadata(additionalRead),
       });
       await ensureDatabaseSourceProperty({ database, now });
 
@@ -374,9 +444,7 @@ export default defineAction({
     });
     const builderRead =
       sourceType === "builder-cms"
-        ? await readBuilderCmsContentEntries({
-            model: sourceTable,
-          })
+        ? await readInitialBuilderCmsAttachEntries(sourceTable)
         : null;
     const builderEntries =
       builderRead?.state === "live" ? builderRead.entries : [];
@@ -386,14 +454,16 @@ export default defineAction({
             model: sourceTable,
           })
         : [];
+    let importedEntriesByDocumentId = new Map<string, BuilderCmsSourceEntry>();
     if (builderRead?.state === "live") {
-      await importBuilderCmsEntriesAsDatabaseItems({
+      const importResult = await importBuilderCmsEntriesAsDatabaseItems({
         database,
         entries: builderEntries,
         now,
         sourceTable,
         existingSourceRows,
       });
+      importedEntriesByDocumentId = importResult.importedEntriesByDocumentId;
     }
 
     const refreshedSetup = await sourceSetupPayload(database.id);
@@ -407,6 +477,9 @@ export default defineAction({
             existingRows: existingSourceRows,
           })
         : undefined;
+    for (const [documentId, entry] of importedEntriesByDocumentId) {
+      builderEntriesByDocumentId?.set(documentId, entry);
+    }
 
     await seedMockSourceFields({
       sourceId,
@@ -447,7 +520,7 @@ export default defineAction({
         fetchedAt: builderRead.fetchedAt,
         now,
         message: builderRead.message,
-        syncState: "linked",
+        ...builderCmsAttachReadMetadata(builderRead),
       });
     }
 

package/corpus/templates/content/actions/change-content-database-source-role.ts

@@ -343,8 +343,12 @@ export default defineAction({
         .where(eq(schema.contentDatabaseSourceRows.sourceId, source.id));
       await clearSourceFederation(source.id, now);
 
+      let importedEntriesByDocumentId = new Map<
+        string,
+        BuilderCmsSourceEntry
+      >();
       if (read.state === "live") {
-        await importBuilderCmsEntriesAsDatabaseItems({
+        const importResult = await importBuilderCmsEntriesAsDatabaseItems({
           database,
           entries,
           now,
@@ -352,6 +356,7 @@ export default defineAction({
           existingSourceRows: [],
           skipTitleDedup: true,
         });
+        importedEntriesByDocumentId = importResult.importedEntriesByDocumentId;
       }
       const refreshedSetup = await sourceSetupPayload(database.id);
       const builderEntriesByDocumentId =
@@ -364,6 +369,9 @@ export default defineAction({
               existingRows: [],
             })
           : new Map<string, BuilderCmsSourceEntry>();
+      for (const [documentId, entry] of importedEntriesByDocumentId) {
+        builderEntriesByDocumentId.set(documentId, entry);
+      }
       await seedMockSourceFields({
         sourceId: source.id,
         ownerEmail: database.ownerEmail,

package/corpus/templates/content/actions/delete-content-database.ts

@@ -29,6 +29,7 @@ export default defineAction({
     return {
       success: true,
       databaseId,
+      documentId: database.documentId,
       deletedAt,
     };
   },