@agent-native/core 0.102.2 → 0.103.1

package/corpus/templates/content/changelog/2026-07-16-organize-every-workspace-through-a-customizable-files-databa.md

@@ -0,0 +1,6 @@
+---
+type: added
+date: 2026-07-16
+---
+
+Organize every workspace through a customizable Files database and sync local folders into the same database-backed experience.

package/corpus/templates/content/parity/matrix.md

@@ -15,7 +15,7 @@ This generated matrix tracks whether high-value Content UI operations use the sa
 | editor.document-body-and-title                     | editor      | Edit document title, body, icon, image alt text, and precise text                              | action-backed         | `edit-document`, `pull-document`, `set-image-alt-text`, `transcribe-media`, `update-document`                                                                                                                                                                                                                                                                                                               | `app/components/editor/DocumentEditor.tsx`, `app/components/editor/DocumentDatabase.tsx`, `app/components/editor/extensions/ImageBlock.tsx`, `app/components/editor/SlashCommandMenu.tsx` | Document content, title, icon, image metadata, and text replacements are saved to the same document source.                                                                                                            | -                                                                                                                                                                                                                                          | -                | P0             | covered       | `actions/content-database-lifecycle.db.test.ts`, `actions/_local-file-documents.test.ts`                                                                                                                                | `document-search-edit`           | -                              |
 | local-files.components-workspace                   | local-files | Register, list, and write local MDX component workspaces                                       | host-only             | `list-local-component-files`, `register-local-component-workspace`, `write-local-component-file`                                                                                                                                                                                                                                                                                                            | `app/routes/_app.local-files.tsx`, `actions/register-local-component-workspace.ts`, `actions/list-local-component-files.ts`, `actions/write-local-component-file.ts`                      | Trusted local component workspace registration and component file reads/writes support local MDX previews.                                                                                                             | Workspace registration depends on a trusted Desktop folder path and is intentionally hidden with agentTool: false.                                                                                                                         | -                | P1             | seeded        | -                                                                                                                                                                                                                       | -                                | Local folder exception/docs PR |
 | local-files.host-folder-handles                    | local-files | Choose, persist, remove, and write trusted local folder handles                                | host-only             | -                                                                                                                                                                                                                                                                                                                                                                                                           | `app/routes/_app.local-files.tsx`                                                                                                                                                         | Host directory handles and browser/Desktop write permissions are managed outside SQL action state.                                                                                                                     | Mounted local folders require browser/Desktop host handles that agents cannot safely or portably hold as normal tools.                                                                                                                     | -                | P0             | none          | -                                                                                                                                                                                                                       | -                                | Local folder exception/docs PR |
