@hydranium/glsp-client-theia 1.0.0-next.32 → 1.0.0-next.321

package/lib/browser/glsp-saveable.js

@@ -0,0 +1,110 @@
+"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
+ ********************************************************************************/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HydraniumGlspSaveable = void 0;
+const protocol_1 = require("@hydranium/protocol");
+// The module path, not the package root: the root also loads GLSP's diagram
+// widget, which touches DOM globals at module load, and this module's unit tests
+// load it in Node.
+const glsp_saveable_1 = require("@eclipse-glsp/theia-integration/lib/browser/diagram/glsp-saveable");
+/**
+ * A `GLSPSaveable` whose every save is a request the server answers, and which
+ * stays dirty until that answer arrives.
+ *
+ * GLSP's sends a `SaveModelAction`, which the server does not answer. It takes
+ * the next dirty-state change to clean as the answer, but the editor context
+ * reports a change only when the dirty flag changes: the second of two saves
+ * gets no answer, and a failed save gets none either. Here each save sends a
+ * `RequestSaveModelAction` and settles on the response to that request only:
+ * it resolves when the server has saved, rejects when the server rejects it,
+ * and rejects when {@link saveTimeout} runs out. A save sent while another is
+ * pending is a request of its own, so an edit made between the two is saved.
+ *
+ * GLSP's also reports not dirty from the moment it sends a save. Theia's exit
+ * check asks only whether anything is dirty, so the window closes over a save
+ * the server has not finished, and a page reloaded right after Ctrl+S gives no
+ * warning. Here the saveable is dirty while any save is pending. GLSP's also
+ * gives up after 2 s, and Theia's Save All then counts the save as failed and
+ * closes the window anyway, so a slow save of a large model is cut off.
+ *
+ * The dirty flag still comes from the server. An edit whose dirty-state change
+ * has not arrived when Save All runs does not make the saveable dirty, so that
+ * edit is not saved.
+ *
+ * The server answers only where the diagram module registers the request's
+ * handler; `AbstractHydraniumGlspDiagramModule` does. A server without it does
+ * not advertise the request, and against such a server the saveable is GLSP's:
+ * it sends a `SaveModelAction` and reports dirty as GLSP's does. It does not
+ * keep only the dirty-while-pending half there, because GLSP's tracks one
+ * pending save and a second save overwrites it, so the first would never
+ * report clean.
+ *
+ * The answer means the server has done what its save does, which is not always
+ * the disk write: under the `fire-and-forget` `SaveDeliveryPolicy` the server
+ * answers before the write finishes and answers a failed write as saved, so a
+ * window closed on that answer can still lose the write.
+ */
+class HydraniumGlspSaveable extends glsp_saveable_1.GLSPSaveable {
+    /**
+     * How long a save waits for the server's response before it rejects. The
+     * server answers up to its language-client settle bound after the write, so
+     * this exceeds that bound with room for the write itself; a save that
+     * rejects in Theia's Save All lets the window close over it.
+     */
+    saveTimeout = 20_000;
+    /** The saves sent and not yet settled. */
+    pendingSaves = new Set();
+    get dirty() {
+        if (!this.serverAnswersSaves()) {
+            return super.dirty;
+        }
+        return this.editorContextService.isDirty || this.pendingSaves.size > 0;
+    }
+    save() {
+        if (!this.serverAnswersSaves()) {
+            return super.save();
+        }
+        if (this.editorContextService.isDirty) {
+            return this.sendSave();
+        }
+        // Nothing new to save, but a save still pending has not finished.
+        return Promise.all(this.pendingSaves).then(() => undefined);
+    }
+    /**
+     * Whether the server answers a {@link RequestSaveModelAction}. GLSP's model
+     * source registers a handler for each kind the server advertises before it
+     * requests the model, so the dispatcher knows it from the first save on.
+     */
+    serverAnswersSaves() {
+        return this.actionDispatcher.hasHandler(protocol_1.RequestSaveModelAction.create());
+    }
+    sendSave() {
+        // `request` with a bound of our own rather than GLSP's `requestUntil`:
+        // that one forgets a request when it times out, so a late response is
+        // dispatched as an action no client handler takes, which rejects.
+        // Here a late response settles the forgotten request and nothing else.
+        const response = this.actionDispatcher.request(protocol_1.RequestSaveModelAction.create());
+        let timer;
+        const timedOut = new Promise((_resolve, reject) => {
+            timer = setTimeout(() => reject(new Error('Save operation timed out')), this.saveTimeout);
+        });
+        const saving = Promise.race([response, timedOut])
+            .then(() => undefined)
+            .finally(() => {
+            clearTimeout(timer);
+            this.pendingSaves.delete(saving);
+            this.onDirtyChangedEmitter.fire(undefined);
+        });
+        this.pendingSaves.add(saving);
+        return saving;
+    }
+}
+exports.HydraniumGlspSaveable = HydraniumGlspSaveable;
+//# sourceMappingURL=glsp-saveable.js.map

