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

package/lib/{server/mcp-server-module.js → common/modules/abstract-mcp-server-module.js}

@@ -15,25 +15,27 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultMcpServerModule = exports.AbstractMcpServerModule = exports.McpHandlerMultiBinding = void 0;
+exports.AbstractMcpServerModule = exports.McpHandlerMultiBinding = exports.DEFAULT_MCP_OPTIONS = exports.DEFAULT_AGENT_PERSONA = void 0;
 const server_1 = require("@eclipse-glsp/server");
-const prompts_1 = require("../prompts");
-const tools_1 = require("../tools");
-const glsp_mcp_server_1 = require("./glsp-mcp-server");
-const mcp_diagram_handler_dispatcher_1 = require("./mcp-diagram-handler-dispatcher");
-const mcp_log_level_registry_1 = require("./mcp-log-level-registry");
-const lru_event_store_1 = require("./lru-event-store");
-const mcp_http_transport_1 = require("./mcp-http-transport");
-const mcp_logger_1 = require("./mcp-logger");
-const mcp_options_1 = require("./mcp-options");
-const mcp_progress_reporter_1 = require("./mcp-progress-reporter");
-const mcp_prompt_handler_1 = require("./mcp-prompt-handler");
-const mcp_resource_handler_1 = require("./mcp-resource-handler");
-const mcp_server_launcher_1 = require("./mcp-server-launcher");
-const mcp_tool_handler_1 = require("./mcp-tool-handler");
+const describe_diagram_mcp_prompt_handler_1 = require("../prompts/handlers/describe-diagram-mcp-prompt-handler");
+const suggest_improvements_mcp_prompt_handler_1 = require("../prompts/handlers/suggest-improvements-mcp-prompt-handler");
+const abstract_mcp_server_launcher_1 = require("../server/abstract-mcp-server-launcher");
+const glsp_mcp_server_1 = require("../server/glsp-mcp-server");
+const lru_event_store_1 = require("../server/lru-event-store");
+const mcp_diagram_handler_dispatcher_1 = require("../server/mcp-diagram-handler-dispatcher");
+const mcp_log_level_registry_1 = require("../server/mcp-log-level-registry");
+const mcp_logger_1 = require("../server/mcp-logger");
+const mcp_options_1 = require("../server/mcp-options");
+const mcp_progress_reporter_1 = require("../server/mcp-progress-reporter");
+const mcp_prompt_handler_1 = require("../server/mcp-prompt-handler");
+const mcp_request_context_1 = require("../server/mcp-request-context");
+const mcp_resource_handler_1 = require("../server/mcp-resource-handler");
+const mcp_tool_handler_1 = require("../server/mcp-tool-handler");
+const element_types_mcp_tool_handler_1 = require("../tools/handlers/element-types-mcp-tool-handler");
+const session_info_mcp_tool_handler_1 = require("../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
@@ -42,7 +44,7 @@ const mcp_tool_handler_1 = require("./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 = `
+exports.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.
@@ -59,6 +61,16 @@ GLSP MCP server. You have to adhere to the following principles:
   so the user can correlate it with follow-up tools. Use the \`set-selection\` tool — or the \`set-view\` tool with
   \`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).
+ */
+exports.DEFAULT_MCP_OPTIONS = {
+    dataMode: 'tools',
+    agentPersona: exports.DEFAULT_AGENT_PERSONA,
+    eventStoreLimit: lru_event_store_1.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
@@ -77,9 +89,11 @@ class McpHandlerMultiBinding extends server_1.AbstractMultiBinding {
 }
 exports.McpHandlerMultiBinding = McpHandlerMultiBinding;
 /**
- * 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
@@ -89,13 +103,13 @@ exports.McpHandlerMultiBinding = McpHandlerMultiBinding;
  * @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);
@@ -109,39 +123,35 @@ class AbstractMcpServerModule extends server_1.GLSPModule {
         super();
         this.defaultOptions = defaultOptions;
     }
-    configure(bind, _unbind, isBound, rebind) {
-        this.bind = bind;
-        this.rebind = rebind;
+    configure(bind, _unbind, isBound, _rebind) {
         const context = { bind, isBound };
-        (0, server_1.applyBindingTarget)(context, mcp_server_launcher_1.McpServerLauncher, this.bindMcpServerLauncher()).inSingletonScope();
-        // The launcher is bound under two additional service identifiers so core's existing
+        (0, server_1.applyBindingTarget)(context, abstract_mcp_server_launcher_1.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(server_1.GLSPServerInitializer).toService(mcp_server_launcher_1.McpServerLauncher);
-        bind(server_1.GLSPServerListener).toService(mcp_server_launcher_1.McpServerLauncher);
-        (0, server_1.applyBindingTarget)(context, mcp_http_transport_1.McpHttpTransport, this.bindMcpHttpTransport()).inSingletonScope();
+        bind(server_1.GLSPServerInitializer).toService(abstract_mcp_server_launcher_1.AbstractMcpServerLauncher);
+        bind(server_1.GLSPServerListener).toService(abstract_mcp_server_launcher_1.AbstractMcpServerLauncher);
         (0, server_1.applyBindingTarget)(context, mcp_diagram_handler_dispatcher_1.McpDiagramHandlerDispatcher, this.bindMcpDiagramHandlerDispatcher()).inSingletonScope();
         (0, server_1.applyBindingTarget)(context, mcp_options_1.McpServerOptions, this.bindMcpServerOptions()).inSingletonScope();
         (0, server_1.applyBindingTarget)(context, mcp_options_1.McpServerDefaults, this.bindMcpServerDefaults());
         (0, server_1.applyBindingTarget)(context, mcp_logger_1.McpLogger, this.bindMcpLogger()).inSingletonScope();
         (0, server_1.applyBindingTarget)(context, mcp_log_level_registry_1.McpLogLevelRegistry, this.bindMcpLogLevelRegistry()).inSingletonScope();
         (0, server_1.applyBindingTarget)(context, mcp_progress_reporter_1.McpProgressReporter, this.bindMcpProgressReporter()).inSingletonScope();
+        (0, server_1.applyBindingTarget)(context, mcp_request_context_1.McpRequestContext, this.bindMcpRequestContext()).inSingletonScope();
         (0, server_1.applyBindingTarget)(context, glsp_mcp_server_1.GLSPMcpServerFactory, this.bindGLSPMcpServerFactory());
         this.configureMultiBinding(new McpHandlerMultiBinding(mcp_tool_handler_1.McpToolHandler), binding => this.configureToolHandlers(binding));
         this.configureMultiBinding(new McpHandlerMultiBinding(mcp_resource_handler_1.McpResourceHandler), binding => this.configureResourceHandlers(binding));
         this.configureMultiBinding(new McpHandlerMultiBinding(mcp_prompt_handler_1.McpPromptHandler), binding => this.configurePromptHandlers(binding));
     }
     /**
-     * {@link McpServerLauncher} binding. Bound as a singleton AND aliased to
-     * `GLSPServerInitializer` + `GLSPServerListener` (the launcher implements both).
-     * Override to swap in a custom launcher impl.
+     * 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.
      */
-    bindMcpServerLauncher() {
-        return mcp_server_launcher_1.McpServerLauncher;
-    }
-    /** {@link McpHttpTransport} binding. Override to swap to a different transport implementation. */
-    bindMcpHttpTransport() {
-        return mcp_http_transport_1.McpHttpTransport;
-    }
+    onMcpServerLauncherActivated(_launcher) { }
     /**
      * {@link McpDiagramHandlerDispatcher} binding. Owns diagram-scope handler discovery,
      * SDK registration, and per-call dispatch routing. Override (or `rebind` to a subclass)
@@ -162,15 +172,11 @@ class AbstractMcpServerModule extends server_1.GLSPModule {
     bindMcpServerDefaults() {
         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}. */
     bindMcpLogger() {
         return mcp_logger_1.McpLogger;
     }
-    /** {@link McpProgressReporter} binding. Same scope/lifecycle story as {@link bindMcpLogger}. */
+    /** {@link McpProgressReporter} binding. */
     bindMcpProgressReporter() {
         return mcp_progress_reporter_1.McpProgressReporter;
     }
@@ -200,8 +206,8 @@ class AbstractMcpServerModule extends server_1.GLSPModule {
      * `binding.rebind(StandardTool, MyTool)` for overrides.
      */
     configureToolHandlers(binding) {
-        binding.add(tools_1.SessionInfoMcpToolHandler);
-        binding.add(tools_1.ElementTypesMcpToolHandler);
+        binding.add(session_info_mcp_tool_handler_1.SessionInfoMcpToolHandler);
+        binding.add(element_types_mcp_tool_handler_1.ElementTypesMcpToolHandler);
     }
     /** See {@link configureToolHandlers}. No server-scope resources ship by default. */
     configureResourceHandlers(_binding) {
@@ -214,36 +220,9 @@ class AbstractMcpServerModule extends server_1.GLSPModule {
      * {@link DefaultMcpDiagramModule.configurePromptHandlers}.
      */
     configurePromptHandlers(binding) {
-        binding.add(prompts_1.DescribeDiagramMcpPromptHandler);
-        binding.add(prompts_1.SuggestImprovementsMcpPromptHandler);
+        binding.add(describe_diagram_mcp_prompt_handler_1.DescribeDiagramMcpPromptHandler);
+        binding.add(suggest_improvements_mcp_prompt_handler_1.SuggestImprovementsMcpPromptHandler);
     }
 }
 exports.AbstractMcpServerModule = AbstractMcpServerModule;
-/**
- * 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.
- */
-class DefaultMcpServerModule extends AbstractMcpServerModule {
-    constructor(overrides = {}) {
-        super({ ...DefaultMcpServerModule.DEFAULT_OPTIONS, ...overrides });
-    }
-}
-exports.DefaultMcpServerModule = DefaultMcpServerModule;
-DefaultMcpServerModule.DEFAULT_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.
-    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: lru_event_store_1.LruEventStore.DEFAULT_LIMIT
-};
-//# sourceMappingURL=mcp-server-module.js.map
+//# sourceMappingURL=abstract-mcp-server-module.js.map

package/lib/common/modules/abstract-mcp-server-module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"abstract-mcp-server-module.js","sourceRoot":"","sources":["../../../src/common/modules/abstract-mcp-server-module.ts"],"names":[],"mappings":"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"}

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

@@ -17,11 +17,11 @@ import { BindingTarget, GLSPModule, InstanceMultiBinding } from '@eclipse-glsp/s
 import { interfaces } from 'inversify';
 import { ElementTypesProvider } from '../resources/services/element-types-provider';
 import { McpModelSerializer } from '../resources/services/mcp-model-serializer';
-import { McpIdAliasService } from './mcp-id-alias-service';
-import { McpLabelProvider } from './mcp-label-provider';
-import { McpDiagramPromptHandlerConstructor } from './mcp-prompt-handler';
-import { McpDiagramResourceHandlerConstructor } from './mcp-resource-handler';
-import { McpDiagramToolHandlerConstructor } from './mcp-tool-handler';
+import { McpIdAliasService } from '../server/mcp-id-alias-service';
+import { McpLabelProvider } from '../server/mcp-label-provider';
+import { McpDiagramPromptHandlerConstructor } from '../server/mcp-prompt-handler';
+import { McpDiagramResourceHandlerConstructor } from '../server/mcp-resource-handler';
+import { McpDiagramToolHandlerConstructor } from '../server/mcp-tool-handler';
 /**
  * Per-GLSP-client-session DI module for the MCP server. Loaded inside `configureDiagramModule`
  * so each `ClientSession.container` gets its own instance of session-scoped services.

package/lib/common/modules/mcp-diagram-module.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-diagram-module.d.ts","sourceRoot":"","sources":["../../../src/common/modules/mcp-diagram-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAsB,aAAa,EAA4B,UAAU,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACrI,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAGvC,OAAO,EAA+B,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AACjH,OAAO,EAA8B,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAgC5G,OAAO,EAA4B,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAE7F,OAAO,EAA2B,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACzF,OAAO,EAAmC,kCAAkC,EAAE,MAAM,8BAA8B,CAAC;AACnH,OAAO,EAAqC,oCAAoC,EAAE,MAAM,gCAAgC,CAAC;AACzH,OAAO,EAA6B,gCAAgC,EAAE,MAAM,4BAA4B,CAAC;AAEzG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,8BAAsB,wBAAyB,SAAQ,UAAU;IAC7D,SAAS,CAAC,IAAI,EAAG,UAAU,CAAC,IAAI,CAAC;IACjC,SAAS,CAAC,MAAM,EAAG,UAAU,CAAC,MAAM,CAAC;cAElB,SAAS,CACxB,IAAI,EAAE,UAAU,CAAC,IAAI,EACrB,OAAO,EAAE,UAAU,CAAC,MAAM,EAC1B,OAAO,EAAE,UAAU,CAAC,OAAO,EAC3B,MAAM,EAAE,UAAU,CAAC,MAAM,GAC1B,IAAI;IAsBP;;;;;;;;;;;;OAYG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA0B5C;;;;OAIG;IACH,SAAS,CAAC,kBAAkB,IAAI,aAAa,CAAC,iBAAiB,CAAC;IAIhE;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,aAAa,CAAC,gBAAgB,CAAC;IAI9D;;;;OAIG;IACH,SAAS,CAAC,mBAAmB,IAAI,aAAa,CAAC,kBAAkB,CAAC;IAIlE;;;;OAIG;IACH,SAAS,CAAC,wBAAwB,IAAI,aAAa,CAAC,oBAAoB,CAAC;IAIzE;;;;OAIG;IACH,SAAS,CAAC,qBAAqB,CAAC,OAAO,EAAE,oBAAoB,CAAC,gCAAgC,CAAC,GAAG,IAAI;IAoBtG,yCAAyC;IACzC,SAAS,CAAC,yBAAyB,CAAC,OAAO,EAAE,oBAAoB,CAAC,oCAAoC,CAAC,GAAG,IAAI;IAK9G;;;;OAIG;IACH,SAAS,CAAC,uBAAuB,CAAC,QAAQ,EAAE,oBAAoB,CAAC,kCAAkC,CAAC,GAAG,IAAI;CAG9G;AAED;;;;;;;;GAQG;AACH,qBAAa,uBAAwB,SAAQ,wBAAwB;CAAG"}

package/lib/{server → common/modules}/mcp-diagram-module.js

@@ -17,18 +17,34 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultMcpDiagramModule = exports.AbstractMcpDiagramModule = void 0;
 const server_1 = require("@eclipse-glsp/server");
-const resources_1 = require("../resources");
+const diagram_png_mcp_resource_handler_1 = require("../resources/handlers/diagram-png-mcp-resource-handler");
+const diagram_svg_mcp_resource_handler_1 = require("../resources/handlers/diagram-svg-mcp-resource-handler");
 const element_types_provider_1 = require("../resources/services/element-types-provider");
 const mcp_model_serializer_1 = require("../resources/services/mcp-model-serializer");
-const tools_1 = require("../tools");
-const mcp_diagram_prompt_handler_registry_1 = require("./mcp-diagram-prompt-handler-registry");
-const mcp_diagram_resource_handler_registry_1 = require("./mcp-diagram-resource-handler-registry");
-const mcp_diagram_tool_handler_registry_1 = require("./mcp-diagram-tool-handler-registry");
-const mcp_id_alias_service_1 = require("./mcp-id-alias-service");
-const mcp_label_provider_1 = require("./mcp-label-provider");
-const mcp_prompt_handler_1 = require("./mcp-prompt-handler");
-const mcp_resource_handler_1 = require("./mcp-resource-handler");
-const mcp_tool_handler_1 = require("./mcp-tool-handler");
+const count_elements_mcp_tool_handler_1 = require("../tools/handlers/count-elements-mcp-tool-handler");
+const create_edges_mcp_tool_handler_1 = require("../tools/handlers/create-edges-mcp-tool-handler");
+const create_nodes_mcp_tool_handler_1 = require("../tools/handlers/create-nodes-mcp-tool-handler");
+const delete_elements_mcp_tool_handler_1 = require("../tools/handlers/delete-elements-mcp-tool-handler");
+const diagram_model_mcp_tool_handler_1 = require("../tools/handlers/diagram-model-mcp-tool-handler");
+const get_selection_mcp_tool_handler_1 = require("../tools/handlers/get-selection-mcp-tool-handler");
+const layout_mcp_tool_handler_1 = require("../tools/handlers/layout-mcp-tool-handler");
+const modify_edges_mcp_tool_handler_1 = require("../tools/handlers/modify-edges-mcp-tool-handler");
+const modify_nodes_mcp_tool_handler_1 = require("../tools/handlers/modify-nodes-mcp-tool-handler");
+const query_elements_mcp_tool_handler_1 = require("../tools/handlers/query-elements-mcp-tool-handler");
+const redo_mcp_tool_handler_1 = require("../tools/handlers/redo-mcp-tool-handler");
+const save_model_mcp_tool_handler_1 = require("../tools/handlers/save-model-mcp-tool-handler");
+const set_selection_mcp_tool_handler_1 = require("../tools/handlers/set-selection-mcp-tool-handler");
+const set_view_mcp_tool_handler_1 = require("../tools/handlers/set-view-mcp-tool-handler");
+const undo_mcp_tool_handler_1 = require("../tools/handlers/undo-mcp-tool-handler");
+const validate_diagram_mcp_tool_handler_1 = require("../tools/handlers/validate-diagram-mcp-tool-handler");
+const mcp_diagram_prompt_handler_registry_1 = require("../server/mcp-diagram-prompt-handler-registry");
+const mcp_diagram_resource_handler_registry_1 = require("../server/mcp-diagram-resource-handler-registry");
+const mcp_diagram_tool_handler_registry_1 = require("../server/mcp-diagram-tool-handler-registry");
+const mcp_id_alias_service_1 = require("../server/mcp-id-alias-service");
+const mcp_label_provider_1 = require("../server/mcp-label-provider");
+const mcp_prompt_handler_1 = require("../server/mcp-prompt-handler");
+const mcp_resource_handler_1 = require("../server/mcp-resource-handler");
+const mcp_tool_handler_1 = require("../server/mcp-tool-handler");
 /**
  * Per-GLSP-client-session DI module for the MCP server. Loaded inside `configureDiagramModule`
  * so each `ClientSession.container` gets its own instance of session-scoped services.
@@ -138,28 +154,28 @@ class AbstractMcpDiagramModule extends server_1.GLSPModule {
      * for additions or `binding.rebind(StandardTool, MyTool)` for overrides.
      */
     configureToolHandlers(binding) {
-        binding.add(tools_1.CreateNodesMcpToolHandler);
-        binding.add(tools_1.CreateEdgesMcpToolHandler);
-        binding.add(tools_1.DeleteElementsMcpToolHandler);
-        binding.add(tools_1.SaveModelMcpToolHandler);
-        binding.add(tools_1.ValidateDiagramMcpToolHandler);
-        binding.add(tools_1.DiagramModelMcpToolHandler);
-        binding.add(tools_1.QueryElementsMcpToolHandler);
-        binding.add(tools_1.CountElementsMcpToolHandler);
-        binding.add(tools_1.ModifyNodesMcpToolHandler);
-        binding.add(tools_1.ModifyEdgesMcpToolHandler);
-        binding.add(tools_1.UndoMcpToolHandler);
-        binding.add(tools_1.RedoMcpToolHandler);
-        binding.add(tools_1.GetSelectionMcpToolHandler);
-        binding.add(tools_1.SetSelectionMcpToolHandler);
-        binding.add(tools_1.SetViewMcpToolHandler);
+        binding.add(create_nodes_mcp_tool_handler_1.CreateNodesMcpToolHandler);
+        binding.add(create_edges_mcp_tool_handler_1.CreateEdgesMcpToolHandler);
+        binding.add(delete_elements_mcp_tool_handler_1.DeleteElementsMcpToolHandler);
+        binding.add(save_model_mcp_tool_handler_1.SaveModelMcpToolHandler);
+        binding.add(validate_diagram_mcp_tool_handler_1.ValidateDiagramMcpToolHandler);
+        binding.add(diagram_model_mcp_tool_handler_1.DiagramModelMcpToolHandler);
+        binding.add(query_elements_mcp_tool_handler_1.QueryElementsMcpToolHandler);
+        binding.add(count_elements_mcp_tool_handler_1.CountElementsMcpToolHandler);
+        binding.add(modify_nodes_mcp_tool_handler_1.ModifyNodesMcpToolHandler);
+        binding.add(modify_edges_mcp_tool_handler_1.ModifyEdgesMcpToolHandler);
+        binding.add(undo_mcp_tool_handler_1.UndoMcpToolHandler);
+        binding.add(redo_mcp_tool_handler_1.RedoMcpToolHandler);
+        binding.add(get_selection_mcp_tool_handler_1.GetSelectionMcpToolHandler);
+        binding.add(set_selection_mcp_tool_handler_1.SetSelectionMcpToolHandler);
+        binding.add(set_view_mcp_tool_handler_1.SetViewMcpToolHandler);
         // Auto-skips at session-open via `canRegister()` when no `LayoutEngine` is bound.
-        binding.add(tools_1.LayoutMcpToolHandler);
+        binding.add(layout_mcp_tool_handler_1.LayoutMcpToolHandler);
     }
     /** See {@link configureToolHandlers}. */
     configureResourceHandlers(binding) {
-        binding.add(resources_1.DiagramPngMcpResourceHandler);
-        binding.add(resources_1.DiagramSvgMcpResourceHandler);
+        binding.add(diagram_png_mcp_resource_handler_1.DiagramPngMcpResourceHandler);
+        binding.add(diagram_svg_mcp_resource_handler_1.DiagramSvgMcpResourceHandler);
     }
     /**
      * See {@link configureToolHandlers}. No diagram-scope prompts ship by default — the shipped

package/lib/common/modules/mcp-diagram-module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-diagram-module.js","sourceRoot":"","sources":["../../../src/common/modules/mcp-diagram-module.ts"],"names":[],"mappings":"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"}

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

@@ -15,7 +15,8 @@
  ********************************************************************************/
 import { ClientSessionManager } from '@eclipse-glsp/server';
 import * as z from 'zod/v4';
-import { AbstractMcpPromptHandler, McpPromptResult } from '../../server';
+import { McpPromptResult } from '../../server/mcp-handler-shared';
+import { AbstractMcpPromptHandler } from '../../server/mcp-prompt-handler';
 export declare const DescribeDiagramArgsSchema: z.ZodObject<{
     sessionId: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;

package/lib/common/prompts/handlers/describe-diagram-mcp-prompt-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"describe-diagram-mcp-prompt-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/prompts/handlers/describe-diagram-mcp-prompt-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,eAAe,EAA0B,MAAM,iCAAiC,CAAC;AAC1F,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAQ3E,eAAO,MAAM,yBAAyB;;iBAKpC,CAAC;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAE5E;;;;;;;GAOG;AACH,qBACa,+BAAgC,SAAQ,wBAAwB,CAAC,mBAAmB,CAAC;IAC9F,MAAM,CAAC,QAAQ,CAAC,IAAI,sBAAsB;IAC1C,QAAQ,CAAC,IAAI,sBAAwC;IACrD,SAAkB,KAAK,sBAAsB;IAC7C,QAAQ,CAAC,WAAW,SAK+C;IACnE,QAAQ,CAAC,UAAU;;sBAA6B;IAElB,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAE1E,mBAAmB,IAAI,MAAM,EAAE;IAWxC,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,mBAAmB,GAAG,eAAe;CAiBrE"}

package/lib/{prompts → common/prompts}/handlers/describe-diagram-mcp-prompt-handler.js

@@ -29,8 +29,14 @@ exports.DescribeDiagramMcpPromptHandler = exports.DescribeDiagramArgsSchema = vo
 const server_1 = require("@eclipse-glsp/server");
 const inversify_1 = require("inversify");
 const z = require("zod/v4");
-const server_2 = require("../../server");
-const tools_1 = require("../../tools");
+const mcp_handler_shared_1 = require("../../server/mcp-handler-shared");
+const mcp_prompt_handler_1 = require("../../server/mcp-prompt-handler");
+const count_elements_mcp_tool_handler_1 = require("../../tools/handlers/count-elements-mcp-tool-handler");
+const diagram_model_mcp_tool_handler_1 = require("../../tools/handlers/diagram-model-mcp-tool-handler");
+const element_types_mcp_tool_handler_1 = require("../../tools/handlers/element-types-mcp-tool-handler");
+const query_elements_mcp_tool_handler_1 = require("../../tools/handlers/query-elements-mcp-tool-handler");
+const set_selection_mcp_tool_handler_1 = require("../../tools/handlers/set-selection-mcp-tool-handler");
+const set_view_mcp_tool_handler_1 = require("../../tools/handlers/set-view-mcp-tool-handler");
 exports.DescribeDiagramArgsSchema = z.object({
     sessionId: z
         .string()
@@ -45,7 +51,7 @@ exports.DescribeDiagramArgsSchema = z.object({
  * Server-scope on purpose — the prompt itself has no per-session state, so we avoid forcing
  * the user to type a sessionId in the common single-diagram case.
  */
-let DescribeDiagramMcpPromptHandler = DescribeDiagramMcpPromptHandler_1 = class DescribeDiagramMcpPromptHandler extends server_2.AbstractMcpPromptHandler {
+let DescribeDiagramMcpPromptHandler = DescribeDiagramMcpPromptHandler_1 = class DescribeDiagramMcpPromptHandler extends mcp_prompt_handler_1.AbstractMcpPromptHandler {
     constructor() {
         super(...arguments);
         this.name = DescribeDiagramMcpPromptHandler_1.NAME;
@@ -59,28 +65,28 @@ let DescribeDiagramMcpPromptHandler = DescribeDiagramMcpPromptHandler_1 = class
     }
     referencedToolNames() {
         return [
-            tools_1.CountElementsMcpToolHandler.NAME,
-            tools_1.ElementTypesMcpToolHandler.NAME,
-            tools_1.DiagramModelMcpToolHandler.NAME,
-            tools_1.QueryElementsMcpToolHandler.NAME,
-            tools_1.SetSelectionMcpToolHandler.NAME,
-            tools_1.SetViewMcpToolHandler.NAME
+            count_elements_mcp_tool_handler_1.CountElementsMcpToolHandler.NAME,
+            element_types_mcp_tool_handler_1.ElementTypesMcpToolHandler.NAME,
+            diagram_model_mcp_tool_handler_1.DiagramModelMcpToolHandler.NAME,
+            query_elements_mcp_tool_handler_1.QueryElementsMcpToolHandler.NAME,
+            set_selection_mcp_tool_handler_1.SetSelectionMcpToolHandler.NAME,
+            set_view_mcp_tool_handler_1.SetViewMcpToolHandler.NAME
         ];
     }
     createResult(args) {
-        const sessionId = (0, server_2.resolveActiveSessionId)(this.clientSessionManager, args.sessionId);
+        const sessionId = (0, mcp_handler_shared_1.resolveActiveSessionId)(this.clientSessionManager, args.sessionId);
         const text = `Describe the diagram for session \`${sessionId}\`. Include:\n\n` +
-            `1. **Overview** — diagram type and total element count (use \`${tools_1.CountElementsMcpToolHandler.NAME}\`).\n` +
+            `1. **Overview** — diagram type and total element count (use \`${count_elements_mcp_tool_handler_1.CountElementsMcpToolHandler.NAME}\`).\n` +
             `2. **Element-type breakdown** — what kinds of elements are present and how many of each ` +
-            `(use \`${tools_1.ElementTypesMcpToolHandler.NAME}\` and \`${tools_1.CountElementsMcpToolHandler.NAME}\`).\n` +
-            `3. **Structure** — load the model with \`${tools_1.DiagramModelMcpToolHandler.NAME}\` and summarize the ` +
+            `(use \`${element_types_mcp_tool_handler_1.ElementTypesMcpToolHandler.NAME}\` and \`${count_elements_mcp_tool_handler_1.CountElementsMcpToolHandler.NAME}\`).\n` +
+            `3. **Structure** — load the model with \`${diagram_model_mcp_tool_handler_1.DiagramModelMcpToolHandler.NAME}\` and summarize the ` +
             `hierarchy and major connections.\n` +
             `4. **Notable elements** — call out anything that stands out (unconnected nodes, deeply ` +
-            `nested groups, missing labels). Use \`${tools_1.QueryElementsMcpToolHandler.NAME}\` to locate specific cases.\n\n` +
+            `nested groups, missing labels). Use \`${query_elements_mcp_tool_handler_1.QueryElementsMcpToolHandler.NAME}\` to locate specific cases.\n\n` +
             `Keep the description concise and skim-friendly. ` +
             `When mentioning an element, prefer its label or type, with the alias appended in parens — e.g. ` +
             `"the 'Brew' task (#7)" or "the decision node (#9)" — never the bare alias alone, since aliases mean nothing to the user. ` +
-            `Use \`${tools_1.SetSelectionMcpToolHandler.NAME}\` or \`${tools_1.SetViewMcpToolHandler.NAME} → 'center-on-elements'\` to draw the user's attention.`;
+            `Use \`${set_selection_mcp_tool_handler_1.SetSelectionMcpToolHandler.NAME}\` or \`${set_view_mcp_tool_handler_1.SetViewMcpToolHandler.NAME} → 'center-on-elements'\` to draw the user's attention.`;
         return { messages: [{ role: 'user', content: { type: 'text', text } }] };
     }
 };

