@agent-native/core 0.80.4 → 0.80.6

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

@@ -17,12 +17,12 @@ import type {
 } from "../shared/api.js";
 import {
   buildBuilderCmsExecutionPlan,
+  resolveBuilderCmsWriteEffect,
   validateBuilderCmsExecutionDryRun,
 } from "./_builder-cms-write-adapter.js";
 import {
   findOpenSourceChangeSet,
-  getContentDatabaseSourceSnapshot,
-  getExistingSource,
+  getContentDatabaseSourceSnapshotForWrite,
   resolveDatabaseForSourceMutation,
   sourceChangeSetKey,
 } from "./_database-source-utils.js";
@@ -103,6 +103,10 @@ export function buildBuilderSourceReviewPayload(args: {
       riskLevel: changeSet.riskLevel,
       riskReasons: changeSet.riskReasons,
       conflictState: changeSet.conflictState,
+      effect: resolveBuilderCmsWriteEffect({
+        source: args.source,
+        changeSet,
+      }),
       execution: latestExecution,
     };
   });
@@ -270,6 +274,8 @@ async function upsertExecutionGate(args: {
   source: ContentDatabaseSource;
   changeSet: ContentDatabaseSourceChangeSet;
   pushModeConfirmation?: ContentDatabaseSourcePushMode;
+  publicationTransition?: PrepareBuilderSourceReviewRequest["publicationTransition"];
+  confirmUnpublish?: boolean;
   ownerEmail: string;
   now: string;
 }) {
@@ -277,6 +283,8 @@ async function upsertExecutionGate(args: {
     source: args.source,
     changeSet: args.changeSet,
     pushModeConfirmation: args.pushModeConfirmation,
+    publicationTransition: args.publicationTransition,
+    confirmUnpublish: args.confirmUnpublish,
   });
   const db = getDb();
   const [existing] = await db
@@ -360,10 +368,22 @@ export default defineAction({
   schema: z.object({
     databaseId: z.string().optional().describe("Database ID"),
     documentId: z.string().optional().describe("Database document/page ID"),
+    sourceId: z
+      .string()
+      .optional()
+      .describe("Target source ID (defaults to the primary source)"),
     pushModeConfirmation: z
       .enum(["autosave", "draft", "publish"])
       .optional()
       .describe("Explicit push mode confirmation for the planned write"),
+    publicationTransition: z
+      .enum(["publish", "unpublish"])
+      .optional()
+      .describe("Explicit publication transition to validate at write time"),
+    confirmUnpublish: z
+      .boolean()
+      .optional()
+      .describe("Required explicit confirmation for unpublish transitions"),
   }),
   run: async (
     args: PrepareBuilderSourceReviewRequest,
@@ -372,13 +392,13 @@ export default defineAction({
     if (!database) throw new Error("Database not found.");
     await assertAccess("document", database.documentId, "editor");
 
-    const sourceRecord = await getExistingSource(database.id);
-    if (!sourceRecord || sourceRecord.sourceType !== "builder-cms") {
+    const snapshot = await getContentDatabaseSourceSnapshotForWrite(
+      database,
+      args.sourceId,
+    );
+    if (!snapshot || snapshot.sourceType !== "builder-cms") {
       throw new Error("Attach a Builder CMS source before reviewing updates.");
     }
-
-    const snapshot = await getContentDatabaseSourceSnapshot(database);
-    if (!snapshot) throw new Error("Attach a source before reviewing updates.");
     const reviewableChanges = snapshot.changeSets.filter(
       (changeSet) =>
         changeSet.direction === "outbound" &&
@@ -397,7 +417,7 @@ export default defineAction({
     for (const changeSet of reviewableChanges) {
       approvedIds.push(
         await approveChangeSetForReview({
-          sourceId: sourceRecord.id,
+          sourceId: snapshot.id,
           ownerEmail: database.ownerEmail,
           changeSet,
           reviewerEmail,
@@ -406,7 +426,10 @@ export default defineAction({
       );
     }
 
-    const approvedSnapshot = await getContentDatabaseSourceSnapshot(database);
+    const approvedSnapshot = await getContentDatabaseSourceSnapshotForWrite(
+      database,
+      args.sourceId,
+    );
     if (!approvedSnapshot) throw new Error("Builder source disappeared.");
     const approvedChangeSets = approvedSnapshot.changeSets.filter(
       (changeSet) =>
@@ -417,6 +440,8 @@ export default defineAction({
         source: approvedSnapshot,
         changeSet,
         pushModeConfirmation: args.pushModeConfirmation,
+        publicationTransition: args.publicationTransition,
+        confirmUnpublish: args.confirmUnpublish,
         ownerEmail: database.ownerEmail,
         now,
       });
@@ -425,19 +450,26 @@ export default defineAction({
     await getDb()
       .update(schema.contentDatabaseSources)
       .set({ updatedAt: now })
-      .where(eq(schema.contentDatabaseSources.id, sourceRecord.id));
+      .where(eq(schema.contentDatabaseSources.id, snapshot.id));
 
-    const response = await getContentDatabaseResponse(database.id);
-    const source = response.source;
-    if (!source) throw new Error("Builder source disappeared.");
-    const reviewedChangeSets = source.changeSets.filter((changeSet) =>
+    const reviewedSnapshot = await getContentDatabaseSourceSnapshotForWrite(
+      database,
+      args.sourceId,
+    );
+    if (!reviewedSnapshot) throw new Error("Builder source disappeared.");
+    // Build the review payload from the TARGET source snapshot, not
+    // response.source (which is always the primary). Re-read after the gate
+    // upsert so newly validated/blocked/stale execution rows are visible to
+    // the returned review payload.
+    const reviewedChangeSets = reviewedSnapshot.changeSets.filter((changeSet) =>
       approvedIds.includes(changeSet.id),
     );
+    const response = await getContentDatabaseResponse(database.id);
 
     return {
       ...response,
       review: buildBuilderSourceReviewPayload({
-        source,
+        source: reviewedSnapshot,
         changeSets: reviewedChangeSets,
       }),
     };

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

@@ -4,8 +4,8 @@ import { z } from "zod";
 
 import type { ContentDatabaseSourceStatusResponse } from "../shared/api.js";
 import {
-  getContentDatabaseSourceSnapshot,
-  getExistingSource,
+  getContentDatabaseSourceSnapshotForWrite,
+  getExistingSourceForWrite,
   resyncBuilderCmsSourceSnapshot,
   resyncMockSourceSnapshot,
   resolveDatabaseForSourceMutation,
@@ -18,13 +18,17 @@ export default defineAction({
   schema: z.object({
     databaseId: z.string().optional().describe("Database ID"),
     documentId: z.string().optional().describe("Database document/page ID"),
+    sourceId: z
+      .string()
+      .optional()
+      .describe("Target source ID (defaults to the primary source)"),
   }),
   run: async (args): Promise<ContentDatabaseSourceStatusResponse> => {
     const database = await resolveDatabaseForSourceMutation(args);
     if (!database) throw new Error("Database not found.");
     await assertAccess("document", database.documentId, "editor");
 
-    const source = await getExistingSource(database.id);
+    const source = await getExistingSourceForWrite(database.id, args.sourceId);
     if (!source) {
       return {
         database: serializeDatabase(database),
@@ -45,7 +49,10 @@ export default defineAction({
     } else {
       throw new Error(`Unsupported source type "${source.sourceType}".`);
     }
-    const snapshot = await getContentDatabaseSourceSnapshot(database);
+    const snapshot = await getContentDatabaseSourceSnapshotForWrite(
+      database,
+      args.sourceId,
+    );
 
     return {
       database: serializeDatabase(database),

package/corpus/templates/content/actions/review-content-database-source-change-set.ts

@@ -10,7 +10,7 @@ import type {
   ReviewContentDatabaseSourceChangeSetRequest,
 } from "../shared/api.js";
 import {
-  getExistingSource,
+  getExistingSourceForWrite,
   resolveDatabaseForSourceMutation,
 } from "./_database-source-utils.js";
 import { getContentDatabaseResponse } from "./_database-utils.js";
@@ -28,6 +28,10 @@ export default defineAction({
   schema: z.object({
     databaseId: z.string().optional().describe("Database ID"),
     documentId: z.string().optional().describe("Database document/page ID"),
+    sourceId: z
+      .string()
+      .optional()
+      .describe("Target source ID (defaults to the primary source)"),
     changeSetId: z.string().describe("Source change-set ID"),
     decision: z
       .enum(["approve", "reject"])
@@ -41,7 +45,7 @@ export default defineAction({
     if (!database) throw new Error("Database not found.");
     await assertAccess("document", database.documentId, "editor");
 
-    const source = await getExistingSource(database.id);
+    const source = await getExistingSourceForWrite(database.id, args.sourceId);
     if (!source) throw new Error("Attach a source before reviewing changes.");
 
     const [changeSet] = await getDb()

package/corpus/templates/content/actions/set-content-database-source-write-mode.ts

@@ -1,22 +1,31 @@
 import { defineAction } from "@agent-native/core";
 import { assertAccess } from "@agent-native/core/sharing";
-import { asc, eq } from "drizzle-orm";
+import { eq } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
 import {
   type ContentDatabaseResponse,
   type ContentDatabaseSourcePushMode,
+  type ContentDatabaseSourceWriteMode,
   type SetContentDatabaseSourceWriteModeRequest,
 } from "../shared/api.js";
 import {
   buildBuilderCmsWriteModeJson,
   type BuilderCmsLiveWriteMode,
 } from "./_builder-cms-write-settings.js";
-import { resolveDatabaseForSourceMutation } from "./_database-source-utils.js";
+import {
+  getExistingSourceForWrite,
+  resolveDatabaseForSourceMutation,
+} from "./_database-source-utils.js";
 import { getContentDatabaseResponse } from "./_database-utils.js";
 
-const writeModeSchema = z.enum(["autosave", "draft", "publish"]);
+const legacyWriteModeSchema = z.enum(["autosave", "draft", "publish"]);
+const sourceWriteModeSchema = z.enum([
+  "read_only",
+  "stage_only",
+  "publish_updates",
+]);
 
 function executableWriteModes(
   modes: readonly ContentDatabaseSourcePushMode[] | undefined,
@@ -29,17 +38,31 @@ function executableWriteModes(
 
 export default defineAction({
   description:
-    "Enable or disable live Builder CMS writes for one source. Live writes stay off by default and can only be enabled for the safe Builder test collection with explicit allowed write modes.",
+    "Set the tiered Builder CMS write mode for one source. Writes stay off by default and can only be enabled for the safe Builder test collection.",
   schema: z.object({
     databaseId: z.string().optional().describe("Database ID"),
     documentId: z.string().optional().describe("Database document/page ID"),
+    sourceId: z
+      .string()
+      .optional()
+      .describe("Target source ID (defaults to the primary source)"),
     liveWritesEnabled: z
       .boolean()
+      .optional()
       .describe("Whether this source may execute guarded live Builder writes"),
+    writeMode: sourceWriteModeSchema
+      .optional()
+      .describe("Tiered Builder write mode for this source"),
+    allowPublicationTransitions: z
+      .boolean()
+      .optional()
+      .describe(
+        "Allow explicit per-item publish/unpublish transitions in publish updates mode",
+      ),
     allowedWriteModes: z
-      .array(writeModeSchema)
+      .array(legacyWriteModeSchema)
       .optional()
-      .describe("Explicit Builder write modes allowed for this source"),
+      .describe("Legacy Builder write modes allowed for this source"),
     allowDraftWrites: z
       .boolean()
       .optional()
@@ -59,12 +82,7 @@ export default defineAction({
     await assertAccess("document", database.documentId, "editor");
 
     const db = getDb();
-    const [source] = await db
-      .select()
-      .from(schema.contentDatabaseSources)
-      .where(eq(schema.contentDatabaseSources.databaseId, database.id))
-      .orderBy(asc(schema.contentDatabaseSources.createdAt))
-      .limit(1);
+    const source = await getExistingSourceForWrite(database.id, args.sourceId);
     if (!source) {
       throw new Error(
         "Attach a Builder CMS source before changing write mode.",
@@ -82,6 +100,8 @@ export default defineAction({
       capabilitiesJson: source.capabilitiesJson,
       metadataJson: source.metadataJson,
       liveWritesEnabled: args.liveWritesEnabled,
+      writeMode: args.writeMode as ContentDatabaseSourceWriteMode | undefined,
+      allowPublicationTransitions: args.allowPublicationTransitions,
       allowedWriteModes: executableWriteModes(args.allowedWriteModes),
       allowDraftWrites: args.allowDraftWrites,
       allowPublishWrites: args.allowPublishWrites,

package/corpus/templates/content/actions/stage-builder-revision.ts

@@ -7,8 +7,7 @@ import { getDb, schema } from "../server/db/index.js";
 import type { ContentDatabaseResponse } from "../shared/api.js";
 import {
   findOpenSourceChangeSet,
-  getContentDatabaseSourceSnapshot,
-  getExistingSource,
+  getContentDatabaseSourceSnapshotForWrite,
   resolveDatabaseForSourceMutation,
   sourceChangeSetKey,
 } from "./_database-source-utils.js";
@@ -20,24 +19,29 @@ export default defineAction({
   schema: z.object({
     databaseId: z.string().optional().describe("Database ID"),
     documentId: z.string().optional().describe("Database document/page ID"),
+    sourceId: z
+      .string()
+      .optional()
+      .describe("Target source ID (defaults to the primary source)"),
   }),
   run: async (args): Promise<ContentDatabaseResponse> => {
     const database = await resolveDatabaseForSourceMutation(args);
     if (!database) throw new Error("Database not found.");
     await assertAccess("document", database.documentId, "editor");
 
-    const source = await getExistingSource(database.id);
+    const source = await getContentDatabaseSourceSnapshotForWrite(
+      database,
+      args.sourceId,
+    );
     if (!source || source.sourceType !== "builder-cms") {
       throw new Error("Attach a Builder CMS source before staging a revision.");
     }
 
-    const snapshot = await getContentDatabaseSourceSnapshot(database);
-    const pendingOutboundChanges =
-      snapshot?.changeSets.filter(
-        (changeSet) =>
-          changeSet.direction === "outbound" &&
-          changeSet.state === "pending_push",
-      ) ?? [];
+    const pendingOutboundChanges = source.changeSets.filter(
+      (changeSet) =>
+        changeSet.direction === "outbound" &&
+        changeSet.state === "pending_push",
+    );
 
     if (pendingOutboundChanges.length === 0) {
       throw new Error("No pending local Builder changes to stage.");

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

@@ -14,7 +14,7 @@ import {
   validateBuilderCmsExecutionDryRun,
 } from "./_builder-cms-write-adapter.js";
 import {
-  getContentDatabaseSourceSnapshot,
+  getContentDatabaseSourceSnapshotForWrite,
   resolveDatabaseForSourceMutation,
 } from "./_database-source-utils.js";
 import { getContentDatabaseResponse } from "./_database-utils.js";
@@ -36,11 +36,27 @@ export default defineAction({
   schema: z.object({
     databaseId: z.string().optional().describe("Database ID"),
     documentId: z.string().optional().describe("Database document/page ID"),
+    sourceId: z
+      .string()
+      .optional()
+      .describe("Target source ID (defaults to the primary source)"),
     changeSetId: z.string().describe("Approved source change-set ID"),
     idempotencyKey: z
       .string()
       .optional()
       .describe("Optional execution idempotency key to validate"),
+    pushModeConfirmation: z
+      .enum(["autosave", "draft", "publish"])
+      .optional()
+      .describe("Explicit push mode confirmation for the validated write"),
+    publicationTransition: z
+      .enum(["publish", "unpublish"])
+      .optional()
+      .describe("Explicit publication transition to validate at write time"),
+    confirmUnpublish: z
+      .boolean()
+      .optional()
+      .describe("Required explicit confirmation for unpublish transitions"),
   }),
   run: async (
     args: ValidateBuilderSourceExecutionRequest,
@@ -49,7 +65,10 @@ export default defineAction({
     if (!database) throw new Error("Database not found.");
     await assertAccess("document", database.documentId, "editor");
 
-    const source = await getContentDatabaseSourceSnapshot(database);
+    const source = await getContentDatabaseSourceSnapshotForWrite(
+      database,
+      args.sourceId,
+    );
     if (!source || source.sourceType !== "builder-cms") {
       throw new Error(
         "Attach a Builder CMS source before validating execution.",
@@ -64,7 +83,10 @@ export default defineAction({
     const plan = buildBuilderCmsExecutionPlan({
       source,
       changeSet,
-      pushModeConfirmation: changeSet.pushMode ?? undefined,
+      pushModeConfirmation:
+        args.pushModeConfirmation ?? changeSet.pushMode ?? undefined,
+      publicationTransition: args.publicationTransition,
+      confirmUnpublish: args.confirmUnpublish,
     });
     const expectedKey = builderCmsExecutionIdempotencyKey({
       sourceId: source.id,

package/corpus/templates/content/app/blocks/BuilderDocsBlocks.tsx

@@ -26,6 +26,8 @@ import {
 } from "@tabler/icons-react";
 import { useState } from "react";
 
+import { ContentReferencePreview } from "@/components/editor/ContentReferencePreview";
+
 function SidecarBadge({ rawRef }: { rawRef: string }) {
   return (
     <div className="mt-2 truncate text-[11px] text-muted-foreground">
@@ -180,7 +182,15 @@ export function BuilderSymbolRead({
       </div>
       <div className="mt-1 text-xs text-muted-foreground">
         {data.model || "model unknown"} / {data.entry || "entry unknown"}
+        {data.dynamic ? " / dynamic" : ""}
       </div>
+      {data.source ? (
+        <ContentReferencePreview
+          sourcePath={data.source}
+          title="Symbol source"
+          className="mb-0"
+        />
+      ) : null}
       <SidecarBadge rawRef={data.rawRef} />
     </section>
   );

package/corpus/templates/content/app/components/editor/BubbleToolbar.tsx

@@ -47,6 +47,7 @@ const BUBBLE_TOOLBAR_EXCLUDED_NODE_TYPES = new Set([
   "image",
   "video",
   "audio",
+  "contentReference",
   "localMdxComponent",
 ]);
 

package/corpus/templates/content/app/components/editor/ContentReferencePreview.tsx

@@ -0,0 +1,185 @@
+import { useT } from "@agent-native/core/client";
+import { IconExternalLink, IconFileText } from "@tabler/icons-react";
+import { lazy, Suspense, useMemo } from "react";
+import { useNavigate } from "react-router";
+
+import { Button } from "@/components/ui/button";
+import { useDocument, useDocuments } from "@/hooks/use-documents";
+import { cn } from "@/lib/utils";
+
+const ReadonlyReferenceEditor = lazy(async () => {
+  const module = await import("./VisualEditor");
+  return { default: module.VisualEditor };
+});
+
+const MAX_CONTENT_REFERENCE_PREVIEW_DEPTH = 1;
+
+function trimSlashes(path: string) {
+  return path.replace(/\\/g, "/").replace(/^\/+/, "").replace(/\/+$/, "");
+}
+
+function dirname(path: string) {
+  const normalized = trimSlashes(path);
+  const index = normalized.lastIndexOf("/");
+  return index >= 0 ? normalized.slice(0, index) : "";
+}
+
+function normalizePathParts(path: string) {
+  const parts: string[] = [];
+  for (const part of path.split("/")) {
+    if (!part || part === ".") continue;
+    if (part === "..") {
+      if (parts.length === 0) return null;
+      parts.pop();
+      continue;
+    }
+    parts.push(part);
+  }
+  return parts.join("/");
+}
+
+export function resolveContentReferencePath(
+  sourcePath: string | null | undefined,
+  currentPath?: string | null,
+) {
+  if (typeof sourcePath !== "string" || !sourcePath.trim()) return null;
+  const normalized = sourcePath.replace(/\\/g, "/").trim();
+  if (/^[a-z][a-z0-9+.-]*:/i.test(normalized)) return null;
+  const base =
+    normalized.startsWith("./") || normalized.startsWith("../")
+      ? dirname(currentPath ?? "")
+      : "";
+  return normalizePathParts(base ? `${base}/${normalized}` : normalized);
+}
+
+export function ContentReferencePreview({
+  sourcePath,
+  currentPath,
+  title,
+  className,
+  referenceDepth = 0,
+}: {
+  sourcePath?: string | null;
+  currentPath?: string | null;
+  title?: string | null;
+  className?: string;
+  referenceDepth?: number;
+}) {
+  const t = useT();
+  const navigate = useNavigate();
+  const documentsQuery = useDocuments();
+  const resolvedPath = useMemo(
+    () => resolveContentReferencePath(sourcePath, currentPath),
+    [currentPath, sourcePath],
+  );
+  const document = useMemo(() => {
+    if (!resolvedPath) return null;
+    return (documentsQuery.data ?? []).find(
+      (candidate) =>
+        candidate.source?.mode === "local-files" &&
+        trimSlashes(candidate.source.path ?? "") === resolvedPath,
+    );
+  }, [documentsQuery.data, resolvedPath]);
+  const documentQuery = useDocument(document?.id ?? null);
+  const body = documentQuery.data?.content ?? "";
+  const displayTitle =
+    title?.trim() ||
+    documentQuery.data?.title ||
+    document?.title ||
+    t("editor.reference.defaultTitle");
+  const isSelfReference =
+    !!resolvedPath &&
+    !!currentPath &&
+    resolvedPath === trimSlashes(currentPath);
+  const isNestedTooDeep = referenceDepth >= MAX_CONTENT_REFERENCE_PREVIEW_DEPTH;
+
+  return (
+    <section
+      className={cn(
+        "content-reference-preview my-4 rounded-md border border-dashed bg-muted/20 text-sm",
+        className,
+      )}
+      data-content-reference={resolvedPath ?? sourcePath ?? ""}
+    >
+      <div className="flex min-h-10 items-center gap-2 border-b px-3 py-2">
+        <IconFileText className="size-4 shrink-0 text-muted-foreground" />
+        <div className="min-w-0 flex-1">
+          <div className="truncate font-medium text-foreground">
+            {displayTitle}
+          </div>
+          <div className="truncate text-xs text-muted-foreground">
+            {resolvedPath ?? sourcePath ?? t("editor.reference.pathMissing")}
+          </div>
+        </div>
+        {document ? (
+          <Button
+            type="button"
+            size="sm"
+            variant="ghost"
+            className="h-8 gap-1.5 px-2 text-xs"
+            onClick={() =>
+              navigate(`/page/${document.id}`, { flushSync: true })
+            }
+          >
+            <IconExternalLink className="size-3.5" />
+            {t("editor.reference.open")}
+          </Button>
+        ) : null}
+      </div>
+      <div className="max-h-[520px] overflow-auto px-3 py-3">
+        {!resolvedPath ? (
+          <div className="text-sm text-muted-foreground">
+            {t("editor.reference.missingPath")}
+          </div>
+        ) : isSelfReference ? (
+          <div className="text-sm text-muted-foreground">
+            {t("editor.reference.selfReference")}
+          </div>
+        ) : documentsQuery.isLoading ? (
+          <div className="text-sm text-muted-foreground">
+            {t("editor.reference.loading")}
+          </div>
+        ) : !document ? (
+          <div className="text-sm text-muted-foreground">
+            {t("editor.reference.notFound")}
+          </div>
+        ) : documentQuery.isLoading ? (
+          <div className="text-sm text-muted-foreground">
+            {t("editor.reference.loading")}
+          </div>
+        ) : documentQuery.isError ? (
+          <div className="text-sm text-muted-foreground">
+            {t("editor.reference.loadError")}
+          </div>
+        ) : isNestedTooDeep ? (
+          <div className="text-sm text-muted-foreground">
+            {t("editor.reference.nestedSkipped")}
+          </div>
+        ) : body.trim() ? (
+          <Suspense
+            fallback={
+              <div className="text-sm text-muted-foreground">
+                {t("editor.reference.loading")}
+              </div>
+            }
+          >
+            <ReadonlyReferenceEditor
+              key={document.id}
+              documentId={document.id}
+              content={body}
+              onChange={() => {}}
+              editable={false}
+              localFileMode
+              localFilePath={resolvedPath}
+              referenceDepth={referenceDepth + 1}
+            />
+          </Suspense>
+        ) : (
+          <div className="text-sm text-muted-foreground">
+            {t("editor.reference.empty")}
+          </div>
+        )}
+      </div>
+    </section>
+  );
+}