@eclipse-glsp/server-mcp 2.8.0-next.1 → 2.8.0-next.12

package/lib/common/tools/handlers/set-selection-mcp-tool-handler.js

@@ -32,10 +32,12 @@ const z = require("zod/v4");
 const mcp_input_schemas_1 = require("../../server/mcp-input-schemas");
 const mcp_tool_handler_1 = require("../../server/mcp-tool-handler");
 exports.SetSelectionInputSchema = mcp_input_schemas_1.McpDiagramScopedInputSchema.extend({
-    selectedElementIds: mcp_input_schemas_1.elementIds
+    selectedElementIds: mcp_input_schemas_1.elementIdsAllowingEmpty
         .optional()
-        .describe('Element IDs to select. Pass an empty array (or omit + set `clear: true`) to clear the selection.'),
-    deselectedElementIds: mcp_input_schemas_1.elementIds.optional().describe('Element IDs to remove from the selection. Used to subtract without replacing.'),
+        .describe('Element IDs to select. Pass an empty array (or omit the field) together with `clear: true` to clear the selection.'),
+    deselectedElementIds: mcp_input_schemas_1.elementIdsAllowingEmpty
+        .optional()
+        .describe('Element IDs to remove from the selection. Used to subtract without replacing.'),
     clear: z
         .boolean()
         .optional()
@@ -54,7 +56,7 @@ exports.SetSelectionOutputSchema = z.object({
  * Read-write hint is honest: the viewport selection state is part of the client environment
  * even though the underlying GModel is unaffected.
  */
-let SetSelectionMcpToolHandler = SetSelectionMcpToolHandler_1 = class SetSelectionMcpToolHandler extends mcp_tool_handler_1.AbstractMcpDiagramToolHandler {
+let SetSelectionMcpToolHandler = class SetSelectionMcpToolHandler extends mcp_tool_handler_1.AbstractMcpDiagramToolHandler {
     constructor() {
         super(...arguments);
         this.name = SetSelectionMcpToolHandler_1.NAME;
@@ -66,6 +68,8 @@ let SetSelectionMcpToolHandler = SetSelectionMcpToolHandler_1 = class SetSelecti
         this.outputSchema = exports.SetSelectionOutputSchema;
         this.readOnlyHint = false;
     }
+    static { SetSelectionMcpToolHandler_1 = this; }
+    static { this.NAME = 'set-selection'; }
     async createResult({ selectedElementIds, deselectedElementIds, clear }) {
         const resolvedSelected = this.resolveExistingIds(selectedElementIds);
         const resolvedDeselected = this.resolveExistingIds(deselectedElementIds);
@@ -75,10 +79,10 @@ let SetSelectionMcpToolHandler = SetSelectionMcpToolHandler_1 = class SetSelecti
         if (resolvedSelected.length > 0 || resolvedDeselected.length > 0) {
             await this.actionDispatcher.dispatch(server_1.SelectAction.create({ selectedElementsIDs: resolvedSelected, deselectedElementsIDs: resolvedDeselected }));
         }
-        return this.success(this.summarize(resolvedSelected, resolvedDeselected, clear !== null && clear !== void 0 ? clear : false), {
+        return this.success(this.summarize(resolvedSelected, resolvedDeselected, clear ?? false), {
             selectedElementIds: this.encodeIds(resolvedSelected),
             deselectedElementIds: this.encodeIds(resolvedDeselected),
-            cleared: clear !== null && clear !== void 0 ? clear : false
+            cleared: clear ?? false
         });
     }
     summarize(selected, deselected, cleared) {
@@ -93,7 +97,6 @@ let SetSelectionMcpToolHandler = SetSelectionMcpToolHandler_1 = class SetSelecti
     }
 };
 exports.SetSelectionMcpToolHandler = SetSelectionMcpToolHandler;
-SetSelectionMcpToolHandler.NAME = 'set-selection';
 __decorate([
     (0, inversify_1.inject)(server_1.ActionDispatcher),
     __metadata("design:type", Object)

package/lib/common/tools/handlers/set-selection-mcp-tool-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"set-selection-mcp-tool-handler.js","sourceRoot":"","sources":["../../../../src/common/tools/handlers/set-selection-mcp-tool-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"set-selection-mcp-tool-handler.js","sourceRoot":"","sources":["../../../../src/common/tools/handlers/set-selection-mcp-tool-handler.ts"],"names":[],"mappings":"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"}

package/lib/common/tools/handlers/set-view-mcp-tool-handler.d.ts

@@ -51,7 +51,8 @@ export declare const SetViewOutputSchema: z.ZodObject<{
         zoom: z.ZodNumber;
     }, z.core.$strip>>;
 }, z.core.$strip>;
-export declare class SetViewMcpToolHandler extends AbstractMcpDiagramToolHandler<SetViewInput> {
+export type SetViewOutput = z.infer<typeof SetViewOutputSchema>;
+export declare class SetViewMcpToolHandler extends AbstractMcpDiagramToolHandler<SetViewInput, SetViewOutput> {
     /** Timeout (in ms) for the `GetViewportAction` round-trip used by `set-viewport` partial updates. Override via subclass + rebind. */
     protected readonly viewportQueryTimeoutMs: number;
     static readonly NAME = "set-view";

package/lib/common/tools/handlers/set-view-mcp-tool-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"set-view-mcp-tool-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/tools/handlers/set-view-mcp-tool-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EACN,gBAAgB,EAKhB,KAAK,EAER,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAgB,aAAa,EAAuB,MAAM,iCAAiC,CAAC;AAEnG,OAAO,EAAE,6BAA6B,EAAE,MAAM,+BAA+B,CAAC;AAE9E,eAAO,MAAM,gBAAgB,oFAAqF,CAAC;AACnH,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE/D,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;iBAsB7B,CAAC;AACH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE9D,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;iBAe9B,CAAC;AAEH,qBACa,qBAAsB,SAAQ,6BAA6B,CAAC,YAAY,CAAC;IAClF,qIAAqI;IACrI,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,MAAM,CAAQ;IAEzD,MAAM,CAAC,QAAQ,CAAC,IAAI,cAAc;IAClC,QAAQ,CAAC,IAAI,cAA8B;IAC3C,SAAkB,KAAK,0BAA0B;IACjD,QAAQ,CAAC,WAAW,SAO6F;IACjH,QAAQ,CAAC,WAAW;;;;;;;;;;;;;;sBAAsB;IAC1C,SAAkB,YAAY;;;;;;;;;;;;;;;sBAAuB;IACrD,oHAAoH;IACpH,SAAkB,YAAY,SAAS;IAEb,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;cAEvD,YAAY,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAUxG;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,MAAM;IAW3G;;;;;OAKG;cACa,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,KAAK,GAAG,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;CAsBrH"}
+{"version":3,"file":"set-view-mcp-tool-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/tools/handlers/set-view-mcp-tool-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,MAAM,EACN,gBAAgB,EAKhB,KAAK,EAER,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAgB,aAAa,EAAuB,MAAM,iCAAiC,CAAC;AAEnG,OAAO,EAAE,6BAA6B,EAAE,MAAM,+BAA+B,CAAC;AAE9E,eAAO,MAAM,gBAAgB,oFAAqF,CAAC;AACnH,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE/D,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;iBAsB7B,CAAC;AACH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE9D,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;iBAe9B,CAAC;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,qBACa,qBAAsB,SAAQ,6BAA6B,CAAC,YAAY,EAAE,aAAa,CAAC;IACjG,qIAAqI;IACrI,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,MAAM,CAAQ;IAEzD,MAAM,CAAC,QAAQ,CAAC,IAAI,cAAc;IAClC,QAAQ,CAAC,IAAI,cAA8B;IAC3C,SAAkB,KAAK,0BAA0B;IACjD,QAAQ,CAAC,WAAW,SAO6F;IACjH,QAAQ,CAAC,WAAW;;;;;;;;;;;;;;sBAAsB;IAC1C,SAAkB,YAAY;;;;;;;;;;;;;;;sBAAuB;IACrD,oHAAoH;IACpH,SAAkB,YAAY,SAAS;IAEb,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;cAEvD,YAAY,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAUxG;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,EAAE,cAAc,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,MAAM;IAW3G;;;;;OAKG;cACa,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,KAAK,GAAG,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;CAsBrH"}

package/lib/common/tools/handlers/set-view-mcp-tool-handler.js

@@ -64,7 +64,7 @@ exports.SetViewOutputSchema = z.object({
         .optional()
         .describe("Resolved final viewport when `action: 'set-viewport'` was applied (current values merged with the supplied overrides).")
 });
-let SetViewMcpToolHandler = SetViewMcpToolHandler_1 = class SetViewMcpToolHandler extends mcp_tool_handler_1.AbstractMcpDiagramToolHandler {
+let SetViewMcpToolHandler = class SetViewMcpToolHandler extends mcp_tool_handler_1.AbstractMcpDiagramToolHandler {
     constructor() {
         super(...arguments);
         /** Timeout (in ms) for the `GetViewportAction` round-trip used by `set-viewport` partial updates. Override via subclass + rebind. */
@@ -83,11 +83,13 @@ let SetViewMcpToolHandler = SetViewMcpToolHandler_1 = class SetViewMcpToolHandle
         /** Viewport IS client-side environment; dispatching mutates it, so the read-base default doesn't honestly apply. */
         this.readOnlyHint = false;
     }
+    static { SetViewMcpToolHandler_1 = this; }
+    static { this.NAME = 'set-view'; }
     async createResult({ action, elementIds, zoom, scroll }) {
         if (action === 'set-viewport') {
             return this.applyExplicitViewport(zoom, scroll);
         }
-        const resolvedIds = elementIds ? elementIds.map(id => this.aliasService.lookup(id)) : this.modelState.index.allIds();
+        const resolvedIds = elementIds ? this.resolveExistingIds(elementIds) : this.modelState.index.allIds();
         const dispatchAction = this.buildIntentAction(action, resolvedIds);
         await this.actionDispatcher.dispatch(dispatchAction);
         return this.success('Viewport successfully changed', { action, targetIds: this.encodeIds(resolvedIds) });
@@ -122,8 +124,8 @@ let SetViewMcpToolHandler = SetViewMcpToolHandler_1 = class SetViewMcpToolHandle
         const current = await (0, mcp_handler_shared_1.requestActionOrFail)(this.actionDispatcher, server_1.GetViewportAction.create(), this.viewportQueryTimeoutMs, this.name);
         // Some clients respond before layout completes — fall back to origin / 1× when fields are null.
         const newViewport = {
-            scroll: scroll !== null && scroll !== void 0 ? scroll : (server_1.Point.isValid(current.viewport.scroll) ? current.viewport.scroll : server_1.Point.ORIGIN),
-            zoom: zoom !== null && zoom !== void 0 ? zoom : (Number.isFinite(current.viewport.zoom) ? current.viewport.zoom : 1)
+            scroll: scroll ?? (server_1.Point.isValid(current.viewport.scroll) ? current.viewport.scroll : server_1.Point.ORIGIN),
+            zoom: zoom ?? (Number.isFinite(current.viewport.zoom) ? current.viewport.zoom : 1)
         };
         await this.actionDispatcher.dispatch(server_1.SetViewportAction.create(rootId, newViewport, { animate: true }));
         return this.success(`Viewport set to scroll=(${newViewport.scroll.x}, ${newViewport.scroll.y}) zoom=${newViewport.zoom}`, {
@@ -133,7 +135,6 @@ let SetViewMcpToolHandler = SetViewMcpToolHandler_1 = class SetViewMcpToolHandle
     }
 };
 exports.SetViewMcpToolHandler = SetViewMcpToolHandler;
-SetViewMcpToolHandler.NAME = 'set-view';
 __decorate([
     (0, inversify_1.inject)(server_1.ActionDispatcher),
     __metadata("design:type", Object)

package/lib/common/tools/handlers/set-view-mcp-tool-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"set-view-mcp-tool-handler.js","sourceRoot":"","sources":["../../../../src/common/tools/handlers/set-view-mcp-tool-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"set-view-mcp-tool-handler.js","sourceRoot":"","sources":["../../../../src/common/tools/handlers/set-view-mcp-tool-handler.ts"],"names":[],"mappings":"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"}

package/lib/common/tools/handlers/undo-mcp-tool-handler.d.ts

@@ -25,10 +25,11 @@ export type UndoInput = z.infer<typeof UndoInputSchema>;
 export declare const UndoOutputSchema: z.ZodObject<{
     commandsUndone: z.ZodNumber;
 }, z.core.$strip>;
+export type UndoOutput = z.infer<typeof UndoOutputSchema>;
 /**
  * Undo a given number of the most recent actions on the command stack.
  */
-export declare class UndoMcpToolHandler extends OperationMcpDiagramToolHandler<UndoInput> {
+export declare class UndoMcpToolHandler extends OperationMcpDiagramToolHandler<UndoInput, UndoOutput> {
     static readonly NAME = "undo";
     readonly name = "undo";
     readonly title = "Undo Diagram Commands";

package/lib/common/tools/handlers/undo-mcp-tool-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"undo-mcp-tool-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/tools/handlers/undo-mcp-tool-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,YAAY,EAAc,MAAM,sBAAsB,CAAC;AAEhE,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAgB,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAE9E,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAE/E,eAAO,MAAM,eAAe;;;iBAE1B,CAAC;AACH,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAExD,eAAO,MAAM,gBAAgB;;iBAE3B,CAAC;AAEH;;GAEG;AACH,qBACa,kBAAmB,SAAQ,8BAA8B,CAAC,SAAS,CAAC;IAC7E,MAAM,CAAC,QAAQ,CAAC,IAAI,UAAU;IAC9B,QAAQ,CAAC,IAAI,UAA2B;IACxC,SAAkB,KAAK,2BAA2B;IAClD,QAAQ,CAAC,WAAW,SAK2E;IAC/F,QAAQ,CAAC,WAAW;;;sBAAmB;IACvC,SAAkB,YAAY;;sBAAoB;IAE5B,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;cAE3C,YAAY,CAAC,EAAE,cAAc,EAAE,EAAE,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;CAWtF"}
+{"version":3,"file":"undo-mcp-tool-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/tools/handlers/undo-mcp-tool-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,YAAY,EAAc,MAAM,sBAAsB,CAAC;AAEhE,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAgB,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAE9E,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAE/E,eAAO,MAAM,eAAe;;;iBAE1B,CAAC;AACH,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAExD,eAAO,MAAM,gBAAgB;;iBAE3B,CAAC;AACH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D;;GAEG;AACH,qBACa,kBAAmB,SAAQ,8BAA8B,CAAC,SAAS,EAAE,UAAU,CAAC;IACzF,MAAM,CAAC,QAAQ,CAAC,IAAI,UAAU;IAC9B,QAAQ,CAAC,IAAI,UAA2B;IACxC,SAAkB,KAAK,2BAA2B;IAClD,QAAQ,CAAC,WAAW,SAK2E;IAC/F,QAAQ,CAAC,WAAW;;;sBAAmB;IACvC,SAAkB,YAAY;;sBAAoB;IAE5B,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;cAE3C,YAAY,CAAC,EAAE,cAAc,EAAE,EAAE,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC;CAetF"}

package/lib/common/tools/handlers/undo-mcp-tool-handler.js

@@ -33,7 +33,7 @@ const mcp_handler_shared_1 = require("../../server/mcp-handler-shared");
 const mcp_input_schemas_1 = require("../../server/mcp-input-schemas");
 const mcp_tool_handler_1 = require("../../server/mcp-tool-handler");
 exports.UndoInputSchema = mcp_input_schemas_1.McpDiagramScopedInputSchema.extend({
-    commandsToUndo: z.number().min(1).default(1).describe('Number of commands to undo. Defaults to 1 (most recent command).')
+    commandsToUndo: z.number().int().min(1).default(1).describe('Number of commands to undo. Defaults to 1 (most recent command).')
 });
 exports.UndoOutputSchema = z.object({
     commandsUndone: z.number().int().describe('Number of commands actually reverted.')
@@ -41,7 +41,7 @@ exports.UndoOutputSchema = z.object({
 /**
  * Undo a given number of the most recent actions on the command stack.
  */
-let UndoMcpToolHandler = UndoMcpToolHandler_1 = class UndoMcpToolHandler extends mcp_tool_handler_1.OperationMcpDiagramToolHandler {
+let UndoMcpToolHandler = class UndoMcpToolHandler extends mcp_tool_handler_1.OperationMcpDiagramToolHandler {
     constructor() {
         super(...arguments);
         this.name = UndoMcpToolHandler_1.NAME;
@@ -54,18 +54,23 @@ let UndoMcpToolHandler = UndoMcpToolHandler_1 = class UndoMcpToolHandler extends
         this.inputSchema = exports.UndoInputSchema;
         this.outputSchema = exports.UndoOutputSchema;
     }
+    static { UndoMcpToolHandler_1 = this; }
+    static { this.NAME = 'undo'; }
     async createResult({ commandsToUndo }) {
         if (!this.commandStack.canUndo()) {
             throw new mcp_handler_shared_1.McpToolError('Nothing to undo (undo stack is empty; the model is at its initial state for this session).');
         }
-        for (let i = 0; i < commandsToUndo; i++) {
+        // The stack may hold fewer commands than requested.
+        let commandsUndone = 0;
+        while (commandsUndone < commandsToUndo && this.commandStack.canUndo()) {
             await this.actionDispatcher.dispatch(server_1.UndoAction.create());
+            commandsUndone++;
         }
-        return this.success('Undo successful', { commandsUndone: commandsToUndo });
+        const shortfall = commandsUndone < commandsToUndo ? ` (${commandsToUndo} requested; the undo stack held no more commands)` : '';
+        return this.success(`Undo successful: reverted ${commandsUndone} command(s)${shortfall}`, { commandsUndone });
     }
 };
 exports.UndoMcpToolHandler = UndoMcpToolHandler;
-UndoMcpToolHandler.NAME = 'undo';
 __decorate([
     (0, inversify_1.inject)(server_1.CommandStack),
     __metadata("design:type", Object)

package/lib/common/tools/handlers/undo-mcp-tool-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"undo-mcp-tool-handler.js","sourceRoot":"","sources":["../../../../src/common/tools/handlers/undo-mcp-tool-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,iDAAgE;AAChE,yCAA+C;AAC/C,4BAA4B;AAC5B,wEAA8E;AAC9E,sEAA6E;AAC7E,oEAA+E;AAElE,QAAA,eAAe,GAAG,+CAA2B,CAAC,MAAM,CAAC;IAC9D,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,kEAAkE,CAAC;CAC5H,CAAC,CAAC;AAGU,QAAA,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,uCAAuC,CAAC;CACrF,CAAC,CAAC;AAEH;;GAEG;AAEI,IAAM,kBAAkB,0BAAxB,MAAM,kBAAmB,SAAQ,iDAAyC;IAA1E;;QAEM,SAAI,GAAG,oBAAkB,CAAC,IAAI,CAAC;QACtB,UAAK,GAAG,uBAAuB,CAAC;QACzC,gBAAW,GAChB,uDAAuD;YACvD,kGAAkG;YAClG,gIAAgI;YAChI,oGAAoG;YACpG,0FAA0F,CAAC;QACtF,gBAAW,GAAG,uBAAe,CAAC;QACrB,iBAAY,GAAG,wBAAgB,CAAC;IAetD,CAAC;IAXa,KAAK,CAAC,YAAY,CAAC,EAAE,cAAc,EAAa;QACtD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC;YAC/B,MAAM,IAAI,iCAAY,CAAC,4FAA4F,CAAC,CAAC;QACzH,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,CAAC,EAAE,EAAE,CAAC;YACtC,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,mBAAU,CAAC,MAAM,EAAE,CAAC,CAAC;QAC9D,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,cAAc,EAAE,cAAc,EAAE,CAAC,CAAC;IAC/E,CAAC;;AAzBQ,gDAAkB;AACX,uBAAI,GAAG,MAAM,AAAT,CAAU;AAYE;IAA/B,IAAA,kBAAM,EAAC,qBAAY,CAAC;;wDAAsC;6BAblD,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;GACA,kBAAkB,CA0B9B"}
+{"version":3,"file":"undo-mcp-tool-handler.js","sourceRoot":"","sources":["../../../../src/common/tools/handlers/undo-mcp-tool-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,iDAAgE;AAChE,yCAA+C;AAC/C,4BAA4B;AAC5B,wEAA8E;AAC9E,sEAA6E;AAC7E,oEAA+E;AAElE,QAAA,eAAe,GAAG,+CAA2B,CAAC,MAAM,CAAC;IAC9D,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,kEAAkE,CAAC;CAClI,CAAC,CAAC;AAGU,QAAA,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,uCAAuC,CAAC;CACrF,CAAC,CAAC;AAGH;;GAEG;AAEI,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,iDAAqD;IAAtF;;QAEM,SAAI,GAAG,oBAAkB,CAAC,IAAI,CAAC;QACtB,UAAK,GAAG,uBAAuB,CAAC;QACzC,gBAAW,GAChB,uDAAuD;YACvD,kGAAkG;YAClG,gIAAgI;YAChI,oGAAoG;YACpG,0FAA0F,CAAC;QACtF,gBAAW,GAAG,uBAAe,CAAC;QACrB,iBAAY,GAAG,wBAAgB,CAAC;IAmBtD,CAAC;;aA7BmB,SAAI,GAAG,MAAM,AAAT,CAAU;IAcpB,KAAK,CAAC,YAAY,CAAC,EAAE,cAAc,EAAa;QACtD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC;YAC/B,MAAM,IAAI,iCAAY,CAAC,4FAA4F,CAAC,CAAC;QACzH,CAAC;QAED,oDAAoD;QACpD,IAAI,cAAc,GAAG,CAAC,CAAC;QACvB,OAAO,cAAc,GAAG,cAAc,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC;YACpE,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,mBAAU,CAAC,MAAM,EAAE,CAAC,CAAC;YAC1D,cAAc,EAAE,CAAC;QACrB,CAAC;QAED,MAAM,SAAS,GAAG,cAAc,GAAG,cAAc,CAAC,CAAC,CAAC,KAAK,cAAc,mDAAmD,CAAC,CAAC,CAAC,EAAE,CAAC;QAChI,OAAO,IAAI,CAAC,OAAO,CAAC,6BAA6B,cAAc,cAAc,SAAS,EAAE,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;IAClH,CAAC;;AA7BQ,gDAAkB;AAaK;IAA/B,IAAA,kBAAM,EAAC,qBAAY,CAAC;;wDAAsC;6BAblD,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;GACA,kBAAkB,CA8B9B"}

package/lib/common/tools/handlers/validate-diagram-mcp-tool-handler.d.ts

@@ -34,7 +34,8 @@ export declare const ValidateDiagramOutputSchema: z.ZodObject<{
         elementId: z.ZodString;
     }, z.core.$strip>>;
 }, z.core.$strip>;
-export declare class ValidateDiagramMcpToolHandler extends AbstractMcpDiagramToolHandler<ValidateDiagramInput> {
+export type ValidateDiagramOutput = z.infer<typeof ValidateDiagramOutputSchema>;
+export declare class ValidateDiagramMcpToolHandler extends AbstractMcpDiagramToolHandler<ValidateDiagramInput, ValidateDiagramOutput> {
     static readonly NAME = "validate-diagram";
     readonly name = "validate-diagram";
     readonly title = "Validate Diagram";

package/lib/common/tools/handlers/validate-diagram-mcp-tool-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate-diagram-mcp-tool-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/tools/handlers/validate-diagram-mcp-tool-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAiB,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAErE,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAgB,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAE9E,OAAO,EAAE,6BAA6B,EAAE,MAAM,+BAA+B,CAAC;AAG9E,eAAO,MAAM,0BAA0B;;;;;;;iBAWrC,CAAC;AACH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAE9E,eAAO,MAAM,2BAA2B;;;;;;;iBAStC,CAAC;AAEH,qBACa,6BAA8B,SAAQ,6BAA6B,CAAC,oBAAoB,CAAC;IAClG,MAAM,CAAC,QAAQ,CAAC,IAAI,sBAAsB;IAC1C,QAAQ,CAAC,IAAI,sBAAsC;IACnD,SAAkB,KAAK,sBAAsB;IAC7C,QAAQ,CAAC,WAAW,SAM4G;IAChI,QAAQ,CAAC,WAAW;;;;;;;sBAA8B;IAClD,SAAkB,YAAY;;;;;;;sBAA+B;IAEzB,SAAS,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC;cAEzD,YAAY,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC;IAyBlG,SAAS,CAAC,kBAAkB,CAAC,CAAC,SAAS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE;CAWrI"}
+{"version":3,"file":"validate-diagram-mcp-tool-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/tools/handlers/validate-diagram-mcp-tool-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAiB,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAErE,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAgB,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAE9E,OAAO,EAAE,6BAA6B,EAAE,MAAM,+BAA+B,CAAC;AAG9E,eAAO,MAAM,0BAA0B;;;;;;;iBAWrC,CAAC;AACH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAE9E,eAAO,MAAM,2BAA2B;;;;;;;iBAStC,CAAC;AACH,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAC;AAEhF,qBACa,6BAA8B,SAAQ,6BAA6B,CAAC,oBAAoB,EAAE,qBAAqB,CAAC;IACzH,MAAM,CAAC,QAAQ,CAAC,IAAI,sBAAsB;IAC1C,QAAQ,CAAC,IAAI,sBAAsC;IACnD,SAAkB,KAAK,sBAAsB;IAC7C,QAAQ,CAAC,WAAW,SAM4G;IAChI,QAAQ,CAAC,WAAW;;;;;;;sBAA8B;IAClD,SAAkB,YAAY;;;;;;;sBAA+B;IAEzB,SAAS,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC;cAEzD,YAAY,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC;IAyBlG,SAAS,CAAC,kBAAkB,CAAC,CAAC,SAAS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE;CAWrI"}

package/lib/common/tools/handlers/validate-diagram-mcp-tool-handler.js.map

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

package/lib/common/util/markdown-util.js

@@ -29,8 +29,7 @@ function objectArrayToMarkdownTable(data) {
     const dataRows = data.map((obj) => {
         const rowString = headers
             .map(header => {
-            var _a;
-            const value = (_a = obj[header]) !== null && _a !== void 0 ? _a : '';
+            const value = obj[header] ?? '';
             if (typeof value === 'object') {
                 return JSON.stringify(value).replace(/["{}|]/g, '');
             }

package/lib/common/util/markdown-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"markdown-util.js","sourceRoot":"","sources":["../../../src/common/util/markdown-util.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;AAKlF,gEAwBC;AA3BD;;GAEG;AACH,SAAgB,0BAA0B,CAAC,IAA2B;IAClE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACf,OAAO,EAAE,CAAC;IACd,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IAC/C,MAAM,YAAY,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IAEnE,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAwB,EAAE,EAAE;QACnD,MAAM,SAAS,GAAG,OAAO;aACpB,GAAG,CAAC,MAAM,CAAC,EAAE;;YACV,MAAM,KAAK,GAAG,MAAA,GAAG,CAAC,MAAM,CAAC,mCAAI,EAAE,CAAC;YAChC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YACxD,CAAC;YACD,+EAA+E;YAC/E,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC/C,CAAC,CAAC;aACD,IAAI,CAAC,KAAK,CAAC,CAAC;QACjB,OAAO,KAAK,SAAS,IAAI,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,SAAS,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC7D,CAAC"}
+{"version":3,"file":"markdown-util.js","sourceRoot":"","sources":["../../../src/common/util/markdown-util.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;AAKlF,gEAwBC;AA3BD;;GAEG;AACH,SAAgB,0BAA0B,CAAC,IAA2B;IAClE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACf,OAAO,EAAE,CAAC;IACd,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IAC/C,MAAM,YAAY,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IAEnE,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAwB,EAAE,EAAE;QACnD,MAAM,SAAS,GAAG,OAAO;aACpB,GAAG,CAAC,MAAM,CAAC,EAAE;YACV,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAChC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YACxD,CAAC;YACD,+EAA+E;YAC/E,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC/C,CAAC,CAAC;aACD,IAAI,CAAC,KAAK,CAAC,CAAC;QACjB,OAAO,KAAK,SAAS,IAAI,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,SAAS,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC7D,CAAC"}

package/lib/node/modules/node-mcp-server-module.js

@@ -30,6 +30,14 @@ const node_mcp_request_context_1 = require("../server/node-mcp-request-context")
  * experimental status.
  */
 class NodeMcpServerModule extends abstract_mcp_server_module_1.AbstractMcpServerModule {
+    static { this.DEFAULT_OPTIONS = {
+        ...abstract_mcp_server_module_1.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 = {}) {
         super({ ...NodeMcpServerModule.DEFAULT_OPTIONS, ...overrides });
     }
@@ -41,12 +49,4 @@ class NodeMcpServerModule extends abstract_mcp_server_module_1.AbstractMcpServer
     }
 }
 exports.NodeMcpServerModule = NodeMcpServerModule;
-NodeMcpServerModule.DEFAULT_OPTIONS = {
-    ...abstract_mcp_server_module_1.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.
-};
 //# sourceMappingURL=node-mcp-server-module.js.map

package/lib/node/modules/node-mcp-server-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"node-mcp-server-module.js","sourceRoot":"","sources":["../../../src/node/modules/node-mcp-server-module.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAGlF,gGAA+G;AAI/G,iFAA2E;AAC3E,iFAA2E;AAE3E;;;;;;;;;GASG;AACH,MAAa,mBAAoB,SAAQ,oDAAuB;IAU5D,YAAY,YAA+B,EAAE;QACzC,KAAK,CAAC,EAAE,GAAG,mBAAmB,CAAC,eAAe,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC;IACpE,CAAC;IAEkB,qBAAqB;QACpC,OAAO,gDAAqB,CAAC;IACjC,CAAC;IAEkB,qBAAqB;QACpC,OAAO,gDAAqB,CAAC;IACjC,CAAC;;AApBL,kDAqBC;AApBmB,mCAAe,GAAsB;IACjD,GAAG,gDAAmB;IACtB,IAAI,EAAE,WAAW;IACjB,YAAY,EAAE,CAAC,WAAW,EAAE,WAAW,CAAC;IACxC,yFAAyF;IACzF,iFAAiF;IACjF,gFAAgF;CACnF,CAAC"}
+{"version":3,"file":"node-mcp-server-module.js","sourceRoot":"","sources":["../../../src/node/modules/node-mcp-server-module.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAGlF,gGAA+G;AAI/G,iFAA2E;AAC3E,iFAA2E;AAE3E;;;;;;;;;GASG;AACH,MAAa,mBAAoB,SAAQ,oDAAuB;aAC5C,oBAAe,GAAsB;QACjD,GAAG,gDAAmB;QACtB,IAAI,EAAE,WAAW;QACjB,YAAY,EAAE,CAAC,WAAW,EAAE,WAAW,CAAC;QACxC,yFAAyF;QACzF,iFAAiF;QACjF,gFAAgF;KACnF,CAAC;IAEF,YAAY,YAA+B,EAAE;QACzC,KAAK,CAAC,EAAE,GAAG,mBAAmB,CAAC,eAAe,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC;IACpE,CAAC;IAEkB,qBAAqB;QACpC,OAAO,gDAAqB,CAAC;IACjC,CAAC;IAEkB,qBAAqB;QACpC,OAAO,gDAAqB,CAAC;IACjC,CAAC;;AApBL,kDAqBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/server-mcp",
-  "version": "2.8.0-next.1+ab013b0",
+  "version": "2.8.0-next.12",
   "description": "Model Context Protocol (MCP) server for the GLSP TypeScript server — runs on Node, browser, and Fetch-API runtimes",
   "keywords": [
     "eclipse",
@@ -42,28 +42,28 @@
     "browser.js",
     "browser.d.ts",
     "common.js",
-    "common.d.ts"
+    "common.d.ts",
+    "!**/*.spec.ts",
+    "!**/*.spec.tsx",
+    "!**/test/**"
   ],
-  "scripts": {
-    "build": "tsc -b",
-    "clean": "rimraf lib *.tsbuildinfo coverage .nyc_output",
-    "generate:index": "glsp generateIndex src/browser src/common src/node -f -s",
-    "lint": "eslint --ext .ts,.tsx ./src",
-    "test": "mocha --config ../../.mocharc \"./src/**/*.spec.?(ts|tsx)\"",
-    "test:ci": "yarn test --reporter mocha-ctrf-json-reporter",
-    "test:coverage": "nyc yarn test",
-    "watch": "tsc -w"
-  },
   "dependencies": {
-    "@eclipse-glsp/server": "2.8.0-next.1+ab013b0",
     "@hono/node-server": "^1.19.9",
-    "@modelcontextprotocol/sdk": "^1.29.0"
+    "@modelcontextprotocol/sdk": "^1.29.0",
+    "zod": "^4.0.0",
+    "@eclipse-glsp/server": "2.8.0-next.12"
   },
   "peerDependencies": {
-    "inversify": "^6.1.3"
+    "inversify": "^6.1.3",
+    "reflect-metadata": "^0.2.2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ab013b0c1f1fce1734182e324ea9f915d50f92a6"
-}
+  "scripts": {
+    "build": "tsc -b",
+    "clean": "rimraf lib *.tsbuildinfo coverage",
+    "generate:index": "glsp generateIndex src/browser src/common src/node -f -s",
+    "lint": "eslint --ext .ts,.tsx ./src"
+  }
+}

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

@@ -14,16 +14,16 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { McpServerOptions as McpServerOptionsType } from '@eclipse-glsp/protocol';
-import { BindingContext } from '@eclipse-glsp/protocol/lib/di';
 import {
     AbstractMultiBinding,
     applyBindingTarget,
+    BindingContext,
     BindingTarget,
     GLSPModule,
     GLSPServerInitializer,
     GLSPServerListener,
-    Logger
+    Logger,
+    McpServerOptions as McpServerOptionsType
 } from '@eclipse-glsp/server';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { interfaces } from 'inversify';

package/src/common/modules/mcp-diagram-module.ts

@@ -215,7 +215,7 @@ export abstract class AbstractMcpDiagramModule extends GLSPModule {
         binding.add(GetSelectionMcpToolHandler);
         binding.add(SetSelectionMcpToolHandler);
         binding.add(SetViewMcpToolHandler);
-        // Auto-skips at session-open via `canRegister()` when no `LayoutEngine` is bound.
+        // Auto-skips via `isSupportedByDiagramType()` when no `LayoutEngine` is bound.
         binding.add(LayoutMcpToolHandler);
     }
 

package/src/common/resources/services/element-types-provider.ts

@@ -14,9 +14,10 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { CreateEdgeOperation, CreateNodeOperation } from '@eclipse-glsp/protocol';
 import {
+    CreateEdgeOperation,
     CreateEdgeOperationHandler,
+    CreateNodeOperation,
     CreateNodeOperationHandler,
     CreateOperationHandler,
     Logger,

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

@@ -14,8 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { GModelElement } from '@eclipse-glsp/graph';
-import { Dimension, GModelSerializer, Logger, Point } from '@eclipse-glsp/server';
+import { Dimension, GModelElement, 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';

package/src/common/server/abstract-mcp-server-launcher.ts

@@ -14,7 +14,6 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { McpServerOptions as McpServerOptionsType } from '@eclipse-glsp/protocol';
 import {
     ClientSessionListener,
     ClientSessionManager,
@@ -30,14 +29,15 @@ import {
     McpInitializeParameters,
     McpInitializeResult,
     McpServerConfiguration,
-    McpServerInitOptions
+    McpServerInitOptions,
+    McpServerOptions as McpServerOptionsType
 } from '@eclipse-glsp/server';
 import { AuthInfo } from '@modelcontextprotocol/sdk/server/auth/types.js';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { WebStandardStreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js';
 import {
-    ServerCapabilities,
     SUPPORTED_PROTOCOL_VERSIONS,
+    ServerCapabilities,
     SetLevelRequestSchema,
     isInitializeRequest
 } from '@modelcontextprotocol/sdk/types.js';

package/src/common/server/glsp-mcp-server.ts

@@ -45,7 +45,8 @@ const KEEP_ALIVE_PING_TIMEOUT_MS = 5_000;
  * registration; the launcher disposes it on session-close and on server shutdown.
  */
 export interface GLSPMcpServer
-    extends Pick<McpServer, 'registerPrompt' | 'registerResource' | 'registerTool' | 'sendLoggingMessage' | 'isConnected' | 'connect'>,
+    extends
+        Pick<McpServer, 'registerPrompt' | 'registerResource' | 'registerTool' | 'sendLoggingMessage' | 'isConnected' | 'connect'>,
         Disposable {
     readonly options: McpServerOptions;
 

package/src/common/server/mcp-diagram-handler-dispatcher.ts

@@ -37,6 +37,11 @@ import { McpRequestContext, NoopMcpRequestContext } from './mcp-request-context'
 import { AbstractMcpDiagramResourceHandler, McpDiagramResourceHandlerConstructor, toParams } from './mcp-resource-handler';
 import { BaseMcpDiagramToolHandler, McpDiagramToolHandlerConstructor } from './mcp-tool-handler';
 
+/** The diagram-type support hook shared by the diagram-scope tool and resource handler bases. */
+interface DiagramTypeSupportAware {
+    isSupportedByDiagramType(): boolean;
+}
+
 /**
  * Per-diagram-type catalog of constructor lists, harvested at MCP-server start by loading each
  * diagram type's modules onto a temporary child container — same pattern as
@@ -97,11 +102,13 @@ export class DefaultMcpDiagramHandlerDispatcher implements McpDiagramHandlerDisp
 
     /**
      * Build the per-diagram-type catalog by inspecting each diagram type's module set. We don't
-     * have a real GLSP session yet — and we don't want one, because we only need the bound
+     * have a real GLSP session yet — and we don't want one, because we mostly need the bound
      * constructor *lists*, not instances. So we spin up a throwaway child container per diagram
      * type, load its modules plus a placeholder session module, and read out the multi-binding
-     * constants. No handler is instantiated; the temporary container is unbound immediately
-     * after.
+     * constants. The temporary container is unbound immediately after.
+     *
+     * Only handlers that override `isSupportedByDiagramType` are instantiated, so a handler with
+     * a `@postConstruct` sees this probe just because it opted into the support gate.
      *
      * The placeholder session module is bound with the synthetic {@link TEMPORARY_CLIENT_ID} so
      * any session-scoped `@inject(ClientId)` in module-load wiring resolves cleanly. Diagram
@@ -123,8 +130,18 @@ export class DefaultMcpDiagramHandlerDispatcher implements McpDiagramHandlerDisp
         for (const [diagramType, modules] of this.diagramModules) {
             const tempContainer = this.serverContainer.createChild();
             tempContainer.load(...modules, placeholderSessionModule);
-            const tools = getConstructorList<McpDiagramToolHandlerConstructor>(tempContainer, McpDiagramToolHandlerConstructor);
-            const resources = getConstructorList<McpDiagramResourceHandlerConstructor>(tempContainer, McpDiagramResourceHandlerConstructor);
+            const tools = this.filterSupported(
+                tempContainer,
+                getConstructorList<McpDiagramToolHandlerConstructor>(tempContainer, McpDiagramToolHandlerConstructor),
+                diagramType,
+                BaseMcpDiagramToolHandler.prototype.isSupportedByDiagramType
+            );
+            const resources = this.filterSupported(
+                tempContainer,
+                getConstructorList<McpDiagramResourceHandlerConstructor>(tempContainer, McpDiagramResourceHandlerConstructor),
+                diagramType,
+                AbstractMcpDiagramResourceHandler.prototype.isSupportedByDiagramType
+            );
             const prompts = getConstructorList<McpDiagramPromptHandlerConstructor>(tempContainer, McpDiagramPromptHandlerConstructor);
             tempContainer.unbindAll();
             catalogs.push({ diagramType, toolConstructors: tools, resourceConstructors: resources, promptConstructors: prompts });
@@ -132,6 +149,40 @@ export class DefaultMcpDiagramHandlerDispatcher implements McpDiagramHandlerDisp
         this.diagramCatalogs = catalogs;
     }
 
+    /**
+     * Drop constructors whose handler reports the diagram type can't support it, so they never
+     * reach the MCP catalog. A handler that overrides the hook is resolved against the harvest
+     * container, where `@optional()` dependencies reflect the diagram type's real bindings; one
+     * that inherits `defaultHook` or doesn't declare the hook is kept without being instantiated.
+     *
+     * Fails open: a constructor that cannot be resolved here stays in the catalog.
+     */
+    protected filterSupported<C extends interfaces.Newable<DiagramTypeSupportAware>>(
+        container: Container,
+        constructors: C[],
+        diagramType: string,
+        defaultHook: DiagramTypeSupportAware['isSupportedByDiagramType']
+    ): C[] {
+        return constructors.filter(constructor => {
+            // A duck-typed handler may not carry the hook at all; skip it rather than resolving it
+            // only to call a method that isn't there.
+            const hook = constructor.prototype.isSupportedByDiagramType;
+            if (typeof hook !== 'function' || hook === defaultHook) {
+                return true;
+            }
+            try {
+                if (container.resolve(constructor).isSupportedByDiagramType()) {
+                    return true;
+                }
+                this.logger.debug(`Diagram type '${diagramType}' does not support MCP handler '${constructor.name}'; not registering.`);
+                return false;
+            } catch (err: unknown) {
+                this.logger.debug(`Could not probe MCP handler '${constructor.name}' for diagram type '${diagramType}'; registering.`, err);
+                return true;
+            }
+        });
+    }
+
     /** True when at least one diagram type has at least one tool handler bound. */
     hasDiagramTools(): boolean {
         return this.diagramCatalogs.some(catalog => catalog.toolConstructors.length > 0);

package/src/common/server/mcp-handler-shared.ts

@@ -71,12 +71,10 @@ export interface McpStructuredContent {
  * otherwise throw `new McpToolError('context-specific message')`.
  */
 export class McpToolError extends Error {
-    constructor(
-        message: string,
-        readonly cause?: unknown
-    ) {
+    constructor(message: string, cause?: unknown) {
         super(message);
         this.name = 'McpToolError';
+        this.cause = cause;
     }
 }
 

package/src/common/server/mcp-input-schemas.ts

@@ -45,6 +45,9 @@ export const elementId = z.string();
 /** One or more element ids. Empty arrays are rejected. */
 export const elementIds = z.array(z.string()).min(1);
 
+/** Zero or more element ids, for tools where an empty array is itself meaningful (e.g. "select nothing"). */
+export const elementIdsAllowingEmpty = z.array(z.string());
+
 /** Cartesian position used by node-creation / -modification tools. */
 export const position = z
     .object({

package/src/common/server/mcp-mime-types.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { ProposalString } from '@eclipse-glsp/protocol';
+import { ProposalString } from '@eclipse-glsp/server';
 
 /**
  * MIME type for an MCP resource. Annotating a `mimeType` field with this type prompts the IDE

package/src/common/server/mcp-options.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { McpServerOptions as McpServerOptionsType } from '@eclipse-glsp/protocol';
+import { McpServerOptions as McpServerOptionsType } from '@eclipse-glsp/server';
 import { injectable } from 'inversify';
 
 /**