@eclipse-glsp/server 2.6.0-next.3 → 2.7.0-next.6

package/lib/node/di/async-dispatch-context.d.ts

@@ -0,0 +1,26 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+import { AsyncLocalStorage } from 'async_hooks';
+import { ActionDispatchContext } from '../../common/actions/action-dispatcher';
+/**
+ * Node.js {@link ActionDispatchContext} backed by native `AsyncLocalStorage`.
+ */
+export declare class AsyncDispatchContext implements ActionDispatchContext {
+    protected storage: AsyncLocalStorage<boolean>;
+    run<R>(callback: () => R): R;
+    isInContext(): boolean;
+}
+//# sourceMappingURL=async-dispatch-context.d.ts.map

package/lib/node/di/async-dispatch-context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"async-dispatch-context.d.ts","sourceRoot":"","sources":["../../../src/node/di/async-dispatch-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAE/E;;GAEG;AACH,qBAAa,oBAAqB,YAAW,qBAAqB;IAC9D,SAAS,CAAC,OAAO,6BAAoC;IAErD,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC;IAI5B,WAAW,IAAI,OAAO;CAGzB"}

package/lib/node/di/async-dispatch-context.js

@@ -0,0 +1,35 @@
+"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.AsyncDispatchContext = void 0;
+const async_hooks_1 = require("async_hooks");
+/**
+ * Node.js {@link ActionDispatchContext} backed by native `AsyncLocalStorage`.
+ */
+class AsyncDispatchContext {
+    constructor() {
+        this.storage = new async_hooks_1.AsyncLocalStorage();
+    }
+    run(callback) {
+        return this.storage.run(true, callback);
+    }
+    isInContext() {
+        return this.storage.getStore() === true;
+    }
+}
+exports.AsyncDispatchContext = AsyncDispatchContext;
+//# sourceMappingURL=async-dispatch-context.js.map

package/lib/node/di/async-dispatch-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"async-dispatch-context.js","sourceRoot":"","sources":["../../../src/node/di/async-dispatch-context.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,6CAAgD;AAGhD;;GAEG;AACH,MAAa,oBAAoB;IAAjC;QACc,YAAO,GAAG,IAAI,+BAAiB,EAAW,CAAC;IASzD,CAAC;IAPG,GAAG,CAAI,QAAiB;QACpB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAED,WAAW;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,IAAI,CAAC;IAC5C,CAAC;CACJ;AAVD,oDAUC"}

package/lib/node/di/node-action-dispatch-scope.d.ts

@@ -0,0 +1,26 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+import { AsyncLocalStorage } from 'async_hooks';
+import { ActionDispatchScope } from '../../common/actions/action-dispatcher';
+/**
+ * Node.js {@link ActionDispatchScope} backed by native `AsyncLocalStorage`.
+ */
+export declare class NodeActionDispatchScope implements ActionDispatchScope {
+    protected storage: AsyncLocalStorage<boolean>;
+    enter<R>(callback: () => R): R;
+    isReentrant(): boolean;
+}
+//# sourceMappingURL=node-action-dispatch-scope.d.ts.map

package/lib/node/di/node-action-dispatch-scope.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"node-action-dispatch-scope.d.ts","sourceRoot":"","sources":["../../../src/node/di/node-action-dispatch-scope.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAE7E;;GAEG;AACH,qBACa,uBAAwB,YAAW,mBAAmB;IAC/D,SAAS,CAAC,OAAO,6BAAoC;IAErD,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC;IAI9B,WAAW,IAAI,OAAO;CAGzB"}

package/lib/node/di/node-action-dispatch-scope.js

