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

package/lib/browser/diagram-widget.js

@@ -13,12 +13,19 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HydraniumGlspDiagramWidget = exports.DIAGRAM_LOADING_FAILED_CLASS = exports.DIAGRAM_LOADING_CLASS = void 0;
 const client_1 = require("@eclipse-glsp/client");
+const protocol_1 = require("@hydranium/protocol");
 const theia_integration_1 = require("@eclipse-glsp/theia-integration");
+const glsp_client_1 = require("@hydranium/glsp-client");
+const core_1 = require("@theia/core");
 const inversify_1 = require("@theia/core/shared/inversify");
-const diagram_loader_1 = require("./diagram-loader");
+const glsp_saveable_1 = require("./glsp-saveable");
+const window_session_1 = require("./window-session");
 // Shipped by this package rather than left to adopters: an overlay whose
 // stylesheet was forgotten is an unstyled div in normal flow, which is a silent
 // failure. Adopters override individual rules from their own stylesheet.
@@ -37,30 +44,50 @@ 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 {
+    windowSessions;
     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));
+    }
+    /** Adds the window's resume token, so a reload or reconnect takes this diagram's session over. */
+    getRequestModelOptions() {
+        return { ...super.getRequestModelOptions(), [protocol_1.RESUME_TOKEN_ARG]: this.windowSessions.current().resumeToken };
+    }
     onAfterAttach(msg) {
         // Before `super`, which is what starts the load on first attach — so the
         // overlay is already up when the round trip begins.
@@ -71,6 +98,16 @@ let HydraniumGlspDiagramWidget = class HydraniumGlspDiagramWidget extends theia_
         this.hideLoadingOverlay();
         super.dispose();
     }
+    /**
+     * GLSP's restore with `animate: false`; compare the two on a GLSP upgrade.
+     * An animated restore holds back every later command, so a Delete right
+     * after a select-all typed as the diagram opens finds nothing selected.
+     */
+    async setViewportData(viewportData) {
+        if (this.actionDispatcher instanceof client_1.GLSPActionDispatcher) {
+            this.actionDispatcher.dispatchOnceModelInitialized(client_1.SetViewportAction.create(viewportData.elementId, viewportData.viewportData, { animate: false }));
+        }
+    }
     /**
      * Cover the canvas until the load settles.
      *
@@ -94,15 +131,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 +160,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();
@@ -162,10 +208,14 @@ let HydraniumGlspDiagramWidget = class HydraniumGlspDiagramWidget extends theia_
      */
     get hydraniumDiagramLoader() {
         const loader = this.diContainer.get(client_1.DiagramLoader);
-        return loader instanceof diagram_loader_1.HydraniumDiagramLoader ? loader : undefined;
+        return loader instanceof glsp_client_1.HydraniumDiagramLoader ? loader : undefined;
     }
 };
 exports.HydraniumGlspDiagramWidget = HydraniumGlspDiagramWidget;
+__decorate([
+    (0, inversify_1.inject)(window_session_1.WindowSessionService),
+    __metadata("design:type", Object)
+], HydraniumGlspDiagramWidget.prototype, "windowSessions", void 0);
 exports.HydraniumGlspDiagramWidget = HydraniumGlspDiagramWidget = __decorate([
     (0, inversify_1.injectable)()
 ], HydraniumGlspDiagramWidget);

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

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

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

@@ -6,8 +6,8 @@
  *
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
-import { type ChannelLoggerOptions } from '@hydranium/client-theia/lib/browser';
 import { type BindingContext } from '@eclipse-glsp/client';