package/lib/browser/glsp-saveable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"glsp-saveable.js","sourceRoot":"","sources":["../../src/browser/glsp-saveable.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AAElF,kDAA6D;AAC7D,4EAA4E;AAC5E,iFAAiF;AACjF,mBAAmB;AACnB,qGAAiG;AAEjG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,2BAAmC,SAAQ,4BAAY;IACpD;;;;;OAKG;IACgB,WAAW,GAAG,MAAM,CAAC;IACxC,0CAA0C;IACvB,YAAY,GAAG,IAAI,GAAG,EAAiB,CAAC;IAE3D,IAAa,KAAK;QACf,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC;YAC9B,OAAO,KAAK,CAAC,KAAK,CAAC;QACtB,CAAC;QACD,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,CAAC;IAC1E,CAAC;IAEQ,IAAI;QACV,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC;YAC9B,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;QACvB,CAAC;QACD,IAAI,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC1B,CAAC;QACD,kEAAkE;QAClE,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC/D,CAAC;IAED;;;;OAIG;IACO,kBAAkB;QACzB,OAAO,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,iCAAsB,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5E,CAAC;IAES,QAAQ;QACf,uEAAuE;QACvE,sEAAsE;QACtE,kEAAkE;QAClE,uEAAuE;QACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,iCAAsB,CAAC,MAAM,EAAE,CAAC,CAAC;QAChF,IAAI,KAAgD,CAAC;QACrD,MAAM,QAAQ,GAAG,IAAI,OAAO,CAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;YACtD,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAC7F,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAkB,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;aAC5D,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;aACrB,OAAO,CAAC,GAAG,EAAE;YACX,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACjC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QACN,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC9B,OAAO,MAAM,CAAC;IACjB,CAAC;CACH"}

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;IAInH;;;;;;;OAOG;IACM,UAAU,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI;IAO3C,wBAAwB,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI;IAIzD,0BAA0B,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI;IAa3D,uBAAuB,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI;IAKjE;;;;;;;;;;;;;;;;OAgBG;IACM,wBAAwB,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI;CAIpE"}
+{"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

@@ -10,8 +10,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractHydraniumGlspTheiaFrontendModule = exports.SkipClientContribution = void 0;
 const theia_integration_1 = require("@eclipse-glsp/theia-integration");
-const browser_1 = require("@hydranium/client-theia/lib/browser");
+const browser_1 = require("@hydranium/client-theia/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"
@@ -84,6 +85,8 @@ 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,iEAA6E;AAE7E,qDAA8D;AAE9D;;;;;;GAMG;AACU,QAAA,sBAAsB,GAAG,MAAM,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;AAGxG;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAsB,wCAAyC,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,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,8BAAsB,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;AA/FD,4FA+FC"}
+{"version":3,"file":"glsp-theia-frontend-module.js","sourceRoot":"","sources":["../../src/browser/glsp-theia-frontend-module.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AAElF,uEAQyC;AAEzC,6DAAiG;AAEjG,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/hydranium-glsp-diagram-configuration.d.ts

@@ -18,7 +18,9 @@ import { type Container } from '@theia/core/shared/inversify';
  * **When to suppress.** A head with a co-resident LSP that publishes its
  * diagnostics over standard LSP `publishDiagnostics` would otherwise list each
  * error twice: GLSP's `TheiaMarkerManager` pushes the *same* errors again under
- * a different marker owner, and Theia shows the union across owners. The GLSP
+ * a different marker owner, and Theia shows the union across owners. One shared
+ * owner would not merge them either: each write replaces that owner's markers
+ * for the file, so the two heads would overwrite each other's. The GLSP
  * path is also open-diagram-scoped (markers clear when the diagram closes), so
  * for such a head it cannot reproduce the LSP head's persistent, cross-file
  * Problems entries — it is only ever a flickering duplicate. A graphical-only

package/lib/browser/hydranium-glsp-diagram-configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hydranium-glsp-diagram-configuration.d.ts","sourceRoot":"","sources":["../../src/browser/hydranium-glsp-diagram-configuration.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAGlF,OAAO,EAAE,wBAAwB,EAA6D,MAAM,iCAAiC,CAAC;AACtI,OAAO,EAAE,KAAK,SAAS,EAAc,MAAM,8BAA8B,CAAC;AAG1E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,8BACsB,yCAA0C,SAAQ,wBAAwB;IAC7F;;;;;OAKG;IACH,SAAS,CAAC,8BAA8B,UAAQ;cAE7B,mBAAmB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;CAOpE"}
+{"version":3,"file":"hydranium-glsp-diagram-configuration.d.ts","sourceRoot":"","sources":["../../src/browser/hydranium-glsp-diagram-configuration.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAGlF,OAAO,EAAE,wBAAwB,EAA6D,MAAM,iCAAiC,CAAC;AACtI,OAAO,EAAE,KAAK,SAAS,EAAc,MAAM,8BAA8B,CAAC;AAG1E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,8BACsB,yCAA0C,SAAQ,wBAAwB;IAC7F;;;;;OAKG;IACH,SAAS,CAAC,8BAA8B,UAAQ;IAEhD,UAAmB,mBAAmB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAMjE;CACH"}

package/lib/browser/hydranium-glsp-diagram-configuration.js

@@ -28,7 +28,9 @@ const diagram_only_marker_manager_js_1 = require("./diagram-only-marker-manager.
  * **When to suppress.** A head with a co-resident LSP that publishes its
  * diagnostics over standard LSP `publishDiagnostics` would otherwise list each
  * error twice: GLSP's `TheiaMarkerManager` pushes the *same* errors again under
- * a different marker owner, and Theia shows the union across owners. The GLSP
+ * a different marker owner, and Theia shows the union across owners. One shared
+ * owner would not merge them either: each write replaces that owner's markers
+ * for the file, so the two heads would overwrite each other's. The GLSP
  * path is also open-diagram-scoped (markers clear when the diagram closes), so
  * for such a head it cannot reproduce the LSP head's persistent, cross-file
  * Problems entries — it is only ever a flickering duplicate. A graphical-only

package/lib/browser/hydranium-glsp-diagram-configuration.js.map

@@ -1 +1 @@
-{"version":3,"file":"hydranium-glsp-diagram-configuration.js","sourceRoot":"","sources":["../../src/browser/hydranium-glsp-diagram-configuration.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;AAGlF,uEAAsI;AACtI,4DAA0E;AAC1E,qFAA6E;AAE7E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEI,IAAe,yCAAyC,GAAxD,MAAe,yCAA0C,SAAQ,4CAAwB;IAC7F;;;;;OAKG;IACO,8BAA8B,GAAG,IAAI,CAAC;IAE7B,mBAAmB,CAAC,SAAoB;QACxD,IAAA,kDAA8B,EAAC,SAAS,EAAE,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAC1E,MAAM,oBAAoB,GAAG,IAAI,CAAC,8BAA8B;YAC7D,CAAC,CAAC,IAAI,CAAC,kBAAkB;YACzB,CAAC,CAAC,GAA0B,EAAE,CAAC,IAAI,0DAAyB,EAAE,CAAC;QAClE,IAAA,6CAAyB,EAAC,SAAS,EAAE,oBAAoB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAChF,CAAC;CACH,CAAA;AAhBqB,8FAAyC;oDAAzC,yCAAyC;IAD9D,IAAA,sBAAU,GAAE;GACS,yCAAyC,CAgB9D"}
+{"version":3,"file":"hydranium-glsp-diagram-configuration.js","sourceRoot":"","sources":["../../src/browser/hydranium-glsp-diagram-configuration.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;AAGlF,uEAAsI;AACtI,4DAA0E;AAC1E,qFAA6E;AAE7E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEI,IAAe,yCAAyC,GAAxD,MAAe,yCAA0C,SAAQ,4CAAwB;IAC7F;;;;;OAKG;IACO,8BAA8B,GAAG,IAAI,CAAC;IAE7B,mBAAmB,CAAC,SAAoB;QACxD,IAAA,kDAA8B,EAAC,SAAS,EAAE,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAC1E,MAAM,oBAAoB,GAAG,IAAI,CAAC,8BAA8B;YAC7D,CAAC,CAAC,IAAI,CAAC,kBAAkB;YACzB,CAAC,CAAC,GAA0B,EAAE,CAAC,IAAI,0DAAyB,EAAE,CAAC;QAClE,IAAA,6CAAyB,EAAC,SAAS,EAAE,oBAAoB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAChF,CAAC;CACH,CAAA;;oDAhBqB,yCAAyC;IAD9D,IAAA,sBAAU,GAAE;GACS,yCAAyC,CAgB9D"}

package/lib/browser/index.d.ts

@@ -6,15 +6,16 @@
  *
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
-export * from './action-dispatcher';
 export * from './client-contribution';
-export * from './diagram-loader';
 export * from './diagram-only-marker-manager';
 export * from './diagram-widget';
 export * from './glsp-client-theia-module';
 export * from './glsp-diagram-manager';
 export * from './glsp-message-service';
+export * from './glsp-saveable';
 export * from './glsp-theia-frontend-module';
-export * from './hidden-bounds-updater';
 export * from './hydranium-glsp-diagram-configuration';
+export * from './theia-diagram-loader';
+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,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,wCAAwC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAMlF,cAAc,uBAAuB,CAAC;AACtC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wCAAwC,CAAC;AACvD,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AAKjC,YAAY,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC"}

package/lib/browser/index.js

@@ -22,17 +22,19 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-// Browser-side framework primitives for GLSP-on-Theia adopters.
-// The cross-head Output-channel logger lives in `@hydranium/client-theia/browser`.
-__exportStar(require("./action-dispatcher"), exports);
+// Browser-side framework primitives for GLSP-on-Theia adopters. The
+// host-neutral classes (the dispatcher, loader, updater, overlay and client)
+// are `@hydranium/glsp-client`'s; the cross-head Output-channel logger lives
+// in `@hydranium/client-theia/browser`.
 __exportStar(require("./client-contribution"), exports);
-__exportStar(require("./diagram-loader"), exports);
 __exportStar(require("./diagram-only-marker-manager"), exports);
 __exportStar(require("./diagram-widget"), exports);
 __exportStar(require("./glsp-client-theia-module"), exports);
 __exportStar(require("./glsp-diagram-manager"), exports);
 __exportStar(require("./glsp-message-service"), exports);
+__exportStar(require("./glsp-saveable"), exports);
 __exportStar(require("./glsp-theia-frontend-module"), exports);
-__exportStar(require("./hidden-bounds-updater"), exports);
 __exportStar(require("./hydranium-glsp-diagram-configuration"), exports);
+__exportStar(require("./theia-diagram-loader"), 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,6DAA2C;AAC3C,yDAAuC;AACvC,yDAAuC;AACvC,+DAA6C;AAC7C,0DAAwC;AACxC,yEAAuD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;;;;;AAElF,oEAAoE;AACpE,6EAA6E;AAC7E,6EAA6E;AAC7E,wCAAwC;AACxC,wDAAsC;AACtC,gEAA8C;AAC9C,mDAAiC;AACjC,6DAA2C;AAC3C,yDAAuC;AACvC,yDAAuC;AACvC,kDAAgC;AAChC,+DAA6C;AAC7C,yEAAuD;AACvD,yDAAuC;AACvC,mDAAiC"}

package/lib/browser/theia-diagram-loader.d.ts

@@ -0,0 +1,25 @@
+/********************************************************************************
+ * 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 { HydraniumDiagramLoader } from '@hydranium/glsp-client';
+/**
+ * The framework loader rendering its failure through Theia's catalogue, which
+ * knows the reading user's locale where the neutral loader does not.
+ *
+ * The key and the English are inline literals, because `theia nls-extract`
+ * drops a key it cannot resolve. The English must match
+ * `DIAGRAM_LOAD_FAILED`'s text in `@hydranium/glsp-client`; a test holds them
+ * equal.
+ *
+ * Bound by `createGlspClientTheiaModule` via `rebind(DiagramLoader)`, after
+ * `createGlspClientModule` bound the neutral loader.
+ */
+export declare class HydraniumGlspTheiaDiagramLoader extends HydraniumDiagramLoader {
+    loadFailureLabel(err: unknown): string;
+}
+//# sourceMappingURL=theia-diagram-loader.d.ts.map

package/lib/browser/theia-diagram-loader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"theia-diagram-loader.d.ts","sourceRoot":"","sources":["../../src/browser/theia-diagram-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAIhE;;;;;;;;;;;GAWG;AACH,qBACa,+BAAgC,SAAQ,sBAAsB;IAC/D,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAE9C;CACH"}

package/lib/browser/theia-diagram-loader.js

@@ -0,0 +1,42 @@
+"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.HydraniumGlspTheiaDiagramLoader = void 0;
+const glsp_client_1 = require("@hydranium/glsp-client");
+const core_1 = require("@theia/core");
+const inversify_1 = require("@theia/core/shared/inversify");
+/**
+ * The framework loader rendering its failure through Theia's catalogue, which
+ * knows the reading user's locale where the neutral loader does not.
+ *
+ * The key and the English are inline literals, because `theia nls-extract`
+ * drops a key it cannot resolve. The English must match
+ * `DIAGRAM_LOAD_FAILED`'s text in `@hydranium/glsp-client`; a test holds them
+ * equal.
+ *
+ * Bound by `createGlspClientTheiaModule` via `rebind(DiagramLoader)`, after
+ * `createGlspClientModule` bound the neutral loader.
+ */
+let HydraniumGlspTheiaDiagramLoader = class HydraniumGlspTheiaDiagramLoader extends glsp_client_1.HydraniumDiagramLoader {
+    loadFailureLabel(err) {
+        return core_1.nls.localize('hydranium/glsp-client-theia/diagram-load-failed', 'Diagram failed to load: {0}', this.formatError(err));
+    }
+};
+exports.HydraniumGlspTheiaDiagramLoader = HydraniumGlspTheiaDiagramLoader;
+exports.HydraniumGlspTheiaDiagramLoader = HydraniumGlspTheiaDiagramLoader = __decorate([
+    (0, inversify_1.injectable)()
+], HydraniumGlspTheiaDiagramLoader);
+//# sourceMappingURL=theia-diagram-loader.js.map

package/lib/browser/theia-diagram-loader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"theia-diagram-loader.js","sourceRoot":"","sources":["../../src/browser/theia-diagram-loader.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;AAElF,wDAAgE;AAChE,sCAAkC;AAClC,4DAA0D;AAE1D;;;;;;;;;;;GAWG;AAEI,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,oCAAsB;IAC/D,gBAAgB,CAAC,GAAY;QACnC,OAAO,UAAG,CAAC,QAAQ,CAAC,iDAAiD,EAAE,6BAA6B,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;IAChI,CAAC;CACH,CAAA;;0CAJY,+BAA+B;IAD3C,IAAA,sBAAU,GAAE;GACA,+BAA+B,CAI3C"}

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/lib/node/connection-container-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection-container-module.js","sourceRoot":"","sources":["../../src/node/connection-container-module.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;AAgBlF,kFAUC;AAxBD,sCAAgD;AAChD,4GAAuG;AACvG,4DAAgF;AAEhF;;;;;;;;;GASG;AACH,SAAgB,mCAAmC,CAAC,YAAmD;IACpG,MAAM,8BAA8B,GAAG,uDAAyB,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QAClF,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;QAC/C,IAAI,CAAC,wBAAiB,CAAC;aACnB,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;aAC9D,gBAAgB,EAAE,CAAC;IAC1B,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;QAC/B,IAAI,CAAC,uDAAyB,CAAC,CAAC,eAAe,CAAC,8BAA8B,CAAC,CAAC;IACnF,CAAC,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"connection-container-module.js","sourceRoot":"","sources":["../../src/node/connection-container-module.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AAElF,sCAAgD;AAChD,4GAAuG;AACvG,4DAAgF;AAEhF;;;;;;;;;GASG;AACH,6CAAoD,YAAmD;IACpG,MAAM,8BAA8B,GAAG,uDAAyB,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QAClF,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;QAC/C,IAAI,CAAC,wBAAiB,CAAC;aACnB,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;aAC9D,gBAAgB,EAAE,CAAC;IAC1B,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;QAC/B,IAAI,CAAC,uDAAyB,CAAC,CAAC,eAAe,CAAC,8BAA8B,CAAC,CAAC;IACnF,CAAC,CAAC,CAAC;AACN,CAAC"}

package/lib/node/glsp-server-connection-handler.d.ts

@@ -6,8 +6,7 @@
  *
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
-import { AbstractSocketForwardingConnectionHandler } from '@hydranium/client-theia/lib/node';
-import { type Channel, type Disposable } from '@theia/core';
+import { AbstractSocketForwardingConnectionHandler } from '@hydranium/client-theia/node';
 import type * as net from 'net';
 /** Options for `GlspServerConnectionHandler`. The language contribution
  *  id determines the per-language servicePath that Theia routes browser-frontend
@@ -16,15 +15,7 @@ import type * as net from 'net';
 export interface GlspServerConnectionHandlerOptions {
     readonly languageContributionId: string;
     readonly portCommand: string;
-    /**
-     * Product name for the connect-failure dialog this handler raises.
-     *
-     * It reaches the adopter's UI verbatim, so the framework default leaks a
-     * framework noun into a product that is not ours. Not a translation concern —
-     * routing it through a catalogue would ask an adopter to "translate" English
-     * into their own product name, and would make their branding
-     * locale-dependent.
-     */
+    /** Name of the server in this handler's log lines. */
     readonly serverName?: string;
     readonly findPortTimeout?: number;
     readonly findPortAttempts?: number;
@@ -42,18 +33,18 @@ export interface GlspServerConnectionHandlerOptions {
 /**
  * Bridges a Theia browser-frontend channel to a GLSP server's TCP socket.
  *
- * The port-discovery + buffer-and-replay race fix + connect orchestration live
- * on the cross-head {@link AbstractSocketForwardingConnectionHandler} base; this
- * subclass supplies only the GLSP specifics — the per-language servicePath
+ * The port discovery, the buffer-and-replay race fix, the connect orchestration
+ * and the byte forwarder live on the cross-head
+ * {@link AbstractSocketForwardingConnectionHandler} base; this subclass supplies
+ * only the GLSP specifics — the per-language servicePath
  * (`GLSPContribution.servicePath + '/' + languageContributionId`), the port
- * command, the log labels — and plugs in `@eclipse-glsp/theia-integration`'s
- * `SocketConnectionForwarder` as the byte relay. Adopters with different
- * language ids or command names subclass with a one-line `super({...})` call.
- * Sibling of `@hydranium/data-client-theia`'s `DataServerConnectionHandler`,
- * which subclasses the same base with its own GLSP-free forwarder.
+ * command, the log labels. Adopters with different language ids or command
+ * names subclass with a one-line `super({...})` call.
  */
 export declare class GlspServerConnectionHandler extends AbstractSocketForwardingConnectionHandler {
     constructor(options: GlspServerConnectionHandlerOptions);
-    protected forwardToSocketConnection(clientChannel: Channel, socket: net.Socket): Disposable;
+    /** Logged only: the frontend contribution reports the failed start, and a
+     *  second notification would duplicate it. */
+    protected reportConnectFailure(): void;
 }
 //# sourceMappingURL=glsp-server-connection-handler.d.ts.map

package/lib/node/glsp-server-connection-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-server-connection-handler.d.ts","sourceRoot":"","sources":["../../src/node/glsp-server-connection-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAIlF,OAAO,EAAE,yCAAyC,EAAE,MAAM,kCAAkC,CAAC;AAC7F,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAE5D,OAAO,KAAK,KAAK,GAAG,MAAM,KAAK,CAAC;AAEhC;;;iDAGiD;AACjD,MAAM,WAAW,kCAAkC;IAChD,QAAQ,CAAC,sBAAsB,EAAE,MAAM,CAAC;IACxC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B;;;;;;;;OAQG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC;;;;;;;OAOG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC;CAC1D;AAED;;;;;;;;;;;;GAYG;AACH,qBACa,2BAA4B,SAAQ,yCAAyC;gBAC9D,OAAO,EAAE,kCAAkC;IAapE,SAAS,CAAC,yBAAyB,CAAC,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,UAAU;CAG7F"}
+{"version":3,"file":"glsp-server-connection-handler.d.ts","sourceRoot":"","sources":["../../src/node/glsp-server-connection-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAGlF,OAAO,EAAE,yCAAyC,EAAE,MAAM,8BAA8B,CAAC;AAEzF,OAAO,KAAK,KAAK,GAAG,MAAM,KAAK,CAAC;AAEhC;;;iDAGiD;AACjD,MAAM,WAAW,kCAAkC;IAChD,QAAQ,CAAC,sBAAsB,EAAE,MAAM,CAAC;IACxC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,sDAAsD;IACtD,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC;;;;;;;OAOG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC;CAC1D;AAED;;;;;;;;;;GAUG;AACH,qBACa,2BAA4B,SAAQ,yCAAyC;IACvF,YAAyB,OAAO,EAAE,kCAAkC,EAWnE;IAED;kDAC8C;IAC9C,UAAmB,oBAAoB,IAAI,IAAI,CAAG;CACpD"}