@agent-native/core 0.90.1 → 0.90.2

package/corpus/templates/design/actions/apply-a11y-fix.ts

@@ -24,16 +24,17 @@ import {
   agentEnterDocument,
   agentLeaveDocument,
   agentUpdateSelection,
-  applyText,
-  getText,
-  hasCollabState,
-  seedFromText,
 } from "@agent-native/core/collab";
 import { accessFilter, assertAccess } from "@agent-native/core/sharing";
 import { and, eq } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
+import {
+  readLiveSourceFile,
+  writeInlineSourceFile,
+  type SourceWorkspaceFile,
+} from "../server/source-workspace.js";
 import { applyVisualEdit, type EditIntent } from "../shared/code-layer.js";
 import { agentSelectionDescriptor } from "../shared/collab-selection.js";
 import {
@@ -79,21 +80,6 @@ const findingSchema = z
 // Live-content + resolve/persist helpers (mirrors apply-visual-edit's scoped path)
 // ---------------------------------------------------------------------------
 
-async function liveContent(
-  fileId: string,
-  storedContent: string,
-): Promise<string> {
-  try {
-    if (await hasCollabState(fileId)) {
-      const live = await getText(fileId, "content");
-      if (typeof live === "string") return live;
-    }
-  } catch {
-    // Collab reads are best-effort; SQL content remains the fallback.
-  }
-  return storedContent;
-}
-
 async function resolveEditableDesignFile(source: {
   designId?: string;
   fileId?: string;
@@ -103,6 +89,7 @@ async function resolveEditableDesignFile(source: {
   designId: string;
   filename: string;
   content: string;
+  versionHash: string;
 }> {
   if (!source.fileId && !source.designId) {
     throw new Error("designId or fileId is required.");
@@ -152,42 +139,73 @@ async function resolveEditableDesignFile(source: {
   // Writes require editor access to the owning design.
   await assertAccess("design", file.designId, "editor");
 
+  // Read the LIVE base (collab text when present, else the SQL row) ONCE
+  // here and capture its versionHash. This is the actual base the deterministic
+  // edit engine transforms in run() below, so this hash — not a fresh re-read
+  // computed at persist time — is what proves the transform's input is still
+  // current when persistDesignFileEdit writes. Mirrors apply-visual-edit.ts's
+  // resolveEditableDesignFile/persistDesignFileEdit split.
+  const workspaceFile: SourceWorkspaceFile = {
+    id: file.id,
+    designId: file.designId,
+    filename: file.filename,
+    fileType: "html",
+    content: file.content ?? "",
+    createdAt: null,
+    updatedAt: null,
+  };
+  const live = await readLiveSourceFile(workspaceFile);
+
   return {
     id: file.id,
     designId: file.designId,
     filename: file.filename,
-    content: await liveContent(file.id, file.content ?? ""),
+    content: live.content,
+    versionHash: live.versionHash,
   };
 }
 
 async function persistDesignFileEdit(file: {
   id: string;
   designId: string;
+  filename: string;
   content: string;
+  expectedVersionHash: string;
 }): Promise<void> {
   // Re-assert at the write boundary so the persist path is independently scoped.
   await assertAccess("design", file.designId, "editor");
 
-  const db = getDb();
-  const now = new Date().toISOString();
-
   agentEnterDocument(file.id);
   try {
-    await db
-      .update(schema.designFiles)
-      .set({ content: file.content, updatedAt: now })
-      .where(eq(schema.designFiles.id, file.id));
-
-    if (await hasCollabState(file.id)) {
-      await applyText(file.id, file.content, "content", "agent");
-    } else {
-      await seedFromText(file.id, file.content);
-    }
+    // Pass through the versionHash captured in resolveEditableDesignFile at
+    // the SAME read the transform used as its base (NOT a fresh re-read of
+    // the (already-transformed) content here — re-reading here would always
+    // observe whatever is live "now" and trivially match itself, proving
+    // nothing about whether a sibling write landed between the transform's
+    // base read and this persist). writeInlineSourceFile re-reads the live
+    // text immediately before its own applyText/DB write and rejects if it no
+    // longer matches this hash — closing the race window where a concurrent
+    // editor/agent write lands between the base read (used to compute this
+    // patch) and this persist call (the same stale-diff-base bug fixed for
+    // insert-design-native-asset.ts / insert-asset.ts: a diff computed from a
+    // stale base, char-diffed into a collab doc that has since moved on,
+    // corrupts or drops the other writer's change).
+    const workspaceFile: SourceWorkspaceFile = {
+      id: file.id,
+      designId: file.designId,
+      filename: file.filename,
+      fileType: "html",
+      content: file.content,
+      createdAt: null,
+      updatedAt: null,
+    };
 
-    await db
-      .update(schema.designs)
-      .set({ updatedAt: now })
-      .where(eq(schema.designs.id, file.designId));
+    await writeInlineSourceFile({
+      designId: file.designId,
+      file: workspaceFile,
+      content: file.content,
+      expectedVersionHash: file.expectedVersionHash,
+    });
   } finally {
     agentLeaveDocument(file.id);
   }
@@ -298,7 +316,9 @@ export default defineAction({
       await persistDesignFileEdit({
         id: file.id,
         designId: file.designId,
+        filename: file.filename,
         content: patch.content,
+        expectedVersionHash: file.versionHash,
       });
     }
 

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

@@ -26,9 +26,6 @@ import {
   agentEnterDocument,
   agentLeaveDocument,
   agentUpdateSelection,
-  applyText,
-  hasCollabState,
-  seedFromText,
 } from "@agent-native/core/collab";
 import {
   accessFilter,
@@ -40,6 +37,10 @@ import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
 import "../server/db/index.js"; // ensure registerShareableResource runs
+import {
+  writeInlineSourceFile,
+  type SourceWorkspaceFile,
+} from "../server/source-workspace.js";
 import { resolveSourceCapabilities } from "../shared/capability-resolver.js";
 import {
   applyVisualEdit,
@@ -57,6 +58,7 @@ import {
 } from "../shared/component-model.js";
 import { hasCapability } from "../shared/design-source-capabilities.js";
 import { normalizeDesignSourceType } from "../shared/source-mode.js";
+import { sourceContentHash } from "../shared/source-workspace.js";
 
 // ─── Helpers ──────────────────────────────────────────────────────────────────
 
@@ -122,34 +124,46 @@ export function applyRootAttributeEdit(
 async function persistEdit(file: {
   id: string;
   designId: string;
+  filename: string;
   content: string;
+  expectedVersionHash: string;
 }): Promise<string> {
   await assertAccess("design", file.designId, "editor");
-  const db = getDb();
-  const now = new Date().toISOString();
 
   agentEnterDocument(file.id);
   try {
-    await db
-      .update(schema.designFiles)
-      .set({ content: file.content, updatedAt: now })
-      .where(eq(schema.designFiles.id, file.id));
+    // Pass through the versionHash of the ACTUAL base the transform used
+    // (captured by the caller in run() at the same read as `html`, BEFORE
+    // applyRootAttributeEdit/applyVisualEdit computed `patchedContent` from
+    // it) — not a fresh re-read of the (already-transformed) content here.
+    // Re-reading the live/SQL state at persist time and hashing THAT would
+    // always match itself trivially, proving nothing about whether a sibling
+    // write landed between the transform's base read and this persist call.
+    // writeInlineSourceFile re-reads the live text immediately before its own
+    // applyText/DB write and rejects it if it no longer matches this hash —
+    // closing the race window (the same stale-diff-base bug fixed for
+    // insert-design-native-asset.ts / insert-asset.ts / apply-visual-edit.ts).
+    const workspaceFile: SourceWorkspaceFile = {
+      id: file.id,
+      designId: file.designId,
+      filename: file.filename,
+      fileType: "html",
+      content: file.content,
+      createdAt: null,
+      updatedAt: null,
+    };
 
-    if (await hasCollabState(file.id)) {
-      await applyText(file.id, file.content, "content", "agent");
-    } else {
-      await seedFromText(file.id, file.content);
-    }
+    const result = await writeInlineSourceFile({
+      designId: file.designId,
+      file: workspaceFile,
+      content: file.content,
+      expectedVersionHash: file.expectedVersionHash,
+    });
 
-    await db
-      .update(schema.designs)
-      .set({ updatedAt: now })
-      .where(eq(schema.designs.id, file.designId));
+    return result.updatedAt;
   } finally {
     agentLeaveDocument(file.id);
   }
-
-  return now;
 }
 
 // ─── Action ───────────────────────────────────────────────────────────────────
@@ -316,6 +330,11 @@ export default defineAction({
       typeof source?.currentContent === "string"
         ? source.currentContent
         : (file.content ?? "");
+    // Capture the hash of this EXACT base — the same string the transform
+    // below reads from — so persistEdit can pass it through as
+    // expectedVersionHash. A re-read at persist time would hash whatever is
+    // live "then" instead of proving this base is still current.
+    const baseVersionHash = sourceContentHash(html);
 
     // ── Resolve node ─────────────────────────────────────────────────────────
     const codeLayerSource: CodeLayerSource = {
@@ -388,7 +407,9 @@ export default defineAction({
       const updatedAt = await persistEdit({
         id: file.id,
         designId: file.designId,
+        filename: file.filename,
         content: patchedContent,
+        expectedVersionHash: baseVersionHash,
       });
 
       agentUpdateSelection(file.id, {