@agent-native/core 0.92.7 → 0.92.8

package/corpus/templates/content/app/i18n-data.ts

@@ -1958,6 +1958,9 @@ const editorPropertiesMessages = {
   deleteProperty: "Delete property",
   deletePropertyDescription:
     'This removes "{{name}}" and its values from every document in this workspace.',
+  deletePropertyDescriptionPrefix: 'This removes "',
+  deletePropertyDescriptionSuffix:
+    '" and its values from every document in this workspace.',
   deletePropertyQuestion: "Delete property?",
   duplicateProperty: "Duplicate property",
   editEndDate: "Edit {{name}} end date",
@@ -4978,6 +4981,8 @@ const editorMessagesByLocale = {
       deleteProperty: "删除属性",
       deletePropertyDescription:
         '这将从该工作区中的每个文档中删除"{{name}}"及其值。',
+      deletePropertyDescriptionPrefix: '这将从该工作区中的每个文档中删除"',
+      deletePropertyDescriptionSuffix: '"及其值。',
       deletePropertyQuestion: "删除属性？",
       duplicateProperty: "重复的属性",
       editEndDate: "编辑 {{name}} 结束日期",
@@ -5304,6 +5309,9 @@ const editorMessagesByLocale = {
       deleteProperty: "Eliminar propiedad",
       deletePropertyDescription:
         'Esto elimina "{{name}}" y sus valores de todos los documentos de este espacio de trabajo.',
+      deletePropertyDescriptionPrefix: 'Esto elimina "',
+      deletePropertyDescriptionSuffix:
+        '" y sus valores de todos los documentos de este espacio de trabajo.',
       deletePropertyQuestion: "¿Eliminar propiedad?",
       duplicateProperty: "Propiedad duplicada",
       editEndDate: "Editar fecha de finalización de {{name}}",
@@ -5641,6 +5649,9 @@ const editorMessagesByLocale = {
       deleteProperty: "Supprimer la propriété",
       deletePropertyDescription:
         "Cela supprime « {{name}} » et ses valeurs de chaque document de cet espace de travail.",
+      deletePropertyDescriptionPrefix: "Cela supprime « ",
+      deletePropertyDescriptionSuffix:
+        " » et ses valeurs de chaque document de cet espace de travail.",
       deletePropertyQuestion: "Supprimer la propriété ?",
       duplicateProperty: "Propriété en double",
       editEndDate: "Modifier la date de fin de {{name}}",
@@ -5978,6 +5989,9 @@ const editorMessagesByLocale = {
       deleteProperty: "Eigenschaft löschen",
       deletePropertyDescription:
         'Dadurch werden „{{name}}" und seine Werte aus jedem Dokument in diesem Arbeitsbereich entfernt.',
+      deletePropertyDescriptionPrefix: "Dadurch werden „",
+      deletePropertyDescriptionSuffix:
+        '" und seine Werte aus jedem Dokument in diesem Arbeitsbereich entfernt.',
       deletePropertyQuestion: "Eigenschaft löschen?",
       duplicateProperty: "Doppelte Eigenschaft",
       editEndDate: "{{name}}-Enddatum bearbeiten",
@@ -6315,6 +6329,9 @@ const editorMessagesByLocale = {
       deleteProperty: "プロパティの削除",
       deletePropertyDescription:
         "これにより、このワークスペース内のすべてのドキュメントから「{{name}}」とその値が削除されます。",
+      deletePropertyDescriptionPrefix:
+        "これにより、このワークスペース内のすべてのドキュメントから「",
+      deletePropertyDescriptionSuffix: "」とその値が削除されます。",
       deletePropertyQuestion: "プロパティを削除しますか?",
       duplicateProperty: "重複したプロパティ",
       editEndDate: "{{name}} の終了日を編集",
@@ -6645,6 +6662,9 @@ const editorMessagesByLocale = {
       deleteProperty: "속성 삭제",
       deletePropertyDescription:
         '이렇게 하면 이 작업공간의 모든 문서에서 "{{name}}"와 해당 값이 제거됩니다.',
+      deletePropertyDescriptionPrefix:
+        '이렇게 하면 이 작업공간의 모든 문서에서 "',
+      deletePropertyDescriptionSuffix: '"와 해당 값이 제거됩니다.',
       deletePropertyQuestion: "속성을 삭제하시겠습니까?",
       duplicateProperty: "중복된 속성",
       editEndDate: "{{name}} 종료일 수정",
@@ -6978,6 +6998,9 @@ const editorMessagesByLocale = {
       deleteProperty: "Excluir propriedade",
       deletePropertyDescription:
         'Isso remove "{{name}}" e seus valores de todos os documentos nesta área de trabalho.',
+      deletePropertyDescriptionPrefix: 'Isso remove "',
+      deletePropertyDescriptionSuffix:
+        '" e seus valores de todos os documentos nesta área de trabalho.',
       deletePropertyQuestion: "Excluir propriedade?",
       duplicateProperty: "Propriedade duplicada",
       editEndDate: "Editar data de término do {{name}}",
@@ -7311,6 +7334,8 @@ const editorMessagesByLocale = {
       deleteProperty: "संपत्ति हटाएं",
       deletePropertyDescription:
         'यह इस कार्यक्षेत्र के प्रत्येक दस्तावेज़ से "{{name}}" और उसके मानों को हटा देता है।',
+      deletePropertyDescriptionPrefix: 'यह इस कार्यक्षेत्र के प्रत्येक दस्तावेज़ से "',
+      deletePropertyDescriptionSuffix: '" और उसके मानों को हटा देता है।',
       deletePropertyQuestion: "संपत्ति हटाएं?",
       duplicateProperty: "डुप्लिकेट संपत्ति",
       editEndDate: "{{name}} समाप्ति तिथि संपादित करें",
@@ -7638,6 +7663,9 @@ const editorMessagesByLocale = {
       deleteProperty: "حذف الممتلكات",
       deletePropertyDescription:
         'يؤدي هذا إلى إزالة "{{name}}" وقيمه من كل مستند في مساحة العمل هذه.',
+      deletePropertyDescriptionPrefix: 'يؤدي هذا إلى إزالة "',
+      deletePropertyDescriptionSuffix:
+        '" وقيمه من كل مستند في مساحة العمل هذه.',
       deletePropertyQuestion: "هل تريد حذف الخاصية؟",
       duplicateProperty: "خاصية مكررة",
       editEndDate: "تحرير تاريخ انتهاء {{name}}",

package/corpus/templates/content/changelog/2026-07-09-notion-conflict-warnings-no-longer-flash-during-normal-synce.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-09
+---
+
+Notion conflict warnings no longer flash during normal synced editing

package/corpus/templates/content/changelog/2026-07-09-property-menus-and-delete-confirmations-now-open-visibly-and.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-09
+---
+
+Property menus and delete confirmations now open visibly and respond reliably in database tables.

package/corpus/templates/content/server/lib/notion-sync.ts

@@ -1355,36 +1355,138 @@ export async function refreshDocumentSyncStatus(
       return status;
     }
     // Both sides changed since last sync — mark as conflict so the user can
-    // pick which side wins. Without this, auto-sync silently stalls whenever
-    // the user has unpushed local edits AND Notion also changed, and pulls
-    // never happen. Matches the conflict handling in pull/pushDocumentToNotion.
+    // pick which side wins. Take the same per-document claim used by pull/push
+    // before persisting that state: a save-triggered push can be between its
+    // remote write and baseline update here, making both sides look changed
+    // for a few hundred milliseconds. If that push owns the claim, let it
+    // finish instead of flashing a conflict that it immediately clears.
     if (status.localChanged && status.remoteChanged) {
-      const link = await getSyncLink(documentId, owner);
-      if (link) {
-        await upsertSyncLink({
-          owner,
-          documentId,
-          remotePageId: link.remotePageId,
-          state: "conflict",
-          lastSyncedAt: link.lastSyncedAt,
-          lastPulledRemoteUpdatedAt: link.lastPulledRemoteUpdatedAt,
-          lastPushedLocalUpdatedAt: link.lastPushedLocalUpdatedAt,
-          lastKnownRemoteUpdatedAt: status.lastKnownRemoteUpdatedAt,
-          lastSyncedContentHash: link.lastSyncedContentHash,
-          lastError: null,
-          warnings: parseWarnings(link),
-          hasConflict: true,
-        });
+      if (!(await tryClaimSyncLink(documentId, owner))) return status;
+      try {
+        // The competing push may have finished after the status snapshot but
+        // before this poll acquired the claim. Re-read the local/link state
+        // under the claim so stale change flags cannot recreate the conflict
+        // immediately after that push resolved it.
         const document = await getDocument(documentId, owner);
-        const updatedLink = await getSyncLink(documentId, owner);
-        return buildStatus({
-          connected: true,
-          documentId,
-          link: updatedLink,
-          remoteUpdatedAt: status.lastKnownRemoteUpdatedAt,
-          documentUpdatedAt: document.updatedAt,
-          documentContent: document.content,
-        });
+        const link = await getSyncLink(documentId, owner);
+        if (link) {
+          const claimedStatus = buildStatus({
+            connected: true,
+            documentId,
+            link,
+            remoteUpdatedAt: status.lastKnownRemoteUpdatedAt,
+            documentUpdatedAt: document.updatedAt,
+            documentContent: document.content,
+          });
+          if (!claimedStatus.localChanged || !claimedStatus.remoteChanged) {
+            return claimedStatus;
+          }
+          let conflictDocument = document;
+
+          // Notion timestamps are only a cheap candidate signal. Confirm the
+          // remote content against the authoritative hash baseline before
+          // persisting a conflict; our own completed push (or any metadata-only
+          // timestamp bump) can otherwise look like a remote content edit.
+          if (link.lastSyncedContentHash) {
+            const connection = await getNotionConnectionForOwner(owner);
+            if (!connection) return claimedStatus;
+
+            let remotePageContent: Awaited<
+              ReturnType<typeof readNotionPageAsDocument>
+            >;
+            try {
+              remotePageContent = await readNotionPageAsDocument(
+                connection.accessToken,
+                link.remotePageId,
+              );
+            } catch {
+              // Fail closed: an unverified timestamp bump is not enough to
+              // interrupt editing with a conflict warning.
+              return claimedStatus;
+            }
+
+            // Local saves do not take the Notion sync claim, so the editor can
+            // keep writing while the remote content request is in flight.
+            // Classify the conflict against the latest local row.
+            const verifiedDocument = await getDocument(documentId, owner);
+            conflictDocument = verifiedDocument;
+            const baselineHash = link.lastSyncedContentHash;
+            const localHash = hashContent(verifiedDocument.content);
+            const remoteHash = hashContent(remotePageContent.content);
+            const localHashChanged = localHash !== baselineHash;
+            const remoteHashChanged = remoteHash !== baselineHash;
+
+            if (localHash === remoteHash) {
+              await upsertSyncLink({
+                owner,
+                documentId,
+                remotePageId: link.remotePageId,
+                state: "linked",
+                lastSyncedAt: nowIso(),
+                lastPulledRemoteUpdatedAt: remotePageContent.lastEditedTime,
+                lastPushedLocalUpdatedAt: verifiedDocument.updatedAt,
+                lastKnownRemoteUpdatedAt: remotePageContent.lastEditedTime,
+                lastSyncedContentHash: localHash,
+                lastError: null,
+                warnings: remotePageContent.warnings,
+                hasConflict: false,
+              });
+              const convergedLink = await getSyncLink(documentId, owner);
+              return buildStatus({
+                connected: true,
+                documentId,
+                link: convergedLink,
+                remoteUpdatedAt: remotePageContent.lastEditedTime,
+                documentUpdatedAt: verifiedDocument.updatedAt,
+                documentContent: verifiedDocument.content,
+              });
+            }
+
+            if (!localHashChanged || !remoteHashChanged) {
+              if (options?.autoSync && localHashChanged) {
+                return pushDocumentToNotion(owner, documentId, false, {
+                  skipClaim: true,
+                });
+              }
+              if (options?.autoSync && remoteHashChanged) {
+                return pullDocumentFromNotion(owner, documentId, false, {
+                  skipClaim: true,
+                });
+              }
+              return {
+                ...claimedStatus,
+                localChanged: localHashChanged,
+                remoteChanged: remoteHashChanged,
+              };
+            }
+          }
+
+          await upsertSyncLink({
+            owner,
+            documentId,
+            remotePageId: link.remotePageId,
+            state: "conflict",
+            lastSyncedAt: link.lastSyncedAt,
+            lastPulledRemoteUpdatedAt: link.lastPulledRemoteUpdatedAt,
+            lastPushedLocalUpdatedAt: link.lastPushedLocalUpdatedAt,
+            lastKnownRemoteUpdatedAt: status.lastKnownRemoteUpdatedAt,
+            lastSyncedContentHash: link.lastSyncedContentHash,
+            lastError: null,
+            warnings: parseWarnings(link),
+            hasConflict: true,
+          });
+          const updatedLink = await getSyncLink(documentId, owner);
+          return buildStatus({
+            connected: true,
+            documentId,
+            link: updatedLink,
+            remoteUpdatedAt: status.lastKnownRemoteUpdatedAt,
+            documentUpdatedAt: conflictDocument.updatedAt,
+            documentContent: conflictDocument.content,
+          });
+        }
+      } finally {
+        await releaseSyncLink(documentId, owner);
       }
     }
   }

package/corpus/templates/design/actions/add-breakpoint.ts

@@ -1,11 +1,13 @@
 import { defineAction } from "@agent-native/core";
 import { assertAccess } from "@agent-native/core/sharing";
-import { eq } from "drizzle-orm";
 import { nanoid } from "nanoid";
 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 type {
   BreakpointDefinition,
   BreakpointSet,
@@ -22,41 +24,17 @@ import { widthToPrefix } from "../shared/responsive-classes.js";
  * `design_breakpoint_set` table keyed by (design_id, file_id) and migrate
  * this in-data storage to it.
  */
-function readBreakpointSet(designData: string | null): BreakpointSet {
-  if (designData) {
-    try {
-      const parsed = JSON.parse(designData) as Record<string, unknown>;
-      if (parsed.breakpointSet && typeof parsed.breakpointSet === "object") {
-        return parsed.breakpointSet as BreakpointSet;
-      }
-    } catch {
-      // ignore parse errors; fall through to default
-    }
-  }
-  return { id: nanoid(), breakpoints: [] };
-}
-
-function writeBreakpointSet(
-  designData: string | null,
-  set: BreakpointSet,
-  now: string,
-): string {
-  let prev: Record<string, unknown> = {};
-  if (designData) {
-    try {
-      const parsed = JSON.parse(designData);
-      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-        prev = parsed;
-      }
-    } catch {
-      // ignore
-    }
+function readBreakpointSet(
+  designData: DesignDataRecord,
+  fallbackId: string,
+): BreakpointSet {
+  if (
+    designData.breakpointSet &&
+    typeof designData.breakpointSet === "object"
+  ) {
+    return designData.breakpointSet as BreakpointSet;
   }
-  return JSON.stringify({
-    ...prev,
-    breakpointSet: set,
-    breakpointSetUpdatedAt: now,
-  });
+  return { id: fallbackId, breakpoints: [] };
 }
 
 export default defineAction({
@@ -95,29 +73,9 @@ export default defineAction({
   run: async ({ designId, label, widthPx, id: providedId }) => {
     await assertAccess("design", designId, "editor");
 
-    const db = getDb();
-    const [design] = await db
-      .select({ data: schema.designs.data })
-      .from(schema.designs)
-      .where(eq(schema.designs.id, designId))
-      .limit(1);
-
-    if (!design) throw new Error(`Design '${designId}' not found.`);
-
-    const set = readBreakpointSet(design.data);
-
-    // Ignore duplicate widths.
-    if (set.breakpoints.some((bp) => bp.widthPx === widthPx)) {
-      return {
-        ignored: true,
-        reason: `A breakpoint with width ${widthPx}px already exists.`,
-        breakpointSet: set,
-      };
-    }
-
     const breakpointId = providedId ?? nanoid();
+    const breakpointSetId = nanoid();
     const prefix = widthToPrefix(widthPx);
-
     const newBreakpoint: BreakpointDefinition = {
       id: breakpointId,
       label,
@@ -125,21 +83,43 @@ export default defineAction({
       prefix,
     };
 
-    // Insert sorted by widthPx ascending (Mobile → Tablet → Desktop).
-    const breakpoints = [...set.breakpoints, newBreakpoint].sort(
-      (a, b) => a.widthPx - b.widthPx,
+    const persisted = await mutateDesignData({
+      designId,
+      mutate: (current, { updatedAt }) => {
+        const set = readBreakpointSet(current, breakpointSetId);
+        if (set.breakpoints.some((bp) => bp.widthPx === widthPx)) {
+          return current;
+        }
+        // Insert sorted by widthPx ascending (Mobile → Tablet → Desktop).
+        const breakpoints = [...set.breakpoints, newBreakpoint].sort(
+          (a, b) => a.widthPx - b.widthPx,
+        );
+        return {
+          ...current,
+          breakpointSet: { ...set, breakpoints },
+          breakpointSetUpdatedAt: updatedAt,
+        };
+      },
+      isApplied: (current) =>
+        readBreakpointSet(current, breakpointSetId).breakpoints.some(
+          (breakpoint) => breakpoint.widthPx === widthPx,
+        ),
+    });
+    const updatedSet = readBreakpointSet(persisted.data, breakpointSetId);
+    const added = updatedSet.breakpoints.find(
+      (breakpoint) => breakpoint.id === breakpointId,
     );
-    const updatedSet: BreakpointSet = { ...set, breakpoints };
 
-    const now = new Date().toISOString();
-    const updatedData = writeBreakpointSet(design.data, updatedSet, now);
-    await db
-      .update(schema.designs)
-      .set({ data: updatedData, updatedAt: now })
-      .where(eq(schema.designs.id, designId));
+    if (!added) {
+      return {
+        ignored: true,
+        reason: `A breakpoint with width ${widthPx}px already exists.`,
+        breakpointSet: updatedSet,
+      };
+    }
 
     return {
-      added: newBreakpoint,
+      added,
       breakpointSet: updatedSet,
     };
   },