@theia/ai-mcp 1.66.0-next.41 → 1.66.0-next.67

package/lib/browser/mcp-frontend-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/mcp-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAO/D,wBASG"}
+{"version":3,"file":"mcp-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/mcp-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAc/D,wBA2DG"}

package/lib/browser/mcp-frontend-module.js

@@ -21,14 +21,61 @@ const mcp_server_manager_1 = require("../common/mcp-server-manager");
 const mcp_frontend_application_contribution_1 = require("./mcp-frontend-application-contribution");
 const mcp_frontend_service_1 = require("./mcp-frontend-service");
 const mcp_frontend_notification_service_1 = require("./mcp-frontend-notification-service");
+const mcp_server_manager_server_client_1 = require("./mcp-server-manager-server-client");
+const mcp_protocol_1 = require("../common/mcp-protocol");
 exports.default = new inversify_1.ContainerModule(bind => {
     bind(browser_1.FrontendApplicationContribution).to(mcp_frontend_application_contribution_1.McpFrontendApplicationContribution).inSingletonScope();
     bind(mcp_server_manager_1.MCPFrontendService).to(mcp_frontend_service_1.MCPFrontendServiceImpl).inSingletonScope();
     bind(mcp_server_manager_1.MCPFrontendNotificationService).to(mcp_frontend_notification_service_1.MCPFrontendNotificationServiceImpl).inSingletonScope();
+    bind(mcp_protocol_1.MCPServerManagerServerClient).to(mcp_server_manager_server_client_1.MCPServerManagerServerClientImpl).inSingletonScope();
+    bind(mcp_protocol_1.MCPServerManagerServer).toDynamicValue(ctx => {
+        const connection = ctx.container.get(browser_1.RemoteConnectionProvider);
+        const client = ctx.container.get(mcp_protocol_1.MCPServerManagerServerClient);
+        return connection.createProxy(mcp_protocol_1.MCPServerManagerServerPath, client);
+    }).inSingletonScope();
     bind(mcp_server_manager_1.MCPServerManager).toDynamicValue(ctx => {
+        const mgrServer = ctx.container.get(mcp_protocol_1.MCPServerManagerServer);
         const connection = ctx.container.get(browser_1.RemoteConnectionProvider);
         const client = ctx.container.get(mcp_server_manager_1.MCPFrontendNotificationService);
-        return connection.createProxy(mcp_server_manager_1.MCPServerManagerPath, client);
+        const serverClient = ctx.container.get(mcp_protocol_1.MCPServerManagerServerClient);
+        const backendServerManager = connection.createProxy(mcp_server_manager_1.MCPServerManagerPath, client);
+        // Listen to server updates to clean up removed servers
+        client.onDidUpdateMCPServers(() => backendServerManager.getServerNames()
+            .then(names => serverClient.cleanServers(names))
+            .catch((error) => {
+            console.error('Error cleaning server descriptions:', error);
+        }));
+        // We proxy the MCPServerManager to override addOrUpdateServer and getServerDescription
+        // to handle the resolve functions via the MCPServerManagerServerClient.
+        return new Proxy(backendServerManager, {
+            get(target, prop, receiver) {
+                // override addOrUpdateServer to store the original description in the MCPServerManagerServerClient
+                // to be used in resolveServerDescription if a resolve function is provided
+                if (prop === 'addOrUpdateServer') {
+                    return async function (...args) {
+                        const updated = serverClient.addServerDescription(args[0]);
+                        await mgrServer.addOrUpdateServer(updated);
+                    };
+                }
+                // override getServerDescription to mix in the resolve function from the client
+                if (prop === 'getServerDescription') {
+                    return async function (name) {
+                        const description = await Reflect.apply(target.getServerDescription, target, [name]);
+                        if (description) {
+                            const resolveFunction = serverClient.getResolveFunction(name);
+                            if (resolveFunction) {
+                                return {
+                                    ...description,
+                                    resolve: resolveFunction
+                                };
+                            }
+                        }
+                        return description;
+                    };
+                }
+                return Reflect.get(target, prop, receiver);
+            }
+        });
     }).inSingletonScope();
 });
 //# sourceMappingURL=mcp-frontend-module.js.map

package/lib/browser/mcp-frontend-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-frontend-module.js","sourceRoot":"","sources":["../../src/browser/mcp-frontend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,4DAA+D;AAC/D,qDAA+H;AAC/H,qEAA0I;AAC1I,mGAA6F;AAC7F,iEAAgE;AAChE,2FAAyF;AAEzF,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,yCAA+B,CAAC,CAAC,EAAE,CAAC,0EAAkC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAChG,IAAI,CAAC,uCAAkB,CAAC,CAAC,EAAE,CAAC,6CAAsB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACvE,IAAI,CAAC,mDAA8B,CAAC,CAAC,EAAE,CAAC,sEAAkC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC/F,IAAI,CAAC,qCAAgB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QACxC,MAAM,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAA4B,kCAAwB,CAAC,CAAC;QAC1F,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAiC,mDAA8B,CAAC,CAAC;QACjG,OAAO,UAAU,CAAC,WAAW,CAAmB,yCAAoB,EAAE,MAAM,CAAC,CAAC;IAClF,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;AAC1B,CAAC,CAAC,CAAC"}
+{"version":3,"file":"mcp-frontend-module.js","sourceRoot":"","sources":["../../src/browser/mcp-frontend-module.ts"],"names":[],"mappings":"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"}

package/lib/browser/mcp-server-manager-server-client.d.ts

@@ -0,0 +1,12 @@
+import { MCPServerDescription } from '../common';
+import { MCPServerDescriptionRCP, MCPServerManagerServerClient } from '../common/mcp-protocol';
+type StoredServerInfo = Pick<MCPServerDescription, 'name' | 'resolve'>;
+export declare class MCPServerManagerServerClientImpl implements MCPServerManagerServerClient {
+    protected serverDescriptions: Map<string, StoredServerInfo>;
+    addServerDescription(description: MCPServerDescription): MCPServerDescriptionRCP;
+    getResolveFunction(name: string): MCPServerDescription['resolve'];
+    resolveServerDescription(description: MCPServerDescriptionRCP): Promise<MCPServerDescription>;
+    cleanServers(serverNames: string[]): void;
+}
+export {};
+//# sourceMappingURL=mcp-server-manager-server-client.d.ts.map

