@agent-native/core 0.101.6 → 0.101.10

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

@@ -0,0 +1,76 @@
+import { resolveAccess } from "@agent-native/core/sharing";
+import { and, eq, isNull } from "drizzle-orm";
+
+import { getDb, schema } from "../db/index.js";
+
+export type DocumentContextPathEntry = {
+  id: string;
+  kind: "page" | "database";
+  title: string;
+  description: string;
+};
+
+/** Focused-read context only: owned descriptions stay on their objects; this
+ * assembles the live path without copying ancestor prose into descendants. */
+export async function getDocumentContextPath(
+  document: Pick<typeof schema.documents.$inferSelect, "id" | "parentId">,
+): Promise<DocumentContextPathEntry[]> {
+  const db = getDb();
+  const path: DocumentContextPathEntry[] = [];
+  const seen = new Set<string>([document.id]);
+  let parentId = document.parentId;
+  while (parentId && !seen.has(parentId)) {
+    seen.add(parentId);
+    const parentAccess = await resolveAccess("document", parentId);
+    // A child share must not disclose prose from an inaccessible ancestor.
+    if (!parentAccess) break;
+    const parent = parentAccess.resource;
+    const [database] = await db
+      .select()
+      .from(schema.contentDatabases)
+      .where(
+        and(
+          eq(schema.contentDatabases.documentId, parent.id),
+          isNull(schema.contentDatabases.deletedAt),
+        ),
+      );
+    path.unshift({
+      id: database?.id ?? parent.id,
+      kind: database ? "database" : "page",
+      title: database?.title ?? parent.title,
+      description: parent.description,
+    });
+    parentId = parent.parentId;
+  }
+
+  const [membership] = await db
+    .select({ database: schema.contentDatabases })
+    .from(schema.contentDatabaseItems)
+    .innerJoin(
+      schema.contentDatabases,
+      eq(schema.contentDatabases.id, schema.contentDatabaseItems.databaseId),
+    )
+    .where(
+      and(
+        eq(schema.contentDatabaseItems.documentId, document.id),
+        isNull(schema.contentDatabases.deletedAt),
+      ),
+    );
+  if (
+    membership &&
+    !path.some((entry) => entry.id === membership.database.id)
+  ) {
+    const databaseDocumentAccess = await resolveAccess(
+      "document",
+      membership.database.documentId,
+    );
+    if (!databaseDocumentAccess) return path;
+    path.push({
+      id: membership.database.id,
+      kind: "database",
+      title: membership.database.title,
+      description: databaseDocumentAccess.resource.description,
+    });
+  }
+  return path;
+}

package/corpus/templates/content/server/lib/public-documents.ts

@@ -9,6 +9,7 @@ export const PUBLIC_DOCUMENT_CONTEXT_EXCERPT_CHARS = 2_400;
 type PublicDocumentPromptInput = {
   id: string;
   title: string;
+  description?: string;
   content: string;
   updatedAt: string | Date;
 };
@@ -44,6 +45,7 @@ ${fullDocumentGuidance}
 
 Document ID: ${doc.id}
 Title: ${doc.title}
+Description: ${doc.description || "(none)"}
 Updated at: ${doc.updatedAt}
 
 Markdown excerpt:
