@hydranium/glsp-client-theia 1.0.0-next.13 → 1.0.0-next.135

package/lib/browser/hidden-bounds-updater.js

@@ -20,6 +20,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HydraniumHiddenBoundsUpdater = void 0;
 const client_1 = require("@eclipse-glsp/client");
 const browser_1 = require("@hydranium/client-theia/lib/browser");
+const common_1 = require("@hydranium/client-theia/lib/common");
 const protocol_1 = require("@hydranium/protocol");
 const inversify_1 = require("@theia/core/shared/inversify");
 /** How many scoped element ids the log line names before summarising the rest.
@@ -66,9 +67,7 @@ const SCOPE_ID_CAP = 3;
  */
 let HydraniumHiddenBoundsUpdater = class HydraniumHiddenBoundsUpdater extends client_1.GLSPHiddenBoundsUpdater {
     channel;
-    /** Not injected: the browser container binds no {@link Clock}, and this only
-     *  measures — no logic is gated on time, so there is nothing to fake in
-     *  production. Overridden in tests for a deterministic elapsed value. */
+    /** The diagram container's {@link Clock}, or a `SystemClock`; it only measures. */
     clock = new protocol_1.SystemClock();
     /**
      * Scope description for the in-flight request, read from the `cause` in
@@ -201,6 +200,11 @@ __decorate([
     (0, inversify_1.inject)(browser_1.ChannelLogger),
     __metadata("design:type", browser_1.ChannelLogger)
 ], HydraniumHiddenBoundsUpdater.prototype, "channel", void 0);
+__decorate([
+    (0, inversify_1.inject)(common_1.Clock),
+    (0, inversify_1.optional)(),
+    __metadata("design:type", Object)
+], HydraniumHiddenBoundsUpdater.prototype, "clock", void 0);
 exports.HydraniumHiddenBoundsUpdater = HydraniumHiddenBoundsUpdater = __decorate([
     (0, inversify_1.injectable)()
 ], HydraniumHiddenBoundsUpdater);

package/lib/browser/hidden-bounds-updater.js.map

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

package/lib/browser/index.d.ts

@@ -14,7 +14,9 @@ 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 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;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,iBAAiB,CAAC;AAChC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,wCAAwC,CAAC;AAKvD,YAAY,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC"}

package/lib/browser/index.js

@@ -32,6 +32,7 @@ __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);

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,gEAAgE;AAChE,mFAAmF;AACnF,sDAAoC;AACpC,wDAAsC;AACtC,mDAAiC;AACjC,gEAA8C;AAC9C,mDAAiC;AACjC,6DAA2C;AAC3C,yDAAuC;AACvC,yDAAuC;AACvC,kDAAgC;AAChC,+DAA6C;AAC7C,0DAAwC;AACxC,yEAAuD"}

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

@@ -7,7 +7,6 @@
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
 import { AbstractSocketForwardingConnectionHandler } from '@hydranium/client-theia/lib/node';
-import { type Channel, type Disposable } from '@theia/core';
 import type * as net from 'net';
 /** Options for `GlspServerConnectionHandler`. The language contribution
  *  id determines the per-language servicePath that Theia routes browser-frontend
@@ -16,6 +15,16 @@ 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.
+     */
+    readonly serverName?: string;
     readonly findPortTimeout?: number;
     readonly findPortAttempts?: number;
     readonly connectTimeoutMs?: number;
@@ -32,18 +41,15 @@ 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;
 }
 //# 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,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,kCAAkC,CAAC;AAE7F,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;;;;;;;;;;GAUG;AACH,qBACa,2BAA4B,SAAQ,yCAAyC;gBAC9D,OAAO,EAAE,kCAAkC;CAYtE"}

package/lib/node/glsp-server-connection-handler.js

@@ -22,38 +22,32 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GlspServerConnectionHandler = void 0;
 const common_1 = require("@eclipse-glsp/theia-integration/lib/common");
-const node_1 = require("@eclipse-glsp/theia-integration/lib/node");
-const node_2 = require("@hydranium/client-theia/lib/node");
+const node_1 = require("@hydranium/client-theia/lib/node");
 const inversify_1 = require("@theia/core/shared/inversify");
 /**
  * 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.
  */