package/lib/browser/mcp-server-manager-server-client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-server-manager-server-client.d.ts","sourceRoot":"","sources":["../../src/browser/mcp-server-manager-server-client.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAEjD,OAAO,EAA0B,uBAAuB,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAEvH,KAAK,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;AAEvE,qBACa,gCAAiC,YAAW,4BAA4B;IAEjF,SAAS,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAa;IAExE,oBAAoB,CAAC,WAAW,EAAE,oBAAoB,GAAG,uBAAuB;IAoBhF,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,CAAC,SAAS,CAAC;IAS3D,wBAAwB,CAAC,WAAW,EAAE,uBAAuB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAcnG,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI;CAU5C"}

package/lib/browser/mcp-server-manager-server-client.js

@@ -0,0 +1,80 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2025 Dirk Fauth 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MCPServerManagerServerClientImpl = void 0;
+const tslib_1 = require("tslib");
+const inversify_1 = require("@theia/core/shared/inversify");
+const uuid_1 = require("@theia/core/lib/common/uuid");
+const mcp_protocol_1 = require("../common/mcp-protocol");
+let MCPServerManagerServerClientImpl = class MCPServerManagerServerClientImpl {
+    constructor() {
+        this.serverDescriptions = new Map();
+    }
+    addServerDescription(description) {
+        if (description.resolve) {
+            const serverDescription = {
+                ...description,
+                resolveId: (0, uuid_1.generateUuid)(),
+            };
+            // store only the name and resolve function
+            if (serverDescription.resolveId) {
+                this.serverDescriptions.set(serverDescription.resolveId, {
+                    name: description.name,
+                    resolve: description.resolve
+                });
+            }
+            return serverDescription;
+        }
+        return description;
+    }
+    getResolveFunction(name) {
+        for (const storedInfo of this.serverDescriptions.values()) {
+            if (storedInfo.name === name) {
+                return storedInfo.resolve;
+            }
+        }
+        return undefined;
+    }
+    async resolveServerDescription(description) {
+        const cleanDescription = (0, mcp_protocol_1.cleanServerDescription)(description);
+        if (description.resolveId) {
+            const storedInfo = this.serverDescriptions.get(description.resolveId);
+            if (storedInfo === null || storedInfo === void 0 ? void 0 : storedInfo.resolve) {
+                const updated = await storedInfo.resolve(cleanDescription);
+                if (updated) {
+                    return updated;
+                }
+            }
+        }
+        return cleanDescription;
+    }
+    cleanServers(serverNames) {
+        const currentNamesSet = new Set(serverNames);
+        // Remove descriptions for servers that no longer exist
+        for (const [resolveId, storedInfo] of this.serverDescriptions.entries()) {
+            if (storedInfo.name && !currentNamesSet.has(storedInfo.name)) {
+                console.debug('Removing a frontend stored resolve function because the corresponding MCP server was removed', storedInfo);
+                this.serverDescriptions.delete(resolveId);
+            }
+        }
+    }
+};
+exports.MCPServerManagerServerClientImpl = MCPServerManagerServerClientImpl;
+exports.MCPServerManagerServerClientImpl = MCPServerManagerServerClientImpl = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], MCPServerManagerServerClientImpl);
+//# sourceMappingURL=mcp-server-manager-server-client.js.map

package/lib/browser/mcp-server-manager-server-client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-server-manager-server-client.js","sourceRoot":"","sources":["../../src/browser/mcp-server-manager-server-client.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,4CAA4C;AAC5C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAA0D;AAE1D,sDAA2D;AAC3D,yDAAuH;AAKhH,IAAM,gCAAgC,GAAtC,MAAM,gCAAgC;IAAtC;QAEO,uBAAkB,GAAkC,IAAI,GAAG,EAAE,CAAC;IAuD5E,CAAC;IArDG,oBAAoB,CAAC,WAAiC;QAClD,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACtB,MAAM,iBAAiB,GAA4B;gBAC/C,GAAG,WAAW;gBACd,SAAS,EAAE,IAAA,mBAAY,GAAE;aAC5B,CAAC;YAEF,2CAA2C;YAC3C,IAAI,iBAAiB,CAAC,SAAS,EAAE,CAAC;gBAC9B,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,iBAAiB,CAAC,SAAS,EAAE;oBACrD,IAAI,EAAE,WAAW,CAAC,IAAI;oBACtB,OAAO,EAAE,WAAW,CAAC,OAAO;iBAC/B,CAAC,CAAC;YACP,CAAC;YAED,OAAO,iBAAiB,CAAC;QAC7B,CAAC;QACD,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,kBAAkB,CAAC,IAAY;QAC3B,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE,CAAC;YACxD,IAAI,UAAU,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;gBAC3B,OAAO,UAAU,CAAC,OAAO,CAAC;YAC9B,CAAC;QACL,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,WAAoC;QAC/D,MAAM,gBAAgB,GAAG,IAAA,qCAAsB,EAAC,WAAW,CAAC,CAAC;QAC7D,IAAI,WAAW,CAAC,SAAS,EAAE,CAAC;YACxB,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YACtE,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,EAAE,CAAC;gBACtB,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;gBAC3D,IAAI,OAAO,EAAE,CAAC;oBACV,OAAO,OAAO,CAAC;gBACnB,CAAC;YACL,CAAC;QACL,CAAC;QACD,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAED,YAAY,CAAC,WAAqB;QAC9B,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;QAC7C,uDAAuD;QACvD,KAAK,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAE,CAAC;YACtE,IAAI,UAAU,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC3D,OAAO,CAAC,KAAK,CAAC,8FAA8F,EAAE,UAAU,CAAC,CAAC;gBAC1H,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC9C,CAAC;QACL,CAAC;IACL,CAAC;CACJ,CAAA;AAzDY,4EAAgC;2CAAhC,gCAAgC;IAD5C,IAAA,sBAAU,GAAE;GACA,gCAAgC,CAyD5C"}

package/lib/common/mcp-protocol.d.ts

