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

package/lib/server/mcp-http-transport.js

@@ -0,0 +1,350 @@
+"use strict";
+/********************************************************************************
+ * Copyright (c) 2025-2026 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.McpHttpTransport = void 0;
+const server_1 = require("@eclipse-glsp/server");
+const express_js_1 = require("@modelcontextprotocol/sdk/server/express.js");
+const streamableHttp_js_1 = require("@modelcontextprotocol/sdk/server/streamableHttp.js");
+const types_js_1 = require("@modelcontextprotocol/sdk/types.js");
+const inversify_1 = require("inversify");
+const node_crypto_1 = require("node:crypto");
+const lru_event_store_1 = require("./lru-event-store");
+const mcp_options_1 = require("./mcp-options");
+let McpHttpTransport = class McpHttpTransport {
+    constructor(logger) {
+        this.logger = logger;
+        this._addressInfo = new server_1.Deferred();
+        this.sessions = new Map();
+        this.onSessionInitializedEmitter = new server_1.Emitter();
+        this.onSessionInitialized = this.onSessionInitializedEmitter.event;
+        this.onSessionClosedEmitter = new server_1.Emitter();
+        this.onSessionClosed = this.onSessionClosedEmitter.event;
+    }
+    get app() {
+        return this._app;
+    }
+    get server() {
+        return this._server;
+    }
+    getAddress() {
+        return this._addressInfo.promise;
+    }
+    async start(config) {
+        const { route, host, port } = config;
+        // `createMcpExpressApp` gives us (a) a base Express app, (b) `express.json()` body
+        // parsing — load-bearing; without it `req.body` is undefined and `isInitializeRequest`
+        // can't tell init from non-init — and (c) DNS-rebinding host-header validation for
+        // the configured allowlist. We forward our `allowedHosts` so the SDK's validator and
+        // any explicit policy share one source of truth.
+        this._app = (0, express_js_1.createMcpExpressApp)({ host, allowedHosts: this.serverOptions.values.allowedHosts });
+        // Allow subclasses to install Express middleware (auth, CORS, rate-limiting,
+        // request logging) before the MCP routes are registered. Default: origin allowlist.
+        this.configureExpressApp(this._app);
+        // MCP-Protocol-Version validation runs after subclass middleware so adopter-installed
+        // gates (auth, CORS) get first cut, but before the SDK route handlers so an unsupported
+        // header rejects with HTTP 400 cleanly per spec.
+        this._app.use(route, this.validateProtocolVersionHeader.bind(this));
+        this._app.post(route, this.handlePostRequest.bind(this));
+        this._app.get(route, this.handleGetRequest.bind(this));
+        this._app.delete(route, this.handleDeleteRequest.bind(this));
+        this._server = this._app.listen(port, host);
+        // Disable the per-request timeout so long-lived SSE GET streams aren't killed during
+        // chat idle periods. From Node's perspective an SSE response is a single in-progress
+        // request that lasts as long as the client stays connected, so the default 5-minute
+        // `requestTimeout` (Node 18.1+) terminates the socket whenever no events flow for
+        // ≥5 min — the client surfaces this as `TypeError: terminated`. We rely on the MCP
+        // session-id handshake + `onclose` to detect gone clients.
+        this._server.requestTimeout = 0;
+        this._server.on('listening', () => this.listening());
+        // Pre-listen errors (typically `EADDRINUSE`) fire on the http.Server. Without a
+        // listener the deferred address never resolves and `start()` hangs; with it we
+        // surface an actionable message naming the offending port + the override path.
+        this._server.on('error', err => this.handleListenError(err, host, port));
+        const addressInfo = await this.getAddress();
+        return { url: this.toServerUrl(addressInfo, route) };
+    }
+    /**
+     * Translate a pre-listen failure into an actionable error and reject the address-info
+     * deferred so `start()` propagates it to the caller. `EADDRINUSE` gets a tailored hint
+     * about overriding via `mcpServer.port`; other codes pass through unchanged.
+     */
+    handleListenError(err, host, port) {
+        if (err.code === 'EADDRINUSE') {
+            const portLabel = port === 0 ? 'requested address' : `${host}:${port}`;
+            this._addressInfo.reject(new Error(`MCP server cannot bind ${portLabel}: address already in use. ` +
+                'Pass a different `mcpServer.port` in the GLSP `initialize` call, or omit the port to get a random one.'));
+            return;
+        }
+        this._addressInfo.reject(err);
+    }
+    /**
+     * Hook for subclasses to register middleware on the Express app before the MCP routes
+     * are mounted. Called once during {@link start}, after the app is created and before
+     * `POST` / `GET` / `DELETE` handlers are added.
+     *
+     * Default behavior: install an Origin allowlist if one is configured. Host-header
+     * validation is already wired by the SDK's `createMcpExpressApp` (using the same
+     * `allowedHosts` we forward in {@link start}); we don't duplicate it here. Subclasses
+     * that override SHOULD `super.configureExpressApp(app)` to keep the origin gate in place;
+     * pre-existing security middleware can run before or after by calling super at the
+     * appropriate point.
+     */
+    configureExpressApp(app) {
+        const allowedOrigins = this.serverOptions.values.allowedOrigins;
+        if (!allowedOrigins) {
+            return;
+        }
+        app.use((req, res, next) => {
+            const origin = req.headers.origin;
+            if (origin && !allowedOrigins.includes(origin)) {
+                res.status(403).json({ error: `Forbidden: Origin '${origin}' not allowed` });
+                return;
+            }
+            next();
+        });
+    }
+    /**
+     * Validate the `MCP-Protocol-Version` header per the Streamable HTTP transport spec.
+     * Initialize POSTs negotiate the version in the body — the header isn't expected there.
+     * For every other request: absent header → pass through (the spec mandates the server
+     * default to `2025-03-26`); present-but-unsupported → respond `400` with a JSON-RPC error
+     * envelope so the client knows which versions to retry with.
+     */
+    validateProtocolVersionHeader(req, res, next) {
+        if (req.method === 'POST' && (0, types_js_1.isInitializeRequest)(req.body)) {
+            return next();
+        }
+        const headerValue = req.headers['mcp-protocol-version'];
+        const version = Array.isArray(headerValue) ? headerValue[0] : headerValue;
+        if (version === undefined) {
+            return next();
+        }
+        if (!types_js_1.SUPPORTED_PROTOCOL_VERSIONS.includes(version)) {
+            res.status(400).json({
+                jsonrpc: '2.0',
+                error: {
+                    code: -32000,
+                    message: `Unsupported MCP-Protocol-Version: '${version}'. ` +
+                        `Supported versions: ${types_js_1.SUPPORTED_PROTOCOL_VERSIONS.join(', ')}.`
+                },
+                id: JSON_RPC_NULL_ID
+            });
+            return;
+        }
+        next();
+    }
+    toServerUrl({ address, family, port }, route, protocol = 'http') {
+        const host = address === '::' || address === '0.0.0.0' ? 'localhost' : family === 'IPv6' ? `[${address}]` : address;
+        return `${protocol}://${host}:${port}${route}`;
+    }
+    listening() {
+        var _a, _b, _c;
+        const addressInfo = (_a = this.server) === null || _a === void 0 ? void 0 : _a.address();
+        if (!addressInfo) {
+            this.logger.error('Could not resolve MCP Server address info. Shutting down.');
+            (_b = this._server) === null || _b === void 0 ? void 0 : _b.close();
+            return;
+        }
+        else if (typeof addressInfo === 'string') {
+            this.logger.error(`MCP Server is unexpectedly listening to pipe or domain socket "${addressInfo}". Shutting down.`);
+            (_c = this._server) === null || _c === void 0 ? void 0 : _c.close();
+            return;
+        }
+        this._addressInfo.resolve(addressInfo);
+    }
+    async handlePostRequest(req, res) {
+        const client = this.getOrCreateClient(req, res);
+        if (!client) {
+            return;
+        }
+        this.logger.debug(`Handling POST request for session ${client.sessionId}`);
+        try {
+            await client.handleRequest(req, res, req.body);
+        }
+        catch (err) {
+            this.logger.error('Error handling MCP request:', err);
+            if (!res.headersSent) {
+                res.status(500).json({ jsonrpc: '2.0', error: { code: -32603, message: 'Internal server error' }, id: JSON_RPC_NULL_ID });
+            }
+        }
+    }
+    /**
+     * Handle GET requests for SSE streams (using built-in support from StreamableHTTP)
+     */
+    async handleGetRequest(req, res) {
+        const client = this.getClient(req, res);
+        if (!client) {
+            return;
+        }
+        // Check for Last-Event-ID header for resumability
+        const lastEventId = req.headers['last-event-id'];
+        if (lastEventId) {
+            this.logger.info(`Client reconnecting with Last-Event-ID: ${lastEventId}`);
+        }
+        else {
+            this.logger.info(`Establishing new SSE stream for session ${client.sessionId}`);
+        }
+        await client.handleRequest(req, res);
+    }
+    /**
+     * Handle DELETE requests for session termination (according to MCP spec).
+     */
+    async handleDeleteRequest(req, res) {
+        const client = this.getClient(req, res);
+        if (!client) {
+            return;
+        }
+        this.logger.info(`Received session termination request for session ${client.sessionId}`);
+        try {
+            // SDK transport closes the session as part of handleRequest.
+            await client.handleRequest(req, res);
+        }
+        catch (err) {
+            this.logger.error('Error handling session termination:', err);
+            if (!res.headersSent) {
+                res.status(500).json({ jsonrpc: '2.0', error: { code: -32603, message: 'Internal server error' }, id: JSON_RPC_NULL_ID });
+            }
+        }
+    }
+    getOrCreateClient(req, res) {
+        // A brand-new session is born on an initialize POST that doesn't assert a session id.
+        // Every other case falls through to `getClient`, which enforces the spec-mandated
+        // 400/404 errors — including the case where an initialize POST carries an unknown
+        // session id (§ #3 — must not silently mint a replacement).
+        if (!getSessionIdHeader(req) && (0, types_js_1.isInitializeRequest)(req.body)) {
+            return this.createClient();
+        }
+        return this.getClient(req, res);
+    }
+    getClient(req, res) {
+        const sessionId = getSessionIdHeader(req);
+        if (!sessionId) {
+            // MCP Streamable HTTP § Session Management #2: a non-initialize request without
+            // a session id MUST be rejected with HTTP 400.
+            res.status(400).json({
+                jsonrpc: '2.0',
+                error: { code: -32000, message: 'Bad Request: No valid session ID provided' },
+                id: JSON_RPC_NULL_ID
+            });
+            return undefined;
+        }
+        const client = this.sessions.get(sessionId);
+        if (!client) {
+            // MCP Streamable HTTP § Session Management #3: requests bearing an unknown or
+            // terminated session id MUST be answered with HTTP 404 so the client knows to
+            // re-initialize.
+            res.status(404).json({
+                jsonrpc: '2.0',
+                error: { code: -32001, message: 'Session not found' },
+                id: JSON_RPC_NULL_ID
+            });
+            return undefined;
+        }
+        return client;
+    }
+    createClient() {
+        const client = new streamableHttp_js_1.StreamableHTTPServerTransport({
+            sessionIdGenerator: () => (0, node_crypto_1.randomUUID)(),
+            // Bounded LRU store so resumability via `Last-Event-ID` works without leaking
+            // memory in long-running deployments. Cap configurable via `eventStoreLimit`.
+            eventStore: new lru_event_store_1.LruEventStore(this.serverOptions.values.eventStoreLimit, this.logger),
+            onsessioninitialized: sessionId => {
+                // Store the transport by session ID when session is initialized
+                // This avoids race conditions where requests might come in before the session is stored
+                this.logger.info(`Session initialized with ID: ${sessionId}`);
+                this.sessions.set(sessionId, client);
+                this.onSessionInitializedEmitter.fire(client);
+            }
+        });
+        client.onclose = () => this.closeClient(client.sessionId);
+        // Surface transport errors to the GLSP logger. SDK 1.27.1 routes previously-swallowed
+        // errors here; without an explicit handler they go undiagnosed.
+        client.onerror = err => { var _a; return this.logger.error(`MCP transport error (session ${(_a = client.sessionId) !== null && _a !== void 0 ? _a : '<pre-init>'}):`, err); };
+        return client;
+    }
+    closeClient(sessionId) {
+        if (!sessionId) {
+            return;
+        }
+        const client = this.sessions.get(sessionId);
+        if (client) {
+            this.sessions.delete(sessionId);
+            client.close();
+            this.logger.info(`Closed and removed client with session ID ${sessionId}`);
+            this.onSessionClosedEmitter.fire(sessionId);
+        }
+    }
+    dispose() {
+        var _a;
+        // Close session transports first so their SSE responses end cleanly. `http.Server.close()`
+        // only stops accepting new connections — existing sockets stay open until they drain — so
+        // closing the server first would leave streams hanging until the per-session `client.close()`
+        // catches up.
+        // `Transport.close()` is async (returns Promise<void>) but `Disposable.dispose()` is sync,
+        // so we attach a catch handler to keep stray rejections out of the unhandled-rejection log.
+        Array.from(this.sessions.values()).forEach(client => client.close().catch(err => this.logger.warn(`Error closing MCP session ${client.sessionId}: ${err}`)));
+        this.sessions.clear();
+        (_a = this._server) === null || _a === void 0 ? void 0 : _a.close();
+        // Reset transient state so a subsequent `start()` call boots cleanly. Required because
+        // the transport is bound `inSingletonScope()` — without the reset, dispose-then-restart
+        // (e.g., GLSP server shutdown followed by a fresh `initializeServer`) would reuse the
+        // dead `_addressInfo` deferred and the closed Express app.
+        this._app = undefined;
+        this._server = undefined;
+        this._addressInfo = new server_1.Deferred();
+        this.logger.info('Server shutdown complete');
+    }
+};
+exports.McpHttpTransport = McpHttpTransport;
+__decorate([
+    (0, inversify_1.inject)(mcp_options_1.McpServerOptions),
+    __metadata("design:type", mcp_options_1.McpServerOptions)
+], McpHttpTransport.prototype, "serverOptions", void 0);
+exports.McpHttpTransport = McpHttpTransport = __decorate([
+    (0, inversify_1.injectable)(),
+    __param(0, (0, inversify_1.inject)(server_1.Logger)),
+    __metadata("design:paramtypes", [server_1.Logger])
+], McpHttpTransport);
+/**
+ * Read the `mcp-session-id` header. Node's `IncomingHttpHeaders` types unknown headers as
+ * `string | string[] | undefined`; if a misbehaving client sends the header twice we pick
+ * the first value rather than coercing the array to `"a,b"` and silently failing the lookup.
+ */
+function getSessionIdHeader(req) {
+    const value = req.headers['mcp-session-id'];
+    return Array.isArray(value) ? value[0] : value;
+}
+/**
+ * JSON-RPC 2.0 § 5 mandates `null` for error responses where the request id cannot be
+ * determined (e.g., parse errors, batch-level rejection, missing session id). Centralised so
+ * the unavoidable `null` literal lives behind one eslint exception instead of many.
+ */
+// eslint-disable-next-line no-null/no-null
+const JSON_RPC_NULL_ID = null;
+//# sourceMappingURL=mcp-http-transport.js.map

