Harden Content workspace navigation and Trash lifecycle

templates/content/.agents/skills/document-editing/SKILL.md

@@ -82,12 +82,20 @@ pnpm action update-document --id abc123 --description "Stable guidance for what
 
 ### delete-document
 
-Delete a document and all its children recursively.
+Move a document and all its children to Trash. IDs, bodies, hierarchy, and
+database membership remain intact so the subtree can be restored.
 
 ```bash
 pnpm action delete-document --id abc123
 ```
 
+Restore the root subtree, or permanently delete it only after it is in Trash:
+
+```bash
+pnpm action restore-document --id abc123
+pnpm action permanently-delete-document --id abc123
+```
+
 ## Comments
 
 Comments are Notion/Google-Docs-style **inline comments**. Selecting text and commenting leaves the passage **highlighted inline** via a ProseMirror decoration overlay — nothing is written into the markdown body, so the document round-trips unchanged. Each thread stores the quoted text plus surrounding context (`anchorPrefix`/`anchorSuffix`) and an approximate `anchorStartOffset`, so the highlight follows the text as the document is edited, disambiguates repeated text, and degrades gracefully (the thread stays in the sidebar) when its text is deleted.

templates/content/AGENTS.md

@@ -146,6 +146,9 @@ cd templates/content && pnpm action <name> [args]
 | `get-content-database`                      | `--databaseId <id>` or `--documentId <id>`                                                                                                                                                         | Get a database with its description, property/option schema guidance, item pages, and computed ancestry context                                                                   |
 | `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                                                                                                                    |
+| `list-trashed-documents`                    |                                                                                                                                                                                                    | List access-filtered page roots visible in the sidebar Trash surface                                                                                                              |
+| `restore-document`                          | `--id <id>`                                                                                                                                                                                        | Restore a page and the subtree moved to Trash with it                                                                                                                             |
+| `permanently-delete-document`               | `--id <id>`                                                                                                                                                                                        | Permanently destroy a document subtree already in Trash                                                                                                                           |
 | `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-local\|builder-cms\|local-table\|notion-database] [--sourceName] [--sourceTable] [--relationshipMode items\|details] [--join <json>]` | Attach a source binding; use `items` to add more Builder rows and `details` to match a read-only local/Notion source onto existing rows                                           |
 | `list-notion-database-sources`              | `[--query <text>] [--limit <1-100>]`                                                                                                                                                               | List Notion data sources visible through the current user's OAuth connection; returns IDs/names only, never tokens                                                                |
@@ -175,7 +178,7 @@ cd templates/content && pnpm action <name> [args]
 | `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                                                                                                                                                    |
+| `delete-document`                           | `--id <id>`                                                                                                                                                                                        | Move a document and its recursive children to Trash                                                                                                                               |
 
 Database views follow Notion-style tab labels. When creating or duplicating
 views in `viewConfig`, use unique default names (`Table 2`, `SEO copy 2`, etc.)

templates/content/actions/_content-spaces.ts

@@ -806,14 +806,19 @@ async function provisionOwnedContentSpace(
 export async function provisionSourceBackedContentSpace(
   db: Db,
   userEmail: string,
-  input: { connectionId: string; name: string },
+  input: {
+    connectionId: string;
+    name: string;
+    propertyValues?: Record<string, unknown>;
+  },
 ) {
   const connectionId = input.connectionId.trim();
   if (!connectionId) throw new Error("Local folder connection ID is required");
   return provisionOwnedContentSpace(db, userEmail, {
     spaceId: sourceBackedContentSpaceId(userEmail, connectionId),
     name: input.name.trim() || "Local folder",
     kind: "source_backed",
+    propertyValues: input.propertyValues,
   });
 }
 

templates/content/actions/_database-row-batch.ts

@@ -151,6 +151,7 @@ export async function resolveDatabaseRowsForBatch(
         eq(schema.contentDatabaseItems.databaseId, database.id),
         rowPredicates.length === 1 ? rowPredicates[0] : or(...rowPredicates),
         isNull(schema.contentDatabases.deletedAt),
+        isNull(schema.documents.trashedAt),
       ),
     )
     .orderBy(asc(schema.contentDatabaseItems.position));
