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

package/src/browser/server/web-mcp-server-launcher.ts

@@ -0,0 +1,39 @@
+/********************************************************************************
+ * 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 { injectable } from 'inversify';
+import { AbstractMcpServerLauncher, FullMcpServerConfiguration, TransportEndpoint } from '../../common/server/abstract-mcp-server-launcher';
+
+/**
+ * Web target for {@link AbstractMcpServerLauncher}. Web targets (Cloudflare Worker, Deno Deploy,
+ * Bun, Service Worker, in-page Worker) have no socket to bind; the adopter plugs the inherited
+ * {@link AbstractMcpServerLauncher.getRequestHandler} into their own listener. `bindTransport`
+ * is therefore a no-op.
+ *
+ * **Adopter responsibilities.** Authentication is the adopter's job. The MCP server has no
+ * built-in auth — wrap `getRequestHandler()` with whatever middleware your deployment requires
+ * (bearer token, mTLS at proxy, Cloudflare Access, OAuth, etc.). Session state lives in memory
+ * inside the launcher; multi-isolate / multi-region deployments that need shared session state
+ * must subclass and override the session store.
+ *
+ * @see `examples/workflow-server-bundled-web/smoke.html` for a Web Worker-based example.
+ */
+@injectable()
+export class WebMcpServerLauncher extends AbstractMcpServerLauncher {
+    protected async bindTransport(_config: FullMcpServerConfiguration): Promise<TransportEndpoint> {
+        return {};
+    }
+}

package/src/common/index.ts

