@agent-native/core-corpus 0.210.2 → 0.211.0

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

@@ -171,6 +171,10 @@ import {
   PropertyCommentControl,
   usePropertyCommentRowState,
 } from "./property-comments";
+import {
+  formatPropertyDate,
+  formatPropertyDateTime,
+} from "./property-date-format";
 
 type TFunction = ReturnType<typeof useT>;
 
@@ -282,56 +286,12 @@ function slugify(value: string) {
   return slug || `option-${Date.now()}`;
 }
 
-function formatDate(value: string) {
-  if (/^\d{4}-\d{2}-\d{2}$/.test(value)) {
-    const [year, month, day] = value.split("-").map(Number);
-    return new Intl.DateTimeFormat(undefined, {
-      month: "short",
-      day: "numeric",
-      year: "numeric",
-    }).format(new Date(year, month - 1, day));
-  }
-
-  const date = new Date(value);
-  if (Number.isNaN(date.getTime())) return value;
-  return new Intl.DateTimeFormat(undefined, {
-    month: "short",
-    day: "numeric",
-    year: "numeric",
-  }).format(date);
-}
-
-function formatDateTime(value: string) {
-  if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}/.test(value)) {
-    const [datePart, timePart] = value.split("T");
-    const [year, month, day] = datePart.split("-").map(Number);
-    const [hour, minute] = timePart.split(":").map(Number);
-    return new Intl.DateTimeFormat(undefined, {
-      month: "short",
-      day: "numeric",
-      year: "numeric",
-      hour: "numeric",
-      minute: "2-digit",
-    }).format(new Date(year, month - 1, day, hour, minute));
-  }
-
-  const date = new Date(value);
-  if (Number.isNaN(date.getTime())) return value;
-  return new Intl.DateTimeFormat(undefined, {
-    month: "short",
-    day: "numeric",
-    year: "numeric",
-    hour: "numeric",
-    minute: "2-digit",
-  }).format(date);
-}
-
 function formatPropertyDateDisplayValue(
   value: DocumentProperty["value"],
   t?: TFunction,
 ) {
   const includeTime = documentPropertyDateIncludesTime(value);
-  const formatter = includeTime ? formatDateTime : formatDate;
+  const formatter = includeTime ? formatPropertyDateTime : formatPropertyDate;
   const start = documentPropertyDatePart(value, "start");
   const end = documentPropertyDatePart(value, "end");
   if (!start) return tWithFallback(t, "editor.properties.empty", "Empty");
@@ -392,7 +352,7 @@ export function displayValue(
   }
 
   if (type === "created_time" || type === "last_edited_time") {
-    return <span>{formatDateTime(propertyText(value))}</span>;
+    return <span>{formatPropertyDateTime(propertyText(value))}</span>;
   }
 
   if (type === "person") {

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

@@ -37,6 +37,7 @@ import { DocumentEditorSkeleton } from "./DocumentEditorSkeleton";
 import { LiveEditorSessionContext } from "./live-editor-session";
 import {
   clearPageDraftJournal,
+  liveDraftWriterIds,
   readPageDraftJournal,
   sweepLegacyRetainedPageDraftMarkers,
   writePageDraftJournal,
@@ -110,6 +111,20 @@ export function PageDraftRecovery({
     "checking" | "promoting" | "waiting_sql" | "ready" | "failed"
   >("checking");
   const [journalRevision, setJournalRevision] = useState(0);
+  // Another tab's open editor settles its own journal entries; replaying one
+  // here races its save queue and sends a save for text nobody typed here.
+  // A query only knows the editors open when it ran, so it holds for the
+  // journal entry and SQL draft it was taken for; a tab opened since writes
+  // entries it misses.
+  const [liveWriters, setLiveWriters] = useState<{
+    scopeKey: string;
+    entryKey: string | null;
+    draftKey: string | null;
+    writerIds: ReadonlySet<string>;
+  } | null>(null);
+  const scopeLiveWriters =
+    liveWriters && liveWriters.scopeKey === scopeKey ? liveWriters : null;
+  const skippedWriterIds = scopeLiveWriters?.writerIds;
   const journalAttemptRef = useRef<string | null>(null);
   const automaticRecoveryRef = useRef<string | null>(null);
   const automaticLegacyRecoveryRef = useRef<string | null>(null);
@@ -124,6 +139,17 @@ export function PageDraftRecovery({
     drafts.data.draft.editorSessionId === liveEditorSessionId
       ? null
       : drafts.data?.draft;
+  // So does an editor open in another tab; settling its draft here would move
+  // text it is still saving to History. Its draft can outlive its journal
+  // entry, or have none when that write failed, so the draft is checked too.
+  const draftKey = draft?.editorSessionId
+    ? `${draft.editorSessionId}:${draft.editGeneration}:${draft.version}`
+    : null;
+  const draftLivenessKnown =
+    draftKey === null || scopeLiveWriters?.draftKey === draftKey;
+  const draftOpenElsewhere = Boolean(
+    draft?.editorSessionId && skippedWriterIds?.has(draft.editorSessionId),
+  );
   // No scope until the session read returns; the session cache expires, so a
   // page opened later can mount before then. Unverified until it does.
   const scopeVerified = scopeKey !== null && verifiedScopeKey === scopeKey;
@@ -190,11 +216,40 @@ export function PageDraftRecovery({
     };
     let entry;
     try {
-      entry = readPageDraftJournal(scope);
+      entry = readPageDraftJournal(scope, skippedWriterIds);
     } catch {
       setJournalState("failed");
       return;
     }
+    const entryKey = entry
+      ? `${entry.scope.writerId}:${entry.snapshot.editGeneration}:${entry.writtenAt}`
+      : null;
+    if (
+      scopeKey &&
+      ((entryKey !== null && scopeLiveWriters?.entryKey !== entryKey) ||
+        !draftLivenessKnown)
+    ) {
+      let cancelled = false;
+      void liveDraftWriterIds().then(
+        (writerIds) => {
+          // Without Web Locks no writer reads as live, so every entry
+          // replays, as it did before writer locks.
+          if (!cancelled)
+            setLiveWriters({
+              scopeKey,
+              entryKey,
+              draftKey,
+              writerIds: writerIds ?? new Set(),
+            });
+        },
+        () => {
+          if (!cancelled) setJournalState("failed");
+        },
+      );
+      return () => {
+        cancelled = true;
+      };
+    }
     if (!entry) {
       sweepLegacyRetainedPageDraftMarkers();
       setJournalState("ready");
@@ -471,6 +526,8 @@ export function PageDraftRecovery({
     editorReleased,
     journalRevision,
     journalState,
+    scopeKey,
+    scopeLiveWriters,
     scopeVerified,
     session?.email,
     session?.orgId,
@@ -690,6 +747,8 @@ export function PageDraftRecovery({
     if (
       !draft ||
       !hasEditIdentity ||
+      !draftLivenessKnown ||
+      draftOpenElsewhere ||
       busy ||
       failure ||
       journalState === "checking" ||
@@ -712,11 +771,14 @@ export function PageDraftRecovery({
     }
     if (session?.email) {
       try {
-        const journal = readPageDraftJournal({
-          accountId: session.email.trim().toLowerCase(),
-          orgId: session.orgId ?? null,
-          documentId: document.id,
-        });
+        const journal = readPageDraftJournal(
+          {
+            accountId: session.email.trim().toLowerCase(),
+            orgId: session.orgId ?? null,
+            documentId: document.id,
+          },
+          skippedWriterIds,
+        );
         if (
           journal?.snapshot.title === draft.title &&
           journal.snapshot.content === draft.content
@@ -733,12 +795,15 @@ export function PageDraftRecovery({
     busy,
     document,
     draft,
+    draftLivenessKnown,
+    draftOpenElsewhere,
     failure,
     hasEditIdentity,
     journalState,
     scopeVerified,
     session?.email,
     session?.orgId,
+    skippedWriterIds,
   ]);
 
   // Keep the editor at one tree position so a notice never remounts it.
@@ -795,7 +860,7 @@ export function PageDraftRecovery({
         }
       />
     );
-  if (!draft) return withNotice(null);
+  if (!draft || draftOpenElsewhere) return withNotice(null);
   // Legacy drafts are preserved automatically; that path toasts once.
   if (!hasEditIdentity && !failure) return withNotice(null);
   if (!failure)