@hydranium/glsp-client-theia 1.0.0-next.19 → 1.0.0-next.192

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

@@ -26,8 +26,7 @@ export interface DiagramLoadFailure {
     readonly error: unknown;
     /**
      * Whether the `severity: 'ERROR'` {@link StatusAction} reached the action
-     * dispatcher — i.e. whether GLSP's `StatusOverlay` is now displaying this
-     * failure.
+     * dispatcher. It says nothing about whether a status overlay shows it.
      *
      * `false` means the report itself failed, which happens when the action
      * dispatcher is the thing that could not initialize. A consumer that covers
@@ -110,10 +109,20 @@ export declare class HydraniumDiagramLoader extends DiagramLoader {
     protected reportLoadFailure(err: unknown): Promise<boolean>;
     /**
      * 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, where a second copy of the sentence would drift.
+     *
+     * **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;
     /** Render a thrown value as a message. Shared so the channel line, the status

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

@@ -1 +1 @@
-{"version":3,"file":"diagram-loader.d.ts","sourceRoot":"","sources":["../../src/browser/diagram-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,aAAa,EAAE,KAAK,qBAAqB,EAAgB,MAAM,sBAAsB,CAAC;AAC/F,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAG/C;;;;;;GAMG;AACH,MAAM,MAAM,kBAAkB,GAAG,kBAAkB,GAAG,kBAAkB,CAAC;AAEzE,MAAM,WAAW,kBAAkB;IAChC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;CAC5B;AAED,MAAM,WAAW,kBAAkB;IAChC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC1B,iFAAiF;IACjF,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC7B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,qBACa,sBAAuB,SAAQ,aAAa;IAC/B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAG,aAAa,CAAC;IAElE,SAAS,CAAC,QAAQ,CAAC,OAAO,+BAAsC;IAChE,SAAS,CAAC,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAEvC;;;+DAG2D;IAC3D,IAAI,WAAW,IAAI,kBAAkB,GAAG,SAAS,CAEhD;IAED;uEACmE;IACnE,eAAe,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAI/B,IAAI,CAAC,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAcnE;;;;;;;;;;;OAWG;IACH,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAQnD;;;;;;;;;;;OAWG;cACa,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAYjE;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM;IAItC;qFACiF;IACjF,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM;CAG7C"}
+{"version":3,"file":"diagram-loader.d.ts","sourceRoot":"","sources":["../../src/browser/diagram-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,aAAa,EAAE,KAAK,qBAAqB,EAAgB,MAAM,sBAAsB,CAAC;AAC/F,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAI/C;;;;;;GAMG;AACH,MAAM,MAAM,kBAAkB,GAAG,kBAAkB,GAAG,kBAAkB,CAAC;AAEzE,MAAM,WAAW,kBAAkB;IAChC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;CAC5B;AAED,MAAM,WAAW,kBAAkB;IAChC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC1B,iFAAiF;IACjF,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC7B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,qBACa,sBAAuB,SAAQ,aAAa;IAC/B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAG,aAAa,CAAC;IAElE,SAAS,CAAC,QAAQ,CAAC,OAAO,+BAAsC;IAChE,SAAS,CAAC,OAAO,CAAC,EAAE,kBAAkB,CAAC;IAEvC;;;+DAG2D;IAC3D,IAAI,WAAW,IAAI,kBAAkB,GAAG,SAAS,CAEhD;IAED;uEACmE;IACnE,eAAe,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAE7C;IAEc,IAAI,CAAC,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CASlE;IAED;;;;;;;;;;;OAWG;IACH,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI,CAMlD;IAED;;;;;;;;;;;OAWG;IACH,UAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAUhE;IAED;;;;;;;;;;;;;;;;OAgBG;IACH,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAErC;IAED;qFACiF;IACjF,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAE1C;CACH"}

package/lib/browser/diagram-loader.js

@@ -21,6 +21,7 @@ exports.HydraniumDiagramLoader = void 0;
 const client_1 = require("@eclipse-glsp/client");
 const browser_1 = require("@hydranium/client-theia/lib/browser");
 const protocol_1 = require("@hydranium/protocol");
+const core_1 = require("@theia/core");
 const inversify_1 = require("@theia/core/shared/inversify");
 /**
  * Diagram loader that never lets a load failure vanish.
@@ -75,10 +76,7 @@ let HydraniumDiagramLoader = class HydraniumDiagramLoader extends client_1.Diagr
             this.settle({ status: 'loaded' });
         }
         catch (err) {
-            // Report first, settle second, and carry whether the report landed: a
-            // consumer that uncovers the canvas on settle then finds the error
-            // already on the status overlay — or learns that it has to render the
-            // failure itself because nothing else can.
+            // Report first, settle second, and carry whether the report landed.
             const surfaced = await this.reportLoadFailure(err);
             this.settle({ status: 'failed', error: err, surfaced });
         }
@@ -128,13 +126,23 @@ let HydraniumDiagramLoader = class HydraniumDiagramLoader extends client_1.Diagr
     }
     /**
      * 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, where a second copy of the sentence would drift.
+     *
+     * **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) {
-        return `Diagram failed to load: ${this.formatError(err)}`;
+        return core_1.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
      *  overlay and any consumer rendering {@link DiagramLoadFailure.error} agree. */

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

@@ -1 +1 @@
-{"version":3,"file":"diagram-loader.js","sourceRoot":"","sources":["../../src/browser/diagram-loader.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;AAElF,iDAA+F;AAC/F,iEAAoE;AACpE,kDAA+C;AAC/C,4DAAkE;AAkClE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEI,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,sBAAa;IACZ,OAAO,CAAiB;IAE/C,OAAO,GAAG,IAAI,mBAAQ,EAAsB,CAAC;IACtD,OAAO,CAAsB;IAEvC;;;+DAG2D;IAC3D,IAAI,WAAW;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC;IACvB,CAAC;IAED;uEACmE;IACnE,eAAe;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IAC/B,CAAC;IAEQ,KAAK,CAAC,IAAI,CAAC,OAA+B;QAChD,IAAI,CAAC;YACF,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACZ,sEAAsE;YACtE,mEAAmE;YACnE,sEAAsE;YACtE,2CAA2C;YAC3C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YACnD,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC3D,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;OAWG;IACO,MAAM,CAAC,OAA2B;QACzC,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO;QACV,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED;;;;;;;;;;;OAWG;IACO,KAAK,CAAC,iBAAiB,CAAC,GAAY;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC/B,IAAI,CAAC;YACF,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,qBAAY,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;YACxF,OAAO,IAAI,CAAC;QACf,CAAC;QAAC,OAAO,SAAS,EAAE,CAAC;YAClB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,kEAAkE,EAAE,SAAS,CAAC,CAAC;YAClG,OAAO,KAAK,CAAC;QAChB,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACH,gBAAgB,CAAC,GAAY;QAC1B,OAAO,2BAA2B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;IAC7D,CAAC;IAED;qFACiF;IACvE,WAAW,CAAC,GAAY;QAC/B,OAAO,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;CACH,CAAA;AA9FY,wDAAsB;AACU;IAAzC,IAAA,kBAAM,EAAC,uBAAa,CAAC;8BAA8B,uBAAa;uDAAC;iCADxD,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CA8FlC"}
+{"version":3,"file":"diagram-loader.js","sourceRoot":"","sources":["../../src/browser/diagram-loader.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;;;AAElF,iDAA+F;AAC/F,iEAAoE;AACpE,kDAA+C;AAC/C,sCAAkC;AAClC,4DAAkE;AAiClE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEI,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,sBAAa;IACZ,OAAO,CAAiB;IAE/C,OAAO,GAAG,IAAI,mBAAQ,EAAsB,CAAC;IACtD,OAAO,CAAsB;IAEvC;;;+DAG2D;IAC3D,IAAI,WAAW;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC;IACvB,CAAC;IAED;uEACmE;IACnE,eAAe;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IAC/B,CAAC;IAEQ,KAAK,CAAC,IAAI,CAAC,OAA+B;QAChD,IAAI,CAAC;YACF,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACZ,oEAAoE;YACpE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YACnD,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC3D,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;OAWG;IACO,MAAM,CAAC,OAA2B;QACzC,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO;QACV,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED;;;;;;;;;;;OAWG;IACO,KAAK,CAAC,iBAAiB,CAAC,GAAY;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC/B,IAAI,CAAC;YACF,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,qBAAY,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;YACxF,OAAO,IAAI,CAAC;QACf,CAAC;QAAC,OAAO,SAAS,EAAE,CAAC;YAClB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,kEAAkE,EAAE,SAAS,CAAC,CAAC;YAClG,OAAO,KAAK,CAAC;QAChB,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;;;;;;OAgBG;IACH,gBAAgB,CAAC,GAAY;QAC1B,OAAO,UAAG,CAAC,QAAQ,CAAC,iDAAiD,EAAE,6BAA6B,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;IAChI,CAAC;IAED;qFACiF;IACvE,WAAW,CAAC,GAAY;QAC/B,OAAO,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;CACH,CAAA;;AApG4C;IAAzC,IAAA,kBAAM,EAAC,uBAAa,CAAC;8BAA8B,uBAAa;uDAAC;iCADxD,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CAqGlC"}

package/lib/browser/diagram-only-marker-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diagram-only-marker-manager.d.ts","sourceRoot":"","sources":["../../src/browser/diagram-only-marker-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,qBAAqB,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAG1E;;;;;;;;;;;;;;GAcG;AACH,qBACa,yBAA0B,SAAQ,qBAAqB;IACjE,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;CAG7E"}
+{"version":3,"file":"diagram-only-marker-manager.d.ts","sourceRoot":"","sources":["../../src/browser/diagram-only-marker-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,qBAAqB,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAG1E;;;;;;;;;;;;;;GAcG;AACH,qBACa,yBAA0B,SAAQ,qBAAqB;IACjE,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAE1E;CACH"}

package/lib/browser/diagram-only-marker-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"diagram-only-marker-manager.js","sourceRoot":"","sources":["../../src/browser/diagram-only-marker-manager.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;AAElF,iDAA0E;AAC1E,4DAA0D;AAE1D;;;;;;;;;;;;;;GAcG;AAEI,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,8BAAqB;IACjE,UAAU,CAAC,QAAkB,EAAE,OAAgB,EAAE,UAAmB;QACjE,6DAA6D;IAChE,CAAC;CACH,CAAA;AAJY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,sBAAU,GAAE;GACA,yBAAyB,CAIrC"}
+{"version":3,"file":"diagram-only-marker-manager.js","sourceRoot":"","sources":["../../src/browser/diagram-only-marker-manager.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;AAElF,iDAA0E;AAC1E,4DAA0D;AAE1D;;;;;;;;;;;;;;GAcG;AAEI,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,8BAAqB;IACjE,UAAU,CAAC,QAAkB,EAAE,OAAgB,EAAE,UAAmB;QACjE,6DAA6D;IAChE,CAAC;CACH,CAAA;;oCAJY,yBAAyB;IADrC,IAAA,sBAAU,GAAE;GACA,yBAAyB,CAIrC"}

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

@@ -6,8 +6,10 @@
  *
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
-import { GLSPDiagramWidget } from '@eclipse-glsp/theia-integration';
+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 '../../style/diagram-loading.css';
 /** Class on the overlay root. Adopters style / override via this contract. */
@@ -24,30 +26,37 @@ export declare const DIAGRAM_LOADING_FAILED_CLASS = "hydranium-diagram-loading-f
  * model to read as a broken editor rather than a slow one.
  *
  * **How the pending state is sourced.** From {@link HydraniumDiagramLoader}, not
- * from `actionDispatcher.onceModelInitialized()`. The loader settles on failure
- * as well as on success, and it does so even when its own error-reporting
- * dispatch throws; `onceModelInitialized()` simply never settles on a failed
- * load. That distinction is not academic here: this overlay is opaque and covers
- * the widget node, while GLSP's `StatusOverlay` — where the loader reports the
- * failure — mounts *inside* the diagram's base div. Keyed on model
- * initialization, a failed load would leave a spinner turning on top of the
- * error message explaining it. Keyed on the loader, exactly one component decides
- * whether the canvas is pending and the two mechanisms compose instead of
- * competing.
+ * from `actionDispatcher.onceModelInitialized()`: the loader settles on failure
+ * as well as on success, even when its own error report throws, while
+ * `onceModelInitialized()` never settles on a failed load and would leave the
+ * spinner turning for good.
  *
- * **The one case where this overlay reports the failure itself.** When
- * `DiagramLoadFailure.surfaced` is `false` the loader could not dispatch its
- * `StatusAction` — the action dispatcher was what failed — so the status overlay
- * shows nothing. Uncovering the canvas would then leave a blank diagram whose only
- * explanation is a line in the Output channel. In that case, and only that case,
- * the overlay stays up and swaps the spinner for the error text.
+ * A failed load keeps the overlay up with the error and a Retry, which asks for
+ * a fresh widget through {@link onDidRequestReopen}.
  *
  * 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}.
  */
 export declare class HydraniumGlspDiagramWidget extends GLSPDiagramWidget {
     protected loadingOverlay?: HTMLElement;
+    protected readonly reopenRequestEmitter: Emitter<void>;
+    /** Fires when this diagram asks to be replaced by a fresh widget, as its
+     *  Retry does; `AbstractHydraniumGlspDiagramManager` reopens it. A load is
+     *  not repeated in place, since GLSP's model source registers its handlers
+     *  once per load. */
+    readonly onDidRequestReopen: Event<void>;
+    /**
+     * 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.
+     */
+    configure(options: GLSPDiagramWidgetOptions, diContainer: Container): void;
+    /** The widget's saveable. Override to change how saves and dirty state behave. */
+    protected createSaveable(): GLSPDiagramWidget['saveable'];
     protected onAfterAttach(msg: Message): void;
     dispose(): void;
     /**
@@ -59,13 +68,7 @@ export declare class HydraniumGlspDiagramWidget extends GLSPDiagramWidget {
      * rather than creating and immediately removing one, so there is no flash.
      */
     protected showLoadingOverlay(): void;
-    /**
-     * Take the overlay down, or keep it as the failure's only reporter.
-     *
-     * The overlay is retained ONLY for a failure the loader could not surface;
-     * anything else uncovers the canvas, so a load that failed *and was reported*
-     * reveals GLSP's status overlay rather than double-reporting on top of it.
-     */
+    /** Take the overlay down, or keep it as the failure's report. */
     protected onLoadSettled(outcome: DiagramLoadOutcome): void;
     /**
      * Repurpose the pending overlay in place as a failure report: same node, so
@@ -78,6 +81,10 @@ export declare class HydraniumGlspDiagramWidget extends GLSPDiagramWidget {
      * is a no-op rather than a fallback wording.
      */
     protected showLoadFailure(error: unknown): void;
+    /** Ask for a fresh widget, after a failed load. */
+    protected retryLoad(): void;
+    /** Build the failure overlay's Retry button, which calls {@link retryLoad}. */
+    protected createRetryButton(): HTMLElement;
     protected hideLoadingOverlay(): void;
     /** Build the overlay DOM. Override to change the wording or add content; the
      *  root must carry {@link DIAGRAM_LOADING_CLASS} for the shipped styling, and

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,MAAM,iCAAiC,CAAC;AAGpE,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,KAAK,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAInF,OAAO,iCAAiC,CAAC;AAEzC,8EAA8E;AAC9E,eAAO,MAAM,qBAAqB,8BAA8B,CAAC;AAEjE;kFACkF;AAClF,eAAO,MAAM,4BAA4B,qCAAoC,CAAC;AAE9E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,qBACa,0BAA2B,SAAQ,iBAAiB;IAC9D,SAAS,CAAC,cAAc,CAAC,EAAE,WAAW,CAAC;cAEpB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAO3C,OAAO,IAAI,IAAI;IAKxB;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAmBpC;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAQ1D;;;;;;;;;OASG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAa/C,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAKpC;;oFAEgF;IAChF,SAAS,CAAC,oBAAoB,IAAI,WAAW;IAa7C;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;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;;;;;;;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

@@ -17,8 +17,10 @@ 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 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");
 // 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.
@@ -37,30 +39,45 @@ exports.DIAGRAM_LOADING_FAILED_CLASS = `${exports.DIAGRAM_LOADING_CLASS}-failed`
  * model to read as a broken editor rather than a slow one.
  *
  * **How the pending state is sourced.** From {@link HydraniumDiagramLoader}, not
- * from `actionDispatcher.onceModelInitialized()`. The loader settles on failure
- * as well as on success, and it does so even when its own error-reporting
- * dispatch throws; `onceModelInitialized()` simply never settles on a failed
- * load. That distinction is not academic here: this overlay is opaque and covers
- * the widget node, while GLSP's `StatusOverlay` — where the loader reports the
- * failure — mounts *inside* the diagram's base div. Keyed on model
- * initialization, a failed load would leave a spinner turning on top of the
- * error message explaining it. Keyed on the loader, exactly one component decides
- * whether the canvas is pending and the two mechanisms compose instead of
- * competing.
+ * from `actionDispatcher.onceModelInitialized()`: the loader settles on failure
+ * as well as on success, even when its own error report throws, while
+ * `onceModelInitialized()` never settles on a failed load and would leave the
+ * spinner turning for good.
  *
- * **The one case where this overlay reports the failure itself.** When
- * `DiagramLoadFailure.surfaced` is `false` the loader could not dispatch its
- * `StatusAction` — the action dispatcher was what failed — so the status overlay
- * shows nothing. Uncovering the canvas would then leave a blank diagram whose only
- * explanation is a line in the Output channel. In that case, and only that case,
- * the overlay stays up and swaps the spinner for the error text.
+ * A failed load keeps the overlay up with the error and a Retry, which asks for
+ * a fresh widget through {@link onDidRequestReopen}.
  *
  * 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}.
  */
 let HydraniumGlspDiagramWidget = class HydraniumGlspDiagramWidget extends theia_integration_1.GLSPDiagramWidget {
     loadingOverlay;
+    reopenRequestEmitter = new core_1.Emitter();
+    /** Fires when this diagram asks to be replaced by a fresh widget, as its
+     *  Retry does; `AbstractHydraniumGlspDiagramManager` reopens it. A load is
+     *  not repeated in place, since GLSP's model source registers its handlers
+     *  once per load. */
+    onDidRequestReopen = this.reopenRequestEmitter.event;
+    /**
+     * 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.
+     */
+    configure(options, diContainer) {
+        super.configure(options, diContainer);
+        this.saveable.dispose();
+        this.saveable = this.createSaveable();
+        this.toDispose.push(this.saveable);
+        this.toDispose.push(this.reopenRequestEmitter);
+    }
+    /** The widget's saveable. Override to change how saves and dirty state behave. */
+    createSaveable() {
+        return new glsp_saveable_1.HydraniumGlspSaveable(this.actionDispatcher, this.diContainer.get(client_1.EditorContextService));
+    }
     onAfterAttach(msg) {
         // Before `super`, which is what starts the load on first attach — so the
         // overlay is already up when the round trip begins.
@@ -94,15 +111,9 @@ let HydraniumGlspDiagramWidget = class HydraniumGlspDiagramWidget extends theia_
         // outcome it cannot report, which is the safe reading.
         loader.onceLoadSettled().then(outcome => this.onLoadSettled(outcome), () => this.hideLoadingOverlay());
     }
-    /**
-     * Take the overlay down, or keep it as the failure's only reporter.
-     *
-     * The overlay is retained ONLY for a failure the loader could not surface;
-     * anything else uncovers the canvas, so a load that failed *and was reported*
-     * reveals GLSP's status overlay rather than double-reporting on top of it.
-     */
+    /** Take the overlay down, or keep it as the failure's report. */
     onLoadSettled(outcome) {
-        if (outcome.status === 'failed' && !outcome.surfaced) {
+        if (outcome.status === 'failed') {
             this.showLoadFailure(outcome.error);
             return;
         }
@@ -129,6 +140,21 @@ let HydraniumGlspDiagramWidget = class HydraniumGlspDiagramWidget extends theia_
         if (label) {
             label.textContent = loader.loadFailureLabel(error);
         }
+        overlay.appendChild(this.createRetryButton());
+    }
+    /** Ask for a fresh widget, after a failed load. */
+    retryLoad() {
+        if (this.hydraniumDiagramLoader?.loadOutcome?.status === 'failed') {
+            this.reopenRequestEmitter.fire();
+        }
+    }
+    /** Build the failure overlay's Retry button, which calls {@link retryLoad}. */
+    createRetryButton() {
+        const button = document.createElement('button');
+        button.className = `theia-button ${exports.DIAGRAM_LOADING_CLASS}-retry`;
+        button.textContent = core_1.nls.localize('hydranium/glsp-client-theia/diagram-load-retry', 'Retry');
+        button.addEventListener('click', () => this.retryLoad());
+        return button;
     }
     hideLoadingOverlay() {
         this.loadingOverlay?.remove();

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-client-theia-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-client-theia-module.d.ts","sourceRoot":"","sources":["../../src/browser/glsp-client-theia-module.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAqB,KAAK,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AACnG,OAAO,EAAE,KAAK,cAAc,EAAgE,MAAM,sBAAsB,CAAC;AAMzH;;;;;qEAKqE;AACrE,MAAM,WAAW,4BAA4B;IAC1C,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC;CAC/C;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,4BAA4B,GAAG,IAAI,CAQhH"}
+{"version":3,"file":"glsp-client-theia-module.d.ts","sourceRoot":"","sources":["../../src/browser/glsp-client-theia-module.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAqB,KAAK,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AACnG,OAAO,EAAE,KAAK,cAAc,EAA+E,MAAM,sBAAsB,CAAC;AAOxI;;;;;qEAKqE;AACrE,MAAM,WAAW,4BAA4B;IAC1C,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC;CAC/C;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,4BAA4B,GAAG,IAAI,CAShH"}

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

@@ -13,6 +13,7 @@ const browser_1 = require("@hydranium/client-theia/lib/browser");
 const client_1 = require("@eclipse-glsp/client");
 const action_dispatcher_1 = require("./action-dispatcher");
 const diagram_loader_1 = require("./diagram-loader");
+const status_overlay_1 = require("./status-overlay");
 const glsp_message_service_1 = require("./glsp-message-service");
 const hidden_bounds_updater_1 = require("./hidden-bounds-updater");
 /**
@@ -41,6 +42,7 @@ function createGlspClientTheiaModule(context, options) {
     rebind(client_1.GLSPActionDispatcher).toService(action_dispatcher_1.HydraniumGlspActionDispatcher);
     rebind(client_1.DiagramLoader).to(diagram_loader_1.HydraniumDiagramLoader).inSingletonScope();
     rebind(client_1.GLSPHiddenBoundsUpdater).to(hidden_bounds_updater_1.HydraniumHiddenBoundsUpdater).inSingletonScope();
+    rebind(client_1.StatusOverlay).to(status_overlay_1.HydraniumStatusOverlay).inSingletonScope();
     (0, glsp_message_service_1.bindHydraniumGlspMessageService)(bind, isBound, rebind);
 }
 //# sourceMappingURL=glsp-client-theia-module.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"glsp-client-theia-module.js","sourceRoot":"","sources":["../../src/browser/glsp-client-theia-module.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;AAsClF,kEAQC;AA5CD,iEAAmG;AACnG,iDAAyH;AACzH,2DAAoE;AACpE,qDAA0D;AAC1D,iEAAyE;AACzE,mEAAuE;AAYvE;;;;;;;;;;;;;;;;;;GAkBG;AACH,SAAgB,2BAA2B,CAAC,OAAuB,EAAE,OAAqC;IACvG,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC1C,IAAA,2BAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IAC/C,IAAI,CAAC,iDAA6B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAChE,MAAM,CAAC,6BAAoB,CAAC,CAAC,SAAS,CAAC,iDAA6B,CAAC,CAAC;IACtE,MAAM,CAAC,sBAAa,CAAC,CAAC,EAAE,CAAC,uCAAsB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpE,MAAM,CAAC,gCAAuB,CAAC,CAAC,EAAE,CAAC,oDAA4B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpF,IAAA,sDAA+B,EAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAC1D,CAAC"}
+{"version":3,"file":"glsp-client-theia-module.js","sourceRoot":"","sources":["../../src/browser/glsp-client-theia-module.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AAElF,iEAAmG;AACnG,iDAAwI;AACxI,2DAAoE;AACpE,qDAA0D;AAC1D,qDAA0D;AAC1D,iEAAyE;AACzE,mEAAuE;AAYvE;;;;;;;;;;;;;;;;;;GAkBG;AACH,qCAA4C,OAAuB,EAAE,OAAqC;IACvG,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC1C,IAAA,2BAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IAC/C,IAAI,CAAC,iDAA6B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAChE,MAAM,CAAC,6BAAoB,CAAC,CAAC,SAAS,CAAC,iDAA6B,CAAC,CAAC;IACtE,MAAM,CAAC,sBAAa,CAAC,CAAC,EAAE,CAAC,uCAAsB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpE,MAAM,CAAC,gCAAuB,CAAC,CAAC,EAAE,CAAC,oDAA4B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpF,MAAM,CAAC,sBAAa,CAAC,CAAC,EAAE,CAAC,uCAAsB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpE,IAAA,sDAA+B,EAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAC1D,CAAC"}

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

@@ -0,0 +1,17 @@
+/********************************************************************************
+ * 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 { BaseJsonrpcGLSPClient, type DisposeClientSessionParameters } from '@eclipse-glsp/client';
+/** The GLSP client of `HydraniumGlspClientContribution`. */
+export declare class HydraniumGlspClient extends BaseJsonrpcGLSPClient {
+    /** Resolves at once when the connection is gone: the session went with its
+     *  server, and upstream would throw, which a diagram disposed after its
+     *  client was lost logs as an error. */
+    disposeClientSession(params: DisposeClientSessionParameters): Promise<void>;
+}
+//# sourceMappingURL=glsp-client.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"glsp-client.d.ts","sourceRoot":"","sources":["../../src/browser/glsp-client.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,qBAAqB,EAAE,KAAK,8BAA8B,EAAE,MAAM,sBAAsB,CAAC;AAElG,4DAA4D;AAC5D,qBAAa,mBAAoB,SAAQ,qBAAqB;IAC3D;;4CAEwC;IAC/B,oBAAoB,CAAC,MAAM,EAAE,8BAA8B,GAAG,OAAO,CAAC,IAAI,CAAC,CAEnF;CACH"}

package/lib/browser/glsp-client.js

@@ -0,0 +1,23 @@
+"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.HydraniumGlspClient = void 0;
+const client_1 = require("@eclipse-glsp/client");
+/** The GLSP client of `HydraniumGlspClientContribution`. */
+class HydraniumGlspClient extends client_1.BaseJsonrpcGLSPClient {
+    /** Resolves at once when the connection is gone: the session went with its
+     *  server, and upstream would throw, which a diagram disposed after its
+     *  client was lost logs as an error. */
+    disposeClientSession(params) {
+        return this.isConnectionActive() ? super.disposeClientSession(params) : Promise.resolve();
+    }
+}
+exports.HydraniumGlspClient = HydraniumGlspClient;
+//# sourceMappingURL=glsp-client.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"glsp-client.js","sourceRoot":"","sources":["../../src/browser/glsp-client.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;AAElF,iDAAkG;AAElG,4DAA4D;AAC5D,yBAAiC,SAAQ,8BAAqB;IAC3D;;4CAEwC;IAC/B,oBAAoB,CAAC,MAAsC;QACjE,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7F,CAAC;CACH"}

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

@@ -8,6 +8,9 @@
  ********************************************************************************/
 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 { type Disposable } from '@theia/core';
 /**
  * `GLSPDiagramManager` subclass that derives the language-correlated getters
  * (`fileExtensions`, `diagramType`, `contributionId`, `iconClass`) from a
@@ -37,10 +40,51 @@ 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 clientListeners?: Disposable;
+    /** The reopens asked for so far, which run one at a time. */
+    protected reopening: Promise<void>;
     get fileExtensions(): string[];
     get diagramType(): string;
     get contributionId(): string;
     get iconClass(): string;
     get label(): string;
+    createWidget(options?: unknown): Promise<GLSPDiagramWidget>;
+    /**
+     * 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.
+     */
+    protected listenToClient(): void;
+    protected reopenAll(which: (widget: GLSPDiagramWidget) => boolean): void;
+    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.
+     * 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.
+     */
+    reopen(widget: GLSPDiagramWidget): Promise<void>;
+    /** Taken down as a close does, but without its save prompt, since a dirty
+     *  diagram whose server is gone has nothing to save to. */
+    protected replaceWidget(widget: GLSPDiagramWidget): Promise<void>;
+    /**
+     * 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 handleNavigations(widget: GLSPDiagramWidget, options?: WidgetOpenerOptions): boolean;
 }
 //# sourceMappingURL=glsp-diagram-manager.d.ts.map

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;AAGtF;;;;;;;;;;;;;;;;;;;;;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,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;CACH"}
+{"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"}

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

@@ -17,7 +17,11 @@ 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 client_contribution_1 = require("./client-contribution");
+const diagram_loader_1 = require("./diagram-loader");
+const diagram_widget_1 = require("./diagram-widget");
 /**
  * `GLSPDiagramManager` subclass that derives the language-correlated getters
  * (`fileExtensions`, `diagramType`, `contributionId`, `iconClass`) from a
@@ -43,6 +47,9 @@ const inversify_1 = require("@theia/core/shared/inversify");
 let AbstractHydraniumGlspDiagramManager = class AbstractHydraniumGlspDiagramManager extends theia_integration_1.GLSPDiagramManager {
     /** Optional icon-class override; takes precedence over the language's `iconClass`. */
     customIconClass;
+    clientListeners;
+    /** The reopens asked for so far, which run one at a time. */
+    reopening = Promise.resolve();
     get fileExtensions() {
         return [...this.diagramLanguage.fileExtensions];
     }
@@ -58,6 +65,98 @@ let AbstractHydraniumGlspDiagramManager = class AbstractHydraniumGlspDiagramMana
     get label() {
         return this.managerLabel;
     }
+    async createWidget(options) {
+        this.listenToClient();
+        const widget = await super.createWidget(options);
+        if (widget instanceof diagram_widget_1.HydraniumGlspDiagramWidget) {
+            widget.onDidRequestReopen(() => void this.reopen(widget));
+        }
+        return widget;
+    }
+    /**
+     * 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.
+     */
+    listenToClient() {
+        if (this.clientListeners) {
+            return;
+        }
+        const contribution = this.diagramServiceProvider.getGLSPClientContribution(this.contributionId);
+        this.clientListeners =
+            contribution instanceof client_contribution_1.HydraniumGlspClientContribution
+                ? new core_1.DisposableCollection(contribution.onDidLoseClient(() => this.reopenAll(() => true)), contribution.onDidStartClient(() => this.reopenAll(widget => this.loadFailed(widget))))
+                : new core_1.DisposableCollection();
+    }
+    reopenAll(which) {
+        for (const widget of this.all.filter(which)) {
+            void this.reopen(widget);
+        }
+    }
+    loadFailed(widget) {
+        const loader = widget.diContainer.get(client_1.DiagramLoader);
+        return loader instanceof diagram_loader_1.HydraniumDiagramLoader && loader.loadOutcome?.status === 'failed';
+    }
+    /**
+     * 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.
+     * 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.
+     */
+    reopen(widget) {
+        const reopened = this.reopening.then(() => this.replaceWidget(widget));
+        this.reopening = reopened.catch(() => undefined);
+        return reopened;
+    }
+    /** Taken down as a close does, but without its save prompt, since a dirty
+     *  diagram whose server is gone has nothing to save to. */
+    async replaceWidget(widget) {
+        if (widget.isDisposed) {
+            return;
+        }
+        const tabBar = this.shell.getTabBarFor(widget);
+        const titles = tabBar?.titles ?? [];
+        const index = titles.indexOf(widget.title);
+        // ponytail: a diagram alone in its tab bar reopens where a new one opens,
+        // since its split closes with it; restore the dock layout if that matters.
+        const neighbour = index > 0 ? titles[index - 1].owner : titles[index + 1]?.owner;
+        const mode = this.shell.activeWidget === widget ? 'activate' : tabBar?.currentTitle === widget.title ? 'reveal' : 'open';
+        // Detached before the dispose, as a close does: the widget stores its
+        // viewport on detach, and its dispose empties the container it reads.
+        widget.parent = null;
+        widget.dispose();
+        const options = {
+            mode,
+            editMode: widget.options.editMode,
+            widgetOptions: neighbour ? { ref: neighbour, mode: index > 0 ? 'tab-after' : 'tab-before' } : undefined
+        };
+        await this.open(widget.uri, options);
+    }
+    /**
+     * 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.
+     */
+    handleNavigations(widget, options) {
+        if (options && 'selection' in options && options.selection === undefined) {
+            const { selection: _dropped, ...rest } = options;
+            return super.handleNavigations(widget, rest);
+        }
+        return super.handleNavigations(widget, options);
+    }
 };
 exports.AbstractHydraniumGlspDiagramManager = AbstractHydraniumGlspDiagramManager;
 exports.AbstractHydraniumGlspDiagramManager = AbstractHydraniumGlspDiagramManager = __decorate([