@hydranium/glsp-server 1.0.0-next.13 → 1.0.0-next.132

package/README.md

@@ -20,9 +20,12 @@ the diagram model is adopter-side, bound per diagram module.
   over the GModel.
 - **Load / save against the live AST.** `HydraniumGlspStorage` loads a document
   on diagram open and writes user operations back through the shared model
-  coordination layer, with `SaveConflictPolicy` deciding what a concurrent
-  external write means. `HydraniumGlspRecordingCommand` is the operation-handler
-  seam — the framework provides no base handler class.
+  coordination layer, with `SaveDeliveryPolicy` deciding whether the save action
+  awaits the write. `HydraniumGlspRequestSaveModelActionHandler` answers each
+  save the Theia client sends, or rejects it when the save fails; GLSP's own
+  save action stays unanswered for other clients.
+  `HydraniumGlspRecordingCommand` is the operation-handler seam — the framework
+  provides no base handler class.
 - **A submission and dispatch lifecycle that waits for the model.**
   `HydraniumGlspSubmissionHandler` gates submit on the readiness event,
   `HydraniumGlspServerActionDispatcher` adds timing and direction to dispatch,
@@ -49,12 +52,21 @@ dependency is `uuid`. You must already have a composed hydranium shared services
 tree, a grammar, and a GModel factory of your own — there is no framework GModel
 factory.
 
+**This head needs one line in your own root manifest, and the install works
+without it right up until the server starts.** `@eclipse-glsp/*` depends on
+`vscode-jsonrpc@8.2.0` exactly, while the Langium chain under hydranium pins the
+transport at `9.0.1` — the version this package declares as its peer. Two
+physical copies in one process throw `Unknown parameter structure auto` during
+GLSP server init, and no peer declaration can prevent a nested copy. Add an
+`overrides` block collapsing the chain and reinstall from scratch;
+[Requirements](../../docs/adopting/requirements.md) gives the exact block.
+
 ## Exports
 
 | subpath     | holds                                                                                                                                                                   | platform        |
 | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------- |
 | `.`         | Composition and the head itself: app / diagram modules, state, storage, submission, command, dispatcher, computed-bounds, validation, logging, `serviceIdentifier`.       | browser-neutral |
-| `./browser` | `startGlspServerInWorker` and `BrowserGlspServerOptions` — the web-worker bringup on GLSP's `WorkerServerLauncher`.                                                       | browser-only    |
+| `./browser` | `startGlspServerInWorker`, `BrowserGlspServerOptions`, `HydraniumGlspWorkerServerLauncher` — the web-worker bringup on GLSP's `WorkerServerLauncher`.                     | browser-only    |
 | `./node`    | `startGlspServer`, `GlspServerOptions`, `StartedGlspServer` — the socket bringup on GLSP's `SocketServerLauncher`.                                                        | Node-only       |
 | `./testing` | `makeGlspHarness`, `makeNoopGlspLogger`, `makeCapturingGlspLogger`.                                                                                                      | browser-neutral |
 
@@ -73,7 +85,8 @@ Each subpath also has a `./lib/…` twin for consumers on
 
 Build the app container, load `HydraniumGlspAppModule` plus your own app modules,
 and hand the result to `startGlspServer` (or `startGlspServerInWorker`, whose
-`context` is a required transferred `MessagePort`). Per diagram open, storage
+`context` is a required transferred `MessagePort` whose page end connects
+through `createMessagePortTransport`). Per diagram open, storage
 loads the document, your GModel factory renders it, and user operations travel
 back into the shared AST through the recording command, after which the GModel is
 re-derived and every listener on that document is notified. The module-by-module
@@ -85,6 +98,8 @@ framework/adopter seams are in
 [`docs/concepts/framework-vs-adopter.md`](../../docs/concepts/framework-vs-adopter.md).
 The Theia-side client wiring lives in `@hydranium/glsp-client-theia`.
 
+For the adopter path from a read-only projection to a writable diagram, see [Make a diagram editable](../../docs/guides/editable-diagram.md). It follows the per-diagram module, operation-handler, and shared-services boundaries.
+
 ## Status
 
 Alpha — pre-v0, not yet published. The API is not stable and may change without a

package/lib/browser/start-glsp-server-in-worker.d.ts

@@ -6,41 +6,30 @@
  *
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
-import { type Logger as GlspLogger, type ServerModule } from '@eclipse-glsp/server/browser.js';
+import { type Logger as GlspLogger, type ServerModule, type WorkerLaunchOptions, WorkerServerLauncher } from '@eclipse-glsp/server/browser.js';
 import { type ContainerModule } from 'inversify';