package/lib/common/prompts/handlers/describe-diagram-mcp-prompt-handler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"describe-diagram-mcp-prompt-handler.js","sourceRoot":"","sources":["../../../../src/common/prompts/handlers/describe-diagram-mcp-prompt-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,iDAA4D;AAC5D,yCAA+C;AAC/C,4BAA4B;AAC5B,wEAA0F;AAC1F,wEAA2E;AAC3E,0GAAmG;AACnG,wGAAiG;AACjG,wGAAiG;AACjG,0GAAmG;AACnG,wGAAiG;AACjG,8FAAuF;AAE1E,QAAA,yBAAyB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9C,SAAS,EAAE,CAAC;SACP,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,4GAA4G,CAAC;CAC9H,CAAC,CAAC;AAGH;;;;;;;GAOG;AAEI,IAAM,+BAA+B,uCAArC,MAAM,+BAAgC,SAAQ,6CAA6C;IAA3F;;QAEM,SAAI,GAAG,iCAA+B,CAAC,IAAI,CAAC;QACnC,UAAK,GAAG,kBAAkB,CAAC;QACpC,gBAAW,GAChB,sEAAsE;YACtE,iHAAiH;YACjH,+CAA+C;YAC/C,yHAAyH;YACzH,8DAA8D,CAAC;QAC1D,eAAU,GAAG,iCAAyB,CAAC;IAgCpD,CAAC;IA5BY,mBAAmB;QACxB,OAAO;YACH,6DAA2B,CAAC,IAAI;YAChC,2DAA0B,CAAC,IAAI;YAC/B,2DAA0B,CAAC,IAAI;YAC/B,6DAA2B,CAAC,IAAI;YAChC,2DAA0B,CAAC,IAAI;YAC/B,iDAAqB,CAAC,IAAI;SAC7B,CAAC;IACN,CAAC;IAES,YAAY,CAAC,IAAyB;QAC5C,MAAM,SAAS,GAAG,IAAA,2CAAsB,EAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACpF,MAAM,IAAI,GACN,sCAAsC,SAAS,kBAAkB;YACjE,iEAAiE,6DAA2B,CAAC,IAAI,QAAQ;YACzG,0FAA0F;YAC1F,UAAU,2DAA0B,CAAC,IAAI,YAAY,6DAA2B,CAAC,IAAI,QAAQ;YAC7F,4CAA4C,2DAA0B,CAAC,IAAI,uBAAuB;YAClG,oCAAoC;YACpC,yFAAyF;YACzF,yCAAyC,6DAA2B,CAAC,IAAI,kCAAkC;YAC3G,kDAAkD;YAClD,iGAAiG;YACjG,2HAA2H;YAC3H,SAAS,2DAA0B,CAAC,IAAI,WAAW,iDAAqB,CAAC,IAAI,yDAAyD,CAAC;QAC3I,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;IAC7E,CAAC;;AAzCQ,0EAA+B;AACxB,oCAAI,GAAG,kBAAkB,AAArB,CAAsB;AAWF;IAAvC,IAAA,kBAAM,EAAC,6BAAoB,CAAC;;6EAAsD;0CAZ1E,+BAA+B;IAD3C,IAAA,sBAAU,GAAE;GACA,+BAA+B,CA0C3C"}

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