@@ -0,0 +1,45 @@
+"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 = require("async_hooks");
+const inversify_1 = require("inversify");
+/**
+ * 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);
+//# sourceMappingURL=node-action-dispatch-scope.js.map

package/lib/node/di/node-action-dispatch-scope.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"node-action-dispatch-scope.js","sourceRoot":"","sources":["../../../src/node/di/node-action-dispatch-scope.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,6CAAgD;AAChD,yCAAuC;AAGvC;;GAEG;AAEI,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAA7B;QACO,YAAO,GAAG,IAAI,+BAAiB,EAAW,CAAC;IASzD,CAAC;IAPG,KAAK,CAAI,QAAiB;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAED,WAAW;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,IAAI,CAAC;IAC5C,CAAC;CACJ,CAAA;AAVY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,sBAAU,GAAE;GACA,uBAAuB,CAUnC"}

package/lib/node/di/node-dispatch-context.d.ts

@@ -0,0 +1,26 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+import { AsyncLocalStorage } from 'async_hooks';
+import { ActionDispatchContext } from '../../common/actions/action-dispatcher';
+/**
+ * Node.js {@link ActionDispatchContext} backed by native `AsyncLocalStorage`.
+ */
+export declare class NodeDispatchContext implements ActionDispatchContext {
+    protected storage: AsyncLocalStorage<boolean>;
+    run<R>(callback: () => R): R;
+    isInContext(): boolean;
+}
+//# sourceMappingURL=node-dispatch-context.d.ts.map

package/lib/node/di/node-dispatch-context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"node-dispatch-context.d.ts","sourceRoot":"","sources":["../../../src/node/di/node-dispatch-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAE/E;;GAEG;AACH,qBAAa,mBAAoB,YAAW,qBAAqB;IAC7D,SAAS,CAAC,OAAO,6BAAoC;IAErD,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC;IAI5B,WAAW,IAAI,OAAO;CAGzB"}

package/lib/node/di/node-dispatch-context.js

@@ -0,0 +1,35 @@
+"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.NodeDispatchContext = void 0;
+const async_hooks_1 = require("async_hooks");
+/**
+ * Node.js {@link ActionDispatchContext} backed by native `AsyncLocalStorage`.
+ */
+class NodeDispatchContext {
+    constructor() {
+        this.storage = new async_hooks_1.AsyncLocalStorage();
+    }
+    run(callback) {
+        return this.storage.run(true, callback);
+    }
+    isInContext() {
+        return this.storage.getStore() === true;
+    }
+}
+exports.NodeDispatchContext = NodeDispatchContext;
+//# sourceMappingURL=node-dispatch-context.js.map

package/lib/node/di/node-dispatch-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"node-dispatch-context.js","sourceRoot":"","sources":["../../../src/node/di/node-dispatch-context.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,6CAAgD;AAGhD;;GAEG;AACH,MAAa,mBAAmB;IAAhC;QACc,YAAO,GAAG,IAAI,+BAAiB,EAAW,CAAC;IASzD,CAAC;IAPG,GAAG,CAAI,QAAiB;QACpB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAED,WAAW;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,IAAI,CAAC;IAC5C,CAAC;CACJ;AAVD,kDAUC"}

package/lib/node/index.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * 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
@@ -15,6 +15,7 @@
  ********************************************************************************/
 export * from './abstract-json-model-storage';
 export * from './di/app-module';
+export * from './di/node-action-dispatch-scope';
 export * from './di/winston-logger';
 export * from './gmodel/gmodel-storage';
 export * from './launch/cli-parser';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC;AACnD,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iBAAiB,CAAC;AAChC,cAAc,iCAAiC,CAAC;AAChD,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iCAAiC,CAAC;AAChD,cAAc,oCAAoC,CAAC;AACnD,cAAc,YAAY,CAAC"}

package/lib/node/index.js

@@ -15,7 +15,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
@@ -31,6 +31,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  ********************************************************************************/
 __exportStar(require("./abstract-json-model-storage"), exports);
 __exportStar(require("./di/app-module"), exports);
+__exportStar(require("./di/node-action-dispatch-scope"), exports);
 __exportStar(require("./di/winston-logger"), exports);
 __exportStar(require("./gmodel/gmodel-storage"), exports);
 __exportStar(require("./launch/cli-parser"), exports);

