@agent-native/core 0.133.2 → 0.133.3

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

@@ -1,10 +1,12 @@
 import { defineAction } from "@agent-native/core";
 import { assertAccess } from "@agent-native/core/sharing";
+import { eq } from "drizzle-orm";
 import { z } from "zod";
 
+import { getDb, schema } from "../server/db/index.js";
 import type {
   BuilderCmsModelFieldSummary,
-  ContentDatabaseResponse,
+  ContentDatabaseSourceAttachmentResult,
   ContentDatabaseSourceFederation,
   ContentDatabaseSourceType,
 } from "../shared/api.js";
@@ -41,11 +43,13 @@ import {
   readLocalTableEntries,
   resolveReadableLocalTableSource,
 } from "./_local-table-source.js";
+import { listPropertiesForDatabase } from "./_property-utils.js";
 
 const sourceTypeSchema = z
   .enum(["mock-local", "builder-cms", "local-table", "notion-database"])
   .default("mock-local");
 const BUILDER_CMS_ATTACH_INITIAL_PAGES = 1;
+const BUILDER_CMS_ATTACH_METADATA_LIMIT = 10_000;
 
 export async function readInitialBuilderCmsAttachEntries(
   sourceTable: string,
@@ -64,24 +68,43 @@ export async function readInitialBuilderCmsAttachSource(
   dependencies: {
     readModelFields?: typeof readBuilderCmsModelFields;
     readEntries?: typeof readBuilderCmsContentEntries;
+    fieldPaths?: readonly string[];
   } = {},
 ) {
   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;
+  const [modelFields, read] = await Promise.all([
+    readModelFields({ model: sourceTable }),
+    readInitialBuilderCmsAttachEntries(
+      sourceTable,
+      readEntries,
+      dependencies.fieldPaths,
+    ),
+  ]);
+  return { read, modelFields };
+}
+
+export async function readCompleteBuilderCmsAttachSource(
+  sourceTable: string,
+  dependencies: {
+    readModelFields?: typeof readBuilderCmsModelFields;
+    readEntries?: typeof readBuilderCmsContentEntries;
+    fieldPaths?: readonly string[];
+  } = {},
+) {
+  const readModelFields =
+    dependencies.readModelFields ?? readBuilderCmsModelFields;
+  const readEntries = dependencies.readEntries ?? readBuilderCmsContentEntries;
+  const [modelFields, read] = await Promise.all([
+    readModelFields({ model: sourceTable }),
+    readEntries({
+      model: sourceTable,
+      fieldPaths: dependencies.fieldPaths,
+      allowCached: true,
+      limit: BUILDER_CMS_ATTACH_METADATA_LIMIT,
+    }),
+  ]);
   return { read, modelFields };
 }
 
@@ -122,6 +145,32 @@ export function builderCmsAttachReadMetadata(read: BuilderCmsReadResult) {
   };
 }
 
+export function initialBuilderAttachmentSetupOptions(args: {
+  builderRead: BuilderCmsReadResult | null;
+  importedEntriesByDocumentId: ReadonlyMap<string, BuilderCmsSourceEntry>;
+}) {
+  if (
+    args.builderRead?.state !== "live" ||
+    args.importedEntriesByDocumentId.size !== args.builderRead.entries.length
+  ) {
+    return undefined;
+  }
+  const documentIds = [...args.importedEntriesByDocumentId.keys()];
+  return {
+    documentIds,
+    limit: Math.max(1, documentIds.length),
+    offset: 0,
+  };
+}
+
+export function builderAttachDurableItemCount(
+  builderEntriesByDocumentId:
+    | ReadonlyMap<string, BuilderCmsSourceEntry>
+    | undefined,
+) {
+  return builderEntriesByDocumentId?.size ?? 0;
+}
+
 // Per-source key mapping the UI commits after the canonical-key confirm step.
 const normalizationFormulaSchema = z
   .string()
