@hydranium/glsp-client-theia 1.0.0-next.203 → 1.0.0-next.205

package/README.md

@@ -48,11 +48,18 @@ if you are mounting a hydranium GLSP diagram in a Theia application.
   LSP already publishes the same diagnostics, and the per-diagram container binds
   `NoOpExternalMarkerManager` instead: markers still decorate the diagram, but
   Theia's Problems view stops double-listing them.
-  **`AbstractHydraniumGlspDiagramManager`** derives the language-correlated
+- **`AbstractHydraniumGlspDiagramManager`** derives the language-correlated
   getters from one descriptor plus a label, and `reopen` replaces a diagram
   with a fresh widget in the same tab position, as the Retry of a failed load
   does. It reopens every diagram when their client is lost, and a failed one
-  when a client starts.
+  when a client starts. A diagram's client id is the same for the same widget
+  in the same window, so a diagram reopened after its client is lost, or
+  reloaded with its page, takes its old session over with the window's resume
+  token and keeps its unsaved text.
+- **`WindowSessionService`** — the window's id and resume token, claimed as
+  the frontend starts. The default keeps them in `sessionStorage` and hands
+  them on only as the page leaves, so a reload resumes and a duplicated tab
+  draws its own. Rebind it for a different notion of a window.
 - **`HydraniumGlspClientContribution`** — for a server that starts late: it
   defers `start` until a workspace is open, fails a start that takes longer than
   `startupTimeoutMs` (30 s by default), and starts a fresh client after a failed

package/lib/browser/diagram-widget.d.ts

@@ -6,11 +6,13 @@
  *
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
+import { type Args } from '@eclipse-glsp/client';
 import { GLSPDiagramWidget, type GLSPDiagramWidgetOptions } from '@eclipse-glsp/theia-integration';
 import { type Message } from '@theia/core/lib/browser';
 import { Emitter, type Event } from '@theia/core';
 import { type Container } from '@theia/core/shared/inversify';
 import { type DiagramLoadOutcome, HydraniumDiagramLoader } from './diagram-loader';
+import { WindowSessionService } from './window-session';
 import '../../style/diagram-loading.css';
 /** Class on the overlay root. Adopters style / override via this contract. */
 export declare const DIAGRAM_LOADING_CLASS = "hydranium-diagram-loading";
