@elytracms/studio 0.0.93 → 0.0.95

package/dist/components/cms/row-actions.js.map

@@ -1 +1 @@
-{"version":3,"file":"row-actions.js","sourceRoot":"","sources":["../../../src/components/cms/row-actions.ts"],"names":[],"mappings":"AAsBA;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,aAAa,CAAC,EAAE,YAAY,EAAE,aAAa,EAAE,SAAS,EAAmB;IACvF,MAAM,OAAO,GAAgB,EAAE,CAAA;IAC/B,IAAI,aAAa;QAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACvC,IAAI,YAAY,CAAC,SAAS,IAAI,aAAa;QAAE,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IACtE,IAAI,YAAY,CAAC,OAAO;QAAE,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IAC3E,IAAI,YAAY,CAAC,MAAM;QAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC/C,OAAO,OAAO,CAAA;AAChB,CAAC","sourcesContent":["import type { CollectionViewCapabilities } from '@elytracms/studio/lib/collection-view/collection-view-source'\n\n/**\n * EC-316 — the right-edge row `⋮` menu's action vocabulary: the SAME bulk-action\n * set the toolbar's selection actions offer (`bulk-actions.ts`'s `BulkAction`),\n * minus `set-field` (a bulk-only composer over a multi-row selection — a single\n * row edits its fields directly in the table), plus `open` (jump to the detail\n * editor — the row's own affordance the primary-column link already offers, but\n * explicit in the menu for a keyboard/menu-driven workflow), plus `duplicate`\n * (EC-442 — copy the draft into a fresh draft document).\n */\nexport type RowAction = 'open' | 'duplicate' | 'publish' | 'unpublish' | 'delete'\n\nexport interface RowActionsInput {\n  /** The rail's capability matrix (AD-19) — the SAME gate the list/edit shells use. */\n  capabilities: Pick<CollectionViewCapabilities, 'publish' | 'remove' | 'duplicate'>\n  /** Whether this row has a navigable detail route (a rail with no detail surface omits it). */\n  hasDetailPath: boolean\n  /** Whether this document IS published — decides `publish` vs `unpublish`. */\n  published: boolean\n}\n\n/**\n * The gated action list for one row (EC-316). Every entry mirrors a capability\n * the rail actually declares — a source without `publish` never offers\n * publish/unpublish, one without `remove` never offers delete, and a rail with\n * no detail surface never offers `open` — so the SAME menu serves the users\n * rail (EC-240), redirects, and any future `CollectionViewSource` without a\n * bespoke per-rail menu. An empty result means the row menu itself renders\n * nothing (never an empty, useless trigger).\n *\n * `duplicate` (EC-442, amended same day) is gated on its OWN capability flag\n * plus a detail surface to land on — never derived from `create`. The owner\n * call (2026-07-17): CMS collections ONLY; every primitive rail declares\n * `duplicate: false` (identities and uploads aren't copyable content;\n * redirects deferred until requested as a product feature).\n */\nexport function rowActionsFor({ capabilities, hasDetailPath, published }: RowActionsInput): RowAction[] {\n  const actions: RowAction[] = []\n  if (hasDetailPath) actions.push('open')\n  if (capabilities.duplicate && hasDetailPath) actions.push('duplicate')\n  if (capabilities.publish) actions.push(published ? 'unpublish' : 'publish')\n  if (capabilities.remove) actions.push('delete')\n  return actions\n}\n"]}
+{"version":3,"file":"row-actions.js","sourceRoot":"","sources":["../../../src/components/cms/row-actions.ts"],"names":[],"mappings":"AAsBA;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,aAAa,CAAC,EAAE,YAAY,EAAE,aAAa,EAAE,SAAS,EAAmB;IACvF,MAAM,OAAO,GAAgB,EAAE,CAAA;IAC/B,IAAI,aAAa;QAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACvC,IAAI,YAAY,CAAC,SAAS,IAAI,aAAa;QAAE,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IACtE,IAAI,YAAY,CAAC,OAAO;QAAE,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IAC3E,IAAI,YAAY,CAAC,MAAM;QAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC/C,OAAO,OAAO,CAAA;AAChB,CAAC","sourcesContent":["import type { CollectionViewCapabilities } from '../../lib/collection-view/collection-view-source'\n\n/**\n * EC-316 — the right-edge row `⋮` menu's action vocabulary: the SAME bulk-action\n * set the toolbar's selection actions offer (`bulk-actions.ts`'s `BulkAction`),\n * minus `set-field` (a bulk-only composer over a multi-row selection — a single\n * row edits its fields directly in the table), plus `open` (jump to the detail\n * editor — the row's own affordance the primary-column link already offers, but\n * explicit in the menu for a keyboard/menu-driven workflow), plus `duplicate`\n * (EC-442 — copy the draft into a fresh draft document).\n */\nexport type RowAction = 'open' | 'duplicate' | 'publish' | 'unpublish' | 'delete'\n\nexport interface RowActionsInput {\n  /** The rail's capability matrix (AD-19) — the SAME gate the list/edit shells use. */\n  capabilities: Pick<CollectionViewCapabilities, 'publish' | 'remove' | 'duplicate'>\n  /** Whether this row has a navigable detail route (a rail with no detail surface omits it). */\n  hasDetailPath: boolean\n  /** Whether this document IS published — decides `publish` vs `unpublish`. */\n  published: boolean\n}\n\n/**\n * The gated action list for one row (EC-316). Every entry mirrors a capability\n * the rail actually declares — a source without `publish` never offers\n * publish/unpublish, one without `remove` never offers delete, and a rail with\n * no detail surface never offers `open` — so the SAME menu serves the users\n * rail (EC-240), redirects, and any future `CollectionViewSource` without a\n * bespoke per-rail menu. An empty result means the row menu itself renders\n * nothing (never an empty, useless trigger).\n *\n * `duplicate` (EC-442, amended same day) is gated on its OWN capability flag\n * plus a detail surface to land on — never derived from `create`. The owner\n * call (2026-07-17): CMS collections ONLY; every primitive rail declares\n * `duplicate: false` (identities and uploads aren't copyable content;\n * redirects deferred until requested as a product feature).\n */\nexport function rowActionsFor({ capabilities, hasDetailPath, published }: RowActionsInput): RowAction[] {\n  const actions: RowAction[] = []\n  if (hasDetailPath) actions.push('open')\n  if (capabilities.duplicate && hasDetailPath) actions.push('duplicate')\n  if (capabilities.publish) actions.push(published ? 'unpublish' : 'publish')\n  if (capabilities.remove) actions.push('delete')\n  return actions\n}\n"]}

