@hydranium/glsp-client 1.0.0-next.327 → 1.0.0-next.328

package/README.md

@@ -115,7 +115,14 @@ for touch, and size its `<svg>` to it, or sprotty draws into 300×150. The
 first render replaces the element with sprotty's own under the same id, so
 keep no reference to it and find it by id when you need it. A failed load
 resolves the mount; read `diagram.loadOutcome` to report it, since the status
-overlay cannot show a failure of the action dispatcher itself.
+overlay cannot show a failure of the action dispatcher itself. A page that
+asks before a reload also reads `diagram.editsInFlight`, the edits the server
+has not answered yet, which no dirty state shows, and a save or a file
+switch awaits `diagram.whenEditsSettled()` so it does not run ahead of one,
+and stops when it resolves `false`, its bound passed with one unanswered.
+A host that calls `createGlspClientModule` itself counts them only when it
+passes `trackEditsInFlight: true`, and reads them from
+`HydraniumGlspActionDispatcher`.
 
 For a browser page, see *Host in a browser* in
 [Adopting Hydranium](https://github.com/eclipse-emfcloud/hydranium/blob/main/docs/ADOPTING.md).

package/lib/action-dispatcher.d.ts

@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
 import { type Action, CheckEdgeResultAction, GLSPActionDispatcher, RequestCheckEdgeAction } from '@eclipse-glsp/client';
-import { type Clock, type Logger, type Stopwatch, type Tracer } from '@hydranium/protocol';
+import { type Clock, Deferred, type Logger, PendingWorkTracker, type Stopwatch, type Tracer } from '@hydranium/protocol';
 /** Default subset of action kinds the framework dispatcher will log: the GLSP
  *  traffic an observer reading the log typically wants to see. All
  *  are standard `@eclipse-glsp/client` kinds; adopters with custom action kinds
@@ -38,15 +38,41 @@ export interface HydraniumGlspActionDispatcherOptions {
  * kind the protocol defines. Adopters with custom kinds either pass
  * `extraLoggedKinds` / `extraKindPairs` to the constructor (via a
  * `toDynamicValue` binding) or subclass and override.
+ *
+ * Where the host asks for it, it also counts the edits it sends that the server
+ * has not answered yet, as {@link editsInFlight}, so a page can ask before a
+ * reload drops one. The dirty state cannot say this: the server sets it only
+ * once it has answered, and an edit that changed nothing is answered with
+ * nothing at all. Each edit is followed by a {@link RequestEditsSettledAction},
+ * which the server answers after it, and counts until that request or a later
+ * one is answered or rejected: the server handles them in order. With no
+ * answer, as when the connection is lost, the count stays, so a guard asks
+ * rather than loses the edit. An action from the server is not counted, nor
+ * is anything on a server that serves no settle request.
  */
 export declare class HydraniumGlspActionDispatcher extends GLSPActionDispatcher {
     protected readonly hydraniumLogger: Logger;
     protected readonly tracer: Tracer;
     /** Times each request to its response: the diagram container's {@link Clock}, or a `SystemClock`. */
     protected readonly clock: Clock;
+    /** Whether to count edits in flight; the host asks for it through `createGlspClientModule`. */
+    protected readonly trackEditsInFlight: boolean;
     protected readonly loggedKinds: ReadonlySet<string>;
     protected readonly kindPairs: ReadonlyMap<string, string>;
     protected readonly kindPairsReverse: ReadonlyMap<string, string>;
+    /** Per edit sent, until its {@link RequestEditsSettledAction} or a later one is answered or rejected. */
+    protected readonly pendingEdits: PendingWorkTracker;
+    /** The edits in flight by the number of their settle request, in send order. */
+    protected readonly editsBySettle: Map<number, Deferred<void>>;
+    protected settlesSent: number;
+    /**
+     * How long {@link whenEditsSettled} waits before going on anyway: well past
+     * the server's bounded waits on one settle together. Its handling of the
+     * edits before has no bound, so a server slower than that is taken as lost.
+     */
+    protected readonly settleEditsMs: number;
+    /** The postponed actions a lifted block is dispatching a second time, counted when first sent. */
+    protected redispatched: ReadonlySet<Action> | undefined;
     protected pairCounter: number;
     /** Pending requests keyed by requestId (for actions that carry one). */
     protected pendingById: Map<string, {
@@ -69,7 +95,31 @@ export declare class HydraniumGlspActionDispatcher extends GLSPActionDispatcher
      * uncaught rejection that blanks the diagram with no server-side signal.
      */
     protected registerInitTiming(): void;
+    /** How many edits the server has not answered yet; see {@link isEdit}. */
+    get editsInFlight(): number;
+    /**
+     * Resolves to `true` once the edits in flight now have been answered or
+     * rejected, or to `false` once {@link settleEditsMs} has passed first. An
+     * edit sent while it waits is not waited for. Never rejects. For a save or a
+     * switch that must not run ahead of an edit the server has not answered.
+     */
+    whenEditsSettled(): Promise<boolean>;
     dispatch(action: Action): Promise<void>;
+    protected handleBlocked(action: Action, predicate: (action: Action) => boolean): Promise<void>;
+    /** Whether `action` changes the model on the server: an operation, an undo or a redo. Widen it for an edit kind of your own. */
+    protected isEdit(action: Action): boolean;
+    /**
+     * Count `action` if it is an edit the client sends, even one whose dispatch
+     * failed, since it may have reached the server. One dispatched again counts
+     * again, except where a lifted block dispatches what it postponed.
+     */
+    protected trackEdit(action: Action): void;
+    /**
+     * End every edit up to the `settle`th: the server handles a client's actions
+     * in order, so its answer covers the edits before it, one whose own settle
+     * was lost included.
+     */
+    protected endEditsThrough(settle: number): void;
     protected logAction(action: Action): void;
     protected classify(action: Action): {
         verb: string;

package/lib/action-dispatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../src/action-dispatcher.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EACJ,KAAK,MAAM,EACX,qBAAqB,EAErB,oBAAoB,EAOpB,sBAAsB,EAaxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,MAAM,EAAE,KAAK,SAAS,EAAe,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAIxG;;;qCAGqC;AACrC,eAAO,MAAM,8BAA8B,EAAE,WAAW,CAAC,MAAM,CAiB7D,CAAC;AAEH;;gEAEgE;AAChE,eAAO,MAAM,4BAA4B,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAInE,CAAC;AAEH;;6EAE6E;AAC7E,MAAM,WAAW,oCAAoC;IAClD,QAAQ,CAAC,gBAAgB,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC7C,QAAQ,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC9D;+DAC2D;IAC3D,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC;CAClD;AAED;;;;;;;;;;;GAWG;AACH,qBACa,6BAA8B,SAAQ,oBAAoB;IAC/B,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAG,MAAM,CAAC;IAC5C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAG,MAAM,CAAC;IACxE,qGAAqG;IACrD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAqB;IAEpG,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACpD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEjE,SAAS,CAAC,WAAW,SAAK;IAC1B,wEAAwE;IACxE,SAAS,CAAC,WAAW;YAAyB,MAAM;sBAAgB,SAAS;OAAM;IACnF,wFAAwF;IACxF,SAAS,CAAC,aAAa;YAA+B,MAAM;sBAAgB,SAAS;SAAO;IAE5F,YAAyB,OAAO,CAAC,EAAE,oCAAoC,EAWtE;IAEQ,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAOnC;IAED;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,IAAI,IAAI,CAMnC;IAEQ,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAK/C;IAED,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAYxC;IAED,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAgBtE;IAED;gFAC4E;IAC5E,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CA+B1C;IAED,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,SAAS,CAAA;KAAE,GAAG,MAAM,CAG/E;IAED,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAsC1C;IAED,yGAAyG;IACzG,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,sBAAsB,GAAG,qBAAqB,GAAG,MAAM,CAGxF;CACH"}
+{"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../src/action-dispatcher.ts"],"names":[],"mappings":"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"}

package/lib/action-dispatcher.js

@@ -66,15 +66,41 @@ exports.HYDRANIUM_DEFAULT_KIND_PAIRS = new Map([
  * kind the protocol defines. Adopters with custom kinds either pass
  * `extraLoggedKinds` / `extraKindPairs` to the constructor (via a
  * `toDynamicValue` binding) or subclass and override.
+ *
+ * Where the host asks for it, it also counts the edits it sends that the server
+ * has not answered yet, as {@link editsInFlight}, so a page can ask before a
+ * reload drops one. The dirty state cannot say this: the server sets it only
+ * once it has answered, and an edit that changed nothing is answered with
+ * nothing at all. Each edit is followed by a {@link RequestEditsSettledAction},
+ * which the server answers after it, and counts until that request or a later
+ * one is answered or rejected: the server handles them in order. With no
+ * answer, as when the connection is lost, the count stays, so a guard asks
+ * rather than loses the edit. An action from the server is not counted, nor
+ * is anything on a server that serves no settle request.
  */
 let HydraniumGlspActionDispatcher = class HydraniumGlspActionDispatcher extends client_1.GLSPActionDispatcher {
     hydraniumLogger;
     tracer;
     /** Times each request to its response: the diagram container's {@link Clock}, or a `SystemClock`. */
     clock = new protocol_1.SystemClock();
+    /** Whether to count edits in flight; the host asks for it through `createGlspClientModule`. */
+    trackEditsInFlight = false;
     loggedKinds;
     kindPairs;
     kindPairsReverse;
+    /** Per edit sent, until its {@link RequestEditsSettledAction} or a later one is answered or rejected. */
+    pendingEdits = new protocol_1.PendingWorkTracker();
+    /** The edits in flight by the number of their settle request, in send order. */
+    editsBySettle = new Map();
+    settlesSent = 0;
+    /**
+     * How long {@link whenEditsSettled} waits before going on anyway: well past
+     * the server's bounded waits on one settle together. Its handling of the
+     * edits before has no bound, so a server slower than that is taken as lost.
+     */
+    settleEditsMs = 30_000;
+    /** The postponed actions a lifted block is dispatching a second time, counted when first sent. */
+    redispatched;
     pairCounter = 0;
     /** Pending requests keyed by requestId (for actions that carry one). */
     pendingById = new Map();
@@ -116,11 +142,80 @@ let HydraniumGlspActionDispatcher = class HydraniumGlspActionDispatcher extends
             this.hydraniumLogger.error('Failed to register model-initialized timing instrumentation', err);
         }
     }
+    /** How many edits the server has not answered yet; see {@link isEdit}. */
+    get editsInFlight() {
+        return this.pendingEdits.size;
+    }
+    /**
+     * Resolves to `true` once the edits in flight now have been answered or
+     * rejected, or to `false` once {@link settleEditsMs} has passed first. An
+     * edit sent while it waits is not waited for. Never rejects. For a save or a
+     * switch that must not run ahead of an edit the server has not answered.
+     */
+    async whenEditsSettled() {
+        if (this.pendingEdits.isIdle) {
+            return true;
+        }
+        return (await this.clock.raceTimer(this.pendingEdits.whenSettled(), this.settleEditsMs)) !== protocol_1.TIMED_OUT;
+    }
     dispatch(action) {
         if (this.loggedKinds.has(action.kind)) {
             this.logAction(action);
         }
-        return super.dispatch(action);
+        const dispatched = super.dispatch(action);
+        this.trackEdit(action);
+        return dispatched;
+    }
+    handleBlocked(action, predicate) {
+        if (!predicate(action)) {
+            return super.handleBlocked(action, predicate);
+        }
+        // A lifted block dispatches what it postponed again, within this call.
+        this.redispatched = new Set(this.postponedActions.map(postponed => postponed.action));
+        try {
+            return super.handleBlocked(action, predicate);
+        }
+        finally {
+            this.redispatched = undefined;
+        }
+    }
+    /** Whether `action` changes the model on the server: an operation, an undo or a redo. Widen it for an edit kind of your own. */
+    isEdit(action) {
+        return client_1.Operation.is(action) || client_1.UndoAction.is(action) || client_1.RedoAction.is(action);
+    }
+    /**
+     * Count `action` if it is an edit the client sends, even one whose dispatch
+     * failed, since it may have reached the server. One dispatched again counts
+     * again, except where a lifted block dispatches what it postponed.
+     */
+    trackEdit(action) {
+        if (!this.trackEditsInFlight ||
+            client_1.ServerAction.is(action) ||
+            !this.isEdit(action) ||
+            this.redispatched?.has(action) ||
+            !this.hasHandler({ kind: protocol_1.RequestEditsSettledAction.KIND })) {
+            return;
+        }
+        const settle = ++this.settlesSent;
+        const edit = new protocol_1.Deferred();
+        this.editsBySettle.set(settle, edit);
+        void this.pendingEdits.track(edit.promise);
+        const answered = () => this.endEditsThrough(settle);
+        this.request(protocol_1.RequestEditsSettledAction.create()).then(answered, answered);
+    }
+    /**
+     * End every edit up to the `settle`th: the server handles a client's actions
+     * in order, so its answer covers the edits before it, one whose own settle
+     * was lost included.
+     */
+    endEditsThrough(settle) {
+        for (const [sent, edit] of this.editsBySettle) {
+            if (sent > settle) {
+                break;
+            }
+            edit.resolve();
+            this.editsBySettle.delete(sent);
+        }
     }
     logAction(action) {
         const { verb, direction } = this.classify(action);
@@ -249,6 +344,11 @@ __decorate([
     (0, inversify_1.optional)(),
     __metadata("design:type", Object)
 ], HydraniumGlspActionDispatcher.prototype, "clock", void 0);
+__decorate([
+    (0, inversify_1.inject)(types_1.HydraniumClientTypes.TrackEditsInFlight),
+    (0, inversify_1.optional)(),
+    __metadata("design:type", Boolean)
+], HydraniumGlspActionDispatcher.prototype, "trackEditsInFlight", void 0);
 exports.HydraniumGlspActionDispatcher = HydraniumGlspActionDispatcher = __decorate([
     (0, inversify_1.injectable)(),
     __param(0, (0, inversify_1.unmanaged)()),

package/lib/action-dispatcher.js.map

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

package/lib/diagram-mount.d.ts

@@ -41,6 +41,23 @@ export interface GlspDiagramMount extends Disposable {
      *  the caller learns of it; when the failure is not `surfaced`, no overlay
      *  shows it and the caller is the only report left. */
     readonly loadOutcome: DiagramLoadOutcome;
+    /**
+     * How many edits the server has not answered yet, as
+     * {@link HydraniumGlspActionDispatcher.editsInFlight} counts them, for a
+     * page that asks before a reload drops one: the diagram's dirty state is
+     * set only once the server has answered. None after a failed load, or
+     * when the dispatcher is not the framework's. None once disposed either:
+     * the server drops the edits the ended session still had queued, though
+     * one it was handling still lands.
+     */
+    readonly editsInFlight: number;
+    /**
+     * Resolves to `true` once the edits in flight now have been answered or
+     * rejected, or to `false` once the dispatcher's bound has passed first, as
+     * {@link HydraniumGlspActionDispatcher.whenEditsSettled} does. `true` at
+     * once wherever {@link editsInFlight} reads none.
+     */
+    whenEditsSettled(): Promise<boolean>;
     /** Ends the client session on the server and stops watching the element;
      *  what is drawn in it is left to the host to remove. */
     dispose(): void;

package/lib/diagram-mount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diagram-mount.d.ts","sourceRoot":"","sources":["../src/diagram-mount.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAEJ,KAAK,sBAAsB,EAU7B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,UAAU,EAAwB,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACzF,OAAO,EAAE,SAAS,EAAmB,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,KAAK,kBAAkB,EAA0B,MAAM,kBAAkB,CAAC;AACnF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAKzD,4CAA4C;AAC5C,MAAM,WAAW,uBAAuB;IACrC;;;;0EAIsE;IACtE,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,6CAA6C;IAC7C,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,sCAAsC;IACtC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B;+DAC2D;IAC3D,QAAQ,CAAC,UAAU,EAAE,mBAAmB,CAAC;IACzC;;uEAEmE;IACnE,QAAQ,CAAC,0BAA0B,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,GAAG,aAAa,EAAE,sBAAsB,KAAK,SAAS,CAAC;IACnH,qEAAqE;IACrE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,wDAAwD;AACxD,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IACjD,4EAA4E;IAC5E,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B;;2DAEuD;IACvD,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAC;IACzC;6DACyD;IACzD,OAAO,IAAI,IAAI,CAAC;CAClB;AAED;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,KAAK,CAAC;AAEtC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAiElG"}
+{"version":3,"file":"diagram-mount.d.ts","sourceRoot":"","sources":["../src/diagram-mount.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAEJ,KAAK,sBAAsB,EAU7B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,UAAU,EAAwB,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACzF,OAAO,EAAE,SAAS,EAAmB,MAAM,WAAW,CAAC;AAEvD,OAAO,EAAE,KAAK,kBAAkB,EAA0B,MAAM,kBAAkB,CAAC;AACnF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAKzD,4CAA4C;AAC5C,MAAM,WAAW,uBAAuB;IACrC;;;;0EAIsE;IACtE,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,6CAA6C;IAC7C,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,sCAAsC;IACtC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B;+DAC2D;IAC3D,QAAQ,CAAC,UAAU,EAAE,mBAAmB,CAAC;IACzC;;uEAEmE;IACnE,QAAQ,CAAC,0BAA0B,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,GAAG,aAAa,EAAE,sBAAsB,KAAK,SAAS,CAAC;IACnH,qEAAqE;IACrE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,wDAAwD;AACxD,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IACjD,4EAA4E;IAC5E,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B;;2DAEuD;IACvD,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAC;IACzC;;;;;;;;OAQG;IACH,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B;;;;;OAKG;IACH,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IACrC;6DACyD;IACzD,OAAO,IAAI,IAAI,CAAC;CAClB;AAED;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,KAAK,CAAC;AAEtC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAkFlG"}

package/lib/diagram-mount.js

@@ -13,6 +13,7 @@ exports.mountGlspDiagram = mountGlspDiagram;
 const client_1 = require("@eclipse-glsp/client");
 const protocol_1 = require("@hydranium/protocol");
 const inversify_1 = require("inversify");
+const action_dispatcher_1 = require("./action-dispatcher");
 const diagram_loader_1 = require("./diagram-loader");
 const glsp_client_module_1 = require("./glsp-client-module");
 const touch_input_1 = require("./touch-input");
@@ -82,7 +83,7 @@ async function mountGlspDiagram(options) {
     // After the standalone modules, since every class the binder binds replaces
     // a token those modules bind.
     const hydraniumModule = new inversify_1.ContainerModule((bind, unbind, isBound, rebind) => {
-        (0, glsp_client_module_1.createGlspClientModule)({ bind, unbind, isBound, rebind }, { logger: options.logger });
+        (0, glsp_client_module_1.createGlspClientModule)({ bind, unbind, isBound, rebind }, { logger: options.logger, trackEditsInFlight: true });
     });
     const container = options.initializeDiagramContainer(new inversify_1.Container(), (0, client_1.createDiagramOptionsModule)(diagramOptions), client_1.STANDALONE_MODULE_CONFIG, hydraniumModule);
     // After the container is built rather than in a module, so the host's own
@@ -94,7 +95,21 @@ async function mountGlspDiagram(options) {
     // Pushed first, so it runs last: `unbindAll` reaches `disposeClientSession`
     // through the model source's pre-destroy hook, after the listeners are gone.
     toDispose.push({ dispose: () => container.unbindAll() });
-    const dispose = () => toDispose.dispose();
+    // Set once the mount loaded with the framework's dispatcher, until disposed.
+    let editsDispatcher;
+    const dispose = () => {
+        editsDispatcher = undefined;
+        toDispose.dispose();
+    };
+    const mountWith = (loadOutcome) => ({
+        container,
+        loadOutcome,
+        get editsInFlight() {
+            return editsDispatcher?.editsInFlight ?? 0;
+        },
+        whenEditsSettled: () => editsDispatcher?.whenEditsSettled() ?? Promise.resolve(true),
+        dispose
+    });
     try {
         const loader = container.get(client_1.DiagramLoader);
         await loader.load();
@@ -103,7 +118,7 @@ async function mountGlspDiagram(options) {
         // A model that never arrived has no use for the accommodations, and when
         // the dispatcher is what failed, every later dispatch rejects too.
         if (loadOutcome.status === 'failed') {
-            return { container, loadOutcome, dispose };
+            return mountWith(loadOutcome);
         }
         const dispatcher = container.get(client_1.TYPES.IActionDispatcher);
         // The bounds the fit measures come from the hidden rendering pass inside
@@ -118,7 +133,10 @@ async function mountGlspDiagram(options) {
         }
         toDispose.push(trackCanvasBounds(live, dispatcher, container.get(client_1.EditorContextService), container.get(types_1.HydraniumClientTypes.Logger)));
         toDispose.push((0, touch_input_1.enableTouchDragging)(live));
-        return { container, loadOutcome, dispose };
+        if (dispatcher instanceof action_dispatcher_1.HydraniumGlspActionDispatcher) {
+            editsDispatcher = dispatcher;
+        }
+        return mountWith(loadOutcome);
     }
     catch (err) {
         // The caller gets no mount to dispose, so the session would outlive it.

package/lib/diagram-mount.js.map

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

package/lib/glsp-client-module.d.ts

@@ -14,6 +14,11 @@ export interface GlspClientModuleOptions {
      *  binding the host made. Absent, the token keeps the host's own binding, or
      *  gets a `ConsoleLogger` when it has none. */
     readonly logger?: Logger;
+    /** Count the diagram edits the server has not answered yet, as
+     *  `HydraniumGlspActionDispatcher.editsInFlight`, for a host that reads the
+     *  count. Off by default: each edit then costs an extra request and its
+     *  answer. */
+    readonly trackEditsInFlight?: boolean;
 }
 /**
  * Binds the framework's client classes into a GLSP diagram container, whatever

package/lib/glsp-client-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-client-module.d.ts","sourceRoot":"","sources":["../src/glsp-client-module.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EACJ,KAAK,cAAc,EAOrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAA4C,KAAK,MAAM,EAAe,MAAM,qBAAqB,CAAC;AASzG,kDAAkD;AAClD,MAAM,WAAW,uBAAuB;IACrC;;mDAE+C;IAC/C,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,GAAE,uBAA4B,GAAG,IAAI,CAyB3G"}
+{"version":3,"file":"glsp-client-module.d.ts","sourceRoot":"","sources":["../src/glsp-client-module.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EACJ,KAAK,cAAc,EAOrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAA4C,KAAK,MAAM,EAAe,MAAM,qBAAqB,CAAC;AASzG,kDAAkD;AAClD,MAAM,WAAW,uBAAuB;IACrC;;mDAE+C;IAC/C,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB;;;kBAGc;IACd,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC;CACxC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,GAAE,uBAA4B,GAAG,IAAI,CA8B3G"}

package/lib/glsp-client-module.js

@@ -55,6 +55,9 @@ function createGlspClientModule(context, options = {}) {
         })
             .inSingletonScope();
     }
+    if (options.trackEditsInFlight !== undefined) {
+        (isBound(types_1.HydraniumClientTypes.TrackEditsInFlight) ? rebind : bind)(types_1.HydraniumClientTypes.TrackEditsInFlight).toConstantValue(options.trackEditsInFlight);
+    }
     bind(action_dispatcher_1.HydraniumGlspActionDispatcher).toSelf().inSingletonScope();
     rebind(client_1.GLSPActionDispatcher).toService(action_dispatcher_1.HydraniumGlspActionDispatcher);
     rebind(client_1.DiagramLoader).to(diagram_loader_1.HydraniumDiagramLoader).inSingletonScope();

package/lib/glsp-client-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-client-module.js","sourceRoot":"","sources":["../src/glsp-client-module.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AAElF,iDAQ8B;AAC9B,kDAAyG;AACzG,2DAAoE;AACpE,qDAA0D;AAC1D,mEAAuE;AACvE,mEAAuE;AACvE,qEAAgE;AAChE,qDAA0D;AAC1D,mCAA+C;AAU/C;;;;;;;;;;;;;;;;;GAiBG;AACH,gCAAuC,OAAuB,EAAE,OAAO,GAA4B,EAAE;IAClG,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC1C,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QAClB,CAAC,OAAO,CAAC,4BAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,4BAAoB,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACvH,CAAC;SAAM,IAAI,CAAC,OAAO,CAAC,4BAAoB,CAAC,MAAM,CAAC,EAAE,CAAC;QAChD,IAAI,CAAC,4BAAoB,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,IAAI,wBAAa,EAAE,CAAC,CAAC;IAC1E,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,4BAAoB,CAAC,MAAM,CAAC,EAAE,CAAC;QACzC,IAAI,CAAC,4BAAoB,CAAC,MAAM,CAAC;aAC7B,cAAc,CAAC,GAAG,CAAC,EAAE;YACnB,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAS,4BAAoB,CAAC,MAAM,CAAC,CAAC;YACtE,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,4BAAoB,CAAC,KAAK,CAAC;gBAC5D,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAQ,4BAAoB,CAAC,KAAK,CAAC;gBACtD,CAAC,CAAC,IAAI,sBAAW,EAAE,CAAC;YACvB,OAAO,IAAI,wBAAa,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC3C,CAAC,CAAC;aACD,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IACD,IAAI,CAAC,iDAA6B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAChE,MAAM,CAAC,6BAAoB,CAAC,CAAC,SAAS,CAAC,iDAA6B,CAAC,CAAC;IACtE,MAAM,CAAC,sBAAa,CAAC,CAAC,EAAE,CAAC,uCAAsB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpE,MAAM,CAAC,gCAAuB,CAAC,CAAC,EAAE,CAAC,oDAA4B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpF,MAAM,CAAC,sBAAa,CAAC,CAAC,EAAE,CAAC,uCAAsB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpE,MAAM,CAAC,kCAAyB,CAAC,CAAC,EAAE,CAAC,oDAA4B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtF,MAAM,CAAC,cAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,6CAAoB,CAAC,CAAC,gBAAgB,EAAE,CAAC;AACrE,CAAC"}
+{"version":3,"file":"glsp-client-module.js","sourceRoot":"","sources":["../src/glsp-client-module.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AAElF,iDAQ8B;AAC9B,kDAAyG;AACzG,2DAAoE;AACpE,qDAA0D;AAC1D,mEAAuE;AACvE,mEAAuE;AACvE,qEAAgE;AAChE,qDAA0D;AAC1D,mCAA+C;AAe/C;;;;;;;;;;;;;;;;;GAiBG;AACH,gCAAuC,OAAuB,EAAE,OAAO,GAA4B,EAAE;IAClG,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC1C,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QAClB,CAAC,OAAO,CAAC,4BAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,4BAAoB,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACvH,CAAC;SAAM,IAAI,CAAC,OAAO,CAAC,4BAAoB,CAAC,MAAM,CAAC,EAAE,CAAC;QAChD,IAAI,CAAC,4BAAoB,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,IAAI,wBAAa,EAAE,CAAC,CAAC;IAC1E,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,4BAAoB,CAAC,MAAM,CAAC,EAAE,CAAC;QACzC,IAAI,CAAC,4BAAoB,CAAC,MAAM,CAAC;aAC7B,cAAc,CAAC,GAAG,CAAC,EAAE;YACnB,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAS,4BAAoB,CAAC,MAAM,CAAC,CAAC;YACtE,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,4BAAoB,CAAC,KAAK,CAAC;gBAC5D,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAQ,4BAAoB,CAAC,KAAK,CAAC;gBACtD,CAAC,CAAC,IAAI,sBAAW,EAAE,CAAC;YACvB,OAAO,IAAI,wBAAa,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC3C,CAAC,CAAC;aACD,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IACD,IAAI,OAAO,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;QAC5C,CAAC,OAAO,CAAC,4BAAoB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,4BAAoB,CAAC,kBAAkB,CAAC,CAAC,eAAe,CACxH,OAAO,CAAC,kBAAkB,CAC5B,CAAC;IACL,CAAC;IACD,IAAI,CAAC,iDAA6B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAChE,MAAM,CAAC,6BAAoB,CAAC,CAAC,SAAS,CAAC,iDAA6B,CAAC,CAAC;IACtE,MAAM,CAAC,sBAAa,CAAC,CAAC,EAAE,CAAC,uCAAsB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpE,MAAM,CAAC,gCAAuB,CAAC,CAAC,EAAE,CAAC,oDAA4B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpF,MAAM,CAAC,sBAAa,CAAC,CAAC,EAAE,CAAC,uCAAsB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpE,MAAM,CAAC,kCAAyB,CAAC,CAAC,EAAE,CAAC,oDAA4B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtF,MAAM,CAAC,cAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,6CAAoB,CAAC,CAAC,gBAAgB,EAAE,CAAC;AACrE,CAAC"}

package/lib/types.d.ts

@@ -17,11 +17,13 @@ import type { interfaces } from 'inversify';
  * `Logger` and `Tracer` are required, so a host that binds neither fails at
  * resolution rather than running silent; `createGlspClientModule` binds
  * defaults for a host that passes none. `Clock` is optional: the classes fall
- * back to a `SystemClock`.
+ * back to a `SystemClock`. `TrackEditsInFlight` is optional too, and off
+ * unbound: `createGlspClientModule` binds it for a host that asks.
  */
 export declare const HydraniumClientTypes: {
     readonly Logger: interfaces.ServiceIdentifier<Logger>;
     readonly Tracer: interfaces.ServiceIdentifier<Tracer>;
     readonly Clock: interfaces.ServiceIdentifier<Clock>;
+    readonly TrackEditsInFlight: interfaces.ServiceIdentifier<boolean>;
 };
 //# sourceMappingURL=types.d.ts.map

package/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAQ5C;;;;;;;;;;GAUG;AACH,eAAO,MAAM,oBAAoB;aAC9B,MAAM;aACN,MAAM;aACN,KAAK;CACE,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAQ5C;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,oBAAoB;aAC9B,MAAM;aACN,MAAM;aACN,KAAK;aACL,kBAAkB;CACX,CAAC"}

package/lib/types.js

@@ -23,11 +23,13 @@ function serviceIdentifier(description) {
  * `Logger` and `Tracer` are required, so a host that binds neither fails at
  * resolution rather than running silent; `createGlspClientModule` binds
  * defaults for a host that passes none. `Clock` is optional: the classes fall
- * back to a `SystemClock`.
+ * back to a `SystemClock`. `TrackEditsInFlight` is optional too, and off
+ * unbound: `createGlspClientModule` binds it for a host that asks.
  */
 exports.HydraniumClientTypes = {
     Logger: serviceIdentifier('HydraniumClientLogger'),
     Tracer: serviceIdentifier('HydraniumClientTracer'),
-    Clock: serviceIdentifier('HydraniumClientClock')
+    Clock: serviceIdentifier('HydraniumClientClock'),
+    TrackEditsInFlight: serviceIdentifier('HydraniumClientTrackEditsInFlight')
 };
 //# sourceMappingURL=types.js.map

package/lib/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AAKlF;gEACgE;AAChE,SAAS,iBAAiB,CAAI,WAAmB;IAC9C,OAAO,MAAM,CAAC,WAAW,CAAoC,CAAC;AACjE,CAAC;AAED;;;;;;;;;;GAUG;AACU,QAAA,oBAAoB,GAAG;IACjC,MAAM,EAAE,iBAAiB,CAAS,uBAAuB,CAAC;IAC1D,MAAM,EAAE,iBAAiB,CAAS,uBAAuB,CAAC;IAC1D,KAAK,EAAE,iBAAiB,CAAQ,sBAAsB,CAAC;CAChD,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AAKlF;gEACgE;AAChE,SAAS,iBAAiB,CAAI,WAAmB;IAC9C,OAAO,MAAM,CAAC,WAAW,CAAoC,CAAC;AACjE,CAAC;AAED;;;;;;;;;;;GAWG;AACU,QAAA,oBAAoB,GAAG;IACjC,MAAM,EAAE,iBAAiB,CAAS,uBAAuB,CAAC;IAC1D,MAAM,EAAE,iBAAiB,CAAS,uBAAuB,CAAC;IAC1D,KAAK,EAAE,iBAAiB,CAAQ,sBAAsB,CAAC;IACvD,kBAAkB,EAAE,iBAAiB,CAAU,mCAAmC,CAAC;CAC5E,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydranium/glsp-client",
-  "version": "1.0.0-next.327",
+  "version": "1.0.0-next.328",
   "description": "Host-neutral client classes for GLSP heads built on @hydranium/glsp-server, the binder that mounts them in a Theia frontend, a VS Code webview or a plain browser page, the one call that mounts a diagram in a page, and the edge whose labels keep finite bounds without bendpoints.",
   "keywords": [
     "diagram",
@@ -59,7 +59,7 @@
   },
   "devDependencies": {
     "@eclipse-glsp/client": "2.7.0",
-    "@hydranium/protocol": "1.0.0-next.327",
+    "@hydranium/protocol": "1.0.0-next.328",
     "@types/node": "^22.0.0",
     "inversify": "6.2.2",
     "reflect-metadata": "0.2.2",
@@ -69,7 +69,7 @@
   },
   "peerDependencies": {
     "@eclipse-glsp/client": "^2.6.0",
-    "@hydranium/protocol": "1.0.0-next.327",
+    "@hydranium/protocol": "1.0.0-next.328",
     "inversify": "^6.0.0",
     "snabbdom": "^3.5.1"
   },

package/src/action-dispatcher.ts

@@ -15,6 +15,8 @@ import {
    GLSPModelSource,
    LocalComputedBoundsAction,
    MessageAction,
+   Operation,
+   RedoAction,
    RejectAction,
    RequestAction,
    RequestBoundsAction,
@@ -30,9 +32,20 @@ import {
    SetModelAction,
    SetTypeHintsAction,
    StatusAction,
+   UndoAction,
    UpdateModelAction
 } from '@eclipse-glsp/client';
-import { type Clock, type Logger, type Stopwatch, SystemClock, type Tracer } from '@hydranium/protocol';
+import {
+   type Clock,
+   Deferred,
+   type Logger,
+   PendingWorkTracker,
+   RequestEditsSettledAction,
+   type Stopwatch,
+   SystemClock,
+   TIMED_OUT,
+   type Tracer
+} from '@hydranium/protocol';
 import { inject, injectable, optional, unmanaged } from 'inversify';
 import { HydraniumClientTypes } from './types';
 
@@ -90,6 +103,17 @@ export interface HydraniumGlspActionDispatcherOptions {
  * kind the protocol defines. Adopters with custom kinds either pass
  * `extraLoggedKinds` / `extraKindPairs` to the constructor (via a
  * `toDynamicValue` binding) or subclass and override.
+ *
+ * Where the host asks for it, it also counts the edits it sends that the server
+ * has not answered yet, as {@link editsInFlight}, so a page can ask before a
+ * reload drops one. The dirty state cannot say this: the server sets it only
+ * once it has answered, and an edit that changed nothing is answered with
+ * nothing at all. Each edit is followed by a {@link RequestEditsSettledAction},
+ * which the server answers after it, and counts until that request or a later
+ * one is answered or rejected: the server handles them in order. With no
+ * answer, as when the connection is lost, the count stays, so a guard asks
+ * rather than loses the edit. An action from the server is not counted, nor
+ * is anything on a server that serves no settle request.
  */
 @injectable()
 export class HydraniumGlspActionDispatcher extends GLSPActionDispatcher {
@@ -97,11 +121,27 @@ export class HydraniumGlspActionDispatcher extends GLSPActionDispatcher {
    @inject(HydraniumClientTypes.Tracer) protected readonly tracer!: Tracer;
    /** Times each request to its response: the diagram container's {@link Clock}, or a `SystemClock`. */
    @inject(HydraniumClientTypes.Clock) @optional() protected readonly clock: Clock = new SystemClock();
+   /** Whether to count edits in flight; the host asks for it through `createGlspClientModule`. */
+   @inject(HydraniumClientTypes.TrackEditsInFlight) @optional() protected readonly trackEditsInFlight: boolean = false;
 
    protected readonly loggedKinds: ReadonlySet<string>;
    protected readonly kindPairs: ReadonlyMap<string, string>;
    protected readonly kindPairsReverse: ReadonlyMap<string, string>;
 
+   /** Per edit sent, until its {@link RequestEditsSettledAction} or a later one is answered or rejected. */
+   protected readonly pendingEdits = new PendingWorkTracker();
+   /** The edits in flight by the number of their settle request, in send order. */
+   protected readonly editsBySettle = new Map<number, Deferred>();
+   protected settlesSent = 0;
+   /**
+    * How long {@link whenEditsSettled} waits before going on anyway: well past
+    * the server's bounded waits on one settle together. Its handling of the
+    * edits before has no bound, so a server slower than that is taken as lost.
+    */
+   protected readonly settleEditsMs: number = 30_000;
+   /** The postponed actions a lifted block is dispatching a second time, counted when first sent. */
+   protected redispatched: ReadonlySet<Action> | undefined;
+
    protected pairCounter = 0;
    /** Pending requests keyed by requestId (for actions that carry one). */
    protected pendingById = new Map<string, { id: number; sinceRequest: Stopwatch }>();
@@ -146,11 +186,87 @@ export class HydraniumGlspActionDispatcher extends GLSPActionDispatcher {
       }
    }
 
+   /** How many edits the server has not answered yet; see {@link isEdit}. */
+   get editsInFlight(): number {
+      return this.pendingEdits.size;
+   }
+
+   /**
+    * Resolves to `true` once the edits in flight now have been answered or
+    * rejected, or to `false` once {@link settleEditsMs} has passed first. An
+    * edit sent while it waits is not waited for. Never rejects. For a save or a
+    * switch that must not run ahead of an edit the server has not answered.
+    */
+   async whenEditsSettled(): Promise<boolean> {
+      if (this.pendingEdits.isIdle) {
+         return true;
+      }
+      return (await this.clock.raceTimer(this.pendingEdits.whenSettled(), this.settleEditsMs)) !== TIMED_OUT;
+   }
+
    override dispatch(action: Action): Promise<void> {
       if (this.loggedKinds.has(action.kind)) {
          this.logAction(action);
       }
-      return super.dispatch(action);
+      const dispatched = super.dispatch(action);
+      this.trackEdit(action);
+      return dispatched;
+   }
+
+   protected override handleBlocked(action: Action, predicate: (action: Action) => boolean): Promise<void> {
+      if (!predicate(action)) {
+         return super.handleBlocked(action, predicate);
+      }
+      // A lifted block dispatches what it postponed again, within this call.
+      this.redispatched = new Set(this.postponedActions.map(postponed => postponed.action));
+      try {
+         return super.handleBlocked(action, predicate);
+      } finally {
+         this.redispatched = undefined;
+      }
+   }
+
+   /** Whether `action` changes the model on the server: an operation, an undo or a redo. Widen it for an edit kind of your own. */
+   protected isEdit(action: Action): boolean {
+      return Operation.is(action) || UndoAction.is(action) || RedoAction.is(action);
+   }
+
+   /**
+    * Count `action` if it is an edit the client sends, even one whose dispatch
+    * failed, since it may have reached the server. One dispatched again counts
+    * again, except where a lifted block dispatches what it postponed.
+    */
+   protected trackEdit(action: Action): void {
+      if (
+         !this.trackEditsInFlight ||
+         ServerAction.is(action) ||
+         !this.isEdit(action) ||
+         this.redispatched?.has(action) ||
+         !this.hasHandler({ kind: RequestEditsSettledAction.KIND })
+      ) {
+         return;
+      }
+      const settle = ++this.settlesSent;
+      const edit = new Deferred();
+      this.editsBySettle.set(settle, edit);
+      void this.pendingEdits.track(edit.promise);
+      const answered = (): void => this.endEditsThrough(settle);
+      this.request(RequestEditsSettledAction.create()).then(answered, answered);
+   }
+
+   /**
+    * End every edit up to the `settle`th: the server handles a client's actions
+    * in order, so its answer covers the edits before it, one whose own settle
+    * was lost included.
+    */
+   protected endEditsThrough(settle: number): void {
+      for (const [sent, edit] of this.editsBySettle) {
+         if (sent > settle) {
+            break;
+         }
+         edit.resolve();
+         this.editsBySettle.delete(sent);
+      }
    }
 
    protected logAction(action: Action): void {

package/src/diagram-mount.ts

@@ -22,6 +22,7 @@ import {
 } from '@eclipse-glsp/client';
 import { type Disposable, DisposableCollection, type Logger } from '@hydranium/protocol';
 import { Container, ContainerModule } from 'inversify';
+import { HydraniumGlspActionDispatcher } from './action-dispatcher';
 import { type DiagramLoadOutcome, HydraniumDiagramLoader } from './diagram-loader';
 import type { HydraniumGlspClient } from './glsp-client';
 import { createGlspClientModule } from './glsp-client-module';
@@ -59,6 +60,23 @@ export interface GlspDiagramMount extends Disposable {
     *  the caller learns of it; when the failure is not `surfaced`, no overlay
     *  shows it and the caller is the only report left. */
    readonly loadOutcome: DiagramLoadOutcome;
+   /**
+    * How many edits the server has not answered yet, as
+    * {@link HydraniumGlspActionDispatcher.editsInFlight} counts them, for a
+    * page that asks before a reload drops one: the diagram's dirty state is
+    * set only once the server has answered. None after a failed load, or
+    * when the dispatcher is not the framework's. None once disposed either:
+    * the server drops the edits the ended session still had queued, though
+    * one it was handling still lands.
+    */
+   readonly editsInFlight: number;
+   /**
+    * Resolves to `true` once the edits in flight now have been answered or
+    * rejected, or to `false` once the dispatcher's bound has passed first, as
+    * {@link HydraniumGlspActionDispatcher.whenEditsSettled} does. `true` at
+    * once wherever {@link editsInFlight} reads none.
+    */
+   whenEditsSettled(): Promise<boolean>;
    /** Ends the client session on the server and stops watching the element;
     *  what is drawn in it is left to the host to remove. */
    dispose(): void;
@@ -130,7 +148,7 @@ export async function mountGlspDiagram(options: GlspDiagramMountOptions): Promis
    // After the standalone modules, since every class the binder binds replaces
    // a token those modules bind.
    const hydraniumModule = new ContainerModule((bind, unbind, isBound, rebind) => {
-      createGlspClientModule({ bind, unbind, isBound, rebind }, { logger: options.logger });
+      createGlspClientModule({ bind, unbind, isBound, rebind }, { logger: options.logger, trackEditsInFlight: true });
    });
    const container = options.initializeDiagramContainer(
       new Container(),
@@ -148,7 +166,21 @@ export async function mountGlspDiagram(options: GlspDiagramMountOptions): Promis
    // Pushed first, so it runs last: `unbindAll` reaches `disposeClientSession`
    // through the model source's pre-destroy hook, after the listeners are gone.
    toDispose.push({ dispose: () => container.unbindAll() });
-   const dispose = (): void => toDispose.dispose();
+   // Set once the mount loaded with the framework's dispatcher, until disposed.
+   let editsDispatcher: HydraniumGlspActionDispatcher | undefined;
+   const dispose = (): void => {
+      editsDispatcher = undefined;
+      toDispose.dispose();
+   };
+   const mountWith = (loadOutcome: DiagramLoadOutcome): GlspDiagramMount => ({
+      container,
+      loadOutcome,
+      get editsInFlight() {
+         return editsDispatcher?.editsInFlight ?? 0;
+      },
+      whenEditsSettled: () => editsDispatcher?.whenEditsSettled() ?? Promise.resolve(true),
+      dispose
+   });
    try {
       const loader = container.get(DiagramLoader);
       await loader.load();
@@ -157,7 +189,7 @@ export async function mountGlspDiagram(options: GlspDiagramMountOptions): Promis
       // A model that never arrived has no use for the accommodations, and when
       // the dispatcher is what failed, every later dispatch rejects too.
       if (loadOutcome.status === 'failed') {
-         return { container, loadOutcome, dispose };
+         return mountWith(loadOutcome);
       }
       const dispatcher = container.get<GLSPActionDispatcher>(TYPES.IActionDispatcher);
       // The bounds the fit measures come from the hidden rendering pass inside
@@ -175,7 +207,10 @@ export async function mountGlspDiagram(options: GlspDiagramMountOptions): Promis
          trackCanvasBounds(live, dispatcher, container.get(EditorContextService), container.get<Logger>(HydraniumClientTypes.Logger))
       );
       toDispose.push(enableTouchDragging(live));
-      return { container, loadOutcome, dispose };
+      if (dispatcher instanceof HydraniumGlspActionDispatcher) {
+         editsDispatcher = dispatcher;
+      }
+      return mountWith(loadOutcome);
    } catch (err: unknown) {
       // The caller gets no mount to dispose, so the session would outlive it.
       toDispose.dispose();

package/src/glsp-client-module.ts

@@ -31,6 +31,11 @@ export interface GlspClientModuleOptions {
     *  binding the host made. Absent, the token keeps the host's own binding, or
     *  gets a `ConsoleLogger` when it has none. */
    readonly logger?: Logger;
+   /** Count the diagram edits the server has not answered yet, as
+    *  `HydraniumGlspActionDispatcher.editsInFlight`, for a host that reads the
+    *  count. Off by default: each edit then costs an extra request and its
+    *  answer. */
+   readonly trackEditsInFlight?: boolean;
 }
 
 /**
@@ -69,6 +74,11 @@ export function createGlspClientModule(context: BindingContext, options: GlspCli
          })
          .inSingletonScope();
    }
+   if (options.trackEditsInFlight !== undefined) {
+      (isBound(HydraniumClientTypes.TrackEditsInFlight) ? rebind : bind)(HydraniumClientTypes.TrackEditsInFlight).toConstantValue(
+         options.trackEditsInFlight
+      );
+   }
    bind(HydraniumGlspActionDispatcher).toSelf().inSingletonScope();
    rebind(GLSPActionDispatcher).toService(HydraniumGlspActionDispatcher);
    rebind(DiagramLoader).to(HydraniumDiagramLoader).inSingletonScope();

package/src/types.ts

@@ -25,10 +25,12 @@ function serviceIdentifier<T>(description: string): interfaces.ServiceIdentifier
  * `Logger` and `Tracer` are required, so a host that binds neither fails at
  * resolution rather than running silent; `createGlspClientModule` binds
  * defaults for a host that passes none. `Clock` is optional: the classes fall
- * back to a `SystemClock`.
+ * back to a `SystemClock`. `TrackEditsInFlight` is optional too, and off
+ * unbound: `createGlspClientModule` binds it for a host that asks.
  */
 export const HydraniumClientTypes = {
    Logger: serviceIdentifier<Logger>('HydraniumClientLogger'),
    Tracer: serviceIdentifier<Tracer>('HydraniumClientTracer'),
-   Clock: serviceIdentifier<Clock>('HydraniumClientClock')
+   Clock: serviceIdentifier<Clock>('HydraniumClientClock'),
+   TrackEditsInFlight: serviceIdentifier<boolean>('HydraniumClientTrackEditsInFlight')
 } as const;