@eclipse-glsp-examples/workflow-server-bundled 2.6.0 → 2.7.0-next.7

package/wf-glsp-server-node.js

@@ -1842,7 +1842,7 @@ exports.TaskEditValidator = TaskEditValidator = __decorate([
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ModelTypes = void 0;
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2026 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -1856,7 +1856,6 @@ exports.ModelTypes = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-/* eslint-disable @typescript-eslint/padding-line-between-statements */
 var ModelTypes;
 (function (ModelTypes) {
     ModelTypes.LABEL_HEADING = 'label:heading';
@@ -3632,7 +3631,7 @@ if (false) {} else {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.CompoundOperation = exports.Operation = exports.RejectAction = exports.ResponseAction = exports.RequestAction = exports.ActionMessage = exports.Action = void 0;
 /********************************************************************************
- * Copyright (c) 2021-2023 STMicroelectronics and others.
+ * Copyright (c) 2021-2026 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -3984,7 +3983,7 @@ var PasteOperation;
 "use strict";
 
 /********************************************************************************
- * Copyright (c) 2021-2023 STMicroelectronics and others.
+ * Copyright (c) 2021-2026 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -3999,7 +3998,7 @@ var PasteOperation;
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.SetContextActions = exports.RequestContextActions = void 0;
+exports.EditorContextResult = exports.GetEditorContextAction = exports.SetContextActions = exports.RequestContextActions = void 0;
 const type_util_1 = __webpack_require__(/*! ../utils/type-util */ "../../node_modules/@eclipse-glsp/protocol/lib/utils/type-util.js");
 const base_protocol_1 = __webpack_require__(/*! ./base-protocol */ "../../node_modules/@eclipse-glsp/protocol/lib/action-protocol/base-protocol.js");
 var RequestContextActions;
@@ -4035,6 +4034,39 @@ var SetContextActions;
     }
     SetContextActions.create = create;
 })(SetContextActions || (exports.SetContextActions = SetContextActions = {}));
+var GetEditorContextAction;
+(function (GetEditorContextAction) {
+    GetEditorContextAction.KIND = 'getEditorContext';
+    function is(object) {
+        return base_protocol_1.RequestAction.hasKind(object, GetEditorContextAction.KIND);
+    }
+    GetEditorContextAction.is = is;
+    function create(options = {}) {
+        return {
+            kind: GetEditorContextAction.KIND,
+            requestId: '',
+            ...options
+        };
+    }
+    GetEditorContextAction.create = create;
+})(GetEditorContextAction || (exports.GetEditorContextAction = GetEditorContextAction = {}));
+var EditorContextResult;
+(function (EditorContextResult) {
+    EditorContextResult.KIND = 'editorContextResult';
+    function is(object) {
+        return base_protocol_1.Action.hasKind(object, EditorContextResult.KIND) && (0, type_util_1.hasObjectProp)(object, 'editorContext');
+    }
+    EditorContextResult.is = is;
+    function create(editorContext, options = {}) {
+        return {
+            kind: EditorContextResult.KIND,
+            responseId: '',
+            editorContext,
+            ...options
+        };
+    }
+    EditorContextResult.create = create;
+})(EditorContextResult || (exports.EditorContextResult = EditorContextResult = {}));
 
 
 /***/ }),