@@ -0,0 +1,65 @@
+/********************************************************************************
+ * 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 './modules/abstract-mcp-server-module';
+export * from './modules/mcp-diagram-module';
+export * from './prompts/handlers/describe-diagram-mcp-prompt-handler';
+export * from './prompts/handlers/suggest-improvements-mcp-prompt-handler';
+export * from './resources/handlers/diagram-png-mcp-resource-handler';
+export * from './resources/handlers/diagram-svg-mcp-resource-handler';
+export * from './resources/services/element-types-provider';
+export * from './resources/services/mcp-model-serializer';
+export * from './server/abstract-mcp-server-launcher';
+export * from './server/glsp-mcp-server';
+export * from './server/lru-event-store';
+export * from './server/mcp-diagram-handler-dispatcher';
+export * from './server/mcp-diagram-prompt-handler-registry';
+export * from './server/mcp-diagram-resource-handler-registry';
+export * from './server/mcp-diagram-tool-handler-registry';
+export * from './server/mcp-handler-shared';
+export * from './server/mcp-id-alias-service';
+export * from './server/mcp-input-schemas';
+export * from './server/mcp-label-provider';
+export * from './server/mcp-log-level-registry';
+export * from './server/mcp-logger';
+export * from './server/mcp-mime-types';
+export * from './server/mcp-options';
+export * from './server/mcp-progress-reporter';
+export * from './server/mcp-prompt-handler';
+export * from './server/mcp-request-context';
+export * from './server/mcp-resource-handler';
+export * from './server/mcp-session';
+export * from './server/mcp-tool-handler';
+export * from './tools/handlers/count-elements-mcp-tool-handler';
+export * from './tools/handlers/create-edges-mcp-tool-handler';
+export * from './tools/handlers/create-nodes-mcp-tool-handler';
+export * from './tools/handlers/delete-elements-mcp-tool-handler';
+export * from './tools/handlers/diagram-model-mcp-tool-handler';
+export * from './tools/handlers/element-types-mcp-tool-handler';
+export * from './tools/handlers/get-selection-mcp-tool-handler';
+export * from './tools/handlers/layout-mcp-tool-handler';
+export * from './tools/handlers/modify-edges-mcp-tool-handler';
+export * from './tools/handlers/modify-nodes-mcp-tool-handler';
+export * from './tools/handlers/query-elements-mcp-tool-handler';
+export * from './tools/handlers/redo-mcp-tool-handler';
+export * from './tools/handlers/save-model-mcp-tool-handler';
+export * from './tools/handlers/session-info-mcp-tool-handler';
+export * from './tools/handlers/set-selection-mcp-tool-handler';
+export * from './tools/handlers/set-view-mcp-tool-handler';
+export * from './tools/handlers/undo-mcp-tool-handler';
+export * from './tools/handlers/validate-diagram-mcp-tool-handler';
+export * from './util/markdown-util';
+export * from './util/mcp-util';

package/src/{server/mcp-server-module.ts → common/modules/abstract-mcp-server-module.ts}

@@ -27,24 +27,26 @@ import {
 } from '@eclipse-glsp/server';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { interfaces } from 'inversify';
-import { DescribeDiagramMcpPromptHandler, SuggestImprovementsMcpPromptHandler } from '../prompts';
-import { ElementTypesMcpToolHandler, SessionInfoMcpToolHandler } from '../tools';
-import { DefaultGLSPMcpServer, GLSPMcpServerFactory } from './glsp-mcp-server';
-import { DefaultMcpDiagramHandlerDispatcher, McpDiagramHandlerDispatcher } from './mcp-diagram-handler-dispatcher';
-import { DefaultMcpLogLevelRegistry, McpLogLevelRegistry } from './mcp-log-level-registry';
-import { LruEventStore } from './lru-event-store';
-import { McpHttpTransport } from './mcp-http-transport';
-import { McpLogger } from './mcp-logger';
-import { McpServerDefaults, McpServerOptions } from './mcp-options';
-import { McpProgressReporter } from './mcp-progress-reporter';
-import { McpPromptHandler } from './mcp-prompt-handler';
-import { McpResourceHandler } from './mcp-resource-handler';
-import { McpServerLauncher } from './mcp-server-launcher';
-import { McpToolHandler } from './mcp-tool-handler';
+import { DescribeDiagramMcpPromptHandler } from '../prompts/handlers/describe-diagram-mcp-prompt-handler';
+import { SuggestImprovementsMcpPromptHandler } from '../prompts/handlers/suggest-improvements-mcp-prompt-handler';
+import { AbstractMcpServerLauncher } from '../server/abstract-mcp-server-launcher';
+import { DefaultGLSPMcpServer, GLSPMcpServerFactory } from '../server/glsp-mcp-server';
+import { LruEventStore } from '../server/lru-event-store';
+import { DefaultMcpDiagramHandlerDispatcher, McpDiagramHandlerDispatcher } from '../server/mcp-diagram-handler-dispatcher';
+import { DefaultMcpLogLevelRegistry, McpLogLevelRegistry } from '../server/mcp-log-level-registry';
+import { McpLogger } from '../server/mcp-logger';
+import { McpServerDefaults, McpServerOptions } from '../server/mcp-options';
+import { McpProgressReporter } from '../server/mcp-progress-reporter';
+import { McpPromptHandler } from '../server/mcp-prompt-handler';
+import { McpRequestContext } from '../server/mcp-request-context';
+import { McpResourceHandler } from '../server/mcp-resource-handler';
+import { McpToolHandler } from '../server/mcp-tool-handler';
+import { ElementTypesMcpToolHandler } from '../tools/handlers/element-types-mcp-tool-handler';
+import { SessionInfoMcpToolHandler } from '../tools/handlers/session-info-mcp-tool-handler';
 
 /**
  * GLSP-generic default agent persona — adopters typically pass a product-specific persona to
- * the {@link DefaultMcpServerModule} constructor (e.g. workflow-server might say "You are the
+ * the concrete server module's constructor (e.g. workflow-server might say "You are the
  * Workflow Modeling Agent...").
  *
  * **Spec note.** This is wired to the MCP `instructions` field, which the spec describes as
@@ -53,7 +55,7 @@ import { McpToolHandler } from './mcp-tool-handler';
  * via `mcpDefaults.agentPersona`. Don't trim on autopilot if a "concise" interpretation drifts
  * back: the verbose form materially improves LLM tool-use compliance for graphical modelling.
  */
-const DEFAULT_AGENT_PERSONA = `
+export const DEFAULT_AGENT_PERSONA = `
 You are the GLSP Modeling Agent. Your primary goal is to assist in the creation and modification of graphical models using the
 GLSP MCP server. You have to adhere to the following principles:
 - MCP-Interaction: Any modeling related activity has to occur using the MCP server.
@@ -71,6 +73,17 @@ GLSP MCP server. You have to adhere to the following principles:
   \`action: "center-on-elements"\` — to point the user at the elements you reference.
 `;
 