package/dist/components/cms/scalar-value-editor.d.ts

@@ -1,5 +1,5 @@
 import type { FilterScalar } from '@elytracms/core/content';
-import type { FilterableFieldOption } from '@elytracms/studio/lib/cms-views';
+import type { FilterableFieldOption } from '../../lib/cms-views/index.js';
 /**
  * The closed single-scalar value control (EC-247), shared by the filter
  * builder's `eq`/comparison clauses and the bulk set-field action so both

package/dist/components/cms/scalar-value-editor.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState } from 'react';
 import { Input, Select } from '@elytracms/studio/ui';
-import { localizedLabel, translate } from '@elytracms/studio/lib/i18n';
-import { scalarFromText } from '@elytracms/studio/lib/cms-views';
+import { localizedLabel, translate } from '../../lib/i18n/index.js';
+import { scalarFromText } from '../../lib/cms-views/index.js';
 import { DateInput } from './date-input.js';
 import { datePickerBounds } from './date-input-core.js';
 /**

package/dist/components/cms/scalar-value-editor.js.map

@@ -1 +1 @@
-{"version":3,"file":"scalar-value-editor.js","sourceRoot":"","sources":["../../../src/components/cms/scalar-value-editor.tsx"],"names":[],"mappings":"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","sourcesContent":["import { useState } from 'react'\nimport type { FilterScalar } from '@elytracms/core/content'\nimport { Input, Select } from '@elytracms/studio/ui'\nimport { localizedLabel, translate } from '@elytracms/studio/lib/i18n'\nimport { scalarFromText } from '@elytracms/studio/lib/cms-views'\nimport type { FilterableFieldOption } from '@elytracms/studio/lib/cms-views'\nimport { DateInput } from './date-input'\nimport { datePickerBounds } from './date-input-core'\n\n/**\n * The closed single-scalar value control (EC-247), shared by the filter\n * builder's `eq`/comparison clauses and the bulk set-field action so both\n * surfaces enter a value the SAME way. It renders exactly the input the field's\n * schema type warrants — a select for boolean/select, a date input, a\n * number/text input otherwise. The `in` multi-value list and the\n * publication-state pseudo field stay in the filter builder: they are\n * filter-only and never a set-field target.\n *\n * It is deliberately *closed* — no field type invents a new control — keeping\n * value entry consistent and agent-inspectable across the two surfaces.\n */\nexport function ScalarFieldValueEditor({\n  option,\n  value,\n  testId,\n  ariaLabel = translate('cms.field.value'),\n  onChange,\n}: {\n  /** The field whose value is being entered (its `def` drives the control). */\n  option: FilterableFieldOption | undefined\n  value: FilterScalar\n  testId: string\n  ariaLabel?: string\n  onChange: (value: FilterScalar) => void\n}) {\n  switch (option?.def?.type) {\n    case 'boolean':\n      return (\n        <Select\n          aria-label={ariaLabel}\n          value={value === true ? 'true' : 'false'}\n          onChange={(event) => onChange(event.target.value === 'true')}\n          className=\"h-7 w-auto py-0 text-xs\"\n          data-testid={testId}\n        >\n          <option value=\"true\">{translate('common.true')}</option>\n          <option value=\"false\">{translate('common.false')}</option>\n        </Select>\n      )\n    case 'select':\n      return (\n        <Select\n          aria-label={ariaLabel}\n          value={String(value)}\n          onChange={(event) => onChange(event.target.value)}\n          className=\"h-7 w-auto py-0 text-xs\"\n          data-testid={testId}\n        >\n          <option value=\"\">—</option>\n          {option.def.options.map((opt) => (\n            <option key={opt.value} value={opt.value}>\n              {localizedLabel(opt.label, opt.value)}\n            </option>\n          ))}\n        </Select>\n      )\n    case 'date':\n      // EC-463: the shared date control — a segment keystroke never commits a\n      // partial year, and pasting/filling an ISO date works.\n      return (\n        <DateInput\n          ariaLabel={ariaLabel}\n          value={value}\n          onChange={(stored) => onChange(stored ?? '')}\n          className=\"h-7 w-36 text-xs\"\n          testId={testId}\n          {...datePickerBounds(option.def.validation)}\n        />\n      )\n    case 'number':\n      return (\n        <DraftValueInput\n          type=\"number\"\n          initial={value === '' ? '' : String(value)}\n          ariaLabel={ariaLabel}\n          testId={testId}\n          onText={(raw) => onChange(scalarFromText(option, raw))}\n        />\n      )\n    default:\n      return (\n        <DraftValueInput\n          initial={String(value)}\n          ariaLabel={ariaLabel}\n          testId={testId}\n          onText={(raw) => onChange(scalarFromText(option, raw))}\n        />\n      )\n  }\n}\n\n/**\n * Text input with a local draft so typing is never re-normalized mid-keystroke\n * (e.g. a trailing comma in a filter `in` list). Remount (key it) when the\n * field/operator changes so the draft resets to the new initial.\n */\nexport function DraftValueInput({\n  initial,\n  type = 'text',\n  placeholder,\n  ariaLabel = translate('cms.field.value'),\n  testId,\n  onText,\n}: {\n  initial: string\n  type?: 'text' | 'number'\n  placeholder?: string\n  ariaLabel?: string\n  testId: string\n  onText: (raw: string) => void\n}) {\n  const [draft, setDraft] = useState(initial)\n  return (\n    <Input\n      aria-label={ariaLabel}\n      type={type}\n      value={draft}\n      placeholder={placeholder ?? translate('cms.field.valuePlaceholder')}\n      onChange={(event) => {\n        setDraft(event.target.value)\n        onText(event.target.value)\n      }}\n      className=\"h-7 w-36 text-xs\"\n      data-testid={testId}\n    />\n  )\n}\n"]}
+{"version":3,"file":"scalar-value-editor.js","sourceRoot":"","sources":["../../../src/components/cms/scalar-value-editor.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAEpD;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,sBAAsB,CAAC,EACrC,MAAM,EACN,KAAK,EACL,MAAM,EACN,SAAS,GAAG,SAAS,CAAC,iBAAiB,CAAC,EACxC,QAAQ,GAQT;IACC,QAAQ,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;QAC1B,KAAK,SAAS;YACZ,OAAO,CACL,MAAC,MAAM,kBACO,SAAS,EACrB,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EACxC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,KAAK,MAAM,CAAC,EAC5D,SAAS,EAAC,yBAAyB,iBACtB,MAAM,aAEnB,iBAAQ,KAAK,EAAC,MAAM,YAAE,SAAS,CAAC,aAAa,CAAC,GAAU,EACxD,iBAAQ,KAAK,EAAC,OAAO,YAAE,SAAS,CAAC,cAAc,CAAC,GAAU,IACnD,CACV,CAAA;QACH,KAAK,QAAQ;YACX,OAAO,CACL,MAAC,MAAM,kBACO,SAAS,EACrB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EACpB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EACjD,SAAS,EAAC,yBAAyB,iBACtB,MAAM,aAEnB,iBAAQ,KAAK,EAAC,EAAE,uBAAW,EAC1B,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAC/B,iBAAwB,KAAK,EAAE,GAAG,CAAC,KAAK,YACrC,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,IAD1B,GAAG,CAAC,KAAK,CAEb,CACV,CAAC,IACK,CACV,CAAA;QACH,KAAK,MAAM;YACT,wEAAwE;YACxE,uDAAuD;YACvD,OAAO,CACL,KAAC,SAAS,IACR,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC,EAC5C,SAAS,EAAC,kBAAkB,EAC5B,MAAM,EAAE,MAAM,KACV,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,GAC3C,CACH,CAAA;QACH,KAAK,QAAQ;YACX,OAAO,CACL,KAAC,eAAe,IACd,IAAI,EAAC,QAAQ,EACb,OAAO,EAAE,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAC1C,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GACtD,CACH,CAAA;QACH;YACE,OAAO,CACL,KAAC,eAAe,IACd,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EACtB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GACtD,CACH,CAAA;IACL,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,EAC9B,OAAO,EACP,IAAI,GAAG,MAAM,EACb,WAAW,EACX,SAAS,GAAG,SAAS,CAAC,iBAAiB,CAAC,EACxC,MAAM,EACN,MAAM,GAQP;IACC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;IAC3C,OAAO,CACL,KAAC,KAAK,kBACQ,SAAS,EACrB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,IAAI,SAAS,CAAC,4BAA4B,CAAC,EACnE,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;YAClB,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAC5B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAC5B,CAAC,EACD,SAAS,EAAC,kBAAkB,iBACf,MAAM,GACnB,CACH,CAAA;AACH,CAAC","sourcesContent":["import { useState } from 'react'\nimport type { FilterScalar } from '@elytracms/core/content'\nimport { Input, Select } from '@elytracms/studio/ui'\nimport { localizedLabel, translate } from '../../lib/i18n'\nimport { scalarFromText } from '../../lib/cms-views'\nimport type { FilterableFieldOption } from '../../lib/cms-views'\nimport { DateInput } from './date-input'\nimport { datePickerBounds } from './date-input-core'\n\n/**\n * The closed single-scalar value control (EC-247), shared by the filter\n * builder's `eq`/comparison clauses and the bulk set-field action so both\n * surfaces enter a value the SAME way. It renders exactly the input the field's\n * schema type warrants — a select for boolean/select, a date input, a\n * number/text input otherwise. The `in` multi-value list and the\n * publication-state pseudo field stay in the filter builder: they are\n * filter-only and never a set-field target.\n *\n * It is deliberately *closed* — no field type invents a new control — keeping\n * value entry consistent and agent-inspectable across the two surfaces.\n */\nexport function ScalarFieldValueEditor({\n  option,\n  value,\n  testId,\n  ariaLabel = translate('cms.field.value'),\n  onChange,\n}: {\n  /** The field whose value is being entered (its `def` drives the control). */\n  option: FilterableFieldOption | undefined\n  value: FilterScalar\n  testId: string\n  ariaLabel?: string\n  onChange: (value: FilterScalar) => void\n}) {\n  switch (option?.def?.type) {\n    case 'boolean':\n      return (\n        <Select\n          aria-label={ariaLabel}\n          value={value === true ? 'true' : 'false'}\n          onChange={(event) => onChange(event.target.value === 'true')}\n          className=\"h-7 w-auto py-0 text-xs\"\n          data-testid={testId}\n        >\n          <option value=\"true\">{translate('common.true')}</option>\n          <option value=\"false\">{translate('common.false')}</option>\n        </Select>\n      )\n    case 'select':\n      return (\n        <Select\n          aria-label={ariaLabel}\n          value={String(value)}\n          onChange={(event) => onChange(event.target.value)}\n          className=\"h-7 w-auto py-0 text-xs\"\n          data-testid={testId}\n        >\n          <option value=\"\">—</option>\n          {option.def.options.map((opt) => (\n            <option key={opt.value} value={opt.value}>\n              {localizedLabel(opt.label, opt.value)}\n            </option>\n          ))}\n        </Select>\n      )\n    case 'date':\n      // EC-463: the shared date control — a segment keystroke never commits a\n      // partial year, and pasting/filling an ISO date works.\n      return (\n        <DateInput\n          ariaLabel={ariaLabel}\n          value={value}\n          onChange={(stored) => onChange(stored ?? '')}\n          className=\"h-7 w-36 text-xs\"\n          testId={testId}\n          {...datePickerBounds(option.def.validation)}\n        />\n      )\n    case 'number':\n      return (\n        <DraftValueInput\n          type=\"number\"\n          initial={value === '' ? '' : String(value)}\n          ariaLabel={ariaLabel}\n          testId={testId}\n          onText={(raw) => onChange(scalarFromText(option, raw))}\n        />\n      )\n    default:\n      return (\n        <DraftValueInput\n          initial={String(value)}\n          ariaLabel={ariaLabel}\n          testId={testId}\n          onText={(raw) => onChange(scalarFromText(option, raw))}\n        />\n      )\n  }\n}\n\n/**\n * Text input with a local draft so typing is never re-normalized mid-keystroke\n * (e.g. a trailing comma in a filter `in` list). Remount (key it) when the\n * field/operator changes so the draft resets to the new initial.\n */\nexport function DraftValueInput({\n  initial,\n  type = 'text',\n  placeholder,\n  ariaLabel = translate('cms.field.value'),\n  testId,\n  onText,\n}: {\n  initial: string\n  type?: 'text' | 'number'\n  placeholder?: string\n  ariaLabel?: string\n  testId: string\n  onText: (raw: string) => void\n}) {\n  const [draft, setDraft] = useState(initial)\n  return (\n    <Input\n      aria-label={ariaLabel}\n      type={type}\n      value={draft}\n      placeholder={placeholder ?? translate('cms.field.valuePlaceholder')}\n      onChange={(event) => {\n        setDraft(event.target.value)\n        onText(event.target.value)\n      }}\n      className=\"h-7 w-36 text-xs\"\n      data-testid={testId}\n    />\n  )\n}\n"]}

package/dist/components/cms/use-discard-controller.d.ts

@@ -1,6 +1,6 @@
 import type { QueryKey } from '@tanstack/react-query';
 import type { CmsDocument, DocumentRef } from '@elytracms/core/cms-core';
-import type { CollectionViewSource } from '@elytracms/studio/lib/collection-view/collection-view-source';
+import type { CollectionViewSource } from '../../lib/collection-view/collection-view-source.js';
 import type { DiscardDraftStatus } from './discard-draft.js';
 export interface DiscardController {
     status: DiscardDraftStatus;

package/dist/components/cms/use-discard-controller.js

@@ -1,5 +1,5 @@
 import { useCallback, useState } from 'react';
-import { translate } from '@elytracms/studio/lib/i18n';
+import { translate } from '../../lib/i18n/index.js';
 import { discardDraftStatus } from './discard-draft.js';
 import { useRestoreVersion } from './use-restore-version.js';
 /**

package/dist/components/cms/use-discard-controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-discard-controller.js","sourceRoot":"","sources":["../../../src/components/cms/use-discard-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAI7C,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAEpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAezD;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAapC;IACC,MAAM,EACJ,UAAU,EACV,SAAS,EACT,YAAY,EACZ,oBAAoB,EACpB,sBAAsB,EACtB,UAAU,EACV,KAAK,EACL,MAAM,EACN,MAAM,EACN,YAAY,EACZ,KAAK,EACL,IAAI,GACL,GAAG,KAAK,CAAA;IAET,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IACrD,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,iBAAiB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAA;IAEtG,MAAM,MAAM,GAAG,kBAAkB,CAAC;QAChC,UAAU;QACV,SAAS;QACT,YAAY;QACZ,iBAAiB,EAAE,oBAAoB;QACvC,KAAK;KACN,CAAC,CAAA;IACF,MAAM,cAAc,GAClB,MAAM,KAAK,gBAAgB;QACzB,CAAC,CAAC,SAAS,CAAC,mCAAmC,CAAC;QAChD,CAAC,CAAC,MAAM,KAAK,YAAY;YACvB,CAAC,CAAC,SAAS,CAAC,qCAAqC,CAAC;YAClD,CAAC,CAAC,MAAM,KAAK,SAAS;gBACpB,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC;gBAC7B,CAAC,CAAC,SAAS,CAAA;IAEnB,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QACrC,IAAI,sBAAsB,KAAK,SAAS;YAAE,OAAM;QAChD,IAAI,CAAC;YACH,4EAA4E;YAC5E,+EAA+E;YAC/E,MAAM,OAAO,CAAC,sBAAsB,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;QACxD,CAAC;gBAAS,CAAC;YACT,cAAc,CAAC,KAAK,CAAC,CAAA;QACvB,CAAC;IACH,CAAC,EAAE,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC,CAAA;IAErC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;AAC/E,CAAC","sourcesContent":["import { useCallback, useState } from 'react'\nimport type { QueryKey } from '@tanstack/react-query'\nimport type { CmsDocument, DocumentRef } from '@elytracms/core/cms-core'\nimport type { CollectionViewSource } from '@elytracms/studio/lib/collection-view/collection-view-source'\nimport { translate } from '@elytracms/studio/lib/i18n'\nimport { discardDraftStatus } from './discard-draft'\nimport type { DiscardDraftStatus } from './discard-draft'\nimport { useRestoreVersion } from './use-restore-version'\n\nexport interface DiscardController {\n  status: DiscardDraftStatus\n  /** The hint shown when the item is disabled (view-read-only / up-to-date / loading). */\n  disabledReason: string | undefined\n  /** Is the confirmation dialog open? */\n  confirmOpen: boolean\n  setConfirmOpen: (open: boolean) => void\n  /** Is a discard restore round-tripping (gates the dialog buttons)? */\n  busy: boolean\n  /** Confirm the discard: flush → restore the pinned published version whole. */\n  discard: () => Promise<void>\n}\n\n/**\n * EC-316 / EC-325 — the \"Discard changes\" controller. Reverting the draft to the\n * published content IS a whole-document restore of the pinned published version,\n * so it routes through the SAME shared restore sequence\n * ({@link useRestoreVersion}) the Compare view's and Versions pane's restores use\n * — never a parallel write path. That sequence flushes a dirty in-memory buffer\n * FIRST (`documents.restore` snapshots whatever is currently PERSISTED), closing\n * the undo-guarantee gap the header's discard used to have.\n *\n * The enablement is the pure `discardDraftStatus` decision (tested in\n * `discard-draft.test.ts`); its semantic-equality edge is the SAME comparator the\n * Versions pane's publish gate uses, so the two never contradict (EC-298).\n */\nexport function useDiscardController(input: {\n  canDiscard: boolean\n  published: boolean\n  viewReadOnly: boolean\n  publishedSnapshotDoc: CmsDocument | undefined\n  publishedVersionNumber: number | undefined\n  versionKey: QueryKey\n  draft: CmsDocument\n  source: CollectionViewSource\n  docRef: DocumentRef\n  replaceDraft: (doc: CmsDocument) => void\n  dirty: boolean\n  save: () => void\n}): DiscardController {\n  const {\n    canDiscard,\n    published,\n    viewReadOnly,\n    publishedSnapshotDoc,\n    publishedVersionNumber,\n    versionKey,\n    draft,\n    source,\n    docRef,\n    replaceDraft,\n    dirty,\n    save,\n  } = input\n\n  const [confirmOpen, setConfirmOpen] = useState(false)\n  const { restore, busy } = useRestoreVersion({ source, docRef, versionKey, dirty, save, replaceDraft })\n\n  const status = discardDraftStatus({\n    canDiscard,\n    published,\n    viewReadOnly,\n    publishedSnapshot: publishedSnapshotDoc,\n    draft,\n  })\n  const disabledReason =\n    status === 'view-read-only'\n      ? translate('cms.editor.switchToDraftToDiscard')\n      : status === 'up-to-date'\n        ? translate('cms.editor.discardDraftUpToDateHint')\n        : status === 'loading'\n          ? translate('common.loading')\n          : undefined\n\n  const discard = useCallback(async () => {\n    if (publishedVersionNumber === undefined) return\n    try {\n      // Whole-document restore of the pinned published version (the shared helper\n      // flushes any dirty buffer first, mirroring the Versions pane / Compare view).\n      await restore(publishedVersionNumber, { kind: 'all' })\n    } finally {\n      setConfirmOpen(false)\n    }\n  }, [publishedVersionNumber, restore])\n\n  return { status, disabledReason, confirmOpen, setConfirmOpen, busy, discard }\n}\n"]}
+{"version":3,"file":"use-discard-controller.js","sourceRoot":"","sources":["../../../src/components/cms/use-discard-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAI7C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAEpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAezD;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAapC;IACC,MAAM,EACJ,UAAU,EACV,SAAS,EACT,YAAY,EACZ,oBAAoB,EACpB,sBAAsB,EACtB,UAAU,EACV,KAAK,EACL,MAAM,EACN,MAAM,EACN,YAAY,EACZ,KAAK,EACL,IAAI,GACL,GAAG,KAAK,CAAA;IAET,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IACrD,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,iBAAiB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAA;IAEtG,MAAM,MAAM,GAAG,kBAAkB,CAAC;QAChC,UAAU;QACV,SAAS;QACT,YAAY;QACZ,iBAAiB,EAAE,oBAAoB;QACvC,KAAK;KACN,CAAC,CAAA;IACF,MAAM,cAAc,GAClB,MAAM,KAAK,gBAAgB;QACzB,CAAC,CAAC,SAAS,CAAC,mCAAmC,CAAC;QAChD,CAAC,CAAC,MAAM,KAAK,YAAY;YACvB,CAAC,CAAC,SAAS,CAAC,qCAAqC,CAAC;YAClD,CAAC,CAAC,MAAM,KAAK,SAAS;gBACpB,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC;gBAC7B,CAAC,CAAC,SAAS,CAAA;IAEnB,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QACrC,IAAI,sBAAsB,KAAK,SAAS;YAAE,OAAM;QAChD,IAAI,CAAC;YACH,4EAA4E;YAC5E,+EAA+E;YAC/E,MAAM,OAAO,CAAC,sBAAsB,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;QACxD,CAAC;gBAAS,CAAC;YACT,cAAc,CAAC,KAAK,CAAC,CAAA;QACvB,CAAC;IACH,CAAC,EAAE,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC,CAAA;IAErC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;AAC/E,CAAC","sourcesContent":["import { useCallback, useState } from 'react'\nimport type { QueryKey } from '@tanstack/react-query'\nimport type { CmsDocument, DocumentRef } from '@elytracms/core/cms-core'\nimport type { CollectionViewSource } from '../../lib/collection-view/collection-view-source'\nimport { translate } from '../../lib/i18n'\nimport { discardDraftStatus } from './discard-draft'\nimport type { DiscardDraftStatus } from './discard-draft'\nimport { useRestoreVersion } from './use-restore-version'\n\nexport interface DiscardController {\n  status: DiscardDraftStatus\n  /** The hint shown when the item is disabled (view-read-only / up-to-date / loading). */\n  disabledReason: string | undefined\n  /** Is the confirmation dialog open? */\n  confirmOpen: boolean\n  setConfirmOpen: (open: boolean) => void\n  /** Is a discard restore round-tripping (gates the dialog buttons)? */\n  busy: boolean\n  /** Confirm the discard: flush → restore the pinned published version whole. */\n  discard: () => Promise<void>\n}\n\n/**\n * EC-316 / EC-325 — the \"Discard changes\" controller. Reverting the draft to the\n * published content IS a whole-document restore of the pinned published version,\n * so it routes through the SAME shared restore sequence\n * ({@link useRestoreVersion}) the Compare view's and Versions pane's restores use\n * — never a parallel write path. That sequence flushes a dirty in-memory buffer\n * FIRST (`documents.restore` snapshots whatever is currently PERSISTED), closing\n * the undo-guarantee gap the header's discard used to have.\n *\n * The enablement is the pure `discardDraftStatus` decision (tested in\n * `discard-draft.test.ts`); its semantic-equality edge is the SAME comparator the\n * Versions pane's publish gate uses, so the two never contradict (EC-298).\n */\nexport function useDiscardController(input: {\n  canDiscard: boolean\n  published: boolean\n  viewReadOnly: boolean\n  publishedSnapshotDoc: CmsDocument | undefined\n  publishedVersionNumber: number | undefined\n  versionKey: QueryKey\n  draft: CmsDocument\n  source: CollectionViewSource\n  docRef: DocumentRef\n  replaceDraft: (doc: CmsDocument) => void\n  dirty: boolean\n  save: () => void\n}): DiscardController {\n  const {\n    canDiscard,\n    published,\n    viewReadOnly,\n    publishedSnapshotDoc,\n    publishedVersionNumber,\n    versionKey,\n    draft,\n    source,\n    docRef,\n    replaceDraft,\n    dirty,\n    save,\n  } = input\n\n  const [confirmOpen, setConfirmOpen] = useState(false)\n  const { restore, busy } = useRestoreVersion({ source, docRef, versionKey, dirty, save, replaceDraft })\n\n  const status = discardDraftStatus({\n    canDiscard,\n    published,\n    viewReadOnly,\n    publishedSnapshot: publishedSnapshotDoc,\n    draft,\n  })\n  const disabledReason =\n    status === 'view-read-only'\n      ? translate('cms.editor.switchToDraftToDiscard')\n      : status === 'up-to-date'\n        ? translate('cms.editor.discardDraftUpToDateHint')\n        : status === 'loading'\n          ? translate('common.loading')\n          : undefined\n\n  const discard = useCallback(async () => {\n    if (publishedVersionNumber === undefined) return\n    try {\n      // Whole-document restore of the pinned published version (the shared helper\n      // flushes any dirty buffer first, mirroring the Versions pane / Compare view).\n      await restore(publishedVersionNumber, { kind: 'all' })\n    } finally {\n      setConfirmOpen(false)\n    }\n  }, [publishedVersionNumber, restore])\n\n  return { status, disabledReason, confirmOpen, setConfirmOpen, busy, discard }\n}\n"]}

package/dist/components/cms/use-document-draft.d.ts

@@ -1,6 +1,9 @@
 import type { PresenceEntry } from '@elytracms/core/persistence';
 import type { CmsDocument, CollectionDef, DocumentPatch, FieldDef, Locale, PropFieldLookup, ValuePath } from '@elytracms/core/cms-core';
-import type { CollectionViewSource } from '@elytracms/studio/lib/collection-view/collection-view-source';
+import type { CollectionViewSource } from '../../lib/collection-view/collection-view-source.js';
+import type { CanvasFieldChange } from '../builder/canvas-rebase.js';
+import type { CommitPolicy } from './commit-policy.js';
+import type { CanvasControlPosition } from './canvas-commit.js';
 import type { Scheduler, UncommittedPosition } from './draft-commit.js';
 /**
  * EC-595 A2 — the detail editor's draft over the revisioned document (and, for the
@@ -10,7 +13,9 @@ import type { Scheduler, UncommittedPosition } from './draft-commit.js';
  * reads it); a field's edit is COMMITTED per its control kind's policy
  * ({@link commitPolicyOf} / {@link createDraftCommitter}) as the patch of the position it
  * wrote — never a document. The canvas commits each action's node patches at once
- * (`compositionPatches`). The draft REBASES whenever the session's document changes
+ * (`compositionPatches`); a burst of typing in one of its inspector controls is that
+ * control's uncommitted position, committed on its kind's policy like a form field
+ * (EC-630, `canvas-commit.ts`). The draft REBASES whenever the session's document changes
  * (a write result, a colleague's change by subscription, a resolved conflict): it is the
  * session's document with this editor's uncommitted positions laid over it — local wins
  * until committed, then the per-path check decides (EC-595 point 7).
@@ -42,6 +47,35 @@ export declare function positionPatch(doc: CmsDocument, path: ValuePath): Docume
  * over it, values from the editor's current draft.
  */
 export declare function rebaseDraft(sessionDoc: CmsDocument, draft: CmsDocument, uncommitted: readonly UncommittedPosition[]): CmsDocument;
+/**
+ * EC-630 — the canvas's write into the draft (pure). The canvas writer's node patches,
+ * keyed by node id, are the canvas's OWN delta: from `base`, the value it last agreed on
+ * with the draft, to `value` — never a document diff, and never measured against the
+ * draft's CURRENT value (a colleague's change that reached the draft a moment before the
+ * edit lifted would read as part of the edit, and its patches would revert it). The draft
+ * takes the delta over whatever it holds now (normally `base` itself) and canonicalises the
+ * field through the write lens. `undefined` when the canvas changed nothing.
+ */
+export declare function canvasWrite(input: {
+    collection: CollectionDef;
+    draft: CmsDocument;
+    field: string;
+    locale: Locale;
+    value: unknown;
+    base: unknown;
+    lookupManifest: PropFieldLookup;
+}): {
+    next: CmsDocument;
+    patches: DocumentPatch[];
+} | undefined;
+/**
+ * EC-630 — the change of the canvas field made UNDERNEATH the canvas when the draft
+ * rebased from `previous` to `next` (pure), numbered after `last`; `undefined` when the
+ * field did not move. The canvas's own edits are in both values (the session's view holds
+ * every patch it committed, the draft overlays every position it has not), so the change
+ * is someone else's: a colleague's patch, a write's canonical row, a resolved conflict.
+ */
+export declare function canvasFieldChange(previous: CmsDocument, next: CmsDocument, path: ValuePath, last: CanvasFieldChange | undefined): CanvasFieldChange | undefined;
 /**
  * The reader's "now" for presence liveness: THIS session's own latest heartbeat `at`
  * (written by the same store clock as everyone else's — the playground store runs a
@@ -61,22 +95,46 @@ export interface DocumentDraft {
     setFieldValue(field: FieldDef, value: unknown): void;
     /** A writer that transforms ONE field position (fill / reset from base). */
     editField(field: FieldDef, update: (draft: CmsDocument) => CmsDocument): void;
-    /** The canvas emitted a new value for its field (node patches, committed at once). */
-    setCanvasValue(field: FieldDef, value: unknown): void;
+    /**
+     * The canvas emitted a new value for its field (node patches, committed at once). `base`
+     * is the value the canvas last agreed on with the draft: the canvas writer's delta is
+     * `base` → `value`, applied over whatever the draft holds now (EC-630 — a change that
+     * landed underneath meanwhile is never reverted by the canvas's own write).
+     */
+    setCanvasValue(field: FieldDef, value: unknown, base: unknown): void;
     /** The slot alias (a document-level key: a whole-document write at the held revision). */
     setAlias(alias: string | undefined): void;
     /** Field boundary events (focus / blur / Enter) — the commit policy's triggers. */
     focused(field: FieldDef): void;
     blurred(field: FieldDef): void;
     entered(field: FieldDef): void;
+    /**
+     * EC-630 — the canvas inspector's boundary events: a control writing `position` of the
+     * canvas field `field`, committing on `policy` (THE declaration for its kind). A burst of
+     * typing in it is its uncommitted position until blur / Enter / the idle pause.
+     */
+    canvasFocused(field: FieldDef, position: CanvasControlPosition, policy: CommitPolicy): void;
+    canvasBlurred(field: FieldDef, position: CanvasControlPosition): void;
+    canvasEntered(field: FieldDef, position: CanvasControlPosition): void;
     /** The forced commit (sync; the persister serialises what follows) / the record model's Save. */
     save(): void;
     /** The FORCED FLUSH: commit everything uncommitted and await persistence. */
     flush(): Promise<void>;
     /** Adopt a draft from outside (a restored version). */
     replaceDraft(next: CmsDocument): void;
-    /** Bumped when the canvas must remount from the draft (a restore, a colleague's change). */
+    /**
+     * Bumped when the canvas must remount from the draft: a restored version replaced the
+     * document, or a locale switch pointed the canvas at another bucket. (A change made
+     * underneath the canvas is NOT a remount — {@link canvasChange}.)
+     */
     canvasNonce: number;
+    /**
+     * EC-630 — the latest change of the canvas field's value made UNDERNEATH the canvas (a
+     * colleague's patch by subscription, a write's canonical row, a resolved conflict): the
+     * draft's value before and after it. The canvas REBASES onto it — the change lands, its
+     * undo history and selection survive — where it used to remount and lose both.
+     */
+    canvasChange: CanvasFieldChange | undefined;
     /** The OTHER sessions present on this document, live by the reader's clock. */
     presence: readonly PresenceEntry[];
 }
@@ -93,4 +151,10 @@ export interface UseDocumentDraftInput {
     /** The reader's clock for presence liveness (ISO); `new Date().toISOString()` by default. */
     now?: () => string;
 }
+/**
+ * EC-616 — the base a record save is diffed against: the source's value whenever the draft
+ * equals it (the record as opened, or as a save came back), else the previous base (the
+ * editor has unsaved changes; a change from another writer meanwhile is not theirs). Pure.
+ */
+export declare function recordSaveBase(previous: CmsDocument, draft: CmsDocument, doc: CmsDocument): CmsDocument;
 export declare function useDocumentDraft(input: UseDocumentDraftInput): DocumentDraft;

package/dist/components/cms/use-document-draft.js

@@ -1,9 +1,10 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { PRESENCE_TTL_MS, livePresence, } from '@elytracms/core/persistence';
 import { applyDocumentPatches, formatValuePath, readValueAt, semanticValueEqual, writeField, } from '@elytracms/core/cms-core';
-import { fieldPositionPath } from '@elytracms/studio/lib/cms/field-patch';
+import { fieldPositionPath } from '../../lib/cms/field-patch.js';
 import { compositionPatches } from '../builder/composition-patches.js';
 import { commitPolicyOf } from './commit-policy.js';
+import { canvasControl, routeCanvasWrite } from './canvas-commit.js';
 import { browserScheduler, createDraftCommitter } from './draft-commit.js';
 /**
  * EC-595 A2 — the detail editor's draft over the revisioned document (and, for the
@@ -13,7 +14,9 @@ import { browserScheduler, createDraftCommitter } from './draft-commit.js';
  * reads it); a field's edit is COMMITTED per its control kind's policy
  * ({@link commitPolicyOf} / {@link createDraftCommitter}) as the patch of the position it
  * wrote — never a document. The canvas commits each action's node patches at once
- * (`compositionPatches`). The draft REBASES whenever the session's document changes
+ * (`compositionPatches`); a burst of typing in one of its inspector controls is that
+ * control's uncommitted position, committed on its kind's policy like a form field
+ * (EC-630, `canvas-commit.ts`). The draft REBASES whenever the session's document changes
  * (a write result, a colleague's change by subscription, a resolved conflict): it is the
  * session's document with this editor's uncommitted positions laid over it — local wins
  * until committed, then the per-path check decides (EC-595 point 7).
@@ -59,6 +62,37 @@ export function rebaseDraft(sessionDoc, draft, uncommitted) {
     const patches = uncommitted.map((position) => positionPatch(draft, position.path));
     return applyDocumentPatches({ document: sessionDoc, patches, since: [] }).document;
 }
+/**
+ * EC-630 — the canvas's write into the draft (pure). The canvas writer's node patches,
+ * keyed by node id, are the canvas's OWN delta: from `base`, the value it last agreed on
+ * with the draft, to `value` — never a document diff, and never measured against the
+ * draft's CURRENT value (a colleague's change that reached the draft a moment before the
+ * edit lifted would read as part of the edit, and its patches would revert it). The draft
+ * takes the delta over whatever it holds now (normally `base` itself) and canonicalises the
+ * field through the write lens. `undefined` when the canvas changed nothing.
+ */
+export function canvasWrite(input) {
+    const { collection, draft, field, locale, lookupManifest } = input;
+    const path = fieldPositionPath(collection, field, locale);
+    const localized = path.length > 1 ? locale : undefined;
+    const patches = compositionPatches(input.base, input.value, field, localized);
+    if (patches.length === 0)
+        return undefined;
+    const applied = applyDocumentPatches({ document: draft, patches, since: [] }).document;
+    return { next: writeField(collection, draft, field, locale, readValueAt(applied, path), { lookupManifest }), patches };
+}
+/**
+ * EC-630 — the change of the canvas field made UNDERNEATH the canvas when the draft
+ * rebased from `previous` to `next` (pure), numbered after `last`; `undefined` when the
+ * field did not move. The canvas's own edits are in both values (the session's view holds
+ * every patch it committed, the draft overlays every position it has not), so the change
+ * is someone else's: a colleague's patch, a write's canonical row, a resolved conflict.
+ */
+export function canvasFieldChange(previous, next, path, last) {
+    const from = readValueAt(previous, path);
+    const to = readValueAt(next, path);
+    return semanticValueEqual(from, to) ? undefined : { from, to, seq: (last?.seq ?? 0) + 1 };
+}
 /**
  * The reader's "now" for presence liveness: THIS session's own latest heartbeat `at`
  * (written by the same store clock as everyone else's — the playground store runs a
@@ -71,6 +105,14 @@ export function presenceReaderNow(entries, sessionId, fallback) {
     const own = entries.filter((entry) => entry.sessionId === sessionId).map((entry) => entry.at);
     return own.length > 0 ? own.sort().at(-1) : fallback;
 }
+/**
+ * EC-616 — the base a record save is diffed against: the source's value whenever the draft
+ * equals it (the record as opened, or as a save came back), else the previous base (the
+ * editor has unsaved changes; a change from another writer meanwhile is not theirs). Pure.
+ */
+export function recordSaveBase(previous, draft, doc) {
+    return semanticValueEqual(draft, doc) ? doc : previous;
+}
 export function useDocumentDraft(input) {
     const { source, collection, doc, locale, lookupManifest, canvasField } = input;
     const writes = source.writes;
@@ -78,6 +120,12 @@ export function useDocumentDraft(input) {
     const ref = useMemo(() => ({ collection: doc.collection, id: doc.id }), [doc.collection, doc.id]);
     const [draft, setDraftState] = useState(doc);
     const draftRef = useRef(draft);
+    // EC-616: the record as the editor opened it (or as of their last successful save) — the
+    // BASE a record rail diffs a save against, so it writes only the editor's changes. It moves
+    // only while the draft equals the source's value (at open, and once a save is reflected
+    // back): another writer's change arriving mid-edit never becomes the editor's base.
+    const baseRef = useRef(doc);
+    baseRef.current = recordSaveBase(baseRef.current, draftRef.current, doc);
     const setDraft = useCallback((next) => {
         draftRef.current = next;
         setDraftState(next);
@@ -88,10 +136,14 @@ export function useDocumentDraft(input) {
     // --- Committing --------------------------------------------------------------------
     const writesRef = useRef(documentModel);
     writesRef.current = documentModel;
+    /** EC-630 — the canvas inspector controls that took focus, by committer key (their position + policy). */
+    const canvasControls = useRef(new Map());
     const committer = useMemo(() => createDraftCommitter({
         policyOf: (name) => {
             const field = fieldsByName.get(name);
-            return field ? commitPolicyOf(field) : 'blur-or-idle';
+            if (field)
+                return commitPolicyOf(field);
+            return canvasControls.current.get(name)?.policy ?? 'blur-or-idle';
         },
         commit: (positions) => {
             const target = writesRef.current;
@@ -104,29 +156,17 @@ export function useDocumentDraft(input) {
     }), 
     // One committer per open document (the editor is keyed by it).
     [ref]);
-    // --- The canvas's value and its remount ---------------------------------------------
+    // --- The canvas's value: its remount and its rebase ------------------------------------
     const canvasPath = canvasField ? fieldPositionPath(collection, canvasField.name, locale) : undefined;
     const canvasPathKey = canvasPath ? formatValuePath(canvasPath) : '';
-    const canvasValueRef = useRef(canvasPath ? readValueAt(draft, canvasPath) : undefined);
     const [canvasNonce, setCanvasNonce] = useState(0);
-    const syncCanvas = useCallback((next) => {
-        if (!canvasPath)
-            return;
-        const value = readValueAt(next, canvasPath);
-        if (semanticValueEqual(value, canvasValueRef.current))
-            return;
-        canvasValueRef.current = value;
-        setCanvasNonce((n) => n + 1);
-    }, 
-    // The path is keyed by its string form.
-    [canvasPathKey]);
+    const [canvasChange, setCanvasChange] = useState(undefined);
     // A locale switch points the canvas at another bucket: remount from it.
     const lastCanvasPathKey = useRef(canvasPathKey);
     useEffect(() => {
         if (lastCanvasPathKey.current === canvasPathKey)
             return;
         lastCanvasPathKey.current = canvasPathKey;
-        canvasValueRef.current = canvasPath ? readValueAt(draftRef.current, canvasPath) : undefined;
         setCanvasNonce((n) => n + 1);
     }, [canvasPathKey]);
     // --- The rebase (document model) -------------------------------------------------------
@@ -138,9 +178,15 @@ export function useDocumentDraft(input) {
         }
         if (!documentModel)
             return;
-        const next = rebaseDraft(doc, draftRef.current, committer.uncommitted());
+        const previous = draftRef.current;
+        const next = rebaseDraft(doc, previous, committer.uncommitted());
         setDraft(next);
-        syncCanvas(next);
+        // EC-630: the canvas field moved underneath the canvas — the canvas rebases onto the
+        // change (its own edits are in both values: the session's view holds every patch it
+        // committed, and the draft overlays every position it has not).
+        if (!canvasPath)
+            return;
+        setCanvasChange((last) => canvasFieldChange(previous, next, canvasPath, last) ?? last);
     }, [doc]);
     // --- Writers ----------------------------------------------------------------------------
     const setFieldValue = useCallback((field, value) => {
@@ -154,20 +200,23 @@ export function useDocumentDraft(input) {
         if (documentModel)
             committer.edited(field.name, fieldPositionPath(collection, field.name, locale));
     }, [collection, locale, setDraft, documentModel, committer]);
-    const setCanvasValue = useCallback((field, value) => {
-        const path = fieldPositionPath(collection, field.name, locale);
-        const before = readValueAt(draftRef.current, path);
-        const next = writeField(collection, draftRef.current, field.name, locale, value, { lookupManifest });
-        const after = readValueAt(next, path);
-        setDraft(next);
-        canvasValueRef.current = after;
+    const setCanvasValue = useCallback((field, value, base) => {
+        const write = canvasWrite({ collection, draft: draftRef.current, field: field.name, locale, value, base, lookupManifest });
+        if (!write)
+            return;
+        setDraft(write.next);
         if (!documentModel)
             return;
-        // The canvas writer's node patches, keyed by node id (computed here, in its write
-        // path, from the canonical values before and after the action — never a document diff).
-        const localized = path.length > 1 ? locale : undefined;
-        void documentModel.commit(ref, compositionPatches(before, after, field.name, localized));
-    }, [collection, locale, lookupManifest, setDraft, documentModel, ref]);
+        // EC-630: a burst of typing in a focused inspector control is that control's
+        // uncommitted position (its policy commits it); a canvas action commits now.
+        const focus = committer.focusedField();
+        routeCanvasWrite({
+            patches: write.patches,
+            focused: focus === undefined ? undefined : canvasControls.current.get(focus),
+            committer,
+            commitNow: (patches) => void documentModel.commit(ref, patches),
+        });
+    }, [collection, locale, lookupManifest, setDraft, documentModel, ref, committer]);
     const setAlias = useCallback((alias) => {
         const next = { ...draftRef.current };
         if (alias === undefined)
@@ -185,7 +234,7 @@ export function useDocumentDraft(input) {
         if (documentModel)
             committer.commitAll();
         else if (writes.kind === 'record')
-            writes.save(draftRef.current);
+            writes.save(draftRef.current, baseRef.current);
     }, [documentModel, committer, writes]);
     const flush = useCallback(async () => {
         save();
@@ -257,10 +306,41 @@ export function useDocumentDraft(input) {
         if (documentModel)
             committer.entered(field.name);
     }, [documentModel, committer]);
+    // EC-630 — the canvas inspector's commit boundary: a control at a position of the canvas
+    // field gained focus, lost it, or saw Enter. Its policy is THE declaration's for its kind.
+    const canvasControlOf = useCallback((field, position, policy) => canvasControl(fieldPositionPath(collection, field.name, locale), position, policy), [collection, locale]);
+    const canvasFocused = useCallback((field, position, policy) => {
+        if (!documentModel)
+            return;
+        const control = canvasControlOf(field, position, policy);
+        canvasControls.current.set(control.key, control);
+        committer.focused(control.key);
+        focusedPathRef.current = control.path;
+        heartbeat();
+    }, [documentModel, committer, canvasControlOf, heartbeat]);
+    const canvasBlurred = useCallback((field, position) => {
+        if (!documentModel)
+            return;
+        const key = canvasControlOf(field, position, 'change').key;
+        committer.blurred(key);
+        canvasControls.current.delete(key);
+        focusedPathRef.current = undefined;
+        heartbeat();
+    }, [documentModel, committer, canvasControlOf, heartbeat]);
+    const canvasEntered = useCallback((field, position) => {
+        if (documentModel)
+            committer.entered(canvasControlOf(field, position, 'change').key);
+    }, [documentModel, committer, canvasControlOf]);
     const replaceDraft = useCallback((next) => {
+        // A restored version replaces the document: when it moved the canvas field, the
+        // canvas remounts from it (its history belonged to the replaced value).
+        const moved = canvasPath && !semanticValueEqual(readValueAt(draftRef.current, canvasPath), readValueAt(next, canvasPath));
         setDraft(next);
-        syncCanvas(next);
-    }, [setDraft, syncCanvas]);
+        if (moved)
+            setCanvasNonce((n) => n + 1);
+    }, 
+    // The path is keyed by its string form.
+    [setDraft, canvasPathKey]);
     const dirty = useMemo(() => !semanticValueEqual(draft, doc), [draft, doc]);
     return {
         draft,
@@ -273,10 +353,14 @@ export function useDocumentDraft(input) {
         focused,
         blurred,
         entered,
+        canvasFocused,
+        canvasBlurred,
+        canvasEntered,
         save,
         flush,
         replaceDraft,
         canvasNonce,
+        canvasChange,
         presence,
     };
 }