@@ -92,6 +94,7 @@ async function getPublicDocumentForEvent(event: H3Event) {
     .select({
       id: documents.id,
       title: documents.title,
+      description: documents.description,
       content: documents.content,
       updatedAt: documents.updatedAt,
       visibility: documents.visibility,

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

@@ -19,6 +19,7 @@ export default createAuthPlugin({
     "/_agent-native/builder/callback",
     "/_agent-native/builder/connect",
     "/_agent-native/builder/status",
+    "/_agent-native/connection-status/builder",
     "/_agent-native/env-status",
   ],
 });

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

@@ -635,6 +635,65 @@ const runContentMigrations = runMigrations(
       sql: `CREATE INDEX IF NOT EXISTS document_property_values_document_property_idx ON document_property_values (document_id, property_id);
         CREATE INDEX IF NOT EXISTS document_property_values_property_document_idx ON document_property_values (property_id, document_id)`,
     },
+    {
+      version: 65,
+      name: "content-owned-descriptions",
+      sql: `ALTER TABLE documents ADD COLUMN IF NOT EXISTS description TEXT NOT NULL DEFAULT '';
+        ALTER TABLE document_property_definitions ADD COLUMN IF NOT EXISTS description TEXT NOT NULL DEFAULT ''`,
+    },
+    {
+      version: 66,
+      name: "document-preview-drafts-private-cas",
+      sql: `CREATE TABLE IF NOT EXISTS document_preview_drafts (
+        id TEXT PRIMARY KEY,
+        owner_email TEXT NOT NULL,
+        org_id TEXT NOT NULL DEFAULT '',
+        document_id TEXT NOT NULL,
+        title TEXT NOT NULL,
+        content TEXT NOT NULL,
+        base_document_updated_at TEXT,
+        loaded_content_was_empty INTEGER NOT NULL DEFAULT 0,
+        deferred_reason TEXT,
+        version INTEGER NOT NULL DEFAULT 1,
+        created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+      );
+      CREATE UNIQUE INDEX IF NOT EXISTS document_preview_drafts_owner_org_document_unique ON document_preview_drafts (owner_email, org_id, document_id);
+      CREATE INDEX IF NOT EXISTS document_preview_drafts_owner_org_document_idx ON document_preview_drafts (owner_email, org_id, document_id)`,
+    },
+    {
+      version: 67,
+      name: "builder-source-execution-attempt-token",
+      sql: `ALTER TABLE content_database_source_executions ADD COLUMN IF NOT EXISTS attempt_token TEXT`,
+    },
+    {
+      version: 68,
+      name: "builder-source-execution-claims",
+      // Non-destructive concurrency fence. Existing duplicate execution rows
+      // remain intact as ambiguity evidence; the claim chooses one canonical
+      // row for every future prepare/execute path.
+      sql: `CREATE TABLE IF NOT EXISTS content_database_source_execution_claims (
+        id TEXT PRIMARY KEY,
+        owner_email TEXT NOT NULL DEFAULT 'local@localhost',
+        source_id TEXT NOT NULL,
+        idempotency_key TEXT NOT NULL,
+        execution_id TEXT NOT NULL,
+        created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
+      );
+      CREATE UNIQUE INDEX IF NOT EXISTS content_database_source_execution_claims_source_key_unique
+        ON content_database_source_execution_claims (source_id, idempotency_key)`,
+    },
+    {
+      version: 69,
+      name: "builder-source-execution-claims-owner-scope",
+      sql: `ALTER TABLE content_database_source_execution_claims ADD COLUMN IF NOT EXISTS owner_email TEXT NOT NULL DEFAULT 'local@localhost';
+      UPDATE content_database_source_execution_claims
+        SET owner_email = COALESCE(
+          (SELECT owner_email FROM content_database_source_executions
+            WHERE content_database_source_executions.id = content_database_source_execution_claims.execution_id),
+          owner_email
+        )`,
+    },
   ],
   { table: "content_migrations" },
 );

package/corpus/templates/content/server/routes/api/document-agent-context.json.get.ts

@@ -16,6 +16,7 @@ import {
   DOCUMENT_AGENT_RESOURCE_KIND,
 } from "../../../shared/agent-readable.js";
 import { getDb, schema } from "../../db/index.js";