@@ -5705,7 +5737,7 @@ exports.BaseGLSPClient = BaseGLSPClient;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.GLSPClient = exports.ClientState = exports.ApplicationIdProvider = void 0;
 /********************************************************************************
- * Copyright (c) 2020-2024 EclipseSource and others.
+ * Copyright (c) 2020-2026 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -5719,12 +5751,12 @@ exports.GLSPClient = exports.ClientState = exports.ApplicationIdProvider = void
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const uuid = __webpack_require__(/*! uuid */ "../../node_modules/@eclipse-glsp/protocol/node_modules/uuid/dist/esm-node/index.js");
+const uuid_1 = __webpack_require__(/*! uuid */ "../../node_modules/@eclipse-glsp/protocol/node_modules/uuid/dist/esm-node/index.js");
 const type_util_1 = __webpack_require__(/*! ../utils/type-util */ "../../node_modules/@eclipse-glsp/protocol/lib/utils/type-util.js");
 class ApplicationIdProvider {
     static get() {
         if (!ApplicationIdProvider._applicationId) {
-            ApplicationIdProvider._applicationId = uuid.v4();
+            ApplicationIdProvider._applicationId = (0, uuid_1.v4)();
         }
         return ApplicationIdProvider._applicationId;
     }
@@ -5763,7 +5795,6 @@ var ClientState;
 })(ClientState || (exports.ClientState = ClientState = {}));
 var GLSPClient;
 (function (GLSPClient) {
-    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     function isOptions(object) {
         return type_util_1.AnyObject.is(object) && (0, type_util_1.hasStringProp)(object, 'id');
     }
@@ -6025,7 +6056,7 @@ exports.JsonrpcClientProxy = JsonrpcClientProxy;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.JsonrpcGLSPClient = void 0;
 /********************************************************************************
- * Copyright (c) 2020-2023 EclipseSource and others.
+ * Copyright (c) 2020-2026 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -6043,7 +6074,6 @@ const vscode_jsonrpc_1 = __webpack_require__(/*! vscode-jsonrpc */ "../../node_m
 const glsp_client_1 = __webpack_require__(/*! ../glsp-client */ "../../node_modules/@eclipse-glsp/protocol/lib/client-server-protocol/glsp-client.js");
 var JsonrpcGLSPClient;
 (function (JsonrpcGLSPClient) {
-    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
     function isOptions(object) {
         return glsp_client_1.GLSPClient.isOptions(object) && 'connectionProvider' in object;
     }
@@ -6562,7 +6592,7 @@ function isContainerModule(config) {
 "use strict";
 
 /********************************************************************************
- * Copyright (c) 2023-2024 EclipseSource and others.
+ * Copyright (c) 2023-2026 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -6640,9 +6670,7 @@ class FeatureModule extends inversify_1.ContainerModule {
         }
         const missing = requires.filter(module => !module.isLoaded({ isBound }));
         if (missing.length > 0) {
-            this.debugLog(
-            // eslint-disable-next-line max-len
-            `Could not load feature module. Required modules are not loaded. Feature ids: ${missing.map(m => m.featureId.toString()).join(', ')}`);
+            this.debugLog(`Could not load feature module. Required modules are not loaded. Feature ids: ${missing.map(m => m.featureId.toString()).join(', ')}`);
             return false;
         }
         return true;
@@ -7348,7 +7376,7 @@ geometry_1.Dimension.area = (dimension) => dimension.width * dimension.height;
 "use strict";
 
 /********************************************************************************
- * Copyright (c) 2024 EclipseSource and others.
+ * Copyright (c) 2024-2026 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -7404,6 +7432,9 @@ geometry_1.Point.moveTowards = (from, vector) => {
     return { from, to, vector, direction: dir };
 };
 geometry_1.Point.equals = (one, other, eps) => (0, math_util_1.equalUpTo)(one.x, other.x, eps) && (0, math_util_1.equalUpTo)(one.y, other.y, eps);
+geometry_1.Point.isVerticalAligned = (a, b, eps = math_util_1.ALMOST_EQUAL_EPSILON) => (0, math_util_1.equalUpTo)(a.x, b.x, eps);
+geometry_1.Point.isHorizontalAligned = (a, b, eps = math_util_1.ALMOST_EQUAL_EPSILON) => (0, math_util_1.equalUpTo)(a.y, b.y, eps);
+geometry_1.Point.isAxisAligned = (a, b, eps = math_util_1.ALMOST_EQUAL_EPSILON) => geometry_1.Point.isVerticalAligned(a, b, eps) || geometry_1.Point.isHorizontalAligned(a, b, eps);
 
 
 /***/ }),
@@ -7615,7 +7646,6 @@ var Disposable;
      * @returns the newly created disposable
      */
     function empty() {
-        // eslint-disable-next-line @typescript-eslint/no-empty-function
         return { dispose: () => { } };
     }
     Disposable.empty = empty;
@@ -8154,7 +8184,7 @@ var Vector;
 "use strict";
 
 /********************************************************************************
- * Copyright (c) 2024 Axon Ivy AG and others.
+ * Copyright (c) 2024-2026 Axon Ivy AG and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -8169,7 +8199,13 @@ var Vector;
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ALMOST_EQUAL_EPSILON = void 0;
 exports.equalUpTo = equalUpTo;
+/**
+ * Default epsilon for loose numeric equality checks, matching the tolerance
+ * used by sprotty's `almostEquals` convention.
+ */
+exports.ALMOST_EQUAL_EPSILON = 1e-3;
 function equalUpTo(one, other, epsilon = Number.EPSILON) {
     return Math.abs(one - other) <= epsilon;
 }
@@ -8186,7 +8222,7 @@ function equalUpTo(one, other, epsilon = Number.EPSILON) {
 "use strict";
 
 /********************************************************************************
- * Copyright (c) 2021-2025 EclipseSource and others.
+ * Copyright (c) 2021-2026 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -60269,11 +60305,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var DefaultActionDispatcher_1;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.DefaultActionDispatcher = exports.ActionDispatcher = void 0;
+exports.DefaultActionDispatcher = exports.ActionDispatchScope = exports.ActionDispatcher = void 0;
 exports.respond = respond;
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2026 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -60290,23 +60327,56 @@ exports.respond = respond;
 const protocol_1 = __webpack_require__(/*! @eclipse-glsp/protocol */ "../../node_modules/@eclipse-glsp/protocol/lib/index.js");
 const inversify_1 = __webpack_require__(/*! inversify */ "../../node_modules/inversify/lib/cjs/index.js");
 const service_identifiers_1 = __webpack_require__(/*! ../di/service-identifiers */ "../../packages/server/lib/common/di/service-identifiers.js");
+const action_queue_1 = __webpack_require__(/*! ../utils/action-queue */ "../../packages/server/lib/common/utils/action-queue.js");
 const glsp_server_error_1 = __webpack_require__(/*! ../utils/glsp-server-error */ "../../packages/server/lib/common/utils/glsp-server-error.js");
 const logger_1 = __webpack_require__(/*! ../utils/logger */ "../../packages/server/lib/common/utils/logger.js");
-const promise_queue_1 = __webpack_require__(/*! ../utils/promise-queue */ "../../packages/server/lib/common/utils/promise-queue.js");
 const action_handler_registry_1 = __webpack_require__(/*! ./action-handler-registry */ "../../packages/server/lib/common/actions/action-handler-registry.js");
 const client_action_handler_1 = __webpack_require__(/*! ./client-action-handler */ "../../packages/server/lib/common/actions/client-action-handler.js");
 exports.ActionDispatcher = Symbol('ActionDispatcher');
-let DefaultActionDispatcher = class DefaultActionDispatcher {
+exports.ActionDispatchScope = Symbol('ActionDispatchScope');
+/**
+ * Default {@link ActionDispatcher}. External dispatches are queued and processed one at a
+ * time; dispatches made from within a running handler run inline with the containing action.
+ */
+let DefaultActionDispatcher = DefaultActionDispatcher_1 = class DefaultActionDispatcher {
     constructor() {
-        this.actionQueue = new promise_queue_1.PromiseQueue();
+        this.actionQueue = new action_queue_1.ActionQueue();
         this.postUpdateQueue = [];
+        this.pendingRequests = new Map();
+        this.requestTimeouts = new Map();
+        this.nextRequestId = 1;
+    }
+    initialize() {
+        // Fire-and-forget: the loop is meant to run for the dispatcher's lifetime; surface any
+        // unexpected termination via the logger instead of an unhandled rejection.
+        this.processActionQueue().catch(error => this.logger.error('Action queue processor terminated unexpectedly', error));
+    }
+    generateRequestId() {
+        return `server_${this.clientId}_${this.nextRequestId++}`;
     }
     dispatch(action) {
-        // Dont queue actions that are just delegated to the client
-        if (this.clientActionForwarder.shouldForwardToClient(action)) {
+        // Intercept first to avoid deadlock: a handler may be awaiting this response.
+        if (this.interceptPendingResponse(action)) {
+            return Promise.resolve();
+        }
+        // Reentrant dispatches run inline to preserve ordering with the containing action.
+        if (this.dispatchScope.isReentrant(action)) {
             return this.doDispatch(action);
         }
-        return this.actionQueue.enqueue(() => this.doDispatch(action));
+        // External dispatches are queued and processed sequentially.
+        return this.actionQueue.push(action);
+    }
+    async processActionQueue() {
+        // Process each action inside the dispatch scope so reentrant dispatch() calls are recognized.
+        for await (const entry of this.actionQueue.consume()) {
+            try {
+                await this.dispatchScope.enter(() => this.doDispatch(entry.item));
+                entry.resolve();
+            }
+            catch (error) {
+                entry.reject(error);
+            }
+        }
     }
     async doDispatch(action) {
         this.logger.debug('Dispatch action:', action.kind);
@@ -60320,42 +60390,171 @@ let DefaultActionDispatcher = class DefaultActionDispatcher {
             const response = await this.executeHandler(handler, action);
             responses.push(...response);
         }
-        if (this.postUpdateQueue.length > 0 && (protocol_1.UpdateModelAction.is(action) || protocol_1.SetModelAction.is(action))) {
-            responses.push(...this.postUpdateQueue);
-            this.postUpdateQueue = [];
-        }
+        // Append post-update actions to responses so they are dispatched in the same inline
+        // batch as the handler responses, preserving sequential order.
+        responses.push(...this.drainPostUpdateQueue(action));
         await this.dispatchResponses(responses);
     }
-    async executeHandler(handler, request) {
-        const responseActions = await handler.execute(request);
-        return responseActions.map(action => respond(request, action));
+    async executeHandler(handler, action) {
+        const responseActions = await handler.execute(action);
+        return responseActions.map(response => respond(action, response));
     }
-    dispatchResponses(actions) {
-        if (actions.length === 0) {
-            return Promise.resolve();
+    async dispatchResponses(actions) {
+        // Sequential dispatch inside the current dispatch scope. Each response goes inline via
+        // the reentrant path, or is intercepted if it resolves a pending request().
+        for (const action of actions) {
+            await this.dispatch(action);
         }
-        const responseQueue = new promise_queue_1.PromiseQueue();
-        const responses = actions.map(action => responseQueue.enqueue(() => this.doDispatch(action)));
-        return Promise.all(responses).then(() => Promise.resolve());
     }
-    dispatchAll(...actions) {
+    async dispatchAll(...actions) {
         if (actions.length === 0) {
-            return Promise.resolve();
+            return;
         }
         const flat = [];
         (0, protocol_1.flatPush)(flat, actions);
-        return Promise.all(flat.map(action => this.dispatch(action))).then(() => Promise.resolve());
+        // Sequential dispatch: external calls were already FIFO via the queue, but reentrant
+        // calls also need deterministic ordering so handlers see each other's effects in order.
+        for (const action of flat) {
+            await this.dispatch(action);
+        }
     }
     dispatchAfterNextUpdate(...actions) {
         if (actions.length !== 0) {
             (0, protocol_1.flatPush)(this.postUpdateQueue, actions);
         }
     }
+    request(action) {
+        return this.doRequest(action, undefined, true);
+    }
+    requestUntil(action, timeoutMs, rejectOnTimeout) {
+        var _a;
+        if (timeoutMs === void 0) { timeoutMs = (_a = action.timeout) !== null && _a !== void 0 ? _a : 2000; }
+        if (rejectOnTimeout === void 0) { rejectOnTimeout = false; }
+        return this.doRequest(action, timeoutMs, rejectOnTimeout);
+    }
+    doRequest(action, timeoutMs, rejectOnTimeout) {
+        if (!action.requestId || action.requestId === '') {
+            action.requestId = this.generateRequestId();
+        }
+        // Stamp the effective timeout onto the action so the receiving side
+        // (handleServerRequest/handleClientRequest) can respect it.
+        action.timeout = timeoutMs;
+        const deferred = new protocol_1.Deferred();
+        this.pendingRequests.set(action.requestId, deferred);
+        if (timeoutMs !== undefined) {
+            const timeout = setTimeout(() => {
+                var _a;
+                if (this.pendingRequests.delete(action.requestId)) {
+                    // Keep the requestTimeouts entry briefly as a stale marker so a late response
+                    // can be filtered, then drop it after a grace period to avoid leaking markers
+                    // for requests whose late responses never arrive.
+                    const cleanup = setTimeout(() => this.requestTimeouts.delete(action.requestId), DefaultActionDispatcher_1.STALE_TIMEOUT_GRACE_MS);
+                    (_a = cleanup.unref) === null || _a === void 0 ? void 0 : _a.call(cleanup);
+                    const message = `Request '${action.requestId}' (${action.kind}) timed out after ${timeoutMs}ms`;
+                    if (rejectOnTimeout) {
+                        deferred.reject(new Error(message));
+                    }
+                    else {
+                        this.logger.info(message);
+                        deferred.resolve(undefined);
+                    }
+                }
+            }, timeoutMs);
+            this.requestTimeouts.set(action.requestId, timeout);
+        }
+        // dispatch() routes correctly on its own: external callers queue, handler-internal
+        // callers run inline via the ActionDispatchScope. The matching response resolves
+        // the deferred out-of-band via interceptPendingResponse().
+        const dispatchPromise = this.dispatch(action);
+        dispatchPromise.catch(error => {
+            if (this.pendingRequests.delete(action.requestId)) {
+                const timeout = this.requestTimeouts.get(action.requestId);
+                if (timeout !== undefined) {
+                    clearTimeout(timeout);
+                    this.requestTimeouts.delete(action.requestId);
+                }
+                deferred.reject(error);
+            }
+        });
+        return deferred.promise;
+    }
+    /**
+     * If the given action is a {@link SetModelAction} or {@link UpdateModelAction} and there are actions
+     * queued via {@link dispatchAfterNextUpdate}, drain and return them.
+     *
+     * @returns The drained actions, or an empty array if nothing to drain.
+     */
+    drainPostUpdateQueue(action) {
+        if (this.postUpdateQueue.length > 0 && (protocol_1.UpdateModelAction.is(action) || protocol_1.SetModelAction.is(action))) {
+            const actions = [...this.postUpdateQueue];
+            this.postUpdateQueue = [];
+            return actions;
+        }
+        return [];
+    }
+    /**
+     * Checks whether the given action is a response matching a pending {@link request} or
+     * {@link requestUntil} call. If matched, resolves (or rejects) the corresponding deferred
+     * and returns `true` so the caller can short-circuit normal dispatch.
+     *
+     * For responses with a valid `responseId` but no matching pending request, checks for a stale
+     * timeout entry (timed-out request) and clears the `responseId` so the action is not forwarded
+     * by {@link ClientActionForwarder}. If no stale entry exists, the `responseId` is left intact
+     * for normal forwarding.
+     */
+    interceptPendingResponse(action) {
+        if (!protocol_1.ResponseAction.hasValidResponseId(action)) {
+            return false;
+        }
+        const deferred = this.pendingRequests.get(action.responseId);
+        if (deferred !== undefined) {
+            this.pendingRequests.delete(action.responseId);
+            const timeout = this.requestTimeouts.get(action.responseId);
+            if (timeout !== undefined) {
+                clearTimeout(timeout);
+                this.requestTimeouts.delete(action.responseId);
+            }
+            // Intercepted responses skip doDispatch, so drain post-update actions here when the
+            // response is an UpdateModel/SetModel. RejectAction does not trigger a drain; pending
+            // post-update actions stay queued until the next successful update.
+            const postUpdateActions = this.drainPostUpdateQueue(action);
+            if (protocol_1.RejectAction.is(action)) {
+                deferred.reject(new Error(`${action.message}${action.detail ? ': ' + action.detail : ''}`));
+            }
+            else {
+                deferred.resolve(action);
+            }
+            if (postUpdateActions.length > 0) {
+                // Fire-and-forget: callers of request() expect the resolved response, not the
+                // unrelated post-update fan-out; awaiting here would couple them unnecessarily.
+                this.dispatchResponses(postUpdateActions).catch(error => this.logger.error('Failed to dispatch post-update actions', error));
+            }
+            return true;
+        }
+        // Late response for a timed-out request: clear responseId so ClientActionForwarder does
+        // not re-emit it to the client.
+        const staleTimeout = this.requestTimeouts.get(action.responseId);
+        if (staleTimeout !== undefined) {
+            clearTimeout(staleTimeout);
+            this.requestTimeouts.delete(action.responseId);
+            this.logger.debug(`Late response for timed-out request '${action.responseId}', dispatching as normal action`);
+            action.responseId = '';
+        }
+        return false;
+    }
     dispose() {
-        this.actionQueue.clear();
+        // Reject queued actions: no further processing should happen after dispose.
+        this.actionQueue.rejectPending(new Error('ActionDispatcher disposed'));
+        this.actionQueue.stop();
+        this.pendingRequests.forEach((deferred, id) => deferred.reject(new Error(`Request '${id}' cancelled: dispatcher disposed`)));
+        this.pendingRequests.clear();
+        this.requestTimeouts.forEach(timeout => clearTimeout(timeout));
+        this.requestTimeouts.clear();
+        this.postUpdateQueue = [];
     }
 };
 exports.DefaultActionDispatcher = DefaultActionDispatcher;
+DefaultActionDispatcher.STALE_TIMEOUT_GRACE_MS = 30000;
 __decorate([
     (0, inversify_1.inject)(action_handler_registry_1.ActionHandlerRegistry),
     __metadata("design:type", action_handler_registry_1.ActionHandlerRegistry)
@@ -60372,7 +60571,17 @@ __decorate([
     (0, inversify_1.inject)(service_identifiers_1.ClientId),
     __metadata("design:type", String)
 ], DefaultActionDispatcher.prototype, "clientId", void 0);
-exports.DefaultActionDispatcher = DefaultActionDispatcher = __decorate([
+__decorate([
+    (0, inversify_1.inject)(exports.ActionDispatchScope),
+    __metadata("design:type", Object)
+], DefaultActionDispatcher.prototype, "dispatchScope", void 0);
+__decorate([
+    (0, inversify_1.postConstruct)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], DefaultActionDispatcher.prototype, "initialize", null);
+exports.DefaultActionDispatcher = DefaultActionDispatcher = DefaultActionDispatcher_1 = __decorate([
     (0, inversify_1.injectable)()
 ], DefaultActionDispatcher);
 /**
@@ -60507,7 +60716,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ClientActionForwarder = void 0;
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2026 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -60554,7 +60763,7 @@ let ClientActionForwarder = class ClientActionForwarder {
         if (client_action_1.ClientAction.is(action)) {
             return false;
         }
-        return this.actionKinds.has(action.kind) || protocol_1.ResponseAction.is(action);
+        return this.actionKinds.has(action.kind) || protocol_1.ResponseAction.hasValidResponseId(action);
     }
 };
 exports.ClientActionForwarder = ClientActionForwarder;
@@ -60598,7 +60807,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DefaultGlobalActionProvider = exports.GlobalActionProvider = void 0;
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2026 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -60634,7 +60843,6 @@ let DefaultGlobalActionProvider = class DefaultGlobalActionProvider {
         const container = serverContainer.createChild();
         const clientSessionModule = (0, client_session_module_1.createClientSessionModule)({
             clientId: 'tempId',
-            // eslint-disable-next-line @typescript-eslint/no-empty-function
             glspClient: { process: () => { } },
             clientActionKinds: []
         });
@@ -61877,7 +62085,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RequestClipboardDataActionHandler = void 0;
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2026 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -61907,7 +62115,6 @@ let RequestClipboardDataActionHandler = class RequestClipboardDataActionHandler
         selectedElements.forEach(element => {
             schemas.push(this.modelSerializer.createSchema(element));
         });
-        // eslint-disable-next-line no-null/no-null
         clipboardData['application/json'] = JSON.stringify(schemas, undefined, 2);
         return [protocol_1.SetClipboardDataAction.create(clipboardData)];
     }
@@ -63224,7 +63431,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ModelSubmissionHandler = void 0;
 /********************************************************************************
- * Copyright (c) 2022-2024 STMicroelectronics and others.
+ * Copyright (c) 2022-2026 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -63427,7 +63634,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RequestModelActionHandler = void 0;
 /********************************************************************************
- * Copyright (c) 2022-2025 STMicroelectronics and others.
+ * Copyright (c) 2022-2026 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -64163,7 +64370,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DefaultProgressService = exports.ProgressService = void 0;
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2026 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -65527,7 +65734,7 @@ exports.GModelReconnectEdgeOperationHandler = GModelReconnectEdgeOperationHandle
 "use strict";
 
 /********************************************************************************
- * Copyright (c) 2022-2024 STMicroelectronics and others.
+ * Copyright (c) 2022-2026 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -65637,6 +65844,7 @@ __exportStar(__webpack_require__(/*! ./session/client-session-factory */ "../../
 __exportStar(__webpack_require__(/*! ./session/client-session-initializer */ "../../packages/server/lib/common/session/client-session-initializer.js"), exports);
 __exportStar(__webpack_require__(/*! ./session/client-session-listener */ "../../packages/server/lib/common/session/client-session-listener.js"), exports);
 __exportStar(__webpack_require__(/*! ./session/client-session-manager */ "../../packages/server/lib/common/session/client-session-manager.js"), exports);
+__exportStar(__webpack_require__(/*! ./utils/action-queue */ "../../packages/server/lib/common/utils/action-queue.js"), exports);
 __exportStar(__webpack_require__(/*! ./utils/args-util */ "../../packages/server/lib/common/utils/args-util.js"), exports);
 __exportStar(__webpack_require__(/*! ./utils/client-options-util */ "../../packages/server/lib/common/utils/client-options-util.js"), exports);
 __exportStar(__webpack_require__(/*! ./utils/console-logger */ "../../packages/server/lib/common/utils/console-logger.js"), exports);
@@ -66438,7 +66646,7 @@ var DefaultGLSPServer_1;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DefaultGLSPServer = void 0;
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2026 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -66467,9 +66675,7 @@ let DefaultGLSPServer = DefaultGLSPServer_1 = class DefaultGLSPServer {
     }
     validateProtocolVersion(params) {
         if (params.protocolVersion !== DefaultGLSPServer_1.PROTOCOL_VERSION) {
-            throw new Error(
-            // eslint-disable-next-line max-len
-            `Protocol version mismatch! The client protocol version ${params.protocolVersion} is not compatible with the server protocol version ${DefaultGLSPServer_1.PROTOCOL_VERSION}!`);
+            throw new Error(`Protocol version mismatch! The client protocol version ${params.protocolVersion} is not compatible with the server protocol version ${DefaultGLSPServer_1.PROTOCOL_VERSION}!`);
         }
     }
     validateServerInitialized() {
@@ -66533,8 +66739,41 @@ let DefaultGLSPServer = DefaultGLSPServer_1 = class DefaultGLSPServer {
         }
         const action = message.action;
         client_action_1.ClientAction.mark(action);
+        if (protocol_1.RequestAction.is(action)) {
+            this.handleClientRequest(clientSession, action, message.clientId);
+            return;
+        }
         clientSession.actionDispatcher.dispatch(action).catch(error => this.handleProcessError(message, error));
     }
+    // Fire-and-forget: intentionally not awaited by process()
+    async handleClientRequest(clientSession, action, clientId) {
+        var _a, _b, _c;
+        try {
+            const response = action.timeout !== undefined
+                ? await clientSession.actionDispatcher.requestUntil(action, action.timeout, true)
+                : await clientSession.actionDispatcher.request(action);
+            if (response) {
+                this.sendResponseToClient(clientId, response);
+            }
+        }
+        catch (error) {
+            const detail = error instanceof glsp_server_error_1.GLSPServerError ? (_b = (_a = error.cause) === null || _a === void 0 ? void 0 : _a.toString) === null || _b === void 0 ? void 0 : _b.call(_a) : (_c = error === null || error === void 0 ? void 0 : error.toString) === null || _c === void 0 ? void 0 : _c.call(error);
+            this.logger.error(`Failed to handle request '${action.kind}' (${action.requestId}):`, detail);
+            try {
+                const reject = protocol_1.RejectAction.create(`Failed to handle request '${action.kind}' (${action.requestId})`, {
+                    responseId: action.requestId,
+                    detail
+                });
+                this.sendResponseToClient(clientId, reject);
+            }
+            catch (sendError) {
+                this.logger.error(`Failed to send rejection for request '${action.requestId}':`, sendError);
+            }
+        }
+    }
+    sendResponseToClient(clientId, response) {
+        this.sendToClient({ clientId, action: response });
+    }
     handleProcessError(message, reason) {
         var _a, _b, _c;
         let errorMsg = `Could not process action: '${message.action.kind}`;
@@ -66923,6 +67162,115 @@ class DefaultClientSession {
 exports.DefaultClientSession = DefaultClientSession;
 
 
+/***/ }),
+
+/***/ "../../packages/server/lib/common/utils/action-queue.js":
+/*!**************************************************************!*\
+  !*** ../../packages/server/lib/common/utils/action-queue.js ***!
+  \**************************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+/********************************************************************************
+ * Copyright (c) 2026 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ActionQueue = void 0;
+/**
+ * Producer/consumer queue with a single async consumer loop. Items are processed in FIFO order.
+ */
+class ActionQueue {
+    constructor() {
+        this.queue = [];
+        this.stopped = false;
+        this.consuming = false;
+    }
+    /**
+     * Enqueues an item. The returned promise settles when the consumer finishes processing it,
+     * propagating results back to the producer. Rejects immediately if the queue has been stopped.
+     */
+    push(item) {
+        if (this.stopped) {
+            return Promise.reject(new Error('ActionQueue is stopped'));
+        }
+        return new Promise((resolve, reject) => {
+            var _a;
+            this.queue.push({ item, resolve, reject });
+            (_a = this.notify) === null || _a === void 0 ? void 0 : _a.call(this);
+        });
+    }
+    /**
+     * Yields pending entries, suspending until the next {@link push} when the queue is empty. Exits
+     * once the queue is stopped and has been drained.
+     *
+     * Single-consumer: calling `consume()` a second time throws an error.
+     */
+    async *consume() {
+        if (this.consuming) {
+            throw new Error('ActionQueue supports only a single consumer');
+        }
+        this.consuming = true;
+        try {
+            while (!this.stopped || this.queue.length > 0) {
+                while (this.queue.length > 0) {
+                    yield this.queue.shift();
+                }
+                if (this.stopped) {
+                    return;
+                }
+                await new Promise(resolve => {
+                    this.notify = resolve;
+                });
+                this.notify = undefined;
+            }
+        }
+        finally {
+            this.consuming = false;
+        }
+    }
+    /**
+     * Stops the queue. Further {@link push} calls reject. The consumer loop exits after
+     * the remaining queued entries have been yielded (or immediately if the queue is empty).
+     */
+    stop() {
+        var _a;
+        this.stopped = true;
+        (_a = this.notify) === null || _a === void 0 ? void 0 : _a.call(this);
+    }
+    /**
+     * Rejects all queued entries with the given reason so producers awaiting their
+     * `push()` promises do not hang. Does not stop the queue.
+     */
+    rejectPending(reason = new Error('ActionQueue cleared')) {
+        const pending = this.queue;
+        this.queue = [];
+        for (const entry of pending) {
+            entry.reject(reason);
+        }
+    }
+    get size() {
+        return this.queue.length;
+    }
+    get isStopped() {
+        return this.stopped;
+    }
+}
+exports.ActionQueue = ActionQueue;
+
+
 /***/ }),
 
 /***/ "../../packages/server/lib/common/utils/args-util.js":
@@ -67473,7 +67821,7 @@ function getRequestParentName(context) {
 "use strict";
 
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2026 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -67494,6 +67842,10 @@ exports.PromiseQueue = void 0;
  * of promises. Promises that are put in this queue are processed one by one.
  * i.e. After the first promise in the queue is resolved, it will be removed from the queue and the resolving of the
  * the next promise (if present) will start. The queue can only resolve one promise at a given time.
+ *
+ * @deprecated Since 2.7. The `DefaultActionDispatcher` no longer uses this queue. Kept for
+ * backwards compatibility; will be removed in a future release. New code should use
+ * {@link ActionQueue} or native async patterns instead.
  */
 class PromiseQueue {
     constructor() {
@@ -67877,10 +68229,12 @@ exports.configureWinstonLogger = configureWinstonLogger;
 const inversify_1 = __webpack_require__(/*! inversify */ "../../node_modules/inversify/lib/cjs/index.js");
 const winston = __webpack_require__(/*! winston */ "../../node_modules/winston/lib/winston.js");
 const common_1 = __webpack_require__(/*! ../../common */ "../../packages/server/lib/common/index.js");
+const node_action_dispatch_scope_1 = __webpack_require__(/*! ./node-action-dispatch-scope */ "../../packages/server/lib/node/di/node-action-dispatch-scope.js");
 const winston_logger_1 = __webpack_require__(/*! ./winston-logger */ "../../packages/server/lib/node/di/winston-logger.js");
 function createAppModule(options) {
     return new inversify_1.ContainerModule((bind, unbind, isBound, rebind) => {
         bind(common_1.InjectionContainer).toDynamicValue(dynamicContext => dynamicContext.container);
+        bind(common_1.ActionDispatchScope).to(node_action_dispatch_scope_1.NodeActionDispatchScope).inSingletonScope();
         const context = { bind, unbind, isBound, rebind };
         configureWinstonLogger(context, options);
     });
@@ -67940,6 +68294,61 @@ function configureWinstonLogger(context, options, rebind = true, baseLoggerCreat
 }
 
 
+/***/ }),
+
+/***/ "../../packages/server/lib/node/di/node-action-dispatch-scope.js":
+/*!***********************************************************************!*\
+  !*** ../../packages/server/lib/node/di/node-action-dispatch-scope.js ***!
+  \***********************************************************************/
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+/********************************************************************************
+ * Copyright (c) 2026 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.NodeActionDispatchScope = void 0;
+const async_hooks_1 = __webpack_require__(/*! async_hooks */ "async_hooks");
+const inversify_1 = __webpack_require__(/*! inversify */ "../../node_modules/inversify/lib/cjs/index.js");
+/**
+ * Node.js {@link ActionDispatchScope} backed by native `AsyncLocalStorage`.
+ */
+let NodeActionDispatchScope = class NodeActionDispatchScope {
+    constructor() {
+        this.storage = new async_hooks_1.AsyncLocalStorage();
+    }
+    enter(callback) {
+        return this.storage.run(true, callback);
+    }
+    isReentrant() {
+        return this.storage.getStore() === true;
+    }
+};
+exports.NodeActionDispatchScope = NodeActionDispatchScope;
+exports.NodeActionDispatchScope = NodeActionDispatchScope = __decorate([
+    (0, inversify_1.injectable)()
+], NodeActionDispatchScope);
+
+
 /***/ }),
 
 /***/ "../../packages/server/lib/node/di/winston-logger.js":
@@ -68117,7 +68526,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 /********************************************************************************
- * Copyright (c) 2022-2024 EclipseSource and others.
+ * Copyright (c) 2022-2026 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -68133,6 +68542,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
  ********************************************************************************/
 __exportStar(__webpack_require__(/*! ./abstract-json-model-storage */ "../../packages/server/lib/node/abstract-json-model-storage.js"), exports);
 __exportStar(__webpack_require__(/*! ./di/app-module */ "../../packages/server/lib/node/di/app-module.js"), exports);
+__exportStar(__webpack_require__(/*! ./di/node-action-dispatch-scope */ "../../packages/server/lib/node/di/node-action-dispatch-scope.js"), exports);
 __exportStar(__webpack_require__(/*! ./di/winston-logger */ "../../packages/server/lib/node/di/winston-logger.js"), exports);
 __exportStar(__webpack_require__(/*! ./gmodel/gmodel-storage */ "../../packages/server/lib/node/gmodel/gmodel-storage.js"), exports);
 __exportStar(__webpack_require__(/*! ./launch/cli-parser */ "../../packages/server/lib/node/launch/cli-parser.js"), exports);
@@ -68577,6 +68987,17 @@ __exportStar(__webpack_require__(/*! ../common */ "../../packages/server/lib/com
 module.exports = __webpack_require__(/*! ./lib/node/index */ "../../packages/server/lib/node/index.js");
 
 
+/***/ }),
+
+/***/ "async_hooks":
+/*!******************************!*\
+  !*** external "async_hooks" ***!
+  \******************************/
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("async_hooks");
+
 /***/ }),
 
 /***/ "buffer":