package/lib/server/mcp-http-transport.js.map

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

package/lib/server/mcp-id-alias-service.d.ts

@@ -0,0 +1,70 @@
+/********************************************************************************
+ * Copyright (c) 2026 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export declare const McpIdAliasService: unique symbol;
+/**
+ * Maps real GLSP element ids to a shorter, more LLM-friendly form on the wire. Tool/resource
+ * handlers `alias` real ids before emitting them and `lookup` incoming aliases before passing
+ * them to the model.
+ *
+ * Bound per GLSP client session — alias state is shared across MCP clients connected to the
+ * same GLSP session (id↔alias round-tripping must be consistent across clients). Adopters
+ * who want raw ids on the wire bind {@link NullMcpIdAliasService} via
+ * {@link DefaultMcpDiagramModule.bindIdAliasService}.
+ *
+ * @experimental
+ */
+export interface McpIdAliasService {
+    /**
+     * Returns the alias for the given real id, allocating one on first call. Stable across
+     * subsequent calls within the same session.
+     */
+    alias(realId: string): string;
+    /**
+     * Resolves an alias back to its real id. Falls back to the input verbatim when no mapping
+     * exists, so callers can pass either an alias or a real id without branching: aliased ids
+     * round-trip; real ids (manual user input, copy-paste, ids surfaced from earlier
+     * server-side state) pass through. Downstream existence checks
+     * (`modelState.index.find`, the operation handler) decide validity.
+     */
+    lookup(aliasOrRealId: string): string;
+}
+/**
+ * Default {@link McpIdAliasService} — sequential integer aliases per session.
+ *
+ * Collision avoidance: every real id passed to {@link alias} is also recorded in a known-real
+ * set. When minting, candidate alias strings that collide with a known real id are skipped, so
+ * a model element whose actual id is e.g. `"1"` cannot be shadowed by an alias mapped to a
+ * different real id. This is conditional on the existing convention that every real id
+ * surfaced to the LLM flows through `alias()` at least once before the LLM can refer to it —
+ * adopter-written handlers that bypass `alias()` re-open the corner case.
+ */
+export declare class DefaultMcpIdAliasService implements McpIdAliasService {
+    protected idToAlias: Map<string, string>;
+    protected aliasToId: Map<string, string>;
+    protected realIds: Set<string>;
+    protected counter: number;
+    alias(realId: string): string;
+    lookup(aliasOrRealId: string): string;
+}
+/**
+ * Null-object {@link McpIdAliasService} — passes ids through unchanged. Bind this in
+ * {@link DefaultMcpDiagramModule.bindIdAliasService} to expose raw GLSP ids on the wire.
+ */
+export declare class NullMcpIdAliasService implements McpIdAliasService {
+    alias(realId: string): string;
+    lookup(aliasOrRealId: string): string;
+}
+//# sourceMappingURL=mcp-id-alias-service.d.ts.map

