@agent-native/core 0.92.7 → 0.92.9

package/corpus/templates/design/actions/delete-file.ts

@@ -4,21 +4,12 @@ import { and, eq } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
+import { mutateDesignData } from "../server/lib/design-data-mutation.js";
 
 function isRecord(value: unknown): value is Record<string, unknown> {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 
-function parseDesignData(value: unknown): Record<string, unknown> {
-  if (typeof value !== "string" || !value.trim()) return {};
-  try {
-    const parsed = JSON.parse(value);
-    return isRecord(parsed) ? parsed : {};
-  } catch {
-    return {};
-  }
-}
-
 function pruneKeyedRecord(
   value: unknown,
   fileId: string,
@@ -100,30 +91,24 @@ export default defineAction({
 
     await assertAccess("design", file.designId, "editor");
 
-    const now = new Date().toISOString();
-
-    await db.transaction(async (tx) => {
-      const [currentDesign] = await tx
-        .select({ data: schema.designs.data })
-        .from(schema.designs)
-        .where(eq(schema.designs.id, file.designId))
-        .limit(1);
-      const nextData = pruneDeletedFileMetadata(
-        parseDesignData(currentDesign?.data),
-        id,
-      );
-
-      await tx.delete(schema.designFiles).where(eq(schema.designFiles.id, id));
-
-      // Update the parent design's board metadata and updatedAt timestamp.
-      await tx
-        .update(schema.designs)
-        .set({
-          data: JSON.stringify({ ...nextData, updatedAt: now }),
-          updatedAt: now,
-        })
-        .where(eq(schema.designs.id, file.designId));
-    });
+    const pruneMetadata = () =>
+      mutateDesignData({
+        designId: file.designId,
+        mutate: (current, { updatedAt }) => ({
+          ...pruneDeletedFileMetadata(current, id),
+          updatedAt,
+        }),
+        isApplied: (current) =>
+          JSON.stringify(pruneDeletedFileMetadata(current, id)) ===
+          JSON.stringify(current),
+      });
+
+    // Prune before deletion so a retry never loses the parent design id, then
+    // prune once more after deletion to close the small window where another
+    // editor could have refreshed metadata for the still-existing file.
+    await pruneMetadata();
+    await db.delete(schema.designFiles).where(eq(schema.designFiles.id, id));
+    await pruneMetadata();
 
     return { id, deleted: true };
   },

package/corpus/templates/design/actions/deploy-design-preview.ts

@@ -32,17 +32,16 @@ import {
 } from "@agent-native/core/server";
 import { getRequestUserEmail } from "@agent-native/core/server/request-context";
 import { assertAccess, resolveAccess } from "@agent-native/core/sharing";
-import { eq } from "drizzle-orm";
 import { z } from "zod";
 
-import { getDb, schema } from "../server/db/index.js";
 import "../server/db/index.js"; // ensure registerShareableResource runs
+import { mutateDesignData } from "../server/lib/design-data-mutation.js";
 import {
   resolveSourceCapabilities,
   resolveFusionCapabilities,
 } from "../shared/capability-resolver.js";
 import { hasCapability } from "../shared/design-source-capabilities.js";
-import { normalizeDesignSourceType } from "../shared/source-mode.js";
+import { designSourceTypeFromData } from "../shared/source-mode.js";
 
 // ─── Helpers ──────────────────────────────────────────────────────────────────
 
@@ -126,8 +125,6 @@ export default defineAction({
       ),
   }),
   run: async ({ designId, branchName }) => {
-    const db = getDb();
-
     // ── Access check (editor level required for deploys) ────────────────────
     await assertAccess("design", designId, "editor");
     const access = await resolveAccess("design", designId);
@@ -140,8 +137,7 @@ export default defineAction({
 
     // ── Source type + capability check ──────────────────────────────────────
     const designData = parseDesignData(resource.data);
-    const sourceType =
-      normalizeDesignSourceType(designData["sourceType"]) ?? "inline";
+    const sourceType = designSourceTypeFromData(designData);
 
     // For fusion sources, resolve the Builder connection status first so that
     // resolveFusionCapabilities returns the CONNECTED map (with deployPreview
@@ -228,28 +224,64 @@ export default defineAction({
 
     // ── Persist preview URL + deploy status into the branch entry ────────────
     const now = new Date().toISOString();
-    const updatedBranches = branches.map((b) => {
-      if (b.branchName?.toLowerCase() !== branch!.branchName!.toLowerCase()) {
-        return b;
-      }
-      return {
-        ...b,
-        previewUrl: builderResult.url,
-        deployStatus: builderResult.status,
-        lastDeployedAt: now,
-      };
-    });
-
-    const updatedData = JSON.stringify({
-      ...designData,
-      branches: updatedBranches,
+    const targetBranchName = branch.branchName;
+    await mutateDesignData({
+      designId,
+      mutate: (current) => {
+        const latestBranches = Array.isArray(current.branches)
+          ? current.branches
+          : [];
+        let found = false;
+        const updatedBranches = latestBranches.map((candidate) => {
+          if (
+            candidate === null ||
+            typeof candidate !== "object" ||
+            Array.isArray(candidate)
+          ) {
+            return candidate;
+          }
+          const stored = candidate as StoredBranchEntry;
+          if (
+            stored.branchName?.toLowerCase() !== targetBranchName.toLowerCase()
+          ) {
+            return candidate;
+          }
+          found = true;
+          return {
+            ...stored,
+            previewUrl: builderResult.url,
+            deployStatus: builderResult.status,
+            lastDeployedAt: now,
+          };
+        });
+        if (!found) {
+          throw new Error(
+            `Branch "${targetBranchName}" was removed while its preview was building. The preview was not attached to stale design data.`,
+          );
+        }
+        return { ...current, branches: updatedBranches };
+      },
+      isApplied: (current) =>
+        Array.isArray(current.branches) &&
+        current.branches.some((candidate) => {
+          if (
+            candidate === null ||
+            typeof candidate !== "object" ||
+            Array.isArray(candidate)
+          ) {
+            return false;
+          }
+          const stored = candidate as StoredBranchEntry;
+          return (
+            stored.branchName?.toLowerCase() ===
+              targetBranchName.toLowerCase() &&
+            stored.previewUrl === builderResult.url &&
+            stored.deployStatus === builderResult.status &&
+            stored.lastDeployedAt === now
+          );
+        }),
     });
 
-    await db
-      .update(schema.designs)
-      .set({ data: updatedData, updatedAt: now })
-      .where(eq(schema.designs.id, designId));
-
     return {
       designId,
       sourceType,

package/corpus/templates/design/actions/deploy-fusion-app.ts

@@ -17,14 +17,13 @@ import {
   reserveFusionHostingSlug,
 } from "@agent-native/core/server";
 import { assertAccess } from "@agent-native/core/sharing";
-import { eq } from "drizzle-orm";
 import { z } from "zod";
 
-import { getDb, schema } from "../server/db/index.js";
+import { schema } from "../server/db/index.js";
 import "../server/db/index.js"; // ensure registerShareableResource runs
+import { mutateDesignData } from "../server/lib/design-data-mutation.js";
 import {
   FULL_APP_BUILDING_ENABLED,
-  parseDesignDataBlob,
   readFusionApp,
   writeFusionApp,
 } from "../shared/full-app.js";
@@ -100,19 +99,27 @@ export default defineAction({
 
     const deployedUrl = getFusionHostingUrl(reservedSlug);
     const now = new Date().toISOString();
-    const db = getDb();
-    const nextData = writeFusionApp(parseDesignDataBlob(design.data), {
-      ...fusionApp,
-      hostingSlug: reservedSlug,
-      deployedUrl,
-      lastDeployId: deploy.deployId,
-      lastDeployStatus: deploy.status,
-      updatedAt: now,
+    await mutateDesignData({
+      designId,
+      mutate: (current) =>
+        writeFusionApp(current, {
+          ...(readFusionApp(current) ?? fusionApp),
+          hostingSlug: reservedSlug,
+          deployedUrl,
+          lastDeployId: deploy.deployId,
+          lastDeployStatus: deploy.status,
+          updatedAt: now,
+        }),
+      isApplied: (current) => {
+        const persisted = readFusionApp(current);
+        return (
+          persisted?.hostingSlug === reservedSlug &&
+          persisted.deployedUrl === deployedUrl &&
+          persisted.lastDeployId === deploy.deployId &&
+          persisted.lastDeployStatus === deploy.status
+        );
+      },
     });
-    await db
-      .update(schema.designs)
-      .set({ data: JSON.stringify(nextData), updatedAt: now })
-      .where(eq(schema.designs.id, designId));
 
     return {
       deployId: deploy.deployId,

package/corpus/templates/design/actions/export-pdf.ts

@@ -4,6 +4,7 @@ import { eq } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
+import { designDataForAccessRole } from "../server/lib/design-data-access.js";
 import { injectHiddenLayerExportStyle } from "../server/lib/design-export.js";
 import { isBoardFile } from "../shared/board-file.js";
 import "../server/db/index.js"; // ensure registerShareableResource runs
@@ -36,7 +37,7 @@ export default defineAction({
       title: row.title,
       description: row.description,
       projectType: row.projectType,
-      data: row.data ?? null,
+      data: designDataForAccessRole(row.data ?? null, access.role),
       files: exportFiles.map((f) => ({
         id: f.id,
         filename: f.filename,

package/corpus/templates/design/actions/export-zip.ts

@@ -4,6 +4,7 @@ import { eq } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
+import { designDataForAccessRole } from "../server/lib/design-data-access.js";
 import {
   exportFilename,
   injectHiddenLayerExportStyle,
@@ -83,9 +84,14 @@ export default defineAction({
       zip.file(filename, content);
     }
 
-    // Add design data if present
-    if (row.data) {
-      zip.file(`${METADATA_ARCHIVE_DIR}/design-data.json`, row.data);
+    // Add design data if present. Public/viewer exports keep render metadata
+    // but must never serialize a localhost bridge token into the archive.
+    const exportDesignData = designDataForAccessRole(
+      row.data ?? null,
+      access.role,
+    );
+    if (typeof exportDesignData === "string") {
+      zip.file(`${METADATA_ARCHIVE_DIR}/design-data.json`, exportDesignData);
     }
 
     // Generate ZIP

package/corpus/templates/design/actions/generate-design.ts

@@ -16,6 +16,7 @@ import { nanoid } from "nanoid";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
+import { mutateDesignData } from "../server/lib/design-data-mutation.js";
 import {
   readLiveSourceFile,
   writeInlineSourceFile,
@@ -23,6 +24,7 @@ import {
 } from "../server/source-workspace.js";
 import {
   mergeCanvasFramePlacements,
+  parseCanvasFrameGeometryById,
   type CanvasFramePlacement,
 } from "../shared/canvas-frames.js";
 import {
@@ -51,6 +53,10 @@ function isRenderableDesignFile(file: {
   );
 }
 
+function jsonValuesEqual(left: unknown, right: unknown): boolean {
+  return JSON.stringify(left) === JSON.stringify(right);
+}
+
 async function updateGenerationSessionForSavedFiles(
   designId: string,
   savedFilenames: string[],
@@ -292,6 +298,15 @@ const generateDesignAction = defineAction({
       );
     }
 
+    // Validate row existence and designs.data before writing files. The final
+    // mutation still re-reads the latest revision after file work; this
+    // preflight prevents malformed JSON from orphaning new files.
+    await mutateDesignData({
+      designId,
+      mutate: (current) => current,
+      isApplied: () => true,
+    });
+
     const existingByName = new Map(existingFiles.map((f) => [f.filename, f]));
 
     // Stamp missing data-agent-native-node-id attributes before persisting so
@@ -371,6 +386,9 @@ const generateDesignAction = defineAction({
           filename: file.filename,
           fileType: file.fileType ?? "html",
           content: file.content,
+          contentOperationSource: null,
+          contentOperationRevision: null,
+          contentOperationResultHash: null,
           createdAt: now,
           updatedAt: now,
         });
@@ -396,6 +414,9 @@ const generateDesignAction = defineAction({
           filename: file.filename,
           fileType: file.fileType ?? "html",
           content: file.content,
+          contentOperationSource: null,
+          contentOperationRevision: null,
+          contentOperationResultHash: null,
           createdAt: now,
           updatedAt: now,
         });
@@ -408,24 +429,9 @@ const generateDesignAction = defineAction({
       }
     }
 
-    // Update design metadata
-    const designUpdates: Record<string, unknown> = { updatedAt: now };
-    if (designSystemId !== undefined) {
-      designUpdates.designSystemId = designSystemId;
-    }
-    if (projectType !== undefined) {
-      designUpdates.projectType = projectType;
-    }
-
     // Merge with existing data so tweak definitions survive content updates.
     // The data column is a free-form JSON blob; we own these keys here and
     // leave anything else intact.
-    //
-    // Wrapped in a transaction so that concurrent generate-design calls for the
-    // same design (e.g. the parallel fan-out from generate-screens) each read
-    // the latest canvasFrames and merge their own placement on top, rather than
-    // all reading the same stale snapshot and the last writer silently
-    // discarding the others' frame coordinates.
     let placedFrames:
       | Array<{
           fileId: string;
@@ -433,68 +439,99 @@ const generateDesignAction = defineAction({
           frame: CanvasFramePlacement;
         }>
       | undefined;
-    await db.transaction(async (tx) => {
-      const [existingDesign] = await tx
-        .select({ data: schema.designs.data })
-        .from(schema.designs)
-        .where(eq(schema.designs.id, designId));
-      let prevData: Record<string, unknown> = {};
-      if (existingDesign?.data) {
-        try {
-          const parsed = JSON.parse(existingDesign.data);
-          if (parsed && typeof parsed === "object") prevData = parsed;
-        } catch {
-          // Stale or invalid JSON — start fresh.
+    const normalizedTweaks = tweaks?.map((tweak) => ({
+      ...tweak,
+      type: tweak.type === "color-swatches" ? "color-swatch" : tweak.type,
+    }));
+    await mutateDesignData({
+      designId,
+      mutate: (prevData) => {
+        const mergedData: Record<string, unknown> = {
+          ...prevData,
+          lastPrompt: prompt,
+          generatedAt: now,
+          fileCount: files.length,
+        };
+        if (normalizedTweaks !== undefined) {
+          mergedData.tweaks = normalizedTweaks;
         }
-      }
-      const mergedData: Record<string, unknown> = {
-        ...prevData,
-        lastPrompt: prompt,
-        generatedAt: now,
-        fileCount: files.length,
-      };
-      if (tweaks !== undefined) {
-        mergedData.tweaks = tweaks.map((tweak) => ({
-          ...tweak,
-          type: tweak.type === "color-swatches" ? "color-swatch" : tweak.type,
-        }));
-      }
-      if (canvasFrames !== undefined) {
-        const savedByFileId = new Map(
-          savedFiles.map((file) => [file.id, file]),
-        );
-        const savedByFilename = new Map(
-          savedFiles.map((file) => [file.filename, file]),
+        if (canvasFrames !== undefined) {
+          const savedByFileId = new Map(
+            savedFiles.map((file) => [file.id, file]),
+          );
+          const savedByFilename = new Map(
+            savedFiles.map((file) => [file.filename, file]),
+          );
+          const existingByFileId = new Map(
+            existingFiles.map((file) => [file.id, file]),
+          );
+          const merged = mergeCanvasFramePlacements({
+            existing: prevData.canvasFrames,
+            placements: canvasFrames,
+            resolveFileId: (placement) => {
+              if (placement.fileId) {
+                return savedByFileId.has(placement.fileId) ||
+                  existingByFileId.has(placement.fileId)
+                  ? placement.fileId
+                  : undefined;
+              }
+              return placement.filename
+                ? (savedByFilename.get(placement.filename)?.id ??
+                    existingByName.get(placement.filename)?.id)
+                : undefined;
+            },
+          });
+          mergedData.canvasFrames = merged.canvasFrames;
+          placedFrames = merged.placedFrames;
+        }
+        return mergedData;
+      },
+      isApplied: (current) => {
+        if (
+          current.lastPrompt !== prompt ||
+          current.generatedAt !== now ||
+          current.fileCount !== files.length ||
+          (normalizedTweaks !== undefined &&
+            !jsonValuesEqual(current.tweaks, normalizedTweaks))
+        ) {
+          return false;
+        }
+        if (canvasFrames === undefined) return true;
+
+        const currentFrames = parseCanvasFrameGeometryById(
+          current.canvasFrames,
         );
-        const existingByFileId = new Map(
-          existingFiles.map((file) => [file.id, file]),
+        return Boolean(
+          placedFrames?.every(({ fileId, frame }) => {
+            const currentFrame = currentFrames[fileId];
+            return (
+              currentFrame !== undefined &&
+              Object.entries(frame).every(
+                ([key, value]) =>
+                  currentFrame[key as keyof typeof currentFrame] === value,
+              )
+            );
+          }),
         );
-        const merged = mergeCanvasFramePlacements({
-          existing: prevData.canvasFrames,
-          placements: canvasFrames,
-          resolveFileId: (placement) => {
-            if (placement.fileId) {
-              return savedByFileId.has(placement.fileId) ||
-                existingByFileId.has(placement.fileId)
-                ? placement.fileId
-                : undefined;
-            }
-            return placement.filename
-              ? (savedByFilename.get(placement.filename)?.id ??
-                  existingByName.get(placement.filename)?.id)
-              : undefined;
-          },
-        });
-        mergedData.canvasFrames = merged.canvasFrames;
-        placedFrames = merged.placedFrames;
-      }
-      designUpdates.data = JSON.stringify(mergedData);
+      },
+    });
 
-      await tx
+    // designs.data/updatedAt are helper-owned. Keep the optional static column
+    // behavior without writing another whole data snapshot or regressing the
+    // helper's monotonic updatedAt revision.
+    const designUpdates: Record<string, unknown> = {};
+    if (designSystemId !== undefined) {
+      designUpdates.designSystemId = designSystemId;
+    }
+    if (projectType !== undefined) {
+      designUpdates.projectType = projectType;
+    }
+    if (Object.keys(designUpdates).length > 0) {
+      await db
         .update(schema.designs)
         .set(designUpdates)
         .where(eq(schema.designs.id, designId));
-    });
+    }
 
     await updateGenerationSessionForSavedFiles(
       designId,

package/corpus/templates/design/actions/get-component-details.ts

@@ -31,7 +31,7 @@ import {
   type ComponentInstance,
 } from "../shared/component-model.js";
 import { hasCapability } from "../shared/design-source-capabilities.js";
-import { normalizeDesignSourceType } from "../shared/source-mode.js";
+import { designSourceTypeFromData } from "../shared/source-mode.js";
 
 function parseJson<T>(raw: string | null | undefined, fallback: T): T {
   if (!raw) return fallback;
@@ -74,24 +74,8 @@ export default defineAction({
     if (!access) throw new Error("Design not found");
 
     // ── Source type + capabilities ───────────────────────────────────────────
-    let rawSourceType: unknown = "inline";
     const rawData = (access.resource as { data?: unknown }).data;
-    if (typeof rawData === "string") {
-      try {
-        const parsed: unknown = JSON.parse(rawData);
-        if (
-          parsed !== null &&
-          typeof parsed === "object" &&
-          "sourceType" in (parsed as object)
-        ) {
-          rawSourceType = (parsed as { sourceType: unknown }).sourceType;
-        }
-      } catch {
-        // Default to inline.
-      }
-    }
-
-    const sourceType = normalizeDesignSourceType(rawSourceType) ?? "inline";
+    const sourceType = designSourceTypeFromData(rawData);
     const caps = resolveSourceCapabilities(sourceType);
     const canResolveToFile = hasCapability(caps, "resolveNodeToFile");
     const hasFullIndex = hasCapability(caps, "indexComponents");

package/corpus/templates/design/actions/get-design-branch-diff.ts

@@ -33,7 +33,7 @@ import type {
   VisualDiffChangeKind,
 } from "../shared/design-review.js";
 import { hasCapability } from "../shared/design-source-capabilities.js";
-import { normalizeDesignSourceType } from "../shared/source-mode.js";
+import { designSourceTypeFromData } from "../shared/source-mode.js";
 
 // ─── Types ────────────────────────────────────────────────────────────────────
 
@@ -209,8 +209,7 @@ export default defineAction({
 
     // ── Source type + capability check ──────────────────────────────────────
     const designData = parseDesignData(resource.data);
-    const sourceType =
-      normalizeDesignSourceType(designData["sourceType"]) ?? "inline";
+    const sourceType = designSourceTypeFromData(designData);
     const caps = resolveSourceCapabilities(sourceType);
 
     // For inline/localhost without branch capability, return a CTA.

package/corpus/templates/design/actions/get-design-surface-index.ts

@@ -25,7 +25,7 @@ import type {
   DesignBreakpoint,
   DesignStateKind,
 } from "../shared/design-surface-index.js";
-import { normalizeDesignSourceType } from "../shared/source-mode.js";
+import { designSourceTypeFromData } from "../shared/source-mode.js";
 
 // ─── Helpers ──────────────────────────────────────────────────────────────────
 
@@ -449,24 +449,8 @@ export default defineAction({
     const db = getDb();
 
     // ── Resolve source type ──────────────────────────────────────────────────
-    let rawSourceType: unknown = "inline";
     const rawData = (access.resource as { data?: unknown }).data;
-    if (typeof rawData === "string") {
-      try {
-        const parsed: unknown = JSON.parse(rawData);
-        if (
-          parsed !== null &&
-          typeof parsed === "object" &&
-          !Array.isArray(parsed) &&
-          "sourceType" in (parsed as object)
-        ) {
-          rawSourceType = (parsed as { sourceType: unknown }).sourceType;
-        }
-      } catch {
-        // Stale/invalid JSON — default to "inline".
-      }
-    }
-    const sourceType = normalizeDesignSourceType(rawSourceType) ?? "inline";
+    const sourceType = designSourceTypeFromData(rawData);
     const capabilities = resolveSourceCapabilities(sourceType);
     const availableCapabilities = Object.entries(capabilities)
       .filter(([, entry]) => entry.status === "available")

package/corpus/templates/design/actions/get-design.ts

@@ -4,6 +4,7 @@ import { eq } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
+import { designDataForAccessRole } from "../server/lib/design-data-access.js";
 import "../server/db/index.js"; // ensure registerShareableResource runs
 
 export default defineAction({
@@ -37,7 +38,7 @@ export default defineAction({
       description: row.description,
       projectType: row.projectType,
       designSystemId: row.designSystemId,
-      data: row.data ?? null,
+      data: designDataForAccessRole(row.data ?? null, access.role),
       visibility: row.visibility,
       createdAt: row.createdAt,
       updatedAt: row.updatedAt,