@shivaedev/form 0.13.1 → 0.14.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.14.0 - 2026-11-03
+
+### Added
+
+- Persist drafts through asynchronous native Effect storage operations, with optional observation across editors. Observed changes preserve local edits and adopt untouched fields.
+
+### Fixed
+
+- Clear only the submitted draft revision after a successful save, keeping newer stored input from another editor. Serialize asynchronous writes and clears, and condition metadata writes on the owned revision.
+
+### Breaking
+
+- Custom `DraftStorage.removeItem` implementations must accept `(key, expected)` and atomically remove only when the stored serialized value equals `expected`. Custom `setItem(key, value, expected?)` implementations must also compare atomically when `expected` is supplied, so rebasing accepted fields cannot overwrite newer stored input. Replace unconditional mutations with conditional mutations at the storage owner; writes without `expected` still store new local input. The browser adapter handles this contract; providers can keep synchronous reads and writes or return native Effects.
+- Lower-level `Persistence` integrations use `observe` and `revision` in place of `read`; mount the draft's atoms to own observation. Core form consumers mount `form.dirty` before reading restored input; asynchronous restoration arrives through the existing field refs. Form's React hooks attach this lifetime automatically.
+
 ## 0.13.1 - 2026-11-03
 
 ### Changed

package/README.md