@@ -42,6 +44,7 @@ export declare const DIAGRAM_LOADING_FAILED_CLASS = "hydranium-diagram-loading-f
  * dirty, so Theia's exit check still counts it; see {@link createSaveable}.
  */
 export declare class HydraniumGlspDiagramWidget extends GLSPDiagramWidget {
+    protected readonly windowSessions: WindowSessionService;
     protected loadingOverlay?: HTMLElement;
     protected readonly reopenRequestEmitter: Emitter<void>;
     /** Fires when this diagram asks to be replaced by a fresh widget, as its
@@ -57,6 +60,8 @@ export declare class HydraniumGlspDiagramWidget extends GLSPDiagramWidget {
     configure(options: GLSPDiagramWidgetOptions, diContainer: Container): void;
     /** The widget's saveable. Override to change how saves and dirty state behave. */
     protected createSaveable(): GLSPDiagramWidget['saveable'];
+    /** Adds the window's resume token, so a reload or reconnect takes this diagram's session over. */
+    protected getRequestModelOptions(): Args;
     protected onAfterAttach(msg: Message): void;
     dispose(): void;
     /**

package/lib/browser/diagram-widget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diagram-widget.d.ts","sourceRoot":"","sources":["../../src/browser/diagram-widget.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAGlF,OAAO,EAAE,iBAAiB,EAAE,KAAK,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAGnG,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,KAAK,KAAK,EAAO,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,KAAK,SAAS,EAAc,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,KAAK,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAKnF,OAAO,iCAAiC,CAAC;AAEzC,8EAA8E;AAC9E,eAAO,MAAM,qBAAqB,8BAA8B,CAAC;AAEjE;kFACkF;AAClF,eAAO,MAAM,4BAA4B,qCAAoC,CAAC;AAE9E;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBACa,0BAA2B,SAAQ,iBAAiB;IAC9D,SAAS,CAAC,cAAc,CAAC,EAAE,WAAW,CAAC;IACvC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,gBAAuB;IAE9D;;;yBAGqB;IACrB,QAAQ,CAAC,kBAAkB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAmC;IAE3E;;;;OAIG;IACM,SAAS,CAAC,OAAO,EAAE,wBAAwB,EAAE,WAAW,EAAE,SAAS,GAAG,IAAI,CAMlF;IAED,kFAAkF;IAClF,SAAS,CAAC,cAAc,IAAI,iBAAiB,CAAC,UAAU,CAAC,CAExD;IAED,UAAmB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAKnD;IAEQ,OAAO,IAAI,IAAI,CAGvB;IAED;;;;OAIG;IACH,UAAyB,eAAe,CAAC,YAAY,EAAE,UAAU,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAMzH;IAED;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,IAAI,IAAI,CAiBnC;IAED,iEAAiE;IACjE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAMzD;IAED;;;;;;;;;OASG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAY9C;IAED,mDAAmD;IACnD,SAAS,CAAC,SAAS,IAAI,IAAI,CAI1B;IAED,+EAA+E;IAC/E,SAAS,CAAC,iBAAiB,IAAI,WAAW,CAMzC;IAED,SAAS,CAAC,kBAAkB,IAAI,IAAI,CAGnC;IAED;;oFAEgF;IAChF,SAAS,CAAC,oBAAoB,IAAI,WAAW,CAW5C;IAED;sEACkE;IAClE,SAAS,KAAK,YAAY,IAAI,MAAM,CAEnC;IAED;;;;;OAKG;IACH,SAAS,KAAK,sBAAsB,IAAI,sBAAsB,GAAG,SAAS,CAGzE;CACH"}
+{"version":3,"file":"diagram-widget.d.ts","sourceRoot":"","sources":["../../src/browser/diagram-widget.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,IAAI,EAAgF,MAAM,sBAAsB,CAAC;AAE/H,OAAO,EAAE,iBAAiB,EAAE,KAAK,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAGnG,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,KAAK,KAAK,EAAO,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,KAAK,SAAS,EAAsB,MAAM,8BAA8B,CAAC;AAClF,OAAO,EAAE,KAAK,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAEnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAIxD,OAAO,iCAAiC,CAAC;AAEzC,8EAA8E;AAC9E,eAAO,MAAM,qBAAqB,8BAA8B,CAAC;AAEjE;kFACkF;AAClF,eAAO,MAAM,4BAA4B,qCAAoC,CAAC;AAE9E;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBACa,0BAA2B,SAAQ,iBAAiB;IAChC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAG,oBAAoB,CAAC;IACvF,SAAS,CAAC,cAAc,CAAC,EAAE,WAAW,CAAC;IACvC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,gBAAuB;IAE9D;;;yBAGqB;IACrB,QAAQ,CAAC,kBAAkB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAmC;IAE3E;;;;OAIG;IACM,SAAS,CAAC,OAAO,EAAE,wBAAwB,EAAE,WAAW,EAAE,SAAS,GAAG,IAAI,CAMlF;IAED,kFAAkF;IAClF,SAAS,CAAC,cAAc,IAAI,iBAAiB,CAAC,UAAU,CAAC,CAExD;IAED,kGAAkG;IAClG,UAAmB,sBAAsB,IAAI,IAAI,CAEhD;IAED,UAAmB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAKnD;IAEQ,OAAO,IAAI,IAAI,CAGvB;IAED;;;;OAIG;IACH,UAAyB,eAAe,CAAC,YAAY,EAAE,UAAU,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAMzH;IAED;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,IAAI,IAAI,CAiBnC;IAED,iEAAiE;IACjE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAMzD;IAED;;;;;;;;;OASG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAY9C;IAED,mDAAmD;IACnD,SAAS,CAAC,SAAS,IAAI,IAAI,CAI1B;IAED,+EAA+E;IAC/E,SAAS,CAAC,iBAAiB,IAAI,WAAW,CAMzC;IAED,SAAS,CAAC,kBAAkB,IAAI,IAAI,CAGnC;IAED;;oFAEgF;IAChF,SAAS,CAAC,oBAAoB,IAAI,WAAW,CAW5C;IAED;sEACkE;IAClE,SAAS,KAAK,YAAY,IAAI,MAAM,CAEnC;IAED;;;;;OAKG;IACH,SAAS,KAAK,sBAAsB,IAAI,sBAAsB,GAAG,SAAS,CAGzE;CACH"}

package/lib/browser/diagram-widget.js

@@ -13,14 +13,19 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HydraniumGlspDiagramWidget = exports.DIAGRAM_LOADING_FAILED_CLASS = exports.DIAGRAM_LOADING_CLASS = void 0;
 const client_1 = require("@eclipse-glsp/client");
+const protocol_1 = require("@hydranium/protocol");
 const theia_integration_1 = require("@eclipse-glsp/theia-integration");
 const core_1 = require("@theia/core");
 const inversify_1 = require("@theia/core/shared/inversify");
 const diagram_loader_1 = require("./diagram-loader");
 const glsp_saveable_1 = require("./glsp-saveable");
+const window_session_1 = require("./window-session");
 // Shipped by this package rather than left to adopters: an overlay whose
 // stylesheet was forgotten is an unstyled div in normal flow, which is a silent
 // failure. Adopters override individual rules from their own stylesheet.
@@ -55,6 +60,7 @@ exports.DIAGRAM_LOADING_FAILED_CLASS = `${exports.DIAGRAM_LOADING_CLASS}-failed`
  * dirty, so Theia's exit check still counts it; see {@link createSaveable}.
  */
 let HydraniumGlspDiagramWidget = class HydraniumGlspDiagramWidget extends theia_integration_1.GLSPDiagramWidget {
+    windowSessions;
     loadingOverlay;
     reopenRequestEmitter = new core_1.Emitter();
     /** Fires when this diagram asks to be replaced by a fresh widget, as its
@@ -78,6 +84,10 @@ let HydraniumGlspDiagramWidget = class HydraniumGlspDiagramWidget extends theia_
     createSaveable() {
         return new glsp_saveable_1.HydraniumGlspSaveable(this.actionDispatcher, this.diContainer.get(client_1.EditorContextService));
     }
+    /** Adds the window's resume token, so a reload or reconnect takes this diagram's session over. */
+    getRequestModelOptions() {
+        return { ...super.getRequestModelOptions(), [protocol_1.RESUME_TOKEN_ARG]: this.windowSessions.current().resumeToken };
+    }
     onAfterAttach(msg) {
         // Before `super`, which is what starts the load on first attach — so the
         // overlay is already up when the round trip begins.
@@ -202,6 +212,10 @@ let HydraniumGlspDiagramWidget = class HydraniumGlspDiagramWidget extends theia_
     }
 };
 exports.HydraniumGlspDiagramWidget = HydraniumGlspDiagramWidget;
+__decorate([
+    (0, inversify_1.inject)(window_session_1.WindowSessionService),
+    __metadata("design:type", Object)
+], HydraniumGlspDiagramWidget.prototype, "windowSessions", void 0);
 exports.HydraniumGlspDiagramWidget = HydraniumGlspDiagramWidget = __decorate([
     (0, inversify_1.injectable)()
 ], HydraniumGlspDiagramWidget);

package/lib/browser/diagram-widget.js.map

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

package/lib/browser/glsp-diagram-manager.d.ts

@@ -6,11 +6,13 @@
  *
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
+import { type IDiagramOptions } from '@eclipse-glsp/client';
 import { GLSPDiagramManager } from '@eclipse-glsp/theia-integration';
 import { type GLSPDiagramLanguage } from '@eclipse-glsp/theia-integration/lib/common';
-import { type GLSPDiagramWidget } from '@eclipse-glsp/theia-integration/lib/browser';
+import { type GLSPDiagramWidget, type GLSPDiagramWidgetOptions } from '@eclipse-glsp/theia-integration/lib/browser';
 import { type WidgetOpenerOptions } from '@theia/core/lib/browser';
 import { type Disposable } from '@theia/core';
+import { WindowSessionService } from './window-session';
 /**
  * `GLSPDiagramManager` subclass that derives the language-correlated getters
  * (`fileExtensions`, `diagramType`, `contributionId`, `iconClass`) from a
@@ -40,6 +42,7 @@ export declare abstract class AbstractHydraniumGlspDiagramManager extends GLSPDi
     protected abstract readonly managerLabel: string;
     /** Optional icon-class override; takes precedence over the language's `iconClass`. */
     protected readonly customIconClass?: string;
+    protected readonly windowSessions: WindowSessionService;
     protected clientListeners?: Disposable;
     /** The reopens asked for so far, which run one at a time. */
     protected reopening: Promise<void>;
@@ -49,6 +52,19 @@ export declare abstract class AbstractHydraniumGlspDiagramManager extends GLSPDi
     get iconClass(): string;
     get label(): string;
     createWidget(options?: unknown): Promise<GLSPDiagramWidget>;
+    /**
+     * The same client id for the same diagram in this window, across a reload
+     * and a reopen after a lost client, so its load takes over the session the
+     * old connection left and keeps its unsaved text. A diagram closed by the
+     * user ends its session, and opening it again starts afresh.
+     *
+     * The widget options enter as a hash: GLSP makes the id an element id and
+     * finds it with an `#id` selector, which a URI's `:` and `/` break. The
+     * options identify the widget, so two widgets of one document, in two edit
+     * modes or set apart by an option an adopter adds, do not take each other's
+     * session over.
+     */
+    protected createDiagramOptions(options: GLSPDiagramWidgetOptions): IDiagramOptions;
     /**
      * Reopen every diagram once its client is lost, since none of them has a
      * server behind it any more, and a failed one once a client starts.
@@ -58,7 +74,8 @@ export declare abstract class AbstractHydraniumGlspDiagramManager extends GLSPDi
     protected loadFailed(widget: GLSPDiagramWidget): boolean;
     /**
      * Replace `widget` with a fresh one for the same diagram, in the same tab
-     * position and with its viewport: a new container, client id and load.
+     * position and with its viewport: a new container and load under the same
+     * client id, which takes over the session the old connection left.
      * Reopens run one at a time, since each places its replacement next to a
      * neighbour that a reopen running alongside could take out of the layout.
      */

package/lib/browser/glsp-diagram-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-diagram-manager.d.ts","sourceRoot":"","sources":["../../src/browser/glsp-diagram-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAGlF,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AACtF,OAAO,EAAE,KAAK,iBAAiB,EAAgC,MAAM,6CAA6C,CAAC;AACnH,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,KAAK,UAAU,EAAwB,MAAM,aAAa,CAAC;AAMpE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,8BACsB,mCAAoC,SAAQ,kBAAkB;IACjF,8EAA8E;IAC9E,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,eAAe,EAAE,mBAAmB,CAAC;IAEjE,wEAAwE;IACxE,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAEjD,sFAAsF;IACtF,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAE5C,SAAS,CAAC,eAAe,CAAC,EAAE,UAAU,CAAC;IACvC,6DAA6D;IAC7D,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAqB;IAEvD,IAAa,cAAc,IAAI,MAAM,EAAE,CAEtC;IAED,IAAa,WAAW,IAAI,MAAM,CAEjC;IAED,IAAa,cAAc,IAAI,MAAM,CAEpC;IAED,IAAa,SAAS,IAAI,MAAM,CAE/B;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAEc,YAAY,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAOzE;IAED;;;OAGG;IACH,SAAS,CAAC,cAAc,IAAI,IAAI,CAY/B;IAED,SAAS,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,iBAAiB,KAAK,OAAO,GAAG,IAAI,CAIvE;IAED,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAGvD;IAED;;;;;OAKG;IACH,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAI/C;IAED;+DAC2D;IAC3D,UAAgB,aAAa,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBtE;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACH,UAAmB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAMtG;CACH"}
+{"version":3,"file":"glsp-diagram-manager.d.ts","sourceRoot":"","sources":["../../src/browser/glsp-diagram-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAmC,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC7F,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AACtF,OAAO,EACJ,KAAK,iBAAiB,EACtB,KAAK,wBAAwB,EAE/B,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,KAAK,UAAU,EAAwB,MAAM,aAAa,CAAC;AAMpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,8BACsB,mCAAoC,SAAQ,kBAAkB;IACjF,8EAA8E;IAC9E,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,eAAe,EAAE,mBAAmB,CAAC;IAEjE,wEAAwE;IACxE,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAEjD,sFAAsF;IACtF,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAEd,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAG,oBAAoB,CAAC;IAEvF,SAAS,CAAC,eAAe,CAAC,EAAE,UAAU,CAAC;IACvC,6DAA6D;IAC7D,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAqB;IAEvD,IAAa,cAAc,IAAI,MAAM,EAAE,CAEtC;IAED,IAAa,WAAW,IAAI,MAAM,CAEjC;IAED,IAAa,cAAc,IAAI,MAAM,CAEpC;IAED,IAAa,SAAS,IAAI,MAAM,CAE/B;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAEc,YAAY,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAOzE;IAED;;;;;;;;;;;OAWG;IACH,UAAmB,oBAAoB,CAAC,OAAO,EAAE,wBAAwB,GAAG,eAAe,CAG1F;IAED;;;OAGG;IACH,SAAS,CAAC,cAAc,IAAI,IAAI,CAY/B;IAED,SAAS,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,iBAAiB,KAAK,OAAO,GAAG,IAAI,CAIvE;IAED,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAGvD;IAED;;;;;;OAMG;IACH,MAAM,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAI/C;IAED;+DAC2D;IAC3D,UAAgB,aAAa,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBtE;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACH,UAAmB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAMtG;CACH"}

package/lib/browser/glsp-diagram-manager.js

@@ -13,15 +13,20 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractHydraniumGlspDiagramManager = void 0;
 const client_1 = require("@eclipse-glsp/client");
 const theia_integration_1 = require("@eclipse-glsp/theia-integration");
 const core_1 = require("@theia/core");
 const inversify_1 = require("@theia/core/shared/inversify");
+const protocol_1 = require("@hydranium/protocol");
 const client_contribution_1 = require("./client-contribution");
 const diagram_loader_1 = require("./diagram-loader");
 const diagram_widget_1 = require("./diagram-widget");
+const window_session_1 = require("./window-session");
 /**
  * `GLSPDiagramManager` subclass that derives the language-correlated getters
  * (`fileExtensions`, `diagramType`, `contributionId`, `iconClass`) from a
@@ -47,6 +52,7 @@ const diagram_widget_1 = require("./diagram-widget");
 let AbstractHydraniumGlspDiagramManager = class AbstractHydraniumGlspDiagramManager extends theia_integration_1.GLSPDiagramManager {
     /** Optional icon-class override; takes precedence over the language's `iconClass`. */
     customIconClass;
+    windowSessions;
     clientListeners;
     /** The reopens asked for so far, which run one at a time. */
     reopening = Promise.resolve();
@@ -73,6 +79,22 @@ let AbstractHydraniumGlspDiagramManager = class AbstractHydraniumGlspDiagramMana
         }
         return widget;
     }
