@agent-native/core 0.92.12 → 0.93.0

package/corpus/templates/content/AGENTS.md

@@ -91,59 +91,60 @@ cd templates/content && pnpm action <name> [args]
 
 ### Document Operations
 
-| Action                                      | Args                                                                                                                                                           | Purpose                                                                                                                                                  |
-| ------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `list-documents`                            | `[--format json]`                                                                                                                                              | List document metadata/tree; no full bodies                                                                                                              |
-| `export-content-source`                     | `[--format json]`                                                                                                                                              | Export editable docs as `content/*.mdx` source files                                                                                                     |
-| `import-content-source`                     | `--files <json> [--dryRun true\|false]`                                                                                                                        | Import `.md`/`.mdx` source files into editable docs                                                                                                      |
-| `list-builder-docs`                         | `[--model docs-content\|blog-article] [--limit <n>]`                                                                                                           | List Builder docs/blog entries available for `.builder.mdx` pull                                                                                         |
-| `pull-builder-doc`                          | `--model <model> --entryId <builder-entry-id> [--dryRun true\|false]`                                                                                          | Pull one Builder entry into Content and return `.builder.mdx` plus `content/builder/.raw` sidecar files                                                  |
-| `check-builder-doc`                         | `--files <json> [--path <file.builder.mdx>]` or `--documentId <id>`                                                                                            | Validate Builder MDX round-trip, sidecar hashes, and remote conflict status before push                                                                  |
-| `push-builder-doc`                          | `--files <json> [--path <file.builder.mdx>] [--dryRun true\|false]`                                                                                            | Guarded Builder autosave PATCH for the safe Builder test model; never publishes                                                                          |
-| `navigate`                                  | `--path <path>` or `--documentId <id>` or `--databaseId <id>`                                                                                                  | Open a route, document page, or database page in the UI                                                                                                  |
-| `search-documents`                          | `--query <text> [--format json]`                                                                                                                               | Search by title/content and return snippets                                                                                                              |
-| `get-document`                              | `--id <id> [--format json]`                                                                                                                                    | Get a single document with content                                                                                                                       |
-| `pull-document`                             | `--id <id> [--format markdown\|text]`                                                                                                                          | Collab-aware "ingest the final" read                                                                                                                     |
-| `create-document`                           | `--title <text> [--content] [--parentId] [--icon]`                                                                                                             | Create a new document                                                                                                                                    |
-| `edit-document`                             | `--id <id> --find <text> --replace <text>`                                                                                                                     | Surgical text edit (preferred for modifications)                                                                                                         |
-| `edit-document`                             | `--id <id> --edits <json>`                                                                                                                                     | Batch surgical text edits                                                                                                                                |
-| `update-document`                           | `--id <id> [--title] [--content] [--icon]`                                                                                                                     | Full rewrite of document fields                                                                                                                          |
-| `share-local-file-document`                 | `--id <local-file-document-id>`                                                                                                                                | Create or refresh a DB-backed shareable copy of a local file document                                                                                    |
-| `remove-local-file-source`                  | `[--sourceRootPath <path>]`                                                                                                                                    | Unlink local-file sources from Content without deleting local Markdown/MDX files                                                                         |
-| `list-local-component-files`                |                                                                                                                                                                | List registered local MDX component source files                                                                                                         |
-| `write-local-component-file`                | `--workspaceId <id> --path <relative-component-path> --content <source>`                                                                                       | Create or update a file in a registered local `components/` folder                                                                                       |
-| `create-content-database`                   | `[--documentId <id>] [--parentId <id>] [--title <text>]`                                                                                                       | Create a database page or convert an existing page into a database                                                                                       |
-| `create-inline-content-database`            | `--hostDocumentId <id> [--title <text>]`                                                                                                                       | Create a database owned by an inline database block in the host document                                                                                 |
-| `get-content-database`                      | `--databaseId <id>` or `--documentId <id>`                                                                                                                     | Get a database table with property schema and item pages                                                                                                 |
-| `list-trashed-content-databases`            |                                                                                                                                                                | List soft-deleted databases visible in the sidebar Trash surface                                                                                         |
-| `restore-content-database`                  | `--databaseId <id>`                                                                                                                                            | Restore a soft-deleted database from the sidebar Trash surface                                                                                           |
-| `get-content-database-source`               | `--databaseId <id>` or `--documentId <id>`                                                                                                                     | Inspect local/no-source or source-backed status, mappings, row identity, freshness, and change sets                                                      |
-| `attach-content-database-source`            | `--databaseId <id>` or `--documentId <id> [--sourceType mock\|builder-cms] [--sourceName] [--sourceTable] [--relationshipMode items\|details] [--join <json>]` | Attach a source binding; use `items` to add more rows and `details` to match a source onto existing rows                                                 |
-| `change-content-database-source-role`       | `--databaseId <id>` or `--documentId <id> --sourceId <id> --relationshipMode items\|details [--join <json>]`                                                   | Change an attached source between adding rows and adding matched detail columns without removing the source                                              |
-| `refresh-content-database-source`           | `--databaseId <id>` or `--documentId <id>`                                                                                                                     | Refresh the read-only source status envelope; large Builder CMS sources may return a partial fetch, and another refresh continues loading remaining rows |
-| `process-builder-body-hydration`            | `--sourceId <id> [--documentId <id>] [--limit <n>]`                                                                                                            | Hydrate queued Builder article bodies into readable Content markdown with preserved source-component markers                                             |
-| `set-content-database-source-write-mode`    | `--databaseId <id>` or `--documentId <id> --liveWritesEnabled true\|false [--allowedWriteModes <json>]`                                                        | Enable/disable per-source Builder live writes; enabling is allowed only for `agent-native-blog-article-test` with explicit modes                         |
-| `stage-builder-revision`                    | `--databaseId <id>` or `--documentId <id>`                                                                                                                     | Stage pending local Builder CMS changes as a local-only save-revision record; never calls Builder                                                        |
-| `review-content-database-source-change-set` | `--databaseId <id>` or `--documentId <id> --changeSetId <id> --decision approve\|reject [--note]`                                                              | Approve or reject a local source change-set review record without provider writes                                                                        |
-| `stage-builder-source-bulk-update`          | `--databaseId <id>` or `--documentId <id> --itemIds <json-array>` or `--documentIds <json-array> --field <json> [--sourceId <id>] [--dryRun true\|false]`      | Preview or stage one bounded field update across selected source-backed Builder rows; apply still goes through Builder review/execution                  |
-| `prepare-builder-source-execution`          | `--databaseId <id>` or `--documentId <id> --changeSetId <id> [--pushModeConfirmation autosave\|draft\|publish]`                                                | Prepare a dry-run Builder execution gate for approved field/body changes with request semantics/idempotency key; never calls Builder                     |
-| `validate-builder-source-execution`         | `--databaseId <id>` or `--documentId <id> --changeSetId <id> [--idempotencyKey <key>]`                                                                         | Validate/replay a prepared Builder execution gate locally as a dry run; never calls Builder                                                              |
-| `execute-builder-source-execution`          | `--databaseId <id>` or `--documentId <id> --changeSetId <id> [--idempotencyKey <key>] [--pushModeConfirmation autosave\|draft\|publish]`                       | Execute a guarded live Builder write only when approved, validated, enabled, idempotent, and targeting `agent-native-blog-article-test`                  |
-| `add-database-item`                         | `--databaseId <id> [--title <text>] [--propertyValues <json>]`                                                                                                 | Add a page row to a database, optionally seeding property values                                                                                         |
-| `duplicate-database-item`                   | `--itemId <id>` or `--documentId <id> [--title <text>]`                                                                                                        | Duplicate exactly one database row page and its stored property values; for two or more rows, use `duplicate-database-items` once                        |
-| `duplicate-database-items`                  | `--databaseId <id>` or `--documentId <databaseDocumentId> --itemIds <json-array>` or `--documentIds <json-array>`                                              | Preferred multi-row duplicate action; duplicate multiple database row pages atomically and return ordered duplicate item/document IDs                    |
-| `delete-database-items`                     | `--databaseId <id>` or `--documentId <databaseDocumentId> --itemIds <json-array>` or `--documentIds <json-array>`                                              | Preferred multi-row delete action; delete multiple database row pages atomically while preserving `delete-document` admin semantics                      |
-| `move-database-item`                        | `--itemId <id>` or `--documentId <id> --position <number>`                                                                                                     | Move a database row page to a new zero-based table position                                                                                              |
-| `update-content-database-view`              | `--databaseId <id> --viewConfig <json>`                                                                                                                        | Persist database views, sorts, filters, hidden properties, and view settings                                                                             |
-| `list-document-properties`                  | `--documentId <id> [--format json]`                                                                                                                            | List Notion-style property definitions and values for a document                                                                                         |
-| `configure-document-property`               | `--documentId <id> [--id <propertyId>] --name <name> --type <type> [--visibility always_show\|hide_when_empty\|always_hide]`                                   | Create or update a property definition                                                                                                                   |
-| `duplicate-document-property`               | `--documentId <id> --propertyId <propertyId>`                                                                                                                  | Duplicate a property definition and its stored values                                                                                                    |
-| `delete-document-property`                  | `--documentId <id> --propertyId <propertyId>`                                                                                                                  | Delete a property definition and its stored values                                                                                                       |
-| `set-document-property`                     | `--documentId <id> --propertyId <propertyId> --value <json>`                                                                                                   | Set a document property value (for a `blocks` field, the value is its markdown content)                                                                  |
-| `reorder-document-property`                 | `--documentId <id> --propertyId <propertyId> --targetPropertyId <id> [--position before\|after]`                                                               | Reorder a property definition within its database (used to reorder Blocks fields on the page)                                                            |
-| `set-document-discoverability`              | `--id <id> --hideFromSearch true\|false [--includeChildren true\|false]`                                                                                       | Hide/show an org-accessible document in Organization/search while keeping link access                                                                    |
-| `move-document`                             | `--id <id> [--parentId] [--position]`                                                                                                                          | Move or reorder a document in the page tree                                                                                                              |
-| `delete-document`                           | `--id <id>`                                                                                                                                                    | Delete with recursive children                                                                                                                           |
+| Action                                      | Args                                                                                                                                                           | Purpose                                                                                                                                                                           |
+| ------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `list-documents`                            | `[--format json]`                                                                                                                                              | List document metadata/tree; no full bodies                                                                                                                                       |
+| `export-content-source`                     | `[--format json]`                                                                                                                                              | Export editable docs as `content/*.mdx` source files                                                                                                                              |
+| `import-content-source`                     | `--files <json> [--dryRun true\|false]`                                                                                                                        | Import `.md`/`.mdx` source files into editable docs                                                                                                                               |
+| `list-builder-docs`                         | `[--model docs-content\|blog-article] [--limit <n>]`                                                                                                           | List Builder docs/blog entries available for `.builder.mdx` pull                                                                                                                  |
+| `pull-builder-doc`                          | `--model <model> --entryId <builder-entry-id> [--dryRun true\|false]`                                                                                          | Pull one Builder entry into Content and return `.builder.mdx` plus `content/builder/.raw` sidecar files                                                                           |
+| `check-builder-doc`                         | `--files <json> [--path <file.builder.mdx>]` or `--documentId <id>`                                                                                            | Validate Builder MDX round-trip, sidecar hashes, and remote conflict status before push                                                                                           |
+| `push-builder-doc`                          | `--files <json> [--path <file.builder.mdx>] [--dryRun true\|false]`                                                                                            | Guarded Builder autosave PATCH for the safe Builder test model; never publishes                                                                                                   |
+| `navigate`                                  | `--path <path>` or `--documentId <id>` or `--databaseId <id>`                                                                                                  | Open a route, document page, or database page in the UI                                                                                                                           |
+| `search-documents`                          | `--query <text> [--format json]`                                                                                                                               | Search by title/content and return snippets                                                                                                                                       |
+| `get-document`                              | `--id <id> [--format json]`                                                                                                                                    | Get a single document with content                                                                                                                                                |
+| `pull-document`                             | `--id <id> [--format markdown\|text]`                                                                                                                          | Collab-aware "ingest the final" read                                                                                                                                              |
+| `create-document`                           | `--title <text> [--content] [--parentId] [--icon]`                                                                                                             | Create a new document                                                                                                                                                             |
+| `edit-document`                             | `--id <id> --find <text> --replace <text>`                                                                                                                     | Surgical text edit (preferred for modifications)                                                                                                                                  |
+| `edit-document`                             | `--id <id> --edits <json>`                                                                                                                                     | Batch surgical text edits                                                                                                                                                         |
+| `update-document`                           | `--id <id> [--title] [--content] [--icon]`                                                                                                                     | Full rewrite of document fields                                                                                                                                                   |
+| `share-local-file-document`                 | `--id <local-file-document-id>`                                                                                                                                | Create or refresh a DB-backed shareable copy of a local file document                                                                                                             |
+| `remove-local-file-source`                  | `[--sourceRootPath <path>]`                                                                                                                                    | Unlink local-file sources from Content without deleting local Markdown/MDX files                                                                                                  |
+| `list-local-component-files`                |                                                                                                                                                                | List registered local MDX component source files                                                                                                                                  |
+| `write-local-component-file`                | `--workspaceId <id> --path <relative-component-path> --content <source>`                                                                                       | Create or update a file in a registered local `components/` folder                                                                                                                |
+| `create-content-database`                   | `[--documentId <id>] [--parentId <id>] [--title <text>]`                                                                                                       | Create a database page or convert an existing page into a database                                                                                                                |
+| `create-inline-content-database`            | `--hostDocumentId <id> [--title <text>]`                                                                                                                       | Create a database owned by an inline database block in the host document                                                                                                          |
+| `get-content-database`                      | `--databaseId <id>` or `--documentId <id>`                                                                                                                     | Get a database table with property schema and item pages                                                                                                                          |
+| `list-trashed-content-databases`            |                                                                                                                                                                | List soft-deleted databases visible in the sidebar Trash surface                                                                                                                  |
+| `restore-content-database`                  | `--databaseId <id>`                                                                                                                                            | Restore a soft-deleted database from the sidebar Trash surface                                                                                                                    |
+| `get-content-database-source`               | `--databaseId <id>` or `--documentId <id>`                                                                                                                     | Inspect local/no-source or source-backed status, mappings, row identity, freshness, and change sets                                                                               |
+| `attach-content-database-source`            | `--databaseId <id>` or `--documentId <id> [--sourceType mock\|builder-cms] [--sourceName] [--sourceTable] [--relationshipMode items\|details] [--join <json>]` | Attach a source binding; use `items` to add more rows and `details` to match a source onto existing rows                                                                          |
+| `change-content-database-source-role`       | `--databaseId <id>` or `--documentId <id> --sourceId <id> --relationshipMode items\|details [--join <json>]`                                                   | Change an attached source between adding rows and adding matched detail columns without removing the source                                                                       |
+| `refresh-content-database-source`           | `--databaseId <id>` or `--documentId <id>`                                                                                                                     | Refresh the read-only source status envelope; large Builder CMS sources may return a partial fetch, and another refresh continues loading remaining rows                          |
+| `process-builder-body-hydration`            | `--sourceId <id> [--documentId <id>] [--limit <n>]`                                                                                                            | Hydrate queued Builder article bodies into readable Content markdown with preserved source-component markers                                                                      |
+| `set-content-database-source-write-mode`    | `--databaseId <id>` or `--documentId <id> --liveWritesEnabled true\|false [--allowedWriteModes <json>]`                                                        | Enable/disable per-source Builder live writes; enabling is allowed only for `agent-native-blog-article-test` with explicit modes                                                  |
+| `stage-builder-revision`                    | `--databaseId <id>` or `--documentId <id>`                                                                                                                     | Stage pending local Builder CMS changes as a local-only save-revision record; never calls Builder                                                                                 |
+| `review-content-database-source-change-set` | `--databaseId <id>` or `--documentId <id> --changeSetId <id> --decision approve\|reject [--note]`                                                              | Approve or reject a local source change-set review record without provider writes                                                                                                 |
+| `stage-builder-source-bulk-update`          | `--databaseId <id>` or `--documentId <id> --itemIds <json-array>` or `--documentIds <json-array> --field <json> [--sourceId <id>] [--dryRun true\|false]`      | Preview or stage one bounded field update across selected source-backed Builder rows; apply still goes through Builder review/execution                                           |
+| `prepare-builder-source-execution`          | `--databaseId <id>` or `--documentId <id> --changeSetId <id> [--pushModeConfirmation autosave\|draft\|publish]`                                                | Prepare a dry-run Builder execution gate for approved field/body changes with request semantics/idempotency key; never calls Builder                                              |
+| `validate-builder-source-execution`         | `--databaseId <id>` or `--documentId <id> --changeSetId <id> [--idempotencyKey <key>]`                                                                         | Validate/replay a prepared Builder execution gate locally as a dry run; never calls Builder                                                                                       |
+| `execute-builder-source-execution`          | `--databaseId <id>` or `--documentId <id> --changeSetId <id> [--idempotencyKey <key>] [--pushModeConfirmation autosave\|draft\|publish]`                       | Execute a guarded live Builder write only when approved, validated, enabled, idempotent, and targeting `agent-native-blog-article-test`                                           |
+| `add-database-item`                         | `--databaseId <id> [--title <text>] [--propertyValues <json>]`                                                                                                 | Add a page row to a database, optionally seeding property values                                                                                                                  |
+| `submit-content-database-form`              | `--databaseId <id> [--viewId <form-view-id>] [--title <text>] [--propertyValues <json>]`                                                                       | Submit one form response atomically; validates required questions, resolves option labels/IDs, writes Blocks correctly, verifies persistence, and returns the exact row page link |
+| `duplicate-database-item`                   | `--itemId <id>` or `--documentId <id> [--title <text>]`                                                                                                        | Duplicate exactly one database row page and its stored property values; for two or more rows, use `duplicate-database-items` once                                                 |
+| `duplicate-database-items`                  | `--databaseId <id>` or `--documentId <databaseDocumentId> --itemIds <json-array>` or `--documentIds <json-array>`                                              | Preferred multi-row duplicate action; duplicate multiple database row pages atomically and return ordered duplicate item/document IDs                                             |
+| `delete-database-items`                     | `--databaseId <id>` or `--documentId <databaseDocumentId> --itemIds <json-array>` or `--documentIds <json-array>`                                              | Preferred multi-row delete action; delete multiple database row pages atomically while preserving `delete-document` admin semantics                                               |
+| `move-database-item`                        | `--itemId <id>` or `--documentId <id> --position <number>`                                                                                                     | Move a database row page to a new zero-based table position                                                                                                                       |
+| `update-content-database-view`              | `--databaseId <id> --viewConfig <json>`                                                                                                                        | Persist database views, sorts, filters, hidden properties, and view settings                                                                                                      |
+| `list-document-properties`                  | `--documentId <id> [--format json]`                                                                                                                            | List Notion-style property definitions and values for a document                                                                                                                  |
+| `configure-document-property`               | `--documentId <id> [--id <propertyId>] --name <name> --type <type> [--visibility always_show\|hide_when_empty\|always_hide]`                                   | Create or update a property definition                                                                                                                                            |
+| `duplicate-document-property`               | `--documentId <id> --propertyId <propertyId>`                                                                                                                  | Duplicate a property definition and its stored values                                                                                                                             |
+| `delete-document-property`                  | `--documentId <id> --propertyId <propertyId>`                                                                                                                  | Delete a property definition and its stored values                                                                                                                                |
+| `set-document-property`                     | `--documentId <id> --propertyId <propertyId> --value <json>`                                                                                                   | Set a document property value (for a `blocks` field, the value is its markdown content)                                                                                           |
+| `reorder-document-property`                 | `--documentId <id> --propertyId <propertyId> --targetPropertyId <id> [--position before\|after]`                                                               | Reorder a property definition within its database (used to reorder Blocks fields on the page)                                                                                     |
+| `set-document-discoverability`              | `--id <id> --hideFromSearch true\|false [--includeChildren true\|false]`                                                                                       | Hide/show an org-accessible document in Organization/search while keeping link access                                                                                             |
+| `move-document`                             | `--id <id> [--parentId] [--position]`                                                                                                                          | Move or reorder a document in the page tree                                                                                                                                       |
+| `delete-document`                           | `--id <id>`                                                                                                                                                    | Delete with recursive children                                                                                                                                                    |
 
 Database views follow Notion-style tab labels. When creating or duplicating
 views in `viewConfig`, use unique default names (`Table 2`, `SEO copy 2`, etc.)