@@ -0,0 +1,52 @@
+import { MCPServerDescription } from './mcp-server-manager';
+/**
+ * MCPServerDescriptionRCP is a version of MCPServerDescription that can be sent over RCP.
+ * It omits the 'resolve' function and instead includes an optional 'resolveId' to identify
+ * the resolve function on the client side.
+ */
+export type MCPServerDescriptionRCP = Omit<MCPServerDescription, 'resolve'> & {
+    resolveId?: string;
+};
+export declare const MCPServerManagerServer: unique symbol;
+export declare const MCPServerManagerServerPath = "/services/mcpservermanagerserver";
+/**
+ * The MCPServerManagerServer handles the RCP specialties of adding server descriptions from the frontend
+ */
+export interface MCPServerManagerServer {
+    addOrUpdateServer(description: MCPServerDescriptionRCP): Promise<void>;
+    setClient(client: MCPServerManagerServerClient): void;
+}
+export declare const MCPServerManagerServerClient: unique symbol;
+export interface MCPServerManagerServerClient {
+    /**
+     * Adds a server description to the client. If the description contains a resolve function,
+     * a unique resolveId is generated and only the name and resolve function are stored.
+     * @param description The server description to add.
+     * @returns The server description with a unique resolveId if a resolve function is provided
+     * or the given description if no resolve function is provided.
+     */
+    addServerDescription(description: MCPServerDescription): MCPServerDescriptionRCP;
+    /**
+     * Retrieves the resolve function for a given server name.
+     * @param name The name of the server to retrieve the resolve function for.
+     * @returns The resolve function if found, or undefined if not found.
+     */
+    getResolveFunction(name: string): MCPServerDescription['resolve'];
+    /**
+     * Resolves the server description by calling the resolve function if it exists.
+     * @param description The server description to resolve.
+     * @returns The resolved server description.
+     */
+    resolveServerDescription(description: MCPServerDescriptionRCP): Promise<MCPServerDescription>;
+    /**
+     * Removes server descriptions that are no longer present in the MCPServerManager.
+     *
+     * @param serverNames The current list of server names from the MCPServerManager.
+     */
+    cleanServers(serverNames: string[]): void;
+}
+/**
+ * Util function to convert a MCPServerDescriptionRCP to a MCPServerDescription by removing the resolveId.
+ */
+export declare const cleanServerDescription: (description: MCPServerDescriptionRCP) => MCPServerDescription;
+//# sourceMappingURL=mcp-protocol.d.ts.map

package/lib/common/mcp-protocol.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-protocol.d.ts","sourceRoot":"","sources":["../../src/common/mcp-protocol.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D;;;;GAIG;AACH,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC,GAAG;IAC1E,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AACvE,eAAO,MAAM,0BAA0B,qCAAqC,CAAC;AAE7E;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACnC,iBAAiB,CAAC,WAAW,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvE,SAAS,CAAC,MAAM,EAAE,4BAA4B,GAAG,IAAI,CAAA;CACxD;AAED,eAAO,MAAM,4BAA4B,eAAyC,CAAC;AACnF,MAAM,WAAW,4BAA4B;IACzC;;;;;;OAMG;IACH,oBAAoB,CAAC,WAAW,EAAE,oBAAoB,GAAG,uBAAuB,CAAC;IACjF;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAClE;;;;OAIG;IACH,wBAAwB,CAAC,WAAW,EAAE,uBAAuB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC9F;;;;OAIG;IACH,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CAC7C;AAED;;GAEG;AACH,eAAO,MAAM,sBAAsB,gBAAiB,uBAAuB,KAAG,oBAG7E,CAAC"}

package/lib/common/mcp-protocol.js

@@ -0,0 +1,30 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2025 EclipseSource GmbH.
+//
+// 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanServerDescription = exports.MCPServerManagerServerClient = exports.MCPServerManagerServerPath = exports.MCPServerManagerServer = void 0;
+exports.MCPServerManagerServer = Symbol('MCPServerManagerServer');
+exports.MCPServerManagerServerPath = '/services/mcpservermanagerserver';
+exports.MCPServerManagerServerClient = Symbol('MCPServerManagerServerClient');
+/**
+ * Util function to convert a MCPServerDescriptionRCP to a MCPServerDescription by removing the resolveId.
+ */
+const cleanServerDescription = (description) => {
+    const { resolveId, ...descriptionProperties } = description;
+    return { ...descriptionProperties };
+};
+exports.cleanServerDescription = cleanServerDescription;
+//# sourceMappingURL=mcp-protocol.js.map

package/lib/common/mcp-protocol.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-protocol.js","sourceRoot":"","sources":["../../src/common/mcp-protocol.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAanE,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAC1D,QAAA,0BAA0B,GAAG,kCAAkC,CAAC;AAUhE,QAAA,4BAA4B,GAAG,MAAM,CAAC,8BAA8B,CAAC,CAAC;AA8BnF;;GAEG;AACI,MAAM,sBAAsB,GAAG,CAAC,WAAoC,EAAwB,EAAE;IACjG,MAAM,EAAE,SAAS,EAAE,GAAG,qBAAqB,EAAE,GAAG,WAAW,CAAC;IAC5D,OAAO,EAAE,GAAG,qBAAqB,EAA0B,CAAC;AAChE,CAAC,CAAC;AAHW,QAAA,sBAAsB,0BAGjC"}

package/lib/common/mcp-server-manager.d.ts