+    /**
+     * The same client id for the same diagram in this window, across a reload
+     * and a reopen after a lost client, so its load takes over the session the
+     * old connection left and keeps its unsaved text. A diagram closed by the
+     * user ends its session, and opening it again starts afresh.
+     *
+     * The widget options enter as a hash: GLSP makes the id an element id and
+     * finds it with an `#id` selector, which a URI's `:` and `/` break. The
+     * options identify the widget, so two widgets of one document, in two edit
+     * modes or set apart by an option an adopter adds, do not take each other's
+     * session over.
+     */
+    createDiagramOptions(options) {
+        const clientId = `${this.diagramType}_${this.windowSessions.current().id}_${(0, protocol_1.textHash)(JSON.stringify(options))}`;
+        return { ...super.createDiagramOptions(options), clientId };
+    }
     /**
      * Reopen every diagram once its client is lost, since none of them has a
      * server behind it any more, and a failed one once a client starts.
@@ -98,7 +120,8 @@ let AbstractHydraniumGlspDiagramManager = class AbstractHydraniumGlspDiagramMana
     }
     /**
      * Replace `widget` with a fresh one for the same diagram, in the same tab
-     * position and with its viewport: a new container, client id and load.
+     * position and with its viewport: a new container and load under the same
+     * client id, which takes over the session the old connection left.
      * Reopens run one at a time, since each places its replacement next to a
      * neighbour that a reopen running alongside could take out of the layout.
      */