package/lib/node/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,gEAA8C;AAC9C,kDAAgC;AAChC,sDAAoC;AACpC,0DAAwC;AACxC,sDAAoC;AACpC,6DAA2C;AAC3C,kEAAgD;AAChD,qEAAmD;AACnD,6CAA2B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,gEAA8C;AAC9C,kDAAgC;AAChC,kEAAgD;AAChD,sDAAoC;AACpC,0DAAwC;AACxC,sDAAoC;AACpC,6DAA2C;AAC3C,kEAAgD;AAChD,qEAAmD;AACnD,6CAA2B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/server",
-  "version": "2.6.0-next.3+7b1fdd9",
+  "version": "2.7.0-next.6+2d275ee",
   "description": "A js server framework for Eclipse GLSP",
   "keywords": [
     "eclipse",
@@ -51,14 +51,14 @@
     "build": "tsc -b",
     "clean": "rimraf lib *.tsbuildinfo coverage .nyc_output",
     "generate:index": "glsp generateIndex src/browser src/common src/node -s -f",
-    "lint": "eslint --ext .ts,.tsx ./src",
+    "lint": "eslint ./src",
     "test": "mocha --config ../../.mocharc \"./src/**/*.spec.?(ts|tsx)\"",
     "test:ci": "yarn test --reporter mocha-ctrf-json-reporter",
     "test:coverage": "nyc yarn test:ci",
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@eclipse-glsp/graph": "2.6.0-next.3+7b1fdd9",
+    "@eclipse-glsp/graph": "2.7.0-next.6+2d275ee",
     "@eclipse-glsp/protocol": "next",
     "@types/uuid": "8.3.1",
     "commander": "^8.3.0",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7b1fdd9129a853bd28b26b61de989715c45713a4"
+  "gitHead": "2d275ee9c4ea080f5fd99171e5c760f53ad34f49"
 }

package/src/browser/di/app-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 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
@@ -15,12 +15,16 @@
  ********************************************************************************/
 
 import { ContainerModule } from 'inversify';
