@agent-native/core 0.92.7 → 0.92.8

package/corpus/templates/design/actions/apply-component-prop-edit.ts

@@ -57,7 +57,7 @@ import {
   componentNodeIdMatches,
 } 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";
 import { sourceContentHash } from "../shared/source-workspace.js";
 
 // ─── Helpers ──────────────────────────────────────────────────────────────────
@@ -241,24 +241,8 @@ export default defineAction({
     if (!access) throw new Error("Design not found");
 
     // ── Source type + capability gate ────────────────────────────────────────
-    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);
 
     // Real-app sources gate on `applyEdit` (bridge write hardening).

package/corpus/templates/design/actions/apply-design-token-edit.ts

@@ -1,11 +1,13 @@
 import { defineAction } from "@agent-native/core";
 import { buildDeepLink } 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 "../server/db/index.js"; // ensure registerShareableResource runs
+import {
+  mutateDesignData,
+  type DesignDataRecord,
+} from "../server/lib/design-data-mutation.js";
 import {
   INLINE_DEFAULT_CAPABILITIES,
   hasCapability,
@@ -53,6 +55,25 @@ function designDeepLink(designId: string): string {
   });
 }
 
+type TweakDef = Parameters<typeof resolveTweaksToCssVars>[0][number];
+type TweakSelections = Record<string, string | number | boolean>;
+
+function readTweaks(data: DesignDataRecord): TweakDef[] {
+  return Array.isArray(data.tweaks) ? (data.tweaks as TweakDef[]) : [];
+}
+
+function readSelections(data: DesignDataRecord): TweakSelections {
+  return data.tweakSelections &&
+    typeof data.tweakSelections === "object" &&
+    !Array.isArray(data.tweakSelections)
+    ? (data.tweakSelections as TweakSelections)
+    : {};
+}
+
+function selectionKeyForCssVar(tweaks: TweakDef[], cssVar: string): string {
+  return tweaks.find((tweak) => tweak.cssVar === cssVar)?.id ?? cssVar;
+}
+
 // ---------------------------------------------------------------------------
 // Action — persist token edit through the Tweaks loop (Tier-A)
 // ---------------------------------------------------------------------------
@@ -93,87 +114,35 @@ export default defineAction({
     // sourceRef will be used once real write-back is implemented
     void sourceRef;
 
-    const db = getDb();
-    const now = new Date().toISOString();
-
-    // ------------------------------------------------------------------
-    // Load current design data
-    // ------------------------------------------------------------------
-    const [existingDesign] = await db
-      .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" && !Array.isArray(parsed)) {
-          prevData = parsed;
+    // Merge against the latest designs.data revision. Each retry re-resolves
+    // cssVar -> tweak id so a concurrent tweak-definition change cannot leave
+    // the value under a stale key.
+    const { data: persistedData } = await mutateDesignData({
+      designId,
+      mutate: (prevData, { updatedAt }) => {
+        const tweaks = readTweaks(prevData);
+        const newSelections = { ...readSelections(prevData) };
+        for (const { cssVar, value } of edits) {
+          newSelections[selectionKeyForCssVar(tweaks, cssVar)] = value;
         }
-      } catch {
-        // Stale/invalid JSON — start fresh but never drop the column.
-      }
-    }
-
-    type TweakDef = Parameters<typeof resolveTweaksToCssVars>[0][number];
-    const tweaks: TweakDef[] = Array.isArray(prevData.tweaks)
-      ? (prevData.tweaks as TweakDef[])
-      : [];
-
-    // Map cssVar -> tweakId for known tweaks
-    const cssVarToTweakId = new Map<string, string>();
-    for (const t of tweaks) {
-      if (t.cssVar) cssVarToTweakId.set(t.cssVar, t.id);
-    }
-
-    const prevSelections: Record<string, string | number | boolean> =
-      prevData.tweakSelections &&
-      typeof prevData.tweakSelections === "object" &&
-      !Array.isArray(prevData.tweakSelections)
-        ? (prevData.tweakSelections as Record<
-            string,
-            string | number | boolean
-          >)
-        : {};
-
-    // ------------------------------------------------------------------
-    // Merge edits into tweakSelections
-    // ------------------------------------------------------------------
-    // For each edit:
-    //   - If the cssVar maps to a known tweak, persist by tweakId (the standard
-    //     Tweaks loop key) so apply-tweaks, get-design-snapshot, and the bridge
-    //     script all pick it up consistently.
-    //   - If the cssVar does NOT map to a known tweak, we synthesise a minimal
-    //     tweak entry and persist via the raw cssVar key so the bridge script
-    //     (`TWEAK_BRIDGE_SCRIPT`) still applies it.
-    const newSelections = { ...prevSelections };
-
-    for (const { cssVar, value } of edits) {
-      const tweakId = cssVarToTweakId.get(cssVar);
-      if (tweakId) {
-        newSelections[tweakId] = value;
-      } else {
-        // Fallback: persist using the cssVar as the key — the bridge script
-        // calls documentElement.style.setProperty with the key directly, so
-        // any key starting with "--" is applied as-is.
-        newSelections[cssVar] = value;
-      }
-    }
-
-    // ------------------------------------------------------------------
-    // Persist — same atomic write as apply-tweaks
-    // ------------------------------------------------------------------
-    const mergedData: Record<string, unknown> = {
-      ...prevData,
-      tweakSelections: newSelections,
-      tweaksAppliedAt: now,
-    };
-
-    await db
-      .update(schema.designs)
-      .set({ data: JSON.stringify(mergedData), updatedAt: now })
-      .where(eq(schema.designs.id, designId));
+        return {
+          ...prevData,
+          tweakSelections: newSelections,
+          tweaksAppliedAt: updatedAt,
+        };
+      },
+      isApplied: (data) => {
+        const tweaks = readTweaks(data);
+        const selections = readSelections(data);
+        return edits.every(
+          ({ cssVar, value }) =>
+            selections[selectionKeyForCssVar(tweaks, cssVar)] === value,
+        );
+      },
+    });
+
+    const tweaks = readTweaks(persistedData);
+    const newSelections = readSelections(persistedData);
 
     // Resolve to full CSS var map for the response (so the caller can send a
     // tweak-values postMessage without a separate round-trip)

