@hydranium/glsp-server 1.0.0-next.316 → 1.0.0-next.318

package/lib/state/reconciling-multi-document-glsp-state.d.ts

@@ -9,7 +9,7 @@
 import { type JsonModelState } from '@eclipse-glsp/server';
 import { type AstNode } from '@hydranium/langium';
 import { type ClientSession } from '@hydranium/core';
-import { type BaseVersion, type ModelVersion, type TextVersion, type TransferElement, type VersionedModel } from '@hydranium/protocol';
+import { type BaseVersion, type ModelVersion, type TextVersion, type TransferElement, type TransferTypeFor, type VersionedModel } from '@hydranium/protocol';
 import { AbstractHydraniumGlspState } from './abstract-hydranium-glsp-state.js';
 import { type OperationTransition } from '../command/hydranium-glsp-operation-command.js';
 /**
@@ -62,14 +62,19 @@ export interface VersionedMultiDocumentSourceModel<TPrimary extends TransferElem
  * 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}.
+ *
+ * `TTransferMap` is the transfer model's `$type` → interface map, the generated
+ * `<LanguageId>TransferTypes`; the primary's projection is typed through it.
  */
-export declare class ReconcilingMultiDocumentGlspState<TRoot extends AstNode, TPrimary extends TransferElement = TransferElement> extends AbstractHydraniumGlspState<TRoot, MultiDocumentSourceModel<TPrimary>> implements JsonModelState<MultiDocumentSourceModel<TPrimary>> {
+export declare class ReconcilingMultiDocumentGlspState<TRoot extends AstNode, TTransferMap extends {
+    [K in keyof TTransferMap]: TransferElement;
+} = Record<string, TransferElement>> extends AbstractHydraniumGlspState<TRoot, MultiDocumentSourceModel<TransferTypeFor<TRoot, TTransferMap>>> implements JsonModelState<MultiDocumentSourceModel<TransferTypeFor<TRoot, TTransferMap>>> {
     /**
      * 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.
      */
-    protected base: MultiDocumentSourceModel<TPrimary>;
+    protected base: MultiDocumentSourceModel<TransferTypeFor<TRoot, TTransferMap>>;
     /** The documents {@link createSecondaryDocument} created for the {@link persist} under way, with the version each was created at. */
     protected readonly createdForWrite: Map<string, number>;
     /**
@@ -83,14 +88,14 @@ export declare class ReconcilingMultiDocumentGlspState<TRoot extends AstNode, TP
      * document, whereas an explicit `undefined` would diff as a removal and
      * persist as a deletion of content the state simply could not see.
      */
-    get sourceModel(): MultiDocumentSourceModel<TPrimary>;
+    get sourceModel(): MultiDocumentSourceModel<TransferTypeFor<TRoot, TTransferMap>>;
     protected captureSourceRoot(uri: string, root: TRoot): void;
     /**
      * 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.
      */
-    normalizeTransition(transition: OperationTransition<MultiDocumentSourceModel<TPrimary>>): Promise<OperationTransition<MultiDocumentSourceModel<TPrimary>>>;
+    normalizeTransition(transition: OperationTransition<MultiDocumentSourceModel<TransferTypeFor<TRoot, TTransferMap>>>): Promise<OperationTransition<MultiDocumentSourceModel<TransferTypeFor<TRoot, TTransferMap>>>>;
     /**
      * Also takes a secondary first tracked during an operation into the base
      * and into the operation's projection from before its command, both from
@@ -129,7 +134,7 @@ export declare class ReconcilingMultiDocumentGlspState<TRoot extends AstNode, TP
      * policy exactly as the single-document state does — the orchestration is
      * shared.
      */
-    updateSourceModel(model: MultiDocumentSourceModel<TPrimary>, baseVersion?: BaseVersion): Promise<void>;
+    updateSourceModel(model: MultiDocumentSourceModel<TransferTypeFor<TRoot, TTransferMap>>, baseVersion?: BaseVersion): Promise<void>;
     /**
      * Write hook — every document of `model` that changed, opened first through
      * {@link openForWrite}, in one `updateAll` on the diagram's session: the
@@ -145,7 +150,7 @@ export declare class ReconcilingMultiDocumentGlspState<TRoot extends AstNode, TP
      * A write that fails closes every document {@link createSecondaryDocument}
      * created for it that {@link closesCreatedDocument} accepts.
      */
-    protected persist(model: MultiDocumentSourceModel<TPrimary>, baseVersion: BaseVersion, secondaryVersions?: Readonly<Record<string, ModelVersion>>): Promise<{
+    protected persist(model: MultiDocumentSourceModel<TransferTypeFor<TRoot, TTransferMap>>, baseVersion: BaseVersion, secondaryVersions?: Readonly<Record<string, ModelVersion>>): Promise<{
         root: TRoot;
     }>;
     /**
@@ -207,14 +212,18 @@ export declare class ReconcilingMultiDocumentGlspState<TRoot extends AstNode, TP
      * since a reconcile without it has nothing to merge into; an unreadable
      * secondary is omitted the same way {@link sourceModel} omits one.
      */
-    protected refetch(): Promise<VersionedMultiDocumentSourceModel<TPrimary> | undefined>;
+    protected refetch(): Promise<VersionedMultiDocumentSourceModel<TransferTypeFor<TRoot, TTransferMap>> | undefined>;
     /**
      * 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.
      */
     protected projectDocument(uri: string): TransferElement | undefined;
-    /** Grammar-mode transfer projection of one AST root. The single projection seam. */
-    protected projectRoot<T extends TransferElement = TransferElement>(root: AstNode): T;
+    /**
+     * Grammar-mode transfer projection of one AST root. The single projection
+     * seam. The encoder slot answers the structural base, so the map's type is
+     * asserted here, once.
+     */
+    protected projectRoot<T extends AstNode>(root: T): TransferTypeFor<T, TTransferMap>;
 }
 //# sourceMappingURL=reconciling-multi-document-glsp-state.d.ts.map

package/lib/state/reconciling-multi-document-glsp-state.d.ts.map

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

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

@@ -47,6 +47,9 @@ import { reconcileSourceModelWrite } from './reconcile-source-model-write.js';
  * 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}.
+ *
+ * `TTransferMap` is the transfer model's `$type` → interface map, the generated
+ * `<LanguageId>TransferTypes`; the primary's projection is typed through it.
  */
 let ReconcilingMultiDocumentGlspState = class ReconcilingMultiDocumentGlspState extends AbstractHydraniumGlspState {
     /**
@@ -92,8 +95,8 @@ let ReconcilingMultiDocumentGlspState = class ReconcilingMultiDocumentGlspState
         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));
+            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])) {
@@ -349,7 +352,11 @@ let ReconcilingMultiDocumentGlspState = class ReconcilingMultiDocumentGlspState
             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. */
+    /**
+     * Grammar-mode transfer projection of one AST root. The single projection
+     * seam. The encoder slot answers the structural base, so the map's type is
+     * asserted here, once.
+     */
     projectRoot(root) {
         return this.sharedServices.model.TransferEncoder.toTransfer(root, 'grammar');
     }

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,7 @@
  ********************************************************************************/
 import { type JsonModelState } from '@eclipse-glsp/server';
 import { type AstNode } from '@hydranium/langium';
-import { type BaseVersion, type TransferElement, type VersionedModel } from '@hydranium/protocol';
+import { type BaseVersion, type TransferElement, type TransferTypeFor, type VersionedModel } from '@hydranium/protocol';
 import { type OperationTransition } from '../command/hydranium-glsp-operation-command.js';
 import { AbstractHydraniumGlspState } from './abstract-hydranium-glsp-state.js';
 /**
@@ -42,12 +42,14 @@ import { AbstractHydraniumGlspState } from './abstract-hydranium-glsp-state.js';
  * the base's injected `conflictResolver`; this class owns the forward-write
  * *orchestration* that consults it.
  */
-export declare class ReconcilingTransferHydraniumGlspState<TRoot extends AstNode, TSourceModel extends TransferElement> extends AbstractHydraniumGlspState<TRoot, TSourceModel> implements JsonModelState<TSourceModel> {
+export declare class ReconcilingTransferHydraniumGlspState<TRoot extends AstNode, TTransferMap extends {
+    [K in keyof TTransferMap]: TransferElement;
+} = Record<string, TransferElement>> extends AbstractHydraniumGlspState<TRoot, TransferTypeFor<TRoot, TTransferMap>> implements JsonModelState<TransferTypeFor<TRoot, TTransferMap>> {
     /**
      * The projection a forward-write conflict reconciles the user's intent
      * from, taken from the built root on every capture.
      */
-    protected base: TSourceModel;
+    protected base: TransferTypeFor<TRoot, TTransferMap>;
     /**
      * Persisted-shape projection of the current source root, consumed by GLSP's
      * {@link JsonModelState} read side and recorded for field-level undo / redo.
@@ -56,14 +58,14 @@ export declare class ReconcilingTransferHydraniumGlspState<TRoot extends AstNode
      * properties excluded), so the diff reflects only authored state.
      * Synchronous — the encoder walks the in-memory AST without serialising.
      */
-    get sourceModel(): TSourceModel;
+    get sourceModel(): TransferTypeFor<TRoot, TTransferMap>;
     /**
      * 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;
+    protected projectRoot(root: AstNode): TransferTypeFor<TRoot, TTransferMap>;
     /** Both ends serialized for the source document and parsed back, unless they are equal. */
-    normalizeTransition(transition: OperationTransition<TSourceModel>): Promise<OperationTransition<TSourceModel>>;
+    normalizeTransition(transition: OperationTransition<TransferTypeFor<TRoot, TTransferMap>>): Promise<OperationTransition<TransferTypeFor<TRoot, TTransferMap>>>;
     protected captureSourceRoot(uri: string, root: TRoot): void;
     /**
      * Persist `model` back to the document store, then capture the resulting
@@ -73,7 +75,7 @@ export declare class ReconcilingTransferHydraniumGlspState<TRoot extends AstNode
      * (force = last-writer-wins, reconciling = field-level merge) shared with
      * undo / redo.
      */
-    updateSourceModel(model: TSourceModel, baseVersion?: BaseVersion): Promise<void>;
+    updateSourceModel(model: TransferTypeFor<TRoot, TTransferMap>, baseVersion?: BaseVersion): Promise<void>;
     /**
      * Persist hook — the only write-side I/O. Default routes the structured
      * model through the diagram session's `update` (serialize → reparse),
@@ -83,7 +85,7 @@ export declare class ReconcilingTransferHydraniumGlspState<TRoot extends AstNode
      * alongside so undo compares what this writes; the orchestration in
      * {@link updateSourceModel} is unchanged.
      */
-    protected persist(model: TSourceModel, baseVersion: BaseVersion): Promise<{
+    protected persist(model: TransferTypeFor<TRoot, TTransferMap>, baseVersion: BaseVersion): Promise<{
         root: TRoot;
     }>;
     /**
@@ -94,6 +96,6 @@ export declare class ReconcilingTransferHydraniumGlspState<TRoot extends AstNode
      * + the framework encoder's `'grammar'` mode; adopters override alongside
      * {@link persist}.
      */
-    protected refetch(): Promise<VersionedModel<TSourceModel> | undefined>;
+    protected refetch(): Promise<VersionedModel<TransferTypeFor<TRoot, TTransferMap>> | 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,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"}
+{"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,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACxH,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AAC1F,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAGhF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,qBACa,qCAAqC,CAC/C,KAAK,SAAS,OAAO,EACrB,YAAY,SAAS;KAAG,CAAC,IAAI,MAAM,YAAY,GAAG,eAAe;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAErG,SAAQ,0BAA0B,CAAC,KAAK,EAAE,eAAe,CAAC,KAAK,EAAE,YAAY,CAAC,CAC9E,YAAW,cAAc,CAAC,eAAe,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAE/D;;;OAGG;IACH,SAAS,CAAC,IAAI,EAAG,eAAe,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAEtD;;;;;;;OAOG;IACH,IAAI,WAAW,IAAI,eAAe,CAAC,KAAK,EAAE,YAAY,CAAC,CAEtD;IAED;;;OAGG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,GAAG,eAAe,CAAC,KAAK,EAAE,YAAY,CAAC,CAEzE;IAED,2FAA2F;IAC5E,mBAAmB,CAC/B,UAAU,EAAE,mBAAmB,CAAC,eAAe,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,GACrE,OAAO,CAAC,mBAAmB,CAAC,eAAe,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,CAQpE;IAED,UAAmB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,IAAI,CAGnE;IAED;;;;;;;OAOG;IACG,iBAAiB,CAAC,KAAK,EAAE,eAAe,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,WAAW,GAAE,WAA8B,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB/H;IAED;;;;;;;;OAQG;IACH,UAAgB,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,KAAK,CAAA;KAAE,CAAC,CAGvH;IAED;;;;;;;OAOG;IACH,UAAgB,OAAO,IAAI,OAAO,CAAC,cAAc,CAAC,eAAe,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,GAAG,SAAS,CAAC,CAQnG;CACH"}

package/lib/state/reconciling-transfer-hydranium-glsp-state.js.map

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

package/lib/submission/hydranium-glsp-submission-handler.d.ts

@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
-import { type Action, type DirtyStateChangeReason, type GModelRootSchema, type LayoutOperation, ModelSubmissionHandler, type ModelValidator, type SetModelAction } from '@eclipse-glsp/server';
+import { type Action, ClientSessionManager, type DirtyStateChangeReason, type GModelRootSchema, type LayoutOperation, ModelSubmissionHandler, type ModelValidator, type SetModelAction } from '@eclipse-glsp/server';
 import { type AstNode, type DocumentState } from '@hydranium/langium';
 import { type AbstractHydraniumGlspState } from '../state/abstract-hydranium-glsp-state.js';
 /**
@@ -40,6 +40,7 @@ import { type AbstractHydraniumGlspState } from '../state/abstract-hydranium-gls
  */
 export declare class HydraniumGlspSubmissionHandler<TRoot extends AstNode, TSourceModel = string> extends ModelSubmissionHandler {
     protected modelState: AbstractHydraniumGlspState<TRoot, TSourceModel>;
+    protected readonly sessionManager: ClientSessionManager;
     /**
      * Document-state gate awaited before {@link submitModel} delegates to
      * `super.submitModel`. Default {@link IntegrityService.SettledState} so the
@@ -109,8 +110,18 @@ export declare class HydraniumGlspSubmissionHandler<TRoot extends AstNode, TSour
      * Never rejects: GLSP runs it from a debounce that drops the result, so a
      * failure here would go unhandled. A validator that throws is logged as an
      * error, markers that cannot be sent as a warning.
+     *
+     * GLSP does not cancel that debounce when the session ends, so it also runs
+     * for a diagram just closed: that run is skipped, and markers it could not
+     * send because the session ended meanwhile are logged for diagnosis only.
      */
     protected performLiveValidation(validator: ModelValidator): Promise<void>;
+    /**
+     * Whether the client session this handler serves has ended. By its
+     * dispatcher rather than its id: a client that reopens a diagram under the
+     * same id gets a new session, which this handler does not serve.
+     */
+    protected sessionEnded(): boolean;
     /**
      * Serialise the model-bearing actions of a submission into a comparable
      * signature.

package/lib/submission/hydranium-glsp-submission-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hydranium-glsp-submission-handler.d.ts","sourceRoot":"","sources":["../../src/submission/hydranium-glsp-submission-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EACJ,KAAK,MAAM,EACX,KAAK,sBAAsB,EAC3B,KAAK,gBAAgB,EACrB,KAAK,eAAe,EAGpB,sBAAsB,EACtB,KAAK,cAAc,EAGnB,KAAK,cAAc,EACrB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEtE,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAG5F;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,qBACa,8BAA8B,CAAC,KAAK,SAAS,OAAO,EAAE,YAAY,GAAG,MAAM,CAAE,SAAQ,sBAAsB;IACrH,UAAsC,UAAU,EAAE,0BAA0B,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAElG;;;;;;OAMG;IACH,SAAS,CAAC,UAAU,EAAE,aAAa,GAAG,SAAS,CAAiC;IAEhF;;;;;;;;;OASG;IACH,wBAAwB,IAAI,OAAO,CAElC;IAEc,WAAW,CAAC,MAAM,CAAC,EAAE,sBAAsB,EAAE,MAAM,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAqBvG;IAED;;;;;;;;OAQG;IACH,IAAI,sBAAsB,IAAI,MAAM,GAAG,SAAS,CAE/C;IAED,SAAS,CAAC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAE3C,mEAAmE;IACnE,SAAS,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAEzC;;;;OAIG;IACH,IAAI,kBAAkB,IAAI,MAAM,CAE/B;IAED,SAAS,CAAC,mBAAmB,SAAK;IAElC,wDAAwD;IACxD,SAAS,CAAC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAE3C,oDAAoD;IACpD,SAAS,CAAC,kBAAkB,CAAC,EAAE;QAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAE3F;;;;;;;;;;;;OAYG;IACH,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAY/C;IAED;;;;;;;;OAQG;IACH,UAAyB,qBAAqB,CAAC,SAAS,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAcvF;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,CAK/C;IAED;;;;OAIG;IACH,UAAmB,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,GAAG,cAAc,CAMhF;IAED,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,sBAAsB,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAUvF;IAED;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,MAAM,CAE1D;CACH"}
+{"version":3,"file":"hydranium-glsp-submission-handler.d.ts","sourceRoot":"","sources":["../../src/submission/hydranium-glsp-submission-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EACJ,KAAK,MAAM,EACX,oBAAoB,EACpB,KAAK,sBAAsB,EAC3B,KAAK,gBAAgB,EACrB,KAAK,eAAe,EAGpB,sBAAsB,EACtB,KAAK,cAAc,EAGnB,KAAK,cAAc,EACrB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEtE,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAG5F;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,qBACa,8BAA8B,CAAC,KAAK,SAAS,OAAO,EAAE,YAAY,GAAG,MAAM,CAAE,SAAQ,sBAAsB;IACrH,UAAsC,UAAU,EAAE,0BAA0B,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IACpE,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAG,oBAAoB,CAAC;IAEvF;;;;;;OAMG;IACH,SAAS,CAAC,UAAU,EAAE,aAAa,GAAG,SAAS,CAAiC;IAEhF;;;;;;;;;OASG;IACH,wBAAwB,IAAI,OAAO,CAElC;IAEc,WAAW,CAAC,MAAM,CAAC,EAAE,sBAAsB,EAAE,MAAM,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAqBvG;IAED;;;;;;;;OAQG;IACH,IAAI,sBAAsB,IAAI,MAAM,GAAG,SAAS,CAE/C;IAED,SAAS,CAAC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAE3C,mEAAmE;IACnE,SAAS,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAEzC;;;;OAIG;IACH,IAAI,kBAAkB,IAAI,MAAM,CAE/B;IAED,SAAS,CAAC,mBAAmB,SAAK;IAElC,wDAAwD;IACxD,SAAS,CAAC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAE3C,oDAAoD;IACpD,SAAS,CAAC,kBAAkB,CAAC,EAAE;QAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAE3F;;;;;;;;;;;;OAYG;IACH,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAY/C;IAED;;;;;;;;;;;;OAYG;IACH,UAAyB,qBAAqB,CAAC,SAAS,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBvF;IAED;;;;OAIG;IACH,SAAS,CAAC,YAAY,IAAI,OAAO,CAEhC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,CAK/C;IAED;;;;OAIG;IACH,UAAmB,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,GAAG,cAAc,CAMhF;IAED,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,sBAAsB,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAUvF;IAED;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,MAAM,CAE1D;CACH"}

package/lib/submission/hydranium-glsp-submission-handler.js

@@ -15,7 +15,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { MarkersReason, ModelState, ModelSubmissionHandler, SetDirtyStateAction, SetMarkersAction } from '@eclipse-glsp/server';
+import { ClientSessionManager, MarkersReason, ModelState, ModelSubmissionHandler, SetDirtyStateAction, SetMarkersAction } from '@eclipse-glsp/server';
 import { IntegrityService } from '@hydranium/core';
 import { inject, injectable } from 'inversify';
 import { describeErrorWithStack } from '@hydranium/protocol';
@@ -50,6 +50,7 @@ import { DiagramStatus } from '../state/diagram-status.js';
  * URI-tagged tracer), so it carries no log-label field of its own.
  */
 let HydraniumGlspSubmissionHandler = class HydraniumGlspSubmissionHandler extends ModelSubmissionHandler {
+    sessionManager;
     /**
      * Document-state gate awaited before {@link submitModel} delegates to
      * `super.submitModel`. Default {@link IntegrityService.SettledState} so the
@@ -155,14 +156,27 @@ let HydraniumGlspSubmissionHandler = class HydraniumGlspSubmissionHandler extend
      * Never rejects: GLSP runs it from a debounce that drops the result, so a
      * failure here would go unhandled. A validator that throws is logged as an
      * error, markers that cannot be sent as a warning.
+     *
+     * GLSP does not cancel that debounce when the session ends, so it also runs
+     * for a diagram just closed: that run is skipped, and markers it could not
+     * send because the session ended meanwhile are logged for diagnosis only.
      */
     async performLiveValidation(validator) {
+        if (this.sessionEnded()) {
+            return;
+        }
         this.modelState.setStatus(DiagramStatus.VALIDATION, { message: 'Validate Model...', severity: 'INFO' });
         try {
             const markers = await validator.validate([this.modelState.root], MarkersReason.LIVE);
-            await this.actionDispatcher
-                .dispatch(SetMarkersAction.create(markers, { reason: MarkersReason.LIVE }))
-                .catch((error) => this.modelState.logger.warn(`Could not send the live-validation markers: ${describeErrorWithStack(error)}`));
+            await this.actionDispatcher.dispatch(SetMarkersAction.create(markers, { reason: MarkersReason.LIVE })).catch((error) => {
+                const message = `Could not send the live-validation markers: ${describeErrorWithStack(error)}`;
+                if (this.sessionEnded()) {
+                    this.modelState.logger.debug(message);
+                }
+                else {
+                    this.modelState.logger.warn(message);
+                }
+            });
         }
         catch (error) {
             this.modelState.logger.error(`Live validation failed: ${describeErrorWithStack(error)}`);
@@ -171,6 +185,14 @@ let HydraniumGlspSubmissionHandler = class HydraniumGlspSubmissionHandler extend
             this.modelState.setStatus(DiagramStatus.VALIDATION, undefined);
         }
     }
+    /**
+     * Whether the client session this handler serves has ended. By its
+     * dispatcher rather than its id: a client that reopens a diagram under the
+     * same id gets a new session, which this handler does not serve.
+     */
+    sessionEnded() {
+        return this.sessionManager.getSession(this.modelState.clientId)?.actionDispatcher !== this.actionDispatcher;
+    }
     /**
      * Serialise the model-bearing actions of a submission into a comparable
      * signature.
@@ -226,6 +248,10 @@ __decorate([
     inject(ModelState),
     __metadata("design:type", Function)
 ], HydraniumGlspSubmissionHandler.prototype, "modelState", void 0);
+__decorate([
+    inject(ClientSessionManager),
+    __metadata("design:type", Object)
+], HydraniumGlspSubmissionHandler.prototype, "sessionManager", void 0);
 HydraniumGlspSubmissionHandler = __decorate([
     injectable()
 ], HydraniumGlspSubmissionHandler);

package/lib/submission/hydranium-glsp-submission-handler.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydranium/glsp-server",
-  "version": "1.0.0-next.316",
+  "version": "1.0.0-next.318",
   "description": "GLSP protocol head for the hydranium framework. Peer of @hydranium/core/lsp and @hydranium/data-server; built on @hydranium/core.",
   "keywords": [
     "diagram",
@@ -70,9 +70,9 @@
   },
   "devDependencies": {
     "@eclipse-glsp/server": "2.7.0",
-    "@hydranium/core": "1.0.0-next.316",
-    "@hydranium/langium": "1.0.0-next.316",
-    "@hydranium/protocol": "1.0.0-next.316",
+    "@hydranium/core": "1.0.0-next.318",
+    "@hydranium/langium": "1.0.0-next.318",
+    "@hydranium/protocol": "1.0.0-next.318",
     "inversify": "6.2.2",
     "reflect-metadata": "0.2.2",
     "rimraf": "^5.0.0",
@@ -82,9 +82,9 @@
   },
   "peerDependencies": {
     "@eclipse-glsp/server": "^2.6.0",
-    "@hydranium/core": "1.0.0-next.316",
-    "@hydranium/langium": "1.0.0-next.316",
-    "@hydranium/protocol": "1.0.0-next.316",
+    "@hydranium/core": "1.0.0-next.318",
+    "@hydranium/langium": "1.0.0-next.318",
+    "@hydranium/protocol": "1.0.0-next.318",
     "inversify": "^6.0.0",
     "reflect-metadata": "^0.2.2",
     "vscode-jsonrpc": "^9.0.0",

package/src/state/reconciling-multi-document-glsp-state.ts

@@ -17,6 +17,7 @@ import {
    type ModelVersion,
    type TextVersion,
    type TransferElement,
+   type TransferTypeFor,
    type VersionedModel,
    describeErrorWithStack
 } from '@hydranium/protocol';
@@ -78,18 +79,24 @@ export interface VersionedMultiDocumentSourceModel<TPrimary extends TransferElem
  * 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}.
+ *
+ * `TTransferMap` is the transfer model's `$type` → interface map, the generated
+ * `<LanguageId>TransferTypes`; the primary's projection is typed through it.
  */
 @injectable()
-export class ReconcilingMultiDocumentGlspState<TRoot extends AstNode, TPrimary extends TransferElement = TransferElement>
-   extends AbstractHydraniumGlspState<TRoot, MultiDocumentSourceModel<TPrimary>>
-   implements JsonModelState<MultiDocumentSourceModel<TPrimary>>
+export class ReconcilingMultiDocumentGlspState<
+   TRoot extends AstNode,
+   TTransferMap extends { [K in keyof TTransferMap]: TransferElement } = Record<string, TransferElement>
+>
+   extends AbstractHydraniumGlspState<TRoot, MultiDocumentSourceModel<TransferTypeFor<TRoot, TTransferMap>>>
+   implements JsonModelState<MultiDocumentSourceModel<TransferTypeFor<TRoot, TTransferMap>>>
 {
    /**
     * 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.
     */
-   protected base!: MultiDocumentSourceModel<TPrimary>;
+   protected base!: MultiDocumentSourceModel<TransferTypeFor<TRoot, TTransferMap>>;
 
    /** The documents {@link createSecondaryDocument} created for the {@link persist} under way, with the version each was created at. */
    protected readonly createdForWrite = new Map<string, TextVersion>();
@@ -105,7 +112,7 @@ export class ReconcilingMultiDocumentGlspState<TRoot extends AstNode, TPrimary e
     * document, whereas an explicit `undefined` would diff as a removal and
     * persist as a deletion of content the state simply could not see.
     */
-   get sourceModel(): MultiDocumentSourceModel<TPrimary> {
+   get sourceModel(): MultiDocumentSourceModel<TransferTypeFor<TRoot, TTransferMap>> {
       const secondaries: Record<string, TransferElement> = {};
       for (const uri of this.secondaryUris) {
          const projection = this.projectDocument(uri);
@@ -128,13 +135,13 @@ export class ReconcilingMultiDocumentGlspState<TRoot extends AstNode, TPrimary e
     * stays out of the transition's patch anyway.
     */
    override async normalizeTransition(
-      transition: OperationTransition<MultiDocumentSourceModel<TPrimary>>
-   ): Promise<OperationTransition<MultiDocumentSourceModel<TPrimary>>> {
+      transition: OperationTransition<MultiDocumentSourceModel<TransferTypeFor<TRoot, TTransferMap>>>
+   ): Promise<OperationTransition<MultiDocumentSourceModel<TransferTypeFor<TRoot, TTransferMap>>>> {
       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<TPrimary>(await this.roundTrip(this._sourceUri, from.primary));
-         to.primary = this.projectRoot<TPrimary>(await this.roundTrip(this._sourceUri, to.primary));
+         from.primary = this.projectRoot((await this.roundTrip(this._sourceUri, from.primary)) as TRoot);
+         to.primary = this.projectRoot((await this.roundTrip(this._sourceUri, to.primary)) as TRoot);
       }
       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])) {
@@ -217,9 +224,12 @@ export class ReconcilingMultiDocumentGlspState<TRoot extends AstNode, TPrimary e
     * policy exactly as the single-document state does — the orchestration is
     * shared.
     */
-   async updateSourceModel(model: MultiDocumentSourceModel<TPrimary>, baseVersion: BaseVersion = this.baseVersion): Promise<void> {
+   async updateSourceModel(
+      model: MultiDocumentSourceModel<TransferTypeFor<TRoot, TTransferMap>>,
+      baseVersion: BaseVersion = this.baseVersion
+   ): Promise<void> {
       let secondaryVersions: Readonly<Record<string, ModelVersion>> | undefined;
-      return reconcileSourceModelWrite<MultiDocumentSourceModel<TPrimary>>(model, baseVersion, {
+      return reconcileSourceModelWrite<MultiDocumentSourceModel<TransferTypeFor<TRoot, TTransferMap>>>(model, baseVersion, {
          persist: async (candidate, candidateBaseVersion) => {
             const { root } = await this.persist(candidate, candidateBaseVersion, secondaryVersions);
             this.captureWrittenRoot(root);
@@ -254,7 +264,7 @@ export class ReconcilingMultiDocumentGlspState<TRoot extends AstNode, TPrimary e
     * created for it that {@link closesCreatedDocument} accepts.
     */
    protected async persist(
-      model: MultiDocumentSourceModel<TPrimary>,
+      model: MultiDocumentSourceModel<TransferTypeFor<TRoot, TTransferMap>>,
       baseVersion: BaseVersion,
       secondaryVersions?: Readonly<Record<string, ModelVersion>>
    ): Promise<{ root: TRoot }> {
@@ -381,7 +391,7 @@ export class ReconcilingMultiDocumentGlspState<TRoot extends AstNode, TPrimary e
     * since a reconcile without it has nothing to merge into; an unreadable
     * secondary is omitted the same way {@link sourceModel} omits one.
     */
-   protected async refetch(): Promise<VersionedMultiDocumentSourceModel<TPrimary> | undefined> {
+   protected async refetch(): Promise<VersionedMultiDocumentSourceModel<TransferTypeFor<TRoot, TTransferMap>> | undefined> {
       const theirs = await this.readCurrentRoot(this._sourceUri);
       if (!theirs) {
          return undefined;
@@ -395,7 +405,7 @@ export class ReconcilingMultiDocumentGlspState<TRoot extends AstNode, TPrimary e
             secondaryVersions[uri] = read.version;
          }
       }
-      return { model: { primary: this.projectRoot<TPrimary>(theirs.root), secondaries }, baseVersion: theirs.version, secondaryVersions };
+      return { model: { primary: this.projectRoot(theirs.root as TRoot), secondaries }, baseVersion: theirs.version, secondaryVersions };
    }
 
    /**
@@ -411,9 +421,13 @@ export class ReconcilingMultiDocumentGlspState<TRoot extends AstNode, TPrimary e
       return root ? this.projectRoot(root) : undefined;
    }
 
-   /** Grammar-mode transfer projection of one AST root. The single projection seam. */
-   protected projectRoot<T extends TransferElement = TransferElement>(root: AstNode): T {
-      return this.sharedServices.model.TransferEncoder.toTransfer(root, 'grammar') as unknown as T;
+   /**
+    * Grammar-mode transfer projection of one AST root. The single projection
+    * seam. The encoder slot answers the structural base, so the map's type is
+    * asserted here, once.
+    */
+   protected projectRoot<T extends AstNode>(root: T): TransferTypeFor<T, TTransferMap> {
+      return this.sharedServices.model.TransferEncoder.toTransfer(root, 'grammar') as TransferTypeFor<T, TTransferMap>;
    }
 }
 

package/src/state/reconciling-transfer-hydranium-glsp-state.ts

@@ -10,7 +10,7 @@
 import { type JsonModelState } from '@eclipse-glsp/server';
 import { injectable } from 'inversify';
 import { type AstNode } from '@hydranium/langium';
-import { type BaseVersion, type TransferElement, type VersionedModel } from '@hydranium/protocol';
+import { type BaseVersion, type TransferElement, type TransferTypeFor, type VersionedModel } from '@hydranium/protocol';
 import { type OperationTransition } from '../command/hydranium-glsp-operation-command.js';
 import { AbstractHydraniumGlspState } from './abstract-hydranium-glsp-state.js';
 import { reconcileSourceModelWrite } from './reconcile-source-model-write.js';
@@ -47,15 +47,18 @@ import { reconcileSourceModelWrite } from './reconcile-source-model-write.js';
  * *orchestration* that consults it.
  */
 @injectable()
-export class ReconcilingTransferHydraniumGlspState<TRoot extends AstNode, TSourceModel extends TransferElement>
-   extends AbstractHydraniumGlspState<TRoot, TSourceModel>
-   implements JsonModelState<TSourceModel>
+export class ReconcilingTransferHydraniumGlspState<
+   TRoot extends AstNode,
+   TTransferMap extends { [K in keyof TTransferMap]: TransferElement } = Record<string, TransferElement>
+>
+   extends AbstractHydraniumGlspState<TRoot, TransferTypeFor<TRoot, TTransferMap>>
+   implements JsonModelState<TransferTypeFor<TRoot, TTransferMap>>
 {
    /**
     * The projection a forward-write conflict reconciles the user's intent
     * from, taken from the built root on every capture.
     */
-   protected base!: TSourceModel;
+   protected base!: TransferTypeFor<TRoot, TTransferMap>;
 
    /**
     * Persisted-shape projection of the current source root, consumed by GLSP's
@@ -65,7 +68,7 @@ export class ReconcilingTransferHydraniumGlspState<TRoot extends AstNode, TSourc
     * properties excluded), so the diff reflects only authored state.
     * Synchronous — the encoder walks the in-memory AST without serialising.
     */
-   get sourceModel(): TSourceModel {
+   get sourceModel(): TransferTypeFor<TRoot, TTransferMap> {
       return this.projectRoot(this.sourceRoot);
    }
 
@@ -73,12 +76,14 @@ export class ReconcilingTransferHydraniumGlspState<TRoot extends AstNode, TSourc
     * 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 {
-      return this.sharedServices.model.TransferEncoder.toTransfer(root, 'grammar') as unknown as TSourceModel;
+   protected projectRoot(root: AstNode): TransferTypeFor<TRoot, TTransferMap> {
+      return this.sharedServices.model.TransferEncoder.toTransfer(root, 'grammar') as TransferTypeFor<TRoot, TTransferMap>;
    }
 
    /** Both ends serialized for the source document and parsed back, unless they are equal. */
-   override async normalizeTransition(transition: OperationTransition<TSourceModel>): Promise<OperationTransition<TSourceModel>> {
+   override async normalizeTransition(
+      transition: OperationTransition<TransferTypeFor<TRoot, TTransferMap>>
+   ): Promise<OperationTransition<TransferTypeFor<TRoot, TTransferMap>>> {
       if (JSON.stringify(transition.from) === JSON.stringify(transition.to)) {
          return transition;
       }
@@ -101,11 +106,11 @@ export class ReconcilingTransferHydraniumGlspState<TRoot extends AstNode, TSourc
     * (force = last-writer-wins, reconciling = field-level merge) shared with
     * undo / redo.
     */
-   async updateSourceModel(model: TSourceModel, baseVersion: BaseVersion = this.baseVersion): Promise<void> {
+   async updateSourceModel(model: TransferTypeFor<TRoot, TTransferMap>, baseVersion: BaseVersion = this.baseVersion): Promise<void> {
       // Orchestration lives in `reconcileSourceModelWrite` so the multi-document
       // state gets the identical conflict handling; this method supplies only
       // the single-document meaning of persist / project.
-      return reconcileSourceModelWrite<TSourceModel>(model, baseVersion, {
+      return reconcileSourceModelWrite<TransferTypeFor<TRoot, TTransferMap>>(model, baseVersion, {
          persist: async (candidate, candidateBaseVersion) => {
             const { root } = await this.persist(candidate, candidateBaseVersion);
             this.captureWrittenRoot(root);
@@ -129,7 +134,7 @@ export class ReconcilingTransferHydraniumGlspState<TRoot extends AstNode, TSourc
     * alongside so undo compares what this writes; the orchestration in
     * {@link updateSourceModel} is unchanged.
     */
-   protected async persist(model: TSourceModel, baseVersion: BaseVersion): Promise<{ root: TRoot }> {
+   protected async persist(model: TransferTypeFor<TRoot, TTransferMap>, baseVersion: BaseVersion): Promise<{ root: TRoot }> {
       const document = await this.requireModelSession().update({ uri: this._sourceUri, model, baseVersion });
       return document as unknown as { root: TRoot };
    }
@@ -142,7 +147,7 @@ export class ReconcilingTransferHydraniumGlspState<TRoot extends AstNode, TSourc
     * + the framework encoder's `'grammar'` mode; adopters override alongside
     * {@link persist}.
     */
-   protected async refetch(): Promise<VersionedModel<TSourceModel> | undefined> {
+   protected async refetch(): Promise<VersionedModel<TransferTypeFor<TRoot, TTransferMap>> | undefined> {
       const theirs = await this.readCurrentRoot(this._sourceUri);
       return (
          theirs && {

package/src/submission/hydranium-glsp-submission-handler.ts

@@ -9,6 +9,7 @@
 
 import {
    type Action,
+   ClientSessionManager,
    type DirtyStateChangeReason,
    type GModelRootSchema,
    type LayoutOperation,
@@ -59,6 +60,7 @@ import { DiagramStatus } from '../state/diagram-status.js';
 @injectable()
 export class HydraniumGlspSubmissionHandler<TRoot extends AstNode, TSourceModel = string> extends ModelSubmissionHandler {
    @inject(ModelState) declare protected modelState: AbstractHydraniumGlspState<TRoot, TSourceModel>;
+   @inject(ClientSessionManager) protected readonly sessionManager!: ClientSessionManager;
 
    /**
     * Document-state gate awaited before {@link submitModel} delegates to
@@ -176,16 +178,26 @@ export class HydraniumGlspSubmissionHandler<TRoot extends AstNode, TSourceModel
     * Never rejects: GLSP runs it from a debounce that drops the result, so a
     * failure here would go unhandled. A validator that throws is logged as an
     * error, markers that cannot be sent as a warning.
+    *
+    * GLSP does not cancel that debounce when the session ends, so it also runs
+    * for a diagram just closed: that run is skipped, and markers it could not
+    * send because the session ended meanwhile are logged for diagnosis only.
     */
    protected override async performLiveValidation(validator: ModelValidator): Promise<void> {
+      if (this.sessionEnded()) {
+         return;
+      }
       this.modelState.setStatus(DiagramStatus.VALIDATION, { message: 'Validate Model...', severity: 'INFO' });
       try {
          const markers = await validator.validate([this.modelState.root], MarkersReason.LIVE);
-         await this.actionDispatcher
-            .dispatch(SetMarkersAction.create(markers, { reason: MarkersReason.LIVE }))
-            .catch((error: unknown) =>
-               this.modelState.logger.warn(`Could not send the live-validation markers: ${describeErrorWithStack(error)}`)
-            );
+         await this.actionDispatcher.dispatch(SetMarkersAction.create(markers, { reason: MarkersReason.LIVE })).catch((error: unknown) => {
+            const message = `Could not send the live-validation markers: ${describeErrorWithStack(error)}`;
+            if (this.sessionEnded()) {
+               this.modelState.logger.debug(message);
+            } else {
+               this.modelState.logger.warn(message);
+            }
+         });
       } catch (error: unknown) {
          this.modelState.logger.error(`Live validation failed: ${describeErrorWithStack(error)}`);
       } finally {
@@ -193,6 +205,15 @@ export class HydraniumGlspSubmissionHandler<TRoot extends AstNode, TSourceModel
       }
    }
 
+   /**
+    * Whether the client session this handler serves has ended. By its
+    * dispatcher rather than its id: a client that reopens a diagram under the
+    * same id gets a new session, which this handler does not serve.
+    */
+   protected sessionEnded(): boolean {
+      return this.sessionManager.getSession(this.modelState.clientId)?.actionDispatcher !== this.actionDispatcher;
+   }
+
    /**
     * Serialise the model-bearing actions of a submission into a comparable
     * signature.