@hydranium/glsp-server 1.0.0-next.31 → 1.0.0-next.315

package/lib/state/reconciling-multi-document-glsp-state.js

@@ -13,7 +13,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { injectable } from 'inversify';
+import { asModelVersion, describeErrorWithStack } from '@hydranium/protocol';
 import { AbstractHydraniumGlspState } from './abstract-hydranium-glsp-state.js';
+import { openOperationOf } from '../command/hydranium-glsp-operation-command.js';
 import { reconcileSourceModelWrite } from './reconcile-source-model-write.js';
 /**
  * Editable GLSP state for a diagram whose edits span SEVERAL Langium documents —
@@ -28,43 +30,33 @@ import { reconcileSourceModelWrite } from './reconcile-source-model-write.js';
  * defines them over the primary plus the secondary write set registered through
  * {@link AbstractHydraniumGlspState.trackSecondaryDocument}.
  *
- * **Writes are NOT atomic, deliberately, and the window is real.** Each document
- * goes through its own `ModelService.update`, so a failure after the first write
- * has landed leaves the set inconsistent on disk. There is no multi-document
- * transaction to lean on: `WorkspaceLock` serialises builds but does not roll
- * back, and the document store commits per URI. An adopter that cannot accept the
- * window should not span documents in one operation.
+ * **The write set is written all or none.** {@link persist} hands every
+ * changed document to one `ClientSession.updateAll` on the diagram's session,
+ * so a conflict on any document leaves every document of the set as it was,
+ * and write order carries no meaning.
  *
- * **What makes the window tolerable is write ORDER, and the rule is
- * referenced-before-referencing** — not "secondaries first" as such. Write the
- * document whose content the others point AT before the documents that point at
- * it, so a partial write leaves an unreferenced element (inert, and the direction
- * an integrity rule can repair) rather than a reference to something that does
- * not exist (a linking error). {@link persist} implements that as
- * secondaries-then-primary, which is correct for the common shape where the
- * primary is the DIAGRAM and the semantics it references are secondaries: the
- * user opened the diagram, so it is also the document the conflict gate should
- * guard. **An adopter whose primary is the referenced document — a semantic file
- * as the diagram source, with layout in a secondary — has the ordering backwards
- * and must override {@link persist} to write the primary first.** Overriding it
- * is the supported route; the base order is a default for the common case, not an
- * invariant of the class.
+ * **Every document of the set is gated.** The primary on the caller's
+ * `baseVersion`, each secondary on {@link secondaryBaseVersion}, by default the version
+ * it had when the source root was last read. A conflict on any of them is
+ * reconciled against the whole write set, and the merged retry is gated on
+ * the versions its refetch read. A write based on `'any'` — an undo or redo
+ * applying a recorded patch — forces every document of the set.
  *
- * **The conflict gate covers the primary only.** Secondaries are written without
- * a based-on version, so a concurrent foreign edit to one is overwritten rather
- * than reconciled. Gating them too would need a per-document reconcile whose
- * outcomes can disagree (merge one, conflict another) with no way to un-write the
- * merged one — the atomicity problem again, one layer up. The captured versions
- * ARE available via {@link AbstractHydraniumGlspState.capturedVersionOf}, so an
- * adopter that wants a coarser check can compare before writing.
+ * A secondary is written only while the diagram's session has it open. The
+ * storage opens it as it joins the write set, and {@link openForWrite} opens it
+ * again before each write; an adopter whose write set can name a document that
+ * does not exist yet overrides {@link openForWrite} to create it through
+ * {@link createSecondaryDocument}.
  */
 let ReconcilingMultiDocumentGlspState = class ReconcilingMultiDocumentGlspState extends AbstractHydraniumGlspState {
     /**
-     * Last in-sync projection across the whole write set, captured on every
-     * {@link setSourceRoot}. Same role as the single-document baseline: the state a
-     * forward-write conflict reconciles the user's intent against.
+     * The projection across the whole write set that a forward-write conflict
+     * reconciles the user's intent from, taken from the built roots on every
+     * capture.
      */
-    baseline;
+    base;
+    /** The documents {@link createSecondaryDocument} created for the {@link persist} under way, with the version each was created at. */
+    createdForWrite = new Map();
     /**
      * Projection of the primary plus every registered secondary, in the framework
      * encoder's `'grammar'` mode (authored state only — cross-references as
@@ -84,25 +76,85 @@ let ReconcilingMultiDocumentGlspState = class ReconcilingMultiDocumentGlspState
                 secondaries[uri] = projection;
             }
         }
-        return { primary: this.projectRoot(this._sourceRoot), secondaries };
+        return { primary: this.projectRoot(this.sourceRoot), secondaries };
     }
-    setSourceRoot(uri, root) {
-        super.setSourceRoot(uri, root);
+    captureSourceRoot(uri, root) {
+        super.captureSourceRoot(uri, root);
         this.trackWriteSet(uri);
-        this.baseline = this.sourceModel;
+        this.base = this.sourceModel;
+    }
+    /**
+     * Each document whose ends differ, either end serialized for its URI and
+     * parsed back; a document equal on both ends is left as it is, since it
+     * stays out of the transition's patch anyway.
+     */
+    async normalizeTransition(transition) {
+        const from = { primary: transition.from.primary, secondaries: { ...transition.from.secondaries } };
+        const to = { primary: transition.to.primary, secondaries: { ...transition.to.secondaries } };
+        if (JSON.stringify(from.primary) !== JSON.stringify(to.primary)) {
+            from.primary = this.projectRoot(await this.roundTrip(this._sourceUri, from.primary));
+            to.primary = this.projectRoot(await this.roundTrip(this._sourceUri, to.primary));
+        }
+        for (const uri of new Set([...Object.keys(from.secondaries), ...Object.keys(to.secondaries)])) {
+            if (JSON.stringify(from.secondaries[uri]) === JSON.stringify(to.secondaries[uri])) {
+                continue;
+            }
+            for (const end of [from, to]) {
+                const secondary = end.secondaries[uri];
+                if (secondary !== undefined) {
+                    end.secondaries[uri] = this.projectRoot(await this.roundTrip(uri, secondary));
+                }
+            }
+        }
+        return { from, to };
+    }
+    /**
+     * Also takes a secondary first tracked during an operation into the base
+     * and into the operation's projection from before its command, both from
+     * the root its version was read from: a conflict on it reconciles from the
+     * revision the operation's copy describes, and undoing the operation
+     * restores it. A document that does not exist yet has no projection to
+     * restore, so an undo leaves what the operation wrote into it.
+     */
+    trackSecondaryDocument(uri) {
+        const added = uri !== this._sourceUri && !this.secondaryUris.includes(uri);
+        super.trackSecondaryDocument(uri);
+        const root = this.capturedRootOf(uri);
+        if (root === undefined) {
+            return;
+        }
+        const projection = this.projectRoot(root);
+        if (this.base !== undefined && !(uri in this.base.secondaries)) {
+            this.base = { ...this.base, secondaries: { ...this.base.secondaries, [uri]: projection } };
+        }
+        if (added) {
+            openOperationOf(this)?.amendBefore(before => isMultiDocumentModel(before) ? { ...before, secondaries: { ...before.secondaries, [uri]: projection } } : before);
+        }
+    }
+    /**
+     * During an operation, also drops the untracked documents from its
+     * projection from before its command: they are not written, so the
+     * operation's undo and redo leave them as they are.
+     */
+    untrackSecondaryDocuments() {
+        const untracked = this.secondaryUris;
+        super.untrackSecondaryDocuments();
+        openOperationOf(this)?.amendBefore(before => isMultiDocumentModel(before)
+            ? { ...before, secondaries: Object.fromEntries(Object.entries(before.secondaries).filter(([uri]) => !untracked.includes(uri))) }
+            : before);
     }
     /**
      * Register the secondary documents that belong to the primary at `uri`, via
      * {@link AbstractHydraniumGlspState.trackSecondaryDocument}. Called on every
-     * {@link setSourceRoot}, after the primary is captured (so `sourceUri` is
-     * current) and BEFORE the baseline is taken (so the baseline includes them).
+     * capture, after the primary is captured (so `sourceUri` is current) and
+     * BEFORE the base is taken (so the base includes them).
      * Default: no secondaries.
      *
      * This hook exists because that ordering is a trap an adopter would otherwise
-     * hit silently. Registering from an overridden `setSourceRoot` *after*
-     * `super.setSourceRoot(...)` runs too late — the baseline has already been
+     * hit silently. Registering from an overridden `captureSourceRoot` *after*
+     * `super.captureSourceRoot(...)` runs too late — the base has already been
      * captured without the secondaries, so the first conflict reconcile measures
-     * the user's intent against a baseline missing half the write set and the
+     * the user's intent against a base missing half the write set and the
      * secondary edits look like foreign changes. Registering *before* the super
      * call is too early for a URI derived from the new primary. Overriding this
      * instead removes the choice.
@@ -112,102 +164,189 @@ let ReconcilingMultiDocumentGlspState = class ReconcilingMultiDocumentGlspState
     }
     /**
      * Persist the whole write set, then capture the resulting primary root. On a
-     * `ConflictError` from the primary, reconcile via the injected policy exactly
-     * as the single-document state does — the orchestration is shared.
+     * `ConflictError` from any document of the set, reconcile via the injected
+     * policy exactly as the single-document state does — the orchestration is
+     * shared.
      */
-    async updateSourceModel(model, version) {
-        return reconcileSourceModelWrite(model, version, {
-            persist: async (candidate, baseVersion) => {
-                const { root } = await this.persist(candidate, baseVersion);
-                this.setSourceRoot(this._sourceUri, root);
+    async updateSourceModel(model, baseVersion = this.baseVersion) {
+        let secondaryVersions;
+        return reconcileSourceModelWrite(model, baseVersion, {
+            persist: async (candidate, candidateBaseVersion) => {
+                const { root } = await this.persist(candidate, candidateBaseVersion, secondaryVersions);
+                this.captureWrittenRoot(root);
+            },
+            refetch: async () => {
+                const refetched = await this.refetch();
+                secondaryVersions = refetched?.secondaryVersions;
+                return refetched;
             },
-            refetch: () => this.refetch(),
-            baseline: this.baseline,
+            base: this.base,
             conflictResolver: this.conflictResolver,
             logger: this.logger,
-            onConflictDropped: () => this.refreshSourceRoot()
+            onConflictDropped: () => this.writeDropped(),
+            onAlreadyApplied: () => this.captureBuiltRoot(),
+            maxWrites: this.maxSourceModelWrites
         });
     }
     /**
-     * Write hook — secondaries first (ungated), primary last (gated on
-     * `baseVersion`). The order is the failure-mode choice documented on the
-     * class, not incidental: override this when the primary is the document the
-     * others REFERENCE, since then this order writes the references first.
+     * Write hook — every document of `model` that changed, opened first through
+     * {@link openForWrite}, in one `updateAll` on the diagram's session: the
+     * primary gated on `baseVersion`, each secondary on its entry in
+     * `secondaryVersions` (a refetch's) or else {@link secondaryBaseVersion}, or
+     * every document on `'any'` when `baseVersion` is `'any'`. Resolves to
+     * the primary's root, the one already captured when the primary did not
+     * change. A write that bypasses `updateAll` gives up the all-or-none
+     * guarantee the class describes. Throws without a session
+     * ({@link requireModelSession}). An override that serializes otherwise than
+     * `ModelService.modelToText` overrides {@link normalizeTransition} alongside.
+     *
+     * A write that fails closes every document {@link createSecondaryDocument}
+     * created for it that {@link closesCreatedDocument} accepts.
      */
-    async persist(model, baseVersion) {
-        for (const [uri, secondary] of Object.entries(model.secondaries)) {
-            if (this.hasChanged(this.baseline?.secondaries[uri], secondary)) {
-                await this.persistSecondary(uri, secondary);
+    async persist(model, baseVersion, secondaryVersions) {
+        const primaryChanged = this.hasChanged(this.base.primary, model.primary);
+        const changedSecondaries = Object.entries(model.secondaries).filter(([uri, secondary]) => this.hasChanged(this.base.secondaries[uri], secondary));
+        if (!primaryChanged && changedSecondaries.length === 0) {
+            return { root: this._sourceRoot };
+        }
+        const session = this.requireModelSession();
+        this.createdForWrite.clear();
+        try {
+            if (primaryChanged) {
+                await this.openForWrite(session, this._sourceUri);
+            }
+            for (const [uri] of changedSecondaries) {
+                await this.openForWrite(session, uri);
+            }
+            // Based after the opens, so a secondary created there is gated on the version it was created at.
+            const updates = primaryChanged
+                ? [{ uri: this._sourceUri, model: model.primary, baseVersion }]
+                : [];
+            for (const [uri, secondary] of changedSecondaries) {
+                updates.push({
+                    uri,
+                    model: secondary,
+                    baseVersion: baseVersion === 'any' ? 'any' : (secondaryVersions?.[uri] ?? this.secondaryBaseVersion(uri))
+                });
             }
+            const documents = await session.updateAll({ updates });
+            return { root: primaryChanged ? documents[0].root : this._sourceRoot };
         }
-        if (!this.hasChanged(this.baseline?.primary, model.primary)) {
-            // Nothing to write, so nothing to gate either — return the root already
-            // captured rather than round-tripping the document for no reason.
-            return { root: this._sourceRoot };
+        catch (error) {
+            for (const [uri, created] of this.createdForWrite) {
+                try {
+                    if (this.closesCreatedDocument(uri, created)) {
+                        await session.close(uri);
+                    }
+                }
+                catch (closeError) {
+                    this.logger.warn(`Could not close ${uri}, created for a write that failed: ${describeErrorWithStack(closeError)}`);
+                }
+            }
+            throw error;
+        }
+        finally {
+            this.createdForWrite.clear();
         }
-        return this.persistPrimary(model.primary, baseVersion);
     }
     /**
-     * Whether `candidate` differs from the baseline projection of the same
+     * Whether a write that failed closes `uri`, which
+     * {@link createSecondaryDocument} created for it at `createdVersion`.
+     * Default: while it still holds the text it was created with. Left open, it
+     * would stay in the diagram's session, and the diagram's next save would
+     * write it to disk though no write landed in it. One whose text moved on,
+     * because the set failed after applying or another client wrote to it,
+     * stays open: closing it would drop that text.
+     */
+    closesCreatedDocument(uri, createdVersion) {
+        return this.sharedServices.workspace.TextDocuments.version(uri) === createdVersion;
+    }
+    /**
+     * Whether `candidate` differs from the base projection of the same
      * document, and therefore needs writing.
      *
      * **Skipping unchanged documents is correctness, not an optimisation.** A
-     * write goes through `ModelService.update`, which re-serializes from the AST —
-     * so writing a document that did not change still rewrites its text, and a
-     * serializer is free to normalise formatting and cannot preserve comments.
-     * Persisting the whole write set unconditionally therefore means a pure layout
-     * drag reflows the semantic file and strips its comments, which is a data
-     * loss the user never asked for and would struggle to attribute.
+     * write re-serializes from the AST, so writing a document that did not
+     * change still rewrites its text in the serializer's own layout. Persisting
+     * the whole write set unconditionally therefore means a pure layout drag
+     * reflows the semantic file, a change the user never asked for and would
+     * struggle to attribute. Comments survive that rewrite, but the
+     * hand-formatting around them does not.
      *
      * Compared by serialised form. Both sides come from the same encoder walking
      * the same shape, so key order is stable and a string compare is sound here;
      * it is also cheap enough to run per document per write.
      */
-    hasChanged(baseline, candidate) {
-        return baseline === undefined || JSON.stringify(baseline) !== JSON.stringify(candidate);
-    }
-    /** Write the primary document, opting into the conflict gate when `baseVersion` is given. */
-    async persistPrimary(model, baseVersion) {
-        const document = await this.sharedServices.model.ModelService.update({
-            uri: this._sourceUri,
-            model,
-            clientId: this.clientId,
-            baseVersion
-        });
-        return document;
+    hasChanged(base, candidate) {
+        return base === undefined || JSON.stringify(base) !== JSON.stringify(candidate);
     }
     /**
-     * Write one secondary document. Ungated by design (see the class doc); override
-     * alongside {@link persistPrimary} when the round-trip differs per document
-     * role — a layout file and a semantic file need not share a serializer.
+     * Make sure the diagram's session has `uri` open before the write set is
+     * written. Default: open it, a no-op for a document the session already
+     * has open. Override to create a document the write set names before it
+     * exists, through {@link createSecondaryDocument}: `updateAll` opens nothing.
      */
-    async persistSecondary(uri, model) {
-        await this.sharedServices.model.ModelService.update({ uri, model, clientId: this.clientId });
+    openForWrite(session, uri) {
+        return session.open(uri);
     }
     /**
-     * Refetch hook — the current settled projection across the write set, used by
-     * the conflict resolver to replay the user's intent against fresh state.
-     * Returns `undefined` when the PRIMARY cannot be read, since a reconcile
-     * without it has nothing to merge into; an unreadable secondary is omitted the
-     * same way {@link sourceModel} omits one.
+     * Create the secondary `uri` holding `text` through `session.create`, and
+     * base its write on the version the created document took. The version
+     * recorded while it did not exist matches no write, so the write conflicts.
+     * Make `text` with `ModelService.modelToText`, not the bare serializer,
+     * which leaves the file without the ending a write would give it.
+     */
+    async createSecondaryDocument(session, uri, text) {
+        const created = await session.create(uri, text);
+        this.createdForWrite.set(uri, created);
+        if (this._secondaryVersions.has(uri)) {
+            this._secondaryVersions.set(uri, asModelVersion(created));
+        }
+    }
+    /**
+     * What a secondary write declares it was based on. Default: the version the
+     * secondary had when the source root was last read
+     * ({@link AbstractHydraniumGlspState.baseVersionOf}), so a foreign edit
+     * to it since is reported as a conflict and reconciled rather than
+     * overwritten; `'any'` for a secondary with no recorded version.
+     * Return `'any'` to force secondary writes.
+     */
+    secondaryBaseVersion(uri) {
+        return this.baseVersionOf(uri) ?? 'any';
+    }
+    /**
+     * Refetch hook — the current projection across the write set, each document
+     * read through {@link AbstractHydraniumGlspState.readCurrentRoot}, with the
+     * versions read alongside: theirs, which the conflict resolver replays the
+     * user's intent onto. Returns `undefined` when the PRIMARY cannot be read,
+     * since a reconcile without it has nothing to merge into; an unreadable
+     * secondary is omitted the same way {@link sourceModel} omits one.
      */
     async refetch() {
-        const fresh = await this.sharedServices.model.ModelService.validated(this._sourceUri).catch(() => undefined);
-        if (!fresh) {
+        const theirs = await this.readCurrentRoot(this._sourceUri);
+        if (!theirs) {
             return undefined;
         }
         const secondaries = {};
+        const secondaryVersions = {};
         for (const uri of this.secondaryUris) {
-            const settled = await this.sharedServices.model.ModelService.validated(uri).catch(() => undefined);
-            if (settled) {
-                secondaries[uri] = this.projectRoot(settled.root);
+            const read = await this.readCurrentRoot(uri);
+            if (read) {
+                secondaries[uri] = this.projectRoot(read.root);
+                secondaryVersions[uri] = read.version;
             }
         }
-        return { primary: this.projectRoot(fresh.root), secondaries };
+        return { model: { primary: this.projectRoot(theirs.root), secondaries }, baseVersion: theirs.version, secondaryVersions };
     }
-    /** Project a currently-loaded document's root, or `undefined` when it is not loaded. */
+    /**
+     * Project a currently-loaded document's root, or `undefined` when it is not
+     * loaded: the open operation's copy of it when there is one, which is where
+     * a handler's edit of it is, else the root its version was read from.
+     */
     projectDocument(uri) {
-        const root = this.sharedServices.model.ModelService.getDocument(uri)?.parseResult?.value;
+        const root = this.existingWorkingRootOf(uri) ??
+            this.capturedRootOf(uri) ??
+            this.sharedServices.model.ModelService.getDocument(uri)?.parseResult?.value;
         return root ? this.projectRoot(root) : undefined;
     }
     /** Grammar-mode transfer projection of one AST root. The single projection seam. */
@@ -219,4 +358,7 @@ ReconcilingMultiDocumentGlspState = __decorate([
     injectable()
 ], ReconcilingMultiDocumentGlspState);
 export { ReconcilingMultiDocumentGlspState };
+function isMultiDocumentModel(value) {
+    return 'secondaries' in value && typeof value.secondaries === 'object' && value.secondaries !== null;
+}
 //# sourceMappingURL=reconciling-multi-document-glsp-state.js.map

package/lib/state/reconciling-multi-document-glsp-state.js.map

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

package/lib/state/reconciling-transfer-hydranium-glsp-state.d.ts

@@ -8,7 +8,8 @@
  ********************************************************************************/
 import { type JsonModelState } from '@eclipse-glsp/server';
 import { type AstNode } from '@hydranium/langium';
-import { type TransferElement } from '@hydranium/protocol';
+import { type BaseVersion, type TransferElement, type VersionedModel } from '@hydranium/protocol';
+import { type OperationTransition } from '../command/hydranium-glsp-operation-command.js';
 import { AbstractHydraniumGlspState } from './abstract-hydranium-glsp-state.js';
 /**
  * Editable GLSP state for adopters whose source model is a **structured
@@ -23,16 +24,16 @@ import { AbstractHydraniumGlspState } from './abstract-hydranium-glsp-state.js';
  *   field-level shape is what lets `fast-json-patch` diff per field, so undo /
  *   redo and forward-write reconcile act per field instead of clobbering the
  *   whole document.
- * - {@link baseline} — the last in-sync projection, captured on every
- *   {@link setSourceRoot}. A forward-write conflict reconciles the user's
- *   intent (baseline → attempted) against the fresh server root.
+ * - {@link base} — the last in-sync projection, taken on every capture of
+ *   the built root. A forward-write conflict reconciles the user's
+ *   intent (base → ours) against the server's current root (theirs).
  * - {@link updateSourceModel} — the concrete reconcile template: persist,
  *   and on a `ConflictError` consult the injected `conflictResolver` and act
- *   on the merged / no-op / conflict / unavailable outcome.
+ *   on its outcome.
  * - {@link persist} / {@link refetch} — the only I/O seams. Defaults route
- *   through `ModelService.update` / `.validated` (reachable from the base via
- *   `sharedServices.model`); adopters whose document round-trip differs
- *   override these without touching the orchestration.
+ *   through the diagram session's `update` and `ModelService.validated`;
+ *   adopters whose document round-trip differs override these without
+ *   touching the orchestration.
  *
  * Adopters whose source model is whole-document text (a bare `{ text }`
  * source model) or that are read-only do NOT extend this class — they extend
@@ -43,13 +44,10 @@ import { AbstractHydraniumGlspState } from './abstract-hydranium-glsp-state.js';
  */
 export declare class ReconcilingTransferHydraniumGlspState<TRoot extends AstNode, TSourceModel extends TransferElement> extends AbstractHydraniumGlspState<TRoot, TSourceModel> implements JsonModelState<TSourceModel> {
     /**
-     * Last in-sync source-model projection, captured on every
-     * {@link setSourceRoot} (initial load + post-update). The baseline a
-     * forward-write conflict reconciles against: it stays the pre-command
-     * state because operation handlers mutate `_sourceRoot` in place during
-     * `execute` while `setSourceRoot` only re-runs once the write commits.
+     * The projection a forward-write conflict reconciles the user's intent
+     * from, taken from the built root on every capture.
      */
-    protected baseline?: TSourceModel;
+    protected base: TSourceModel;
     /**
      * Persisted-shape projection of the current source root, consumed by GLSP's
      * {@link JsonModelState} read side and recorded for field-level undo / redo.
@@ -59,33 +57,43 @@ export declare class ReconcilingTransferHydraniumGlspState<TRoot extends AstNode
      * Synchronous — the encoder walks the in-memory AST without serialising.
      */
     get sourceModel(): TSourceModel;
-    setSourceRoot(uri: string, root: TRoot): void;
+    /**
+     * The source model of `root`. The single projection seam: the source
+     * model, the refetch and {@link normalizeTransition} all project through it.
+     */
+    protected projectRoot(root: AstNode): TSourceModel;
+    /** Both ends serialized for the source document and parsed back, unless they are equal. */
+    normalizeTransition(transition: OperationTransition<TSourceModel>): Promise<OperationTransition<TSourceModel>>;
+    protected captureSourceRoot(uri: string, root: TRoot): void;
     /**
      * Persist `model` back to the document store, then capture the resulting
-     * AST root. On a `ConflictError` (the based-on version was superseded),
-     * reconcile the user's intent against the fresh server root via the bound
+     * AST root. On a `ConflictError` (the base version was superseded),
+     * reconcile the user's intent against the server's current root via the bound
      * `conflictResolver` and act on the outcome — one declarative policy
      * (force = last-writer-wins, reconciling = field-level merge) shared with
      * undo / redo.
      */
-    updateSourceModel(model: TSourceModel, version?: number): Promise<void>;
+    updateSourceModel(model: TSourceModel, baseVersion?: BaseVersion): Promise<void>;
     /**
      * Persist hook — the only write-side I/O. Default routes the structured
-     * model through `ModelService.update` (serialize → reparse), opting into
-     * the `ConflictError` gate when `version` is given. Adopters whose document
-     * round-trip differs override this; the orchestration in
+     * model through the diagram session's `update` (serialize → reparse),
+     * opting into the `ConflictError` gate unless `baseVersion` is `'any'`,
+     * and throws without a session. Adopters whose document
+     * round-trip differs override this, and {@link normalizeTransition}
+     * alongside so undo compares what this writes; the orchestration in
      * {@link updateSourceModel} is unchanged.
      */
-    protected persist(model: TSourceModel, baseVersion?: number): Promise<{
+    protected persist(model: TSourceModel, baseVersion: BaseVersion): Promise<{
         root: TRoot;
     }>;
     /**
-     * Refetch hook — reads the current settled server root as a persisted-shape
-     * projection (or `undefined` when unavailable). The `conflictResolver`
-     * replays the user's intent against this fresh state. Default uses
-     * `ModelService.validated` + the framework encoder's `'grammar'` mode;
-     * adopters override alongside {@link persist}.
+     * Refetch hook — the stored text parsed afresh, as a persisted-shape
+     * projection with the version of that text (or `undefined` when
+     * unavailable): theirs, which the `conflictResolver` replays the user's
+     * intent onto. Default uses {@link AbstractHydraniumGlspState.readCurrentRoot}
+     * + the framework encoder's `'grammar'` mode; adopters override alongside
+     * {@link persist}.
      */
-    protected refetch(): Promise<TSourceModel | undefined>;
+    protected refetch(): Promise<VersionedModel<TSourceModel> | undefined>;
 }
 //# sourceMappingURL=reconciling-transfer-hydranium-glsp-state.d.ts.map

package/lib/state/reconciling-transfer-hydranium-glsp-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reconciling-transfer-hydranium-glsp-state.d.ts","sourceRoot":"","sources":["../../src/state/reconciling-transfer-hydranium-glsp-state.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAGhF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,qBACa,qCAAqC,CAAC,KAAK,SAAS,OAAO,EAAE,YAAY,SAAS,eAAe,CAC3G,SAAQ,0BAA0B,CAAC,KAAK,EAAE,YAAY,CACtD,YAAW,cAAc,CAAC,YAAY,CAAC;IAEvC;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC;IAElC;;;;;;;OAOG;IACH,IAAI,WAAW,IAAI,YAAY,CAE9B;IAEQ,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,IAAI;IAKtD;;;;;;;OAOG;IACG,iBAAiB,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB7E;;;;;;OAMG;cACa,OAAO,CAAC,KAAK,EAAE,YAAY,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,KAAK,CAAA;KAAE,CAAC;IAU5F;;;;;;OAMG;cACa,OAAO,IAAI,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;CAI9D"}
+{"version":3,"file":"reconciling-transfer-hydranium-glsp-state.d.ts","sourceRoot":"","sources":["../../src/state/reconciling-transfer-hydranium-glsp-state.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAClG,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AAC1F,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAGhF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,qBACa,qCAAqC,CAAC,KAAK,SAAS,OAAO,EAAE,YAAY,SAAS,eAAe,CAC3G,SAAQ,0BAA0B,CAAC,KAAK,EAAE,YAAY,CACtD,YAAW,cAAc,CAAC,YAAY,CAAC;IAEvC;;;OAGG;IACH,SAAS,CAAC,IAAI,EAAG,YAAY,CAAC;IAE9B;;;;;;;OAOG;IACH,IAAI,WAAW,IAAI,YAAY,CAE9B;IAED;;;OAGG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,GAAG,YAAY,CAEjD;IAED,2FAA2F;IAC5E,mBAAmB,CAAC,UAAU,EAAE,mBAAmB,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC,CAQ5H;IAED,UAAmB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,IAAI,CAGnE;IAED;;;;;;;OAOG;IACG,iBAAiB,CAAC,KAAK,EAAE,YAAY,EAAE,WAAW,GAAE,WAA8B,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBvG;IAED;;;;;;;;OAQG;IACH,UAAgB,OAAO,CAAC,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,KAAK,CAAA;KAAE,CAAC,CAG/F;IAED;;;;;;;OAOG;IACH,UAAgB,OAAO,IAAI,OAAO,CAAC,cAAc,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC,CAQ3E;CACH"}