@@ -185,9 +186,21 @@ export async function renumberDatabaseRows(
   now: string,
 ) {
   const rows = await db
-    .select()
+    .select({
+      id: schema.contentDatabaseItems.id,
+      documentId: schema.contentDatabaseItems.documentId,
+    })
     .from(schema.contentDatabaseItems)
-    .where(eq(schema.contentDatabaseItems.databaseId, database.id))
+    .innerJoin(
+      schema.documents,
+      eq(schema.documents.id, schema.contentDatabaseItems.documentId),
+    )
+    .where(
+      and(
+        eq(schema.contentDatabaseItems.databaseId, database.id),
+        isNull(schema.documents.trashedAt),
+      ),
+    )
     .orderBy(asc(schema.contentDatabaseItems.position));
   if (rows.length === 0) return;
 

templates/content/actions/_database-utils.ts

@@ -22,7 +22,10 @@ import type {
   ContentDatabaseResponse,
 } from "../shared/api.js";
 import { favoriteDocumentIds } from "./_content-favorites.js";
-import { listContentOrganizationMemberships } from "./_content-space-access.js";
+import {
+  listContentOrganizationMemberships,
+  normalizeContentSpaceEmail,
+} from "./_content-space-access.js";
 import { getAllContentDatabaseSourceSnapshots } from "./_database-source-utils.js";
 import {
   applyFederatedOverlayValues,
@@ -81,6 +84,8 @@ export const contentDatabaseListDocumentSelection = {
   sourcePath: schema.documents.sourcePath,
   sourceRootPath: schema.documents.sourceRootPath,
   sourceUpdatedAt: schema.documents.sourceUpdatedAt,
+  trashedAt: schema.documents.trashedAt,
+  trashRootId: schema.documents.trashRootId,
   visibility: schema.documents.visibility,
   ownerEmail: schema.documents.ownerEmail,
   orgId: schema.documents.orgId,
@@ -300,9 +305,14 @@ export async function getContentDatabaseResponse(
 
   const { limit, offset } = normalizeContentDatabasePageOptions(options);
   const userEmail = getRequestUserEmail();
+  const normalizedUserEmail = userEmail
+    ? normalizeContentSpaceEmail(userEmail)
+    : null;
   const activeOrgId = getRequestOrgId();
   const authorizedOrgIds =
-    database.systemRole === "favorites" && userEmail
+    (database.systemRole === "favorites" ||
+      database.systemRole === "workspaces") &&
+    userEmail
       ? [
           ...new Set([
             ...(await listContentOrganizationMemberships(userEmail)).map(
@@ -312,6 +322,45 @@ export async function getContentDatabaseResponse(
           ]),
         ]
       : [];
+  const workspacesVisibleDocumentIds =
+    database.systemRole === "workspaces" && normalizedUserEmail
+      ? (
+          await db
+            .select({
+              documentId: schema.contentSpaceCatalogItems.documentId,
+              ownerEmail: schema.contentSpaces.ownerEmail,
+              orgId: schema.contentSpaces.orgId,
+            })
+            .from(schema.contentSpaceCatalogItems)
+            .innerJoin(
+              schema.contentSpaces,
+              eq(
+                schema.contentSpaces.id,
+                schema.contentSpaceCatalogItems.spaceId,
+              ),
+            )
+            .where(
+              and(
+                eq(
+                  schema.contentSpaceCatalogItems.catalogDatabaseId,
+                  databaseId,
+                ),
+                eq(
+                  schema.contentSpaceCatalogItems.ownerEmail,
+                  normalizedUserEmail,
+                ),
+                isNull(schema.contentSpaces.archivedAt),
+              ),
+            )
+        )
+          .filter(
+            (row) =>
+              normalizeContentSpaceEmail(row.ownerEmail) ===
+                normalizedUserEmail ||
+              (!!row.orgId && authorizedOrgIds.includes(row.orgId)),
+          )
+          .map((row) => row.documentId)
+      : null;
   const favoritesVisibleDocumentIds =
     database.systemRole === "favorites" && userEmail
       ? (
@@ -331,6 +380,7 @@ export async function getContentDatabaseResponse(
                     }),
                   ),
                 ),
+                isNull(schema.documents.trashedAt),
                 documentDiscoveryFilter({
                   userEmail,
                   orgIds: authorizedOrgIds,
@@ -351,6 +401,11 @@ export async function getContentDatabaseResponse(
       : undefined;
   const visibleItemFilter = and(
     eq(schema.contentDatabaseItems.databaseId, databaseId),
+    sql`exists (
+      select 1 from ${schema.documents}
+      where ${schema.documents.id} = ${schema.contentDatabaseItems.documentId}
+        and ${schema.documents.trashedAt} is null
+    )`,
     organizationFilesItemFilter,
     favoritesVisibleDocumentIds
       ? favoritesVisibleDocumentIds.length > 0
@@ -360,6 +415,14 @@ export async function getContentDatabaseResponse(
           )
         : sql`1 = 0`
       : undefined,
+    workspacesVisibleDocumentIds
+      ? workspacesVisibleDocumentIds.length > 0
+        ? inArray(
+            schema.contentDatabaseItems.documentId,
+            workspacesVisibleDocumentIds,
+          )
+        : sql`1 = 0`
+      : undefined,
   );
   const [itemCount] = await db
     .select({ count: sql<number>`COUNT(*)` })
@@ -388,23 +451,28 @@ export async function getContentDatabaseResponse(
                 schema.documents.id,
                 items.map((item) => item.documentId),
               ),
+              isNull(schema.documents.trashedAt),
               database.systemRole === "favorites"
                 ? favoritesVisibleDocumentIds?.length
                   ? inArray(schema.documents.id, favoritesVisibleDocumentIds)
                   : sql`1 = 0`
-                : database.systemRole === "files" && database.orgId
-                  ? and(
-                      eq(schema.documents.orgId, database.orgId),
-                      or(
-                        eq(schema.documents.visibility, "org"),
-                        eq(schema.documents.visibility, "public"),
-                      ),
-                      or(
-                        eq(schema.documents.hideFromSearch, 0),
-                        isNull(schema.documents.hideFromSearch),
-                      ),
-                    )
-                  : eq(schema.documents.ownerEmail, database.ownerEmail),
+                : database.systemRole === "workspaces"
+                  ? workspacesVisibleDocumentIds?.length
+                    ? inArray(schema.documents.id, workspacesVisibleDocumentIds)
+                    : sql`1 = 0`
+                  : database.systemRole === "files" && database.orgId
+                    ? and(
+                        eq(schema.documents.orgId, database.orgId),
+                        or(
+                          eq(schema.documents.visibility, "org"),
+                          eq(schema.documents.visibility, "public"),
+                        ),
+                        or(
+                          eq(schema.documents.hideFromSearch, 0),
+                          isNull(schema.documents.hideFromSearch),
+                        ),
+                      )
+                    : eq(schema.documents.ownerEmail, database.ownerEmail),
             ),
           )
       : [];

templates/content/actions/add-database-item.ts

@@ -41,6 +41,9 @@ export default defineAction({
         ),
       );
     if (!database) throw new Error(`Database "${databaseId}" not found`);
+    if (database.systemRole === "workspaces") {
+      throw new Error("Use create-content-space to add a workspace");
+    }
 
     const access = await assertAccess(
       "document",

templates/content/actions/connect-local-folder-source.ts

@@ -51,6 +51,7 @@ export default defineAction({
       .optional()
       .default(false)
       .describe("Create a separate private Content space for this folder"),
+    propertyValues: z.record(z.string(), z.unknown()).optional(),
     truthPolicy: truthPolicySchema.describe(
       "Whether Content, the folder, or reviewed conflict resolution is authoritative",
     ),
@@ -130,7 +131,7 @@ export default defineAction({
       const provisioned = await provisionSourceBackedContentSpace(
         db,
         userEmail,
-        { connectionId, name: label },
+        { connectionId, name: label, propertyValues: args.propertyValues },
       );
       targetSpaceId = provisioned.spaceId;
       targetDatabaseId = provisioned.filesDatabaseId;