@@ -159,6 +182,10 @@ let AbstractHydraniumGlspDiagramManager = class AbstractHydraniumGlspDiagramMana
     }
 };
 exports.AbstractHydraniumGlspDiagramManager = AbstractHydraniumGlspDiagramManager;
+__decorate([
+    (0, inversify_1.inject)(window_session_1.WindowSessionService),
+    __metadata("design:type", Object)
+], AbstractHydraniumGlspDiagramManager.prototype, "windowSessions", void 0);
 exports.AbstractHydraniumGlspDiagramManager = AbstractHydraniumGlspDiagramManager = __decorate([
     (0, inversify_1.injectable)()
 ], AbstractHydraniumGlspDiagramManager);

package/lib/browser/glsp-diagram-manager.js.map

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

package/lib/browser/glsp-theia-frontend-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-theia-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/glsp-theia-frontend-module.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EACJ,KAAK,gBAAgB,EACrB,oBAAoB,EACpB,sBAAsB,EACtB,KAAK,kBAAkB,EAEvB,uBAAuB,EAEzB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AAEtF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAG/D;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,eAAoE,CAAC;AACxG,MAAM,MAAM,sBAAsB,GAAG,OAAO,sBAAsB,CAAC;AAEnE;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,8BAAsB,wCAAyC,SAAQ,uBAAuB;IAC3F,qEAAqE;IACrE,kBAA2B,eAAe,EAAE,mBAAmB,CAAC;IAEhE,oFAAoF;IACpF,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,EAAE,UAAU,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAE3F,8FAA8F;IAC9F,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE,UAAU,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAEnF;;;;;;;;;;OAUG;IACH,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE/C;;;;;;;;;OASG;IACH,SAAS,CAAC,sBAAsB,IAAI,UAAU,CAAC,OAAO,CAAC,sBAAsB,CAAC,GAAG,sBAAsB,GAAG,SAAS,CAElH;IAED;;;;;;;OAOG;IACM,UAAU,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAMnD;IAEQ,wBAAwB,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAEjE;IAEQ,0BAA0B,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAWnE;IAEQ,uBAAuB,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAGhE;IAED;;;;;;;;;;;;;;;;OAgBG;IACM,wBAAwB,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAGjE;CACH"}
+{"version":3,"file":"glsp-theia-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/glsp-theia-frontend-module.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EACJ,KAAK,gBAAgB,EACrB,oBAAoB,EACpB,sBAAsB,EACtB,KAAK,kBAAkB,EAEvB,uBAAuB,EAEzB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AAEtF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAI/D;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,eAAoE,CAAC;AACxG,MAAM,MAAM,sBAAsB,GAAG,OAAO,sBAAsB,CAAC;AAEnE;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,8BAAsB,wCAAyC,SAAQ,uBAAuB;IAC3F,qEAAqE;IACrE,kBAA2B,eAAe,EAAE,mBAAmB,CAAC;IAEhE,oFAAoF;IACpF,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,EAAE,UAAU,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAE3F,8FAA8F;IAC9F,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE,UAAU,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAEnF;;;;;;;;;;OAUG;IACH,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE/C;;;;;;;;;OASG;IACH,SAAS,CAAC,sBAAsB,IAAI,UAAU,CAAC,OAAO,CAAC,sBAAsB,CAAC,GAAG,sBAAsB,GAAG,SAAS,CAElH;IAED;;;;;;;OAOG;IACM,UAAU,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAOnD;IAEQ,wBAAwB,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAEjE;IAEQ,0BAA0B,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAWnE;IAEQ,uBAAuB,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAGhE;IAED;;;;;;;;;;;;;;;;OAgBG;IACM,wBAAwB,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAGjE;CACH"}

package/lib/browser/glsp-theia-frontend-module.js

@@ -12,6 +12,7 @@ exports.AbstractHydraniumGlspTheiaFrontendModule = exports.SkipClientContributio
 const theia_integration_1 = require("@eclipse-glsp/theia-integration");
 const browser_1 = require("@hydranium/client-theia/lib/browser");
 const diagram_widget_1 = require("./diagram-widget");
