@ai-matrx/records-ui 0.82.0 → 0.83.1

package/dist/index.cjs

@@ -189,6 +189,8 @@ __export(src_exports, {
   VIEW_LAYOUTS: () => VIEW_LAYOUTS,
   VIEW_NOT_SAVED_YET: () => VIEW_NOT_SAVED_YET,
   VIEW_TABLE: () => VIEW_TABLE,
+  VISIBILITY_LANES: () => VISIBILITY_LANES,
+  VISIBILITY_LANE_TITLE: () => VISIBILITY_LANE_TITLE,
   ViewBar: () => ViewBar,
   ViewSwitcher: () => ViewSwitcher,
   WITHHELD_RECORD_LABEL: () => WITHHELD_RECORD_LABEL,
@@ -244,6 +246,7 @@ __export(src_exports, {
   isPlainFieldType: () => isPlainFieldType,
   isRelationFieldType: () => isRelationFieldType,
   isSignatureField: () => isSignatureField,
+  keptByTheApp: () => keptByTheApp,
   keyFor: () => keyFor,
   kindsWithNoChoice: () => kindsWithNoChoice,
   laneFor: () => laneFor,
@@ -279,6 +282,7 @@ __export(src_exports, {
   revokeConsequence: () => revokeConsequence,
   rowName: () => rowName,
   rowNameIn: () => rowNameIn,
+  saveViewPatch: () => saveViewPatch,
   scalarText: () => scalarText,
   shareUnavailableReason: () => shareUnavailableReason,
   specFromBlock: () => specFromBlock,
@@ -308,6 +312,7 @@ __export(src_exports, {
   viewDocument: () => viewDocument,
   viewFromRecord: () => viewFromRecord,
   viewPatchDocument: () => viewPatchDocument,
+  visibilityLaneFor: () => visibilityLaneFor,
   whatIsMissing: () => whatIsMissing,
   whatYouMayDo: () => whatYouMayDo,
   whatYouMayDoWithTable: () => whatYouMayDoWithTable,
@@ -2383,7 +2388,7 @@ function useGridEditing({ tableId, fields, rows, reload, canWrite, mayWriteRow }
     startedFrom.current = null;
   }, []);
   const writeCellNow = (0, import_react15.useCallback)(
-    async (rowId, key, value) => {
+    async (rowId, key, value, base, resent = false) => {
       const id = cellKey(rowId, key);
       setOptimistic((held) => ({ ...held, [id]: value }));
       setSaving((held) => ({ ...held, [id]: true }));
@@ -2426,22 +2431,31 @@ function useGridEditing({ tableId, fields, rows, reload, canWrite, mayWriteRow }
         delete next[id];
         return next;
       });
-      if (written.error.code === "stale_write") versions.current.delete(rowId);
+      const conflict = (0, import_core.asWriteConflict)(written.error, rowId);
+      if (written.error.code === "stale_write") {
+        if (conflict) rememberVersion(versions.current, rowId, conflict.current_version);
+        else versions.current.delete(rowId);
+        if (conflict && !resent && sameValue(conflict.contested_fields[key], base)) {
+          await writeCellNow(rowId, key, value, base, true);
+          return;
+        }
+      }
       setRefusals((held) => ({
         ...held,
         [id]: {
           error: written.error,
-          conflict: (0, import_core.asWriteConflict)(written.error, rowId),
+          conflict,
           attempted: value
         }
       }));
     },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
     [client, reload]
   );
   const writeCell = (0, import_react15.useCallback)(
-    (rowId, key, value) => {
+    (rowId, key, value, base) => {
       const behind = queues.current.get(rowId) ?? Promise.resolve();
-      const next = behind.then(() => writeCellNow(rowId, key, value));
+      const next = behind.then(() => writeCellNow(rowId, key, value, base));
       queues.current.set(
         rowId,
         next.then(
@@ -2459,7 +2473,7 @@ function useGridEditing({ tableId, fields, rows, reload, canWrite, mayWriteRow }
       const open = editing;
       if (!open) return;
       const value = typed.current;
-      if (!sameValue(startedFrom.current, value)) void writeCell(open.rowId, open.key, value);
+      if (!sameValue(startedFrom.current, value)) void writeCell(open.rowId, open.key, value, startedFrom.current);
       if (!move) {
         setEditing(null);
         setDraft(null);
@@ -2488,7 +2502,7 @@ function useGridEditing({ tableId, fields, rows, reload, canWrite, mayWriteRow }
     (rowId, key) => {
       const held = refusals[cellKey(rowId, key)];
       if (!held) return;
-      void writeCell(rowId, key, held.attempted);
+      void writeCell(rowId, key, held.attempted, held.conflict?.contested_fields[key]);
     },
     [refusals, writeCell]
   );
@@ -2510,6 +2524,33 @@ function useGridEditing({ tableId, fields, rows, reload, canWrite, mayWriteRow }
     },
     [reload]
   );
+  const keepEditing = (0, import_react15.useCallback)(
+    (rowId, key) => {
+      const held = refusals[cellKey(rowId, key)];
+      if (!held || !writable(rowId)) return;
+      startedFrom.current = shownValue(rowId, key);
+      typed.current = held.attempted;
+      setDraft(held.attempted);
+      setEditing({ rowId, key });
+    },
+    [refusals, writable, shownValue]
+  );
+  const discard = (0, import_react15.useCallback)((rowId, key) => {
+    const id = cellKey(rowId, key);
+    setRefusals((held) => {
+      if (!held[id]) return held;
+      const next = { ...held };
+      delete next[id];
+      return next;
+    });
+    setOptimistic((held) => {
+      if (!(id in held)) return held;
+      const next = { ...held };
+      delete next[id];
+      return next;
+    });
+    setEditing((open) => open && open.rowId === rowId && open.key === key ? null : open);
+  }, []);
   const remove = (0, import_react15.useCallback)(
     async (rowId) => {
       setBusy(true);
@@ -2557,10 +2598,12 @@ function useGridEditing({ tableId, fields, rows, reload, canWrite, mayWriteRow }
     commit,
     setCell: (rowId, key, value) => {
       if (!writable(rowId)) return;
-      void writeCell(rowId, key, value);
+      void writeCell(rowId, key, value, shownValue(rowId, key));
     },
     retry,
     keepTheirs,
+    keepEditing,
+    discard,
     remove,
     addRecord,
     rowError,
@@ -2629,13 +2672,28 @@ function GridCell({
         draft: editing.draft,
         onType: editing.type,
         onCommit: (move) => editing.commit(move),
-        onCancel: editing.cancel
+        onCancel: editing.cancel,
+        below: (
+          // KEPT EDITING: the refusal stays beside the value it is about, so the
+          // person reads what to change while changing it. Keep editing is the
+          // state they are in, so only Discard is offered. It is INSIDE the open
+          // cell, so pressing Discard is not "focus left the cell" — which would
+          // commit the refused value one more time on its way out.
+          refusal2 && !refusal2.conflict ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
+            RefusalNotice,
+            {
+              error: refusal2.error,
+              className: "py-1.5 text-left",
+              onDiscard: () => editing.discard(row.id, field.key)
+            }
+          ) : null
+        )
       }
     );
   }
   if (editorKindFor(field) === "checkbox") {
     const answered = value === true || value === false;
-    return /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("span", { "data-matrx-cell-control": "", className: "flex w-full items-center gap-1.5", children: [
+    return /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("span", { "data-matrx-cell-control": "", className: "flex w-full flex-wrap items-center gap-1.5", children: [
       /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
         import_design_system7.Checkbox,
         {
@@ -2648,10 +2706,7 @@ function GridCell({
         }
       ),
       answered ? null : /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { className: "text-xs text-muted-foreground", title: "nobody has answered this yet", children: "\u2014" }),
-      refusal2 ? /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("span", { className: "flex items-center gap-1 rounded border border-destructive/40 px-1", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(RefusalLine, { error: refusal2.error }),
-        /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_design_system7.Button, { size: "sm", variant: "outline", onClick: () => editing?.retry(row.id, field.key), children: "Try again" })
-      ] }) : null
+      refusal2 ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(CellRefusalNotice, { refusal: refusal2, field, row, editing, typed: false }) : null
     ] });
   }
   const openThisCell = (event) => {
@@ -2724,22 +2779,48 @@ function GridCell({
           ),
           onAskWhoChanged ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(WhoBadge, { field, row, onAskWhoChanged }) : null,
           state === "saving" ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { className: "px-1 text-[10px] text-muted-foreground", children: "Saving\u2026" }) : null,
-          refusal2 ? /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("span", { className: "flex flex-col gap-0.5 rounded border border-destructive/40 p-1", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(RefusalLine, { error: refusal2.error }),
-            refusal2.conflict ? /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("span", { className: "text-[11px]", children: [
-              "Theirs: ",
-              /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("strong", { children: formatTheirs(refusal2.conflict, field.key) })
-            ] }) : null,
-            /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("span", { className: "flex gap-1", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_design_system7.Button, { size: "sm", variant: "outline", onClick: () => editing?.retry(row.id, field.key), children: "Try again" }),
-              /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_design_system7.Button, { size: "sm", variant: "ghost", onClick: () => editing?.keepTheirs(row.id, field.key), children: "Keep theirs" })
-            ] })
-          ] }) : null
+          refusal2 ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(CellRefusalNotice, { refusal: refusal2, field, row, editing, typed: true }) : null
         ]
       }
     )
   );
 }
+function CellRefusalNotice({
+  refusal: refusal2,
+  field,
+  row,
+  editing,
+  typed
+}) {
+  if (refusal2.conflict) {
+    return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
+      RefusalNotice,
+      {
+        error: refusal2.error,
+        className: "py-1.5 text-left",
+        actions: /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("span", { className: "flex flex-col gap-1", "data-refusal-conflict": "", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("span", { className: "text-[11px]", children: [
+            "Theirs: ",
+            /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("strong", { children: formatTheirs(refusal2.conflict, field.key) })
+          ] }),
+          /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("span", { className: "flex flex-wrap gap-1", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_design_system7.Button, { size: "sm", variant: "outline", onClick: () => editing?.retry(row.id, field.key), children: "Try again" }),
+            /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_design_system7.Button, { size: "sm", variant: "ghost", onClick: () => editing?.keepTheirs(row.id, field.key), children: "Keep theirs" })
+          ] })
+        ] })
+      }
+    );
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
+    RefusalNotice,
+    {
+      error: refusal2.error,
+      className: "py-1.5 text-left",
+      ...typed ? { onKeepEditing: () => editing?.keepEditing(row.id, field.key) } : {},
+      onDiscard: () => editing?.discard(row.id, field.key)
+    }
+  );
+}
 function WhoBadge({
   field,
   row,
@@ -2792,7 +2873,8 @@ function OpenCell({
   draft,
   onType,
   onCommit,
-  onCancel
+  onCancel,
+  below
 }) {
   const multiline = takesANewline(field);
   const blurCommits = closesOnBlur(field);
@@ -2821,6 +2903,7 @@ function OpenCell({
       className: "flex w-full min-w-[10rem] flex-col gap-1",
       onDoubleClick: (event) => event.stopPropagation(),
       onKeyDown: (event) => {
+        if (event.target?.closest?.("[data-refusal-notice]")) return;
         if (event.key === "Escape") {
           event.preventDefault();
           event.stopPropagation();
@@ -2846,7 +2929,8 @@ function OpenCell({
         blurCommits ? /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { className: "text-[10px] text-muted-foreground", children: multiline ? "\u23CE saves \xB7 \u21E7\u23CE new line \xB7 Esc cancels \xB7 Tab next" : "\u23CE saves \xB7 Esc cancels \xB7 Tab next" }) : /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("span", { className: "flex items-center gap-1", children: [
           /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_design_system7.Button, { size: "sm", onClick: () => once(() => onCommit(null)), children: "Save" }),
           /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_design_system7.Button, { size: "sm", variant: "ghost", onClick: () => once(onCancel), children: "Cancel" })
-        ] })
+        ] }),
+        below
       ]
     }
   );
@@ -6812,8 +6896,8 @@ function TableSettings({
       /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(import_design_system18.Button, { size: "sm", variant: "ghost", onClick: () => setAskingToRemove(null), children: "Keep it" })
     ] }) : null,
     /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("ul", { className: "divide-y rounded border", children: [
-      rows.map((field, index) => /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("li", { className: "flex items-center gap-2 px-2 py-1.5", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("span", { className: "min-w-0 flex-1 truncate", children: fieldName(field) }),
+      rows.map((field, index) => /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("li", { "data-settings-field": "", className: "flex flex-wrap items-center gap-x-2 gap-y-1 px-2 py-1.5", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("span", { "data-settings-field-name": "", className: "min-w-[8rem] flex-1 break-words", children: fieldName(field) }),
         /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(import_design_system18.Badge, { variant: "outline", className: "text-[10px] font-normal", children: fieldTypeLabel(field) }),
         field.required ? /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("span", { className: "text-[10px] text-destructive", children: "required" }) : null,
         /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
@@ -6870,9 +6954,9 @@ function TableSettings({
       /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("span", { className: "font-medium", children: "Proposed" }),
       /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("span", { className: "text-muted-foreground", children: proposals?.length ?? 0 })
     ] }),
-    proposals === void 0 ? /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("p", { className: "text-muted-foreground", children: "Nothing is listing proposals here yet: the store has no `custom.field_propose` door, so this panel would be inventing an empty queue. When the door lands, its rows appear in this list with the same accept and reject." }) : proposals.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("p", { className: "text-muted-foreground", children: "No field is waiting for a decision." }) : /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("ul", { className: "divide-y rounded border", children: proposals.map((proposal) => /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("li", { className: "flex items-center gap-2 px-2 py-1.5", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("span", { className: "min-w-0 flex-1 truncate", children: proposal.field.label || proposal.field.key }),
-      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("span", { className: "min-w-0 flex-1 truncate text-muted-foreground", children: proposal.why }),
+    proposals === void 0 ? /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("p", { className: "text-muted-foreground", children: "Nothing is listing proposals here yet: the store has no `custom.field_propose` door, so this panel would be inventing an empty queue. When the door lands, its rows appear in this list with the same accept and reject." }) : proposals.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("p", { className: "text-muted-foreground", children: "No field is waiting for a decision." }) : /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("ul", { className: "divide-y rounded border", children: proposals.map((proposal) => /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("li", { className: "flex flex-wrap items-center gap-x-2 gap-y-1 px-2 py-1.5", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("span", { className: "min-w-[8rem] flex-1 break-words", children: proposal.field.label || proposal.field.key }),
+      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("span", { className: "min-w-[8rem] flex-1 break-words text-muted-foreground", children: proposal.why }),
       /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(import_design_system18.Badge, { variant: "secondary", className: "text-[10px] font-normal", children: proposal.proposed_by }),
       /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(import_design_system18.Button, { size: "sm", variant: "outline", onClick: () => onAcceptProposal?.(proposal), children: "Accept" }),
       /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(import_design_system18.Button, { size: "sm", variant: "ghost", onClick: () => onRejectProposal?.(proposal), children: "Reject" })
@@ -7047,7 +7131,39 @@ var import_design_system22 = require("@ai-matrx/design-system");
 // src/RecordForm.tsx
 var import_react41 = require("react");
 var import_react42 = require("@ai-matrx/records/react");
+var import_core7 = require("@ai-matrx/records/core");
+
+// src/writeOnTheWinningVersion.ts
 var import_core6 = require("@ai-matrx/records/core");
+function sameStoredValue(left, right) {
+  if (left === right) return true;
+  const empty = (v) => v === null || v === void 0 || v === "";
+  if (empty(left) || empty(right)) return empty(left) && empty(right);
+  if (typeof left === "object" || typeof right === "object") {
+    try {
+      return JSON.stringify(left) === JSON.stringify(right);
+    } catch {
+      return false;
+    }
+  }
+  return false;
+}
+async function updateOnTheWinningVersion(client, recordId, patch, expectedVersion, base) {
+  const send = (expected) => client.recordUpdate({
+    record_id: recordId,
+    patch,
+    ...expected === null ? {} : { expectedVersion: expected }
+  });
+  const first = await send(expectedVersion);
+  if (first.ok) return first;
+  const conflict = (0, import_core6.asWriteConflict)(first.error, recordId);
+  if (!conflict) return first;
+  const untouched = base === "always" || Object.keys(patch).every((key) => sameStoredValue(conflict.contested_fields[key], base[key]));
+  if (!untouched) return first;
+  return send(conflict.current_version);
+}
+
+// src/RecordForm.tsx
 var import_design_system20 = require("@ai-matrx/design-system");
 
 // src/systemTable.ts
@@ -7235,13 +7351,38 @@ function RecordForm({
   const fields = (0, import_react42.useFields)(tableId, recordType);
   const existing = (0, import_react42.useRecord)(recordId ?? null);
   const mutation = (0, import_react42.useRecordMutation)();
+  const client = (0, import_react42.useRecordsClient)();
+  const [edit, setEdit] = (0, import_react41.useState)({
+    saving: false,
+    error: null,
+    conflict: null
+  });
+  const said = {
+    saving: mutation.saving || edit.saving,
+    error: recordId ? edit.error : mutation.error,
+    conflict: recordId ? edit.conflict : mutation.conflict,
+    clearConflict: () => {
+      mutation.clearConflict();
+      setEdit((e) => ({ ...e, conflict: null }));
+    }
+  };
   const [draft, setDraft] = (0, import_react41.useState)({});
   const [touched, setTouched] = (0, import_react41.useState)(false);
+  const [changed, setChanged] = (0, import_react41.useState)({});
+  const [answered, setAnswered] = (0, import_react41.useState)(null);
   const loaded = useRecordVersion(recordId ?? null);
   const loadedVersion = loaded.version;
+  const changedRef = (0, import_react41.useRef)({});
+  changedRef.current = changed;
   (0, import_react41.useEffect)(() => {
     const document3 = existing.data?.document;
-    if (document3) setDraft({ ...document3 });
+    if (!document3) return;
+    const mine = changedRef.current;
+    setDraft((held) => {
+      const next = { ...document3 };
+      for (const key of Object.keys(mine)) next[key] = held[key];
+      return next;
+    });
   }, [existing.data?.record_id, loadedVersion]);
   const document2 = (0, import_react41.useMemo)(() => {
     const out = {};
@@ -7252,22 +7393,61 @@ function RecordForm({
     return out;
   }, [draft]);
   const predicted = (0, import_react41.useMemo)(
-    () => fields.data ? (0, import_core6.predictWriteRefusals)({ fields: fields.data, document: document2, ...recordType ? { recordType } : {} }) : [],
+    () => fields.data ? (0, import_core7.predictWriteRefusals)({ fields: fields.data, document: document2, ...recordType ? { recordType } : {} }) : [],
     [fields.data, document2, recordType]
   );
   if (fields.error) return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(RefusalNotice, { error: fields.error, className });
   if (existing.error) return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(RefusalNotice, { error: existing.error, className });
+  const storeSaid = said.error && said.error !== answered ? said.error : null;
+  const fieldProblems = predicted.filter((p) => p.field_key);
+  const problemsShown = (key) => touched || changed[key] ? fieldProblems.filter((p) => p.field_key === key) : [];
+  const storeRefusalIsOnAField = storeSaid !== null && !said.conflict && storeSaid.code === "refused_by_rule" && (fields.data ?? []).some((f) => problemsShown(f.key).length > 0);
+  const stored = existing.data?.document;
+  const focusField = (field) => {
+    if (!field) return;
+    globalThis.document?.getElementById(`field-${field.id}`)?.focus();
+  };
+  const keepEditing = (field) => {
+    if (storeSaid) setAnswered(storeSaid);
+    const first = field ?? (fields.data ?? []).find((f) => problemsShown(f.key).length > 0) ?? (fields.data ?? [])[0];
+    focusField(first);
+  };
+  const discard = (field) => {
+    if (storeSaid) setAnswered(storeSaid);
+    if (field) {
+      setDraft((d) => ({ ...d, [field.key]: stored ? stored[field.key] : void 0 }));
+      setChanged((c) => {
+        const next = { ...c };
+        delete next[field.key];
+        return next;
+      });
+      return;
+    }
+    setDraft(stored ? { ...stored } : {});
+    setChanged({});
+    setTouched(false);
+  };
   const save = async () => {
     setTouched(true);
+    setAnswered(null);
     if (recordId) {
       const version = loadedVersion;
-      const moved = await mutation.update({
-        record_id: recordId,
-        patch: document2,
-        ...version === null ? {} : { expectedVersion: version }
+      if (Object.keys(changed).length === 0) {
+        onSaved?.(recordId);
+        return;
+      }
+      const patch = Object.fromEntries(Object.entries(document2).filter(([key]) => changed[key]));
+      setEdit({ saving: true, error: null, conflict: null });
+      const answered2 = await updateOnTheWinningVersion(client, recordId, patch, version, stored ?? {});
+      setEdit({
+        saving: false,
+        error: answered2.ok ? null : answered2.error,
+        conflict: answered2.ok ? null : (0, import_core7.asWriteConflict)(answered2.error, recordId)
       });
+      const moved = answered2.ok ? answered2.data : null;
       if (moved !== null) {
         loaded.note(moved);
+        setChanged({});
         host.notify?.success("Saved");
         existing.reload();
         onSaved?.(recordId);
@@ -7295,8 +7475,13 @@ function RecordForm({
             field,
             value: draft[field.key],
             document: existing.data?.document,
-            problems: touched ? predicted.filter((p) => p.field_key === field.key) : [],
-            onChange: (value) => setDraft((d) => ({ ...d, [field.key]: value }))
+            problems: problemsShown(field.key),
+            onChange: (value) => {
+              setDraft((d) => ({ ...d, [field.key]: value }));
+              setChanged((c) => c[field.key] ? c : { ...c, [field.key]: true });
+            },
+            onKeepEditing: () => keepEditing(field),
+            onDiscard: () => discard(field)
           },
           field.id
         )) }),
@@ -7307,13 +7492,13 @@ function RecordForm({
           },
           p.message
         )) : null,
-        mutation.error ? /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+        storeSaid && !storeRefusalIsOnAField ? /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
           RefusalNotice,
           {
-            error: mutation.error,
-            ...mutation.conflict ? {
+            error: storeSaid,
+            ...said.conflict ? {
               actions: /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { className: "mt-1 space-y-1", children: [
-                Object.entries(mutation.conflict.contested_fields).map(([key, theirs]) => {
+                Object.entries(said.conflict.contested_fields).map(([key, theirs]) => {
                   const column = (fields.data ?? []).find((f) => f.key === key);
                   return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("p", { className: "text-[11px]", children: [
                     column ? fieldName(column) : humanize(key),
@@ -7331,19 +7516,21 @@ function RecordForm({
                     size: "sm",
                     variant: "outline",
                     onClick: () => {
+                      if (said.conflict) loaded.note(said.conflict.current_version);
                       existing.reload();
-                      mutation.clearConflict();
+                      said.clearConflict();
+                      setAnswered(storeSaid);
                     },
                     children: "Take theirs and start again"
                   }
                 )
               ] })
-            } : {}
+            } : { onKeepEditing: () => keepEditing(), onDiscard: () => discard() }
           }
         ) : null,
         /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_design_system20.Separator, {}),
         /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { className: "flex items-center gap-2", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_design_system20.Button, { type: "submit", size: "sm", disabled: mutation.saving, children: mutation.saving ? "Saving\u2026" : recordId ? "Save" : "Create" }),
+          /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_design_system20.Button, { type: "submit", size: "sm", disabled: said.saving, children: said.saving ? "Saving\u2026" : recordId ? "Save" : "Create" }),
           onCancel ? /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_design_system20.Button, { type: "button", size: "sm", variant: "ghost", onClick: onCancel, children: "Cancel" }) : null
         ] })
       ]
@@ -7355,17 +7542,20 @@ function FieldRow({
   value,
   document: document2,
   problems,
-  onChange
+  onChange,
+  onKeepEditing,
+  onDiscard
 }) {
   const id = `field-${field.id}`;
   return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { className: "flex min-w-0 flex-col gap-1", children: [
     /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(FieldLabel, { field, htmlFor: id, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(ProvenanceBadge, { document: document2, fieldKey: field.key }) }),
     /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(FieldControl, { field, value, onChange, id }),
-    problems.map((problem) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+    problems.map((problem, index) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
       RefusalNotice,
       {
         error: { code: "refused_by_rule", message: problem.message },
-        className: "border-0 p-0"
+        className: "border-0 p-0",
+        ...index === 0 ? { onKeepEditing, onDiscard } : {}
       },
       problem.message
     ))
@@ -7658,6 +7848,9 @@ function viewFromRecord(row) {
     presentation: parseGridPresentation(data["presentation"])
   };
 }
+async function saveViewPatch(client, viewId, document2, expectedVersion) {
+  return updateOnTheWinningVersion(client, viewId, document2, expectedVersion, "always");
+}
 function viewPatchDocument(patch) {
   const out = {};
   if (patch.name !== void 0) out["name"] = patch.name;
@@ -12053,6 +12246,21 @@ function whenItFires(subscription) {
   const every = subscription.cadence === "hourly" ? "an hourly summary" : subscription.cadence === "weekly" ? "a weekly summary" : "a daily summary";
   return subscription.schedule ? `${every}, ${subscription.schedule}` : every;
 }
+var PERIOD_MS = {
+  hourly: 60 * 60 * 1e3,
+  daily: 24 * 60 * 60 * 1e3,
+  weekly: 7 * 24 * 60 * 60 * 1e3
+};
+function nextSummaryAt(subscription, now) {
+  if (!subscription.next_digest_at) return null;
+  const due = new Date(subscription.next_digest_at);
+  if (Number.isNaN(due.getTime())) return null;
+  if (due.getTime() > now.getTime()) return due;
+  const period = PERIOD_MS[subscription.cadence];
+  if (!period) return due;
+  const behind = now.getTime() - due.getTime();
+  return new Date(due.getTime() + (Math.floor(behind / period) + 1) * period);
+}
 var CHANNEL_WORDS2 = SUBSCRIPTION_CHANNEL_LABEL;
 var DIGEST_SUGGESTION = "Email me a summary of this every Monday at 8 in the morning.";
 function SubscriptionsPanel({ tableId, activeRuleId, className }) {
@@ -12180,7 +12388,7 @@ function SubscriptionsPanel({ tableId, activeRuleId, className }) {
           /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: "mt-1.5 flex flex-wrap items-center gap-x-3 gap-y-1 text-xs text-muted-foreground", children: [
             subscription.next_digest_at ? /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("span", { children: [
               "Next summary ",
-              new Date(subscription.next_digest_at).toLocaleString()
+              nextSummaryAt(subscription, /* @__PURE__ */ new Date())?.toLocaleString()
             ] }) : subscription.cadence === "instant" ? null : subscription.muted ? /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("span", { children: "No next summary while it is off." }) : null,
             subscription.last_sent_at ? /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("span", { children: [
               "Last told you ",
@@ -13876,14 +14084,14 @@ function NotifyRuleEditor({ tableId, seed, className }) {
 var import_react95 = require("react");
 var import_recharts = require("recharts");
 var import_records11 = require("@ai-matrx/records");
-var import_core7 = require("@ai-matrx/records/core");
+var import_core8 = require("@ai-matrx/records/core");
 var import_design_system46 = require("@ai-matrx/design-system");
 var import_jsx_runtime49 = require("react/jsx-runtime");
 function pretty(n) {
   return Number.isInteger(n) ? n.toLocaleString() : n.toLocaleString(void 0, { maximumFractionDigits: 2 });
 }
 function asRefusal2(block) {
-  return (0, import_core7.mapPgError)(
+  return (0, import_core8.mapPgError)(
     {
       message: block.refused ?? "",
       ...block.sqlstate ? { code: block.sqlstate } : {}
@@ -16330,13 +16538,30 @@ var LANE_EMPTY = {
   community: "Nothing shared beyond your organization. A table published by link or to the world lands here.",
   app: "The app has not needed a table of its own in this organization yet. Saving a view, writing a comment or building a form makes one, and it appears here rather than among your own data."
 };
+function keptByTheApp(table) {
+  return table.kept_by_the_app === true;
+}
 function laneFor(table) {
   if (table.is_kernel) return "system";
-  if ((table.slug ?? "").startsWith(APP_TABLE_PREFIX)) return "app";
+  if ((table.slug ?? "").startsWith(APP_TABLE_PREFIX) || keptByTheApp(table)) return "app";
   if (table.visibility === "public" || table.visibility === "link") return "community";
   if (table.visibility === "personal") return "mine";
   return "organization";
 }
+var VISIBILITY_LANES = ["mine", "organization", "community", "world"];
+var VISIBILITY_LANE_TITLE = {
+  mine: "Mine",
+  organization: "My organization",
+  community: "Community",
+  world: "World"
+};
+function visibilityLaneFor(table) {
+  if (table.is_kernel) return null;
+  if ((table.slug ?? "").startsWith(APP_TABLE_PREFIX) || keptByTheApp(table)) return null;
+  if (table.visibility === "personal") return "mine";
+  if (table.visibility === "link" || table.visibility === "public") return "world";
+  return "organization";
+}
 function TablesHome({ onOpenTable, className }) {
   const client = (0, import_react117.useRecordsClient)();
   const tables = (0, import_react117.useTables)();
@@ -16484,6 +16709,43 @@ var import_react118 = require("react");
 var import_react119 = require("@ai-matrx/records/react");
 var import_design_system57 = require("@ai-matrx/design-system");
 var import_jsx_runtime61 = require("react/jsx-runtime");
+var RAIL_TITLE = {
+  settings: "Table settings",
+  inbox: "Inbox",
+  import: "Import",
+  field: "Add a field",
+  record: "Record",
+  "new-record": "New record",
+  forms: "Forms",
+  bookings: "Bookings",
+  checklists: "Checklists",
+  notifications: "Notifications",
+  portals: "Portals",
+  "who-changed": "Who changed this"
+};
+function RailFrame({
+  phone,
+  title,
+  onClose,
+  children
+}) {
+  if (phone) {
+    return /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(
+      import_design_system57.BottomSheet,
+      {
+        open: true,
+        onOpenChange: (open) => {
+          if (!open) onClose();
+        },
+        title,
+        size: "full",
+        surface: "solid",
+        children: /* @__PURE__ */ (0, import_jsx_runtime61.jsx)("div", { "data-rail-sheet": "", className: "min-h-0 flex-1 overflow-y-auto px-3 pb-6", children })
+      }
+    );
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime61.jsx)("aside", { "data-rail-column": "", className: "w-[26rem] shrink-0 overflow-y-auto rounded-md border p-3", children });
+}
 function filterInWords(filter, fields) {
   const nameOf = (key) => {
     const field = fields.find((f) => f.key === key);
@@ -16623,6 +16885,7 @@ function TablePage({
   const setRail = (next) => setSurface((now) => ({ ...now, rail: next }));
   const [openRecord, setOpenRecord] = (0, import_react118.useState)(opening.record);
   const viewVersion = useRecordVersion(view?.id ?? null);
+  const phone = (0, import_design_system57.useIsMobile)();
   const shownLayout = layoutFromLink ?? view?.layout ?? "grid";
   const press = (pressed) => {
     const next = chooseSurface(surface, pressed);
@@ -16650,6 +16913,7 @@ function TablePage({
     setLayoutFromLink(isLayout ? named : null);
     setSurface((now) => ({ ...now, main: isLayout ? "records" : named }));
   }, [activeView]);
+  const [viewSaveRefused, setViewSaveRefused] = (0, import_react118.useState)(null);
   const patchView = (0, import_react118.useCallback)(
     async (patch) => {
       const current = view;
@@ -16657,12 +16921,13 @@ function TablePage({
       setView({ ...current, ...patch });
       const document2 = viewPatchDocument(patch);
       if (Object.keys(document2).length === 0) return;
-      const written = await client.recordUpdate({
-        record_id: current.id,
-        patch: document2,
-        ...viewVersion.version === null ? {} : { expectedVersion: viewVersion.version }
-      });
-      if (written.ok) viewVersion.note(written.data);
+      setViewSaveRefused(null);
+      const written = await saveViewPatch(client, current.id, document2, viewVersion.version);
+      if (written.ok) {
+        viewVersion.note(written.data);
+        return;
+      }
+      setViewSaveRefused({ error: written.error, patch, before: current });
     },
     [client, view, viewVersion]
   );
@@ -16813,6 +17078,27 @@ function TablePage({
         ),
         /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(ExportMenu, { tableId })
       ] }),
+      viewSaveRefused ? /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(
+        RefusalNotice,
+        {
+          error: viewSaveRefused.error,
+          actions: /* @__PURE__ */ (0, import_jsx_runtime61.jsxs)("span", { className: "flex flex-wrap gap-1 pt-0.5", "data-view-save-refused": "", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(import_design_system57.Button, { size: "sm", variant: "outline", onClick: () => void patchView(viewSaveRefused.patch), children: "Try again" }),
+            /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(
+              import_design_system57.Button,
+              {
+                size: "sm",
+                variant: "ghost",
+                onClick: () => {
+                  setView(viewSaveRefused.before);
+                  setViewSaveRefused(null);
+                },
+                children: "Discard"
+              }
+            )
+          ] })
+        }
+      ) : null,
       main === "dashboards" ? /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(DashboardCanvas, { tableId, activeDashboardId: activeDashboardId ?? null }) : main === "archived" ? (
         /* THE ROWS THAT LEFT. Restoring one puts it back in the grid, so the
            page returns to the records rather than leaving the person looking
@@ -16873,7 +17159,7 @@ function TablePage({
         view ? null : /* @__PURE__ */ (0, import_jsx_runtime61.jsx)("p", { className: "text-xs text-muted-foreground", children: VIEW_NOT_SAVED_YET })
       ] })
     ] }),
-    rail === "none" ? null : /* @__PURE__ */ (0, import_jsx_runtime61.jsxs)("aside", { className: "w-[26rem] shrink-0 overflow-y-auto rounded-md border p-3", children: [
+    rail === "none" ? null : /* @__PURE__ */ (0, import_jsx_runtime61.jsxs)(RailFrame, { phone, title: RAIL_TITLE[rail], onClose: () => setRail("none"), children: [
       rail === "settings" ? /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(
         TableSettings,
         {