@codingame/monaco-vscode-mcp-service-override 17.2.0 → 18.0.0

package/vscode/src/vs/workbench/contrib/mcp/browser/mcpWorkbenchService.js

@@ -0,0 +1,176 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { IMcpGalleryService, IMcpManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement.service';
+import { ACTIVE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { HasInstalledMcpServersContext, McpServersGalleryEnabledContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
+import { IMcpWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
+import { McpServerEditorInput } from './mcpServerEditorInput.js';
+
+let McpWorkbenchServer = class McpWorkbenchServer {
+    constructor(local, gallery, mcpGalleryService, fileService) {
+        this.local = local;
+        this.gallery = gallery;
+        this.mcpGalleryService = mcpGalleryService;
+        this.fileService = fileService;
+    }
+    get id() {
+        return this.gallery?.id ?? this.local?.id ?? '';
+    }
+    get name() {
+        return this.gallery?.name ?? this.local?.name ?? '';
+    }
+    get label() {
+        return this.gallery?.displayName ?? this.local?.displayName ?? '';
+    }
+    get iconUrl() {
+        return this.gallery?.iconUrl ?? this.local?.iconUrl;
+    }
+    get publisherDisplayName() {
+        return this.gallery?.publisherDisplayName ?? this.local?.publisherDisplayName ?? this.gallery?.publisher ?? this.local?.publisher;
+    }
+    get publisherUrl() {
+        return this.gallery?.publisherDomain?.link;
+    }
+    get description() {
+        return this.gallery?.description ?? this.local?.description ?? '';
+    }
+    get installCount() {
+        return this.gallery?.installCount ?? 0;
+    }
+    get url() {
+        return this.gallery?.url;
+    }
+    get repository() {
+        return this.gallery?.repositoryUrl;
+    }
+    async getReadme(token) {
+        if (this.local?.readmeUrl) {
+            const content = await this.fileService.readFile(this.local.readmeUrl);
+            return ( content.value.toString());
+        }
+        if (this.gallery?.readmeUrl) {
+            return this.mcpGalleryService.getReadme(this.gallery, token);
+        }
+        return Promise.reject(( new Error('not available')));
+    }
+};
+McpWorkbenchServer = ( __decorate([
+    ( __param(2, IMcpGalleryService)),
+    ( __param(3, IFileService))
+], McpWorkbenchServer));
+let McpWorkbenchService = class McpWorkbenchService extends Disposable {
+    get local() { return this._local; }
+    constructor(mcpGalleryService, mcpManagementService, editorService, instantiationService) {
+        super();
+        this.mcpGalleryService = mcpGalleryService;
+        this.mcpManagementService = mcpManagementService;
+        this.editorService = editorService;
+        this.instantiationService = instantiationService;
+        this._local = [];
+        this._onChange = this._register(( new Emitter()));
+        this.onChange = this._onChange.event;
+        this._register(this.mcpManagementService.onDidInstallMcpServers(e => this.onDidInstallMcpServers(e)));
+        this._register(this.mcpManagementService.onDidUninstallMcpServer(e => this.onDidUninstallMcpServer(e)));
+        this.queryLocal().then(async () => {
+            await this.queryGallery();
+            this._onChange.fire(undefined);
+        });
+    }
+    onDidUninstallMcpServer(e) {
+        if (e.error) {
+            return;
+        }
+        const server = this._local.find(server => server.local?.name === e.name);
+        if (server) {
+            this._local = this._local.filter(server => server.local?.name !== e.name);
+            server.local = undefined;
+            this._onChange.fire(server);
+        }
+    }
+    onDidInstallMcpServers(e) {
+        for (const result of e) {
+            if (!result.local) {
+                continue;
+            }
+            let server = this._local.find(server => server.local?.name === result.name);
+            if (server) {
+                server.local = result.local;
+            }
+            else {
+                server = this.instantiationService.createInstance(McpWorkbenchServer, result.local, result.source);
+                this._local.push(server);
+            }
+            this._onChange.fire(server);
+        }
+    }
+    fromGallery(gallery) {
+        for (const local of this._local) {
+            if (local.name === gallery.name) {
+                local.gallery = gallery;
+                return local;
+            }
+        }
+        return undefined;
+    }
+    async queryGallery(options, token) {
+        if (!this.mcpGalleryService.isEnabled()) {
+            return [];
+        }
+        const result = await this.mcpGalleryService.query(options, token);
+        return ( result.map(
+            gallery => this.fromGallery(gallery) ?? this.instantiationService.createInstance(McpWorkbenchServer, undefined, gallery)
+        ));
+    }
+    async queryLocal() {
+        const installed = await this.mcpManagementService.getInstalled();
+        this._local = ( installed.map(i => {
+            const local = this._local.find(server => server.name === i.name) ?? this.instantiationService.createInstance(McpWorkbenchServer, undefined, undefined);
+            local.local = i;
+            return local;
+        }));
+        return this._local;
+    }
+    async install(server) {
+        if (!server.gallery) {
+            throw ( new Error('Gallery server is missing'));
+        }
+        await this.mcpManagementService.installFromGallery(server.gallery, server.gallery.packageTypes[0]);
+    }
+    async uninstall(server) {
+        if (!server.local) {
+            throw ( new Error('Local server is missing'));
+        }
+        await this.mcpManagementService.uninstall(server.local);
+    }
+    async open(extension, options) {
+        await this.editorService.openEditor(this.instantiationService.createInstance(McpServerEditorInput, extension), options, ACTIVE_GROUP);
+    }
+};
+McpWorkbenchService = ( __decorate([
+    ( __param(0, IMcpGalleryService)),
+    ( __param(1, IMcpManagementService)),
+    ( __param(2, IEditorService)),
+    ( __param(3, IInstantiationService))
+], McpWorkbenchService));
+let MCPContextsInitialisation = class MCPContextsInitialisation extends Disposable {
+    static { this.ID = 'workbench.mcp.contexts.initialisation'; }
+    constructor(mcpWorkbenchService, mcpGalleryService, contextKeyService) {
+        super();
+        const hasInstalledMcpServersContextKey = HasInstalledMcpServersContext.bindTo(contextKeyService);
+        McpServersGalleryEnabledContext.bindTo(contextKeyService).set(mcpGalleryService.isEnabled());
+        this._register(mcpWorkbenchService.onChange(() => hasInstalledMcpServersContextKey.set(mcpWorkbenchService.local.length > 0)));
+    }
+};
+MCPContextsInitialisation = ( __decorate([
+    ( __param(0, IMcpWorkbenchService)),
+    ( __param(1, IMcpGalleryService)),
+    ( __param(2, IContextKeyService))
+], MCPContextsInitialisation));
+
+export { MCPContextsInitialisation, McpWorkbenchService };

package/vscode/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.d.ts

@@ -1,6 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
 import { IMcpConfigPathsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfigPathsService.service";
 import { IMcpRegistry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service";
 import { IMcpDiscovery } from "./mcpDiscovery.js";
@@ -9,8 +10,9 @@ export declare class ConfigMcpDiscovery extends Disposable implements IMcpDiscov
     private readonly _mcpRegistry;
     private readonly _textModelService;
     private readonly _mcpConfigPathsService;
+    private readonly _remoteAgentService;
     private configSources;
-    constructor(_configurationService: IConfigurationService, _mcpRegistry: IMcpRegistry, _textModelService: ITextModelService, _mcpConfigPathsService: IMcpConfigPathsService);
+    constructor(_configurationService: IConfigurationService, _mcpRegistry: IMcpRegistry, _textModelService: ITextModelService, _mcpConfigPathsService: IMcpConfigPathsService, _remoteAgentService: IRemoteAgentService);
     start(): void;
     private _getServerIdMapping;
     private sync;

package/vscode/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.js

@@ -4,24 +4,28 @@ import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/array
 import { Throttler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Disposable, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { win32, posix, sep } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
+import { OperatingSystem, isWindows } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 import { getMcpServerMapping } from '../mcpConfigFileUtils.js';
 import { IMcpConfigPathsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfigPathsService.service';
-import { mcpConfigurationSection } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { mcpConfigurationSection } from '@codingame/monaco-vscode-aa9ead53-dfd3-59da-b9e7-f163d201de8d-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 import { McpServerTransportType, McpServerDefinition } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
-import { autorunDelta } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
-import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
+import { autorunDelta } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
 let ConfigMcpDiscovery = class ConfigMcpDiscovery extends Disposable {
-    constructor(_configurationService, _mcpRegistry, _textModelService, _mcpConfigPathsService) {
+    constructor(_configurationService, _mcpRegistry, _textModelService, _mcpConfigPathsService, _remoteAgentService) {
         super();
         this._configurationService = _configurationService;
         this._mcpRegistry = _mcpRegistry;
         this._textModelService = _textModelService;
         this._mcpConfigPathsService = _mcpConfigPathsService;
+        this._remoteAgentService = _remoteAgentService;
         this.configSources = [];
     }
     start() {
@@ -78,6 +82,7 @@ let ConfigMcpDiscovery = class ConfigMcpDiscovery extends Disposable {
             const uri = src.path.uri;
             return uri && src.getServerToLocationMapping(uri);
         })));
+        const remoteEnv = await this._remoteAgentService.getEnvironment();
         for (const [index, src] of this.configSources.entries()) {
             const collectionId = `mcp.config.${src.path.id}`;
             let value = src.path.workspaceFolder
@@ -88,6 +93,13 @@ let ConfigMcpDiscovery = class ConfigMcpDiscovery extends Disposable {
                 this._configurationService.updateValue(mcpConfigurationSection, value, {}, src.path.target, { donotNotifyError: true });
             }
             const configMapping = configMappings[index];
+            const { isAbsolute, join, sep: sep$1 } = src.path.remoteAuthority && remoteEnv
+                ? (remoteEnv.os === OperatingSystem.Windows ? win32 : posix)
+                : (isWindows ? win32 : posix);
+            const fsPathForRemote = (uri) => {
+                const fsPathLocal = uri.fsPath;
+                return fsPathLocal.replaceAll(sep, sep$1);
+            };
             const nextDefinitions = ( Object.entries(value?.servers || {}).map(([name, value]) => ({
                 id: `${collectionId}.${name}`,
                 label: name,
@@ -101,7 +113,13 @@ let ConfigMcpDiscovery = class ConfigMcpDiscovery extends Disposable {
                     command: value.command,
                     env: value.env || {},
                     envFile: value.envFile,
-                    cwd: undefined,
+                    cwd: value.cwd
+                        ? (!isAbsolute(value.cwd) && !value.cwd.startsWith('~') && !value.cwd.startsWith('${') && src.path.workspaceFolder
+                            ? join(fsPathForRemote(src.path.workspaceFolder.uri), value.cwd)
+                            : value.cwd)
+                        : src.path.workspaceFolder
+                            ? fsPathForRemote(src.path.workspaceFolder.uri)
+                            : undefined,
                 },
                 roots: src.path.workspaceFolder ? [src.path.workspaceFolder.uri] : [],
                 variableReplacement: {
@@ -109,6 +127,7 @@ let ConfigMcpDiscovery = class ConfigMcpDiscovery extends Disposable {
                     section: mcpConfigurationSection,
                     target: src.path.target,
                 },
+                devMode: value.dev,
                 presentation: {
                     order: src.path.order,
                     origin: configMapping?.get(name),
@@ -130,6 +149,7 @@ let ConfigMcpDiscovery = class ConfigMcpDiscovery extends Disposable {
                     remoteAuthority: src.path.remoteAuthority || null,
                     serverDefinitions: src.serverDefinitions,
                     isTrustedByDefault: true,
+                    configTarget: src.path.target,
                     scope: src.path.scope,
                 });
             }
@@ -140,7 +160,8 @@ ConfigMcpDiscovery = ( __decorate([
     ( __param(0, IConfigurationService)),
     ( __param(1, IMcpRegistry)),
     ( __param(2, ITextModelService)),
-    ( __param(3, IMcpConfigPathsService))
+    ( __param(3, IMcpConfigPathsService)),
+    ( __param(4, IRemoteAgentService))
 ], ConfigMcpDiscovery));
 
 export { ConfigMcpDiscovery };

package/vscode/src/vs/workbench/contrib/mcp/common/discovery/extensionMcpDiscovery.js

@@ -4,14 +4,15 @@ import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/v
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isFalsyOrWhitespace } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
-import { mcpContributionPoint, mcpActivationEvent } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { mcpContributionPoint, mcpActivationEvent } from '@codingame/monaco-vscode-aa9ead53-dfd3-59da-b9e7-f163d201de8d-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 import { McpServerDefinition, extensionPrefixedIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
-import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
 var ExtensionMcpDiscovery_1;
 const cacheKey = 'mcp.extCachedServers';
@@ -64,6 +65,7 @@ let ExtensionMcpDiscovery = ExtensionMcpDiscovery_1 = class ExtensionMcpDiscover
                         remoteAuthority: null,
                         isTrustedByDefault: true,
                         scope: StorageScope.WORKSPACE,
+                        configTarget: ConfigurationTarget.USER,
                         serverDefinitions: observableValue(this, serverDefs?.map(McpServerDefinition.fromSerialized) || []),
                         lazy: {
                             isCached: !!serverDefs,
@@ -78,21 +80,21 @@ let ExtensionMcpDiscovery = ExtensionMcpDiscovery_1 = class ExtensionMcpDiscover
     }
     async _activateExtensionServers(collectionId) {
         await this._extensionService.activateByEvent(mcpActivationEvent(collectionId));
-        await Promise.all(( this._mcpRegistry.delegates
+        await Promise.all(( this._mcpRegistry.delegates.get()
             .map(r => r.waitForInitialProviderPromises())));
     }
     static _validate(user) {
         if (!Array.isArray(user.value)) {
-            user.collector.error(( localize(7713, "Expected an array of MCP collections")));
+            user.collector.error(( localize(7918, "Expected an array of MCP collections")));
             return false;
         }
         for (const contribution of user.value) {
             if (typeof contribution.id !== 'string' || isFalsyOrWhitespace(contribution.id)) {
-                user.collector.error(( localize(7714, "Expected 'id' to be a non-empty string.")));
+                user.collector.error(( localize(7919, "Expected 'id' to be a non-empty string.")));
                 return false;
             }
             if (typeof contribution.label !== 'string' || isFalsyOrWhitespace(contribution.label)) {
-                user.collector.error(( localize(7715, "Expected 'label' to be a non-empty string.")));
+                user.collector.error(( localize(7920, "Expected 'label' to be a non-empty string.")));
                 return false;
             }
         }

package/vscode/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAbstract.d.ts

@@ -8,7 +8,7 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { INativeMcpDiscoveryData } from "../../../../../platform/mcp/common/nativeMcpDiscoveryHelper.js";
 import { Dto } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier";
-import { DiscoverySource } from "@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration";
+import { DiscoverySource } from "@codingame/monaco-vscode-aa9ead53-dfd3-59da-b9e7-f163d201de8d-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration";
 import { IMcpRegistry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service";
 import { McpCollectionDefinition, McpServerDefinition } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";
 import { IMcpDiscovery } from "./mcpDiscovery.js";

package/vscode/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAbstract.js

@@ -6,18 +6,19 @@ import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/netw
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
-import { mcpDiscoverySection, discoverySourceLabel } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { mcpDiscoverySection, discoverySourceLabel } from '@codingame/monaco-vscode-aa9ead53-dfd3-59da-b9e7-f163d201de8d-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 import { McpCollectionSortOrder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { ClaudeDesktopMpcDiscoveryAdapter, CursorDesktopMpcDiscoveryAdapter, WindsurfDesktopMpcDiscoveryAdapter } from './nativeMcpDiscoveryAdapters.js';
-import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
-import { autorunWithStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
+import { autorunWithStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 let FilesystemMcpDiscovery = class FilesystemMcpDiscovery extends Disposable {
     constructor(configurationService, _fileService, _mcpRegistry) {
@@ -81,7 +82,7 @@ let NativeFilesystemMcpDiscovery = class NativeFilesystemMcpDiscovery extends Fi
         this.suffix = '';
         if (remoteAuthority) {
             this.suffix = ' ' + ( localize(
-                7716,
+                7921,
                 ' on {0}',
                 labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority)
             ));
@@ -111,6 +112,7 @@ let NativeFilesystemMcpDiscovery = class NativeFilesystemMcpDiscovery extends Fi
                 id: adapter.id,
                 label: discoverySourceLabel[adapter.discoverySource] + this.suffix,
                 remoteAuthority: adapter.remoteAuthority,
+                configTarget: ConfigurationTarget.USER,
                 scope: StorageScope.PROFILE,
                 isTrustedByDefault: false,
                 serverDefinitions: observableValue(this, []),

package/vscode/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAdapters.d.ts

@@ -2,7 +2,7 @@ import { VSBuffer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buf
 import { Mutable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/types";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { INativeMcpDiscoveryData } from "../../../../../platform/mcp/common/nativeMcpDiscoveryHelper.js";
-import { DiscoverySource } from "@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration";
+import { DiscoverySource } from "@codingame/monaco-vscode-aa9ead53-dfd3-59da-b9e7-f163d201de8d-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration";
 import { McpCollectionSortOrder, McpServerDefinition } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";
 export interface NativeMpcDiscoveryAdapter {
     readonly remoteAuthority: string | null;

package/vscode/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAdapters.js

@@ -1,7 +1,7 @@
 
 import { Platform } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { DiscoverySource } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { DiscoverySource } from '@codingame/monaco-vscode-aa9ead53-dfd3-59da-b9e7-f163d201de8d-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { McpServerTransportType, McpCollectionSortOrder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 
 function claudeConfigToServerDefinition(idPrefix, contents, cwd) {
@@ -26,7 +26,7 @@ function claudeConfigToServerDefinition(idPrefix, contents, cwd) {
                 command: server.command,
                 env: server.env || {},
                 envFile: undefined,
-                cwd,
+                cwd: cwd?.fsPath,
             }
         };
     }));

package/vscode/src/vs/workbench/contrib/mcp/common/discovery/workspaceMcpDiscoveryAdapter.js

@@ -4,17 +4,18 @@ import { DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/commo
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
-import { DiscoverySource } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { DiscoverySource } from '@codingame/monaco-vscode-aa9ead53-dfd3-59da-b9e7-f163d201de8d-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 import { McpCollectionSortOrder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { FilesystemMcpDiscovery } from './nativeMcpDiscoveryAbstract.js';
 import { claudeConfigToServerDefinition } from './nativeMcpDiscoveryAdapters.js';
-import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
 let CursorWorkspaceMcpDiscoveryAdapter = class CursorWorkspaceMcpDiscoveryAdapter extends FilesystemMcpDiscovery {
     constructor(fileService, _workspaceContextService, mcpRegistry, configurationService, _remoteAgentService) {
@@ -45,6 +46,7 @@ let CursorWorkspaceMcpDiscoveryAdapter = class CursorWorkspaceMcpDiscoveryAdapte
             scope: StorageScope.WORKSPACE,
             isTrustedByDefault: false,
             serverDefinitions: observableValue(this, []),
+            configTarget: ConfigurationTarget.WORKSPACE_FOLDER,
             presentation: {
                 origin: configFile,
                 order: McpCollectionSortOrder.WorkspaceFolder + 1,

package/vscode/src/vs/workbench/contrib/mcp/common/mcpConfigPathsService.js

@@ -13,12 +13,12 @@ import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
-import { FOLDER_SETTINGS_PATH } from '@codingame/monaco-vscode-4a0e04a7-c3bd-5fb7-9d3b-4fd047cc9e59-common/vscode/vs/workbench/services/preferences/common/preferences';
+import { FOLDER_SETTINGS_PATH } from '@codingame/monaco-vscode-c87fff3a-2aa9-52ab-ba4d-17e8d1e5e185-common/vscode/vs/workbench/services/preferences/common/preferences';
 import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
-import { mcpConfigurationSection } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { mcpConfigurationSection } from '@codingame/monaco-vscode-aa9ead53-dfd3-59da-b9e7-f163d201de8d-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { McpCollectionSortOrder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
-import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
 let McpConfigPathsService = class McpConfigPathsService extends Disposable {
     get paths() {
@@ -33,7 +33,7 @@ let McpConfigPathsService = class McpConfigPathsService extends Disposable {
                 id: 'usrlocal',
                 key: 'userLocalValue',
                 target: ConfigurationTarget.USER_LOCAL,
-                label: ( localize(7717, 'Global in {0}', productService.nameShort)),
+                label: ( localize(7922, 'Global in {0}', productService.nameShort)),
                 scope: StorageScope.PROFILE,
                 order: McpCollectionSortOrder.User,
                 uri: preferencesService.userSettingsResource,

package/vscode/src/vs/workbench/contrib/mcp/common/mcpDevMode.d.ts

@@ -0,0 +1,23 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
+import { IDebugService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug.service";
+import { IMcpDevModeDebugging } from "./mcpDevMode.service.js";
+import { IMcpRegistry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service";
+import { IMcpServer, McpServerDefinition, McpServerLaunch } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";
+export declare class McpDevModeServerAttache extends Disposable {
+    active: boolean;
+    constructor(server: IMcpServer, fwdRef: {
+        lastModeDebugged: boolean;
+    }, registry: IMcpRegistry, fileService: IFileService, workspaceContextService: IWorkspaceContextService);
+}
+export declare class McpDevModeDebugging implements IMcpDevModeDebugging {
+    private readonly _debugService;
+    private readonly _commandService;
+    readonly _serviceBrand: undefined;
+    constructor(_debugService: IDebugService, _commandService: ICommandService);
+    transform(definition: McpServerDefinition, launch: McpServerLaunch): Promise<McpServerLaunch>;
+    protected ensureListeningOnPort(port: number): Promise<void>;
+    protected getDebugPort(): Promise<number>;
+}

package/vscode/src/vs/workbench/contrib/mcp/common/mcpDevMode.js

@@ -0,0 +1,89 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { equals as equals$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { Throttler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { parse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/glob';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import '@codingame/monaco-vscode-api/vscode/vs/nls';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
+import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
+import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
+import { autorun, autorunDelta } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+
+let McpDevModeServerAttache = class McpDevModeServerAttache extends Disposable {
+    constructor(server, fwdRef, registry, fileService, workspaceContextService) {
+        super();
+        this.active = false;
+        const workspaceFolder = ( server.readDefinitions().map(({ collection }) => collection?.presentation?.origin &&
+            workspaceContextService.getWorkspaceFolder(collection.presentation?.origin)?.uri));
+        const restart = async () => {
+            const lastDebugged = fwdRef.lastModeDebugged;
+            await server.stop();
+            await server.start({ isFromInteraction: false, debug: lastDebugged });
+        };
+        let didAutoStart = false;
+        this._register(autorun(reader => {
+            const defs = server.readDefinitions().read(reader);
+            if (!defs.collection || !defs.server || !defs.server.devMode) {
+                didAutoStart = false;
+                return;
+            }
+            if (didAutoStart) {
+                return;
+            }
+            const delegates = registry.delegates.read(reader);
+            if (!( delegates.some(d => d.canStart(defs.collection, defs.server)))) {
+                return;
+            }
+            server.start();
+            didAutoStart = true;
+        }));
+        const debugMode = ( server.readDefinitions().map(d => !!d.server?.devMode?.debug));
+        this._register(autorunDelta(debugMode, ({ lastValue, newValue }) => {
+            if (!!newValue && !equals(lastValue, newValue)) {
+                restart();
+            }
+        }));
+        const watchObs = derivedOpts({ equalsFn: equals$1 }, reader => {
+            const def = server.readDefinitions().read(reader);
+            const watch = def.server?.devMode?.watch;
+            return typeof watch === 'string' ? [watch] : watch;
+        });
+        const restartScheduler = this._register(( new Throttler()));
+        this._register(autorun(reader => {
+            const pattern = watchObs.read(reader);
+            const wf = workspaceFolder.read(reader);
+            if (!pattern || !wf) {
+                return;
+            }
+            const includes = pattern.filter(p => !p.startsWith('!'));
+            const excludes = ( pattern.filter(p => p.startsWith('!')).map(p => p.slice(1)));
+            reader.store.add(fileService.watch(wf, { includes, excludes, recursive: true }));
+            const includeParse = ( includes.map(p => parse({ base: wf.fsPath, pattern: p })));
+            const excludeParse = ( excludes.map(p => parse({ base: wf.fsPath, pattern: p })));
+            reader.store.add(fileService.onDidFilesChange(e => {
+                for (const change of [e.rawAdded, e.rawDeleted, e.rawUpdated]) {
+                    for (const uri of change) {
+                        if (( includeParse.some(i => i(uri.fsPath))) && !( excludeParse.some(e => e(uri.fsPath)))) {
+                            restartScheduler.queue(restart);
+                            break;
+                        }
+                    }
+                }
+            }));
+        }));
+    }
+};
+McpDevModeServerAttache = ( __decorate([
+    ( __param(2, IMcpRegistry)),
+    ( __param(3, IFileService)),
+    ( __param(4, IWorkspaceContextService))
+], McpDevModeServerAttache));
+
+export { McpDevModeServerAttache };

package/vscode/src/vs/workbench/contrib/mcp/common/mcpDevMode.service.d.ts

@@ -0,0 +1,6 @@
+import { McpServerDefinition, McpServerLaunch } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";
+export interface IMcpDevModeDebugging {
+    readonly _serviceBrand: undefined;
+    transform(definition: McpServerDefinition, launch: McpServerLaunch): Promise<McpServerLaunch>;
+}
+export declare const IMcpDevModeDebugging: import("@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation").ServiceIdentifier<IMcpDevModeDebugging>;

package/vscode/src/vs/workbench/contrib/mcp/common/mcpDevMode.service.js

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+
+const IMcpDevModeDebugging = ( createDecorator('mcpDevModeDebugging'));
+
+export { IMcpDevModeDebugging };