+const window_session_1 = require("./window-session");
 /**
  * Sentinel returned from {@link AbstractHydraniumGlspTheiaFrontendModule.bindClientContribution}
  * to mean "this module deliberately does not bind a GLSPClientContribution"
@@ -85,6 +86,7 @@ class AbstractHydraniumGlspTheiaFrontendModule extends theia_integration_1.GLSPT
     initialize(context) {
         super.initialize(context);
         (0, browser_1.bindConnectionReporter)(context.bind, context.isBound);
+        (0, window_session_1.bindWindowSessionService)(context.bind, context.isBound);
         if (this.logLevelPreference) {
             (0, browser_1.bindLogLevelPreference)(context.bind, this.logLevelPreference);
         }

package/lib/browser/glsp-theia-frontend-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-theia-frontend-module.js","sourceRoot":"","sources":["../../src/browser/glsp-theia-frontend-module.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AAElF,uEAQyC;AAEzC,iEAAqG;AAErG,qDAA8D;AAE9D;;;;;;GAMG;AACU,QAAA,sBAAsB,GAAG,MAAM,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;AAGxG;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,8CAA+D,SAAQ,2CAAuB;IAU3F;;;;;;;;;;OAUG;IACgB,kBAAkB,CAAU;IAE/C;;;;;;;;;OASG;IACO,sBAAsB;QAC7B,OAAO,SAAS,CAAC;IACpB,CAAC;IAED;;;;;;;OAOG;IACM,UAAU,CAAC,OAAyB;QAC1C,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC1B,IAAA,gCAAsB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC3B,IAAA,gCAAsB,EAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACjE,CAAC;IACJ,CAAC;IAEQ,wBAAwB,CAAC,OAAyB;QACxD,OAAO,CAAC,IAAI,CAAC,wCAAoB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACpE,CAAC;IAEQ,0BAA0B,CAAC,OAAyB;QAC1D,MAAM,YAAY,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACnD,IAAI,YAAY,KAAK,QAAA,sBAAsB,EAAE,CAAC;YAC3C,OAAO;QACV,CAAC;QACD,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC9B,KAAK,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;YAC1C,OAAO;QACV,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;QACvD,OAAO,CAAC,IAAI,CAAC,0CAAsB,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAChE,CAAC;IAEQ,uBAAuB,CAAC,OAAyB;QACvD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;QAC9D,IAAA,0CAAsB,EAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IACpE,CAAC;IAED;;;;;;;;;;;;;;;;OAgBG;IACM,wBAAwB,CAAC,OAAyB;QACxD,KAAK,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;QACxC,OAAO,CAAC,MAAM,CAAC,qCAAiB,CAAC,CAAC,EAAE,CAAC,2CAA0B,CAAC,CAAC;IACpE,CAAC;CACH"}
+{"version":3,"file":"glsp-theia-frontend-module.js","sourceRoot":"","sources":["../../src/browser/glsp-theia-frontend-module.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AAElF,uEAQyC;AAEzC,iEAAqG;AAErG,qDAA8D;AAC9D,qDAA4D;AAE5D;;;;;;GAMG;AACU,QAAA,sBAAsB,GAAG,MAAM,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;AAGxG;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,8CAA+D,SAAQ,2CAAuB;IAU3F;;;;;;;;;;OAUG;IACgB,kBAAkB,CAAU;IAE/C;;;;;;;;;OASG;IACO,sBAAsB;QAC7B,OAAO,SAAS,CAAC;IACpB,CAAC;IAED;;;;;;;OAOG;IACM,UAAU,CAAC,OAAyB;QAC1C,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC1B,IAAA,gCAAsB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtD,IAAA,yCAAwB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACxD,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC3B,IAAA,gCAAsB,EAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACjE,CAAC;IACJ,CAAC;IAEQ,wBAAwB,CAAC,OAAyB;QACxD,OAAO,CAAC,IAAI,CAAC,wCAAoB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACpE,CAAC;IAEQ,0BAA0B,CAAC,OAAyB;QAC1D,MAAM,YAAY,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACnD,IAAI,YAAY,KAAK,QAAA,sBAAsB,EAAE,CAAC;YAC3C,OAAO;QACV,CAAC;QACD,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC9B,KAAK,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;YAC1C,OAAO;QACV,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;QACvD,OAAO,CAAC,IAAI,CAAC,0CAAsB,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAChE,CAAC;IAEQ,uBAAuB,CAAC,OAAyB;QACvD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;QAC9D,IAAA,0CAAsB,EAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IACpE,CAAC;IAED;;;;;;;;;;;;;;;;OAgBG;IACM,wBAAwB,CAAC,OAAyB;QACxD,KAAK,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;QACxC,OAAO,CAAC,MAAM,CAAC,qCAAiB,CAAC,CAAC,EAAE,CAAC,2CAA0B,CAAC,CAAC;IACpE,CAAC;CACH"}

package/lib/browser/index.d.ts

@@ -20,5 +20,6 @@ export * from './glsp-theia-frontend-module';
 export * from './hidden-bounds-updater';
 export * from './hydranium-glsp-diagram-configuration';
 export * from './status-overlay';
+export * from './window-session';
 export type { GLSPDiagramLanguage } from '@eclipse-glsp/theia-integration/lib/common';
 //# sourceMappingURL=index.d.ts.map

package/lib/browser/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAIlF,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,wCAAwC,CAAC;AACvD,cAAc,kBAAkB,CAAC;AAKjC,YAAY,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAIlF,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,wCAAwC,CAAC;AACvD,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AAKjC,YAAY,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC"}

package/lib/browser/index.js

@@ -38,4 +38,5 @@ __exportStar(require("./glsp-theia-frontend-module"), exports);
 __exportStar(require("./hidden-bounds-updater"), exports);
 __exportStar(require("./hydranium-glsp-diagram-configuration"), exports);
 __exportStar(require("./status-overlay"), exports);
+__exportStar(require("./window-session"), exports);
 //# sourceMappingURL=index.js.map

package/lib/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;;;;;AAElF,gEAAgE;AAChE,mFAAmF;AACnF,sDAAoC;AACpC,wDAAsC;AACtC,mDAAiC;AACjC,gEAA8C;AAC9C,mDAAiC;AACjC,gDAA8B;AAC9B,6DAA2C;AAC3C,yDAAuC;AACvC,yDAAuC;AACvC,kDAAgC;AAChC,+DAA6C;AAC7C,0DAAwC;AACxC,yEAAuD;AACvD,mDAAiC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;;;;;AAElF,gEAAgE;AAChE,mFAAmF;AACnF,sDAAoC;AACpC,wDAAsC;AACtC,mDAAiC;AACjC,gEAA8C;AAC9C,mDAAiC;AACjC,gDAA8B;AAC9B,6DAA2C;AAC3C,yDAAuC;AACvC,yDAAuC;AACvC,kDAAgC;AAChC,+DAA6C;AAC7C,0DAAwC;AACxC,yEAAuD;AACvD,mDAAiC;AACjC,mDAAiC"}

package/lib/browser/window-session.d.ts

@@ -0,0 +1,57 @@
+/********************************************************************************
+ * Copyright (c) 2026 CrossBreeze, EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License which is available in the project root.
+ *
+ * SPDX-License-Identifier: MIT
+ ********************************************************************************/
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
+import { type interfaces } from '@theia/core/shared/inversify';
+/** The `sessionStorage` key of the window's {@link WindowSession}. */
+export declare const WINDOW_SESSION_KEY = "hydranium.glsp.windowSession";
+/** Holds the id of the window session the last page in the tab left, for the next page to take up. */
+export declare const RELEASED_WINDOW_SESSION_KEY = "hydranium.glsp.releasedWindowSession";
+/** The window's part of every diagram client id it opens, and the token its diagrams resume with. */
+export interface WindowSession {
+    readonly id: string;
+    readonly resumeToken: string;
+}
+export declare function isWindowSession(value: unknown): value is WindowSession;
+export declare const WindowSessionService: unique symbol;
+/**
+ * The page's window session: the one the last page in this tab left, so a
+ * reload resumes its diagrams, and a new one otherwise.
+ *
+ * A reload only has a session to resume on a server that outlives the page; a
+ * server started per frontend, as a Theia plugin host's is, is new after one.
+ */
+export interface WindowSessionService {
+    current(): WindowSession;
+}
+/**
+ * Keeps the window session in `sessionStorage` and hands it on only as the page
+ * leaves. A duplicated tab copies `sessionStorage` while the original page is
+ * still live, so the copy finds no released session and draws its own; taking
+ * the original's would end the original's diagram sessions. Where
+ * `sessionStorage` is unavailable the session lasts for the page, and a reload
+ * resumes nothing.
+ *
+ * Claimed as the frontend starts, not with the first diagram: until then the
+ * released mark stays, and a tab duplicated meanwhile would take it too. A page
+ * restored from the back-forward cache takes the mark back, since Theia
+ * before 1.75 leaves it live without a reload.
+ */
+export declare class DefaultWindowSessionService implements WindowSessionService, FrontendApplicationContribution {
+    protected session?: WindowSession;
+    initialize(): void;
+    current(): WindowSession;
+    protected claim(): WindowSession;
+    protected parse(text: string | null): WindowSession | undefined;
+}
+/**
+ * Bind {@link WindowSessionService} once per container, and claim it as the
+ * frontend starts. An adopter rebinds {@link WindowSessionService}.
+ */
+export declare function bindWindowSessionService(bind: interfaces.Bind, isBound: interfaces.IsBound): void;
+//# sourceMappingURL=window-session.d.ts.map