-| local-files.import-export-mounted-folder           | local-files | Import, check, export, push, and remove local folder source files                              | action-backed         | `export-content-source`, `import-content-source`, `remove-local-file-source`                                                                                                                                                                                                                                                                                                                                | `app/routes/_app.local-files.tsx`, `actions/import-content-source.ts`, `actions/export-content-source.ts`                                                                                 | Local Markdown/MDX source files are imported into Content documents, editable Content documents are exported back to source-friendly files, and imported source entries can be removed without deleting files on disk. | -                                                                                                                                                                                                                                          | -                | P0             | covered       | `actions/_local-file-documents.test.ts`                                                                                                                                                                                 | `local-file-source-truth`        | -                              |
+| local-files.import-export-mounted-folder           | local-files | Import, check, export, push, and remove local folder source files                              | action-backed         | `connect-local-folder-source`, `disconnect-local-folder-source`, `export-content-source`, `import-content-source`, `remove-local-file-source`, `resolve-local-folder-conflict`, `sync-local-folder-source`, `sync-manifest-local-folder-source`                                                                                                                                                             | `app/routes/_app.local-files.tsx`, `actions/import-content-source.ts`, `actions/export-content-source.ts`                                                                                 | Local Markdown/MDX source files are imported into Content documents, editable Content documents are exported back to source-friendly files, and imported source entries can be removed without deleting files on disk. | -                                                                                                                                                                                                                                          | -                | P0             | covered       | `actions/_local-file-documents.test.ts`, `actions/local-folder-source.db.test.ts`                                                                                                                                       | `local-file-source-truth`        | -                              |
 | notion.route-backed-document-sync                  | source-sync | Notion document sync status, link, unlink, pull, push, resolve, create, search, and disconnect | action-backed         | `connect-notion-status`, `create-and-link-notion-page`, `disconnect-notion`, `link-notion-page`, `list-notion-links`, `pull-notion-page`, `push-notion-page`, `refresh-notion-sync-status`, `resolve-notion-sync-conflict`, `search-notion-pages`, `sync-notion-comments`, `unlink-notion-page`                                                                                                             | `app/hooks/use-notion.ts`, `app/components/editor/DocumentToolbar.tsx`, `app/components/editor/NotionSyncBar.tsx`, `app/components/editor/DocumentEditor.tsx`                             | Notion connection state, page search, link metadata, and local/remote document body sync state are read or mutated through Content actions.                                                                            | Notion OAuth auth-url and callback routes remain route-shaped because they initiate and receive browser redirects rather than normal app data mutations.                                                                                   | -                | P0             | covered       | `parity/__tests__/matrix-route-gap-classify.test.ts`                                                                                                                                                                    | -                                | -                              |
 | sharing.document-discoverability-and-export        | sharing     | Share, hide from search, export, and reveal documents                                          | action-backed         | `export-document`, `reveal-local-source-file`, `set-document-discoverability`, `share-local-file-document`                                                                                                                                                                                                                                                                                                  | `app/components/editor/DocumentToolbar.tsx`, `app/hooks/use-documents.ts`                                                                                                                 | Search discoverability, shareable copies, exports, and OS reveal requests are managed through Content actions.                                                                                                         | -                                                                                                                                                                                                                                          | -                | P0             | covered       | `actions/_local-file-documents.test.ts`                                                                                                                                                                                 | `local-file-source-truth`        | -                              |
 | sharing.os-reveal-local-source                     | sharing     | Reveal a local source file in the system file manager                                          | host-only             | `reveal-local-source-file`                                                                                                                                                                                                                                                                                                                                                                                  | `app/components/editor/DocumentToolbar.tsx`, `actions/reveal-local-source-file.ts`                                                                                                        | -                                                                                                                                                                                                                      | OS reveal depends on trusted local host capabilities and should not spend agent tool surface or imply portable hosted behavior.                                                                                                            | -                | P2             | seeded        | -                                                                                                                                                                                                                       | -                                | Local folder exception/docs PR |
@@ -29,3 +29,4 @@ This generated matrix tracks whether high-value Content UI operations use the sa
 | source-sync.database-source-bindings               | source-sync | Attach, inspect, refresh, disconnect, join, and bind database sources                          | action-backed         | `add-content-database-source-field-property`, `attach-content-database-source`, `bind-content-database-source-field`, `change-content-database-source-role`, `disconnect-content-database-source`, `get-content-database-source`, `list-builder-cms-models`, `list-notion-database-sources`, `refresh-content-database-source`, `suggest-source-join-key`                                                   | `app/components/editor/DocumentDatabase.tsx`, `app/components/editor/DocumentProperties.tsx`, `app/components/editor/database/DatabaseView.tsx`, `app/hooks/use-content-database.ts`      | Mounted database source metadata, fields, source role, join keys, and source-field/property bindings are stored and refreshed.                                                                                         | -                                                                                                                                                                                                                                          | -                | P0             | covered       | `actions/bind-content-database-source-field.db.test.ts`, `actions/content-database-source-actions.test.ts`, `actions/resync-content-database-source.db.test.ts`                                                         | `database-source-scope`          | -                              |
 | source-sync.provider-api-and-staged-datasets       | source-sync | Inspect provider APIs and stage/query/delete large provider datasets                           | action-backed         | `delete-staged-dataset`, `list-staged-datasets`, `provider-api-catalog`, `provider-api-docs`, `provider-api-request`, `query-staged-dataset`                                                                                                                                                                                                                                                                | `actions/provider-api-catalog.ts`, `actions/provider-api-docs.ts`, `actions/provider-api-request.ts`, `actions/query-staged-dataset.ts`                                                   | Provider API metadata and staged dataset scratch storage support scoped agent/source analysis.                                                                                                                         | -                                                                                                                                                                                                                                          | -                | P1             | seeded        | -                                                                                                                                                                                                                       | -                                | -                              |
 | versions.history-and-restore                       | versions    | Open version history and restore a previous document version                                   | action-backed         | `list-document-versions`, `restore-document-version`                                                                                                                                                                                                                                                                                                                                                        | `app/components/editor/VersionHistoryPanel.tsx`, `app/hooks/use-document-versions.ts`                                                                                                     | Document versions are listed and selected versions can restore the document while snapshotting current state.                                                                                                          | -                                                                                                                                                                                                                                          | -                | P0             | seeded        | -                                                                                                                                                                                                                       | -                                | -                              |
