@eclipse-glsp/server-mcp 2.7.0-next.9 → 2.7.0

package/src/{tools → common/tools}/handlers/create-edges-mcp-tool-handler.ts

@@ -17,15 +17,16 @@
 import { ChangeRoutingPointsOperation, CreateEdgeOperation, DiagramConfiguration, EdgeCreationChecker } from '@eclipse-glsp/server';
 import { inject, injectable, optional } from 'inversify';
 import * as z from 'zod/v4';
+import { McpToolResult } from '../../server/mcp-handler-shared';
 import {
     ElementIdentity,
     ElementIdentitySchema,
     McpDiagramScopedInputSchema,
-    McpToolResult,
-    OperationMcpDiagramToolHandler,
+    dispatchedCommands,
     position
-} from '../../server';
-import { formatNoticeList } from '../../util';
+} from '../../server/mcp-input-schemas';
+import { OperationMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
+import { formatNoticeList } from '../../util/mcp-util';
 
 /** Single edge-creation entry. Strict so an LLM-typoed field surfaces as a validation error instead of being silently dropped. */
 export const CreateEdgeSpecSchema = z.strictObject({
@@ -58,6 +59,7 @@ export const CreateEdgesValidationResultSchema = z.object({
 
 export const CreateEdgesOutputSchema = z.object({
     createdEdges: z.array(ElementIdentitySchema).describe('Identity of each edge successfully created. Empty in `dryRun` mode.'),
+    dispatchedCommands,
     errors: z.array(z.string()).describe('Per-input failure messages; absent or empty when every input succeeded.'),
     validationResults: z
         .array(CreateEdgesValidationResultSchema)
@@ -164,7 +166,7 @@ export class CreateEdgesMcpToolHandler extends OperationMcpDiagramToolHandler<Cr
         // Per-input errors are surfaced in `errors`; the call itself still succeeds — rolling back partial creates would require operation-level transactions.
         return this.success(
             `Successfully created ${createdEdges.length} edge(s) (in ${dispatchedOperations} commands):\n${successListStr}${formatNoticeList('errors', errors)}`,
-            { createdEdges, errors }
+            { createdEdges, dispatchedCommands: dispatchedOperations, errors }
         );
     }
 

package/src/{tools → common/tools}/handlers/create-nodes-mcp-tool-handler.spec.ts

@@ -28,7 +28,9 @@ import {
 } from '@eclipse-glsp/server';
 import { expect } from 'chai';
 import { Container, ContainerModule } from 'inversify';
-import { McpIdAliasService, McpLabelProvider, McpToolResult } from '../../server';
+import { McpToolResult } from '../../server/mcp-handler-shared';
+import { McpIdAliasService } from '../../server/mcp-id-alias-service';
+import { McpLabelProvider } from '../../server/mcp-label-provider';
 import { CreateNodesInput, CreateNodesMcpToolHandler } from './create-nodes-mcp-tool-handler';
 
 interface CreatedElementsStructured {

package/src/{tools → common/tools}/handlers/create-nodes-mcp-tool-handler.ts

@@ -17,15 +17,16 @@
 import { ApplyLabelEditOperation, CreateNodeOperation } from '@eclipse-glsp/server';
 import { injectable } from 'inversify';
 import * as z from 'zod/v4';
+import { McpToolResult } from '../../server/mcp-handler-shared';
 import {
     ElementIdentity,
     ElementIdentitySchema,
     McpDiagramScopedInputSchema,
-    McpToolResult,
-    OperationMcpDiagramToolHandler,
+    dispatchedCommands,
     position
-} from '../../server';
-import { formatNoticeList } from '../../util';
+} from '../../server/mcp-input-schemas';
+import { OperationMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
+import { formatNoticeList } from '../../util/mcp-util';
 
 /** Single node-creation entry. Strict so an LLM-typoed field surfaces as a validation error instead of being silently dropped. */
 export const CreateNodeSpecSchema = z.strictObject({
@@ -48,6 +49,7 @@ export const CreateNodesOutputSchema = z.object({
     createdNodes: z
         .array(ElementIdentitySchema)
         .describe('Nodes successfully created, in input order. `label` is only present when the type actually accepted text.'),
+    dispatchedCommands,
     errors: z.array(z.string()).describe('Per-input hard-failure messages — the creation could not complete.'),
     warnings: z
         .array(z.string())
@@ -125,7 +127,7 @@ export class CreateNodesMcpToolHandler extends OperationMcpDiagramToolHandler<Cr
             `Successfully created ${createdNodes.length} node(s) (in ${dispatchedOperations} commands):\n${successListStr}` +
                 formatNoticeList('errors', errors) +
                 formatNoticeList('warnings', warnings),
-            { createdNodes, errors, warnings }
+            { createdNodes, dispatchedCommands: dispatchedOperations, errors, warnings }
         );
     }
 }

package/src/{tools → common/tools}/handlers/delete-elements-mcp-tool-handler.ts

@@ -17,13 +17,9 @@
 import { DeleteElementOperation } from '@eclipse-glsp/server';
 import { injectable } from 'inversify';
 import * as z from 'zod/v4';
-import {
-    ElementIdentitySchema,
-    McpDiagramScopedInputSchema,
-    McpToolResult,
-    OperationMcpDiagramToolHandler,
-    elementIds
-} from '../../server';
+import { McpToolResult } from '../../server/mcp-handler-shared';
+import { ElementIdentitySchema, McpDiagramScopedInputSchema, dispatchedCommands, elementIds } from '../../server/mcp-input-schemas';
+import { OperationMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
 
 export const DeleteElementsInputSchema = McpDiagramScopedInputSchema.extend({ elementIds });
 export type DeleteElementsInput = z.infer<typeof DeleteElementsInputSchema>;
@@ -39,7 +35,8 @@ export const DeleteElementsOutputSchema = z.object({
         .int()
         .describe(
             'Total number of elements removed from the model. Higher than `deletedElements.length` when dependents (e.g. edges) are auto-deleted.'
-        )
+        ),
+    dispatchedCommands
 });
 
 @injectable()
@@ -67,7 +64,8 @@ export class DeleteElementsMcpToolHandler extends OperationMcpDiagramToolHandler
         const deletedCount = beforeCount - this.modelState.index.allIds().length;
         return this.success(`Successfully deleted ${deletedCount} element(s) (including dependents)`, {
             deletedElements,
-            deletedCount
+            deletedCount,
+            dispatchedCommands: 1
         });
     }
 }

package/src/{tools → common/tools}/handlers/diagram-model-mcp-tool-handler.ts

@@ -18,7 +18,9 @@ import { GModelElement } from '@eclipse-glsp/server';
 import { inject, injectable } from 'inversify';
 import * as z from 'zod/v4';
 import { McpModelSerializer } from '../../resources/services/mcp-model-serializer';
-import { McpDiagramScopedInputSchema, AbstractMcpDiagramToolHandler, McpToolResult } from '../../server';
+import { McpToolResult } from '../../server/mcp-handler-shared';
+import { McpDiagramScopedInputSchema } from '../../server/mcp-input-schemas';
+import { AbstractMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
 
 export const DiagramModelInputSchema = McpDiagramScopedInputSchema;
 export type DiagramModelInput = z.infer<typeof DiagramModelInputSchema>;

package/src/{tools → common/tools}/handlers/element-types-mcp-tool-handler.ts

@@ -23,7 +23,8 @@ import {
 } from '@eclipse-glsp/server';
 import { Container, ContainerModule, inject, injectable } from 'inversify';
 import * as z from 'zod/v4';
-import { AbstractMcpToolHandler, McpToolError, McpToolResult } from '../../server';
+import { McpToolError, McpToolResult } from '../../server/mcp-handler-shared';
+import { AbstractMcpToolHandler } from '../../server/mcp-tool-handler';
 import { ElementTypes, ElementTypesProvider } from '../../resources/services/element-types-provider';
 
 export const ElementTypesInputSchema = z.object({

package/src/{tools → common/tools}/handlers/get-selection-mcp-tool-handler.ts

@@ -17,7 +17,9 @@
 import { ActionDispatcher, GetSelectionAction } from '@eclipse-glsp/server';
 import { inject, injectable } from 'inversify';
 import * as z from 'zod/v4';
-import { McpDiagramScopedInputSchema, AbstractMcpDiagramToolHandler, McpToolResult, requestActionOrFail } from '../../server';
+import { McpToolResult, requestActionOrFail } from '../../server/mcp-handler-shared';
+import { McpDiagramScopedInputSchema } from '../../server/mcp-input-schemas';
+import { AbstractMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
 
 export const GetSelectionInputSchema = McpDiagramScopedInputSchema;
 export type GetSelectionInput = z.infer<typeof GetSelectionInputSchema>;

package/src/{tools → common/tools}/handlers/layout-mcp-tool-handler.ts

@@ -17,13 +17,16 @@
 import { LayoutEngine, LayoutOperation } from '@eclipse-glsp/server';
 import { inject, injectable, optional } from 'inversify';
 import * as z from 'zod/v4';
-import { McpDiagramScopedInputSchema, McpToolResult, OperationMcpDiagramToolHandler } from '../../server';
+import { McpToolResult } from '../../server/mcp-handler-shared';
+import { McpDiagramScopedInputSchema, dispatchedCommands } from '../../server/mcp-input-schemas';
+import { OperationMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
 
 export const LayoutInputSchema = McpDiagramScopedInputSchema;
 export type LayoutInput = z.infer<typeof LayoutInputSchema>;
 
 export const LayoutOutputSchema = z.object({
-    applied: z.boolean().describe('Always true on success — surfaced for parity with other operations.')
+    applied: z.boolean().describe('Always true on success — surfaced for parity with other operations.'),
+    dispatchedCommands
 });
 
 /** Not registered by default: requires an adopter-supplied `LayoutEngine` to bind, which only some GLSP servers ship. */
@@ -51,6 +54,6 @@ export class LayoutMcpToolHandler extends OperationMcpDiagramToolHandler<LayoutI
 
     protected async createResult(_params: LayoutInput): Promise<McpToolResult> {
         await this.actionDispatcher.dispatch(LayoutOperation.create());
-        return this.success('Automatic layout applied', { applied: true });
+        return this.success('Automatic layout applied', { applied: true, dispatchedCommands: 1 });
     }
 }

package/src/{tools → common/tools}/handlers/modify-edges-mcp-tool-handler.ts

@@ -17,16 +17,16 @@
 import { ChangeRoutingPointsOperation, GEdge, ReconnectEdgeOperation } from '@eclipse-glsp/server';
 import { injectable } from 'inversify';
 import * as z from 'zod/v4';
+import { McpToolError, McpToolResult } from '../../server/mcp-handler-shared';
 import {
     ElementIdentitySchema,
     McpDiagramScopedInputSchema,
-    McpToolError,
-    McpToolResult,
-    OperationMcpDiagramToolHandler,
+    dispatchedCommands,
     elementId as elementIdSchema,
     position
-} from '../../server';
-import { formatNoticeList } from '../../util';
+} from '../../server/mcp-input-schemas';
+import { OperationMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
+import { formatNoticeList } from '../../util/mcp-util';
 
 /** Single edge-modification entry. Strict so an LLM-typoed field surfaces as a validation error instead of being silently dropped. */
 export const ModifyEdgeSpecSchema = z.strictObject({
@@ -52,7 +52,7 @@ export type ModifyEdgesInput = z.infer<typeof ModifyEdgesInputSchema>;
 
 export const ModifyEdgesOutputSchema = z.object({
     modifiedEdges: z.array(ElementIdentitySchema).describe('Identity of each edge whose change request was dispatched.'),
-    dispatchedCommands: z.number().int().describe('Number of underlying GLSP operations dispatched.'),
+    dispatchedCommands,
     errors: z.array(z.string()).describe('Per-input failure messages; absent or empty when every input succeeded.')
 });
 

package/src/{tools → common/tools}/handlers/modify-nodes-mcp-tool-handler.ts

@@ -17,16 +17,16 @@
 import { ApplyLabelEditOperation, ChangeBoundsOperation, GEdge, GShapeElement } from '@eclipse-glsp/server';
 import { injectable } from 'inversify';
 import * as z from 'zod/v4';
+import { McpToolError, McpToolResult } from '../../server/mcp-handler-shared';
 import {
     ElementIdentitySchema,
     McpDiagramScopedInputSchema,
-    McpToolError,
-    McpToolResult,
-    OperationMcpDiagramToolHandler,
+    dispatchedCommands,
     elementId,
     position
-} from '../../server';
-import { formatNoticeList } from '../../util';
+} from '../../server/mcp-input-schemas';
+import { OperationMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
+import { formatNoticeList } from '../../util/mcp-util';
 
 /** Strict — any unknown field on the size object surfaces as a validation error. */
 export const NodeSizeSchema = z.strictObject({
@@ -54,7 +54,7 @@ export const ModifyNodesOutputSchema = z.object({
     modifiedNodes: z
         .array(ElementIdentitySchema)
         .describe('Identity of each node whose change request was dispatched (post-modification labels).'),
-    dispatchedCommands: z.number().int().describe('Number of underlying GLSP operations dispatched (a single change may yield several).'),
+    dispatchedCommands,
     warnings: z
         .array(z.string())
         .describe(

package/src/{tools → common/tools}/handlers/query-elements-mcp-tool-handler.spec.ts

@@ -18,7 +18,9 @@ import { ClientId, GLabel, GModelElement, Logger, ModelState, NullLogger } from
 import { expect } from 'chai';
 import { Container, ContainerModule } from 'inversify';
 import { McpModelSerializer } from '../../resources/services/mcp-model-serializer';
-import { DefaultMcpLabelProvider, McpElementsNotFoundError, McpIdAliasService, McpLabelProvider, McpToolResult } from '../../server';
+import { McpElementsNotFoundError, McpToolResult } from '../../server/mcp-handler-shared';
+import { McpIdAliasService } from '../../server/mcp-id-alias-service';
+import { DefaultMcpLabelProvider, McpLabelProvider } from '../../server/mcp-label-provider';
 import { QueryElementsInput, QueryElementsMcpToolHandler } from './query-elements-mcp-tool-handler';
 
 function makeLabel(text: string): GLabel {

package/src/{tools → common/tools}/handlers/query-elements-mcp-tool-handler.ts

@@ -18,13 +18,9 @@ import { GModelElement } from '@eclipse-glsp/server';
 import { inject, injectable } from 'inversify';
 import * as z from 'zod/v4';
 import { McpModelSerializer } from '../../resources/services/mcp-model-serializer';
-import {
-    McpDiagramScopedInputSchema,
-    AbstractMcpDiagramToolHandler,
-    McpElementsNotFoundError,
-    McpToolResult,
-    elementIds as elementIdsSchema
-} from '../../server';
+import { McpElementsNotFoundError, McpToolResult } from '../../server/mcp-handler-shared';
+import { McpDiagramScopedInputSchema, elementIds as elementIdsSchema } from '../../server/mcp-input-schemas';
+import { AbstractMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
 
 export const QueryElementsInputSchema = McpDiagramScopedInputSchema.extend({
     elementIds: elementIdsSchema

package/src/{tools → common/tools}/handlers/redo-mcp-tool-handler.ts

@@ -17,7 +17,9 @@
 import { CommandStack, RedoAction } from '@eclipse-glsp/server';
 import { inject, injectable } from 'inversify';
 import * as z from 'zod/v4';
-import { McpDiagramScopedInputSchema, McpToolError, McpToolResult, OperationMcpDiagramToolHandler } from '../../server';
+import { McpToolError, McpToolResult } from '../../server/mcp-handler-shared';
+import { McpDiagramScopedInputSchema } from '../../server/mcp-input-schemas';
+import { OperationMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
 
 export const RedoInputSchema = McpDiagramScopedInputSchema.extend({
     commandsToRedo: z.number().min(1).default(1).describe('Number of commands to redo. Defaults to 1 (most recent undone command).')

package/src/{tools → common/tools}/handlers/save-model-mcp-tool-handler.ts

@@ -17,7 +17,10 @@
 import { ActionDispatcher, CommandStack, SaveModelAction } from '@eclipse-glsp/server';
 import { inject, injectable } from 'inversify';
 import * as z from 'zod/v4';
-import { McpDiagramScopedInputSchema, AbstractMcpDiagramToolHandler, McpLogger, McpToolResult } from '../../server';
+import { McpToolResult } from '../../server/mcp-handler-shared';
+import { McpDiagramScopedInputSchema } from '../../server/mcp-input-schemas';
+import { McpLogger } from '../../server/mcp-logger';
+import { AbstractMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
 
 export const SaveModelInputSchema = McpDiagramScopedInputSchema.extend({
     fileUri: z.string().optional().describe('Optional destination file URI. If not provided, saves to the original source model location.')

package/src/{tools → common/tools}/handlers/session-info-mcp-tool-handler.spec.ts

@@ -17,7 +17,7 @@
 import { ClientSession, ClientSessionManager, CommandStack, Logger, ModelState, NullLogger } from '@eclipse-glsp/server';
 import { expect } from 'chai';
 import { Container, ContainerModule } from 'inversify';
-import { McpToolResult } from '../../server';
+import { McpToolResult } from '../../server/mcp-handler-shared';
 import { SessionInfoMcpToolHandler } from './session-info-mcp-tool-handler';
 
 function asText(result: McpToolResult): string {

package/src/{tools → common/tools}/handlers/session-info-mcp-tool-handler.ts

@@ -17,7 +17,8 @@
 import { ClientSessionManager, CommandStack, ModelState } from '@eclipse-glsp/server';
 import { inject, injectable } from 'inversify';
 import * as z from 'zod/v4';
-import { AbstractMcpToolHandler, McpToolError, McpToolResult } from '../../server';
+import { McpToolError, McpToolResult } from '../../server/mcp-handler-shared';
+import { AbstractMcpToolHandler } from '../../server/mcp-tool-handler';
 
 export const SessionInfoInputSchema = z.object({
     sessionId: z

package/src/{tools → common/tools}/handlers/set-selection-mcp-tool-handler.spec.ts

@@ -27,7 +27,9 @@ import {
 } from '@eclipse-glsp/server';
 import { expect } from 'chai';
 import { Container, ContainerModule } from 'inversify';
-import { DefaultMcpLabelProvider, McpElementsNotFoundError, McpIdAliasService, McpLabelProvider, McpToolResult } from '../../server';
+import { McpElementsNotFoundError, McpToolResult } from '../../server/mcp-handler-shared';
+import { McpIdAliasService } from '../../server/mcp-id-alias-service';
+import { DefaultMcpLabelProvider, McpLabelProvider } from '../../server/mcp-label-provider';
 import { SetSelectionInput, SetSelectionMcpToolHandler } from './set-selection-mcp-tool-handler';
 
 function makeElement(id: string, type: string): GModelElement {

package/src/{tools → common/tools}/handlers/set-selection-mcp-tool-handler.ts

@@ -17,7 +17,9 @@
 import { ActionDispatcher, SelectAction, SelectAllAction } from '@eclipse-glsp/server';
 import { inject, injectable } from 'inversify';
 import * as z from 'zod/v4';
-import { AbstractMcpDiagramToolHandler, McpDiagramScopedInputSchema, McpToolResult, elementIds } from '../../server';
+import { McpToolResult } from '../../server/mcp-handler-shared';
+import { McpDiagramScopedInputSchema, elementIds } from '../../server/mcp-input-schemas';
+import { AbstractMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
 
 export const SetSelectionInputSchema = McpDiagramScopedInputSchema.extend({
     selectedElementIds: elementIds

package/src/{tools → common/tools}/handlers/set-view-mcp-tool-handler.ts

@@ -26,15 +26,9 @@ import {
 } from '@eclipse-glsp/server';
 import { inject, injectable } from 'inversify';
 import * as z from 'zod/v4';
-import {
-    McpDiagramScopedInputSchema,
-    AbstractMcpDiagramToolHandler,
-    McpToolError,
-    McpToolResult,
-    elementIds,
-    position,
-    requestActionOrFail
-} from '../../server';
+import { McpToolError, McpToolResult, requestActionOrFail } from '../../server/mcp-handler-shared';
+import { McpDiagramScopedInputSchema, elementIds, position } from '../../server/mcp-input-schemas';
+import { AbstractMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
 
 export const VIEWPORT_ACTIONS = ['fit-to-screen', 'center-on-elements', 'reset-viewport', 'set-viewport'] as const;
 export type ViewportAction = (typeof VIEWPORT_ACTIONS)[number];

package/src/{tools → common/tools}/handlers/undo-mcp-tool-handler.ts

@@ -17,7 +17,9 @@
 import { CommandStack, UndoAction } from '@eclipse-glsp/server';
 import { inject, injectable } from 'inversify';
 import * as z from 'zod/v4';
-import { McpDiagramScopedInputSchema, McpToolError, McpToolResult, OperationMcpDiagramToolHandler } from '../../server';
+import { McpToolError, McpToolResult } from '../../server/mcp-handler-shared';
+import { McpDiagramScopedInputSchema } from '../../server/mcp-input-schemas';
+import { OperationMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
 
 export const UndoInputSchema = McpDiagramScopedInputSchema.extend({
     commandsToUndo: z.number().min(1).default(1).describe('Number of commands to undo. Defaults to 1 (most recent command).')

package/src/{prompts → node}/index.ts

@@ -14,5 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-export * from './handlers/describe-diagram-mcp-prompt-handler';
-export * from './handlers/suggest-improvements-mcp-prompt-handler';
+export * from './modules/node-mcp-server-module';
+export * from './reexport';
+export * from './server/node-mcp-request-context';
+export * from './server/node-mcp-server-launcher';

package/src/node/modules/node-mcp-server-module.ts

@@ -0,0 +1,56 @@
+/********************************************************************************
+ * 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 { BindingTarget } from '@eclipse-glsp/server';
+import { AbstractMcpServerModule, DEFAULT_MCP_OPTIONS } from '../../common/modules/abstract-mcp-server-module';
+import { AbstractMcpServerLauncher } from '../../common/server/abstract-mcp-server-launcher';
+import { McpServerDefaults } from '../../common/server/mcp-options';
+import { McpRequestContext } from '../../common/server/mcp-request-context';
+import { NodeMcpServerLauncher } from '../server/node-mcp-server-launcher';
+import { NodeMcpRequestContext } from '../server/node-mcp-request-context';
+
+/**
+ * Default {@link AbstractMcpServerModule} entry point for Node hosts. Ships GLSP-default option
+ * values (see {@link DEFAULT_OPTIONS}) on top of the abstract module's hook defaults, and binds
+ * the Node-flavored {@link NodeMcpServerLauncher} + {@link NodeMcpRequestContext}. Adopter-provided
+ * overrides via the constructor merge on top.
+ *
+ * @experimental The MCP integration is under active development. Option names, schema shapes,
+ * and handler contracts MAY change in minor releases until the feature graduates from
+ * experimental status.
+ */
+export class NodeMcpServerModule extends AbstractMcpServerModule {
+    static readonly DEFAULT_OPTIONS: McpServerDefaults = {
+        ...DEFAULT_MCP_OPTIONS,
+        host: '127.0.0.1',
+        allowedHosts: ['127.0.0.1', 'localhost']
+        // `allowedOrigins` deliberately undefined: accept absent Origin (typical for desktop-IDE
+        // MCP clients) and rely on Host validation to gate DNS-rebinding. Adopters whose
+        // deployment is browser-fronted set this explicitly to their frontend's origin.
+    };
+
+    constructor(overrides: McpServerDefaults = {}) {
+        super({ ...NodeMcpServerModule.DEFAULT_OPTIONS, ...overrides });
+    }
+
+    protected override bindMcpServerLauncher(): BindingTarget<AbstractMcpServerLauncher> {
+        return NodeMcpServerLauncher;
+    }
+
+    protected override bindMcpRequestContext(): BindingTarget<McpRequestContext> {
+        return NodeMcpRequestContext;
+    }
+}

package/src/node/reexport.ts

@@ -0,0 +1,16 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+export * from '../common';