-import { InjectionContainer, LogLevel, LoggerConfigOptions, configureConsoleLogger } from '../../common/';
+import { ActionDispatchScope, InjectionContainer, LogLevel, LoggerConfigOptions, configureConsoleLogger } from '../../common/';
+import { BrowserActionDispatchScope } from './browser-action-dispatch-scope';
 
 export function createAppModule(options: LoggerConfigOptions = {}): ContainerModule {
     const resolvedOptions: LoggerConfigOptions = { consoleLog: true, logLevel: LogLevel.info, ...options };
     return new ContainerModule((bind, unbind, isBound, rebind) => {
         bind(InjectionContainer).toDynamicValue(dynamicContext => dynamicContext.container);
+        // Transient on purpose: a singleton at the server-container level would be shared across
+        // sessions and leak the browser flag between them.
+        bind(ActionDispatchScope).to(BrowserActionDispatchScope);
         const context = { bind, unbind, isBound, rebind };
         configureConsoleLogger(context, resolvedOptions);
     });

package/src/browser/di/browser-action-dispatch-scope.spec.ts

@@ -0,0 +1,75 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+import { Action } from '@eclipse-glsp/protocol';
+import { expect } from 'chai';
+import { ClientAction } from '../../common/protocol/client-action';
+import * as mock from '../../common/test/mock-util';
+import { BrowserActionDispatchScope } from './browser-action-dispatch-scope';
+
+describe('BrowserActionDispatchScope', () => {
+    const action: Action = { kind: 'foo' };
+    const markedClientAction = ((): Action => {
+        const a: Action = { kind: 'bar' };
+        ClientAction.mark(a);
+        return a;
+    })();
+
+    let scope: BrowserActionDispatchScope;
+    beforeEach(() => {
+        scope = new BrowserActionDispatchScope();
+    });
+
+    it('isReentrant is false outside enter()', () => {
+        expect(scope.isReentrant(action)).to.be.false;
+    });
+
+    it('isReentrant is true during a synchronous enter()', () => {
+        scope.enter(() => {
+            expect(scope.isReentrant(action)).to.be.true;
+        });
+        expect(scope.isReentrant(action)).to.be.false;
+    });
+
+    it('isReentrant is true during an async enter() and false after settle', async () => {
+        const probe: Promise<boolean> = scope.enter(async () => {
+            await Promise.resolve();
+            return scope.isReentrant(action);
+        });
+        expect(await probe).to.be.true;
+        expect(scope.isReentrant(action)).to.be.false;
+    });
+
+    it('resets active flag when callback throws synchronously', () => {
+        expect(() =>
+            scope.enter(() => {
+                throw new Error('boom');
+            })
+        ).to.throw('boom');
+        expect(scope.isReentrant(action)).to.be.false;
+    });
+
+    it('resets active flag when async callback rejects', async () => {
+        await mock.expectToThrowAsync(() => scope.enter(() => Promise.reject(new Error('boom'))), 'boom');
+        expect(scope.isReentrant(action)).to.be.false;
+    });
+
+    it('isReentrant is false for client-originated actions even when scope is active', () => {
+        scope.enter(() => {
+            expect(scope.isReentrant(markedClientAction)).to.be.false;
+            expect(scope.isReentrant(action)).to.be.true;
+        });
+    });
+});

package/src/browser/di/browser-action-dispatch-scope.ts

@@ -0,0 +1,67 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+
+import { Action } from '@eclipse-glsp/protocol';
+import { injectable } from 'inversify';
+import { ActionDispatchScope } from '../../common/actions/action-dispatcher';
+import { ClientAction } from '../../common/protocol/client-action';
+
+/**
+ * Browser-compatible {@link ActionDispatchScope} backed by a single boolean flag, used because
+ * available `AsyncLocalStorage` polyfills do not work reliably across browser engines (e.g. V8).
+ *
+ * The flag cannot distinguish "still inside the handler's async continuation" from "unrelated
+ * event fired during the handler's await". Any dispatch arriving in such a gap is observed as
+ * reentrant and routed inline. Client-originated actions are explicitly treated as non-reentrant
+ * to cover the dominant case, but server-side dispatches from non-handler contexts (timer
+ * callbacks, event listeners, adopter code) cannot be filtered this way and may interleave with
+ * the in-flight handler.
+ *
+ * The dispatcher normally serializes handler execution; the inline interleaving breaks that
+ * guarantee. A handler that pauses on `await` may resume to find that another handler has mutated
+ * state in between (model state, command stack, caches), leading to unexpected behavior.
+ * Avoid dispatching from non-handler contexts where possible.
+ */
+@injectable()
+export class BrowserActionDispatchScope implements ActionDispatchScope {
+    protected active = false;
+
+    // Assumes serial invocation by the dispatcher's queue processor; concurrent enter() calls
+    // would corrupt the prior-restore logic and leave the flag stuck.
+    enter<R>(callback: () => R): R {
+        const prior = this.active;
+        this.active = true;
+        let result: R;
+        try {
+            result = callback();
+        } catch (error) {
+            this.active = prior;
+            throw error;
+        }
+        if (result instanceof Promise) {
+            // Cast required because TS cannot prove the .finally() result matches the generic R.
+            return result.finally(() => {
+                this.active = prior;
+            }) as unknown as R;
+        }
+        this.active = prior;
+        return result;
+    }
+
+    isReentrant(action: Action): boolean {
+        return this.active && !ClientAction.is(action);
+    }
+}

package/src/browser/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * 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
@@ -14,5 +14,6 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 export * from './di/app-module';
+export * from './di/browser-action-dispatch-scope';
 export * from './launch/worker-server-launcher';
 export * from './reexport';