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

package/lib/{tools → common/tools}/handlers/diagram-model-mcp-tool-handler.js

@@ -29,8 +29,9 @@ exports.DiagramModelMcpToolHandler = exports.DiagramModelOutputSchema = exports.
 const inversify_1 = require("inversify");
 const z = require("zod/v4");
 const mcp_model_serializer_1 = require("../../resources/services/mcp-model-serializer");
-const server_1 = require("../../server");
-exports.DiagramModelInputSchema = server_1.McpDiagramScopedInputSchema;
+const mcp_input_schemas_1 = require("../../server/mcp-input-schemas");
+const mcp_tool_handler_1 = require("../../server/mcp-tool-handler");
+exports.DiagramModelInputSchema = mcp_input_schemas_1.McpDiagramScopedInputSchema;
 /** `.loose()` lets adopter element types attach extra fields (position, size, …) without widening the schema each time. */
 exports.DiagramModelElementSchema = z
     .object({
@@ -43,7 +44,7 @@ exports.DiagramModelOutputSchema = z.object({
     sessionId: z.string(),
     elements: z.array(exports.DiagramModelElementSchema)
 });
-let DiagramModelMcpToolHandler = DiagramModelMcpToolHandler_1 = class DiagramModelMcpToolHandler extends server_1.AbstractMcpDiagramToolHandler {
+let DiagramModelMcpToolHandler = DiagramModelMcpToolHandler_1 = class DiagramModelMcpToolHandler extends mcp_tool_handler_1.AbstractMcpDiagramToolHandler {
     constructor() {
         super(...arguments);
         this.name = DiagramModelMcpToolHandler_1.NAME;

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

@@ -0,0 +1 @@
+{"version":3,"file":"diagram-model-mcp-tool-handler.js","sourceRoot":"","sources":["../../../../src/common/tools/handlers/diagram-model-mcp-tool-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAGlF,yCAA+C;AAC/C,4BAA4B;AAC5B,wFAAmF;AAEnF,sEAA6E;AAC7E,oEAA8E;AAEjE,QAAA,uBAAuB,GAAG,+CAA2B,CAAC;AAGnE,2HAA2H;AAC9G,QAAA,yBAAyB,GAAG,CAAC;KACrC,MAAM,CAAC;IACJ,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAClC,CAAC;KACD,KAAK,EAAE,CAAC;AAEA,QAAA,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7C,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,iCAAyB,CAAC;CAC/C,CAAC,CAAC;AAGI,IAAM,0BAA0B,kCAAhC,MAAM,0BAA2B,SAAQ,gDAAgD;IAAzF;;QAEM,SAAI,GAAG,4BAA0B,CAAC,IAAI,CAAC;QAC9B,UAAK,GAAG,yBAAyB,CAAC;QAC3C,gBAAW,GAChB,qEAAqE;YACrE,4DAA4D;YAC5D,oGAAoG;YACpG,wCAAwC,CAAC;QACpC,gBAAW,GAAG,+BAAuB,CAAC;QAC7B,iBAAY,GAAG,gCAAwB,CAAC;IAe9D,CAAC;IAXa,YAAY,CAAC,EAAE,SAAS,EAAqB;QACnD,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAClC,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7D,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAClF,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;IACxF,CAAC;IAED,qFAAqF;IAC3E,cAAc,CAAC,IAAmB,EAAE,YAAoB;QAC9D,OAAO,YAAY,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,IAAI,CAAC,IAAI,MAAM,YAAY,yDAAyD,CAAC;IAClJ,CAAC;;AAxBQ,gEAA0B;AACnB,+BAAI,GAAG,eAAe,AAAlB,CAAmB;AAWD;IAArC,IAAA,kBAAM,EAAC,yCAAkB,CAAC;;8DAA0C;qCAZ5D,0BAA0B;IADtC,IAAA,sBAAU,GAAE;GACA,0BAA0B,CAyBtC"}

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

@@ -16,7 +16,8 @@
 import { ClientSessionManager } from '@eclipse-glsp/server';
 import { Container, ContainerModule } from 'inversify';
 import * as z from 'zod/v4';
-import { AbstractMcpToolHandler, McpToolResult } from '../../server';
+import { McpToolResult } from '../../server/mcp-handler-shared';
+import { AbstractMcpToolHandler } from '../../server/mcp-tool-handler';
 import { ElementTypes } from '../../resources/services/element-types-provider';
 export declare const ElementTypesInputSchema: z.ZodObject<{
     sessionId: z.ZodOptional<z.ZodString>;

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

@@ -0,0 +1 @@
+{"version":3,"file":"element-types-mcp-tool-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/tools/handlers/element-types-mcp-tool-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAEH,oBAAoB,EAIvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,eAAe,EAAsB,MAAM,WAAW,CAAC;AAC3E,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAgB,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,YAAY,EAAwB,MAAM,iDAAiD,CAAC;AAErG,eAAO,MAAM,uBAAuB;;;iBAGlC,CAAC;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAExE;;;;GAIG;AACH,eAAO,MAAM,sBAAsB;;;;;iBAUvB,CAAC;AAEb,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;iBAInC,CAAC;AAEH;;;;;;;;GAQG;AACH,qBACa,0BAA2B,SAAQ,sBAAsB,CAAC,iBAAiB,CAAC;IAC7D,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IACrD,SAAS,CAAC,eAAe,EAAE,SAAS,CAAC;IACnC,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAEnF,MAAM,CAAC,QAAQ,CAAC,IAAI,mBAAmB;IACvC,QAAQ,CAAC,IAAI,mBAAmC;IAChD,SAAkB,KAAK,6BAA6B;IACpD,QAAQ,CAAC,WAAW,SAIqE;IACzF,QAAQ,CAAC,WAAW;;;sBAA2B;IAC/C,SAAkB,YAAY;;;;;;;;;;;;;;sBAA4B;IAE1D,SAAS,CAAC,QAAQ,CAAC,KAAK,4BAAmC;IAE3D,SAAS,CAAC,YAAY,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,iBAAiB,GAAG,aAAa;IAUpF,gFAAgF;IAChF,SAAS,CAAC,qBAAqB,CAC3B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,YAAY,CAAC,WAAW,CAAC,EACpC,SAAS,EAAE,YAAY,CAAC,WAAW,CAAC,GACrC,MAAM;IAST,SAAS,CAAC,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM;IAWnE,SAAS,CAAC,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,YAAY;IAS5D,wJAAwJ;IACxJ,SAAS,CAAC,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,YAAY;CAoBnE"}

package/lib/{tools → common/tools}/handlers/element-types-mcp-tool-handler.js

@@ -29,7 +29,8 @@ exports.ElementTypesMcpToolHandler = exports.ElementTypesOutputSchema = exports.
 const server_1 = require("@eclipse-glsp/server");
 const inversify_1 = require("inversify");
 const z = require("zod/v4");
-const server_2 = require("../../server");
+const mcp_handler_shared_1 = require("../../server/mcp-handler-shared");
+const mcp_tool_handler_1 = require("../../server/mcp-tool-handler");
 const element_types_provider_1 = require("../../resources/services/element-types-provider");
 exports.ElementTypesInputSchema = z.object({
     sessionId: z.string().optional().describe('Open GLSP session id; diagram type is derived from it. Provide this OR `diagramType`.'),
@@ -65,7 +66,7 @@ exports.ElementTypesOutputSchema = z.object({
  * Adopters with statically-known type info bind their own {@link ElementTypesProvider} via
  * `bindElementTypesProvider()`; the harvest picks it up without further overrides.
  */
-let ElementTypesMcpToolHandler = ElementTypesMcpToolHandler_1 = class ElementTypesMcpToolHandler extends server_2.AbstractMcpToolHandler {
+let ElementTypesMcpToolHandler = ElementTypesMcpToolHandler_1 = class ElementTypesMcpToolHandler extends mcp_tool_handler_1.AbstractMcpToolHandler {
     constructor() {
         super(...arguments);
         this.name = ElementTypesMcpToolHandler_1.NAME;
@@ -96,11 +97,11 @@ let ElementTypesMcpToolHandler = ElementTypesMcpToolHandler_1 = class ElementTyp
     }
     resolveDiagramType(sessionId) {
         if (!sessionId) {
-            throw new server_2.McpToolError('Either `diagramType` or `sessionId` must be provided.');
+            throw new mcp_handler_shared_1.McpToolError('Either `diagramType` or `sessionId` must be provided.');
         }
         const session = this.clientSessionManager.getSession(sessionId);
         if (!session) {
-            throw new server_2.McpToolError(`Unknown sessionId: ${sessionId}`);
+            throw new mcp_handler_shared_1.McpToolError(`Unknown sessionId: ${sessionId}`);
         }
         return session.diagramType;
     }
@@ -116,7 +117,7 @@ let ElementTypesMcpToolHandler = ElementTypesMcpToolHandler_1 = class ElementTyp
     harvestElementTypes(diagramType) {
         const modules = this.diagramModules.get(diagramType);
         if (!modules) {
-            throw new server_2.McpToolError(`Unknown diagram type: ${diagramType}`);
+            throw new mcp_handler_shared_1.McpToolError(`Unknown diagram type: ${diagramType}`);
         }
         const tempContainer = this.serverContainer.createChild();
         try {

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

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

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

@@ -15,7 +15,8 @@
  ********************************************************************************/
 import { ActionDispatcher } from '@eclipse-glsp/server';
 import * as z from 'zod/v4';
-import { AbstractMcpDiagramToolHandler, McpToolResult } from '../../server';
+import { McpToolResult } from '../../server/mcp-handler-shared';
+import { AbstractMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
 export declare const GetSelectionInputSchema: z.ZodObject<{
     sessionId: z.ZodString;
 }, z.core.$strip>;

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

@@ -0,0 +1 @@
+{"version":3,"file":"get-selection-mcp-tool-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/tools/handlers/get-selection-mcp-tool-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,gBAAgB,EAAsB,MAAM,sBAAsB,CAAC;AAE5E,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAuB,MAAM,iCAAiC,CAAC;AAErF,OAAO,EAAE,6BAA6B,EAAE,MAAM,+BAA+B,CAAC;AAE9E,eAAO,MAAM,uBAAuB;;iBAA8B,CAAC;AACnE,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAExE,eAAO,MAAM,wBAAwB;;iBAEnC,CAAC;AAEH,sIAAsI;AACtI,qBACa,0BAA2B,SAAQ,6BAA6B,CAAC,iBAAiB,CAAC;IAC5F,2GAA2G;IAC3G,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAQ;IAE5C,MAAM,CAAC,QAAQ,CAAC,IAAI,mBAAmB;IACvC,QAAQ,CAAC,IAAI,mBAAmC;IAChD,SAAkB,KAAK,mCAAmC;IAC1D,QAAQ,CAAC,WAAW,SAIkC;IACtD,QAAQ,CAAC,WAAW;;sBAA2B;IAC/C,SAAkB,YAAY;;sBAA4B;IAEhC,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;cAEvD,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC;CAMnF"}

package/lib/{tools → common/tools}/handlers/get-selection-mcp-tool-handler.js

@@ -29,13 +29,15 @@ exports.GetSelectionMcpToolHandler = exports.GetSelectionOutputSchema = exports.
 const server_1 = require("@eclipse-glsp/server");
 const inversify_1 = require("inversify");
 const z = require("zod/v4");
-const server_2 = require("../../server");
-exports.GetSelectionInputSchema = server_2.McpDiagramScopedInputSchema;
+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.GetSelectionInputSchema = mcp_input_schemas_1.McpDiagramScopedInputSchema;
 exports.GetSelectionOutputSchema = z.object({
     selectedElementIds: z.array(z.string()).describe('Aliased ids of the elements currently selected on the client.')
 });
 /** Round-trips a sprotty {@link GetSelectionAction} via `ActionDispatcher.requestUntil` and awaits the matching `SelectionResult`. */
-let GetSelectionMcpToolHandler = GetSelectionMcpToolHandler_1 = class GetSelectionMcpToolHandler extends server_2.AbstractMcpDiagramToolHandler {
+let GetSelectionMcpToolHandler = GetSelectionMcpToolHandler_1 = class GetSelectionMcpToolHandler extends mcp_tool_handler_1.AbstractMcpDiagramToolHandler {
     constructor() {
         super(...arguments);
         /** Timeout (in ms) for awaiting the selection response from the client. Override via subclass + rebind. */
@@ -50,7 +52,7 @@ let GetSelectionMcpToolHandler = GetSelectionMcpToolHandler_1 = class GetSelecti
         this.outputSchema = exports.GetSelectionOutputSchema;
     }
     async createResult(_params) {
-        const response = await (0, server_2.requestActionOrFail)(this.actionDispatcher, server_1.GetSelectionAction.create(), this.timeoutMs, this.name);
+        const response = await (0, mcp_handler_shared_1.requestActionOrFail)(this.actionDispatcher, server_1.GetSelectionAction.create(), this.timeoutMs, this.name);
         const selectedElementIds = this.encodeIds(response.selectedElementsIDs);
         const selectedIdsStr = selectedElementIds.map(id => `- ${id}`).join('\n');
         return this.success(`Following element IDs are selected:\n${selectedIdsStr}`, { selectedElementIds });

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

@@ -0,0 +1 @@
+{"version":3,"file":"get-selection-mcp-tool-handler.js","sourceRoot":"","sources":["../../../../src/common/tools/handlers/get-selection-mcp-tool-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,iDAA4E;AAC5E,yCAA+C;AAC/C,4BAA4B;AAC5B,wEAAqF;AACrF,sEAA6E;AAC7E,oEAA8E;AAEjE,QAAA,uBAAuB,GAAG,+CAA2B,CAAC;AAGtD,QAAA,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7C,kBAAkB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,+DAA+D,CAAC;CACpH,CAAC,CAAC;AAEH,sIAAsI;AAE/H,IAAM,0BAA0B,kCAAhC,MAAM,0BAA2B,SAAQ,gDAAgD;IAAzF;;QACH,2GAA2G;QACxF,cAAS,GAAW,IAAI,CAAC;QAGnC,SAAI,GAAG,4BAA0B,CAAC,IAAI,CAAC;QAC9B,UAAK,GAAG,+BAA+B,CAAC;QACjD,gBAAW,GAChB,wFAAwF;YACxF,sHAAsH;YACtH,6FAA6F;YAC7F,iDAAiD,CAAC;QAC7C,gBAAW,GAAG,+BAAuB,CAAC;QAC7B,iBAAY,GAAG,gCAAwB,CAAC;IAU9D,CAAC;IANa,KAAK,CAAC,YAAY,CAAC,OAA0B;QACnD,MAAM,QAAQ,GAAG,MAAM,IAAA,wCAAmB,EAAC,IAAI,CAAC,gBAAgB,EAAE,2BAAkB,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1H,MAAM,kBAAkB,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QACxE,MAAM,cAAc,GAAG,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1E,OAAO,IAAI,CAAC,OAAO,CAAC,wCAAwC,cAAc,EAAE,EAAE,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAC1G,CAAC;;AAtBQ,gEAA0B;AAInB,+BAAI,GAAG,eAAe,AAAlB,CAAmB;AAWH;IAAnC,IAAA,kBAAM,EAAC,yBAAgB,CAAC;;oEAA8C;qCAf9D,0BAA0B;IADtC,IAAA,sBAAU,GAAE;GACA,0BAA0B,CAuBtC"}

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

@@ -15,13 +15,15 @@
  ********************************************************************************/
 import { LayoutEngine } from '@eclipse-glsp/server';
 import * as z from 'zod/v4';
-import { McpToolResult, OperationMcpDiagramToolHandler } from '../../server';
+import { McpToolResult } from '../../server/mcp-handler-shared';
+import { OperationMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
 export declare const LayoutInputSchema: z.ZodObject<{
     sessionId: z.ZodString;
 }, z.core.$strip>;
 export type LayoutInput = z.infer<typeof LayoutInputSchema>;
 export declare const LayoutOutputSchema: z.ZodObject<{
     applied: z.ZodBoolean;
+    dispatchedCommands: z.ZodNumber;
 }, z.core.$strip>;
 /** Not registered by default: requires an adopter-supplied `LayoutEngine` to bind, which only some GLSP servers ship. */
 export declare class LayoutMcpToolHandler extends OperationMcpDiagramToolHandler<LayoutInput> {
@@ -34,6 +36,7 @@ export declare class LayoutMcpToolHandler extends OperationMcpDiagramToolHandler
     }, z.core.$strip>;
     readonly outputSchema: z.ZodObject<{
         applied: z.ZodBoolean;
+        dispatchedCommands: z.ZodNumber;
     }, z.core.$strip>;
     protected layoutEngine?: LayoutEngine;
     /** Skip-bind when no `LayoutEngine` is bound — every dispatch would otherwise no-op. */

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

@@ -0,0 +1 @@
+{"version":3,"file":"layout-mcp-tool-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/tools/handlers/layout-mcp-tool-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,YAAY,EAAmB,MAAM,sBAAsB,CAAC;AAErE,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEhE,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAE/E,eAAO,MAAM,iBAAiB;;iBAA8B,CAAC;AAC7D,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE5D,eAAO,MAAM,kBAAkB;;;iBAG7B,CAAC;AAEH,yHAAyH;AACzH,qBACa,oBAAqB,SAAQ,8BAA8B,CAAC,WAAW,CAAC;IACjF,MAAM,CAAC,QAAQ,CAAC,IAAI,YAAY;IAChC,QAAQ,CAAC,IAAI,YAA6B;IAC1C,SAAkB,KAAK,yBAAyB;IAChD,QAAQ,CAAC,WAAW,SAM+D;IACnF,QAAQ,CAAC,WAAW;;sBAAqB;IACzC,SAAkB,YAAY;;;sBAAsB;IAElB,SAAS,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC;IAExE,wFAAwF;IAC/E,WAAW,IAAI,OAAO;cAIf,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;CAI7E"}

package/lib/{tools → common/tools}/handlers/layout-mcp-tool-handler.js

@@ -29,13 +29,15 @@ exports.LayoutMcpToolHandler = exports.LayoutOutputSchema = exports.LayoutInputS
 const server_1 = require("@eclipse-glsp/server");
 const inversify_1 = require("inversify");
 const z = require("zod/v4");
-const server_2 = require("../../server");
-exports.LayoutInputSchema = server_2.McpDiagramScopedInputSchema;
+const mcp_input_schemas_1 = require("../../server/mcp-input-schemas");
+const mcp_tool_handler_1 = require("../../server/mcp-tool-handler");
+exports.LayoutInputSchema = mcp_input_schemas_1.McpDiagramScopedInputSchema;
 exports.LayoutOutputSchema = z.object({
-    applied: z.boolean().describe('Always true on success — surfaced for parity with other operations.')
+    applied: z.boolean().describe('Always true on success — surfaced for parity with other operations.'),
+    dispatchedCommands: mcp_input_schemas_1.dispatchedCommands
 });
 /** Not registered by default: requires an adopter-supplied `LayoutEngine` to bind, which only some GLSP servers ship. */
-let LayoutMcpToolHandler = LayoutMcpToolHandler_1 = class LayoutMcpToolHandler extends server_2.OperationMcpDiagramToolHandler {
+let LayoutMcpToolHandler = LayoutMcpToolHandler_1 = class LayoutMcpToolHandler extends mcp_tool_handler_1.OperationMcpDiagramToolHandler {
     constructor() {
         super(...arguments);
         this.name = LayoutMcpToolHandler_1.NAME;
@@ -55,7 +57,7 @@ let LayoutMcpToolHandler = LayoutMcpToolHandler_1 = class LayoutMcpToolHandler e
     }
     async createResult(_params) {
         await this.actionDispatcher.dispatch(server_1.LayoutOperation.create());
-        return this.success('Automatic layout applied', { applied: true });
+        return this.success('Automatic layout applied', { applied: true, dispatchedCommands: 1 });
     }
 };
 exports.LayoutMcpToolHandler = LayoutMcpToolHandler;

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

@@ -0,0 +1 @@
+{"version":3,"file":"layout-mcp-tool-handler.js","sourceRoot":"","sources":["../../../../src/common/tools/handlers/layout-mcp-tool-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,iDAAqE;AACrE,yCAAyD;AACzD,4BAA4B;AAE5B,sEAAiG;AACjG,oEAA+E;AAElE,QAAA,iBAAiB,GAAG,+CAA2B,CAAC;AAGhD,QAAA,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,qEAAqE,CAAC;IACpG,kBAAkB,EAAlB,sCAAkB;CACrB,CAAC,CAAC;AAEH,yHAAyH;AAElH,IAAM,oBAAoB,4BAA1B,MAAM,oBAAqB,SAAQ,iDAA2C;IAA9E;;QAEM,SAAI,GAAG,sBAAoB,CAAC,IAAI,CAAC;QACxB,UAAK,GAAG,qBAAqB,CAAC;QACvC,gBAAW,GAChB,oGAAoG;YACpG,iEAAiE;YACjE,sGAAsG;YACtG,+FAA+F;YAC/F,wEAAwE;YACxE,8EAA8E,CAAC;QAC1E,gBAAW,GAAG,yBAAiB,CAAC;QACvB,iBAAY,GAAG,0BAAkB,CAAC;IAaxD,CAAC;IATG,wFAAwF;IAC/E,WAAW;QAChB,OAAO,IAAI,CAAC,YAAY,KAAK,SAAS,CAAC;IAC3C,CAAC;IAES,KAAK,CAAC,YAAY,CAAC,OAAoB;QAC7C,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,wBAAe,CAAC,MAAM,EAAE,CAAC,CAAC;QAC/D,OAAO,IAAI,CAAC,OAAO,CAAC,0BAA0B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,EAAE,CAAC,CAAC;IAC9F,CAAC;;AAxBQ,oDAAoB;AACb,yBAAI,GAAG,QAAQ,AAAX,CAAY;AAaY;IAA3C,IAAA,kBAAM,EAAC,qBAAY,CAAC;IAAE,IAAA,oBAAQ,GAAE;;0DAAuC;+BAd/D,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CAyBhC"}

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

@@ -14,7 +14,8 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import * as z from 'zod/v4';
-import { McpToolResult, OperationMcpDiagramToolHandler } from '../../server';
+import { McpToolResult } from '../../server/mcp-handler-shared';
+import { OperationMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
 /** Single edge-modification entry. Strict so an LLM-typoed field surfaces as a validation error instead of being silently dropped. */
 export declare const ModifyEdgeSpecSchema: z.ZodObject<{
     elementId: z.ZodString;

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

@@ -0,0 +1 @@
+{"version":3,"file":"modify-edges-mcp-tool-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/tools/handlers/modify-edges-mcp-tool-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAIlF,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAgB,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAQ9E,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAG/E,sIAAsI;AACtI,eAAO,MAAM,oBAAoB;;;;;;;;kBAW/B,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;;;;;;;;iBAKjC,CAAC;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,eAAO,MAAM,uBAAuB;;;;;;;;iBAIlC,CAAC;AAEH,qBACa,yBAA0B,SAAQ,8BAA8B,CAAC,gBAAgB,CAAC;IAC3F,MAAM,CAAC,QAAQ,CAAC,IAAI,kBAAkB;IACtC,QAAQ,CAAC,IAAI,kBAAkC;IAC/C,SAAkB,KAAK,0BAA0B;IACjD,QAAQ,CAAC,WAAW,SAM8C;IAClE,QAAQ,CAAC,WAAW;;;;;;;;;;;sBAA0B;IAC9C,SAAkB,YAAY;;;;;;;;sBAA2B;cAEzC,YAAY,CAAC,EAAE,KAAK,EAAE,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;CA0EpF"}

package/lib/{tools → common/tools}/handlers/modify-edges-mcp-tool-handler.js

@@ -26,31 +26,33 @@ exports.ModifyEdgesMcpToolHandler = exports.ModifyEdgesOutputSchema = exports.Mo
 const server_1 = require("@eclipse-glsp/server");
 const inversify_1 = require("inversify");
 const z = require("zod/v4");
-const server_2 = require("../../server");
-const util_1 = require("../../util");
+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");
+const mcp_util_1 = require("../../util/mcp-util");
 /** Single edge-modification entry. Strict so an LLM-typoed field surfaces as a validation error instead of being silently dropped. */
 exports.ModifyEdgeSpecSchema = z.strictObject({
-    elementId: server_2.elementId,
+    elementId: mcp_input_schemas_1.elementId,
     sourceElementId: z.string().optional().describe('ID of the source element (must exist in the diagram)'),
     targetElementId: z.string().optional().describe('ID of the target element (must exist in the diagram)'),
     routingPoints: z
-        .array(server_2.position)
+        .array(mcp_input_schemas_1.position)
         .optional()
         .describe('Optional array of routing point coordinates that allow for a complex edge path. ' +
         'Using an empty array removes all routing points.')
 });
-exports.ModifyEdgesInputSchema = server_2.McpDiagramScopedInputSchema.extend({
+exports.ModifyEdgesInputSchema = mcp_input_schemas_1.McpDiagramScopedInputSchema.extend({
     edges: z
         .array(exports.ModifyEdgeSpecSchema)
         .min(1)
         .describe('Array of edge changes — each entry needs `elementId` plus the fields to update. Must include at least one change.')
 });
 exports.ModifyEdgesOutputSchema = z.object({
-    modifiedEdges: z.array(server_2.ElementIdentitySchema).describe('Identity of each edge whose change request was dispatched.'),
-    dispatchedCommands: z.number().int().describe('Number of underlying GLSP operations dispatched.'),
+    modifiedEdges: z.array(mcp_input_schemas_1.ElementIdentitySchema).describe('Identity of each edge whose change request was dispatched.'),
+    dispatchedCommands: mcp_input_schemas_1.dispatchedCommands,
     errors: z.array(z.string()).describe('Per-input failure messages; absent or empty when every input succeeded.')
 });
-let ModifyEdgesMcpToolHandler = ModifyEdgesMcpToolHandler_1 = class ModifyEdgesMcpToolHandler extends server_2.OperationMcpDiagramToolHandler {
+let ModifyEdgesMcpToolHandler = ModifyEdgesMcpToolHandler_1 = class ModifyEdgesMcpToolHandler extends mcp_tool_handler_1.OperationMcpDiagramToolHandler {
     constructor() {
         super(...arguments);
         this.name = ModifyEdgesMcpToolHandler_1.NAME;
@@ -73,7 +75,7 @@ let ModifyEdgesMcpToolHandler = ModifyEdgesMcpToolHandler_1 = class ModifyEdgesM
             .filter(([, element]) => !(element instanceof server_1.GEdge))
             .map(([change, element]) => `'${change.elementId}' (type '${element.type}')`);
         if (wrongType.length) {
-            throw new server_2.McpToolError(`modify-edges accepts edges only — got: ${wrongType.join(', ')}. Use modify-nodes for nodes.`);
+            throw new mcp_handler_shared_1.McpToolError(`modify-edges accepts edges only — got: ${wrongType.join(', ')}. Use modify-nodes for nodes.`);
         }
         // Dispatch in parallel via `allSettled` so one failed edge surfaces in `errors`
         // instead of rejecting the whole call and losing the other outcomes.
@@ -125,7 +127,7 @@ let ModifyEdgesMcpToolHandler = ModifyEdgesMcpToolHandler_1 = class ModifyEdgesM
         const modifiedEdges = [...modifiedRealIds]
             .map(realId => this.describeElement(realId))
             .filter((entry) => entry !== undefined);
-        return this.success(`Successfully modified ${edges.length - errors.length} edge(s) (in ${dispatched.length} commands)${(0, util_1.formatNoticeList)('errors', errors)}`, { modifiedEdges, dispatchedCommands: dispatched.length, errors });
+        return this.success(`Successfully modified ${edges.length - errors.length} edge(s) (in ${dispatched.length} commands)${(0, mcp_util_1.formatNoticeList)('errors', errors)}`, { modifiedEdges, dispatchedCommands: dispatched.length, errors });
     }
 };
 exports.ModifyEdgesMcpToolHandler = ModifyEdgesMcpToolHandler;

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

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

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

@@ -14,7 +14,8 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import * as z from 'zod/v4';
-import { McpToolResult, OperationMcpDiagramToolHandler } from '../../server';
+import { McpToolResult } from '../../server/mcp-handler-shared';
+import { OperationMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
 /** Strict — any unknown field on the size object surfaces as a validation error. */
 export declare const NodeSizeSchema: z.ZodObject<{
     width: z.ZodNumber;

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

@@ -0,0 +1 @@
+{"version":3,"file":"modify-nodes-mcp-tool-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/tools/handlers/modify-nodes-mcp-tool-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAIlF,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAgB,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAQ9E,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAG/E,oFAAoF;AACpF,eAAO,MAAM,cAAc;;;kBAGzB,CAAC;AAEH,sIAAsI;AACtI,eAAO,MAAM,oBAAoB;;;;;;;;;;;kBAK/B,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;iBAKjC,CAAC;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,eAAO,MAAM,uBAAuB;;;;;;;;iBAUlC,CAAC;AAEH,qBACa,yBAA0B,SAAQ,8BAA8B,CAAC,gBAAgB,CAAC;IAC3F,MAAM,CAAC,QAAQ,CAAC,IAAI,kBAAkB;IACtC,QAAQ,CAAC,IAAI,kBAAkC;IAC/C,SAAkB,KAAK,0BAA0B;IACjD,QAAQ,CAAC,WAAW,SAMsD;IAC1E,QAAQ,CAAC,WAAW;;;;;;;;;;;;;;sBAA0B;IAC9C,SAAkB,YAAY;;;;;;;;sBAA2B;cAEzC,YAAY,CAAC,EAAE,KAAK,EAAE,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;CA4DpF"}

package/lib/{tools → common/tools}/handlers/modify-nodes-mcp-tool-handler.js

@@ -26,8 +26,10 @@ exports.ModifyNodesMcpToolHandler = exports.ModifyNodesOutputSchema = exports.Mo
 const server_1 = require("@eclipse-glsp/server");
 const inversify_1 = require("inversify");
 const z = require("zod/v4");
-const server_2 = require("../../server");
-const util_1 = require("../../util");
+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");
+const mcp_util_1 = require("../../util/mcp-util");
 /** Strict — any unknown field on the size object surfaces as a validation error. */
 exports.NodeSizeSchema = z.strictObject({
     width: z.number().positive().describe('Width of the element in diagram space (must be > 0).'),
@@ -35,12 +37,12 @@ exports.NodeSizeSchema = z.strictObject({
 });
 /** Single node-modification entry. Strict so an LLM-typoed field surfaces as a validation error instead of being silently dropped. */
 exports.ModifyNodeSpecSchema = z.strictObject({
-    elementId: server_2.elementId,
-    position: server_2.position.optional().describe('Position where the node should be moved to (absolute diagram coordinates)'),
+    elementId: mcp_input_schemas_1.elementId,
+    position: mcp_input_schemas_1.position.optional().describe('Position where the node should be moved to (absolute diagram coordinates)'),
     size: exports.NodeSizeSchema.optional().describe('New size of the node'),
     text: z.string().optional().describe("Label text to use instead (given that the element's type allows for labels).")
 });
-exports.ModifyNodesInputSchema = server_2.McpDiagramScopedInputSchema.extend({
+exports.ModifyNodesInputSchema = mcp_input_schemas_1.McpDiagramScopedInputSchema.extend({
     nodes: z
         .array(exports.ModifyNodeSpecSchema)
         .min(1)
@@ -48,14 +50,14 @@ exports.ModifyNodesInputSchema = server_2.McpDiagramScopedInputSchema.extend({
 });
 exports.ModifyNodesOutputSchema = z.object({
     modifiedNodes: z
-        .array(server_2.ElementIdentitySchema)
+        .array(mcp_input_schemas_1.ElementIdentitySchema)
         .describe('Identity of each node whose change request was dispatched (post-modification labels).'),
-    dispatchedCommands: z.number().int().describe('Number of underlying GLSP operations dispatched (a single change may yield several).'),
+    dispatchedCommands: mcp_input_schemas_1.dispatchedCommands,
     warnings: z
         .array(z.string())
         .describe('Soft notices for inputs whose change applied with caveats (e.g. `text` supplied for a node whose type has no editable label).')
 });
-let ModifyNodesMcpToolHandler = ModifyNodesMcpToolHandler_1 = class ModifyNodesMcpToolHandler extends server_2.OperationMcpDiagramToolHandler {
+let ModifyNodesMcpToolHandler = ModifyNodesMcpToolHandler_1 = class ModifyNodesMcpToolHandler extends mcp_tool_handler_1.OperationMcpDiagramToolHandler {
     constructor() {
         super(...arguments);
         this.name = ModifyNodesMcpToolHandler_1.NAME;
@@ -76,13 +78,13 @@ let ModifyNodesMcpToolHandler = ModifyNodesMcpToolHandler_1 = class ModifyNodesM
         // are sequential across all element kinds, so an LLM passing an arbitrary id may hit an edge.
         const wrongType = elements.filter(([, element]) => element instanceof server_1.GEdge).map(([change]) => `'${change.elementId}'`);
         if (wrongType.length) {
-            throw new server_2.McpToolError(`modify-nodes does not accept edges — got: ${wrongType.join(', ')}. Use modify-edges for edges.`);
+            throw new mcp_handler_shared_1.McpToolError(`modify-nodes does not accept edges — got: ${wrongType.join(', ')}. Use modify-edges for edges.`);
         }
         // Reject any other non-shape kinds (labels, compartments, ports, custom kinds) — they
         // reach the index too and would silently produce no-op or undefined-bounds operations.
         const nonShape = elements.filter(([, element]) => !(element instanceof server_1.GShapeElement)).map(([change]) => `'${change.elementId}'`);
         if (nonShape.length) {
-            throw new server_2.McpToolError(`modify-nodes only accepts shape elements — got: ${nonShape.join(', ')}. ` +
+            throw new mcp_handler_shared_1.McpToolError(`modify-nodes only accepts shape elements — got: ${nonShape.join(', ')}. ` +
                 'Use `query-elements` (inspect mode) to find shape ids, or pick the parent shape.');
         }
         // Modifications are independent of each other — dispatch in parallel.
@@ -114,7 +116,7 @@ let ModifyNodesMcpToolHandler = ModifyNodesMcpToolHandler_1 = class ModifyNodesM
         const modifiedNodes = nodes
             .map(change => this.describeElement(change.elementId))
             .filter((entry) => entry !== undefined);
-        return this.success(`Successfully modified ${nodes.length} node(s) (in ${promises.length} commands)` + (0, util_1.formatNoticeList)('warnings', warnings), { modifiedNodes, dispatchedCommands: promises.length, warnings });
+        return this.success(`Successfully modified ${nodes.length} node(s) (in ${promises.length} commands)` + (0, mcp_util_1.formatNoticeList)('warnings', warnings), { modifiedNodes, dispatchedCommands: promises.length, warnings });
     }
 };
 exports.ModifyNodesMcpToolHandler = ModifyNodesMcpToolHandler;

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

@@ -0,0 +1 @@
+{"version":3,"file":"modify-nodes-mcp-tool-handler.js","sourceRoot":"","sources":["../../../../src/common/tools/handlers/modify-nodes-mcp-tool-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;AAElF,iDAA4G;AAC5G,yCAAuC;AACvC,4BAA4B;AAC5B,wEAA8E;AAC9E,sEAMwC;AACxC,oEAA+E;AAC/E,kDAAuD;AAEvD,oFAAoF;AACvE,QAAA,cAAc,GAAG,CAAC,CAAC,YAAY,CAAC;IACzC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,sDAAsD,CAAC;IAC7F,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,uDAAuD,CAAC;CAClG,CAAC,CAAC;AAEH,sIAAsI;AACzH,QAAA,oBAAoB,GAAG,CAAC,CAAC,YAAY,CAAC;IAC/C,SAAS,EAAT,6BAAS;IACT,QAAQ,EAAE,4BAAQ,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,2EAA2E,CAAC;IACnH,IAAI,EAAE,sBAAc,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,sBAAsB,CAAC;IAChE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,8EAA8E,CAAC;CACvH,CAAC,CAAC;AAEU,QAAA,sBAAsB,GAAG,+CAA2B,CAAC,MAAM,CAAC;IACrE,KAAK,EAAE,CAAC;SACH,KAAK,CAAC,4BAAoB,CAAC;SAC3B,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,CAAC,mHAAmH,CAAC;CACrI,CAAC,CAAC;AAGU,QAAA,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5C,aAAa,EAAE,CAAC;SACX,KAAK,CAAC,yCAAqB,CAAC;SAC5B,QAAQ,CAAC,uFAAuF,CAAC;IACtG,kBAAkB,EAAlB,sCAAkB;IAClB,QAAQ,EAAE,CAAC;SACN,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;SACjB,QAAQ,CACL,+HAA+H,CAClI;CACR,CAAC,CAAC;AAGI,IAAM,yBAAyB,iCAA/B,MAAM,yBAA0B,SAAQ,iDAAgD;IAAxF;;QAEM,SAAI,GAAG,2BAAyB,CAAC,IAAI,CAAC;QAC7B,UAAK,GAAG,sBAAsB,CAAC;QACxC,gBAAW,GAChB,yFAAyF;YACzF,+FAA+F;YAC/F,sEAAsE;YACtE,4HAA4H;YAC5H,wEAAwE;YACxE,qEAAqE,CAAC;QACjE,gBAAW,GAAG,8BAAsB,CAAC;QAC5B,iBAAY,GAAG,+BAAuB,CAAC;IA8D7D,CAAC;IA5Da,KAAK,CAAC,YAAY,CAAC,EAAE,KAAK,EAAoB;QACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAExE,uFAAuF;QACvF,wFAAwF;QACxF,8FAA8F;QAC9F,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,YAAY,cAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,SAAS,GAAG,CAAC,CAAC;QACxH,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,IAAI,iCAAY,CAAC,6CAA6C,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAC7H,CAAC;QAED,sFAAsF;QACtF,uFAAuF;QACvF,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,YAAY,sBAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,SAAS,GAAG,CAAC,CAAC;QAClI,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,IAAI,iCAAY,CAClB,mDAAmD,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;gBACtE,kFAAkF,CACzF,CAAC;QACN,CAAC;QAED,sEAAsE;QACtE,MAAM,QAAQ,GAAoB,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE;;YACnC,uFAAuF;YACvF,MAAM,QAAQ,GAAG,OAAwB,CAAC;YAC1C,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;YACxC,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAE1D,IAAI,IAAI,IAAI,QAAQ,EAAE,CAAC;gBACnB,MAAM,OAAO,GAAG,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,QAAQ,CAAC,IAAI,CAAC;gBACtC,MAAM,WAAW,GAAG,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,QAAQ,CAAC,QAAQ,CAAC;gBAElD,MAAM,SAAS,GAAG,8BAAqB,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;gBAC9F,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;YAC7D,CAAC;YAED,IAAI,IAAI,EAAE,CAAC;gBACP,MAAM,OAAO,GAAG,MAAA,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,0CAAE,EAAE,CAAC;gBAC1D,IAAI,OAAO,EAAE,CAAC;oBACV,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,gCAAuB,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBACrG,CAAC;qBAAM,CAAC;oBACJ,QAAQ,CAAC,IAAI,CACT,yBAAyB,MAAM,CAAC,SAAS,YAAY,QAAQ,CAAC,IAAI,0CAA0C,CAC/G,CAAC;gBACN,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE5B,MAAM,aAAa,GAAG,KAAK;aACtB,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;aACrD,MAAM,CAAC,CAAC,KAAK,EAAsC,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;QAChF,OAAO,IAAI,CAAC,OAAO,CACf,yBAAyB,KAAK,CAAC,MAAM,gBAAgB,QAAQ,CAAC,MAAM,YAAY,GAAG,IAAA,2BAAgB,EAAC,UAAU,EAAE,QAAQ,CAAC,EACzH,EAAE,aAAa,EAAE,kBAAkB,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,CACnE,CAAC;IACN,CAAC;;AAzEQ,8DAAyB;AAClB,8BAAI,GAAG,cAAc,AAAjB,CAAkB;oCAD7B,yBAAyB;IADrC,IAAA,sBAAU,GAAE;GACA,yBAAyB,CA0ErC"}

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

@@ -16,7 +16,8 @@
 import { GModelElement } from '@eclipse-glsp/server';
 import * as z from 'zod/v4';
 import { McpModelSerializer } from '../../resources/services/mcp-model-serializer';
-import { AbstractMcpDiagramToolHandler, McpToolResult } from '../../server';
+import { McpToolResult } from '../../server/mcp-handler-shared';
+import { AbstractMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
 export declare const QueryElementsInputSchema: z.ZodObject<{
     sessionId: z.ZodString;
     elementIds: z.ZodOptional<z.ZodArray<z.ZodString>>;

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

@@ -0,0 +1 @@
+{"version":3,"file":"query-elements-mcp-tool-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/tools/handlers/query-elements-mcp-tool-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAA4B,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAE1F,OAAO,EAAE,6BAA6B,EAAE,MAAM,+BAA+B,CAAC;AAE9E,eAAO,MAAM,wBAAwB;;;;;;iBAOnC,CAAC;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,eAAO,MAAM,uBAAuB;;;;iBAIlC,CAAC;AAEH,2HAA2H;AAC3H,eAAO,MAAM,oBAAoB;;;;iBAMrB,CAAC;AAEb,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;iBAYpC,CAAC;AAEH,qGAAqG;AACrG,qBACa,2BAA4B,SAAQ,6BAA6B,CAAC,kBAAkB,CAAC;IAC9F,MAAM,CAAC,QAAQ,CAAC,IAAI,oBAAoB;IACxC,QAAQ,CAAC,IAAI,oBAAoC;IACjD,SAAkB,KAAK,4BAA4B;IACnD,QAAQ,CAAC,WAAW,SAI8E;IAClG,QAAQ,CAAC,WAAW;;;;;;sBAA4B;IAChD,SAAkB,YAAY;;;;;;;;;;;;;;;;;sBAA6B;IAE/B,SAAS,CAAC,UAAU,EAAE,kBAAkB,CAAC;IAErE,0FAA0F;IAC1F,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAO;cAE9B,YAAY,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,aAAa,CAAC;IAIhF,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,aAAa;IA2BpD,iGAAiG;IACjG,SAAS,CAAC,gBAAgB,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,sBAAsB,EAAE,MAAM,EAAE,GAAG,MAAM;IAO/F,SAAS,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,kBAAkB,GAAG,aAAa;IA8B/E,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,EAAE,SAAS,EAAE,OAAO,GAAG,MAAM;CAKhH"}

package/lib/{tools → common/tools}/handlers/query-elements-mcp-tool-handler.js

@@ -29,9 +29,11 @@ exports.QueryElementsMcpToolHandler = exports.QueryElementsOutputSchema = export
 const inversify_1 = require("inversify");
 const z = require("zod/v4");
 const mcp_model_serializer_1 = require("../../resources/services/mcp-model-serializer");
-const server_1 = require("../../server");
-exports.QueryElementsInputSchema = server_1.McpDiagramScopedInputSchema.extend({
-    elementIds: server_1.elementIds
+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.QueryElementsInputSchema = mcp_input_schemas_1.McpDiagramScopedInputSchema.extend({
+    elementIds: mcp_input_schemas_1.elementIds
         .optional()
         .describe('Inspect-mode trigger. When set, returns rich per-element data and ignores the filter fields. Throws on unknown id.'),
     types: z.array(z.string()).optional().describe('List-mode type filter. Empty/omitted = any. Ignored when `elementIds` is set.'),
@@ -63,7 +65,7 @@ exports.QueryElementsOutputSchema = z.object({
         'The `elements` array then includes the container plus its descendants.')
 });
 /** Two-mode element query — list/filter or inspect-by-id, discriminated by `elementIds` presence. */
-let QueryElementsMcpToolHandler = QueryElementsMcpToolHandler_1 = class QueryElementsMcpToolHandler extends server_1.AbstractMcpDiagramToolHandler {
+let QueryElementsMcpToolHandler = QueryElementsMcpToolHandler_1 = class QueryElementsMcpToolHandler extends mcp_tool_handler_1.AbstractMcpDiagramToolHandler {
     constructor() {
         super(...arguments);
         this.name = QueryElementsMcpToolHandler_1.NAME;
@@ -83,7 +85,7 @@ let QueryElementsMcpToolHandler = QueryElementsMcpToolHandler_1 = class QueryEle
     inspect(inputIds) {
         const { realIds, missingIds } = this.resolveIds(inputIds);
         if (missingIds.length > 0) {
-            throw new server_1.McpElementsNotFoundError(missingIds);
+            throw new mcp_handler_shared_1.McpElementsNotFoundError(missingIds);
         }
         const elements = realIds.map(id => this.modelState.index.get(id));
         // Per-input serialize lets us identify which inputs caused expansion: the serializer

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

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

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

@@ -15,7 +15,8 @@
  ********************************************************************************/
 import { CommandStack } from '@eclipse-glsp/server';
 import * as z from 'zod/v4';
-import { McpToolResult, OperationMcpDiagramToolHandler } from '../../server';
+import { McpToolResult } from '../../server/mcp-handler-shared';
+import { OperationMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
 export declare const RedoInputSchema: z.ZodObject<{
     sessionId: z.ZodString;
     commandsToRedo: z.ZodDefault<z.ZodNumber>;

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

@@ -0,0 +1 @@
+{"version":3,"file":"redo-mcp-tool-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/tools/handlers/redo-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,SAI8C;IAClE,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;CAatF"}

package/lib/{tools → common/tools}/handlers/redo-mcp-tool-handler.js

@@ -29,8 +29,10 @@ exports.RedoMcpToolHandler = exports.RedoOutputSchema = exports.RedoInputSchema
 const server_1 = require("@eclipse-glsp/server");
 const inversify_1 = require("inversify");
 const z = require("zod/v4");
-const server_2 = require("../../server");
-exports.RedoInputSchema = server_2.McpDiagramScopedInputSchema.extend({
+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.RedoInputSchema = mcp_input_schemas_1.McpDiagramScopedInputSchema.extend({
     commandsToRedo: z.number().min(1).default(1).describe('Number of commands to redo. Defaults to 1 (most recent undone command).')
 });
 exports.RedoOutputSchema = z.object({
@@ -39,7 +41,7 @@ exports.RedoOutputSchema = z.object({
 /**
  * Redo a given number of the most recent undone actions on the command stack.
  */
-let RedoMcpToolHandler = RedoMcpToolHandler_1 = class RedoMcpToolHandler extends server_2.OperationMcpDiagramToolHandler {
+let RedoMcpToolHandler = RedoMcpToolHandler_1 = class RedoMcpToolHandler extends mcp_tool_handler_1.OperationMcpDiagramToolHandler {
     constructor() {
         super(...arguments);
         this.name = RedoMcpToolHandler_1.NAME;
@@ -53,7 +55,7 @@ let RedoMcpToolHandler = RedoMcpToolHandler_1 = class RedoMcpToolHandler extends
     }
     async createResult({ commandsToRedo }) {
         if (!this.commandStack.canRedo()) {
-            throw new server_2.McpToolError('Nothing to redo (redo stack is empty; perform an undo first or accept that the redo history was cleared by a subsequent edit).');
+            throw new mcp_handler_shared_1.McpToolError('Nothing to redo (redo stack is empty; perform an undo first or accept that the redo history was cleared by a subsequent edit).');
         }
         for (let i = 0; i < commandsToRedo; i++) {
             await this.actionDispatcher.dispatch(server_1.RedoAction.create());

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

@@ -0,0 +1 @@
+{"version":3,"file":"redo-mcp-tool-handler.js","sourceRoot":"","sources":["../../../../src/common/tools/handlers/redo-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,yEAAyE,CAAC;CACnI,CAAC,CAAC;AAGU,QAAA,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,kDAAkD,CAAC;CAChG,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,+GAA+G;YAC/G,wGAAwG;YACxG,kHAAkH;YAClH,6DAA6D,CAAC;QACzD,gBAAW,GAAG,uBAAe,CAAC;QACrB,iBAAY,GAAG,wBAAgB,CAAC;IAiBtD,CAAC;IAba,KAAK,CAAC,YAAY,CAAC,EAAE,cAAc,EAAa;QACtD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC;YAC/B,MAAM,IAAI,iCAAY,CAClB,gIAAgI,CACnI,CAAC;QACN,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;;AA1BQ,gDAAkB;AACX,uBAAI,GAAG,MAAM,AAAT,CAAU;AAWE;IAA/B,IAAA,kBAAM,EAAC,qBAAY,CAAC;;wDAAsC;6BAZlD,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;GACA,kBAAkB,CA2B9B"}

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

@@ -15,7 +15,9 @@
  ********************************************************************************/
 import { ActionDispatcher, CommandStack } from '@eclipse-glsp/server';
 import * as z from 'zod/v4';
-import { AbstractMcpDiagramToolHandler, McpLogger, McpToolResult } from '../../server';
+import { McpToolResult } from '../../server/mcp-handler-shared';
+import { McpLogger } from '../../server/mcp-logger';
+import { AbstractMcpDiagramToolHandler } from '../../server/mcp-tool-handler';
 export declare const SaveModelInputSchema: z.ZodObject<{
     sessionId: z.ZodString;
     fileUri: z.ZodOptional<z.ZodString>;

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

@@ -0,0 +1 @@
+{"version":3,"file":"save-model-mcp-tool-handler.d.ts","sourceRoot":"","sources":["../../../../src/common/tools/handlers/save-model-mcp-tool-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAmB,MAAM,sBAAsB,CAAC;AAEvF,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,6BAA6B,EAAE,MAAM,+BAA+B,CAAC;AAE9E,eAAO,MAAM,oBAAoB;;;iBAE/B,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAElE,eAAO,MAAM,qBAAqB;;;iBAMhC,CAAC;AAEH,2JAA2J;AAC3J,qBACa,uBAAwB,SAAQ,6BAA6B,CAAC,cAAc,CAAC;IACtF,MAAM,CAAC,QAAQ,CAAC,IAAI,gBAAgB;IACpC,QAAQ,CAAC,IAAI,gBAAgC;IAC7C,SAAkB,KAAK,wBAAwB;IAC/C,QAAQ,CAAC,WAAW,SAIoD;IACxE,QAAQ,CAAC,WAAW;;;sBAAwB;IAC5C,SAAkB,YAAY;;;sBAAyB;IACvD;;;;OAIG;IACH,SAAkB,YAAY,SAAS;IACvC,SAAkB,eAAe,EAAE,OAAO,CAAS;IACnD,SAAkB,cAAc,EAAE,OAAO,CAAS;IAExB,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IACjD,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IACxC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;cAElC,YAAY,CAAC,EAAE,OAAO,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;CAUpF"}

package/lib/{tools → common/tools}/handlers/save-model-mcp-tool-handler.js

@@ -29,8 +29,10 @@ exports.SaveModelMcpToolHandler = exports.SaveModelOutputSchema = exports.SaveMo
 const server_1 = require("@eclipse-glsp/server");
 const inversify_1 = require("inversify");
 const z = require("zod/v4");
-const server_2 = require("../../server");
-exports.SaveModelInputSchema = server_2.McpDiagramScopedInputSchema.extend({
+const mcp_input_schemas_1 = require("../../server/mcp-input-schemas");
+const mcp_logger_1 = require("../../server/mcp-logger");
+const mcp_tool_handler_1 = require("../../server/mcp-tool-handler");
+exports.SaveModelInputSchema = mcp_input_schemas_1.McpDiagramScopedInputSchema.extend({
     fileUri: z.string().optional().describe('Optional destination file URI. If not provided, saves to the original source model location.')
 });
 exports.SaveModelOutputSchema = z.object({
@@ -41,7 +43,7 @@ exports.SaveModelOutputSchema = z.object({
         .describe('Destination file URI when explicitly provided; absent when saving to the original source location.')
 });
 /** Doesn't extend `OperationMcpDiagramToolHandler` — saving a read-only model is a legitimate adopter scenario (e.g. "save as" to a writable location). */
-let SaveModelMcpToolHandler = SaveModelMcpToolHandler_1 = class SaveModelMcpToolHandler extends server_2.AbstractMcpDiagramToolHandler {
+let SaveModelMcpToolHandler = SaveModelMcpToolHandler_1 = class SaveModelMcpToolHandler extends mcp_tool_handler_1.AbstractMcpDiagramToolHandler {
     constructor() {
         super(...arguments);
         this.name = SaveModelMcpToolHandler_1.NAME;
@@ -82,8 +84,8 @@ __decorate([
     __metadata("design:type", Object)
 ], SaveModelMcpToolHandler.prototype, "commandStack", void 0);
 __decorate([
-    (0, inversify_1.inject)(server_2.McpLogger),
-    __metadata("design:type", server_2.McpLogger)
+    (0, inversify_1.inject)(mcp_logger_1.McpLogger),
+    __metadata("design:type", mcp_logger_1.McpLogger)
 ], SaveModelMcpToolHandler.prototype, "mcpLogger", void 0);
 exports.SaveModelMcpToolHandler = SaveModelMcpToolHandler = SaveModelMcpToolHandler_1 = __decorate([
     (0, inversify_1.injectable)()

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

@@ -0,0 +1 @@
+{"version":3,"file":"save-model-mcp-tool-handler.js","sourceRoot":"","sources":["../../../../src/common/tools/handlers/save-model-mcp-tool-handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,iDAAuF;AACvF,yCAA+C;AAC/C,4BAA4B;AAE5B,sEAA6E;AAC7E,wDAAoD;AACpD,oEAA8E;AAEjE,QAAA,oBAAoB,GAAG,+CAA2B,CAAC,MAAM,CAAC;IACnE,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,8FAA8F,CAAC;CAC1I,CAAC,CAAC;AAGU,QAAA,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1C,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,oGAAoG,CAAC;IACjI,OAAO,EAAE,CAAC;SACL,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,oGAAoG,CAAC;CACtH,CAAC,CAAC;AAEH,2JAA2J;AAEpJ,IAAM,uBAAuB,+BAA7B,MAAM,uBAAwB,SAAQ,gDAA6C;IAAnF;;QAEM,SAAI,GAAG,yBAAuB,CAAC,IAAI,CAAC;QAC3B,UAAK,GAAG,oBAAoB,CAAC;QACtC,gBAAW,GAChB,wDAAwD;YACxD,gEAAgE;YAChE,2EAA2E;YAC3E,mEAAmE,CAAC;QAC/D,gBAAW,GAAG,4BAAoB,CAAC;QAC1B,iBAAY,GAAG,6BAAqB,CAAC;QACvD;;;;WAIG;QACe,iBAAY,GAAG,KAAK,CAAC;QACrB,oBAAe,GAAY,KAAK,CAAC;QACjC,mBAAc,GAAY,KAAK,CAAC;IAgBtD,CAAC;IAVa,KAAK,CAAC,YAAY,CAAC,EAAE,OAAO,EAAkB;QACpD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YACnD,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QACzE,CAAC;QAED,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,wBAAe,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QAC1E,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,0BAA0B,OAAO,CAAC,CAAC,CAAC,OAAO,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACjF,OAAO,IAAI,CAAC,OAAO,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9E,CAAC;;AAjCQ,0DAAuB;AAChB,4BAAI,GAAG,YAAY,AAAf,CAAgB;AAmBA;IAAnC,IAAA,kBAAM,EAAC,yBAAgB,CAAC;;iEAA8C;AACvC;IAA/B,IAAA,kBAAM,EAAC,qBAAY,CAAC;;6DAAsC;AAC9B;IAA5B,IAAA,kBAAM,EAAC,sBAAS,CAAC;8BAAsB,sBAAS;0DAAC;kCAtBzC,uBAAuB;IADnC,IAAA,sBAAU,GAAE;GACA,uBAAuB,CAkCnC"}