package/corpus/templates/design/actions/apply-tweaks.ts

@@ -1,11 +1,14 @@
 import { defineAction } from "@agent-native/core";
 import { buildDeepLink } 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 "../server/db/index.js"; // ensure registerShareableResource runs
+import {
+  mutateDesignData,
+  type DesignDataRecord,
+} from "../server/lib/design-data-mutation.js";
+import { tweakSelectionsHash } from "../shared/resolve-tweaks.js";
 
 /** Editor deep link so external agents can surface "Open design". */
 function designDeepLink(designId: string): string {
@@ -16,6 +19,17 @@ function designDeepLink(designId: string): string {
   });
 }
 
+export class TweakSelectionsConflictError extends Error {
+  readonly statusCode = 409;
+
+  constructor() {
+    super(
+      "Tweak values changed elsewhere before this edit could be saved. Refresh the design and try again.",
+    );
+    this.name = "TweakSelectionsConflictError";
+  }
+}
+
 export default defineAction({
   description:
     "Persist the user's live tweak knob values (accent color, density, " +
@@ -35,53 +49,61 @@ export default defineAction({
           "e.g. { 'theme-accent': '#0EA5E9', 'border-radius': 12, " +
           "'dark-mode': true }",
       ),
+    expectedSelectionsHash: z
+      .string()
+      .min(1)
+      .max(128)
+      .optional()
+      .describe(
+        "Optimistic-concurrency hash of the persisted tweak selection map this full snapshot was based on.",
+      ),
   }),
-  run: async ({ designId, selections }) => {
+  run: async ({ designId, selections, expectedSelectionsHash }) => {
     await assertAccess("design", designId, "editor");
 
-    const db = getDb();
-    const now = new Date().toISOString();
-
-    // Additive JSON merge: keep every other key in designs.data intact, only
-    // merge into the tweakSelections sub-object.
-    const [existingDesign] = await db
-      .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" && !Array.isArray(parsed)) {
-          prevData = parsed;
-        }
-      } catch {
-        // Stale/invalid JSON — start fresh but never drop the column.
-      }
-    }
-
-    const prevSelections =
-      prevData.tweakSelections &&
-      typeof prevData.tweakSelections === "object" &&
-      !Array.isArray(prevData.tweakSelections)
-        ? (prevData.tweakSelections as Record<string, unknown>)
+    const readSelections = (data: DesignDataRecord) =>
+      data.tweakSelections &&
+      typeof data.tweakSelections === "object" &&
+      !Array.isArray(data.tweakSelections)
+        ? (data.tweakSelections as Record<string, unknown>)
         : {};