@@ -211,6 +260,7 @@ export default defineAction({
       .string()
       .optional()
       .describe("Source table/model name, for example content_items."),
+    builderFieldPaths: z.array(z.string().max(500)).max(200).optional(),
     relationshipMode: z
       .enum(["items", "details"])
       .optional()
@@ -231,7 +281,7 @@ export default defineAction({
     limit: z.coerce.number().int().min(1).max(500).default(100),
     offset: z.coerce.number().int().min(0).default(0),
   }),
-  run: async (args): Promise<ContentDatabaseResponse> => {
+  run: async (args): Promise<ContentDatabaseSourceAttachmentResult> => {
     const database = await resolveDatabaseForSourceMutation(args);
     if (!database) throw new Error("Database not found.");
     await assertAccess("document", database.documentId, "editor");
@@ -445,11 +495,14 @@ export default defineAction({
         sourceTable,
         now,
       });
-      // Snapshot existing items BEFORE importing so we can bind the new source
-      // to ONLY the rows it imports — never the primary's existing rows.
-      const beforeSetup = await sourceSetupPayload(database.id);
+      // Snapshot membership IDs before importing so the new source binds only
+      // its own rows without serializing the existing database.
+      const priorItems = await getDb()
+        .select({ documentId: schema.contentDatabaseItems.documentId })
+        .from(schema.contentDatabaseItems)
+        .where(eq(schema.contentDatabaseItems.databaseId, database.id));
       const priorDocumentIds = new Set(
-        beforeSetup.response.items.map((item) => item.document.id),
+        priorItems.map((item) => item.documentId),
       );
       let importedEntriesByDocumentId = new Map<
         string,
@@ -466,7 +519,12 @@ export default defineAction({
         });
         importedEntriesByDocumentId = importResult.importedEntriesByDocumentId;
       }
-      const additionalSetup = await sourceSetupPayload(database.id);
+      const importedDocumentIds = [...importedEntriesByDocumentId.keys()];
+      const additionalSetup = await sourceSetupPayload(database.id, {
+        documentIds: importedDocumentIds,
+        limit: Math.max(1, importedDocumentIds.length),
+        offset: 0,
+      });
       // Only the items this collection just created — exclude the primary's.
       const importedItems = additionalSetup.response.items.filter(
         (item) => !priorDocumentIds.has(item.document.id),
@@ -550,7 +608,9 @@ export default defineAction({
       : [];
     const builderInitial =
       sourceType === "builder-cms"
-        ? await readInitialBuilderCmsAttachSource(sourceTable)
+        ? await readCompleteBuilderCmsAttachSource(sourceTable, {
+            fieldPaths: args.builderFieldPaths,
+          })
         : null;
     const sourceId = await replaceSourceMetadata({
       database,
@@ -562,9 +622,15 @@ export default defineAction({
     });
     const builderModelFields = builderInitial?.modelFields ?? [];
     const builderRead = builderInitial?.read ?? null;
+    const builderPropertiesPromise = builderRead
+      ? listPropertiesForDatabase(database.id)
+      : null;
     const builderEntries =
       builderRead?.state === "live" ? builderRead.entries : [];
     let importedEntriesByDocumentId = new Map<string, BuilderCmsSourceEntry>();
+    let importedItems: Awaited<
+      ReturnType<typeof importBuilderCmsEntriesAsDatabaseItems>
+    >["importedItems"] = [];
     if (builderRead?.state === "live") {
       const importResult = await importBuilderCmsEntriesAsDatabaseItems({
         database,
@@ -574,14 +640,29 @@ export default defineAction({
         existingSourceRows,
       });
       importedEntriesByDocumentId = importResult.importedEntriesByDocumentId;
+      importedItems = importResult.importedItems;
     }
-
-    const refreshedSetup = await sourceSetupPayload(database.id);
+    const canUseImportedBuilderItems =
+      builderRead?.state === "live" &&
+      importedItems.length === builderRead.entries.length &&
+      importedItems.length === importedEntriesByDocumentId.size;
+    const refreshedSetup = canUseImportedBuilderItems
+      ? null
+      : await sourceSetupPayload(
+          database.id,
+          initialBuilderAttachmentSetupOptions({
+            builderRead,
+            importedEntriesByDocumentId,
+          }),
+        );
+    const refreshedProperties =
+      refreshedSetup?.properties ?? (await builderPropertiesPromise) ?? [];
+    const refreshedItems = refreshedSetup?.response.items ?? importedItems;
     const builderEntriesByDocumentId =
       builderRead?.state === "live"
         ? mapBuilderCmsEntriesToLocalItems({
             entries: builderEntries,
-            items: refreshedSetup.response.items,
+            items: refreshedItems,
             sourceTable,
             now,
             existingRows: existingSourceRows,
@@ -591,48 +672,65 @@ export default defineAction({
       builderEntriesByDocumentId?.set(documentId, entry);
     }
 
-    await seedMockSourceFields({
-      sourceId,
-      ownerEmail: database.ownerEmail,
-      sourceType,
-      properties: refreshedSetup.properties,
-      builderModelFields,
-      builderSampleEntries: builderEntries,
-      now,
-    });
-    await seedMockSourceRows({
-      sourceId,
-      ownerEmail: database.ownerEmail,
-      sourceType,
-      sourceTable,
-      items: refreshedSetup.response.items,
-      now,
-      builderEntriesByDocumentId,
-    });
-    if (sourceType === "builder-cms" && builderRead?.state === "live") {
-      await enqueueBuilderBodyHydrationForItems({
+    await (async () => {
+      await seedMockSourceFields({
         sourceId,
         ownerEmail: database.ownerEmail,
-        orgId: database.orgId,
-        sourceTable,
-        items: refreshedSetup.response.items,
-        builderEntriesByDocumentId,
+        sourceType,
+        properties: refreshedProperties,
+        builderModelFields,
+        builderSampleEntries: builderEntries,
         now,
       });
-    }
-    if (sourceType === "builder-cms" && builderRead) {
-      await updateBuilderCmsSourceReadMetadata({
+      await seedMockSourceRows({
         sourceId,
+        ownerEmail: database.ownerEmail,
+        sourceType,
         sourceTable,
-        readState: builderRead.state,
-        entryCount: builderRead.entries.length,
-        matchedRowCount: builderEntriesByDocumentId?.size ?? 0,
-        fetchedAt: builderRead.fetchedAt,
+        items: refreshedItems,
         now,
-        message: builderRead.message,
-        builderModelFields,
-        ...builderCmsAttachReadMetadata(builderRead),
+        builderEntriesByDocumentId,
       });
+      if (sourceType === "builder-cms" && builderRead?.state === "live") {
+        await enqueueBuilderBodyHydrationForItems({
+          sourceId,
+          ownerEmail: database.ownerEmail,
+          orgId: database.orgId,
+          sourceTable,
+          items: refreshedItems,
+          builderEntriesByDocumentId,
+          now,
+          processInBackground: false,
+        });
+      }
+      if (sourceType === "builder-cms" && builderRead) {
+        await updateBuilderCmsSourceReadMetadata({
+          sourceId,
+          sourceTable,
+          readState: builderRead.state,
+          entryCount: builderRead.entries.length,
+          matchedRowCount: builderEntriesByDocumentId?.size ?? 0,
+          fetchedAt: builderRead.fetchedAt,
+          now,
+          message: builderRead.message,
+          builderModelFields,
+          ...builderCmsAttachReadMetadata(builderRead),
+        });
+      }
+    })();
+    if (sourceType === "builder-cms") {
+      return {
+        responseProjection: "ack",
+        databaseId: database.id,
+        documentId: database.documentId,
+        sourceId,
+        sourceType,
+        sourceTable,
+        importedItemCount: builderAttachDurableItemCount(
+          builderEntriesByDocumentId,
+        ),
+        fetchedAt: builderRead?.fetchedAt ?? now,
+      };
     }
 
     return getContentDatabaseResponse(database.id, {

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

@@ -105,7 +105,7 @@ export default defineAction({
         .update(schema.contentDatabaseSources)
         .set({ updatedAt: now })
         .where(eq(schema.contentDatabaseSources.id, source.id));
-      return getContentDatabaseResponse(database.id);
+      return getContentDatabaseResponse(database.id, { limit: 100, offset: 0 });
     }
 
     // ── Bind to an existing column ─────────────────────────────────────────
@@ -261,6 +261,6 @@ export default defineAction({
       }
     }
 
-    return getContentDatabaseResponse(database.id);
+    return getContentDatabaseResponse(database.id, { limit: 100, offset: 0 });
   },
 });

package/corpus/templates/content/actions/cancel-prepared-builder-source-update.ts

@@ -295,7 +295,10 @@ export default defineAction({
     });
 
     return {
-      ...(await getContentDatabaseResponse(database.id)),
+      ...(await getContentDatabaseResponse(database.id, {
+        limit: 100,
+        offset: 0,
+      })),
       cancellation: {
         sourceId: args.sourceId,
         changeSetId: args.changeSetId,

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

@@ -38,7 +38,10 @@ export default defineAction({
       });
       await writeAppState("refresh-signal", { ts: Date.now() });
       return {
-        ...(await getContentDatabaseResponse(database.id)),
+        ...(await getContentDatabaseResponse(database.id, {
+          limit: 100,
+          offset: 0,
+        })),
         deletedItemIds: removedItemIds,
         deletedDocumentIds: [],
         deletedCount: 0,
@@ -74,7 +77,10 @@ export default defineAction({
     await writeAppState("refresh-signal", { ts: Date.now() });
 
     return {
-      ...(await getContentDatabaseResponse(database.id)),
+      ...(await getContentDatabaseResponse(database.id, {
+        limit: 100,
+        offset: 0,
+      })),
       deletedItemIds,
       deletedDocumentIds,
       deletedCount: deletedItemIds.length,

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

@@ -71,7 +71,7 @@ export default defineAction({
           ),
         );
       if (target) await deleteSourceRecords(target.id);
-      return getContentDatabaseResponse(database.id);
+      return getContentDatabaseResponse(database.id, { limit: 100, offset: 0 });
     }
 
     const source = await getExistingSource(database.id);
@@ -79,6 +79,6 @@ export default defineAction({
       await deleteSourceRecords(source.id);
     }
 
-    return getContentDatabaseResponse(database.id);
+    return getContentDatabaseResponse(database.id, { limit: 100, offset: 0 });
   },
 });

package/corpus/templates/content/actions/duplicate-database-item.ts

@@ -176,8 +176,22 @@ export default defineAction({
 
     await writeAppState("refresh-signal", { ts: Date.now() });
 
+    const response = await getContentDatabaseResponse(row.item.databaseId, {
+      limit: 100,
+      offset: 0,
+    });
+    const duplicatedItem =
+      response.items.find((item) => item.id === nextItemId) ??
+      (
+        await getContentDatabaseResponse(row.item.databaseId, {
+          limit: 1,
+          offset: 0,
+          documentIds: [nextDocumentId],
+        })
+      ).items.find((item) => item.id === nextItemId);
     return {
-      ...(await getContentDatabaseResponse(row.item.databaseId)),
+      ...response,
+      duplicatedItems: duplicatedItem ? [duplicatedItem] : [],
       duplicatedItemId: nextItemId,
       duplicatedDocumentId: nextDocumentId,
     };

package/corpus/templates/content/actions/duplicate-database-items.ts

@@ -186,8 +186,26 @@ export default defineAction({
 
     await writeAppState("refresh-signal", { ts: Date.now() });
 
+    const response = await getContentDatabaseResponse(database.id, {
+      limit: 100,
+      offset: 0,
+    });
+    const duplicatedPage = await getContentDatabaseResponse(database.id, {
+      limit: duplicates.length,
+      offset: 0,
+      documentIds: duplicates.map(
+        (duplicate) => duplicate.duplicatedDocumentId,
+      ),
+    });
+    const duplicatedItemIds = new Set(
+      duplicates.map((duplicate) => duplicate.duplicatedItemId),
+    );
+    const duplicatedItems = duplicatedPage.items.filter((item) =>
+      duplicatedItemIds.has(item.id),
+    );
     return {
-      ...(await getContentDatabaseResponse(database.id)),
+      ...response,
+      duplicatedItems,
       duplicatedItemId: duplicates[0]?.duplicatedItemId,
       duplicatedDocumentId: duplicates[0]?.duplicatedDocumentId,
       duplicatedItemIds: duplicates.map(

package/corpus/templates/content/actions/execute-builder-source-execution.ts

@@ -854,7 +854,8 @@ export function realExecutionDeps(
     executeWrite: (args) => executeBuilderCmsWrite(args),
     readLiveEntry: (args) => readBuilderCmsEntryLiveState(args),
     reconcileWrite: reconcileBuilderCmsWrite,
-    getResponse: (databaseId) => getContentDatabaseResponse(databaseId),
+    getResponse: (databaseId) =>
+      getContentDatabaseResponse(databaseId, { limit: 100, offset: 0 }),
     lookupSafeModelIntent: lookupBuilderCmsSafeModelIntent,
   };
 }

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

@@ -1,18 +1,15 @@
 import { defineAction } from "@agent-native/core";
-import { resolveAccess } from "@agent-native/core/sharing";
-import { eq } from "drizzle-orm";
 import { z } from "zod";
 
-import { getDb, schema } from "../server/db/index.js";
 import type {
   ContentDatabaseResponse,
   ContentDatabaseUnavailableResponse,
 } from "../shared/api.js";
-import { resolveContentSpaceAccess } from "./_content-space-access.js";
 import {
   CONTENT_DATABASE_MAX_READ_LIMIT,
+  contentDatabaseTableQuerySchema,
   getContentDatabaseResponse,
-  getDocumentContextPath,
+  resolveContentDatabaseRead,
 } from "./_database-utils.js";
 
 export default defineAction({
@@ -28,6 +25,7 @@ export default defineAction({
       .max(CONTENT_DATABASE_MAX_READ_LIMIT)
       .optional(),
     offset: z.coerce.number().int().min(0).optional(),
+    tableQuery: contentDatabaseTableQuerySchema,
   }),
   http: { method: "GET" },
   readOnly: true,
@@ -36,69 +34,19 @@ export default defineAction({
     documentId,
     limit,
     offset,
+    tableQuery,
   }): Promise<ContentDatabaseResponse | ContentDatabaseUnavailableResponse> => {
-    const db = getDb();
-    let resolvedDatabaseId = databaseId;
-
-    if (!resolvedDatabaseId && documentId) {
-      const [database] = await db
-        .select()
-        .from(schema.contentDatabases)
-        .where(eq(schema.contentDatabases.documentId, documentId));
-      resolvedDatabaseId = database?.id;
-    }
-
-    if (!resolvedDatabaseId) {
-      throw new Error("Either databaseId or documentId is required.");
-    }
-
-    const [database] = await db
-      .select()
-      .from(schema.contentDatabases)
-      .where(eq(schema.contentDatabases.id, resolvedDatabaseId));
-    if (!database) {
-      return {
-        available: false,
-        reason: "not_found",
-        databaseId: resolvedDatabaseId,
-        documentId: documentId ?? null,
-        message: `Database "${resolvedDatabaseId}" not found`,
-      };
-    }
-
-    let canRead = Boolean(await resolveAccess("document", database.documentId));
-    if (!canRead && database.systemRole === "files" && database.spaceId) {
-      try {
-        await resolveContentSpaceAccess(database.spaceId);
-        canRead = true;
-      } catch {
-        canRead = false;
-      }
-    }
-    if (!canRead) throw new Error(`Database "${resolvedDatabaseId}" not found`);
-
-    if (database.deletedAt) {
-      return {
-        available: false,
-        reason: "deleted",
-        databaseId: database.id,
-        documentId: database.documentId,
-        deletedAt: database.deletedAt,
-        message: `Database "${database.id}" has been deleted`,
-      };
-    }
+    const resolved = await resolveContentDatabaseRead({
+      databaseId,
+      documentId,
+    });
+    if (!resolved.available) return resolved;
 
-    const response = await getContentDatabaseResponse(resolvedDatabaseId, {
+    return getContentDatabaseResponse(resolved.database.id, {
       limit,
       offset,
+      tableQuery,
+      database: resolved.database,
     });
-    const [document] = await db
-      .select()
-      .from(schema.documents)
-      .where(eq(schema.documents.id, database.documentId));
-    return {
-      ...response,
-      contextPath: document ? await getDocumentContextPath(document) : [],
-    };
   },
 });

package/corpus/templates/content/actions/move-database-item.ts

@@ -135,6 +135,9 @@ export default defineAction({
 
     await writeAppState("refresh-signal", { ts: Date.now() });
 
-    return getContentDatabaseResponse(row.item.databaseId);
+    return getContentDatabaseResponse(row.item.databaseId, {
+      limit: 100,
+      offset: 0,
+    });
   },
 });

package/corpus/templates/content/actions/prepare-builder-source-execution.ts

@@ -155,7 +155,7 @@ export default defineAction({
       timing.record("gate_preparation_and_dry_run_validation", gateStartedAt);
 
       const response = await timing.measure("response_load", () =>
-        getContentDatabaseResponse(database.id),
+        getContentDatabaseResponse(database.id, { limit: 100, offset: 0 }),
       );
       const result = { ...response, timings: timing.finish() };
       timing.log("succeeded");

package/corpus/templates/content/actions/prepare-builder-source-review.ts

@@ -34,7 +34,6 @@ import {
   serializeSourceRowRecord,
   sourceChangeSetKey,
 } from "./_database-source-utils.js";
-import { getContentDatabaseResponse } from "./_database-utils.js";
 
 export const BUILDER_SOURCE_REVIEW_PREPARE_LIMIT = 100;
 
@@ -763,18 +762,16 @@ export default defineAction({
         approvalStartedAt,
       );
 
-      const { reviewedSnapshot, response } = await timing.measure(
-        "reconciliation_and_response_load",
-        async () => ({
-          reviewedSnapshot: await getContentDatabaseSourceSnapshotForWrite(
+      const reviewedSnapshot = await timing.measure(
+        "reconciliation_snapshot_load",
+        () =>
+          getContentDatabaseSourceSnapshotForWrite(
             database,
             args.sourceId,
             reviewableChanges.every((changeSet) => changeSet.documentId)
               ? reviewableChanges.map((changeSet) => changeSet.documentId!)
               : args.documentIds,
           ),
-          response: await getContentDatabaseResponse(database.id),
-        }),
       );
       if (!reviewedSnapshot) throw new Error("Builder source disappeared.");
       // Build the review payload from the TARGET source snapshot, not
@@ -797,7 +794,6 @@ export default defineAction({
       review.preparedRowLimit = reviewableChanges.length;
 
       const result = {
-        ...response,
         review,
         preparedChangeSetMappings,
         timings: timing.finish(),