+import { type ChannelLoggerOptions } from '@hydranium/client-theia/browser';
 /** Options for `createGlspClientTheiaModule`. The adopter supplies the channel
  *  logger configuration ({@link ChannelLoggerOptions} — a `channelName`, and
  *  optionally a `component` label); the framework owns the dispatcher type and
@@ -18,10 +18,17 @@ export interface GlspClientTheiaModuleOptions {
     readonly channelLogger: ChannelLoggerOptions;
 }
 /**
- * Composes the standard framework client bindings: the cross-head Output-channel
- * logger, the instrumented action dispatcher, the failure-reporting diagram
- * loader, the instrumented hidden-bounds updater, and the message service that
- * drops the duplicate model-loading notification.
+ * Composes the standard framework client bindings for a Theia frontend: the
+ * cross-head Output-channel logger, the host-neutral classes
+ * `createGlspClientModule` binds, fed from that channel, the loader that renders
+ * its failure through Theia's catalogue, and the message service that drops
+ * the duplicate model-loading notification.
+ *
+ * The neutral tokens are bound BEFORE the neutral binder runs, so it binds no
+ * console defaults. The logger binding tags each line with the requesting
+ * class, as `bindChannelLogger`'s own does; a plain `toService` alias would
+ * start a fresh request and lose the tag. The clock is resolved lazily, so a
+ * clock an adopter module binds after this one is still the one used.
  *
  * Takes the whole {@link BindingContext} rather than `(bind, rebind)`: the
  * message-service rebind has to know whether GLSP's `theiaNotificationModule`

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,EAAE,KAAK,cAAc,EAAiB,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAGJ,KAAK,oBAAoB,EAG3B,MAAM,iCAAiC,CAAC;AAOzC;;;;;qEAKqE;AACrE,MAAM,WAAW,4BAA4B;IAC1C,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC;CAC/C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,4BAA4B,GAAG,IAAI,CAehH"}

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

@@ -9,17 +9,25 @@
  ********************************************************************************/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createGlspClientTheiaModule = createGlspClientTheiaModule;
-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 browser_1 = require("@hydranium/client-theia/browser");
+const common_1 = require("@hydranium/client-theia/common");
+const glsp_client_1 = require("@hydranium/glsp-client");
+const protocol_1 = require("@hydranium/protocol");
 const glsp_message_service_1 = require("./glsp-message-service");