package/lib/server/mcp-id-alias-service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-id-alias-service.d.ts","sourceRoot":"","sources":["../../src/server/mcp-id-alias-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAIlF,eAAO,MAAM,iBAAiB,eAA8B,CAAC;AAE7D;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,iBAAiB;IAC9B;;;OAGG;IACH,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9B;;;;;;OAMG;IACH,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC;CACzC;AAED;;;;;;;;;GASG;AACH,qBACa,wBAAyB,YAAW,iBAAiB;IAC9D,SAAS,CAAC,SAAS,sBAA6B;IAChD,SAAS,CAAC,SAAS,sBAA6B;IAChD,SAAS,CAAC,OAAO,cAAqB;IACtC,SAAS,CAAC,OAAO,SAAK;IAEtB,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAoB7B,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;CAGxC;AAED;;;GAGG;AACH,qBACa,qBAAsB,YAAW,iBAAiB;IAC3D,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAI7B,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;CAGxC"}

package/lib/server/mcp-id-alias-service.js

@@ -0,0 +1,85 @@
+"use strict";
+/********************************************************************************
+ * Copyright (c) 2026 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NullMcpIdAliasService = exports.DefaultMcpIdAliasService = exports.McpIdAliasService = void 0;
+const inversify_1 = require("inversify");
+exports.McpIdAliasService = Symbol('McpIdAliasService');
+/**
+ * Default {@link McpIdAliasService} — sequential integer aliases per session.
+ *
+ * Collision avoidance: every real id passed to {@link alias} is also recorded in a known-real
+ * set. When minting, candidate alias strings that collide with a known real id are skipped, so
+ * a model element whose actual id is e.g. `"1"` cannot be shadowed by an alias mapped to a
+ * different real id. This is conditional on the existing convention that every real id
+ * surfaced to the LLM flows through `alias()` at least once before the LLM can refer to it —
+ * adopter-written handlers that bypass `alias()` re-open the corner case.
+ */
+let DefaultMcpIdAliasService = class DefaultMcpIdAliasService {
+    constructor() {
+        this.idToAlias = new Map();
+        this.aliasToId = new Map();
+        this.realIds = new Set();
+        this.counter = 1;
+    }
+    alias(realId) {
+        this.realIds.add(realId);
+        const existingAlias = this.idToAlias.get(realId);
+        if (existingAlias) {
+            return existingAlias;
+        }
+        let candidate = this.counter.toString();
+        while (this.realIds.has(candidate)) {
+            this.counter += 1;
+            candidate = this.counter.toString();
+        }
+        this.counter += 1;
+        this.idToAlias.set(realId, candidate);
+        this.aliasToId.set(candidate, realId);
+        return candidate;
+    }
+    lookup(aliasOrRealId) {
+        var _a;
+        return (_a = this.aliasToId.get(aliasOrRealId)) !== null && _a !== void 0 ? _a : aliasOrRealId;
+    }
+};
+exports.DefaultMcpIdAliasService = DefaultMcpIdAliasService;
+exports.DefaultMcpIdAliasService = DefaultMcpIdAliasService = __decorate([
+    (0, inversify_1.injectable)()
+], DefaultMcpIdAliasService);
+/**
+ * Null-object {@link McpIdAliasService} — passes ids through unchanged. Bind this in
+ * {@link DefaultMcpDiagramModule.bindIdAliasService} to expose raw GLSP ids on the wire.
+ */
+let NullMcpIdAliasService = class NullMcpIdAliasService {
+    alias(realId) {
+        return realId;
+    }
+    lookup(aliasOrRealId) {
+        return aliasOrRealId;
+    }
+};
+exports.NullMcpIdAliasService = NullMcpIdAliasService;
+exports.NullMcpIdAliasService = NullMcpIdAliasService = __decorate([
+    (0, inversify_1.injectable)()
+], NullMcpIdAliasService);
+//# sourceMappingURL=mcp-id-alias-service.js.map