-import type { Logger } from '@hydranium/protocol';
+import { type Logger, type TransferredMessagePort } from '@hydranium/protocol';
+import { type MessageConnection } from 'vscode-jsonrpc/browser';
 import type { IntegratedServer } from '@hydranium/core';
+export type { TransferredMessagePort } from '@hydranium/protocol';
 /**
- * A `MessagePort` the host transferred into the worker, described structurally.
+ * The worker launcher every {@link startGlspServerInWorker} head runs on: GLSP's
+ * own, with its connection built over `createMessagePortTransport` rather than
+ * over `BrowserMessageReader`/`BrowserMessageWriter`, which never report a
+ * close. So the client disposing its connection closes this one, and upstream
+ * disposes the server instance, and with it every client session, as it does
+ * when a socket closes.
  *
- * This package inherits `tsconfig.base.json`'s `lib: ["ES2022"]` and so compiles
- * without the DOM lib, which is what keeps `document` / `window` compile errors
- * here — so `MessagePort` has no name either and the contract has to be spelled
- * out.
+ * Requires `context`: unlike upstream it never falls back to the worker global.
  *
- * **The member set is chosen to admit a `MessagePort` and REJECT a `Worker` or
- * the worker global**, both of which the launcher's own reader would otherwise
- * accept. Only a port needs starting, so `start` is what tells the three apart,
- * and naming it here turns "never bind a head to the global" from a rule in a
- * document into a compile error at the call site.
- *
- * **That compile error happens at the ADOPTER, not here.** This project resolves
- * neither `MessagePort` nor `Worker` as a type, so nothing in this package can
- * demonstrate the rejection; a host compiling its worker against `lib.webworker`
- * (or a page against `lib.dom`) is where the names resolve and the guard bites.
- * Measured there: passing the worker global fails with `Property 'start' is
- * missing in type 'DedicatedWorkerGlobalScope'`.
- *
- * `addEventListener` is not a discriminator — `postMessage` plus `start` already
- * excludes the other two — and nothing in this module calls any of the three
- * (the reader assigns `onmessage`, which starts a port implicitly). It is listed
- * because it is part of what the reader uses, so the interface reads as the
- * contract rather than as a minimal trick.
+ * **The install needs a single `vscode-jsonrpc`.** The connection comes from
+ * this package's copy, and GLSP's request and notification types from the copy
+ * `@eclipse-glsp/protocol` resolves. With two copies, a typed notification or
+ * request GLSP sends throws `Unknown parameter structure auto`, because the
+ * connection compares the type's parameter-structure marker by identity.
  */