-let GlspServerConnectionHandler = class GlspServerConnectionHandler extends node_2.AbstractSocketForwardingConnectionHandler {
+let GlspServerConnectionHandler = class GlspServerConnectionHandler extends node_1.AbstractSocketForwardingConnectionHandler {
     constructor(options) {
         super({
             path: common_1.GLSPContribution.servicePath + '/' + options.languageContributionId,
             portCommand: options.portCommand,
             logComponent: 'GLSP',
-            serverName: 'Graphical Server',
+            serverName: options.serverName ?? 'Graphical Server',
             findPortTimeout: options.findPortTimeout,
             findPortAttempts: options.findPortAttempts,
             connectTimeoutMs: options.connectTimeoutMs,
             onSocketCreated: options.onSocketCreated
         });
     }
-    forwardToSocketConnection(clientChannel, socket) {
-        return new node_1.SocketConnectionForwarder(clientChannel, socket);
-    }
 };
 exports.GlspServerConnectionHandler = GlspServerConnectionHandler;
 exports.GlspServerConnectionHandler = GlspServerConnectionHandler = __decorate([

package/lib/node/glsp-server-connection-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-server-connection-handler.js","sourceRoot":"","sources":["../../src/node/glsp-server-connection-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;;;;AAElF,uEAA8E;AAC9E,mEAAqF;AACrF,2DAA6F;AAE7F,4DAAqE;AAwBrE;;;;;;;;;;;;GAYG;AAEI,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,gDAAyC;IACvF,YAAyB,OAA2C;QACjE,KAAK,CAAC;YACH,IAAI,EAAE,yBAAgB,CAAC,WAAW,GAAG,GAAG,GAAG,OAAO,CAAC,sBAAsB;YACzE,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,YAAY,EAAE,MAAM;YACpB,UAAU,EAAE,kBAAkB;YAC9B,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;SAC1C,CAAC,CAAC;IACN,CAAC;IAES,yBAAyB,CAAC,aAAsB,EAAE,MAAkB;QAC3E,OAAO,IAAI,gCAAyB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;CACH,CAAA;AAjBY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,sBAAU,GAAE;IAEG,WAAA,IAAA,qBAAS,GAAE,CAAA;;GADd,2BAA2B,CAiBvC"}
+{"version":3,"file":"glsp-server-connection-handler.js","sourceRoot":"","sources":["../../src/node/glsp-server-connection-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;;;;AAElF,uEAA8E;AAC9E,2DAA6F;AAC7F,4DAAqE;AAkCrE;;;;;;;;;;GAUG;AAEI,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,gDAAyC;IACvF,YAAyB,OAA2C;QACjE,KAAK,CAAC;YACH,IAAI,EAAE,yBAAgB,CAAC,WAAW,GAAG,GAAG,GAAG,OAAO,CAAC,sBAAsB;YACzE,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,YAAY,EAAE,MAAM;YACpB,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,kBAAkB;YACpD,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;SAC1C,CAAC,CAAC;IACN,CAAC;CACH,CAAA;AAbY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,sBAAU,GAAE;IAEG,WAAA,IAAA,qBAAS,GAAE,CAAA;;GADd,2BAA2B,CAavC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydranium/glsp-client-theia",
-  "version": "1.0.0-next.13",
+  "version": "1.0.0-next.135",
   "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": [
     "hydranium",
@@ -77,15 +77,19 @@
   },
   "devDependencies": {
     "@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.13",
-    "@hydranium/protocol": "1.0.0-next.13",
-    "@theia/core": "^1.71.0",
-    "@theia/output": "^1.71.0",
-    "@theia/process": "^1.71.0",
-    "@theia/workspace": "^1.71.0",
+    "@hydranium/client-theia": "1.0.0-next.135",
+    "@hydranium/core": "1.0.0-next.135",
+    "@hydranium/glsp-server": "1.0.0-next.135",
+    "@hydranium/protocol": "1.0.0-next.135",
+    "@theia/core": "^1.70.0",
+    "@theia/output": "^1.70.0",
+    "@theia/process": "^1.70.0",
+    "@theia/workspace": "^1.70.0",
     "@types/node": "^22.0.0",
     "inversify": "6.2.2",
+    "reflect-metadata": "0.2.2",
     "rimraf": "^5.0.0",
     "snabbdom": "3.5.1",
     "typescript": "^5.8.0"
@@ -93,12 +97,12 @@
   "peerDependencies": {
     "@eclipse-glsp/client": "^2.6.0",
     "@eclipse-glsp/theia-integration": "^2.6.0",
-    "@hydranium/client-theia": "1.0.0-next.13",
-    "@hydranium/protocol": "1.0.0-next.13",
-    "@theia/core": "^1.71.0",
-    "@theia/output": "^1.71.0",
-    "@theia/process": "^1.71.0",
-    "@theia/workspace": "^1.71.0",
+    "@hydranium/client-theia": "1.0.0-next.135",
+    "@hydranium/protocol": "1.0.0-next.135",
+    "@theia/core": "^1.70.0",
+    "@theia/output": "^1.70.0",
+    "@theia/process": "^1.70.0",
+    "@theia/workspace": "^1.70.0",
     "inversify": "^6.0.0",
     "snabbdom": "^3.5.1"
   },

package/src/browser/diagram-loader.ts

@@ -10,6 +10,7 @@
 import { DiagramLoader, type DiagramLoadingOptions, StatusAction } from '@eclipse-glsp/client';
 import { ChannelLogger } from '@hydranium/client-theia/lib/browser';
 import { Deferred } from '@hydranium/protocol';
+import { nls } from '@theia/core';
 import { inject, injectable } from '@theia/core/shared/inversify';
 
 /**
@@ -156,13 +157,25 @@ export class HydraniumDiagramLoader extends DiagramLoader {
 
    /**
     * The sentence a failed load is reported with, on every surface that reports
-    * it, and the only seam an adopter rewords or localizes it at. Public
-    * because the canvas overlay is one of those surfaces and lives in another
-    * class: it renders this failure exactly when the `StatusAction` did not
-    * land, so a second copy of the sentence there could only ever drift unseen.
+    * it. Public because the canvas overlay is one of those surfaces and lives in
+    * another class: it renders this failure exactly when the `StatusAction` did
+    * not land, so a second copy of the sentence there could only ever drift
+    * unseen.
+    *
+    * **The seam and the catalogue key answer different questions, so it carries
+    * both.** Overriding this method changes the WORDING for every user of one
+    * adopter's product; the key is what gives a reader the sentence in their own
+    * language, and no override can supply that without an adopter writing a
+    * subclass per locale — which is the thing a catalogue exists to avoid. Two
+    * of the three surfaces this reaches are user-visible, so the audience
+    * triage answers it: a host-bound string a user sees takes an inline key.
+    *
+    * The Output-channel line is therefore localized too, which is deliberate
+    * rather than overlooked — the alternative is a second English copy of one
+    * sentence, and the reason for a single source here has not changed.
     */
    loadFailureLabel(err: unknown): string {
-      return `Diagram failed to load: ${this.formatError(err)}`;
+      return nls.localize('hydranium/glsp-client-theia/diagram-load-failed', 'Diagram failed to load: {0}', this.formatError(err));
    }
 
    /** Render a thrown value as a message. Shared so the channel line, the status

package/src/browser/diagram-widget.ts

@@ -7,13 +7,14 @@
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
 
-import { DiagramLoader } from '@eclipse-glsp/client';
-import { GLSPDiagramWidget } from '@eclipse-glsp/theia-integration';
+import { DiagramLoader, EditorContextService } from '@eclipse-glsp/client';
+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 { injectable } from '@theia/core/shared/inversify';
+import { type Container, injectable } from '@theia/core/shared/inversify';
 import { type DiagramLoadOutcome, HydraniumDiagramLoader } from './diagram-loader';
+import { HydraniumGlspSaveable } from './glsp-saveable';
 // 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.
@@ -56,11 +57,31 @@ export const DIAGRAM_LOADING_FAILED_CLASS = `${DIAGRAM_LOADING_CLASS}-failed`;
  * Bound unconditionally by `AbstractHydraniumGlspTheiaFrontendModule`. To opt out,
  * override {@link showLoadingOverlay} to a no-op; to change what is rendered,
  * override {@link createLoadingOverlay} or {@link loadingLabel}.
+ *
+ * Its saveable is a {@link HydraniumGlspSaveable}, which keeps a pending save
+ * dirty, so Theia's exit check still counts it; see {@link createSaveable}.
  */
 @injectable()
 export class HydraniumGlspDiagramWidget extends GLSPDiagramWidget {
    protected loadingOverlay?: HTMLElement;
 
+   /**
+    * Replaces the saveable GLSP's `configure` builds inline, with no factory
+    * seam. The widget factory calls `configure` before the widget reaches the
+    * shell, so Theia only ever tracks this one.
+    */
+   override configure(options: GLSPDiagramWidgetOptions, diContainer: Container): void {
+      super.configure(options, diContainer);
+      this.saveable.dispose();
+      this.saveable = this.createSaveable();
+      this.toDispose.push(this.saveable);
+   }
+
+   /** The widget's saveable. Override to change how saves and dirty state behave. */
+   protected createSaveable(): GLSPDiagramWidget['saveable'] {
+      return new HydraniumGlspSaveable(this.actionDispatcher, this.diContainer.get(EditorContextService));
+   }
+
    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

@@ -10,6 +10,8 @@
 import { codiconCSSString } 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 WidgetOpenerOptions } from '@theia/core/lib/browser';
 import { injectable } from '@theia/core/shared/inversify';
 
 /**
@@ -64,4 +66,31 @@ export abstract class AbstractHydraniumGlspDiagramManager extends GLSPDiagramMan
    get label(): string {
       return this.managerLabel;
    }
+
+   /**
+    * Drops a `selection` key that is present but `undefined` before the base
+    * class reads it.
+    *
+    * Without this, opening a diagram from Theia's file picker throws and the
+    * editor never leaves "Loading diagram…". Upstream's
+    * `OptionsWithSelection.is` tests `'selection' in options`, which is true for
+    * a key explicitly set to `undefined`, and the branch it guards then calls
+    * `Object.keys` on that value. Theia's own `QuickFileOpenService` always sets
+    * the key — its `buildOpenerOptions` returns `{ selection: range }`, and
+    * `range` is `undefined` unless the query carried a `:line:column` suffix —
+    * so the crash is reached by the ordinary act of opening a diagram by name.
+    *
+    * Normalising the OPTIONS rather than rebinding
+    * `TheiaOpenerOptionsNavigationService`: the service is shared by every
+    * diagram type in the container, so replacing it would make one adopter's
+    * fix silently global, and the guard belongs where the value enters rather
+    * than where it is consumed. The base method stays the single implementation.
+    */
+   protected override handleNavigations(widget: GLSPDiagramWidget, options?: WidgetOpenerOptions): boolean {
+      if (options && 'selection' in options && (options as { selection?: unknown }).selection === undefined) {
+         const { selection: _dropped, ...rest } = options as WidgetOpenerOptions & { selection?: unknown };
+         return super.handleNavigations(widget, rest);
+      }
+      return super.handleNavigations(widget, options);
+   }
 }

package/src/browser/glsp-message-service.ts

@@ -24,6 +24,14 @@ import { type interfaces, injectable } from '@theia/core/shared/inversify';
  * Matching an English literal fails silently — no error, no log line, just the
  * duplicate progress popup back — so this needs keeping in step with
  * `RequestModelActionHandler` on every GLSP bump.
+ *
+ * **Exported to be imported, and it must NOT be externalized.** An adopter
+ * subclassing the message service needs the same literal to match on, and a
+ * second copy of it is a second thing to keep in step across that bump. It is
+ * also the one user-visible string in the framework that is deliberately excluded
+ * from the message catalogue: it exists to equal an upstream English literal that
+ * lives in no catalogue, so giving it a code and a translation would break the
+ * match it exists for.
  */
 export const MODEL_LOADING_PROGRESS_TITLE = 'Model loading in progress';
 

package/src/browser/glsp-saveable.ts

@@ -0,0 +1,110 @@
+/********************************************************************************
+ * 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 { RequestSaveModelAction } from '@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.
+import { GLSPSaveable } from '@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.
+ */
+export class HydraniumGlspSaveable extends GLSPSaveable {
+   /**
+    * How long a save waits for the server's response before it rejects.
+    * Long, because the wait only runs out when the server hangs, and a save
+    * that rejects in Theia's Save All lets the window close over it.
+    */
+   protected override saveTimeout = 10_000;
+   /** The saves sent and not yet settled. */
+   protected readonly pendingSaves = new Set<Promise<void>>();
+
+   override get dirty(): boolean {
+      if (!this.serverAnswersSaves()) {
+         return super.dirty;
+      }
+      return this.editorContextService.isDirty || this.pendingSaves.size > 0;
+   }
+
+   override save(): Promise<void> {
+      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.
+    */
+   protected serverAnswersSaves(): boolean {
+      return this.actionDispatcher.hasHandler(RequestSaveModelAction.create());
+   }
+
+   protected sendSave(): Promise<void> {
+      // `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(RequestSaveModelAction.create());
+      let timer: ReturnType<typeof setTimeout> | undefined;
+      const timedOut = new Promise<never>((_resolve, reject) => {
+         timer = setTimeout(() => reject(new Error('Save operation timed out')), this.saveTimeout);
+      });
+      const saving: Promise<void> = Promise.race([response, timedOut])
+         .then(() => undefined)
+         .finally(() => {
+            clearTimeout(timer);
+            this.pendingSaves.delete(saving);
+            this.onDirtyChangedEmitter.fire(undefined);
+         });
+      this.pendingSaves.add(saving);
+      return saving;
+   }
+}

package/src/browser/hidden-bounds-updater.ts

@@ -20,8 +20,9 @@ import {
    isRoutable
 } from '@eclipse-glsp/client';
 import { ChannelLogger } from '@hydranium/client-theia/lib/browser';
-import { type Clock, SystemClock } from '@hydranium/protocol';
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { Clock } from '@hydranium/client-theia/lib/common';
+import { SystemClock } from '@hydranium/protocol';
+import { inject, injectable, optional } from '@theia/core/shared/inversify';
 import { type VNode } from 'snabbdom';
 
 /** How many scoped element ids the log line names before summarising the rest.
@@ -71,10 +72,8 @@ const SCOPE_ID_CAP = 3;
 export class HydraniumHiddenBoundsUpdater extends GLSPHiddenBoundsUpdater {
    @inject(ChannelLogger) protected readonly channel!: ChannelLogger;
 
-   /** Not injected: the browser container binds no {@link Clock}, and this only
-    *  measures — no logic is gated on time, so there is nothing to fake in
-    *  production. Overridden in tests for a deterministic elapsed value. */
-   protected readonly clock: Clock = new SystemClock();
+   /** The diagram container's {@link Clock}, or a `SystemClock`; it only measures. */
+   @inject(Clock) @optional() protected readonly clock: Clock = new SystemClock();
 
    /**
     * Scope description for the in-flight request, read from the `cause` in

package/src/browser/index.ts

@@ -17,6 +17,12 @@ 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';
+
+// 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
+// path — without this line every adopter implementing one deep-imports it.
+export type { GLSPDiagramLanguage } from '@eclipse-glsp/theia-integration/lib/common';

package/src/node/glsp-server-connection-handler.ts

@@ -8,9 +8,7 @@
  ********************************************************************************/
 
 import { GLSPContribution } from '@eclipse-glsp/theia-integration/lib/common';
-import { SocketConnectionForwarder } from '@eclipse-glsp/theia-integration/lib/node';
 import { AbstractSocketForwardingConnectionHandler } from '@hydranium/client-theia/lib/node';
-import { type Channel, type Disposable } from '@theia/core';
 import { injectable, unmanaged } from '@theia/core/shared/inversify';
 import type * as net from 'net';
 
@@ -21,6 +19,16 @@ 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.
+    */
+   readonly serverName?: string;
    readonly findPortTimeout?: number;
    readonly findPortAttempts?: number;
    readonly connectTimeoutMs?: number;
@@ -38,15 +46,13 @@ 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.
  */
 @injectable()
 export class GlspServerConnectionHandler extends AbstractSocketForwardingConnectionHandler {
@@ -55,15 +61,11 @@ export class GlspServerConnectionHandler extends AbstractSocketForwardingConnect
          path: GLSPContribution.servicePath + '/' + options.languageContributionId,
          portCommand: options.portCommand,
          logComponent: 'GLSP',
-         serverName: 'Graphical Server',
+         serverName: options.serverName ?? 'Graphical Server',
          findPortTimeout: options.findPortTimeout,
          findPortAttempts: options.findPortAttempts,
          connectTimeoutMs: options.connectTimeoutMs,
          onSocketCreated: options.onSocketCreated
       });
    }
-
-   protected forwardToSocketConnection(clientChannel: Channel, socket: net.Socket): Disposable {
-      return new SocketConnectionForwarder(clientChannel, socket);
-   }
 }