@@ -497,7 +498,7 @@ body. A Blocks field can only be deleted from the database view's column menu
 (not from the page body); deleting the last Blocks field warns that it removes
 the body for every object of the type. Formula properties store their expression in property options and support
 `{Property name}` substitution plus simple numeric math such as `{MSV} * 2`.
-Database views support multiple named table, list, gallery, board, calendar, and timeline views saved in
+Database views support multiple named table, list, gallery, board, calendar, timeline, and form views saved in
 `content_databases.view_config_json`. Each view has its own stacked sorts,
 type-aware filters with an all/any match mode, per-view hidden property IDs,
 column widths, and (for table, list, gallery, and board views) grouping property
@@ -569,8 +570,17 @@ If a calendar or timeline view has not saved a date property yet, the UI and
 Timeline views render the same date-backed row pages in a horizontally
 scrollable six-week range, using a per-view start date property and optional
 end date property so cards can span multiple days.
+Form views render database properties as ordered questions. Each form view owns
+its enabled-question order and required flags, so two forms on the same database
+can collect different information. Use `submit-content-database-form` for agent,
+Slack, MCP, and UI submissions instead of composing `add-database-item` plus
+several property writes. The action accepts property definition IDs or exact
+property names, accepts select/status option IDs or labels, rejects unknown
+options, writes primary and additional Blocks fields to their correct stores in
+one transaction, verifies the saved row, and returns `createdItemId`,
+`createdDocumentId`, `urlPath`, and `deepLink`.
 The active view menu can rename, duplicate, delete, or switch an existing