+import { getDocumentContextPath } from "../../lib/document-context.js";
 
 function queryString(value: unknown): string {
   if (typeof value === "string") return value;
@@ -45,7 +46,9 @@ export default defineEventHandler(async (event) => {
   const [document] = await db
     .select({
       id: schema.documents.id,
+      parentId: schema.documents.parentId,
       title: schema.documents.title,
+      description: schema.documents.description,
       content: schema.documents.content,
       icon: schema.documents.icon,
       visibility: schema.documents.visibility,
@@ -77,11 +80,13 @@ export default defineEventHandler(async (event) => {
     resourceType: "document",
     id: document.id,
     title: document.title,
+    description: document.description,
     icon: document.icon,
     content: document.content,
     visibility: document.visibility,
     createdAt: document.createdAt,
     updatedAt: document.updatedAt,
+    contextPath: await getDocumentContextPath(document),
     url: buildContentPublicDocumentUrl(document.id, {
       basePath: getConfiguredAppBasePath(),
       token: tokenAccess ? token : null,

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

@@ -8,11 +8,19 @@ import type {
 
 export type DocumentAccessRole = "owner" | "viewer" | "editor" | "admin";
 
+export interface ContentContextPathEntry {
+  id: string;
+  kind: "page" | "database";
+  title: string;
+  description: string;
+}
+
 export interface Document {
   id: string;
   parentId: string | null;
   title: string;
   content: string;
+  description?: string;
   icon: string | null;
   position: number;
   isFavorite: boolean;
@@ -27,6 +35,7 @@ export interface Document {
   properties?: DocumentProperty[];
   database?: ContentDatabase;
   databaseMembership?: ContentDatabaseMembership;
+  contextPath?: ContentContextPathEntry[];
   createdAt: string;
   updatedAt: string;
 }
@@ -90,12 +99,14 @@ export interface DocumentCreateRequest {
   title?: string;
   parentId?: string | null;
   content?: string;
+  description?: string;
   icon?: string;
 }
 
 export interface DocumentUpdateRequest {
   title?: string;
   content?: string;
+  description?: string;
   icon?: string | null;
   isFavorite?: boolean;
   loadedUpdatedAt?: string;
@@ -158,6 +169,7 @@ export interface DocumentPropertyDefinition {
   databaseId: string | null;
   name: string;
   type: DocumentPropertyType;
+  description?: string;
   visibility: DocumentPropertyVisibility;
   options: DocumentPropertyOptions;
   position: number;
@@ -182,6 +194,7 @@ export interface ConfigureDocumentPropertyRequest {
   documentId: string;
   name: string;
   type: DocumentPropertyType;
+  description?: string;
   visibility?: DocumentPropertyVisibility;
   options?: DocumentPropertyOptions;
 }
@@ -213,6 +226,7 @@ export interface ContentDatabase {
   id: string;
   documentId: string;
   title: string;
+  description?: string;
   viewConfig: ContentDatabaseViewConfig;
   createdAt: string;
   updatedAt: string;
@@ -352,6 +366,7 @@ export type ContentDatabaseBodyHydrationState =
   | "pending"
   | "hydrating"
   | "hydrated"
+  | "unavailable"
   | "error";
 
 export interface ContentDatabaseBodyHydration {
@@ -365,6 +380,7 @@ export interface ContentDatabaseBodyHydrationSummary {
   pending: number;
   hydrating: number;
   hydrated: number;
+  unavailable?: number;
   error: number;
   total: number;
 }
@@ -438,6 +454,8 @@ export type ContentDatabaseSourceExecutionState =
   | "write_disabled"
   | "blocked"
   | "running"
+  | "response_received"
+  | "reconciliation_required"
   | "succeeded"
   | "failed";
 
@@ -493,6 +511,8 @@ export interface ContentDatabaseSourceFieldChange {
   sourceFieldKey: string;
   currentValue: DocumentPropertyValue;
   proposedValue: DocumentPropertyValue;
+  /** Exact provider-native JSON value; review continues to show proposedValue. */
+  builderValueJson?: string;
 }
 
 export interface ContentDatabaseSourceBodyChange {
@@ -633,6 +653,7 @@ export interface ContentDatabaseSource {
     allowDraftWrites?: boolean;
     allowPublishWrites?: boolean;
     allowedWriteModes?: ContentDatabaseSourcePushMode[];
+    builderModelFields?: BuilderCmsModelFieldSummary[];
     federation?: ContentDatabaseSourceFederation;
   };
   fields: ContentDatabaseSourceFieldMapping[];
@@ -653,6 +674,7 @@ export interface BuilderCmsModelFieldSummary {
   label?: string;
   type: string;
   inputType?: string;
+  model?: string;
   enum?: string[];
   options?: string[];
   required: boolean;
@@ -692,6 +714,7 @@ export interface ContentDatabaseResponse {
   properties: DocumentProperty[];
   items: ContentDatabaseItem[];
   source: ContentDatabaseSource | null;
+  contextPath?: ContentContextPathEntry[];
   // All attached sources (NEXT). `source` stays as `sources[0] ?? null` for
   // back-compat; multi-source consumers read `sources`.
   sources?: ContentDatabaseSource[];
@@ -710,6 +733,12 @@ export interface ContentDatabaseResponse {
   duplicatedDocumentIds?: string[];
   deletedItemIds?: string[];
   deletedDocumentIds?: string[];
+  timings?: BuilderActionTiming[];
+}
+
+export interface BuilderActionTiming {
+  name: string;
+  durationMs: number;
 }
 
 export interface ContentDatabaseUnavailableResponse {
@@ -737,11 +766,13 @@ export interface CreateDatabaseRequest {
   documentId?: string;
   parentId?: string | null;
   title?: string;
+  description?: string;
 }
 
 export interface CreateInlineDatabaseRequest {
   hostDocumentId: string;
   title?: string;
+  description?: string;
 }
 
 export interface CreateInlineDatabaseResponse {
@@ -941,6 +972,25 @@ export interface PrepareBuilderSourceExecutionRequest {
   confirmUnpublish?: boolean;
 }
 
+export interface CancelPreparedBuilderSourceUpdateRequest {
+  databaseId?: string;
+  documentId?: string;
+  sourceId: string;
+  changeSetId: string;
+  note?: string;
+}
+
+export interface CancelPreparedBuilderSourceUpdateResponse extends ContentDatabaseResponse {
+  cancellation: {
+    sourceId: string;
+    changeSetId: string;
+    executionIds: string[];
+    status: "cancelled" | "already_cancelled";
+    cancelledAt: string;
+    cancelledBy: string;
+  };
+}
+
 export interface ValidateBuilderSourceExecutionRequest {
   databaseId?: string;
   documentId?: string;
@@ -971,6 +1021,7 @@ export interface PrepareBuilderSourceReviewRequest {
   pushModeConfirmation?: ContentDatabaseSourcePushMode;
   publicationTransition?: BuilderCmsPublicationTransitionIntent;
   confirmUnpublish?: boolean;
+  transitions?: Record<string, ExecuteBuilderSourceBatchTransition>;
 }
 
 export interface ExecuteBuilderSourceBatchTransition {
@@ -987,12 +1038,17 @@ export interface ExecuteBuilderSourceBatchRequest {
   transitions?: Record<string, ExecuteBuilderSourceBatchTransition>;
 }
 
-export type BuilderSourceBatchItemStatus = "succeeded" | "blocked" | "failed";
+export type BuilderSourceBatchItemStatus =
+  | "succeeded"
+  | "blocked"
+  | "reconciliation_required"
+  | "failed";
 
 export interface BuilderSourceBatchItemResult {
   changeSetId: string;
   status: BuilderSourceBatchItemStatus;
   message?: string;
+  timings?: BuilderActionTiming[];
 }
 
 export interface ExecuteBuilderSourceBatchResponse {
@@ -1000,9 +1056,11 @@ export interface ExecuteBuilderSourceBatchResponse {
     total: number;
     succeeded: number;
     blocked: number;
+    reconciliationRequired: number;
     failed: number;
   };
   results: BuilderSourceBatchItemResult[];
+  timings?: BuilderActionTiming[];
 }
 
 export interface SetContentDatabaseSourceWriteModeRequest {
@@ -1083,6 +1141,8 @@ export interface ContentDatabaseSourceReviewRowSummary {
   databaseItemId: string | null;
   documentId: string | null;
   title: string;
+  /** Existing Builder entry targeted by this write; null for new drafts. */
+  targetEntryId?: string | null;
   fieldChanges: ContentDatabaseSourceFieldChange[];
   bodyChange: ContentDatabaseSourceBodyChange | null;
   riskLevel: ContentDatabaseSourceRiskLevel;
@@ -1112,18 +1172,44 @@ export interface ContentDatabaseSourceReviewPayload {
       | "stale"
       | "write_disabled"
       | "running"
+      | "reconciliation_required"
       | "succeeded"
       | "failed";
     message: string;
   };
 }
 
+export interface PreviewBuilderSourceReviewRequest {
+  databaseId?: string;
+  documentId?: string;
+  sourceId?: string;
+  scope?: "selected" | "all";
+  documentIds?: string[];
+}
+
+export interface PreviewBuilderSourceReviewResponse {
+  sourceId: string;
+  sourceTable: string;
+  changeSetIds: string[];
+  review: ContentDatabaseSourceReviewPayload | null;
+}
+
 export interface PrepareBuilderSourceReviewResponse {
   database: ContentDatabase;
   properties: DocumentProperty[];
   items: ContentDatabaseItem[];
   source: ContentDatabaseSource | null;
   review: ContentDatabaseSourceReviewPayload;
+  /**
+   * Maps the operator-selected diff identities to the immutable change-set
+   * identities prepared for execution. These differ when a cancelled or
+   * otherwise closed synthetic diff is reviewed again as a new revision.
+   */
+  preparedChangeSetMappings: Array<{
+    requestedChangeSetId: string;
+    preparedChangeSetId: string;
+  }>;
+  timings?: BuilderActionTiming[];
 }
 
 export interface ProcessBuilderBodyHydrationRequest {