package/lib/server/mcp-id-alias-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-id-alias-service.js","sourceRoot":"","sources":["../../src/server/mcp-id-alias-service.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,yCAAuC;AAE1B,QAAA,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AA8B7D;;;;;;;;;GASG;AAEI,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAA9B;QACO,cAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;QACtC,cAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;QACtC,YAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAC5B,YAAO,GAAG,CAAC,CAAC;IAyB1B,CAAC;IAvBG,KAAK,CAAC,MAAc;QAChB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACzB,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,aAAa,EAAE,CAAC;YAChB,OAAO,aAAa,CAAC;QACzB,CAAC;QAED,IAAI,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACjC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;YAClB,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACxC,CAAC;QACD,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;QAElB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACtC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAEtC,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,aAAqB;;QACxB,OAAO,MAAA,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,mCAAI,aAAa,CAAC;IAC9D,CAAC;CACJ,CAAA;AA7BY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CA6BpC;AAED;;;GAGG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAC9B,KAAK,CAAC,MAAc;QAChB,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,MAAM,CAAC,aAAqB;QACxB,OAAO,aAAa,CAAC;IACzB,CAAC;CACJ,CAAA;AARY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,sBAAU,GAAE;GACA,qBAAqB,CAQjC"}

package/lib/server/mcp-input-schemas.d.ts