@@ -15,7 +15,8 @@
  ********************************************************************************/
 import { ClientSessionManager } from '@eclipse-glsp/server';
 import * as z from 'zod/v4';
-import { AbstractMcpPromptHandler, McpPromptResult } from '../../server';
+import { McpPromptResult } from '../../server/mcp-handler-shared';
+import { AbstractMcpPromptHandler } from '../../server/mcp-prompt-handler';
 export declare const SuggestImprovementsArgsSchema: z.ZodObject<{
     sessionId: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;

package/lib/common/prompts/handlers/suggest-improvements-mcp-prompt-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"suggest-improvements-mcp-prompt-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/prompts/handlers/suggest-improvements-mcp-prompt-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,eAAe,EAA0B,MAAM,iCAAiC,CAAC;AAC1F,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAM3E,eAAO,MAAM,6BAA6B;;iBAKxC,CAAC;AACH,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,6BAA6B,CAAC,CAAC;AAEpF;;;;;;;GAOG;AACH,qBACa,mCAAoC,SAAQ,wBAAwB,CAAC,uBAAuB,CAAC;IACtG,MAAM,CAAC,QAAQ,CAAC,IAAI,0BAA0B;IAC9C,QAAQ,CAAC,IAAI,0BAA4C;IACzD,SAAkB,KAAK,kCAAkC;IACzD,QAAQ,CAAC,WAAW,SAK+C;IACnE,QAAQ,CAAC,UAAU;;sBAAiC;IAEtB,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAE1E,mBAAmB,IAAI,MAAM,EAAE;IASxC,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,uBAAuB,GAAG,eAAe;CAkBzE"}