@@ -220,7 +220,11 @@ function OrderEditor({ persistence }: { readonly persistence: Omit<PersistedDraf
 
 Each stored record defaults to at most 256 KiB of UTF-8 JSON and seven days since its last write. Set `maxBytes` and `maxAgeMs` to finite positive limits to change those bounds. Oversized, expired, malformed or incompatible records are dropped when encountered. Persistence requires JSON-compatible encoded input; invalid input such as an empty required string or an unfinished numeric string still persists. Storage access, serialization and quota failures leave the form usable.
 
-Edits and received values update the stored draft. Revert removes it. A successful submit clears accepted input; edits made after the submitted snapshot remain persisted. A failed submit keeps the draft.
+Edits and received values update the stored draft. Revert conditionally removes the form's owned revision. A successful submit clears only the revision associated with its submitted input, including refreshes of its untouched fields; newer edits made locally or in another editor remain persisted. A failed submit keeps the draft.
+
+A custom `DraftStorage` implements `getItem(key)`, `setItem(key, value, expected?)` and `removeItem(key, expected)`. Each operation returns its synchronous result or a native `Effect` with no remaining services; acquire application services when constructing the provider. `expected` is the exact serialized value previously read or written, containing an opaque revision. The storage owner must compare and mutate atomically: remove the key, or replace it when `setItem` supplies `expected`, only if its current value equals `expected`. A `setItem` without `expected` stores a new local edit; a conditional write rebases accepted or refreshed fields without replacing another editor's newer draft. For an Electron bridge, perform these comparisons in the process that owns the shared store. Writes and clears from one form run in order even when storage is asynchronous. Storage failures remain best-effort and do not fail the form's save.
+
+Optional `subscribe(key, listener)` reports the current serialized value, or `null` when cleared, and returns an unsubscribe function. Report changes in storage order. Observation starts while the form's atoms are mounted and ends with their lifetime. Form's React hooks mount that lifetime automatically; direct atom consumers mount `form.dirty` or its validation/submission atoms. An untouched editor follows observed changes. Locally edited fields keep their current input while untouched fields adopt the observed draft. Receiving a storage event does not echo a write. The browser adapter observes other windows through storage events and serializes mutations with Web Locks where available; without Web Locks its compare and remove run synchronously.
 
 Outside React, pass a `session` from `draftSession(id)` in `@shivaedev/form/draftSession.ts` and call its `drop()` when the application replaces that session. Core forms without a session owner use only the application's key. `DraftSessionContext` supplies the owner to React integrations.
 
@@ -352,6 +356,8 @@ The returned form exposes:
 
 The lower-level `draft.ts` (`draft`), `refs.ts` (`fromRef`, `propertyRef`) and `statusOf.ts` (`statusOf`) modules hold the machinery the form composes; the examples use the form API instead.
 
+For a custom lower-level `Persistence`, `observe(receive)` calls `receive` with decoded stored input (or `undefined` after removal) and returns a cleanup function. The receiver returns `true` only when it adopted the complete incoming input; `false` preserves the local revision when local fields remain. `revision()` captures a revision reader for a submission; `write(..., sameInput)` can keep that captured reader current when only untouched server fields refresh.
+
 ### Install and limits
 
 ```sh

package/dist/adapters/browserDraftStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browserDraftStorage.d.ts","sourceRoot":"","sources":["../../src/adapters/browserDraftStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD,eAAO,MAAM,mBAAmB,iDAAqE,CAAC"}
+{"version":3,"file":"browserDraftStorage.d.ts","sourceRoot":"","sources":["../../src/adapters/browserDraftStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAOvD,eAAO,MAAM,mBAAmB,iDAuB7B,CAAC"}

package/dist/adapters/browserDraftStorage.js

@@ -1,4 +1,29 @@
-import { Layer } from "effect";
+import { Effect, Layer } from "effect";
 import { DraftStorageProvider } from "#persistence.ts";
-export const browserDraftStorage = Layer.succeed(DraftStorageProvider, () => globalThis.localStorage);
+function mutate(key, run) {
+    const locks = globalThis.navigator?.locks;
+    return locks ? Effect.promise(() => locks.request(`@shivaedev/form/${key}`, run)) : run();
+}
+export const browserDraftStorage = Layer.succeed(DraftStorageProvider, () => ({
+    getItem: (key) => globalThis.localStorage.getItem(key),
+    removeItem: (key, expected) => mutate(key, () => {
+        if (globalThis.localStorage.getItem(key) === expected) {
+            globalThis.localStorage.removeItem(key);
+        }
+    }),
+    setItem: (key, value, expected) => mutate(key, () => {
+        if (expected === undefined || globalThis.localStorage.getItem(key) === expected) {
+            globalThis.localStorage.setItem(key, value);
+        }
+    }),
+    subscribe: (key, listener) => {
+        function changed(event) {
+            if (event.storageArea === globalThis.localStorage && (event.key === key || event.key === null)) {
+                listener(event.newValue);
+            }
+        }
+        globalThis.addEventListener("storage", changed);
+        return () => globalThis.removeEventListener("storage", changed);
+    },
+}));
 //# sourceMappingURL=browserDraftStorage.js.map

package/dist/adapters/browserDraftStorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"browserDraftStorage.js","sourceRoot":"","sources":["../../src/adapters/browserDraftStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,CAAC,OAAO,CAAC,oBAAoB,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC"}
+{"version":3,"file":"browserDraftStorage.js","sourceRoot":"","sources":["../../src/adapters/browserDraftStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD,SAAS,MAAM,CAAC,GAAW,EAAE,GAAe;IAC3C,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC;IAC1C,OAAO,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,mBAAmB,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;AAC3F,CAAC;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,CAAC,OAAO,CAAC,oBAAoB,EAAE,GAAG,EAAE,CAAC,CAAC;IAC7E,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC;IACtD,UAAU,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,CAC7B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE;QAChB,IAAI,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE,CAAC;YACvD,UAAU,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACzC,CAAC;IACF,CAAC,CAAC;IACH,OAAO,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,CACjC,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE;QAChB,IAAI,QAAQ,KAAK,SAAS,IAAI,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE,CAAC;YACjF,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC7C,CAAC;IACF,CAAC,CAAC;IACH,SAAS,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;QAC5B,SAAS,OAAO,CAAC,KAAmB;YACnC,IAAI,KAAK,CAAC,WAAW,KAAK,UAAU,CAAC,YAAY,IAAI,CAAC,KAAK,CAAC,GAAG,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,EAAE,CAAC;gBAChG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC1B,CAAC;QACF,CAAC;QACD,UAAU,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAChD,OAAO,GAAG,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC;CACD,CAAC,CAAC,CAAC"}

package/dist/adapters/draftCodec.d.ts

@@ -0,0 +1,7 @@
+import { Schema } from "effect";
+import type { PersistedDraftConfig, StoredValues } from "#persistence.ts";
+export declare function draftCodec<TSchema extends Schema.Constraint>(schema: TSchema, config: PersistedDraftConfig): {
+    read: (raw: string) => StoredValues<TSchema["Encoded"]>;
+    write: (baseline: TSchema["Encoded"], values: TSchema["Encoded"], edited: readonly string[]) => string;
+};
+//# sourceMappingURL=draftCodec.d.ts.map

package/dist/adapters/draftCodec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"draftCodec.d.ts","sourceRoot":"","sources":["../../src/adapters/draftCodec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAgB,MAAM,QAAQ,CAAC;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE1E,wBAAgB,UAAU,CAAC,OAAO,SAAS,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,oBAAoB;gBAcvF,MAAM,KAAG,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;sBAmBzC,OAAO,CAAC,SAAS,CAAC,UAAU,OAAO,CAAC,SAAS,CAAC,UAAU,SAAS,MAAM,EAAE;EAM5F"}

package/dist/adapters/draftCodec.js

@@ -0,0 +1,40 @@
+import { Schema, SchemaParser } from "effect";
+export function draftCodec(schema, config) {
+    const StoredDraft = Schema.Struct({
+        baseline: Schema.Unknown,
+        edited: Schema.Array(Schema.String),
+        session: Schema.String,
+        updatedAt: Schema.Number,
+        values: Schema.Unknown,
+        version: Schema.Literal(1),
+    });
+    const valid = Schema.is(StoredDraft);
+    const decode = SchemaParser.decodeUnknownSync(Schema.toEncoded(schema), { disableChecks: true });
+    const maxAgeMs = config.maxAgeMs ?? 7 * 24 * 60 * 60 * 1000;
+    const maxBytes = config.maxBytes ?? 256 * 1024;
+    const session = config.session?.id ?? "";
+    function read(raw) {
+        const value = new TextEncoder().encode(raw).byteLength <= maxBytes ? JSON.parse(raw) : undefined;
+        const now = config.now();
+        if (!valid(value)
+            || value.session !== session
+            || !Number.isFinite(maxAgeMs)
+            || !Number.isFinite(maxBytes)
+            || maxAgeMs <= 0
+            || maxBytes <= 0
+            || now - value.updatedAt > maxAgeMs
+            || value.updatedAt > now) {
+            throw new Error("Invalid stored draft");
+        }
+        return { baseline: decode(value.baseline), edited: value.edited, values: decode(value.values) };
+    }
+    return {
+        read,
+        write: (baseline, values, edited) => {
+            const raw = JSON.stringify({ baseline, edited, revision: crypto.randomUUID(), session, updatedAt: config.now(), values, version: 1 });
+            read(raw);
+            return raw;
+        },
+    };
+}
+//# sourceMappingURL=draftCodec.js.map

package/dist/adapters/draftCodec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"draftCodec.js","sourceRoot":"","sources":["../../src/adapters/draftCodec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAG9C,MAAM,UAAU,UAAU,CAAoC,MAAe,EAAE,MAA4B;IAC1G,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;QACjC,QAAQ,EAAE,MAAM,CAAC,OAAO;QACxB,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;QACnC,OAAO,EAAE,MAAM,CAAC,MAAM;QACtB,SAAS,EAAE,MAAM,CAAC,MAAM;QACxB,MAAM,EAAE,MAAM,CAAC,OAAO;QACtB,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;KAC1B,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC;IACrC,MAAM,MAAM,GAAG,YAAY,CAAC,iBAAiB,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACjG,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC5D,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,GAAG,GAAG,IAAI,CAAC;IAC/C,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC;IACzC,SAAS,IAAI,CAAC,GAAW;QACxB,MAAM,KAAK,GAAY,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1G,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;QACzB,IACC,CAAC,KAAK,CAAC,KAAK,CAAC;eACV,KAAK,CAAC,OAAO,KAAK,OAAO;eACzB,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;eAC1B,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;eAC1B,QAAQ,IAAI,CAAC;eACb,QAAQ,IAAI,CAAC;eACb,GAAG,GAAG,KAAK,CAAC,SAAS,GAAG,QAAQ;eAChC,KAAK,CAAC,SAAS,GAAG,GAAG,EACvB,CAAC;YACF,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACzC,CAAC;QACD,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;IACjG,CAAC;IACD,OAAO;QACN,IAAI;QACJ,KAAK,EAAE,CAAC,QAA4B,EAAE,MAA0B,EAAE,MAAyB,EAAE,EAAE;YAC9F,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;YACtI,IAAI,CAAC,GAAG,CAAC,CAAC;YACV,OAAO,GAAG,CAAC;QACZ,CAAC;KACD,CAAC;AACH,CAAC"}

package/dist/adapters/persistence.d.ts

@@ -1,4 +1,4 @@
-import { Schema } from "effect";
+import { type Schema } from "effect";
 import type { PersistedDraftConfig, Persistence } from "#persistence.ts";
 export declare function persistence<TSchema extends Schema.Constraint>(schema: TSchema, config: PersistedDraftConfig): Persistence<TSchema["Encoded"]>;
 //# sourceMappingURL=persistence.d.ts.map

package/dist/adapters/persistence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"persistence.d.ts","sourceRoot":"","sources":["../../src/adapters/persistence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAgB,MAAM,QAAQ,CAAC;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEzE,wBAAgB,WAAW,CAAC,OAAO,SAAS,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,oBAAoB,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAmF7I"}
+{"version":3,"file":"persistence.d.ts","sourceRoot":"","sources":["../../src/adapters/persistence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,MAAM,EAAa,MAAM,QAAQ,CAAC;AAC9D,OAAO,KAAK,EAAkB,oBAAoB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAYzF,wBAAgB,WAAW,CAAC,OAAO,SAAS,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,oBAAoB,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CA2G7I"}

package/dist/adapters/persistence.js

@@ -1,83 +1,113 @@
-import { Schema, SchemaParser } from "effect";
+import { Data, Effect, Semaphore } from "effect";
+import { draftCodec } from "./draftCodec.js";
+class DraftStorageUnavailable extends Data.TaggedError("DraftStorageUnavailable") {
+}
+function operation(run) {
+    return Effect.suspend(() => {
+        const value = run();
+        return Effect.isEffect(value) ? value : Effect.succeed(value);
+    }).pipe(Effect.catchCause((cause) => Effect.fail(new DraftStorageUnavailable({ cause }))));
+}
 export function persistence(schema, config) {
-    const encoded = Schema.toEncoded(schema);
-    const StoredDraft = Schema.Struct({
-        baseline: Schema.Unknown,
-        edited: Schema.Array(Schema.String),
-        session: Schema.String,
-        updatedAt: Schema.Number,
-        values: Schema.Unknown,
-        version: Schema.Literal(1),
-    });
-    const valid = Schema.is(StoredDraft);
-    const decode = SchemaParser.decodeUnknownSync(encoded, { disableChecks: true });
-    const maxAgeMs = config.maxAgeMs ?? 7 * 24 * 60 * 60 * 1000;
-    const maxBytes = config.maxBytes ?? 256 * 1024;
-    function bytes(value) {
-        return new TextEncoder().encode(value).byteLength;
-    }
-    const storage = config.storage;
-    const session = config.session?.id ?? "";
+    const codec = draftCodec(schema, config);
+    const serial = Semaphore.makeUnsafe(1);
+    let revision = { value: undefined };
     function active() {
         return config.session?.active !== false;
     }
-    function attempt(run, failed) {
+    function run(effect) {
+        return Effect.runCallback(serial.withPermit(effect).pipe(Effect.catchTag("DraftStorageUnavailable", () => Effect.void)));
+    }
+    function clear(expected = revision.value) {
+        if (expected !== undefined) {
+            run(operation(() => config.storage().removeItem(config.key, expected)));
+        }
+    }
+    function read(raw) {
         try {
-            return run();
+            return { values: raw === null ? undefined : codec.read(raw) };
         }
         catch {
-            failed?.();
+            if (raw !== null) {
+                clear(raw);
+            }
             return undefined;
         }
     }
-    function clear() {
-        attempt(() => storage().removeItem(config.key));
-    }
-    config.session?.track(config.key, clear);
+    config.session?.track(config.key, () => run(Effect.gen(function* () {
+        const storage = yield* operation(config.storage);
+        const raw = yield* operation(() => storage.getItem(config.key));
+        if (raw !== null) {
+            yield* operation(() => codec.read(raw));
+            yield* operation(() => storage.removeItem(config.key, raw));
+        }
+    })));
     return {
-        clear: () => {
+        clear: (expected = revision.value) => {
             if (active()) {
-                clear();
+                clear(expected);
             }
         },
-        read: () => attempt(() => {
-            if (!active()) {
-                return undefined;
-            }
-            const raw = storage().getItem(config.key);
-            if (raw === null) {
-                return undefined;
-            }
-            const value = bytes(raw) <= maxBytes ? JSON.parse(raw) : undefined;
-            const now = config.now();
-            if (valid(value)
-                && value.session === session
-                && Number.isFinite(maxAgeMs)
-                && Number.isFinite(maxBytes)
-                && maxAgeMs > 0
-                && maxBytes > 0
-                && now - value.updatedAt <= maxAgeMs
-                && value.updatedAt <= now) {
-                return { baseline: decode(value.baseline), edited: value.edited, values: decode(value.values) };
+        observe: (receive) => {
+            let stopped = false;
+            let changes = 0;
+            function changed(raw, loaded = false) {
+                if (stopped || !active()) {
+                    return;
+                }
+                if (!loaded && revision.value === (raw ?? undefined)) {
+                    return;
+                }
+                const parsed = read(raw);
+                if (parsed && receive(parsed.values)) {
+                    revision = { value: raw ?? undefined };
+                }
             }
-            clear();
-            return undefined;
-        }, clear),
-        write: (baseline, values, edited) => {
+            let unsubscribe;
+            const stop = Effect.runCallback(Effect.gen(function* () {
+                if (!active()) {
+                    return;
+                }
+                const storage = yield* operation(config.storage);
+                unsubscribe = yield* operation(() => storage.subscribe?.(config.key, (incoming) => {
+                    changes += 1;
+                    changed(incoming);
+                }));
+                const before = changes;
+                const captured = revision;
+                const raw = yield* operation(() => storage.getItem(config.key));
+                if (before === changes && captured === revision) {
+                    changed(raw, true);
+                }
+            }).pipe(Effect.catchTag("DraftStorageUnavailable", () => Effect.void)));
+            return () => {
+                stopped = true;
+                unsubscribe?.();
+                stop();
+            };
+        },
+        revision: () => {
+            const captured = revision;
+            return () => captured.value;
+        },
+        write: (baseline, values, edited, sameInput) => {
             if (!active()) {
                 return;
             }
-            attempt(() => {
-                const raw = JSON.stringify({ baseline, edited, session, updatedAt: config.now(), values, version: 1 });
-                const parsed = JSON.parse(raw);
-                if (!(maxAgeMs > 0 && Number.isFinite(maxAgeMs) && Number.isFinite(maxBytes) && bytes(raw) <= maxBytes && valid(parsed))) {
-                    clear();
-                    return;
+            try {
+                const expected = sameInput ? revision.value : undefined;
+                const raw = codec.write(baseline, values, edited);
+                if (sameInput) {
+                    revision.value = raw;
+                }
+                else {
+                    revision = { value: raw };
                 }
-                decode(parsed.baseline);
-                decode(parsed.values);
-                storage().setItem(config.key, raw);
-            }, clear);
+                run(operation(() => (active() ? config.storage().setItem(config.key, raw, expected) : undefined)));
+            }
+            catch {
+                clear();
+            }
         },
     };
 }

package/dist/adapters/persistence.js.map

@@ -1 +1 @@
-{"version":3,"file":"persistence.js","sourceRoot":"","sources":["../../src/adapters/persistence.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"persistence.js","sourceRoot":"","sources":["../../src/adapters/persistence.ts"],"names":[],"mappings":"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"}

package/dist/adapters/react.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"react.d.ts","sourceRoot":"","sources":["../../src/adapters/react.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAElE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACpF,eAAO,MAAM,mBAAmB,mDAAqD,CAAC;AACtF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,oBAAoB,GAAG,oBAAoB,CAAC;AACtF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,oBAAoB,GAAG,SAAS,GAAG,oBAAoB,GAAG,SAAS,CAAC;AAK9G,MAAM,WAAW,KAAK,CAAC,OAAO,SAAS,MAAM,EAAE,IAAI,SAAS,IAAI,CAAC,OAAO,CAAC;IACxE,QAAQ,CAAC,OAAO,EAAE,SAAS,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC;IAChE,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;IAC3D,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;CACvC;AACD,wBAAgB,QAAQ,CAAC,OAAO,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE,IAAI,SAAS,IAAI,CAAC,OAAO,CAAC,EAC/F,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,EACxC,IAAI,EAAE,IAAI,GACR,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAOtB;AACD,MAAM,WAAW,MAAM,CAAC,CAAC,EAAE,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/C,QAAQ,CAAC,GAAG,EAAE,MAAM,IAAI,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAC7B;AACD,wBAAgB,SAAS,CAAC,OAAO,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,EACpE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,GACtC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,GAAG,YAAY,GAAG,OAAO,CAAC,CAKvD;AACD,wBAAgB,QAAQ,CAAC,OAAO,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,GAAG,OAAO,CAEvH"}
+{"version":3,"file":"react.d.ts","sourceRoot":"","sources":["../../src/adapters/react.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAElE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACpF,eAAO,MAAM,mBAAmB,mDAAqD,CAAC;AACtF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,oBAAoB,GAAG,oBAAoB,CAAC;AACtF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,oBAAoB,GAAG,SAAS,GAAG,oBAAoB,GAAG,SAAS,CAAC;AAK9G,MAAM,WAAW,KAAK,CAAC,OAAO,SAAS,MAAM,EAAE,IAAI,SAAS,IAAI,CAAC,OAAO,CAAC;IACxE,QAAQ,CAAC,OAAO,EAAE,SAAS,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC;IAChE,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;IAC3D,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;CACvC;AACD,wBAAgB,QAAQ,CAAC,OAAO,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE,IAAI,SAAS,IAAI,CAAC,OAAO,CAAC,EAC/F,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,EACxC,IAAI,EAAE,IAAI,GACR,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAQtB;AACD,MAAM,WAAW,MAAM,CAAC,CAAC,EAAE,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/C,QAAQ,CAAC,GAAG,EAAE,MAAM,IAAI,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAC7B;AACD,wBAAgB,SAAS,CAAC,OAAO,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,EACpE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,GACtC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,GAAG,YAAY,GAAG,OAAO,CAAC,CAMvD;AACD,wBAAgB,QAAQ,CAAC,OAAO,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,GAAG,OAAO,CAEvH"}

package/dist/adapters/react.js

@@ -1,4 +1,4 @@
-import { useAtomRef, useAtomSet, useAtomValue } from "@effect/atom-react";
+import { useAtomMount, useAtomRef, useAtomSet, useAtomValue } from "@effect/atom-react";
 import { createContext, useCallback, useContext, useMemo } from "react";
 export const DraftSessionContext = createContext(undefined);
 export function usePersistedDraft(config) {
@@ -6,6 +6,7 @@ export function usePersistedDraft(config) {
     return config ? { ...config, session: session ?? config.session } : undefined;
 }
 export function useField(form, name) {
+    useAtomMount(form.dirty);
     const value = useAtomRef(form.field(name));
     const error = useAtomValue(form.error(name));
     const onChange = useCallback((next) => form.change(name, next), [form, name]);
@@ -14,6 +15,7 @@ export function useField(form, name) {
     return { choices, error, name, onBlur, onChange, value };
 }
 export function useSubmit(form) {
+    useAtomMount(form.dirty);
     const result = useAtomValue(form.submit);
     const set = useAtomSet(form.submit);
     const run = useCallback(() => set(), [set]);

package/dist/adapters/react.js.map

@@ -1 +1 @@
-{"version":3,"file":"react.js","sourceRoot":"","sources":["../../src/adapters/react.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAE1E,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAIxE,MAAM,CAAC,MAAM,mBAAmB,GAAG,aAAa,CAA2B,SAAS,CAAC,CAAC;AAGtF,MAAM,UAAU,iBAAiB,CAAC,MAAwC;IACzE,MAAM,OAAO,GAAG,UAAU,CAAC,mBAAmB,CAAC,CAAC;IAChD,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,OAAO,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/E,CAAC;AASD,MAAM,UAAU,QAAQ,CACvB,IAAwC,EACxC,IAAU;IAEV,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,IAA4B,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IACtG,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAChE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AAC1D,CAAC;AAMD,MAAM,UAAU,SAAS,CACxB,IAAwC;IAExC,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACzC,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;AACpD,CAAC;AACD,MAAM,UAAU,QAAQ,CAA8C,IAAwC;IAC7G,OAAO,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC"}
+{"version":3,"file":"react.js","sourceRoot":"","sources":["../../src/adapters/react.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAExF,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAIxE,MAAM,CAAC,MAAM,mBAAmB,GAAG,aAAa,CAA2B,SAAS,CAAC,CAAC;AAGtF,MAAM,UAAU,iBAAiB,CAAC,MAAwC;IACzE,MAAM,OAAO,GAAG,UAAU,CAAC,mBAAmB,CAAC,CAAC;IAChD,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,OAAO,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/E,CAAC;AASD,MAAM,UAAU,QAAQ,CACvB,IAAwC,EACxC,IAAU;IAEV,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACzB,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,IAA4B,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IACtG,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAChE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AAC1D,CAAC;AAMD,MAAM,UAAU,SAAS,CACxB,IAAwC;IAExC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACzB,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACzC,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;AACpD,CAAC;AACD,MAAM,UAAU,QAAQ,CAA8C,IAAwC;IAC7G,OAAO,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC"}

package/dist/draft.d.ts

@@ -1,9 +1,10 @@
 import * as Atom from "effect/reactivity/Atom";
 import * as AtomRef from "effect/reactivity/AtomRef";
+import { type Entries } from "./draftValues.ts";
 import type { Persistence } from "./persistence.ts";
-type Entries = Readonly<Record<string, unknown>>;
 export declare function draft<TValues extends Entries>(initial: TValues, persistence?: Persistence<TValues>): {
     dirty: Atom.Atom<boolean>;
+    mounted: Atom.Atom<void>;
     receive: (incoming: TValues) => void;
     revert: () => void;
     submission: () => {
@@ -12,5 +13,4 @@ export declare function draft<TValues extends Entries>(initial: TValues, persist
     };
     values: AtomRef.AtomRef<TValues>;
 };
-export {};
 //# sourceMappingURL=draft.d.ts.map

package/dist/draft.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"draft.d.ts","sourceRoot":"","sources":["../src/draft.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,KAAK,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAsCjD,wBAAgB,KAAK,CAAC,OAAO,SAAS,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC;IAuBjG,KAAK;IAIL,OAAO,aAAa,OAAO,KAAG,IAAI;IAOlC,MAAM,QAAM,IAAI;IAOhB,UAAU;QAGR,MAAM,cAAc,OAAO,KAAG,IAAI;QAalC,MAAM;;IAGR,MAAM;EAEP"}
+{"version":3,"file":"draft.d.ts","sourceRoot":"","sources":["../src/draft.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAgD,KAAK,OAAO,EAAoC,MAAM,kBAAkB,CAAC;AAChI,OAAO,KAAK,EAAE,WAAW,EAAgB,MAAM,kBAAkB,CAAC;AAElE,wBAAgB,KAAK,CAAC,OAAO,SAAS,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC;;;wBAsE7E,OAAO,KAAG,IAAI;kBAUtB,IAAI;;QAWd,MAAM,cAAc,OAAO,KAAG,IAAI;QAYlC,MAAM;;;EAKT"}

package/dist/draft.js

@@ -1,45 +1,61 @@
-import { Equal } from "effect";
 import * as Atom from "effect/reactivity/Atom";
 import * as AtomRef from "effect/reactivity/AtomRef";
-const none = {};
-function untouched({ baseline, current, settled }, name) {
-    return Equal.equals(current[name], baseline[name]) || (Object.hasOwn(settled, name) && Equal.equals(current[name], settled[name]));
-}
-function changed(held) {
-    return Object.keys({ ...held.baseline, ...held.current }).some((name) => !untouched(held, name));
-}
-function merged(held, incoming) {
-    const result = {};
-    for (const name of Object.keys({ ...held.current, ...incoming })) {
-        const source = untouched(held, name) ? incoming : held.current;
-        if (Object.hasOwn(source, name)) {
-            result[name] = source[name];
-        }
-    }
-    return result;
-}
-function matching(current, submitted) {
-    return Object.fromEntries(Object.keys({ ...current, ...submitted })
-        .filter((name) => Equal.equals(current[name], submitted[name]))
-        .map((name) => [name, submitted[name]]));
-}
+import { accepted, changed, changedFields, merged, mergeObserved, untouched } from "./draftValues.js";
 export function draft(initial, persistence) {
-    const restored = persistence?.read();
-    const loaded = {
-        baseline: restored?.baseline ?? initial,
-        current: restored?.values ?? initial,
-        settled: restored ? Object.fromEntries(Object.entries(restored.values).filter(([name]) => !restored.edited.includes(name))) : none,
-    };
-    const state = AtomRef.make({
-        baseline: initial,
-        current: restored ? merged(loaded, initial) : initial,
-        settled: none,
+    const none = {};
+    const state = AtomRef.make({ baseline: initial, current: initial, settled: none });
+    const local = new Set();
+    let previous = initial;
+    let receiving = false;
+    let refreshing = false;
+    function withoutWriting(run) {
+        receiving = true;
+        run();
+        receiving = false;
+    }
+    function restore(restored) {
+        const held = state.value;
+        const incoming = restored
+            ? merged({
+                baseline: restored.baseline,
+                current: restored.values,
+                settled: Object.fromEntries(Object.entries(restored.values).filter(([name]) => !restored.edited.includes(name))),
+            }, held.baseline)
+            : held.baseline;
+        withoutWriting(() => state.update((value) => ({ ...value, current: mergeObserved(value.current, incoming, local) })));
+        return local.size === 0;
+    }
+    const mounted = Atom.readable((get) => {
+        if (persistence) {
+            get.addFinalizer(persistence.observe(restore));
+        }
     });
+    function releaseCleanFields() {
+        for (const name of local) {
+            if (untouched(state.value, name)) {
+                local.delete(name);
+            }
+        }
+    }
+    function store(value, sameInput = refreshing) {
+        const edited = Object.keys({ ...value.baseline, ...value.current }).filter((name) => !untouched(value, name));
+        persistence?.write({ ...value.baseline, ...value.settled }, value.current, edited, sameInput);
+    }
     if (persistence) {
         state.subscribe((value) => {
+            const before = previous;
+            previous = value.current;
+            if (receiving) {
+                return;
+            }
+            if (!refreshing) {
+                for (const name of changedFields(before, value.current)) {
+                    local.add(name);
+                }
+            }
+            releaseCleanFields();
             if (changed(value)) {
-                const edited = Object.keys({ ...value.baseline, ...value.current }).filter((name) => !untouched(value, name));
-                persistence.write({ ...value.baseline, ...value.settled }, value.current, edited);
+                store(value);
             }
             else {
                 persistence.clear();
@@ -48,15 +64,20 @@ export function draft(initial, persistence) {
     }
     return {
         dirty: Atom.readable((get) => {
+            get(mounted);
             get.addFinalizer(state.subscribe((value) => get.setSelf(changed(value))));
             return changed(state.value);
         }),
+        mounted,
         receive: (incoming) => {
+            refreshing = true;
             state.update((held) => ({
                 baseline: incoming,
                 current: changed(held) ? merged(held, incoming) : incoming,
                 settled: none,
             }));
+            refreshing = false;
+            releaseCleanFields();
         },
         revert: () => {
             state.update((held) => ({
@@ -67,19 +88,20 @@ export function draft(initial, persistence) {
         },
         submission: () => {
             const { baseline, current: submitted } = state.value;
+            const revision = persistence?.revision();
             return {
                 accept: (incoming) => {
-                    state.update((held) => {
-                        if (held.baseline !== baseline) {
-                            return { ...held, settled: matching(held.current, submitted) };
+                    withoutWriting(() => state.update((held) => accepted(held, baseline, submitted, incoming)));
+                    releaseCleanFields();
+                    if (changed(state.value)) {
+                        store(state.value, true);
+                    }
+                    else {
+                        const expected = revision?.();
+                        if (expected !== undefined) {
+                            persistence?.clear(expected);
                         }
-                        return {
-                            ...held,
-                            baseline: incoming ?? submitted,
-                            current: incoming === undefined ? held.current : merged({ ...held, baseline: submitted, settled: none }, incoming),
-                            settled: none,
-                        };
-                    });
+                    }
                 },
                 values: submitted,
             };