@@ -0,0 +1,73 @@
+/********************************************************************************
+ * Copyright (c) 2026 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+import * as z from 'zod/v4';
+/**
+ * Common Zod input-schema fragments shared across MCP tool / resource / prompt handlers.
+ * Adopters compose these via `z.object({ ... })` or `McpDiagramScopedInputSchema.extend(...)`
+ * — Zod's modifiers (`.describe`, `.optional`, `.min`, ...) return new schemas without mutating
+ * the exports, so the shared fragments can be safely adapted at the call site.
+ *
+ * @example
+ * ```ts
+ * import { McpDiagramScopedInputSchema, elementIds } from '@eclipse-glsp/server-mcp';
+ *
+ * // Use as-is — the tool's `description` field already conveys the action context:
+ * const inputSchema = McpDiagramScopedInputSchema.extend({ elementIds });
+ *
+ * // Override `describe` only when there's genuinely new info (defaults, conditional applicability):
+ * const inputSchema = McpDiagramScopedInputSchema.extend({
+ *     elementIds: elementIds.optional().describe('If not provided, validates entire model.')
+ * });
+ * ```
+ */
+/** GLSP client session id (open diagram). Resolved by the launcher dispatcher via `ClientSessionManager`. */
+export declare const sessionId: z.ZodString;
+/** Single element id — alias or real; handlers translate via `resolveIds` on the diagram base. */
+export declare const elementId: z.ZodString;
+/** One or more element ids. Empty arrays are rejected. */
+export declare const elementIds: z.ZodArray<z.ZodString>;
+/** Cartesian position used by node-creation / -modification tools. */
+export declare const position: z.ZodObject<{
+    x: z.ZodNumber;
+    y: z.ZodNumber;
+}, z.core.$strict>;
+/**
+ * Base schema for diagram-scope tool / prompt / resource-tool-alternative input. Adopter
+ * schemas extend this via {@link z.ZodObject.extend} and add their tool-specific fields.
+ */
+export declare const McpDiagramScopedInputSchema: z.ZodObject<{
+    sessionId: z.ZodString;
+}, z.core.$strip>;
+/**
+ * Compact identity echoed by mutating tools (create / modify / delete) so the LLM has enough
+ * context to refer to the element by label or type in user-facing prose without a follow-up
+ * `query-elements`. The `id` is the alias.
+ */
+export declare const ElementIdentitySchema: z.ZodObject<{
+    id: z.ZodString;
+    elementTypeId: z.ZodString;
+    label: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
+/** Inferred shape of {@link ElementIdentitySchema} — see its docstring for usage. */
+export type ElementIdentity = z.infer<typeof ElementIdentitySchema>;
+/**
+ * Inferred shape of {@link McpDiagramScopedInputSchema} — `{ sessionId: string }`. Any
+ * adopter input schema that extends `McpDiagramScopedInputSchema` infers a type structurally
+ * assignable to this; used as the upper bound on diagram-scope handler generics
+ * (`<T extends McpDiagramScopedInput = McpDiagramScopedInput>`).
+ */
+export type McpDiagramScopedInput = z.infer<typeof McpDiagramScopedInputSchema>;
+//# sourceMappingURL=mcp-input-schemas.d.ts.map

package/lib/server/mcp-input-schemas.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-input-schemas.d.ts","sourceRoot":"","sources":["../../src/server/mcp-input-schemas.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAE5B;;;;;;;;;;;;;;;;;;GAkBG;AAEH,6GAA6G;AAC7G,eAAO,MAAM,SAAS,aAAgE,CAAC;AAEvF,kGAAkG;AAClG,eAAO,MAAM,SAAS,aAAa,CAAC;AAEpC,0DAA0D;AAC1D,eAAO,MAAM,UAAU,yBAA6B,CAAC;AAErD,sEAAsE;AACtE,eAAO,MAAM,QAAQ;;;kBAKR,CAAC;AAEd;;;GAGG;AACH,eAAO,MAAM,2BAA2B;;iBAA0B,CAAC;AAEnE;;;;GAIG;AACH,eAAO,MAAM,qBAAqB;;;;iBAIhC,CAAC;AAEH,qFAAqF;AACrF,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEpE;;;;;GAKG;AACH,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAC"}