package/lib/{prompts → common/prompts}/handlers/suggest-improvements-mcp-prompt-handler.js

@@ -29,8 +29,12 @@ exports.SuggestImprovementsMcpPromptHandler = exports.SuggestImprovementsArgsSch
 const server_1 = require("@eclipse-glsp/server");
 const inversify_1 = require("inversify");
 const z = require("zod/v4");
-const server_2 = require("../../server");
-const tools_1 = require("../../tools");
+const mcp_handler_shared_1 = require("../../server/mcp-handler-shared");
+const mcp_prompt_handler_1 = require("../../server/mcp-prompt-handler");
+const diagram_model_mcp_tool_handler_1 = require("../../tools/handlers/diagram-model-mcp-tool-handler");
+const query_elements_mcp_tool_handler_1 = require("../../tools/handlers/query-elements-mcp-tool-handler");
+const set_selection_mcp_tool_handler_1 = require("../../tools/handlers/set-selection-mcp-tool-handler");
+const validate_diagram_mcp_tool_handler_1 = require("../../tools/handlers/validate-diagram-mcp-tool-handler");
 exports.SuggestImprovementsArgsSchema = z.object({
     sessionId: z
         .string()
@@ -45,7 +49,7 @@ exports.SuggestImprovementsArgsSchema = z.object({
  * Server-scope on purpose — the prompt itself has no per-session state, so we avoid forcing
  * the user to type a sessionId in the common single-diagram case.
  */
-let SuggestImprovementsMcpPromptHandler = SuggestImprovementsMcpPromptHandler_1 = class SuggestImprovementsMcpPromptHandler extends server_2.AbstractMcpPromptHandler {
+let SuggestImprovementsMcpPromptHandler = SuggestImprovementsMcpPromptHandler_1 = class SuggestImprovementsMcpPromptHandler extends mcp_prompt_handler_1.AbstractMcpPromptHandler {
     constructor() {
         super(...arguments);
         this.name = SuggestImprovementsMcpPromptHandler_1.NAME;
@@ -59,26 +63,26 @@ let SuggestImprovementsMcpPromptHandler = SuggestImprovementsMcpPromptHandler_1
     }
     referencedToolNames() {
         return [
-            tools_1.ValidateDiagramMcpToolHandler.NAME,
-            tools_1.DiagramModelMcpToolHandler.NAME,
-            tools_1.QueryElementsMcpToolHandler.NAME,
-            tools_1.SetSelectionMcpToolHandler.NAME
+            validate_diagram_mcp_tool_handler_1.ValidateDiagramMcpToolHandler.NAME,
+            diagram_model_mcp_tool_handler_1.DiagramModelMcpToolHandler.NAME,
+            query_elements_mcp_tool_handler_1.QueryElementsMcpToolHandler.NAME,
+            set_selection_mcp_tool_handler_1.SetSelectionMcpToolHandler.NAME
         ];
     }
     createResult(args) {
-        const sessionId = (0, server_2.resolveActiveSessionId)(this.clientSessionManager, args.sessionId);
+        const sessionId = (0, mcp_handler_shared_1.resolveActiveSessionId)(this.clientSessionManager, args.sessionId);
         const text = `Review the diagram for session \`${sessionId}\` and propose concrete improvements. Focus on:\n\n` +
-            `1. **Validation issues** — run \`${tools_1.ValidateDiagramMcpToolHandler.NAME}\` and surface any markers.\n` +
-            `2. **Connectivity** — load the model (\`${tools_1.DiagramModelMcpToolHandler.NAME}\`) and flag unconnected ` +
+            `1. **Validation issues** — run \`${validate_diagram_mcp_tool_handler_1.ValidateDiagramMcpToolHandler.NAME}\` and surface any markers.\n` +
+            `2. **Connectivity** — load the model (\`${diagram_model_mcp_tool_handler_1.DiagramModelMcpToolHandler.NAME}\`) and flag unconnected ` +
             `nodes or orphaned subgraphs.\n` +
-            `3. **Labelling** — use \`${tools_1.QueryElementsMcpToolHandler.NAME}\` to find nodes that lack a meaningful ` +
+            `3. **Labelling** — use \`${query_elements_mcp_tool_handler_1.QueryElementsMcpToolHandler.NAME}\` to find nodes that lack a meaningful ` +
             `label, and edges with missing or unclear text.\n` +
             `4. **Structure** — call out elements whose type or placement looks inconsistent with ` +
             `the rest of the diagram.\n\n` +
             `Group findings by severity (must-fix vs. nice-to-have). ` +
             `When naming elements, prefer their label or type with the alias in parens — e.g. ` +
             `"the 'Brew' task (#7)" or "the decision node (#9)" — never the bare alias alone, since aliases mean nothing to the user. ` +
-            `Point at each suggestion via \`${tools_1.SetSelectionMcpToolHandler.NAME}\` so the user can navigate. ` +
+            `Point at each suggestion via \`${set_selection_mcp_tool_handler_1.SetSelectionMcpToolHandler.NAME}\` so the user can navigate. ` +
             `Do not modify the diagram — only propose.`;
         return { messages: [{ role: 'user', content: { type: 'text', text } }] };
     }

package/lib/common/prompts/handlers/suggest-improvements-mcp-prompt-handler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"suggest-improvements-mcp-prompt-handler.js","sourceRoot":"","sources":["../../../../src/common/prompts/handlers/suggest-improvements-mcp-prompt-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,iDAA4D;AAC5D,yCAA+C;AAC/C,4BAA4B;AAC5B,wEAA0F;AAC1F,wEAA2E;AAC3E,wGAAiG;AACjG,0GAAmG;AACnG,wGAAiG;AACjG,8GAAuG;AAE1F,QAAA,6BAA6B,GAAG,CAAC,CAAC,MAAM,CAAC;IAClD,SAAS,EAAE,CAAC;SACP,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,4GAA4G,CAAC;CAC9H,CAAC,CAAC;AAGH;;;;;;;GAOG;AAEI,IAAM,mCAAmC,2CAAzC,MAAM,mCAAoC,SAAQ,6CAAiD;IAAnG;;QAEM,SAAI,GAAG,qCAAmC,CAAC,IAAI,CAAC;QACvC,UAAK,GAAG,8BAA8B,CAAC;QAChD,gBAAW,GAChB,+EAA+E;YAC/E,yGAAyG;YACzG,4GAA4G;YAC5G,iHAAiH;YACjH,8DAA8D,CAAC;QAC1D,eAAU,GAAG,qCAA6B,CAAC;IA+BxD,CAAC;IA3BY,mBAAmB;QACxB,OAAO;YACH,iEAA6B,CAAC,IAAI;YAClC,2DAA0B,CAAC,IAAI;YAC/B,6DAA2B,CAAC,IAAI;YAChC,2DAA0B,CAAC,IAAI;SAClC,CAAC;IACN,CAAC;IAES,YAAY,CAAC,IAA6B;QAChD,MAAM,SAAS,GAAG,IAAA,2CAAsB,EAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACpF,MAAM,IAAI,GACN,oCAAoC,SAAS,qDAAqD;YAClG,oCAAoC,iEAA6B,CAAC,IAAI,+BAA+B;YACrG,2CAA2C,2DAA0B,CAAC,IAAI,2BAA2B;YACrG,gCAAgC;YAChC,4BAA4B,6DAA2B,CAAC,IAAI,0CAA0C;YACtG,kDAAkD;YAClD,uFAAuF;YACvF,8BAA8B;YAC9B,0DAA0D;YAC1D,mFAAmF;YACnF,2HAA2H;YAC3H,kCAAkC,2DAA0B,CAAC,IAAI,+BAA+B;YAChG,2CAA2C,CAAC;QAChD,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;IAC7E,CAAC;;AAxCQ,kFAAmC;AAC5B,wCAAI,GAAG,sBAAsB,AAAzB,CAA0B;AAWN;IAAvC,IAAA,kBAAM,EAAC,6BAAoB,CAAC;;iFAAsD;8CAZ1E,mCAAmC;IAD/C,IAAA,sBAAU,GAAE;GACA,mCAAmC,CAyC/C"}

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

@@ -15,7 +15,10 @@
  ********************************************************************************/
 import { Role } from '@modelcontextprotocol/sdk/types.js';
 import * as z from 'zod/v4';
-import { AbstractMcpDiagramResourceHandler, McpMimeType, McpProgressReporter, McpResourceContent, McpResourceUri } from '../../server';
+import { McpResourceContent } from '../../server/mcp-handler-shared';
+import { McpMimeType } from '../../server/mcp-mime-types';
+import { McpProgressReporter } from '../../server/mcp-progress-reporter';
+import { AbstractMcpDiagramResourceHandler, McpResourceUri } from '../../server/mcp-resource-handler';
 export declare const DiagramPngInputSchema: z.ZodObject<{
     sessionId: z.ZodString;
     scale: z.ZodOptional<z.ZodNumber>;

package/lib/common/resources/handlers/diagram-png-mcp-resource-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"diagram-png-mcp-resource-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/resources/handlers/diagram-png-mcp-resource-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAE1D,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAgB,MAAM,iCAAiC,CAAC;AAEnF,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,iCAAiC,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEtG,eAAO,MAAM,qBAAqB;;;;;;iBA+BhC,CAAC;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEpE,yJAAyJ;AACzJ,qBACa,4BAA6B,SAAQ,iCAAiC,CAAC,eAAe,CAAC;IAChG,+GAA+G;IAC/G,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAQ;IAEnD;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAK;IAE5C,MAAM,CAAC,QAAQ,CAAC,IAAI,iBAAiB;IACrC,QAAQ,CAAC,IAAI,iBAAqC;IAClD,SAAkB,KAAK,uBAAuB;IAC9C,QAAQ,CAAC,WAAW,SAO4F;IAChH,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAe;IAC7C,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAmD;IAC/E,yGAAyG;IACzG,SAAkB,QAAQ,EAAE,IAAI,EAAE,CAAyB;IAC3D,0GAA0G;IAC1G,SAAkB,QAAQ,OAAO;IAIjC,SAAkB,0BAA0B;;;;;;sBAAyB;IAExC,SAAS,CAAC,QAAQ,EAAE,mBAAmB,CAAC;IAE1C,SAAS,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAEpE,gHAAgH;IACvG,WAAW,IAAI,OAAO;cAIf,YAAY,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAe/G;;;;;OAKG;IACH,SAAS,CAAC,WAAW,CACjB,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,MAAM,EAAE,MAAM,GAAG,SAAS,GAC3B;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;IAkBpC;;;;;OAKG;IACH,SAAS,CAAC,kBAAkB,IAAI;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;CAsBpE"}