+    const selectionsAreApplied = (persisted: Record<string, unknown>) =>
+      Object.entries(selections).every(
+        ([key, value]) => persisted[key] === value,
+      );
 
-    const mergedData = {
-      ...prevData,
-      tweakSelections: { ...prevSelections, ...selections },
-      tweaksAppliedAt: now,
-    };
-
-    await db
-      .update(schema.designs)
-      .set({ data: JSON.stringify(mergedData), updatedAt: now })
-      .where(eq(schema.designs.id, designId));
+    // Transactional CAS merge: keep every sibling key in designs.data and
+    // retry against the newest revision if another editor/action writes while
+    // this request is in flight.
+    const { data: persistedData } = await mutateDesignData({
+      designId,
+      mutate: (prevData, { updatedAt }) => {
+        const persistedSelections = readSelections(prevData);
+        const alreadyApplied = selectionsAreApplied(persistedSelections);
+        if (
+          expectedSelectionsHash !== undefined &&
+          tweakSelectionsHash(persistedSelections) !== expectedSelectionsHash &&
+          !alreadyApplied
+        ) {
+          throw new TweakSelectionsConflictError();
+        }
+        if (alreadyApplied) return prevData;
+        return {
+          ...prevData,
+          tweakSelections: { ...persistedSelections, ...selections },
+          tweaksAppliedAt: updatedAt,
+        };
+      },
+      isApplied: (data) => {
+        const persistedSelections = readSelections(data);
+        return selectionsAreApplied(persistedSelections);
+      },
+    });
 
     return {
       designId,
-      appliedTweaks: mergedData.tweakSelections,
+      appliedTweaks: readSelections(persistedData),
+      selectionsHash: tweakSelectionsHash(readSelections(persistedData)),
       deepLink: designDeepLink(designId),
     };
   },

package/corpus/templates/design/actions/capture-design-state.ts

@@ -13,7 +13,7 @@ import "../server/db/index.js"; // ensure registerShareableResource runs
 import { hasCapability } from "../shared/design-source-capabilities.js";
 import type { DesignSourceCapabilities } from "../shared/design-source-capabilities.js";
 import {
-  normalizeDesignSourceType,
+  designSourceTypeFromData,
   resolveDescriptorCapabilities,
   type DesignSourceDescriptor,
 } from "../shared/source-mode.js";