-view's layout between table, list, gallery, calendar, timeline, and board while
+view's layout between table, list, gallery, calendar, timeline, board, and form while
 preserving its sorts, filters, hidden properties, and layout-specific settings.
 Board views group
 pages by status, select, multi-select, or checkbox

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

@@ -56,7 +56,7 @@ type BuilderMcpToolResult = {
 };
 
 const BUILDER_CMS_DEFAULT_READ_LIMIT = 500;
-const BUILDER_CMS_MAX_READ_LIMIT = 1000;
+const BUILDER_CMS_MAX_READ_LIMIT = 10_000;
 const BUILDER_CMS_PAGE_SIZE = 100;
 const BUILDER_CMS_READ_RETRIES = 2;
 const BUILDER_CMS_METADATA_ENTRY_FIELD_PATHS = [
@@ -537,12 +537,10 @@ async function readBuilderCmsContentEntriesViaMcp(args: {
   let hasMore = false;
   for (
     let offset = startOffset;
-    startOffset + contentEntries.length < limit;
+    contentEntries.length < limit;
     offset += BUILDER_CMS_PAGE_SIZE
   ) {
-    const pageLimit = readPageLimit(
-      limit - startOffset - contentEntries.length,
-    );
+    const pageLimit = readPageLimit(limit - contentEntries.length);
     const contentResult = await postBuilderMcp({
       endpoint,
       privateKey: args.privateKey,
@@ -575,10 +573,7 @@ async function readBuilderCmsContentEntriesViaMcp(args: {
       pageEntries,
     );
     pagesRead += 1;
-    hasMore =
-      pageEntries.length >= pageLimit &&
-      appended > 0 &&
-      contentEntries.length < limit;
+    hasMore = pageEntries.length >= pageLimit && appended > 0;
     if (args.maxPages && pagesRead >= args.maxPages) break;
     if (!hasMore) break;
   }
@@ -595,7 +590,7 @@ async function readBuilderCmsContentEntriesViaMcp(args: {
         nextOffset: startOffset + contentEntries.length,
         fetchedEntryCount: startOffset + contentEntries.length,
         hasMore,
-        partial: hasMore && Boolean(args.maxPages),
+        partial: hasMore,
         readMode: "mcp",
       },
     };
@@ -617,7 +612,7 @@ async function readBuilderCmsContentEntriesViaMcp(args: {
         pageSize: BUILDER_CMS_PAGE_SIZE,
         startOffset,
         nextOffset: startOffset,
-        fetchedEntryCount: 0,
+        fetchedEntryCount: startOffset,
         hasMore: false,
         partial: false,
         readMode: "mcp",
@@ -732,11 +727,11 @@ async function readBuilderCmsContentEntriesViaContentApi(args: {
   let hasMore = false;
   for (
     let offset = startOffset;
-    startOffset + entries.length < limit;
+    entries.length < limit;
     offset += BUILDER_CMS_PAGE_SIZE
   ) {
     const pageUrl = new URL(url);
-    const pageLimit = readPageLimit(limit - startOffset - entries.length);
+    const pageLimit = readPageLimit(limit - entries.length);
     pageUrl.searchParams.set("limit", String(pageLimit));
     pageUrl.searchParams.set("offset", String(offset));
 
@@ -793,8 +788,7 @@ async function readBuilderCmsContentEntriesViaContentApi(args: {
       .filter((entry): entry is BuilderCmsSourceEntry => Boolean(entry));
     const appended = appendUniqueBuilderEntries(entries, seenIds, pageEntries);
     pagesRead += 1;
-    hasMore =
-      pageEntries.length >= pageLimit && appended > 0 && entries.length < limit;
+    hasMore = pageEntries.length >= pageLimit && appended > 0;
     if (args.maxPages && pagesRead >= args.maxPages) break;
     if (!hasMore) break;
   }
@@ -811,7 +805,7 @@ async function readBuilderCmsContentEntriesViaContentApi(args: {
       nextOffset: startOffset + entries.length,
       fetchedEntryCount: startOffset + entries.length,
       hasMore,
-      partial: hasMore && Boolean(args.maxPages),
+      partial: hasMore,
       readMode: "builder-api",
     },
   };

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

@@ -32,6 +32,7 @@ import type {
   ContentDatabaseSourceWriteOwner,
   BuilderCmsModelFieldSummary,
   DocumentProperty,
+  DocumentPropertyOptions,
   DocumentPropertyValue,
 } from "../shared/api.js";
 import {
@@ -550,11 +551,27 @@ function sameMappedSourceFieldValue(
   localValue: unknown,
   sourceValue: unknown,
   type: DocumentProperty["definition"]["type"] | null | undefined,
+  options?: DocumentPropertyOptions,
 ): boolean {
+  const normalizedLocalValue = type
+    ? normalizePropertyValueWithOptions(type, localValue, options)
+    : localValue;
   const normalizedSourceValue = type
-    ? normalizePropertyValue(type, sourceValue)
+    ? normalizePropertyValueWithOptions(type, sourceValue, options)
     : sourceValue;
-  return sameSourceFieldValue(localValue, normalizedSourceValue);
+  if (
+    type === "multi_select" &&
+    Array.isArray(normalizedLocalValue) &&
+    Array.isArray(normalizedSourceValue)
+  ) {
+    // Builder option order is not meaningful. Compare the canonical option IDs
+    // as sets so a reordered response does not become an outbound edit.
+    return sameSourceFieldValue(
+      [...normalizedLocalValue].sort(),
+      [...normalizedSourceValue].sort(),
+    );
+  }
+  return sameSourceFieldValue(normalizedLocalValue, normalizedSourceValue);
 }
 
 function stringSourceValue(
@@ -2047,6 +2064,7 @@ export function buildBuilderLocalOutboundChangeSets(args: {
     sourceFieldKey: string;
     sourceFieldLabel: string;
     propertyType?: DocumentProperty["definition"]["type"] | null;
+    propertyOptions?: DocumentPropertyOptions;
   }>;
   // Row-union scoping (multi-source). Documents owned by ANOTHER source must
   // never be create candidates for this one — each row belongs to exactly one
@@ -2107,7 +2125,12 @@ export function buildBuilderLocalOutboundChangeSets(args: {
         const localValue = rowLocalValues.get(field.localFieldKey);
         const baseValue = rowSourceValues[field.sourceFieldKey];
         if (
-          sameMappedSourceFieldValue(localValue, baseValue, field.propertyType)
+          sameMappedSourceFieldValue(
+            localValue,
+            baseValue,
+            field.propertyType,
+            field.propertyOptions,
+          )
         ) {
           continue;
         }
@@ -2117,7 +2140,11 @@ export function buildBuilderLocalOutboundChangeSets(args: {
           localFieldKey: field.localFieldKey,
           sourceFieldKey: field.sourceFieldKey,
           currentValue: (field.propertyType
-            ? normalizePropertyValue(field.propertyType, baseValue)
+            ? normalizePropertyValueWithOptions(
+                field.propertyType,
+                baseValue,
+                field.propertyOptions,
+              )
             : (baseValue ?? null)) as DocumentPropertyValue,
           proposedValue: localValue as DocumentPropertyValue,
         });
@@ -2139,12 +2166,25 @@ export function buildBuilderLocalOutboundChangeSets(args: {
       }
       return (
         changeSet.fieldChanges.some((stored) =>
-          fieldChanges.some(
-            (change) =>
-              change.localFieldKey === stored.localFieldKey &&
-              sameSourceFieldValue(change.currentValue, stored.currentValue) &&
-              sameSourceFieldValue(change.proposedValue, stored.proposedValue),
-          ),
+          fieldChanges.some((change) => {
+            if (change.localFieldKey !== stored.localFieldKey) return false;
+            const writableField = args.writableFields?.find(
+              (field) => field.localFieldKey === change.localFieldKey,
+            );
+            const sameStoredValue = (current: unknown, previous: unknown) =>
+              writableField
+                ? sameMappedSourceFieldValue(
+                    current,
+                    previous,
+                    writableField.propertyType,
+                    writableField.propertyOptions,
+                  )
+                : sameSourceFieldValue(current, previous);
+            return (
+              sameStoredValue(change.currentValue, stored.currentValue) &&
+              sameStoredValue(change.proposedValue, stored.proposedValue)
+            );
+          }),
         ) ||
         (!!bodyChange && !!changeSet.bodyChange)
       );
@@ -2616,6 +2656,7 @@ async function loadSourceSnapshot(
           id: schema.documentPropertyDefinitions.id,
           name: schema.documentPropertyDefinitions.name,
           type: schema.documentPropertyDefinitions.type,
+          optionsJson: schema.documentPropertyDefinitions.optionsJson,
         })
         .from(schema.documentPropertyDefinitions)
         .where(eq(schema.documentPropertyDefinitions.databaseId, database.id)),
@@ -2630,6 +2671,9 @@ async function loadSourceSnapshot(
       row.type as DocumentProperty["definition"]["type"],
     ]),
   );
+  const propertyOptionsById = new Map(
+    propertyDefs.map((row) => [row.id, parsePropertyOptions(row.optionsJson)]),
+  );
   const fields = fieldRows.map((row) =>
     serializeSourceField(
       row,
@@ -2705,6 +2749,9 @@ async function loadSourceSnapshot(
       propertyType: row.propertyId
         ? (propertyTypeById.get(row.propertyId) ?? null)
         : null,
+      propertyOptions: row.propertyId
+        ? propertyOptionsById.get(row.propertyId)
+        : undefined,
     }));
   // Row-union ownership scoping (Builder only). Determine which documents belong
   // to OTHER sources and whether this source is the primary (oldest), so the
@@ -4253,11 +4300,11 @@ export async function resyncBuilderCmsSourceSnapshot(args: {
     maxPages: args.runFullRefresh
       ? undefined
       : BUILDER_CMS_REFRESH_INITIAL_PAGES,
+    limit: args.runFullRefresh ? 10_000 : undefined,
     offset: continueOffset,
   });
   const incrementalRead =
     builderRead.state === "live" &&
-    !args.runFullRefresh &&
     (builderRead.progress?.partial === true ||
       (builderRead.progress?.startOffset ?? 0) > 0);
   const builderEntries =

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

@@ -248,7 +248,9 @@ function defaultDatabaseView(
               ? "Calendar"
               : type === "timeline"
                 ? "Timeline"
-                : "Table",
+                : type === "form"
+                  ? "Form"
+                  : "Table",
     type,
     sorts: values.sorts ?? [],
     filters: values.filters ?? [],
@@ -265,6 +267,7 @@ function defaultDatabaseView(
     wrapCells: values.wrapCells === true,
     rowDensity: normalizeDatabaseRowDensity(values.rowDensity),
     openPagesIn: normalizeDatabaseOpenPagesIn(values.openPagesIn),
+    formQuestions: normalizeDatabaseFormQuestions(values.formQuestions),
   };
 }
 
@@ -277,7 +280,8 @@ function normalizeDatabaseView(value: unknown): ContentDatabaseView | null {
     view.type === "list" ||
     view.type === "gallery" ||
     view.type === "calendar" ||
-    view.type === "timeline"
+    view.type === "timeline" ||
+    view.type === "form"
       ? view.type
       : "table";
   return {
@@ -313,9 +317,33 @@ function normalizeDatabaseView(value: unknown): ContentDatabaseView | null {
     wrapCells: view.wrapCells === true,
     rowDensity: normalizeDatabaseRowDensity(view.rowDensity),
     openPagesIn: normalizeDatabaseOpenPagesIn(view.openPagesIn),
+    formQuestions: normalizeDatabaseFormQuestions(view.formQuestions),
   };
 }
 
+function normalizeDatabaseFormQuestions(value: unknown) {
+  if (!Array.isArray(value)) return [];
+  const seen = new Set<string>();
+  return value.flatMap((candidate) => {
+    if (!candidate || typeof candidate !== "object") return [];
+    const question = candidate as {
+      key?: unknown;
+      enabled?: unknown;
+      required?: unknown;
+    };
+    const key = typeof question.key === "string" ? question.key.trim() : "";
+    if (!key || seen.has(key)) return [];
+    seen.add(key);
+    return [
+      {
+        key,
+        enabled: question.enabled !== false,
+        required: question.required === true,
+      },
+    ];
+  });
+}
+
 function normalizeDatabaseFilterMode(
   value: unknown,
 ): ContentDatabaseFilterMode {