package/lib/browser/window-session.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"window-session.d.ts","sourceRoot":"","sources":["../../src/browser/window-session.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAIlF,OAAO,EAAE,+BAA+B,EAAE,MAAM,2DAA2D,CAAC;AAC5G,OAAO,EAAc,KAAK,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE3E,sEAAsE;AACtE,eAAO,MAAM,kBAAkB,iCAAiC,CAAC;AACjE,sGAAsG;AACtG,eAAO,MAAM,2BAA2B,yCAAyC,CAAC;AAElF,qGAAqG;AACrG,MAAM,WAAW,aAAa;IAC3B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC/B;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,aAAa,CAOtE;AAED,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE;;;;;;GAMG;AACH,MAAM,WAAW,oBAAoB;IAClC,OAAO,IAAI,aAAa,CAAC;CAC3B;AAED;;;;;;;;;;;;GAYG;AACH,qBACa,2BAA4B,YAAW,oBAAoB,EAAE,+BAA+B;IACtG,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IAElC,UAAU,IAAI,IAAI,CAEjB;IAED,OAAO,IAAI,aAAa,CAGvB;IAED,SAAS,CAAC,KAAK,IAAI,aAAa,CAkB/B;IAED,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,aAAa,GAAG,SAAS,CAO9D;CACH;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,GAAG,IAAI,CAMjG"}

package/lib/browser/window-session.js

@@ -0,0 +1,102 @@
+"use strict";
+/********************************************************************************
+ * Copyright (c) 2026 CrossBreeze, EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License which is available in the project root.
+ *
+ * SPDX-License-Identifier: MIT
+ ********************************************************************************/
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DefaultWindowSessionService = exports.WindowSessionService = exports.RELEASED_WINDOW_SESSION_KEY = exports.WINDOW_SESSION_KEY = void 0;
+exports.isWindowSession = isWindowSession;
+exports.bindWindowSessionService = bindWindowSessionService;
+const protocol_1 = require("@hydranium/protocol");
+// Not the `@theia/core/lib/browser` barrel, which touches DOM globals at load.
+const frontend_application_contribution_1 = require("@theia/core/lib/browser/frontend-application-contribution");
+const inversify_1 = require("@theia/core/shared/inversify");
+/** The `sessionStorage` key of the window's {@link WindowSession}. */
+exports.WINDOW_SESSION_KEY = 'hydranium.glsp.windowSession';
+/** Holds the id of the window session the last page in the tab left, for the next page to take up. */
+exports.RELEASED_WINDOW_SESSION_KEY = 'hydranium.glsp.releasedWindowSession';
+function isWindowSession(value) {
+    return (typeof value === 'object' &&
+        value !== null &&
+        typeof value.id === 'string' &&
+        typeof value.resumeToken === 'string');
+}
+exports.WindowSessionService = Symbol('WindowSessionService');
+/**
+ * Keeps the window session in `sessionStorage` and hands it on only as the page
+ * leaves. A duplicated tab copies `sessionStorage` while the original page is
+ * still live, so the copy finds no released session and draws its own; taking
+ * the original's would end the original's diagram sessions. Where
+ * `sessionStorage` is unavailable the session lasts for the page, and a reload
+ * resumes nothing.
+ *
+ * Claimed as the frontend starts, not with the first diagram: until then the
+ * released mark stays, and a tab duplicated meanwhile would take it too. A page
+ * restored from the back-forward cache takes the mark back, since Theia
+ * before 1.75 leaves it live without a reload.
+ */
+let DefaultWindowSessionService = class DefaultWindowSessionService {
+    session;
+    initialize() {
+        this.current();
+    }
+    current() {
+        this.session ??= this.claim();
+        return this.session;
+    }
+    claim() {
+        const created = { id: (0, protocol_1.randomUuid)(), resumeToken: (0, protocol_1.randomUuid)() };
+        try {
+            const storage = globalThis.sessionStorage;
+            const stored = this.parse(storage.getItem(exports.WINDOW_SESSION_KEY));
+            const session = stored && storage.getItem(exports.RELEASED_WINDOW_SESSION_KEY) === stored.id ? stored : created;
+            storage.setItem(exports.WINDOW_SESSION_KEY, JSON.stringify(session));
+            storage.removeItem(exports.RELEASED_WINDOW_SESSION_KEY);
+            globalThis.addEventListener?.('pagehide', () => storage.setItem(exports.RELEASED_WINDOW_SESSION_KEY, session.id));
+            globalThis.addEventListener?.('pageshow', event => {
+                if (event.persisted) {
+                    storage.removeItem(exports.RELEASED_WINDOW_SESSION_KEY);
+                }
+            });
+            return session;
+        }
+        catch {
+            return created;
+        }
+    }
+    parse(text) {
+        try {
+            const value = text ? JSON.parse(text) : undefined;
+            return isWindowSession(value) ? value : undefined;
+        }
+        catch {
+            return undefined;
+        }
+    }
+};
+exports.DefaultWindowSessionService = DefaultWindowSessionService;
+exports.DefaultWindowSessionService = DefaultWindowSessionService = __decorate([
+    (0, inversify_1.injectable)()
+], DefaultWindowSessionService);
+/**
+ * Bind {@link WindowSessionService} once per container, and claim it as the
+ * frontend starts. An adopter rebinds {@link WindowSessionService}.
+ */
+function bindWindowSessionService(bind, isBound) {
+    if (!isBound(exports.WindowSessionService)) {
+        bind(DefaultWindowSessionService).toSelf().inSingletonScope();
+        bind(exports.WindowSessionService).toService(DefaultWindowSessionService);
+        bind(frontend_application_contribution_1.FrontendApplicationContribution).toService(exports.WindowSessionService);
+    }
+}
+//# sourceMappingURL=window-session.js.map