@@ -34,7 +34,7 @@ function resolveCapabilities(
     if (parsed.capabilities && typeof parsed.capabilities === "object") {
       return parsed.capabilities as DesignSourceCapabilities;
     }
-    const sourceType = normalizeDesignSourceType(parsed.sourceType) ?? "inline";
+    const sourceType = designSourceTypeFromData(parsed);
     const descriptor: DesignSourceDescriptor =
       sourceType === "fusion"
         ? { sourceType, connected: parsed.connected === true }

package/corpus/templates/design/actions/connect-localhost.ts

@@ -5,7 +5,7 @@ import {
   getRequestOrgId,
   getRequestUserEmail,
 } from "@agent-native/core/server/request-context";
-import { and, eq, sql } from "drizzle-orm";
+import { and, eq, isNull, sql } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
@@ -91,6 +91,17 @@ function stableConnectionId(
   return `localhost_${hash}`;
 }
 
+const PREVIEW_TOKEN_DOMAIN = "agent-native-design-preview-v1\0";
+
+/** One-way compatibility derivation shared with the core design-connect CLI. */
+export function derivePreviewToken(bridgeToken: string): string {
+  return crypto
+    .createHash("sha256")
+    .update(PREVIEW_TOKEN_DOMAIN)
+    .update(bridgeToken)
+    .digest("hex");
+}
+
 export default defineAction({
   description:
     "Register or refresh a localhost Design source connection produced by `agent-native design connect`. Stores the dev server URL, bridge URL, route manifest, and operation capabilities so the UI can later list local-code artboards.",
@@ -133,6 +144,12 @@ export default defineAction({
       .describe(
         "The bridge's real auth token minted at bridge start. Stored on the connection so grant-localhost-write-consent can read it without minting its own.",
       ),
+    previewToken: z
+      .string()
+      .optional()
+      .describe(
+        "Distinct read-only token for browser preview, snapshots, and live-edit bridge registration. Omit when passing bridgeToken to derive the compatible token automatically.",
+      ),
     status: z
       .enum(["connected", "detected", "manual", "error"])
       .optional()
@@ -181,6 +198,12 @@ export default defineAction({
         operation,
         status: "available" as const,
       }));
+    const ownerOrgScope = and(
+      eq(schema.designLocalhostConnections.ownerEmail, ownerEmail),
+      orgId
+        ? eq(schema.designLocalhostConnections.orgId, orgId)
+        : isNull(schema.designLocalhostConnections.orgId),
+    );
 
     // The id may already be taken by a DIFFERENT user (legacy ids were derived
     // from devServerUrl + rootPath without user scoping, so two users on the
@@ -189,15 +212,21 @@ export default defineAction({
     const existing = await db
       .select({
         ownerEmail: schema.designLocalhostConnections.ownerEmail,
+        orgId: schema.designLocalhostConnections.orgId,
+        previewToken: schema.designLocalhostConnections.previewToken,
         bridgeToken: schema.designLocalhostConnections.bridgeToken,
       })
       .from(schema.designLocalhostConnections)
       .where(eq(schema.designLocalhostConnections.id, id))
       .limit(1);
 
-    if (existing[0] && existing[0].ownerEmail !== ownerEmail) {
+    if (
+      existing[0] &&
+      (existing[0].ownerEmail !== ownerEmail ||
+        (existing[0].orgId ?? null) !== orgId)
+    ) {
       throw new Error(
-        `Connection id "${id}" already belongs to another user. ` +
+        `Connection id "${id}" already belongs to another user or organization. ` +
           "Omit id so a per-user connection id is derived instead.",
       );
     }
@@ -209,6 +238,13 @@ export default defineAction({
       explicitToken ||
       existing[0]?.bridgeToken ||
       crypto.randomBytes(32).toString("hex");
+    const explicitPreviewToken =
+      args.previewToken?.trim() ||
+      (explicitToken ? derivePreviewToken(nextBridgeToken) : undefined);
+    const nextPreviewToken =
+      explicitPreviewToken ||
+      existing[0]?.previewToken ||
+      derivePreviewToken(nextBridgeToken);
     const baseValues = {
       id,
       name: args.name ?? new URL(devServerUrl).host,
@@ -232,7 +268,12 @@ export default defineAction({
     // conflict a no-op.
     await db
       .insert(schema.designLocalhostConnections)
-      .values({ ...baseValues, bridgeToken: nextBridgeToken, createdAt: now })
+      .values({
+        ...baseValues,
+        previewToken: nextPreviewToken,
+        bridgeToken: nextBridgeToken,
+        createdAt: now,
+      })
       .onConflictDoUpdate({
         target: schema.designLocalhostConnections.id,
         set: {
@@ -240,24 +281,27 @@ export default defineAction({
           bridgeToken: explicitToken
             ? nextBridgeToken
             : sql`coalesce(${schema.designLocalhostConnections.bridgeToken}, excluded.bridge_token)`,
+          previewToken: explicitPreviewToken
+            ? nextPreviewToken
+            : sql`coalesce(${schema.designLocalhostConnections.previewToken}, excluded.preview_token)`,
         },
-        setWhere: eq(schema.designLocalhostConnections.ownerEmail, ownerEmail),
+        setWhere: ownerOrgScope,
       });
 
     // Return the token the row actually holds (owner-scoped, so a cross-user
     // no-op never leaks another user's token), not the one we minted — so
     // concurrent callers converge on the winner (no 401 on a lost race).
     const [stored] = await db
-      .select({ bridgeToken: schema.designLocalhostConnections.bridgeToken })
+      .select({
+        bridgeToken: schema.designLocalhostConnections.bridgeToken,
+        previewToken: schema.designLocalhostConnections.previewToken,
+      })
       .from(schema.designLocalhostConnections)
-      .where(
-        and(
-          eq(schema.designLocalhostConnections.id, id),
-          eq(schema.designLocalhostConnections.ownerEmail, ownerEmail),
-        ),
-      )
+      .where(and(eq(schema.designLocalhostConnections.id, id), ownerOrgScope))
       .limit(1);
     const effectiveBridgeToken = stored?.bridgeToken ?? nextBridgeToken;
+    const effectivePreviewToken =
+      stored?.previewToken ?? derivePreviewToken(effectiveBridgeToken);
 
     return {
       id,
@@ -271,6 +315,8 @@ export default defineAction({
       capabilities,
       status: args.status,
       lastSeenAt: now,
+      // Safe for Design browser previews. It cannot authorize filesystem calls.
+      previewToken: effectivePreviewToken,
       // Returned so the caller can start the bridge with
       // `design connect --bridge-token <this>`, matching this row.
       bridgeToken: effectiveBridgeToken,

package/corpus/templates/design/actions/create-component.ts

@@ -53,7 +53,7 @@ import {
   COMPONENT_PROP_PREFIX,
 } 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";
 
 // ─── Pure helpers ─────────────────────────────────────────────────────────────
 
@@ -259,24 +259,8 @@ export default defineAction({
     if (!access) throw new Error("Design not found");
 
     // ── Source type + capability gate ────────────────────────────────────────
-    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);
 
     // Real-app sources gate on `applyEdit` (bridge write hardening).

package/corpus/templates/design/actions/create-design-branch.ts

@@ -36,12 +36,13 @@ 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 ──────────────────────────────────────────────────────────────────
 
@@ -127,8 +128,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 branch/deploy
@@ -219,10 +219,6 @@ export default defineAction({
     });
 
     // ── Persist branch metadata into the design's data blob ─────────────────
-    const existingBranches = Array.isArray(designData["branches"])
-      ? (designData["branches"] as unknown[])
-      : [];
-
     const branchEntry = {
       branchName: builderResult.branchName,
       projectId: builderResult.projectId,
@@ -233,19 +229,43 @@ export default defineAction({
       createdAt: now,
     };
 
-    const updatedData = JSON.stringify({
-      ...designData,
-      branches: [...existingBranches, branchEntry],
-      // Upgrade the source type to fusion once a Builder branch is provisioned,
-      // so the capability matrix reflects the new real-app tier.
-      sourceType: "fusion",
+    await mutateDesignData({
+      designId,
+      mutate: (current) => {
+        const existingBranches = Array.isArray(current.branches)
+          ? current.branches
+          : [];
+        const alreadyAppended = existingBranches.some(
+          (candidate) =>
+            candidate !== null &&
+            typeof candidate === "object" &&
+            !Array.isArray(candidate) &&
+            (candidate as Record<string, unknown>).preSnapshotVersionId ===
+              versionId,
+        );
+        return {
+          ...current,
+          branches: alreadyAppended
+            ? existingBranches
+            : [...existingBranches, branchEntry],
+          // Upgrade the source type to fusion once a Builder branch is
+          // provisioned so the capability matrix reflects the real-app tier.
+          sourceType: "fusion",
+        };
+      },
+      isApplied: (current) =>
+        current.sourceType === "fusion" &&
+        Array.isArray(current.branches) &&
+        current.branches.some(
+          (candidate) =>
+            candidate !== null &&
+            typeof candidate === "object" &&
+            !Array.isArray(candidate) &&
+            (candidate as Record<string, unknown>).preSnapshotVersionId ===
+              versionId,
+        ),
     });
 
-    await db
-      .update(schema.designs)
-      .set({ data: updatedData, updatedAt: now })
-      .where(eq(schema.designs.id, designId));
-
     return {
       designId,
       sourceType: "fusion" as const,

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

@@ -20,15 +20,14 @@ import {
 } from "@agent-native/core/server";
 import { getRequestUserEmail } from "@agent-native/core/server/request-context";
 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 { resolveBuilderStatus } from "../shared/builder-app.js";
 import {
   FULL_APP_BUILDING_ENABLED,
-  parseDesignDataBlob,
   readFusionApp,
   writeFusionApp,
 } from "../shared/full-app.js";
@@ -170,23 +169,28 @@ export default defineAction({
     });
 
     const now = new Date().toISOString();
-    const db = getDb();
-    const nextData = writeFusionApp(parseDesignDataBlob(design.data), {
+    const nextFusionApp = {
       projectId: result.projectId,
       branchName: result.branchName,
       editorUrl: result.url,
-      status: "building",
+      status: "building" as const,
       statusMessage:
         "App is being generated. Call sync-fusion-app to check progress.",
       createdAt: now,
       updatedAt: now,
+    };
+    await mutateDesignData({
+      designId,
+      mutate: (current) => writeFusionApp(current, nextFusionApp),
+      isApplied: (current) => {
+        const persisted = readFusionApp(current);
+        return (
+          persisted?.projectId === result.projectId &&
+          persisted.branchName === result.branchName
+        );
+      },
     });
 
-    await db
-      .update(schema.designs)
-      .set({ data: JSON.stringify(nextData), updatedAt: now })
-      .where(eq(schema.designs.id, designId));
-
     return {
       status: "building" as const,
       designId,