@@ -75,6 +75,16 @@ export interface BaseMCPServerDescription {
      * List of available tools for the server. Returns the name and description if available.
      */
     tools?: ToolInformation[];
+    /**
+     * Optional resolve function that gets called during server definition resolution.
+     * This function can be used to dynamically modify server configurations,
+     * resolve environment variables, validate configurations, or perform any
+     * necessary preprocessing before the server starts.
+     *
+     * @param description The current server description
+     * @returns A promise that resolves to the processed server description
+     */
+    resolve?: (description: MCPServerDescription) => Promise<MCPServerDescription>;
 }
 export interface LocalMCPServerDescription extends BaseMCPServerDescription {
     /**

package/lib/common/mcp-server-manager.d.ts.map

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

package/lib/common/mcp-server-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-server-manager.js","sourceRoot":"","sources":["../../src/common/mcp-server-manager.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAKnE,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAelD,QAAA,8BAA8B,GAAG,MAAM,CAAC,gCAAgC,CAAC,CAAC;AAmCvF,IAAY,eAQX;AARD,WAAY,eAAe;IACvB,6CAA0B,CAAA;IAC1B,iDAA8B,CAAA;IAC9B,wCAAqB,CAAA;IACrB,4CAAyB,CAAA;IACzB,sCAAmB,CAAA;IACnB,0CAAuB,CAAA;IACvB,sCAAmB,CAAA;AACvB,CAAC,EARW,eAAe,+BAAf,eAAe,QAQ1B;AAsED,SAAgB,2BAA2B,CAAC,WAAiC;IACzE,OAAQ,WAAyC,CAAC,OAAO,KAAK,SAAS,CAAC;AAC5E,CAAC;AAFD,kEAEC;AACD,SAAgB,4BAA4B,CAAC,WAAiC;IAC1E,OAAQ,WAA0C,CAAC,SAAS,KAAK,SAAS,CAAC;AAC/E,CAAC;AAFD,oEAEC;AAEY,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAC9C,QAAA,oBAAoB,GAAG,4BAA4B,CAAC"}
+{"version":3,"file":"mcp-server-manager.js","sourceRoot":"","sources":["../../src/common/mcp-server-manager.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAKnE,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAelD,QAAA,8BAA8B,GAAG,MAAM,CAAC,gCAAgC,CAAC,CAAC;AAmCvF,IAAY,eAQX;AARD,WAAY,eAAe;IACvB,6CAA0B,CAAA;IAC1B,iDAA8B,CAAA;IAC9B,wCAAqB,CAAA;IACrB,4CAAyB,CAAA;IACzB,sCAAmB,CAAA;IACnB,0CAAuB,CAAA;IACvB,sCAAmB,CAAA;AACvB,CAAC,EARW,eAAe,+BAAf,eAAe,QAQ1B;AAiFD,SAAgB,2BAA2B,CAAC,WAAiC;IACzE,OAAQ,WAAyC,CAAC,OAAO,KAAK,SAAS,CAAC;AAC5E,CAAC;AAFD,kEAEC;AACD,SAAgB,4BAA4B,CAAC,WAAiC;IAC1E,OAAQ,WAA0C,CAAC,SAAS,KAAK,SAAS,CAAC;AAC/E,CAAC;AAFD,oEAEC;AAEY,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAC9C,QAAA,oBAAoB,GAAG,4BAA4B,CAAC"}

package/lib/node/mcp-backend-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-backend-module.d.ts","sourceRoot":"","sources":["../../src/node/mcp-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAoB/D,wBAGG"}
+{"version":3,"file":"mcp-backend-module.d.ts","sourceRoot":"","sources":["../../src/node/mcp-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AAkC/D,wBAGG"}

package/lib/node/mcp-backend-module.js

@@ -21,6 +21,8 @@ const mcp_server_manager_impl_1 = require("./mcp-server-manager-impl");
 const mcp_server_manager_1 = require("../common/mcp-server-manager");
 const connection_container_module_1 = require("@theia/core/lib/node/messaging/connection-container-module");
 const mcp_preferences_1 = require("../common/mcp-preferences");
+const mcp_server_manager_server_1 = require("./mcp-server-manager-server");
+const mcp_protocol_1 = require("../common/mcp-protocol");
 // We use a connection module to handle AI services separately for each frontend.
 const mcpConnectionModule = connection_container_module_1.ConnectionContainerModule.create(({ bind, bindBackendService, bindFrontendService }) => {
     bind(mcp_server_manager_1.MCPServerManager).to(mcp_server_manager_impl_1.MCPServerManagerImpl).inSingletonScope();
@@ -30,6 +32,12 @@ const mcpConnectionModule = connection_container_module_1.ConnectionContainerMod
         client.onDidCloseConnection(() => server.disconnectClient(client));
         return server;
     })).inSingletonScope();
+    bind(mcp_protocol_1.MCPServerManagerServer).to(mcp_server_manager_server_1.MCPServerManagerServerImpl).inSingletonScope();
+    bind(core_1.ConnectionHandler).toDynamicValue(ctx => new core_1.RpcConnectionHandler(mcp_protocol_1.MCPServerManagerServerPath, client => {
+        const server = ctx.container.get(mcp_protocol_1.MCPServerManagerServer);
+        server.setClient(client);
+        return server;
+    })).inSingletonScope();
 });
 exports.default = new inversify_1.ContainerModule(bind => {
     bind(core_1.PreferenceContribution).toConstantValue({ schema: mcp_preferences_1.McpServersPreferenceSchema });

package/lib/node/mcp-backend-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-backend-module.js","sourceRoot":"","sources":["../../src/node/mcp-backend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,4DAA+D;AAC/D,sCAA8F;AAC9F,uEAAiE;AACjE,qEAAsH;AACtH,4GAAuG;AACvG,+DAAuE;AAEvE,iFAAiF;AACjF,MAAM,mBAAmB,GAAG,uDAAyB,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,EAAE,EAAE;IAC/G,IAAI,CAAC,qCAAgB,CAAC,CAAC,EAAE,CAAC,8CAAoB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACnE,IAAI,CAAC,wBAAiB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,2BAAoB,CAClE,yCAAoB,EAAE,MAAM,CAAC,EAAE;QAC3B,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAmB,qCAAgB,CAAC,CAAC;QACrE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACzB,MAAM,CAAC,oBAAoB,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;QACnE,OAAO,MAAM,CAAC;IAClB,CAAC,CACJ,CAAC,CAAC,gBAAgB,EAAE,CAAC;AAC1B,CAAC,CAAC,CAAC;AAEH,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,6BAAsB,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,4CAA0B,EAAE,CAAC,CAAC;IACrF,IAAI,CAAC,uDAAyB,CAAC,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC;AACzE,CAAC,CAAC,CAAC"}
+{"version":3,"file":"mcp-backend-module.js","sourceRoot":"","sources":["../../src/node/mcp-backend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,4DAA+D;AAC/D,sCAA8F;AAC9F,uEAAiE;AACjE,qEAIsC;AACtC,4GAAuG;AACvG,+DAAuE;AACvE,2EAAyE;AACzE,yDAA0H;AAE1H,iFAAiF;AACjF,MAAM,mBAAmB,GAAG,uDAAyB,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,EAAE,EAAE;IAC/G,IAAI,CAAC,qCAAgB,CAAC,CAAC,EAAE,CAAC,8CAAoB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACnE,IAAI,CAAC,wBAAiB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,2BAAoB,CAClE,yCAAoB,EAAE,MAAM,CAAC,EAAE;QAC3B,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAmB,qCAAgB,CAAC,CAAC;QACrE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACzB,MAAM,CAAC,oBAAoB,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;QACnE,OAAO,MAAM,CAAC;IAClB,CAAC,CACJ,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,qCAAsB,CAAC,CAAC,EAAE,CAAC,sDAA0B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC/E,IAAI,CAAC,wBAAiB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,2BAAoB,CAClE,yCAA0B,EAAE,MAAM,CAAC,EAAE;QACjC,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAyB,qCAAsB,CAAC,CAAC;QACjF,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACzB,OAAO,MAAM,CAAC;IAClB,CAAC,CACJ,CAAC,CAAC,gBAAgB,EAAE,CAAC;AAC1B,CAAC,CAAC,CAAC;AAEH,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,6BAAsB,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,4CAA0B,EAAE,CAAC,CAAC;IACrF,IAAI,CAAC,uDAAyB,CAAC,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC;AACzE,CAAC,CAAC,CAAC"}

package/lib/node/mcp-server-manager-impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-server-manager-impl.d.ts","sourceRoot":"","sources":["../../src/node/mcp-server-manager-impl.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AACtH,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAE7G,qBACa,oBAAqB,YAAW,gBAAgB;IAEzD,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IACtD,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,8BAA8B,CAAC,CAAM;IAC9D,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAa;IAEzD,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7C,iBAAiB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAU5C,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAQrF,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9C,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAInC,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAKtE,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAQ5E,iBAAiB,CAAC,WAAW,EAAE,oBAAoB,GAAG,IAAI;IAoB1D,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAkBhC,SAAS,CAAC,MAAM,EAAE,8BAA8B,GAAG,IAAI;IAIvD,gBAAgB,CAAC,MAAM,EAAE,8BAA8B,GAAG,IAAI;IAU9D,OAAO,CAAC,aAAa;IAIrB,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAQjF,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAOjE"}
+{"version":3,"file":"mcp-server-manager-impl.d.ts","sourceRoot":"","sources":["../../src/node/mcp-server-manager-impl.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AACtH,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAE7G,qBACa,oBAAqB,YAAW,gBAAgB;IAEzD,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IACtD,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,8BAA8B,CAAC,CAAM;IAC9D,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAa;IAEzD,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7C,iBAAiB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAU5C,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAQrF,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB9C,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAInC,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAKtE,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAQ5E,iBAAiB,CAAC,WAAW,EAAE,oBAAoB,GAAG,IAAI;IAoB1D,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAkBhC,SAAS,CAAC,MAAM,EAAE,8BAA8B,GAAG,IAAI;IAIvD,gBAAgB,CAAC,MAAM,EAAE,8BAA8B,GAAG,IAAI;IAU9D,OAAO,CAAC,aAAa;IAIrB,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAQjF,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAOjE"}

package/lib/node/mcp-server-manager-impl.js

@@ -55,6 +55,14 @@ let MCPServerManagerImpl = class MCPServerManagerImpl {
         if (!server) {
             throw new Error(`MCP server "${serverName}" not found.`);
         }
+        const description = await server.getDescription();
+        if (description.resolve) {
+            const resolved = await description.resolve(description);
+            const isEqual = JSON.stringify(description) === JSON.stringify(resolved);
+            if (!isEqual) {
+                server.update(resolved);
+            }
+        }
         await server.start();
         this.notifyClients();
     }

package/lib/node/mcp-server-manager-impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-server-manager-impl.js","sourceRoot":"","sources":["../../src/node/mcp-server-manager-impl.ts"],"names":[],"mappings":";;;;AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF,4DAA0D;AAE1D,6CAAyC;AAKlC,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAA1B;QAEO,YAAO,GAA2B,IAAI,GAAG,EAAE,CAAC;QAC5C,YAAO,GAA0C,EAAE,CAAC;QACpD,oBAAe,GAA4B,IAAI,GAAG,EAAE,CAAC;IA+HnE,CAAC;IA7HG,KAAK,CAAC,UAAU,CAAC,UAAkB;QAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,eAAe,UAAU,cAAc,CAAC,CAAC;QAC7D,CAAC;QACD,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,eAAe,UAAU,YAAY,CAAC,CAAC;QACnD,IAAI,CAAC,aAAa,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,iBAAiB;QACnB,MAAM,cAAc,GAAa,EAAE,CAAC;QACpC,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YAClD,IAAI,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;gBACtB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9B,CAAC;QACL,CAAC;QACD,OAAO,cAAc,CAAC;IAC1B,CAAC;IAED,QAAQ,CAAC,UAAkB,EAAE,QAAgB,EAAE,UAAkB;QAC7D,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,eAAe,QAAQ,cAAc,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,UAAkB;QAChC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,eAAe,UAAU,cAAc,CAAC,CAAC;QAC7D,CAAC;QACD,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACrB,IAAI,CAAC,aAAa,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,cAAc;QAChB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,IAAY;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACtC,OAAO,MAAM,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9D,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,UAAkB;QACpC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,eAAe,UAAU,cAAc,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;IACnC,CAAC;IAED,iBAAiB,CAAC,WAAiC;QAC/C,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAE1D,IAAI,cAAc,EAAE,CAAC;YACjB,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACJ,MAAM,SAAS,GAAG,IAAI,sBAAS,CAAC,WAAW,CAAC,CAAC;YAC7C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAE9C,kDAAkD;YAClD,MAAM,QAAQ,GAAG,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE;gBAC9C,IAAI,CAAC,aAAa,EAAE,CAAC;YACzB,CAAC,CAAC,CAAC;YAEH,wCAAwC;YACxC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,CAAC,aAAa,EAAE,CAAC;IACzB,CAAC;IAED,YAAY,CAAC,IAAY;QACrB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,MAAM,EAAE,CAAC;YACT,MAAM,CAAC,IAAI,EAAE,CAAC;YACd,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAE1B,+BAA+B;YAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAChD,IAAI,QAAQ,EAAE,CAAC;gBACX,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACnB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACtC,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,IAAI,CAAC,eAAe,IAAI,cAAc,CAAC,CAAC;QACpD,CAAC;QACD,IAAI,CAAC,aAAa,EAAE,CAAC;IACzB,CAAC;IAED,SAAS,CAAC,MAAsC;QAC5C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,gBAAgB,CAAC,MAAsC;QACnD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;YACf,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAC1B,MAAM,CAAC,IAAI,EAAE,CAAC;QAClB,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,aAAa;QACjB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,YAAY,CAAC,UAAkB,EAAE,UAAkB;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,eAAe,UAAU,cAAc,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC;IAED,YAAY,CAAC,UAAkB;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,eAAe,UAAU,cAAc,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,MAAM,CAAC,YAAY,EAAE,CAAC;IACjC,CAAC;CACJ,CAAA;AAnIY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CAmIhC"}
+{"version":3,"file":"mcp-server-manager-impl.js","sourceRoot":"","sources":["../../src/node/mcp-server-manager-impl.ts"],"names":[],"mappings":"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"}

package/lib/node/mcp-server-manager-server.d.ts

@@ -0,0 +1,9 @@
+import { MCPServerManager } from '../common';
+import { MCPServerDescriptionRCP, MCPServerManagerServer, MCPServerManagerServerClient } from '../common/mcp-protocol';
+export declare class MCPServerManagerServerImpl implements MCPServerManagerServer {
+    protected readonly mcpServerManager: MCPServerManager;
+    protected client: MCPServerManagerServerClient;
+    setClient(client: MCPServerManagerServerClient): void;
+    addOrUpdateServer(descriptionRCP: MCPServerDescriptionRCP): Promise<void>;
+}
+//# sourceMappingURL=mcp-server-manager-server.d.ts.map

package/lib/node/mcp-server-manager-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-server-manager-server.d.ts","sourceRoot":"","sources":["../../src/node/mcp-server-manager-server.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAwB,gBAAgB,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAA0B,uBAAuB,EAAE,sBAAsB,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAE/I,qBACa,0BAA2B,YAAW,sBAAsB;IAGrE,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAEtD,SAAS,CAAC,MAAM,EAAE,4BAA4B,CAAC;IAE/C,SAAS,CAAC,MAAM,EAAE,4BAA4B,GAAG,IAAI;IAI/C,iBAAiB,CAAC,cAAc,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAgBlF"}

package/lib/node/mcp-server-manager-server.js

@@ -0,0 +1,53 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2025 Dirk Fauth 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MCPServerManagerServerImpl = void 0;
+const tslib_1 = require("tslib");
+const inversify_1 = require("@theia/core/shared/inversify");
+const common_1 = require("../common");
+const mcp_protocol_1 = require("../common/mcp-protocol");
+let MCPServerManagerServerImpl = class MCPServerManagerServerImpl {
+    setClient(client) {
+        this.client = client;
+    }
+    async addOrUpdateServer(descriptionRCP) {
+        const description = (0, mcp_protocol_1.cleanServerDescription)(descriptionRCP);
+        if (descriptionRCP.resolveId) {
+            description.resolve = async (desc) => {
+                if (this.client) {
+                    const descRCP = {
+                        ...desc,
+                        resolveId: descriptionRCP.resolveId
+                    };
+                    return this.client.resolveServerDescription(descRCP);
+                }
+                return desc; // Fallback if no client is set
+            };
+        }
+        ;
+        this.mcpServerManager.addOrUpdateServer(description);
+    }
+};
+exports.MCPServerManagerServerImpl = MCPServerManagerServerImpl;
+tslib_1.__decorate([
+    (0, inversify_1.inject)(common_1.MCPServerManager),
+    tslib_1.__metadata("design:type", Object)
+], MCPServerManagerServerImpl.prototype, "mcpServerManager", void 0);
+exports.MCPServerManagerServerImpl = MCPServerManagerServerImpl = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], MCPServerManagerServerImpl);
+//# sourceMappingURL=mcp-server-manager-server.js.map

package/lib/node/mcp-server-manager-server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-server-manager-server.js","sourceRoot":"","sources":["../../src/node/mcp-server-manager-server.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,4CAA4C;AAC5C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAkE;AAClE,sCAAmE;AACnE,yDAA+I;AAGxI,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAOnC,SAAS,CAAC,MAAoC;QAC1C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,cAAuC;QAC3D,MAAM,WAAW,GAAG,IAAA,qCAAsB,EAAC,cAAc,CAAC,CAAC;QAC3D,IAAI,cAAc,CAAC,SAAS,EAAE,CAAC;YAC3B,WAAW,CAAC,OAAO,GAAG,KAAK,EAAE,IAA0B,EAAE,EAAE;gBACvD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;oBACd,MAAM,OAAO,GAA4B;wBACrC,GAAG,IAAI;wBACP,SAAS,EAAE,cAAc,CAAC,SAAS;qBACtC,CAAC;oBACF,OAAO,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;gBACzD,CAAC;gBACD,OAAO,IAAI,CAAC,CAAC,+BAA+B;YAChD,CAAC,CAAC;QACN,CAAC;QAAA,CAAC;QACF,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IACzD,CAAC;CACJ,CAAA;AA3BY,gEAA0B;AAGhB;IADlB,IAAA,kBAAM,EAAC,yBAAgB,CAAC;;oEAC6B;qCAH7C,0BAA0B;IADtC,IAAA,sBAAU,GAAE;GACA,0BAA0B,CA2BtC"}

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@theia/ai-mcp",
-  "version": "1.66.0-next.41+d4393e3c9",
+  "version": "1.66.0-next.67+6fae23c43",
   "description": "Theia - MCP Integration",
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.15.1",
-    "@theia/ai-core": "1.66.0-next.41+d4393e3c9",
-    "@theia/core": "1.66.0-next.41+d4393e3c9"
+    "@theia/ai-core": "1.66.0-next.67+6fae23c43",
+    "@theia/core": "1.66.0-next.67+6fae23c43"
   },
   "publishConfig": {
     "access": "public"
@@ -47,5 +47,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "d4393e3c90401f6c5929236afb26991cddfeb24b"
+  "gitHead": "6fae23c43f4e850ef4dd6f7c85aa0422077f70e2"
 }

package/src/browser/mcp-frontend-module.ts

@@ -16,18 +16,75 @@
 
 import { ContainerModule } from '@theia/core/shared/inversify';
 import { FrontendApplicationContribution, RemoteConnectionProvider, ServiceConnectionProvider } from '@theia/core/lib/browser';
-import { MCPFrontendService, MCPServerManager, MCPServerManagerPath, MCPFrontendNotificationService } from '../common/mcp-server-manager';
+import {
+    MCPFrontendService,
+    MCPServerManager,
+    MCPServerManagerPath,
+    MCPFrontendNotificationService
+} from '../common/mcp-server-manager';
 import { McpFrontendApplicationContribution } from './mcp-frontend-application-contribution';
 import { MCPFrontendServiceImpl } from './mcp-frontend-service';
 import { MCPFrontendNotificationServiceImpl } from './mcp-frontend-notification-service';
+import { MCPServerManagerServerClientImpl } from './mcp-server-manager-server-client';
+import { MCPServerManagerServer, MCPServerManagerServerClient, MCPServerManagerServerPath } from '../common/mcp-protocol';
 
 export default new ContainerModule(bind => {
     bind(FrontendApplicationContribution).to(McpFrontendApplicationContribution).inSingletonScope();
     bind(MCPFrontendService).to(MCPFrontendServiceImpl).inSingletonScope();
     bind(MCPFrontendNotificationService).to(MCPFrontendNotificationServiceImpl).inSingletonScope();
+    bind(MCPServerManagerServerClient).to(MCPServerManagerServerClientImpl).inSingletonScope();
+
+    bind(MCPServerManagerServer).toDynamicValue(ctx => {
+        const connection = ctx.container.get<ServiceConnectionProvider>(RemoteConnectionProvider);
+        const client = ctx.container.get<MCPServerManagerServerClient>(MCPServerManagerServerClient);
+        return connection.createProxy<MCPServerManagerServer>(MCPServerManagerServerPath, client);
+    }).inSingletonScope();
+
     bind(MCPServerManager).toDynamicValue(ctx => {
+        const mgrServer = ctx.container.get<MCPServerManagerServer>(MCPServerManagerServer);
         const connection = ctx.container.get<ServiceConnectionProvider>(RemoteConnectionProvider);
         const client = ctx.container.get<MCPFrontendNotificationService>(MCPFrontendNotificationService);
-        return connection.createProxy<MCPServerManager>(MCPServerManagerPath, client);
+        const serverClient = ctx.container.get<MCPServerManagerServerClient>(MCPServerManagerServerClient);
+        const backendServerManager = connection.createProxy<MCPServerManager>(MCPServerManagerPath, client);
+
+        // Listen to server updates to clean up removed servers
+        client.onDidUpdateMCPServers(() =>
+            backendServerManager.getServerNames()
+                .then(names => serverClient.cleanServers(names))
+                .catch((error: unknown) => {
+                    console.error('Error cleaning server descriptions:', error);
+                }));
+
+        // We proxy the MCPServerManager to override addOrUpdateServer and getServerDescription
+        // to handle the resolve functions via the MCPServerManagerServerClient.
+        return new Proxy(backendServerManager, {
+            get(target: MCPServerManager, prop: PropertyKey, receiver: unknown): unknown {
+                // override addOrUpdateServer to store the original description in the MCPServerManagerServerClient
+                // to be used in resolveServerDescription if a resolve function is provided
+                if (prop === 'addOrUpdateServer') {
+                    return async function (this: MCPServerManager, ...args: [serverDescription: Parameters<MCPServerManager['addOrUpdateServer']>[0]]): Promise<void> {
+                        const updated = serverClient.addServerDescription(args[0]);
+                        await mgrServer.addOrUpdateServer(updated);
+                    };
+                }
+                // override getServerDescription to mix in the resolve function from the client
+                if (prop === 'getServerDescription') {
+                    return async function (this: MCPServerManager, name: string): ReturnType<MCPServerManager['getServerDescription']> {
+                        const description = await Reflect.apply(target.getServerDescription, target, [name]);
+                        if (description) {
+                            const resolveFunction = serverClient.getResolveFunction(name);
+                            if (resolveFunction) {
+                                return {
+                                    ...description,
+                                    resolve: resolveFunction
+                                };
+                            }
+                        }
+                        return description;
+                    };
+                }
+                return Reflect.get(target, prop, receiver);
+            }
+        });
     }).inSingletonScope();
 });

package/src/browser/mcp-server-manager-server-client.ts

@@ -0,0 +1,82 @@
+// *****************************************************************************
+// Copyright (C) 2025 Dirk Fauth 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable } from '@theia/core/shared/inversify';
+import { MCPServerDescription } from '../common';
+import { generateUuid } from '@theia/core/lib/common/uuid';
+import { cleanServerDescription, MCPServerDescriptionRCP, MCPServerManagerServerClient } from '../common/mcp-protocol';
+
+type StoredServerInfo = Pick<MCPServerDescription, 'name' | 'resolve'>;
+
+@injectable()
+export class MCPServerManagerServerClientImpl implements MCPServerManagerServerClient {
+
+    protected serverDescriptions: Map<string, StoredServerInfo> = new Map();
+
+    addServerDescription(description: MCPServerDescription): MCPServerDescriptionRCP {
+        if (description.resolve) {
+            const serverDescription: MCPServerDescriptionRCP = {
+                ...description,
+                resolveId: generateUuid(),
+            };
+
+            // store only the name and resolve function
+            if (serverDescription.resolveId) {
+                this.serverDescriptions.set(serverDescription.resolveId, {
+                    name: description.name,
+                    resolve: description.resolve
+                });
+            }
+
+            return serverDescription;
+        }
+        return description;
+    }
+
+    getResolveFunction(name: string): MCPServerDescription['resolve'] {
+        for (const storedInfo of this.serverDescriptions.values()) {
+            if (storedInfo.name === name) {
+                return storedInfo.resolve;
+            }
+        }
+        return undefined;
+    }
+
+    async resolveServerDescription(description: MCPServerDescriptionRCP): Promise<MCPServerDescription> {
+        const cleanDescription = cleanServerDescription(description);
+        if (description.resolveId) {
+            const storedInfo = this.serverDescriptions.get(description.resolveId);
+            if (storedInfo?.resolve) {
+                const updated = await storedInfo.resolve(cleanDescription);
+                if (updated) {
+                    return updated;
+                }
+            }
+        }
+        return cleanDescription;
+    }
+
+    cleanServers(serverNames: string[]): void {
+        const currentNamesSet = new Set(serverNames);
+        // Remove descriptions for servers that no longer exist
+        for (const [resolveId, storedInfo] of this.serverDescriptions.entries()) {
+            if (storedInfo.name && !currentNamesSet.has(storedInfo.name)) {
+                console.debug('Removing a frontend stored resolve function because the corresponding MCP server was removed', storedInfo);
+                this.serverDescriptions.delete(resolveId);
+            }
+        }
+    }
+}

package/src/common/mcp-protocol.ts

@@ -0,0 +1,75 @@
+// *****************************************************************************
+// Copyright (C) 2025 EclipseSource GmbH.
+//
+// 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { MCPServerDescription } from './mcp-server-manager';
+
+/**
+ * MCPServerDescriptionRCP is a version of MCPServerDescription that can be sent over RCP.
+ * It omits the 'resolve' function and instead includes an optional 'resolveId' to identify
+ * the resolve function on the client side.
+ */
+export type MCPServerDescriptionRCP = Omit<MCPServerDescription, 'resolve'> & {
+    resolveId?: string;
+};
+
+export const MCPServerManagerServer = Symbol('MCPServerManagerServer');
+export const MCPServerManagerServerPath = '/services/mcpservermanagerserver';
+
+/**
+ * The MCPServerManagerServer handles the RCP specialties of adding server descriptions from the frontend
+ */
+export interface MCPServerManagerServer {
+    addOrUpdateServer(description: MCPServerDescriptionRCP): Promise<void>;
+    setClient(client: MCPServerManagerServerClient): void
+}
+
+export const MCPServerManagerServerClient = Symbol('MCPServerManagerServerClient');
+export interface MCPServerManagerServerClient {
+    /**
+     * Adds a server description to the client. If the description contains a resolve function,
+     * a unique resolveId is generated and only the name and resolve function are stored.
+     * @param description The server description to add.
+     * @returns The server description with a unique resolveId if a resolve function is provided
+     * or the given description if no resolve function is provided.
+     */
+    addServerDescription(description: MCPServerDescription): MCPServerDescriptionRCP;
+    /**
+     * Retrieves the resolve function for a given server name.
+     * @param name The name of the server to retrieve the resolve function for.
+     * @returns The resolve function if found, or undefined if not found.
+     */
+    getResolveFunction(name: string): MCPServerDescription['resolve'];
+    /**
+     * Resolves the server description by calling the resolve function if it exists.
+     * @param description The server description to resolve.
+     * @returns The resolved server description.
+     */
+    resolveServerDescription(description: MCPServerDescriptionRCP): Promise<MCPServerDescription>;
+    /**
+     * Removes server descriptions that are no longer present in the MCPServerManager.
+     *
+     * @param serverNames The current list of server names from the MCPServerManager.
+     */
+    cleanServers(serverNames: string[]): void;
+}
+
+/**
+ * Util function to convert a MCPServerDescriptionRCP to a MCPServerDescription by removing the resolveId.
+ */
+export const cleanServerDescription = (description: MCPServerDescriptionRCP): MCPServerDescription => {
+    const { resolveId, ...descriptionProperties } = description;
+    return { ...descriptionProperties } as MCPServerDescription;
+};

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

@@ -102,6 +102,17 @@ export interface BaseMCPServerDescription {
      * List of available tools for the server. Returns the name and description if available.
      */
     tools?: ToolInformation[];
+
+    /**
+     * Optional resolve function that gets called during server definition resolution.
+     * This function can be used to dynamically modify server configurations,
+     * resolve environment variables, validate configurations, or perform any
+     * necessary preprocessing before the server starts.
+     *
+     * @param description The current server description
+     * @returns A promise that resolves to the processed server description
+     */
+    resolve?: (description: MCPServerDescription) => Promise<MCPServerDescription>;
 }
 
 export interface LocalMCPServerDescription extends BaseMCPServerDescription {

package/src/node/mcp-backend-module.ts

@@ -17,9 +17,15 @@
 import { ContainerModule } from '@theia/core/shared/inversify';
 import { ConnectionHandler, PreferenceContribution, RpcConnectionHandler } from '@theia/core';
 import { MCPServerManagerImpl } from './mcp-server-manager-impl';
-import { MCPFrontendNotificationService, MCPServerManager, MCPServerManagerPath } from '../common/mcp-server-manager';
+import {
+    MCPFrontendNotificationService,
+    MCPServerManager,
+    MCPServerManagerPath
+} from '../common/mcp-server-manager';
 import { ConnectionContainerModule } from '@theia/core/lib/node/messaging/connection-container-module';
 import { McpServersPreferenceSchema } from '../common/mcp-preferences';
+import { MCPServerManagerServerImpl } from './mcp-server-manager-server';
+import { MCPServerManagerServer, MCPServerManagerServerClient, MCPServerManagerServerPath } from '../common/mcp-protocol';
 
 // We use a connection module to handle AI services separately for each frontend.
 const mcpConnectionModule = ConnectionContainerModule.create(({ bind, bindBackendService, bindFrontendService }) => {
@@ -32,6 +38,14 @@ const mcpConnectionModule = ConnectionContainerModule.create(({ bind, bindBacken
             return server;
         }
     )).inSingletonScope();
+    bind(MCPServerManagerServer).to(MCPServerManagerServerImpl).inSingletonScope();
+    bind(ConnectionHandler).toDynamicValue(ctx => new RpcConnectionHandler<MCPServerManagerServerClient>(
+        MCPServerManagerServerPath, client => {
+            const server = ctx.container.get<MCPServerManagerServer>(MCPServerManagerServer);
+            server.setClient(client);
+            return server;
+        }
+    )).inSingletonScope();
 });
 
 export default new ContainerModule(bind => {

package/src/node/mcp-server-manager-impl.ts

@@ -59,6 +59,14 @@ export class MCPServerManagerImpl implements MCPServerManager {
         if (!server) {
             throw new Error(`MCP server "${serverName}" not found.`);
         }
+        const description = await server.getDescription();
+        if (description.resolve) {
+            const resolved = await description.resolve(description);
+            const isEqual = JSON.stringify(description) === JSON.stringify(resolved);
+            if (!isEqual) {
+                server.update(resolved);
+            }
+        }
         await server.start();
         this.notifyClients();
     }

package/src/node/mcp-server-manager-server.ts

@@ -0,0 +1,49 @@
+// *****************************************************************************
+// Copyright (C) 2025 Dirk Fauth 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { MCPServerDescription, MCPServerManager } from '../common';
+import { cleanServerDescription, MCPServerDescriptionRCP, MCPServerManagerServer, MCPServerManagerServerClient } from '../common/mcp-protocol';
+
+@injectable()
+export class MCPServerManagerServerImpl implements MCPServerManagerServer {
+
+    @inject(MCPServerManager)
+    protected readonly mcpServerManager: MCPServerManager;
+
+    protected client: MCPServerManagerServerClient;
+
+    setClient(client: MCPServerManagerServerClient): void {
+        this.client = client;
+    }
+
+    async addOrUpdateServer(descriptionRCP: MCPServerDescriptionRCP): Promise<void> {
+        const description = cleanServerDescription(descriptionRCP);
+        if (descriptionRCP.resolveId) {
+            description.resolve = async (desc: MCPServerDescription) => {
+                if (this.client) {
+                    const descRCP: MCPServerDescriptionRCP = {
+                        ...desc,
+                        resolveId: descriptionRCP.resolveId
+                    };
+                    return this.client.resolveServerDescription(descRCP);
+                }
+                return desc; // Fallback if no client is set
+            };
+        };
+        this.mcpServerManager.addOrUpdateServer(description);
+    }
+}