package/lib/browser/window-session.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydranium/glsp-client-theia",
-  "version": "1.0.0-next.203",
+  "version": "1.0.0-next.205",
   "description": "Theia-coupled client primitives for GLSP heads built on @hydranium/glsp-server. Provides the action dispatcher, channel logger, and connection-handler bases that Theia-based adopters extend; companion of @hydranium/glsp-server.",
   "keywords": [
     "diagram",
@@ -82,10 +82,10 @@
     "@eclipse-glsp/client": "2.7.0",
     "@eclipse-glsp/server": "2.7.0",
     "@eclipse-glsp/theia-integration": "2.7.0",
-    "@hydranium/client-theia": "1.0.0-next.203",
-    "@hydranium/core": "1.0.0-next.203",
-    "@hydranium/glsp-server": "1.0.0-next.203",
-    "@hydranium/protocol": "1.0.0-next.203",
+    "@hydranium/client-theia": "1.0.0-next.205",
+    "@hydranium/core": "1.0.0-next.205",
+    "@hydranium/glsp-server": "1.0.0-next.205",
+    "@hydranium/protocol": "1.0.0-next.205",
     "@theia/core": "^1.70.0",
     "@theia/process": "^1.70.0",
     "@theia/workspace": "^1.70.0",
@@ -99,8 +99,8 @@
   "peerDependencies": {
     "@eclipse-glsp/client": "^2.6.0",
     "@eclipse-glsp/theia-integration": "^2.6.0",
-    "@hydranium/client-theia": "1.0.0-next.203",
-    "@hydranium/protocol": "1.0.0-next.203",
+    "@hydranium/client-theia": "1.0.0-next.205",
+    "@hydranium/protocol": "1.0.0-next.205",
     "@theia/core": "^1.70.0",
     "@theia/process": "^1.70.0",
     "@theia/workspace": "^1.70.0",

package/src/browser/diagram-widget.ts

@@ -7,15 +7,17 @@
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
 
-import { DiagramLoader, EditorContextService, GLSPActionDispatcher, SetViewportAction } from '@eclipse-glsp/client';
+import { type Args, DiagramLoader, EditorContextService, GLSPActionDispatcher, SetViewportAction } from '@eclipse-glsp/client';
+import { RESUME_TOKEN_ARG } from '@hydranium/protocol';
 import { GLSPDiagramWidget, type GLSPDiagramWidgetOptions } from '@eclipse-glsp/theia-integration';
 // Type-only: the `@theia/core/lib/browser` barrel touches DOM globals at module
 // load, which the node-environment unit tests cannot provide.
 import { type Message } from '@theia/core/lib/browser';
 import { Emitter, type Event, nls } from '@theia/core';
-import { type Container, injectable } from '@theia/core/shared/inversify';
+import { type Container, inject, injectable } from '@theia/core/shared/inversify';
 import { type DiagramLoadOutcome, HydraniumDiagramLoader } from './diagram-loader';
 import { HydraniumGlspSaveable } from './glsp-saveable';
+import { WindowSessionService } from './window-session';
 // Shipped by this package rather than left to adopters: an overlay whose
 // stylesheet was forgotten is an unstyled div in normal flow, which is a silent
 // failure. Adopters override individual rules from their own stylesheet.
@@ -54,6 +56,7 @@ export const DIAGRAM_LOADING_FAILED_CLASS = `${DIAGRAM_LOADING_CLASS}-failed`;
  */
 @injectable()
 export class HydraniumGlspDiagramWidget extends GLSPDiagramWidget {
+   @inject(WindowSessionService) protected readonly windowSessions!: WindowSessionService;
    protected loadingOverlay?: HTMLElement;
    protected readonly reopenRequestEmitter = new Emitter<void>();
 
@@ -81,6 +84,11 @@ export class HydraniumGlspDiagramWidget extends GLSPDiagramWidget {
       return new HydraniumGlspSaveable(this.actionDispatcher, this.diContainer.get(EditorContextService));
    }
 
+   /** Adds the window's resume token, so a reload or reconnect takes this diagram's session over. */
+   protected override getRequestModelOptions(): Args {
+      return { ...super.getRequestModelOptions(), [RESUME_TOKEN_ARG]: this.windowSessions.current().resumeToken };
+   }
+
    protected override onAfterAttach(msg: Message): void {
       // Before `super`, which is what starts the load on first attach — so the
       // overlay is already up when the round trip begins.

package/src/browser/glsp-diagram-manager.ts

@@ -7,16 +7,22 @@
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
 
-import { codiconCSSString, DiagramLoader } from '@eclipse-glsp/client';
+import { codiconCSSString, DiagramLoader, type IDiagramOptions } from '@eclipse-glsp/client';
 import { GLSPDiagramManager } from '@eclipse-glsp/theia-integration';
 import { type GLSPDiagramLanguage } from '@eclipse-glsp/theia-integration/lib/common';
-import { type GLSPDiagramWidget, type GLSPWidgetOpenerOptions } from '@eclipse-glsp/theia-integration/lib/browser';
+import {
+   type GLSPDiagramWidget,
+   type GLSPDiagramWidgetOptions,
+   type GLSPWidgetOpenerOptions
+} from '@eclipse-glsp/theia-integration/lib/browser';
 import { type WidgetOpenerOptions } from '@theia/core/lib/browser';
 import { type Disposable, DisposableCollection } from '@theia/core';
-import { injectable } from '@theia/core/shared/inversify';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { textHash } from '@hydranium/protocol';
 import { HydraniumGlspClientContribution } from './client-contribution';
 import { HydraniumDiagramLoader } from './diagram-loader';
 import { HydraniumGlspDiagramWidget } from './diagram-widget';
+import { WindowSessionService } from './window-session';
 
 /**
  * `GLSPDiagramManager` subclass that derives the language-correlated getters
@@ -51,6 +57,8 @@ export abstract class AbstractHydraniumGlspDiagramManager extends GLSPDiagramMan
    /** Optional icon-class override; takes precedence over the language's `iconClass`. */
    protected readonly customIconClass?: string;
 
+   @inject(WindowSessionService) protected readonly windowSessions!: WindowSessionService;
+
    protected clientListeners?: Disposable;
    /** The reopens asked for so far, which run one at a time. */
    protected reopening: Promise<void> = Promise.resolve();
@@ -84,6 +92,23 @@ export abstract class AbstractHydraniumGlspDiagramManager extends GLSPDiagramMan
       return widget;
    }
 
+   /**
+    * The same client id for the same diagram in this window, across a reload
+    * and a reopen after a lost client, so its load takes over the session the
+    * old connection left and keeps its unsaved text. A diagram closed by the
+    * user ends its session, and opening it again starts afresh.
+    *
+    * The widget options enter as a hash: GLSP makes the id an element id and
+    * finds it with an `#id` selector, which a URI's `:` and `/` break. The
+    * options identify the widget, so two widgets of one document, in two edit
+    * modes or set apart by an option an adopter adds, do not take each other's
+    * session over.
+    */
+   protected override createDiagramOptions(options: GLSPDiagramWidgetOptions): IDiagramOptions {
+      const clientId = `${this.diagramType}_${this.windowSessions.current().id}_${textHash(JSON.stringify(options))}`;
+      return { ...super.createDiagramOptions(options), clientId };
+   }
+
    /**
     * Reopen every diagram once its client is lost, since none of them has a
     * server behind it any more, and a failed one once a client starts.
@@ -115,7 +140,8 @@ export abstract class AbstractHydraniumGlspDiagramManager extends GLSPDiagramMan
 
    /**
     * Replace `widget` with a fresh one for the same diagram, in the same tab
-    * position and with its viewport: a new container, client id and load.
+    * position and with its viewport: a new container and load under the same
+    * client id, which takes over the session the old connection left.
     * Reopens run one at a time, since each places its replacement next to a
     * neighbour that a reopen running alongside could take out of the layout.
     */

package/src/browser/glsp-theia-frontend-module.ts

@@ -20,6 +20,7 @@ import { type GLSPDiagramLanguage } from '@eclipse-glsp/theia-integration/lib/co
 import { bindConnectionReporter, bindLogLevelPreference } from '@hydranium/client-theia/lib/browser';
 import type { interfaces } from '@theia/core/shared/inversify';
 import { HydraniumGlspDiagramWidget } from './diagram-widget';
+import { bindWindowSessionService } from './window-session';
 
 /**
  * Sentinel returned from {@link AbstractHydraniumGlspTheiaFrontendModule.bindClientContribution}
@@ -107,6 +108,7 @@ export abstract class AbstractHydraniumGlspTheiaFrontendModule extends GLSPTheia
    override initialize(context: ContainerContext): void {
       super.initialize(context);
       bindConnectionReporter(context.bind, context.isBound);
+      bindWindowSessionService(context.bind, context.isBound);
       if (this.logLevelPreference) {
          bindLogLevelPreference(context.bind, this.logLevelPreference);
       }

package/src/browser/index.ts

@@ -23,6 +23,7 @@ export * from './glsp-theia-frontend-module';
 export * from './hidden-bounds-updater';
 export * from './hydranium-glsp-diagram-configuration';
 export * from './status-overlay';
+export * from './window-session';
 
 // Upstream's root entry is its browser tier and re-exports no `lib/common`, so the
 // type our abstract `diagramLanguage` members are declared with has no bare-specifier

package/src/browser/window-session.ts

@@ -0,0 +1,114 @@
+/********************************************************************************
+ * Copyright (c) 2026 CrossBreeze, EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License which is available in the project root.
+ *
+ * SPDX-License-Identifier: MIT
+ ********************************************************************************/
+
+import { randomUuid } from '@hydranium/protocol';
+// Not the `@theia/core/lib/browser` barrel, which touches DOM globals at load.
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
+import { injectable, type interfaces } from '@theia/core/shared/inversify';
+
+/** The `sessionStorage` key of the window's {@link WindowSession}. */
+export const WINDOW_SESSION_KEY = 'hydranium.glsp.windowSession';
+/** Holds the id of the window session the last page in the tab left, for the next page to take up. */
+export const RELEASED_WINDOW_SESSION_KEY = 'hydranium.glsp.releasedWindowSession';
+
+/** The window's part of every diagram client id it opens, and the token its diagrams resume with. */
+export interface WindowSession {
+   readonly id: string;
+   readonly resumeToken: string;
+}
+
+export function isWindowSession(value: unknown): value is WindowSession {
+   return (
+      typeof value === 'object' &&
+      value !== null &&
+      typeof (value as WindowSession).id === 'string' &&
+      typeof (value as WindowSession).resumeToken === 'string'
+   );
+}
+
+export const WindowSessionService = Symbol('WindowSessionService');
+
+/**
+ * The page's window session: the one the last page in this tab left, so a
+ * reload resumes its diagrams, and a new one otherwise.
+ *
+ * A reload only has a session to resume on a server that outlives the page; a
+ * server started per frontend, as a Theia plugin host's is, is new after one.
+ */
+export interface WindowSessionService {
+   current(): WindowSession;
+}
+
+/**
+ * Keeps the window session in `sessionStorage` and hands it on only as the page
+ * leaves. A duplicated tab copies `sessionStorage` while the original page is
+ * still live, so the copy finds no released session and draws its own; taking
+ * the original's would end the original's diagram sessions. Where
+ * `sessionStorage` is unavailable the session lasts for the page, and a reload
+ * resumes nothing.
+ *
+ * Claimed as the frontend starts, not with the first diagram: until then the
+ * released mark stays, and a tab duplicated meanwhile would take it too. A page
+ * restored from the back-forward cache takes the mark back, since Theia
+ * before 1.75 leaves it live without a reload.
+ */
+@injectable()
+export class DefaultWindowSessionService implements WindowSessionService, FrontendApplicationContribution {
+   protected session?: WindowSession;
+
+   initialize(): void {
+      this.current();
+   }
+
+   current(): WindowSession {
+      this.session ??= this.claim();
+      return this.session;
+   }
+
+   protected claim(): WindowSession {
+      const created: WindowSession = { id: randomUuid(), resumeToken: randomUuid() };
+      try {
+         const storage = globalThis.sessionStorage;
+         const stored = this.parse(storage.getItem(WINDOW_SESSION_KEY));
+         const session = stored && storage.getItem(RELEASED_WINDOW_SESSION_KEY) === stored.id ? stored : created;
+         storage.setItem(WINDOW_SESSION_KEY, JSON.stringify(session));
+         storage.removeItem(RELEASED_WINDOW_SESSION_KEY);
+         globalThis.addEventListener?.('pagehide', () => storage.setItem(RELEASED_WINDOW_SESSION_KEY, session.id));
+         globalThis.addEventListener?.('pageshow', event => {
+            if ((event as PageTransitionEvent).persisted) {
+               storage.removeItem(RELEASED_WINDOW_SESSION_KEY);
+            }
+         });
+         return session;
+      } catch {
+         return created;
+      }
+   }
+
+   protected parse(text: string | null): WindowSession | undefined {
+      try {
+         const value: unknown = text ? JSON.parse(text) : undefined;
+         return isWindowSession(value) ? value : undefined;
+      } catch {
+         return undefined;
+      }
+   }
+}
+
+/**
+ * Bind {@link WindowSessionService} once per container, and claim it as the
+ * frontend starts. An adopter rebinds {@link WindowSessionService}.
+ */
+export function bindWindowSessionService(bind: interfaces.Bind, isBound: interfaces.IsBound): void {
+   if (!isBound(WindowSessionService)) {
+      bind(DefaultWindowSessionService).toSelf().inSingletonScope();
+      bind(WindowSessionService).toService(DefaultWindowSessionService);
+      bind(FrontendApplicationContribution).toService(WindowSessionService);
+   }
+}