+/**
+ * Target-neutral default option values shared by every {@link AbstractMcpServerModule} subclass.
+ * Node and Browser concrete modules spread this and add their own target-specific fields
+ * (e.g. `host`/`allowedHosts` on Node).
+ */
+export const DEFAULT_MCP_OPTIONS: McpServerDefaults = {
+    dataMode: 'tools',
+    agentPersona: DEFAULT_AGENT_PERSONA,
+    eventStoreLimit: LruEventStore.DEFAULT_LIMIT
+};
+
 /**
  * Multi-binding helper for MCP handler classes. Singleton-scoped sibling of core's
  * `MultiBinding<T>` — same `binding.add(...)` / `binding.rebind(old, new)` adopter shape, but
@@ -89,9 +102,11 @@ export class McpHandlerMultiBinding<T> extends AbstractMultiBinding<interfaces.N
 }
 
 /**
- * Server-scope DI module for the MCP server. Adopters subclass {@link DefaultMcpServerModule}
- * and override the `bind*` hooks to swap single-instance services or the `configure*` hooks to
- * add/replace handlers in the multi-bindings. Mirrors the `DiagramModule` pattern from core
+ * Server-scope DI module for the MCP server. Target-neutral: concrete subclasses (Node, Browser)
+ * supply the launcher + request-context bindings via {@link bindMcpServerLauncher} and
+ * {@link bindMcpRequestContext}. Adopters subclass the concrete module and override the `bind*`
+ * hooks to swap single-instance services or the `configure*` hooks to add/replace handlers in
+ * the multi-bindings. Mirrors the `DiagramModule` pattern from core
  * (`bindGModelSerializer()`, `configureActionHandlers(binding)`, etc.).
  *
  * Adopter-provided default option values flow through the constructor — pass a
@@ -101,13 +116,13 @@ export class McpHandlerMultiBinding<T> extends AbstractMultiBinding<interfaces.N
  * @example
  * ```ts
  * // Drop-in: GLSP defaults.
- * launcher.configure(serverModule, new DefaultMcpServerModule());
+ * launcher.configure(serverModule, new NodeMcpServerModule());
  *
  * // Drop-in with a product-specific override.
- * launcher.configure(serverModule, new DefaultMcpServerModule({ dataMode: 'resources' }));
+ * launcher.configure(serverModule, new NodeMcpServerModule({ dataMode: 'resources' }));
  *
  * // Subclass when handler customization is needed.
- * class WorkflowMcpServerModule extends DefaultMcpServerModule {
+ * class WorkflowMcpServerModule extends NodeMcpServerModule {
  *     constructor() { super({ agentPersona: WORKFLOW_PERSONA }); }
  *     protected override configureToolHandlers(binding) {
  *         super.configureToolHandlers(binding);
@@ -117,9 +132,6 @@ export class McpHandlerMultiBinding<T> extends AbstractMultiBinding<interfaces.N
  * ```
  */
 export abstract class AbstractMcpServerModule extends GLSPModule {
-    protected bind!: interfaces.Bind;
-    protected rebind!: interfaces.Rebind;
-
     constructor(protected readonly defaultOptions: McpServerDefaults = {}) {
         super();
     }
@@ -128,23 +140,26 @@ export abstract class AbstractMcpServerModule extends GLSPModule {
         bind: interfaces.Bind,
         _unbind: interfaces.Unbind,
         isBound: interfaces.IsBound,
-        rebind: interfaces.Rebind
+        _rebind: interfaces.Rebind
     ): void {
-        this.bind = bind;
-        this.rebind = rebind;
         const context = { bind, isBound };
-        applyBindingTarget(context, McpServerLauncher, this.bindMcpServerLauncher()).inSingletonScope();
-        // The launcher is bound under two additional service identifiers so core's existing
+        applyBindingTarget(context, AbstractMcpServerLauncher, this.bindMcpServerLauncher())
+            .inSingletonScope()
+            .onActivation((_, launcher) => {
+                this.onMcpServerLauncherActivated(launcher);
+                return launcher;
+            });
+        // The launcher is aliased under two additional service identifiers so core's existing
         // multi-bindings pick it up alongside the rest of the server's contributions/listeners.
-        bind(GLSPServerInitializer).toService(McpServerLauncher);
-        bind(GLSPServerListener).toService(McpServerLauncher);
-        applyBindingTarget(context, McpHttpTransport, this.bindMcpHttpTransport()).inSingletonScope();
+        bind(GLSPServerInitializer).toService(AbstractMcpServerLauncher);
+        bind(GLSPServerListener).toService(AbstractMcpServerLauncher);
         applyBindingTarget(context, McpDiagramHandlerDispatcher, this.bindMcpDiagramHandlerDispatcher()).inSingletonScope();
         applyBindingTarget(context, McpServerOptions, this.bindMcpServerOptions()).inSingletonScope();
         applyBindingTarget(context, McpServerDefaults, this.bindMcpServerDefaults());
         applyBindingTarget(context, McpLogger, this.bindMcpLogger()).inSingletonScope();
         applyBindingTarget(context, McpLogLevelRegistry, this.bindMcpLogLevelRegistry()).inSingletonScope();
         applyBindingTarget(context, McpProgressReporter, this.bindMcpProgressReporter()).inSingletonScope();
+        applyBindingTarget(context, McpRequestContext, this.bindMcpRequestContext()).inSingletonScope();
         applyBindingTarget(context, GLSPMcpServerFactory, this.bindGLSPMcpServerFactory());
         this.configureMultiBinding(new McpHandlerMultiBinding<McpToolHandler>(McpToolHandler), binding =>
             this.configureToolHandlers(binding as McpHandlerMultiBinding<McpToolHandler>)
@@ -158,18 +173,23 @@ export abstract class AbstractMcpServerModule extends GLSPModule {
     }
 
     /**
-     * {@link McpServerLauncher} binding. Bound as a singleton AND aliased to
-     * `GLSPServerInitializer` + `GLSPServerListener` (the launcher implements both).
-     * Override to swap in a custom launcher impl.
+     * {@link AbstractMcpServerLauncher} binding. Bound as a singleton AND aliased to
+     * `GLSPServerInitializer` + `GLSPServerListener` (the launcher implements both). Concrete
+     * modules return the target-specific launcher class (Node, Web, ...).
      */
-    protected bindMcpServerLauncher(): BindingTarget<McpServerLauncher> {
-        return McpServerLauncher;
-    }
+    protected abstract bindMcpServerLauncher(): BindingTarget<AbstractMcpServerLauncher>;
 
-    /** {@link McpHttpTransport} binding. Override to swap to a different transport implementation. */
-    protected bindMcpHttpTransport(): BindingTarget<McpHttpTransport> {
-        return McpHttpTransport;
-    }
+    /**
+     * Hook fired once when the {@link AbstractMcpServerLauncher} singleton is first resolved by
+     * the DI container — lets adopters obtain the instance without subclassing it. No-op by default.
+     */
+    protected onMcpServerLauncherActivated(_launcher: AbstractMcpServerLauncher): void {}
+
+    /**
+     * {@link McpRequestContext} binding. Concrete modules return the target-specific async-context
+     * implementation (e.g. Node's `AsyncLocalStorage`-backed variant or a browser-friendly one).
+     */
+    protected abstract bindMcpRequestContext(): BindingTarget<McpRequestContext>;
 
     /**
      * {@link McpDiagramHandlerDispatcher} binding. Owns diagram-scope handler discovery,
@@ -194,16 +214,12 @@ export abstract class AbstractMcpServerModule extends GLSPModule {
         return { constantValue: this.defaultOptions };
     }
 
-    /**
-     * {@link McpLogger} binding. Bound on the server container; per-session containers inherit
-     * it, so handlers at any scope can inject it; routes through the active MCP request via
-     * {@link mcpRequestContext}.
-     */
+    /** {@link McpLogger} binding — routes through the active MCP request via {@link McpRequestContext}. */
     protected bindMcpLogger(): BindingTarget<McpLogger> {
         return McpLogger;
     }
 
-    /** {@link McpProgressReporter} binding. Same scope/lifecycle story as {@link bindMcpLogger}. */
+    /** {@link McpProgressReporter} binding. */
     protected bindMcpProgressReporter(): BindingTarget<McpProgressReporter> {
         return McpProgressReporter;
     }
@@ -257,31 +273,3 @@ export abstract class AbstractMcpServerModule extends GLSPModule {
         binding.add(SuggestImprovementsMcpPromptHandler);
     }
 }
-
-/**
- * Default {@link AbstractMcpServerModule} entry point. Ships GLSP-default option values (see
- * {@link DEFAULT_OPTIONS}) on top of the abstract module's hook defaults. 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 DefaultMcpServerModule extends AbstractMcpServerModule {
-    static readonly DEFAULT_OPTIONS: McpServerDefaults = {
-        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.
-        dataMode: 'tools',
-        agentPersona: DEFAULT_AGENT_PERSONA,
-        // 10K events per session is generous for typical workloads (a few MB) and large enough
-        // that disconnects within seconds recover via `Last-Event-ID` resumability.
-        eventStoreLimit: LruEventStore.DEFAULT_LIMIT
-    };
-
-    constructor(overrides: McpServerDefaults = {}) {
-        super({ ...DefaultMcpServerModule.DEFAULT_OPTIONS, ...overrides });
-    }
-}

package/src/{server → common/modules}/mcp-diagram-module.ts

@@ -16,48 +16,47 @@
 
 import { applyBindingTarget, BindingTarget, ClientSessionInitializer, GLSPModule, InstanceMultiBinding } from '@eclipse-glsp/server';
 import { interfaces } from 'inversify';
-import { DiagramPngMcpResourceHandler, DiagramSvgMcpResourceHandler } from '../resources';
+import { DiagramPngMcpResourceHandler } from '../resources/handlers/diagram-png-mcp-resource-handler';
+import { DiagramSvgMcpResourceHandler } from '../resources/handlers/diagram-svg-mcp-resource-handler';
 import { DefaultElementTypesProvider, ElementTypesProvider } from '../resources/services/element-types-provider';
 import { MarkdownMcpModelSerializer, McpModelSerializer } from '../resources/services/mcp-model-serializer';
-import {
-    CountElementsMcpToolHandler,
-    CreateEdgesMcpToolHandler,
-    CreateNodesMcpToolHandler,
-    DeleteElementsMcpToolHandler,
-    DiagramModelMcpToolHandler,
-    GetSelectionMcpToolHandler,
-    LayoutMcpToolHandler,
-    ModifyEdgesMcpToolHandler,
-    ModifyNodesMcpToolHandler,
-    QueryElementsMcpToolHandler,
-    RedoMcpToolHandler,
-    SaveModelMcpToolHandler,
-    SetSelectionMcpToolHandler,
-    SetViewMcpToolHandler,
-    UndoMcpToolHandler,
-    ValidateDiagramMcpToolHandler
-} from '../tools';
+import { CountElementsMcpToolHandler } from '../tools/handlers/count-elements-mcp-tool-handler';
+import { CreateEdgesMcpToolHandler } from '../tools/handlers/create-edges-mcp-tool-handler';
+import { CreateNodesMcpToolHandler } from '../tools/handlers/create-nodes-mcp-tool-handler';
+import { DeleteElementsMcpToolHandler } from '../tools/handlers/delete-elements-mcp-tool-handler';
+import { DiagramModelMcpToolHandler } from '../tools/handlers/diagram-model-mcp-tool-handler';
+import { GetSelectionMcpToolHandler } from '../tools/handlers/get-selection-mcp-tool-handler';
+import { LayoutMcpToolHandler } from '../tools/handlers/layout-mcp-tool-handler';
+import { ModifyEdgesMcpToolHandler } from '../tools/handlers/modify-edges-mcp-tool-handler';
+import { ModifyNodesMcpToolHandler } from '../tools/handlers/modify-nodes-mcp-tool-handler';
+import { QueryElementsMcpToolHandler } from '../tools/handlers/query-elements-mcp-tool-handler';
+import { RedoMcpToolHandler } from '../tools/handlers/redo-mcp-tool-handler';
+import { SaveModelMcpToolHandler } from '../tools/handlers/save-model-mcp-tool-handler';
+import { SetSelectionMcpToolHandler } from '../tools/handlers/set-selection-mcp-tool-handler';
+import { SetViewMcpToolHandler } from '../tools/handlers/set-view-mcp-tool-handler';
+import { UndoMcpToolHandler } from '../tools/handlers/undo-mcp-tool-handler';
+import { ValidateDiagramMcpToolHandler } from '../tools/handlers/validate-diagram-mcp-tool-handler';
 import {
     McpDiagramPromptHandlerFactory,
     McpDiagramPromptHandlerRegistry,
     McpDiagramPromptHandlerRegistryInitializer
-} from './mcp-diagram-prompt-handler-registry';
+} from '../server/mcp-diagram-prompt-handler-registry';
 import {
     McpDiagramResourceHandlerFactory,
     McpDiagramResourceHandlerRegistry,
     McpDiagramResourceHandlerRegistryInitializer
-} from './mcp-diagram-resource-handler-registry';
+} from '../server/mcp-diagram-resource-handler-registry';
 import {
     McpDiagramToolHandlerFactory,
     McpDiagramToolHandlerRegistry,
     McpDiagramToolHandlerRegistryInitializer
-} from './mcp-diagram-tool-handler-registry';
-import { DefaultMcpIdAliasService, McpIdAliasService } from './mcp-id-alias-service';
-import { McpDiagramScopedInput } from './mcp-input-schemas';
-import { DefaultMcpLabelProvider, McpLabelProvider } from './mcp-label-provider';
-import { AbstractMcpDiagramPromptHandler, McpDiagramPromptHandlerConstructor } from './mcp-prompt-handler';
-import { AbstractMcpDiagramResourceHandler, McpDiagramResourceHandlerConstructor } from './mcp-resource-handler';
-import { BaseMcpDiagramToolHandler, McpDiagramToolHandlerConstructor } from './mcp-tool-handler';
+} from '../server/mcp-diagram-tool-handler-registry';
+import { DefaultMcpIdAliasService, McpIdAliasService } from '../server/mcp-id-alias-service';
+import { McpDiagramScopedInput } from '../server/mcp-input-schemas';
+import { DefaultMcpLabelProvider, McpLabelProvider } from '../server/mcp-label-provider';
+import { AbstractMcpDiagramPromptHandler, McpDiagramPromptHandlerConstructor } from '../server/mcp-prompt-handler';
+import { AbstractMcpDiagramResourceHandler, McpDiagramResourceHandlerConstructor } from '../server/mcp-resource-handler';
+import { BaseMcpDiagramToolHandler, McpDiagramToolHandlerConstructor } from '../server/mcp-tool-handler';
 
 /**
  * Per-GLSP-client-session DI module for the MCP server. Loaded inside `configureDiagramModule`

package/src/{prompts → common/prompts}/handlers/describe-diagram-mcp-prompt-handler.ts

@@ -17,15 +17,14 @@
 import { ClientSessionManager } from '@eclipse-glsp/server';
 import { inject, injectable } from 'inversify';
 import * as z from 'zod/v4';
-import { AbstractMcpPromptHandler, McpPromptResult, resolveActiveSessionId } from '../../server';
-import {
-    CountElementsMcpToolHandler,
-    DiagramModelMcpToolHandler,
-    ElementTypesMcpToolHandler,
-    QueryElementsMcpToolHandler,
-    SetSelectionMcpToolHandler,
-    SetViewMcpToolHandler
-} from '../../tools';
+import { McpPromptResult, resolveActiveSessionId } from '../../server/mcp-handler-shared';
+import { AbstractMcpPromptHandler } from '../../server/mcp-prompt-handler';
+import { CountElementsMcpToolHandler } from '../../tools/handlers/count-elements-mcp-tool-handler';
+import { DiagramModelMcpToolHandler } from '../../tools/handlers/diagram-model-mcp-tool-handler';
+import { ElementTypesMcpToolHandler } from '../../tools/handlers/element-types-mcp-tool-handler';
+import { QueryElementsMcpToolHandler } from '../../tools/handlers/query-elements-mcp-tool-handler';
+import { SetSelectionMcpToolHandler } from '../../tools/handlers/set-selection-mcp-tool-handler';
+import { SetViewMcpToolHandler } from '../../tools/handlers/set-view-mcp-tool-handler';
 
 export const DescribeDiagramArgsSchema = z.object({
     sessionId: z

package/src/{prompts → common/prompts}/handlers/suggest-improvements-mcp-prompt-handler.ts

@@ -17,13 +17,12 @@
 import { ClientSessionManager } from '@eclipse-glsp/server';
 import { inject, injectable } from 'inversify';
 import * as z from 'zod/v4';
-import { AbstractMcpPromptHandler, McpPromptResult, resolveActiveSessionId } from '../../server';
-import {
-    DiagramModelMcpToolHandler,
-    QueryElementsMcpToolHandler,
-    SetSelectionMcpToolHandler,
-    ValidateDiagramMcpToolHandler
-} from '../../tools';
+import { McpPromptResult, resolveActiveSessionId } from '../../server/mcp-handler-shared';
+import { AbstractMcpPromptHandler } from '../../server/mcp-prompt-handler';
+import { DiagramModelMcpToolHandler } from '../../tools/handlers/diagram-model-mcp-tool-handler';
+import { QueryElementsMcpToolHandler } from '../../tools/handlers/query-elements-mcp-tool-handler';
+import { SetSelectionMcpToolHandler } from '../../tools/handlers/set-selection-mcp-tool-handler';
+import { ValidateDiagramMcpToolHandler } from '../../tools/handlers/validate-diagram-mcp-tool-handler';
 
 export const SuggestImprovementsArgsSchema = z.object({
     sessionId: z

package/src/{resources → common/resources}/handlers/diagram-png-mcp-resource-handler.ts

@@ -18,15 +18,11 @@ import { ClientActionKinds, isGBoundsAware, RequestExportAction } from '@eclipse
 import { Role } from '@modelcontextprotocol/sdk/types.js';
 import { inject, injectable } from 'inversify';
 import * as z from 'zod/v4';
-import {
-    AbstractMcpDiagramResourceHandler,
-    McpDiagramScopedInputSchema,
-    McpMimeType,
-    McpProgressReporter,
-    McpResourceContent,
-    McpResourceUri,
-    McpToolError
-} from '../../server';
+import { McpResourceContent, McpToolError } from '../../server/mcp-handler-shared';
+import { McpDiagramScopedInputSchema } from '../../server/mcp-input-schemas';
+import { McpMimeType } from '../../server/mcp-mime-types';
+import { McpProgressReporter } from '../../server/mcp-progress-reporter';
+import { AbstractMcpDiagramResourceHandler, McpResourceUri } from '../../server/mcp-resource-handler';
 
 export const DiagramPngInputSchema = McpDiagramScopedInputSchema.extend({
     scale: z

package/src/{resources → common/resources}/handlers/diagram-svg-mcp-resource-handler.ts

@@ -18,15 +18,11 @@ import { ClientActionKinds, RequestExportAction } from '@eclipse-glsp/server';
 import { Role } from '@modelcontextprotocol/sdk/types.js';
 import { inject, injectable } from 'inversify';
 import * as z from 'zod/v4';
-import {
-    AbstractMcpDiagramResourceHandler,
-    McpDiagramScopedInputSchema,
-    McpMimeType,
-    McpProgressReporter,
-    McpResourceContent,
-    McpResourceUri,
-    McpToolError
-} from '../../server';
+import { McpResourceContent, McpToolError } from '../../server/mcp-handler-shared';
+import { McpDiagramScopedInputSchema } from '../../server/mcp-input-schemas';
+import { McpMimeType } from '../../server/mcp-mime-types';
+import { McpProgressReporter } from '../../server/mcp-progress-reporter';
+import { AbstractMcpDiagramResourceHandler, McpResourceUri } from '../../server/mcp-resource-handler';
 
 export const DiagramSvgInputSchema = McpDiagramScopedInputSchema.extend({
     timeoutMs: z

package/src/{resources → common/resources}/services/mcp-model-serializer.ts

@@ -19,7 +19,7 @@ import { Dimension, GModelSerializer, Logger, Point } from '@eclipse-glsp/server
 import { inject, injectable, postConstruct } from 'inversify';
 import { McpStructuredContent } from '../../server/mcp-handler-shared';
 import { McpIdAliasService } from '../../server/mcp-id-alias-service';
-import { objectArrayToMarkdownTable } from '../../util';
+import { objectArrayToMarkdownTable } from '../../util/markdown-util';
 
 export const McpModelSerializer = Symbol('McpModelSerializer');