-export interface TransferredMessagePort {
-    postMessage(message: unknown): void;
-    addEventListener(type: 'message', listener: (event: unknown) => void, options?: unknown): void;
-    start(): void;
+export declare class HydraniumGlspWorkerServerLauncher extends WorkerServerLauncher {
+    protected createConnection(options: WorkerLaunchOptions): MessageConnection;
 }
 /**
  * Options for {@link startGlspServerInWorker}.
@@ -55,14 +44,15 @@ export interface BrowserGlspServerOptions {
     /**
      * The port the host transferred into the worker for this head.
      *
-     * **Required, and that is the whole point.** GLSP's
-     * `WorkerServerLauncher.createConnection` falls back to the worker global
-     * when it is omitted, and a head on the global receives every other head's
-     * traffic — `BrowserMessageReader` filters nothing, so this is not a race
-     * under load but every message delivered to the wrong reader. The global is
-     * unusable even for a single head, because the launcher posts its startup
-     * string through the global `postMessage` regardless of the connection it
-     * was given, and no JSON-RPC reader can parse that.
+     * **Required: the worker global is no substitute.** A head on the global
+     * receives every other head's traffic — a reader filters nothing, so this is
+     * not a race under load but every message delivered to the wrong reader — and
+     * GLSP's launcher posts its startup string through the global `postMessage`
+     * regardless of the connection it was given, which no JSON-RPC reader parses.
+     * Unlike upstream's, this head's launcher never falls back to the global.
+     *
+     * The page's end must connect through `createMessagePortTransport` as well:
+     * the head reads its close signal from the port, and posts one on it.
      */
     readonly context: TransferredMessagePort;
     /**
@@ -114,8 +104,9 @@ export interface BrowserGlspServerOptions {
  *   below. There is no transport handshake to wait on: the port arrived live,
  *   and the launcher's own readiness signal is a string it posts on the worker
  *   global, which nothing here reads.
- * - `stopped` resolves when the connection closes, and rejects on a connection
- *   error.
+ * - `stopped` resolves when the connection closes, which the client disposing
+ *   its connection causes, and rejects on a connection error. Nothing reports a
+ *   page that dies, because the port cannot.
  */
 export declare function startGlspServerInWorker(options: BrowserGlspServerOptions): IntegratedServer;
 //# sourceMappingURL=start-glsp-server-in-worker.d.ts.map

package/lib/browser/start-glsp-server-in-worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start-glsp-server-in-worker.d.ts","sourceRoot":"","sources":["../../src/browser/start-glsp-server-in-worker.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EACJ,KAAK,MAAM,IAAI,UAAU,EACzB,KAAK,YAAY,EAInB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAa,KAAK,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAIxD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,WAAW,sBAAsB;IACpC,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACpC,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/F,KAAK,IAAI,IAAI,CAAC;CAChB;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,wBAAwB;IACtC;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,OAAO,EAAE,sBAAsB,CAAC;IACzC;;;;;;;;OAQG;IACH,QAAQ,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,UAAU,CAAC;IACvD;;;OAGG;IACH,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC;;;;OAIG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IACrD;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,wBAAwB,GAAG,gBAAgB,CAsE3F"}
+{"version":3,"file":"start-glsp-server-in-worker.d.ts","sourceRoot":"","sources":["../../src/browser/start-glsp-server-in-worker.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EACJ,KAAK,MAAM,IAAI,UAAU,EACzB,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACxB,oBAAoB,EAEtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAyB,KAAK,eAAe,EAAE,MAAM,WAAW,CAAC;AACxE,OAAO,EAA8B,KAAK,MAAM,EAAE,KAAK,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC3G,OAAO,EAA2B,KAAK,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AACzF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAKxD,YAAY,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAElE;;;;;;;;;;;;;;;GAeG;AACH,qBACa,iCAAkC,SAAQ,oBAAoB;cACrD,gBAAgB,CAAC,OAAO,EAAE,mBAAmB,GAAG,iBAAiB;CAItF;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,wBAAwB;IACtC;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,OAAO,EAAE,sBAAsB,CAAC;IACzC;;;;;;;;OAQG;IACH,QAAQ,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,UAAU,CAAC;IACvD;;;OAGG;IACH,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC;;;;OAIG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IACrD;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,wBAAwB,GAAG,gBAAgB,CAsE3F"}

package/lib/browser/start-glsp-server-in-worker.js

@@ -6,10 +6,44 @@
  *
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 import { WorkerServerLauncher, createAppModule } from '@eclipse-glsp/server/browser.js';
-import { Container } from 'inversify';
+import { Container, injectable } from 'inversify';
+import { createMessagePortTransport } from '@hydranium/protocol';
+import { createMessageConnection } from 'vscode-jsonrpc/browser';
 import { createGlspFrameworkOverrides } from '../launcher/glsp-framework-overrides.js';
 import { createGlspServerOverrides } from '../launcher/glsp-server-overrides.js';
+/**
+ * The worker launcher every {@link startGlspServerInWorker} head runs on: GLSP's
+ * own, with its connection built over `createMessagePortTransport` rather than
+ * over `BrowserMessageReader`/`BrowserMessageWriter`, which never report a
+ * close. So the client disposing its connection closes this one, and upstream
+ * disposes the server instance, and with it every client session, as it does
+ * when a socket closes.
+ *
+ * Requires `context`: unlike upstream it never falls back to the worker global.
+ *
+ * **The install needs a single `vscode-jsonrpc`.** The connection comes from
+ * this package's copy, and GLSP's request and notification types from the copy
+ * `@eclipse-glsp/protocol` resolves. With two copies, a typed notification or
+ * request GLSP sends throws `Unknown parameter structure auto`, because the
+ * connection compares the type's parameter-structure marker by identity.
+ */
+let HydraniumGlspWorkerServerLauncher = class HydraniumGlspWorkerServerLauncher extends WorkerServerLauncher {
+    createConnection(options) {
+        const transport = createMessagePortTransport(options.context);
+        return createMessageConnection(transport.reader, transport.writer);
+    }
+};
+HydraniumGlspWorkerServerLauncher = __decorate([
+    injectable()
+], HydraniumGlspWorkerServerLauncher);
+export { HydraniumGlspWorkerServerLauncher };
 /**
  * Start a GLSP head on a transferred `MessagePort` inside a web worker, with no
  * Node runtime and no backend process.
@@ -32,8 +66,9 @@ import { createGlspServerOverrides } from '../launcher/glsp-server-overrides.js'
  *   below. There is no transport handshake to wait on: the port arrived live,
  *   and the launcher's own readiness signal is a string it posts on the worker
  *   global, which nothing here reads.
- * - `stopped` resolves when the connection closes, and rejects on a connection
- *   error.
+ * - `stopped` resolves when the connection closes, which the client disposing
+ *   its connection causes, and rejects on a connection error. Nothing reports a
+ *   page that dies, because the port cannot.
  */
 export function startGlspServerInWorker(options) {
     const lifecycle = options.logger;
@@ -48,17 +83,17 @@ export function startGlspServerInWorker(options) {
     const glspAppModule = createAppModule({ consoleLog: false });
     const appContainer = new Container();
     appContainer.load(glspAppModule, createGlspFrameworkOverrides(options.createLogger), ...(options.appModules ?? []));
-    const launcher = appContainer.resolve(WorkerServerLauncher);
+    const launcher = appContainer.resolve(HydraniumGlspWorkerServerLauncher);
     // Additional module rather than an app-container binding, as on Node: the
     // launcher loads these into the per-connection SERVER container, the only
     // tier where the adopter's `ServerModule` binding of `GLSPServer` is
     // rebindable.
     launcher.configure(options.serverModule, createGlspServerOverrides());
     try {
-        // Upstream declares `WorkerLaunchOptions.context` as `Worker`, narrower
-        // than the `MessagePort | Worker | DedicatedWorkerGlobalScope` its own
-        // `BrowserMessageReader` accepts — so the value that is CORRECT here is
-        // the one the declaration names as wrong.
+        // Upstream declares `WorkerLaunchOptions.context` as `Worker`, and
+        // `HydraniumGlspWorkerServerLauncher.createConnection` reads it as a
+        // port — so the value that is CORRECT here is the one the declaration
+        // names as wrong.
         //
         // **The cast is currently redundant, and is kept deliberately.** `Worker`
         // does not resolve under this package's `lib`, so `skipLibCheck` leaves

package/lib/browser/start-glsp-server-in-worker.js.map

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

package/lib/command/hydranium-glsp-command-stack.d.ts

@@ -0,0 +1,27 @@
+/********************************************************************************
+ * Copyright (c) 2026 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 { DefaultCommandStack, ModelState } from '@eclipse-glsp/server';
+import { type ServerSharedServices } from '@hydranium/core';
+/**
+ * GLSP's command stack with the diagram's dirty state read from the text store:
+ * dirty while any document the diagram's client session has open differs from
+ * its file, as the store last knew the file. Undo and redo are GLSP's.
+ *
+ * GLSP's own answer counts the diagram's commands since its last save, so it
+ * misses every change the diagram did not make: another client's unsaved edit
+ * leaves it clean, and a save it did not make of a document other than the
+ * diagram's own leaves it dirty. Every `SetDirtyStateAction` GLSP sends reads
+ * this answer.
+ */
+export declare class HydraniumGlspCommandStack extends DefaultCommandStack {
+    protected readonly modelState: ModelState;
+    protected readonly sharedServices: ServerSharedServices;
+    get isDirty(): boolean;
+}
+//# sourceMappingURL=hydranium-glsp-command-stack.d.ts.map

package/lib/command/hydranium-glsp-command-stack.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hydranium-glsp-command-stack.d.ts","sourceRoot":"","sources":["../../src/command/hydranium-glsp-command-stack.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAI5D;;;;;;;;;;GAUG;AACH,qBACa,yBAA0B,SAAQ,mBAAmB;IAC3C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAG,UAAU,CAAC;IACpB,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAG,oBAAoB,CAAC;IAEpG,IAAa,OAAO,IAAI,OAAO,CAI9B;CACH"}

package/lib/command/hydranium-glsp-command-stack.js

@@ -0,0 +1,53 @@
+/********************************************************************************
+ * Copyright (c) 2026 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the MIT License which is available in the project root.
+ *
+ * SPDX-License-Identifier: MIT
+ ********************************************************************************/
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { DefaultCommandStack, ModelState } from '@eclipse-glsp/server';
+import { inject, injectable } from 'inversify';
+import { HydraniumTypes } from '../state/hydranium-shared-core-services.js';
+/**
+ * GLSP's command stack with the diagram's dirty state read from the text store:
+ * dirty while any document the diagram's client session has open differs from
+ * its file, as the store last knew the file. Undo and redo are GLSP's.
+ *
+ * GLSP's own answer counts the diagram's commands since its last save, so it
+ * misses every change the diagram did not make: another client's unsaved edit
+ * leaves it clean, and a save it did not make of a document other than the
+ * diagram's own leaves it dirty. Every `SetDirtyStateAction` GLSP sends reads
+ * this answer.
+ */
+let HydraniumGlspCommandStack = class HydraniumGlspCommandStack extends DefaultCommandStack {
+    modelState;
+    sharedServices;
+    get isDirty() {
+        const textDocuments = this.sharedServices.workspace.TextDocuments;
+        const clientId = this.modelState.clientId;
+        return textDocuments.openDocuments().some(open => open.clients.includes(clientId) && textDocuments.isDirty(open.uri));
+    }
+};
+__decorate([
+    inject(ModelState),
+    __metadata("design:type", Object)
+], HydraniumGlspCommandStack.prototype, "modelState", void 0);
+__decorate([
+    inject(HydraniumTypes.SharedCoreServices),
+    __metadata("design:type", Object)
+], HydraniumGlspCommandStack.prototype, "sharedServices", void 0);
+HydraniumGlspCommandStack = __decorate([
+    injectable()
+], HydraniumGlspCommandStack);
+export { HydraniumGlspCommandStack };
+//# sourceMappingURL=hydranium-glsp-command-stack.js.map

package/lib/command/hydranium-glsp-command-stack.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hydranium-glsp-command-stack.js","sourceRoot":"","sources":["../../src/command/hydranium-glsp-command-stack.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;;;;;;;;;;AAElF,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAE5E;;;;;;;;;;GAUG;AAEI,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,mBAAmB;IACxB,UAAU,CAAc;IACD,cAAc,CAAwB;IAEpG,IAAa,OAAO;QACjB,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,aAAa,CAAC;QAClE,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAC1C,OAAO,aAAa,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACzH,CAAC;CACH,CAAA;AARyC;IAAtC,MAAM,CAAC,UAAU,CAAC;;6DAA4C;AACD;IAA7D,MAAM,CAAC,cAAc,CAAC,kBAAkB,CAAC;;iEAA0D;AAF1F,yBAAyB;IADrC,UAAU,EAAE;GACA,yBAAyB,CASrC"}

package/lib/command/hydranium-glsp-recording-command.d.ts

@@ -9,6 +9,7 @@
 import { type AnyObject, type JsonModelState, JsonRecordingCommand, type MaybePromise } from '@eclipse-glsp/server';
 import { type AstNode } from '@hydranium/langium';
 import { type AbstractHydraniumGlspState } from '../state/abstract-hydranium-glsp-state.js';
+import { type BasedOn } from '@hydranium/protocol';
 /**
  * Source-model state shape consumed by {@link HydraniumGlspRecordingCommand}.
  * The intersection ties together GLSP's read-side
@@ -42,13 +43,13 @@ export type HydraniumGlspRecordingState<TSourceModel extends AnyObject> = Abstra
  *
  * **postChange semantics.** GLSP's `JsonRecordingCommand.postChange` calls
  * `modelState.updateSourceModel(newModel)` with the model only. The
- * framework lift overrides `postChange` so it also threads the based-on
- * version captured at command start — letting the downstream
- * `ModelService.update` opt into the `ConflictError` gate. Undo / redo
- * postChange calls run with version `undefined` (no gating): the user
- * authored against the recorded patch, not against a specific server
- * version, so re-applying it should succeed regardless of intervening
- * edits. The recorded patch itself encodes the semantic intent.
+ * framework lift overrides `postChange` so it also threads the snapshot
+ * version taken at command start — letting the downstream
+ * session `update` opt into the `ConflictError` gate. Undo / redo
+ * postChange calls pass `'anything'`: the user authored against the recorded
+ * patch, not against a specific server version, so re-applying it should
+ * succeed regardless of intervening edits. The recorded patch itself encodes
+ * the semantic intent.
  */
 export declare class HydraniumGlspRecordingCommand<TSourceModel extends AnyObject> extends JsonRecordingCommand<TSourceModel> {
     /** Human-readable label for the operation; appears in the timing-pair log line. */
@@ -60,13 +61,13 @@ export declare class HydraniumGlspRecordingCommand<TSourceModel extends AnyObjec
     protected readonly redoAction?: (() => MaybePromise<void>) | undefined;
     protected modelState: HydraniumGlspRecordingState<TSourceModel>;
     /**
-     * Based-on version captured at {@link execute} start; threaded into
-     * {@link postChange} so {@link AbstractHydraniumGlspState.updateSourceModel}
-     * sees the version the user authored against. Cleared after `execute`
-     * returns so undo / redo paths fall through to `updateSourceModel`
-     * without a version (no gating).
+     * What the command was authored against, taken at {@link execute} start and
+     * threaded into {@link postChange} so
+     * {@link AbstractHydraniumGlspState.updateSourceModel} gates on it. Reset to
+     * `'anything'` after `execute` returns so undo / redo paths fall through
+     * ungated.
      */
-    protected activeVersion?: number;
+    protected activeBasedOn: BasedOn;
     /**
      * Source-model snapshots captured at {@link execute} — the state the
      * command left ({@link afterSnapshot}) and the state it started from
@@ -92,21 +93,20 @@ export declare class HydraniumGlspRecordingCommand<TSourceModel extends AnyObjec
      * via {@link AbstractHydraniumGlspState.updateSourceModel}). The label combines
      * the operation name with the source-uri-stamped logger.
      *
-     * Captures {@link AbstractHydraniumGlspState.version} at start so {@link postChange}
-     * can thread the based-on version into `updateSourceModel`. The capture
-     * is `try`/`finally`-scoped so undo / redo paths invoked later do not
-     * see a stale captured version.
+     * Takes {@link AbstractHydraniumGlspState.basedOn} at start so {@link postChange}
+     * can thread it into `updateSourceModel`. Scoped with `try`/`finally` so undo
+     * / redo paths invoked later do not see a stale value.
      */
     execute(): Promise<void>;
     /**
      * Override of GLSP's {@link JsonRecordingCommand.postChange} so the
      * call to {@link AbstractHydraniumGlspState.updateSourceModel} threads the
-     * captured based-on version alongside the new model.
+     * based-on version alongside the new model.
      *
-     * During {@link execute} the version is the snapshot captured at
-     * command start; during {@link undo} / {@link redo} it is `undefined`
-     * — replaying a recorded patch does not author against a specific
-     * server version, so no gate applies.
+     * During {@link execute} it is the snapshot version taken at command start;
+     * during {@link undo} / {@link redo} it is `'anything'` — replaying a
+     * recorded patch does not author against a specific server version, so no
+     * gate applies.
      */
     protected postChange(newModel: TSourceModel): MaybePromise<void>;
     /**

package/lib/command/hydranium-glsp-recording-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hydranium-glsp-recording-command.d.ts","sourceRoot":"","sources":["../../src/command/hydranium-glsp-recording-command.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,cAAc,EAAE,oBAAoB,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpH,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAE5F;;;;;;;;;GASG;AACH,MAAM,MAAM,2BAA2B,CAAC,YAAY,SAAS,SAAS,IAAI,0BAA0B,CAAC,OAAO,EAAE,YAAY,CAAC,GACxH,cAAc,CAAC,YAAY,CAAC,CAAC;AAEhC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,qBAAa,6BAA6B,CAAC,YAAY,SAAS,SAAS,CAAE,SAAQ,oBAAoB,CAAC,YAAY,CAAC;IA0B/G,mFAAmF;IACnF,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM;IAEhC;uEACmE;IACnE,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IACxD,gEAAgE;IAChE,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IAhC3D,UAAkB,UAAU,EAAE,2BAA2B,CAAC,YAAY,CAAC,CAAC;IAExE;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAEjC;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,EAAE,YAAY,CAAC;IACxC,SAAS,CAAC,aAAa,CAAC,EAAE,YAAY,CAAC;gBAGpC,UAAU,EAAE,2BAA2B,CAAC,YAAY,CAAC;IACrD,mFAAmF;IAChE,KAAK,EAAE,MAAM,EAChC,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IACnC;uEACmE;IAChD,UAAU,CAAC,GAAE,MAAM,YAAY,CAAC,IAAI,CAAC,aAAA;IACxD,gEAAgE;IAC7C,UAAU,CAAC,GAAE,MAAM,YAAY,CAAC,IAAI,CAAC,aAAA;IAK3D;;;;;;;;;;OAUG;IACY,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAavC;;;;;;;;;OASG;cACgB,UAAU,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,CAAC,IAAI,CAAC;IAIzE;;;;;;;;;;;OAWG;IACY,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBpC;;;;OAIG;IACY,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAgBtC"}
+{"version":3,"file":"hydranium-glsp-recording-command.d.ts","sourceRoot":"","sources":["../../src/command/hydranium-glsp-recording-command.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,cAAc,EAAE,oBAAoB,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpH,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAC5F,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;;;;;;;;GASG;AACH,MAAM,MAAM,2BAA2B,CAAC,YAAY,SAAS,SAAS,IAAI,0BAA0B,CAAC,OAAO,EAAE,YAAY,CAAC,GACxH,cAAc,CAAC,YAAY,CAAC,CAAC;AAEhC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,qBAAa,6BAA6B,CAAC,YAAY,SAAS,SAAS,CAAE,SAAQ,oBAAoB,CAAC,YAAY,CAAC;IA0B/G,mFAAmF;IACnF,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM;IAEhC;uEACmE;IACnE,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IACxD,gEAAgE;IAChE,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IAhC3D,UAAkB,UAAU,EAAE,2BAA2B,CAAC,YAAY,CAAC,CAAC;IAExE;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,EAAE,OAAO,CAAc;IAE9C;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,EAAE,YAAY,CAAC;IACxC,SAAS,CAAC,aAAa,CAAC,EAAE,YAAY,CAAC;gBAGpC,UAAU,EAAE,2BAA2B,CAAC,YAAY,CAAC;IACrD,mFAAmF;IAChE,KAAK,EAAE,MAAM,EAChC,SAAS,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC;IACnC;uEACmE;IAChD,UAAU,CAAC,GAAE,MAAM,YAAY,CAAC,IAAI,CAAC,aAAA;IACxD,gEAAgE;IAC7C,UAAU,CAAC,GAAE,MAAM,YAAY,CAAC,IAAI,CAAC,aAAA;IAK3D;;;;;;;;;OASG;IACY,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAavC;;;;;;;;;OASG;cACgB,UAAU,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,CAAC,IAAI,CAAC;IAIzE;;;;;;;;;;;OAWG;IACY,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBpC;;;;OAIG;IACY,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAgBtC"}

package/lib/command/hydranium-glsp-recording-command.js

@@ -29,26 +29,26 @@ import { JsonRecordingCommand } from '@eclipse-glsp/server';
  *
  * **postChange semantics.** GLSP's `JsonRecordingCommand.postChange` calls
  * `modelState.updateSourceModel(newModel)` with the model only. The
- * framework lift overrides `postChange` so it also threads the based-on
- * version captured at command start — letting the downstream
- * `ModelService.update` opt into the `ConflictError` gate. Undo / redo
- * postChange calls run with version `undefined` (no gating): the user
- * authored against the recorded patch, not against a specific server
- * version, so re-applying it should succeed regardless of intervening
- * edits. The recorded patch itself encodes the semantic intent.
+ * framework lift overrides `postChange` so it also threads the snapshot
+ * version taken at command start — letting the downstream
+ * session `update` opt into the `ConflictError` gate. Undo / redo
+ * postChange calls pass `'anything'`: the user authored against the recorded
+ * patch, not against a specific server version, so re-applying it should
+ * succeed regardless of intervening edits. The recorded patch itself encodes
+ * the semantic intent.
  */
 export class HydraniumGlspRecordingCommand extends JsonRecordingCommand {
     label;
     undoAction;
     redoAction;
     /**
-     * Based-on version captured at {@link execute} start; threaded into
-     * {@link postChange} so {@link AbstractHydraniumGlspState.updateSourceModel}
-     * sees the version the user authored against. Cleared after `execute`
-     * returns so undo / redo paths fall through to `updateSourceModel`
-     * without a version (no gating).
+     * What the command was authored against, taken at {@link execute} start and
+     * threaded into {@link postChange} so
+     * {@link AbstractHydraniumGlspState.updateSourceModel} gates on it. Reset to
+     * `'anything'` after `execute` returns so undo / redo paths fall through
+     * ungated.
      */
-    activeVersion;
+    activeBasedOn = 'anything';
     /**
      * Source-model snapshots captured at {@link execute} — the state the
      * command left ({@link afterSnapshot}) and the state it started from
@@ -79,36 +79,35 @@ export class HydraniumGlspRecordingCommand extends JsonRecordingCommand {
      * via {@link AbstractHydraniumGlspState.updateSourceModel}). The label combines
      * the operation name with the source-uri-stamped logger.
      *
-     * Captures {@link AbstractHydraniumGlspState.version} at start so {@link postChange}
-     * can thread the based-on version into `updateSourceModel`. The capture
-     * is `try`/`finally`-scoped so undo / redo paths invoked later do not
-     * see a stale captured version.
+     * Takes {@link AbstractHydraniumGlspState.basedOn} at start so {@link postChange}
+     * can thread it into `updateSourceModel`. Scoped with `try`/`finally` so undo
+     * / redo paths invoked later do not see a stale value.
      */
     async execute() {
         const logger = this.modelState.logger.for('HydraniumGlspRecordingCommand');
-        this.activeVersion = this.modelState.version;
-        logger.debug(`Executing '${this.label}' (based-on doc.version=v${this.activeVersion})`);
+        this.activeBasedOn = this.modelState.basedOn;
+        logger.debug(`Executing '${this.label}' (based-on doc.version=v${this.modelState.version})`);
         this.beforeSnapshot = this.deepClone(await this.getJsonObject());
         try {
             await this.modelState.tracer.for('HydraniumGlspRecordingCommand').time(`Execute command '${this.label}'`, () => super.execute());
         }
         finally {
-            this.activeVersion = undefined;
+            this.activeBasedOn = 'anything';
         }
         this.afterSnapshot = this.deepClone(await this.getJsonObject());
     }
     /**
      * Override of GLSP's {@link JsonRecordingCommand.postChange} so the
      * call to {@link AbstractHydraniumGlspState.updateSourceModel} threads the
-     * captured based-on version alongside the new model.
+     * based-on version alongside the new model.
      *
-     * During {@link execute} the version is the snapshot captured at
-     * command start; during {@link undo} / {@link redo} it is `undefined`
-     * — replaying a recorded patch does not author against a specific
-     * server version, so no gate applies.
+     * During {@link execute} it is the snapshot version taken at command start;
+     * during {@link undo} / {@link redo} it is `'anything'` — replaying a
+     * recorded patch does not author against a specific server version, so no
+     * gate applies.
      */
     postChange(newModel) {
-        return this.modelState.updateSourceModel(newModel, this.activeVersion);
+        return this.modelState.updateSourceModel(newModel, this.activeBasedOn);
     }
     /**
      * Reconcile the recorded `after → before` transition against the

package/lib/command/hydranium-glsp-recording-command.js.map

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

package/lib/command/index.d.ts

@@ -7,4 +7,5 @@
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
 export * from './hydranium-glsp-recording-command.js';
+export * from './hydranium-glsp-command-stack.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/command/index.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,cAAc,uCAAuC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/command/index.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,cAAc,uCAAuC,CAAC;AACtD,cAAc,mCAAmC,CAAC"}

package/lib/command/index.js

@@ -7,4 +7,5 @@
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
 export * from './hydranium-glsp-recording-command.js';
+export * from './hydranium-glsp-command-stack.js';
 //# sourceMappingURL=index.js.map

package/lib/command/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/command/index.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,cAAc,uCAAuC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/command/index.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,cAAc,uCAAuC,CAAC;AACtD,cAAc,mCAAmC,CAAC"}

package/lib/launcher/abstract-hydranium-glsp-diagram-module.d.ts

@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: MIT
  ********************************************************************************/
-import { DiagramModule } from '@eclipse-glsp/server';
+import { type ActionHandlerConstructor, type BindingTarget, type CommandStack, DiagramModule, type InstanceMultiBinding } from '@eclipse-glsp/server';
 import { type interfaces } from 'inversify';
 import type { LanguageMetaData } from '@hydranium/langium';
 /**
@@ -16,8 +16,10 @@ import type { LanguageMetaData } from '@hydranium/langium';
  * Exported separately from {@link AbstractHydraniumGlspDiagramModule} for adopters
  * whose diagram module already extends an intermediate base of their own and
  * cannot take the framework base class; call it from `configure` after
- * `super.configure(...)`. The base class is the preferred entry point because
- * it makes the declaration non-optional.
+ * `super.configure(...)`, add {@link HydraniumGlspRequestSaveModelActionHandler}
+ * in `configureActionHandlers`, and return {@link HydraniumGlspCommandStack} from
+ * `bindCommandStack`, all of which the base also does. The base class is the
+ * preferred entry point because it makes the declaration non-optional.
  *
  * **Why the session tier.** GLSP builds its app container once per process,
  * before any document exists, so a per-language service bound there can only
@@ -71,5 +73,12 @@ export declare abstract class AbstractHydraniumGlspDiagramModule extends Diagram
      */
     protected abstract declareLanguage(): LanguageMetaData;
     protected configure(bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind): void;
+    /** {@link HydraniumGlspCommandStack}, so the diagram is dirty exactly while a document it has open is. */
+    protected bindCommandStack(): BindingTarget<CommandStack>;
+    /**
+     * Adds {@link HydraniumGlspRequestSaveModelActionHandler}, the save the
+     * Theia client sends, beside GLSP's own save handler.
+     */
+    protected configureActionHandlers(binding: InstanceMultiBinding<ActionHandlerConstructor>): void;
 }
 //# sourceMappingURL=abstract-hydranium-glsp-diagram-module.d.ts.map