-const hidden_bounds_updater_1 = require("./hidden-bounds-updater");
+const theia_diagram_loader_1 = require("./theia-diagram-loader");
 /**
- * Composes the standard framework client bindings: the cross-head Output-channel
- * logger, the instrumented action dispatcher, the failure-reporting diagram
- * loader, the instrumented hidden-bounds updater, and the message service that
- * drops the duplicate model-loading notification.
+ * Composes the standard framework client bindings for a Theia frontend: the
+ * cross-head Output-channel logger, the host-neutral classes
+ * `createGlspClientModule` binds, fed from that channel, the loader that renders
+ * its failure through Theia's catalogue, and the message service that drops
+ * the duplicate model-loading notification.
+ *
+ * The neutral tokens are bound BEFORE the neutral binder runs, so it binds no
+ * console defaults. The logger binding tags each line with the requesting
+ * class, as `bindChannelLogger`'s own does; a plain `toService` alias would
+ * start a fresh request and lose the tag. The clock is resolved lazily, so a
+ * clock an adopter module binds after this one is still the one used.
  *
  * Takes the whole {@link BindingContext} rather than `(bind, rebind)`: the
  * message-service rebind has to know whether GLSP's `theiaNotificationModule`
@@ -37,10 +45,17 @@ const hidden_bounds_updater_1 = require("./hidden-bounds-updater");
 function createGlspClientTheiaModule(context, options) {
     const { bind, isBound, rebind } = context;
     (0, browser_1.bindChannelLogger)(bind, options.channelLogger);
-    bind(action_dispatcher_1.HydraniumGlspActionDispatcher).toSelf().inSingletonScope();
-    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();
+    bind(glsp_client_1.HydraniumClientTypes.Logger).toDynamicValue(ctx => {
+        const base = ctx.container.get(browser_1.ChannelLogger);
+        const parentName = (0, browser_1.getRequestParentName)(ctx);
+        return parentName ? base.for(parentName) : base;
+    });
+    bind(glsp_client_1.HydraniumClientTypes.Tracer).toService(browser_1.ChannelTracer);
+    bind(glsp_client_1.HydraniumClientTypes.Clock)
+        .toDynamicValue(ctx => (ctx.container.isBound(common_1.Clock) ? ctx.container.get(common_1.Clock) : new protocol_1.SystemClock()))
+        .inSingletonScope();
+    (0, glsp_client_1.createGlspClientModule)(context);
+    rebind(client_1.DiagramLoader).to(theia_diagram_loader_1.HydraniumGlspTheiaDiagramLoader).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,iDAA0E;AAC1E,6DAMyC;AACzC,2DAAuD;AACvD,wDAAsF;AACtF,kDAAkD;AAClD,iEAAyE;AACzE,iEAAyE;AAYzE;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;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,kCAAoB,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QACpD,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,uBAAa,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,IAAA,8BAAoB,EAAC,GAAG,CAAC,CAAC;QAC7C,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnD,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,kCAAoB,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,uBAAa,CAAC,CAAC;IAC3D,IAAI,CAAC,kCAAoB,CAAC,KAAK,CAAC;SAC5B,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,cAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAQ,cAAK,CAAC,CAAC,CAAC,CAAC,IAAI,sBAAW,EAAE,CAAC,CAAC;SAC3G,gBAAgB,EAAE,CAAC;IACvB,IAAA,oCAAsB,EAAC,OAAO,CAAC,CAAC;IAChC,MAAM,CAAC,sBAAa,CAAC,CAAC,EAAE,CAAC,sDAA+B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC7E,IAAA,sDAA+B,EAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAC1D,CAAC"}

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

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

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

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

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"glsp-diagram-manager.js","sourceRoot":"","sources":["../../src/browser/glsp-diagram-manager.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;AAElF,iDAAwD;AACxD,uEAAqE;AAIrE,4DAA0D;AAE1D;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEI,IAAe,mCAAmC,GAAlD,MAAe,mCAAoC,SAAQ,sCAAkB;IAOjF,sFAAsF;IACnE,eAAe,CAAU;IAE5C,IAAa,cAAc;QACxB,OAAO,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;IACnD,CAAC;IAED,IAAa,WAAW;QACrB,OAAO,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC;IAC3C,CAAC;IAED,IAAa,cAAc;QACxB,OAAO,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC;IAC9C,CAAC;IAED,IAAa,SAAS;QACnB,OAAO,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC,SAAS,IAAI,IAAA,yBAAgB,EAAC,oBAAoB,CAAC,CAAC;IAC3G,CAAC;IAED,IAAI,KAAK;QACN,OAAO,IAAI,CAAC,YAAY,CAAC;IAC5B,CAAC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACgB,iBAAiB,CAAC,MAAyB,EAAE,OAA6B;QAC1F,IAAI,OAAO,IAAI,WAAW,IAAI,OAAO,IAAK,OAAmC,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACrG,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,OAAwD,CAAC;YAClG,OAAO,KAAK,CAAC,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,KAAK,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;CACH,CAAA;AAxDqB,kFAAmC;8CAAnC,mCAAmC;IADxD,IAAA,sBAAU,GAAE;GACS,mCAAmC,CAwDxD"}
+{"version":3,"file":"glsp-diagram-manager.js","sourceRoot":"","sources":["../../src/browser/glsp-diagram-manager.ts"],"names":[],"mappings":"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"}

package/lib/browser/glsp-message-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-message-service.d.ts","sourceRoot":"","sources":["../../src/browser/glsp-message-service.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,mBAAmB,EAAE,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACnH,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,KAAK,UAAU,EAAc,MAAM,8BAA8B,CAAC;AAE3E;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,4BAA4B,8BAA8B,CAAC;AAExE;;;;;;;;;;;;GAYG;AACH,qBACa,2BAA4B,SAAQ,uBAAuB;IACrE;;mBAEe;IACf,SAAS,CAAC,qBAAqB,cAAqB;cAEjC,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI;cAQhD,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,IAAI;cAOlD,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI;CAQjE;AAED;;;;;;;;GAQG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI,CAMnI"}
+{"version":3,"file":"glsp-message-service.d.ts","sourceRoot":"","sources":["../../src/browser/glsp-message-service.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,mBAAmB,EAAE,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACnH,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,KAAK,UAAU,EAAc,MAAM,8BAA8B,CAAC;AAE3E;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,4BAA4B,8BAA8B,CAAC;AAExE;;;;;;;;;;;;GAYG;AACH,qBACa,2BAA4B,SAAQ,uBAAuB;IACrE;;mBAEe;IACf,SAAS,CAAC,qBAAqB,cAAqB;IAEpD,UAAmB,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI,CAMlE;IAED,UAAmB,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,IAAI,CAKpE;IAED,UAAmB,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAO9D;CACH;AAED;;;;;;;;GAQG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI,CAMnI"}

package/lib/browser/glsp-message-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"glsp-message-service.js","sourceRoot":"","sources":["../../src/browser/glsp-message-service.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;AAoFlF,0EAMC;AAvFD,uEAA0E;AAC1E,4DAA2E;AAE3E;;;;;;;;;;;;;;;;;;;;;GAqBG;AACU,QAAA,4BAA4B,GAAG,2BAA2B,CAAC;AAExE;;;;;;;;;;;;GAYG;AAEI,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,2CAAuB;IACrE;;mBAEe;IACL,qBAAqB,GAAG,IAAI,GAAG,EAAU,CAAC;IAEjC,aAAa,CAAC,MAA2B;QACzD,IAAI,MAAM,CAAC,KAAK,KAAK,oCAA4B,EAAE,CAAC;YACjD,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAClD,OAAO;QACV,CAAC;QACD,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAEkB,cAAc,CAAC,MAA4B;QAC3D,IAAI,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YACrD,OAAO;QACV,CAAC;QACD,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IAEkB,WAAW,CAAC,MAAyB;QACrD,4EAA4E;QAC5E,mDAAmD;QACnD,IAAI,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YACxD,OAAO;QACV,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;CACH,CAAA;AA7BY,kEAA2B;sCAA3B,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CA6BvC;AAED;;;;;;;;GAQG;AACH,SAAgB,+BAA+B,CAAC,IAAqB,EAAE,OAA2B,EAAE,MAAyB;IAC1H,IAAI,OAAO,CAAC,2CAAuB,CAAC,EAAE,CAAC;QACpC,MAAM,CAAC,2CAAuB,CAAC,CAAC,EAAE,CAAC,2BAA2B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtF,CAAC;SAAM,CAAC;QACL,IAAI,CAAC,2CAAuB,CAAC,CAAC,EAAE,CAAC,2BAA2B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"glsp-message-service.js","sourceRoot":"","sources":["../../src/browser/glsp-message-service.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;;;;;;;AAGlF,uEAA0E;AAC1E,4DAA2E;AAE3E;;;;;;;;;;;;;;;;;;;;;GAqBG;AACU,QAAA,4BAA4B,GAAG,2BAA2B,CAAC;AAExE;;;;;;;;;;;;GAYG;AAEI,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,2CAAuB;IACrE;;mBAEe;IACL,qBAAqB,GAAG,IAAI,GAAG,EAAU,CAAC;IAEjC,aAAa,CAAC,MAA2B;QACzD,IAAI,MAAM,CAAC,KAAK,KAAK,QAAA,4BAA4B,EAAE,CAAC;YACjD,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAClD,OAAO;QACV,CAAC;QACD,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAEkB,cAAc,CAAC,MAA4B;QAC3D,IAAI,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YACrD,OAAO;QACV,CAAC;QACD,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IAEkB,WAAW,CAAC,MAAyB;QACrD,4EAA4E;QAC5E,mDAAmD;QACnD,IAAI,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YACxD,OAAO;QACV,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;CACH,CAAA;;sCA7BY,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CA6BvC;AAED;;;;;;;;GAQG;AACH,yCAAgD,IAAqB,EAAE,OAA2B,EAAE,MAAyB;IAC1H,IAAI,OAAO,CAAC,2CAAuB,CAAC,EAAE,CAAC;QACpC,MAAM,CAAC,2CAAuB,CAAC,CAAC,EAAE,CAAC,2BAA2B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtF,CAAC;SAAM,CAAC;QACL,IAAI,CAAC,2CAAuB,CAAC,CAAC,EAAE,CAAC,2BAA2B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpF,CAAC;AACJ,CAAC"}

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

@@ -0,0 +1,67 @@
+/********************************************************************************
+ * 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 { 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 declare class HydraniumGlspSaveable extends 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.
+     */
+    protected saveTimeout: number;
+    /** The saves sent and not yet settled. */
+    protected readonly pendingSaves: Set<Promise<void>>;
+    get dirty(): boolean;
+    save(): Promise<void>;
+    /**
+     * 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;
+    protected sendSave(): Promise<void>;
+}
+//# sourceMappingURL=glsp-saveable.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"glsp-saveable.d.ts","sourceRoot":"","sources":["../../src/browser/glsp-saveable.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAMlF,OAAO,EAAE,YAAY,EAAE,MAAM,mEAAmE,CAAC;AAEjG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,qBAAa,qBAAsB,SAAQ,YAAY;IACpD;;;;;OAKG;IACH,UAAmB,WAAW,SAAU;IACxC,0CAA0C;IAC1C,SAAS,CAAC,QAAQ,CAAC,YAAY,qBAA4B;IAE3D,IAAa,KAAK,IAAI,OAAO,CAK5B;IAEQ,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAS7B;IAED;;;;OAIG;IACH,SAAS,CAAC,kBAAkB,IAAI,OAAO,CAEtC;IAED,SAAS,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAmBlC;CACH"}