+| workspace.spaces-and-files-catalog                 | workspace   | Provision and navigate Content spaces through Files and Workspaces                             | action-backed         | `backfill-content-files`, `ensure-content-spaces`, `list-content-spaces`                                                                                                                                                                                                                                                                                                                                    | `app/components/sidebar/DocumentSidebar.tsx`, `app/hooks/use-content-spaces.ts`                                                                                                           | Personal and organization spaces, their canonical Files databases, and the personal Workspaces catalog are provisioned and reconciled in SQL.                                                                          | -                                                                                                                                                                                                                                          | -                | P0             | covered       | `actions/content-spaces.db.test.ts`, `actions/content-files.db.test.ts`                                                                                                                                                 | -                                | -                              |

package/corpus/templates/content/parity/matrix.ts

@@ -35,6 +35,34 @@ export const parityMatrix: ParityRow[] = [
     ],
     evalScenarioIds: ["document-search-edit"],
   },
+  {
+    id: "workspace.spaces-and-files-catalog",
+    surface: "workspace",
+    label: "Provision and navigate Content spaces through Files and Workspaces",
+    uiEntrypoints: [
+      "app/components/sidebar/DocumentSidebar.tsx",
+      "app/hooks/use-content-spaces.ts",
+    ],
+    durableEffect:
+      "Personal and organization spaces, their canonical Files databases, and the personal Workspaces catalog are provisioned and reconciled in SQL.",
+    uiImplementation:
+      "The app sidebar calls the shared space actions and renders the selected Files database through a saved sidebar view.",
+    status: "action-backed",
+    actions: [
+      "backfill-content-files",
+      "ensure-content-spaces",
+      "list-content-spaces",
+    ],
+    exception: null,
+    reliabilityRisk: "none",
+    spinePriority: "P0",
+    testCoverage: "covered",
+    followUpPR: null,
+    coverageRefs: [
+      "actions/content-spaces.db.test.ts",
+      "actions/content-files.db.test.ts",
+    ],
+  },
   {
     id: "sidebar.navigation-and-screen-context",
     surface: "sidebar",
@@ -537,16 +565,24 @@ export const parityMatrix: ParityRow[] = [
       "UI reads/writes browser or Desktop folder handles around import/export actions.",
     status: "action-backed",
     actions: [
+      "connect-local-folder-source",
+      "disconnect-local-folder-source",
       "export-content-source",
       "import-content-source",
       "remove-local-file-source",
+      "resolve-local-folder-conflict",
+      "sync-local-folder-source",
+      "sync-manifest-local-folder-source",
     ],
     exception: null,
     reliabilityRisk: "none",
     spinePriority: "P0",
     testCoverage: "covered",
     followUpPR: null,
-    coverageRefs: ["actions/_local-file-documents.test.ts"],
+    coverageRefs: [
+      "actions/_local-file-documents.test.ts",
+      "actions/local-folder-source.db.test.ts",
+    ],
     evalScenarioIds: ["local-file-source-truth"],
   },
   {

package/corpus/templates/content/scripts/dev-database.mjs

@@ -37,8 +37,8 @@ function ensureLocalEnv() {
   const values = parseEnv(existing);
   let changed = false;
 
-  if (values.get("AGENT_NATIVE_MODE") !== "database") {
-    values.set("AGENT_NATIVE_MODE", "database");
+  if (values.get("AGENT_NATIVE_MODE") === "database") {
+    values.delete("AGENT_NATIVE_MODE");
     changed = true;
   }
   const authSecret = values.get("BETTER_AUTH_SECRET") ?? "";
@@ -49,15 +49,17 @@ function ensureLocalEnv() {
 
   if (changed) {
     writeFileSync(envPath, serializeEnv(values));
-    console.log("[content dev] Wrote local database-mode env to .env.local");
+    console.log("[content dev] Updated local Content env in .env.local");
   }
   return values;
 }
 
 const envValues = ensureLocalEnv();
+const baseEnv = { ...process.env };
+delete baseEnv.AGENT_NATIVE_MODE;
+delete baseEnv.AGENT_NATIVE_DATA_MODE;
 const childEnv = {
-  ...process.env,
-  AGENT_NATIVE_MODE: "database",
+  ...baseEnv,
   BETTER_AUTH_SECRET:
     process.env.BETTER_AUTH_SECRET || envValues.get("BETTER_AUTH_SECRET"),
 };

package/corpus/templates/content/server/db/schema.ts

@@ -11,6 +11,7 @@ import {
 
 export const documents = table("documents", {
   id: text("id").primaryKey(),
+  spaceId: text("space_id"),
   parentId: text("parent_id"),
   title: text("title").notNull().default("Untitled"),
   content: text("content").notNull().default(""),
@@ -31,6 +32,58 @@ export const documents = table("documents", {
   ...ownableColumns(),
 });
 
+export const contentSpaces = table(
+  "content_spaces",
+  {
+    id: text("id").primaryKey(),
+    name: text("name").notNull(),
+    kind: text("kind").notNull(),
+    ownerEmail: text("owner_email").notNull(),
+    orgId: text("org_id"),
+    filesDatabaseId: text("files_database_id").notNull(),
+    createdBy: text("created_by").notNull(),
+    archivedAt: text("archived_at"),
+    createdAt: text("created_at").notNull().default(now()),
+    updatedAt: text("updated_at").notNull().default(now()),
+  },
+  (space) => [
+    uniqueIndex("content_spaces_files_database_unique").on(
+      space.filesDatabaseId,
+    ),
+    index("content_spaces_owner_org_idx").on(space.ownerEmail, space.orgId),
+    index("content_spaces_org_idx").on(space.orgId),
+  ],
+);
+
+export const contentSpaceCatalogItems = table(
+  "content_space_catalog_items",
+  {
+    id: text("id").primaryKey(),
+    ownerEmail: text("owner_email").notNull(),
+    catalogDatabaseId: text("catalog_database_id").notNull(),
+    databaseItemId: text("database_item_id").notNull(),
+    documentId: text("document_id").notNull(),
+    spaceId: text("space_id").notNull(),
+    createdAt: text("created_at").notNull().default(now()),
+    updatedAt: text("updated_at").notNull().default(now()),
+  },
+  (catalogItem) => [
+    uniqueIndex("content_space_catalog_items_catalog_space_unique").on(
+      catalogItem.catalogDatabaseId,
+      catalogItem.spaceId,
+    ),
+    uniqueIndex("content_space_catalog_items_catalog_item_unique").on(
+      catalogItem.catalogDatabaseId,
+      catalogItem.databaseItemId,
+    ),
+    index("content_space_catalog_items_owner_catalog_idx").on(
+      catalogItem.ownerEmail,
+      catalogItem.catalogDatabaseId,
+    ),
+    index("content_space_catalog_items_space_idx").on(catalogItem.spaceId),
+  ],
+);
+
 export const documentVersions = table("document_versions", {
   id: text("id").primaryKey(),
   ownerEmail: text("owner_email").notNull().default("local@localhost"),
@@ -160,47 +213,67 @@ export const documentPropertyDefinitions = table(
   },
 );
 
-export const contentDatabases = table("content_databases", {
-  id: text("id").primaryKey(),
-  ownerEmail: text("owner_email").notNull().default("local@localhost"),
-  orgId: text("org_id"),
-  documentId: text("document_id").notNull(),
-  ownerDocumentId: text("owner_document_id"),
-  ownerBlockId: text("owner_block_id"),
-  title: text("title").notNull().default("Untitled database"),
-  viewConfigJson: text("view_config_json").notNull().default("{}"),
-  // Single source of truth for the primary "Content" Blocks field — the one
-  // backed by `documents.content`. A DB-enforced single-primary invariant: at
-  // most one property id lives here, so two concurrent seeds can never produce
-  // two aliasing primaries. NULL means there is currently no primary Blocks
-  // field (never seeded, or the primary was intentionally deleted).
-  primaryBlocksPropertyId: text("primary_blocks_property_id"),
-  // 1 once a database has been seeded with its primary Blocks field at least
-  // once. Distinguishes "never seeded" (legacy database needing backfill) from
-  // "primary intentionally deleted" (seeded once, then removed — must NOT be
-  // reseeded). See delete-document-property.
-  blocksSeeded: integer("blocks_seeded").notNull().default(0),
-  deletedAt: text("deleted_at"),
-  createdAt: text("created_at").notNull().default(now()),
-  updatedAt: text("updated_at").notNull().default(now()),
-});
+export const contentDatabases = table(
+  "content_databases",
+  {
+    id: text("id").primaryKey(),
+    spaceId: text("space_id"),
+    ownerEmail: text("owner_email").notNull().default("local@localhost"),
+    orgId: text("org_id"),
+    documentId: text("document_id").notNull(),
+    ownerDocumentId: text("owner_document_id"),
+    ownerBlockId: text("owner_block_id"),
+    title: text("title").notNull().default("Untitled database"),
+    systemRole: text("system_role"),
+    viewConfigJson: text("view_config_json").notNull().default("{}"),
+    // Single source of truth for the primary "Content" Blocks field — the one
+    // backed by `documents.content`. A DB-enforced single-primary invariant: at
+    // most one property id lives here, so two concurrent seeds can never produce
+    // two aliasing primaries. NULL means there is currently no primary Blocks
+    // field (never seeded, or the primary was intentionally deleted).
+    primaryBlocksPropertyId: text("primary_blocks_property_id"),
+    // 1 once a database has been seeded with its primary Blocks field at least
+    // once. Distinguishes "never seeded" (legacy database needing backfill) from
+    // "primary intentionally deleted" (seeded once, then removed — must NOT be
+    // reseeded). See delete-document-property.
+    blocksSeeded: integer("blocks_seeded").notNull().default(0),
+    deletedAt: text("deleted_at"),
+    createdAt: text("created_at").notNull().default(now()),
+    updatedAt: text("updated_at").notNull().default(now()),
+  },
+  (database) => [
+    uniqueIndex("content_databases_space_system_role_unique").on(
+      database.spaceId,
+      database.systemRole,
+    ),
+  ],
+);
 
-export const contentDatabaseItems = table("content_database_items", {
-  id: text("id").primaryKey(),
-  ownerEmail: text("owner_email").notNull().default("local@localhost"),
-  orgId: text("org_id"),
-  databaseId: text("database_id").notNull(),
-  documentId: text("document_id").notNull(),
-  position: integer("position").notNull().default(0),
-  bodyHydrationStatus: text("body_hydration_status")
-    .notNull()
-    .default("hydrated"),
-  bodyHydrationAttemptedAt: text("body_hydration_attempted_at"),
-  bodyHydrationError: text("body_hydration_error"),
-  bodyHydrationVersion: text("body_hydration_version"),
-  createdAt: text("created_at").notNull().default(now()),
-  updatedAt: text("updated_at").notNull().default(now()),
-});
+export const contentDatabaseItems = table(
+  "content_database_items",
+  {
+    id: text("id").primaryKey(),
+    ownerEmail: text("owner_email").notNull().default("local@localhost"),
+    orgId: text("org_id"),
+    databaseId: text("database_id").notNull(),
+    documentId: text("document_id").notNull(),
+    position: integer("position").notNull().default(0),
+    bodyHydrationStatus: text("body_hydration_status")
+      .notNull()
+      .default("hydrated"),
+    bodyHydrationAttemptedAt: text("body_hydration_attempted_at"),
+    bodyHydrationError: text("body_hydration_error"),
+    bodyHydrationVersion: text("body_hydration_version"),
+    createdAt: text("created_at").notNull().default(now()),
+    updatedAt: text("updated_at").notNull().default(now()),
+  },
+  (item) => [
+    uniqueIndex("content_database_items_database_document_unique").on(
+      item.databaseId,
+      item.documentId,
+    ),
+  ],
+);
 
 export const contentDatabaseBodyHydrationQueue = table(
   "content_database_body_hydration_queue",

package/corpus/templates/content/server/lib/document-context.ts

@@ -1,5 +1,5 @@
 import { resolveAccess } from "@agent-native/core/sharing";
-import { and, eq, isNull } from "drizzle-orm";
+import { and, asc, eq, isNull, sql } from "drizzle-orm";
 
 import { getDb, schema } from "../db/index.js";
 
@@ -55,9 +55,23 @@ export async function getDocumentContextPath(
         eq(schema.contentDatabaseItems.documentId, document.id),
         isNull(schema.contentDatabases.deletedAt),
       ),
+    )
+    .orderBy(
+      sql`CASE WHEN ${schema.contentDatabases.systemRole} IS NULL THEN 0 ELSE 1 END`,
+      asc(schema.contentDatabases.id),
+    );
+  const [backingDatabase] = await db
+    .select({ id: schema.contentDatabases.id })
+    .from(schema.contentDatabases)
+    .where(
+      and(
+        eq(schema.contentDatabases.documentId, document.id),
+        isNull(schema.contentDatabases.deletedAt),
+      ),
     );
   if (
     membership &&
+    !(membership.database.systemRole && backingDatabase) &&
     !path.some((entry) => entry.id === membership.database.id)
   ) {
     const databaseDocumentAccess = await resolveAccess(

package/corpus/templates/content/server/lib/notion-sync.ts

@@ -5,6 +5,7 @@ import crypto from "node:crypto";
 import { and, eq, inArray, isNull, lt, or } from "drizzle-orm";
 import type { InferSelectModel } from "drizzle-orm";
 
+import { ensureDocumentFilesMembership } from "../../actions/_content-files.js";
 import type { DocumentSyncStatus } from "../../shared/api.js";
 import { canonicalizeNfm, nfmToDoc, type PMNode } from "../../shared/nfm.js";
 import { getDb, schema } from "../db/index.js";
@@ -492,11 +493,15 @@ async function createLinkedChildDocument(args: {
   const db = getDb();
   const now = nowIso();
   const id = nanoid();
+  if (!args.parent.spaceId) {
+    throw new Error("Parent document does not belong to a Content space.");
+  }
 
   let inserted = false;
   try {
     await db.insert(schema.documents).values({
       id,
+      spaceId: args.parent.spaceId,
       ownerEmail: args.parent.ownerEmail,
       orgId: args.parent.orgId,
       parentId: args.parent.id,
@@ -511,6 +516,7 @@ async function createLinkedChildDocument(args: {
       updatedAt: now,
     });
     inserted = true;
+    await ensureDocumentFilesMembership(db, id, now);
     await inheritShares(args.parent.id, id, now);
     await upsertSyncLink({
       owner: args.owner,

package/corpus/templates/content/server/plugins/db.ts

@@ -694,6 +694,159 @@ const runContentMigrations = runMigrations(
           owner_email
         )`,
     },
+    {
+      version: 70,
+      name: "content-spaces-table",
+      sql: `CREATE TABLE IF NOT EXISTS content_spaces (
+        id TEXT PRIMARY KEY,
+        name TEXT NOT NULL,
+        kind TEXT NOT NULL,
+        owner_email TEXT NOT NULL,
+        org_id TEXT,
+        files_database_id TEXT NOT NULL,
+        created_by TEXT NOT NULL,
+        archived_at TEXT,
+        created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+      )`,
+    },
+    {
+      version: 71,
+      name: "content-space-catalog-items-table",
+      sql: `CREATE TABLE IF NOT EXISTS content_space_catalog_items (
+        id TEXT PRIMARY KEY,
+        owner_email TEXT NOT NULL,
+        catalog_database_id TEXT NOT NULL,
+        database_item_id TEXT NOT NULL,
+        document_id TEXT NOT NULL,
+        space_id TEXT NOT NULL,
+        created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+      )`,
+    },
+    {
+      version: 72,
+      name: "content-space-columns",
+      sql: `ALTER TABLE documents ADD COLUMN IF NOT EXISTS space_id TEXT;
+        ALTER TABLE content_databases ADD COLUMN IF NOT EXISTS space_id TEXT;
+        ALTER TABLE content_databases ADD COLUMN IF NOT EXISTS system_role TEXT`,
+    },
+    {
+      version: 73,
+      name: "content-space-hot-path-indexes",
+      sql: `CREATE UNIQUE INDEX IF NOT EXISTS content_spaces_files_database_unique ON content_spaces (files_database_id);
+        CREATE INDEX IF NOT EXISTS content_spaces_owner_org_idx ON content_spaces (owner_email, org_id);
+        CREATE INDEX IF NOT EXISTS content_spaces_org_idx ON content_spaces (org_id);
+        CREATE UNIQUE INDEX IF NOT EXISTS content_space_catalog_items_catalog_space_unique ON content_space_catalog_items (catalog_database_id, space_id);
+        CREATE UNIQUE INDEX IF NOT EXISTS content_space_catalog_items_catalog_item_unique ON content_space_catalog_items (catalog_database_id, database_item_id);
+        CREATE INDEX IF NOT EXISTS content_space_catalog_items_owner_catalog_idx ON content_space_catalog_items (owner_email, catalog_database_id);
+        CREATE INDEX IF NOT EXISTS content_space_catalog_items_space_idx ON content_space_catalog_items (space_id);
+        CREATE INDEX IF NOT EXISTS documents_space_idx ON documents (space_id);
+        CREATE INDEX IF NOT EXISTS content_databases_space_idx ON content_databases (space_id);
+        CREATE UNIQUE INDEX IF NOT EXISTS content_databases_space_system_role_unique ON content_databases (space_id, system_role)`,
+    },
+    {
+      version: 74,
+      name: "content-database-items-canonical-membership",
+      sql: `DROP INDEX IF EXISTS content_space_catalog_items_catalog_item_unique;
+        DROP INDEX IF EXISTS content_database_body_hydration_queue_item_idx;
+        UPDATE content_space_catalog_items
+        SET database_item_id = (
+          SELECT MIN(canonical.id)
+          FROM content_database_items original
+          INNER JOIN content_database_items canonical
+            ON canonical.database_id = original.database_id
+           AND canonical.document_id = original.document_id
+          WHERE original.id = content_space_catalog_items.database_item_id
+        )
+        WHERE EXISTS (
+          SELECT 1
+          FROM content_database_items original
+          INNER JOIN content_database_items canonical
+            ON canonical.database_id = original.database_id
+           AND canonical.document_id = original.document_id
+          WHERE original.id = content_space_catalog_items.database_item_id
+            AND canonical.id < original.id
+        );
+        UPDATE content_database_body_hydration_queue
+        SET database_item_id = (
+          SELECT MIN(canonical.id)
+          FROM content_database_items original
+          INNER JOIN content_database_items canonical
+            ON canonical.database_id = original.database_id
+           AND canonical.document_id = original.document_id
+          WHERE original.id = content_database_body_hydration_queue.database_item_id
+        )
+        WHERE EXISTS (
+          SELECT 1
+          FROM content_database_items original
+          INNER JOIN content_database_items canonical
+            ON canonical.database_id = original.database_id
+           AND canonical.document_id = original.document_id
+          WHERE original.id = content_database_body_hydration_queue.database_item_id
+            AND canonical.id < original.id
+        );
+        UPDATE content_database_source_rows
+        SET database_item_id = (
+          SELECT MIN(canonical.id)
+          FROM content_database_items original
+          INNER JOIN content_database_items canonical
+            ON canonical.database_id = original.database_id
+           AND canonical.document_id = original.document_id
+          WHERE original.id = content_database_source_rows.database_item_id
+        )
+        WHERE EXISTS (
+          SELECT 1
+          FROM content_database_items original
+          INNER JOIN content_database_items canonical
+            ON canonical.database_id = original.database_id
+           AND canonical.document_id = original.document_id
+          WHERE original.id = content_database_source_rows.database_item_id
+            AND canonical.id < original.id
+        );
+        UPDATE content_database_source_change_sets
+        SET database_item_id = (
+          SELECT MIN(canonical.id)
+          FROM content_database_items original
+          INNER JOIN content_database_items canonical
+            ON canonical.database_id = original.database_id
+           AND canonical.document_id = original.document_id
+          WHERE original.id = content_database_source_change_sets.database_item_id
+        )
+        WHERE EXISTS (
+          SELECT 1
+          FROM content_database_items original
+          INNER JOIN content_database_items canonical
+            ON canonical.database_id = original.database_id
+           AND canonical.document_id = original.document_id
+          WHERE original.id = content_database_source_change_sets.database_item_id
+            AND canonical.id < original.id
+        );
+        DELETE FROM content_space_catalog_items
+        WHERE id NOT IN (
+          SELECT MIN(id)
+          FROM content_space_catalog_items
+          GROUP BY catalog_database_id, database_item_id
+        );
+        DELETE FROM content_database_body_hydration_queue
+        WHERE id NOT IN (
+          SELECT MIN(id)
+          FROM content_database_body_hydration_queue
+          GROUP BY database_item_id
+        );
+        CREATE UNIQUE INDEX IF NOT EXISTS content_space_catalog_items_catalog_item_unique
+          ON content_space_catalog_items (catalog_database_id, database_item_id);
+        CREATE UNIQUE INDEX IF NOT EXISTS content_database_body_hydration_queue_item_idx
+          ON content_database_body_hydration_queue (database_item_id);
+        DELETE FROM content_database_items
+        WHERE id NOT IN (
+          SELECT MIN(id)
+          FROM content_database_items
+          GROUP BY database_id, document_id
+        );
+        CREATE UNIQUE INDEX IF NOT EXISTS content_database_items_database_document_unique
+          ON content_database_items (database_id, document_id)`,
+    },
   ],
   { table: "content_migrations" },
 );

package/corpus/templates/content/shared/api.ts

@@ -96,6 +96,7 @@ export interface ResolveDocumentSyncConflictRequest {
 
 export interface DocumentCreateRequest {
   id?: string;
+  spaceId?: string;
   title?: string;
   parentId?: string | null;
   content?: string;
@@ -289,7 +290,8 @@ export type ContentDatabaseViewType =
   | "gallery"
   | "calendar"
   | "timeline"
-  | "form";
+  | "form"
+  | "sidebar";
 
 export type ContentDatabaseRowDensity = "compact" | "default" | "comfortable";
 export type ContentDatabaseFilterMode = "and" | "or";
@@ -414,7 +416,12 @@ export type ContentDatabaseSourceType =
   | "mock-local"
   | "builder-cms"
   | "local-table"
-  | "notion-database";
+  | "notion-database"
+  | "local-folder";
+export type ContentDatabaseSourceTruthPolicy =
+  | "database_primary"
+  | "source_primary"
+  | "reviewed_bidirectional";
 export type ContentDatabaseSourceSyncState =
   | "idle"
   | "linked"
@@ -433,7 +440,7 @@ export type ContentDatabaseSourceWriteMode =
   | "publish_updates";
 export type BuilderCmsPublicationTransitionIntent = "publish" | "unpublish";
 export const BUILDER_CMS_SAFE_WRITE_MODEL = "agent-native-blog-article-test";
-export type ContentDatabaseSourceChangeDirection = "outbound";
+export type ContentDatabaseSourceChangeDirection = "incoming" | "outbound";
 export type ContentDatabaseSourceChangeState =
   | "proposed"
   | "pending_push"
@@ -471,6 +478,9 @@ export interface ContentDatabaseSourceCapabilities {
   canStageLocalRevision: boolean;
   liveWritesEnabled: boolean;
   readOnlyRefresh: boolean;
+  canRename?: boolean;
+  canReveal?: boolean;
+  canUseLocalComponents?: boolean;
 }
 
 export interface ContentDatabaseSourceFieldMapping {
@@ -640,6 +650,9 @@ export interface ContentDatabaseSource {
     allowPublicationTransitions?: boolean;
     notes?: string | null;
     readMode?: "fixture" | "builder-api" | string | null;
+    connectionId?: string | null;
+    connectionLabel?: string | null;
+    truthPolicy?: ContentDatabaseSourceTruthPolicy;
     liveReadConfigured?: boolean;
     lastReadEntryCount?: number;
     lastReadMatchedRowCount?: number;
@@ -764,6 +777,7 @@ export interface ContentDatabaseSourceFieldPropertyResponse {
 
 export interface CreateDatabaseRequest {
   documentId?: string;
+  spaceId?: string;
   parentId?: string | null;
   title?: string;
   description?: string;