@codingame/monaco-vscode-api 37.6.1 → 38.0.1

package/vscode/src/vs/platform/customizationMarketplace/common/customizationMarketplaceService.js

@@ -0,0 +1,247 @@
+
+import { raceCancellationError } from '../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { CancellationError, isCancellationError, getErrorMessage } from '../../../base/common/errors.js';
+import { Lazy } from '../../../base/common/lazy.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { LRUCache } from '../../../base/common/map.js';
+import { isEqual } from '../../../base/common/resources.js';
+import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { localize } from '../../../nls.js';
+import { isDark } from '../../theme/common/theme.js';
+
+const maxContinuations = 32;
+const defaultPageSize = 30;
+const maxPageSize = 100;
+const maxQueryLength = 4096;
+const maxRelevanceScore = 100;
+const maxFeedPriority = 10;
+const continuationLifetimeMs = 30 * 60_000;
+const CustomizationMarketplaceMediaType = {
+    Skill: "application/ai-skill",
+    McpServer: "application/mcp-server+json",
+    ClaudePlugin: "application/vnd.anthropic.claude-plugin+json",
+    CopilotPlugin: "application/vnd.github.copilot-plugin",
+    CursorPlugin: "application/vnd.cursor.cursor-plugin+json"
+};
+function getCustomizationMarketplaceIconUri(icon, themeType) {
+    return URI.isUri(icon) ? icon : icon?.[isDark(themeType) ? "dark" : "light"];
+}
+function isCustomizationMarketplaceIconEqual(first, second) {
+    if (first === undefined || second === undefined) {
+        return first === second;
+    }
+    if (URI.isUri(first) || URI.isUri(second)) {
+        return URI.isUri(first) && URI.isUri(second) && isEqual(first, second);
+    }
+    return isEqual(first.light, second.light) && isEqual(first.dark, second.dark);
+}
+function getCustomizationMarketplaceResourceKey(resource) {
+    return JSON.stringify([resource.sourceId, resource.identifier, resource.version ?? null]);
+}
+var CustomizationMarketplaceRecoveryGroup;
+(function(CustomizationMarketplaceRecoveryGroup) {
+    CustomizationMarketplaceRecoveryGroup["GitHubDefaultAccount"] = "githubDefaultAccount";
+})(
+    CustomizationMarketplaceRecoveryGroup || (CustomizationMarketplaceRecoveryGroup = {})
+);
+function createLazyCustomizationMarketplaceProvider(id, createProvider, sourceId = id) {
+    const provider = ( new Lazy(createProvider));
+    return {
+        id,
+        sourceId,
+        query: async (options, token) => {
+            if (token.isCancellationRequested) {
+                throw ( new CancellationError());
+            }
+            const instance = provider.value;
+            if (instance.id !== id) {
+                throw ( new Error(
+                    `Marketplace provider '${id}' has an unexpected identifier '${instance.id}'.`
+                ));
+            }
+            return instance.query(options, token);
+        }
+    };
+}
+class CustomizationMarketplaceService {
+    constructor(sources) {
+        this.sources = sources;
+        this.continuations = ( new LRUCache(maxContinuations));
+        if (( sources.some(source => !source.id || source.sourceId === "")) || ( new Set(sources.map(source => source.id))).size !== sources.length) {
+            throw ( new Error("Marketplace sources must have unique, nonempty identifiers."));
+        }
+    }
+    async query(options, token) {
+        if (token.isCancellationRequested || options.sourceIds.length === 0) {
+            throw ( new CancellationError());
+        }
+        const requestedSourceIds = ( new Set(options.sourceIds));
+        const sources = this.sources.filter(source => ( requestedSourceIds.has(source.sourceId ?? source.id)));
+        const selectedSourceIds = ( new Set(sources.map(source => source.sourceId ?? source.id)));
+        const query = options.query?.trim() ?? "";
+        const requestedPageSize = options.pageSize ?? defaultPageSize;
+        if (requestedSourceIds.size !== options.sourceIds.length || selectedSourceIds.size !== requestedSourceIds.size || ( [...requestedSourceIds].some(sourceId => !( selectedSourceIds.has(sourceId)))) || query.length > maxQueryLength || !Number.isSafeInteger(requestedPageSize) || requestedPageSize <= 0 || (options.mediaType !== undefined && !( Object.values(CustomizationMarketplaceMediaType)).includes(options.mediaType))) {
+            throw ( new Error(( localize(2581, "The marketplace query is invalid."))));
+        }
+        const pageSize = Math.min(requestedPageSize, maxPageSize);
+        for (const [key, value] of [...this.continuations]) {
+            if (value.expiresAt <= Date.now()) {
+                this.continuations.delete(key);
+            }
+        }
+        const continuation = options.cursor && this.continuations.get(options.cursor.token);
+        if (options.cursor && (!continuation || continuation.query !== query || continuation.mediaType !== options.mediaType || continuation.pageSize !== pageSize || continuation.sourceIds.length !== sources.length || ( continuation.sourceIds.some((id, index) => id !== sources[index].id)) || ( continuation.states.some(state => state.cacheToken?.isCancellationRequested)))) {
+            throw ( new Error(( localize(2582, "The marketplace page is invalid. Start a new search."))));
+        }
+        const states = continuation ? continuation.states.map(state => ({
+            ...state,
+            items: [...state.items]
+        })) : sources.map(() => ({
+            items: [],
+            exhausted: false,
+            lastScore: maxRelevanceScore,
+            lastPriority: maxFeedPriority
+        }));
+        let nextSourceIndex = continuation?.nextSourceIndex ?? 0;
+        const store = ( new DisposableStore());
+        const cancellation = store.add(( new CancellationTokenSource(token)));
+        try {
+            const items = [];
+            while (items.length < pageSize) {
+                await raceCancellationError(Promise.all(states.map(async (state, index) => {
+                    if (state.items.length || state.exhausted) {
+                        return;
+                    }
+                    let page;
+                    try {
+                        page = await sources[index].query({
+                            query,
+                            mediaType: options.mediaType,
+                            pageSize,
+                            cursor: state.cursor
+                        }, cancellation.token);
+                    } catch (error) {
+                        if (isCancellationError(error) || cancellation.token.isCancellationRequested) {
+                            throw ( new CancellationError());
+                        }
+                        state.error = getErrorMessage(error);
+                        state.exhausted = true;
+                        return;
+                    }
+                    if (state.cacheToken?.isCancellationRequested || page.cacheToken?.isCancellationRequested || (state.cursor !== undefined && state.cacheToken !== page.cacheToken)) {
+                        throw ( new Error(( localize(2582, "The marketplace page is invalid. Start a new search."))));
+                    }
+                    if (page.items.length > pageSize || (page.total !== undefined && (!Number.isSafeInteger(page.total) || page.total < page.items.length)) || (page.nextCursor !== undefined && (!page.nextCursor || page.nextCursor === state.cursor || !page.items.length))) {
+                        throw ( new Error(( localize(
+                            2583,
+                            "The marketplace source '{0}' returned an invalid page.",
+                            sources[index].id
+                        ))));
+                    }
+                    let lastScore = state.lastScore;
+                    let lastPriority = state.lastPriority;
+                    for (const item of page.items) {
+                        const score = item.score ?? 0;
+                        const priority = item.priority ?? 0;
+                        if ((item.score !== undefined && !Number.isFinite(item.score)) || score < 0 || score > maxRelevanceScore || (query && score > lastScore)) {
+                            throw ( new Error(( localize(
+                                2584,
+                                "The marketplace source '{0}' returned invalid relevance ordering.",
+                                sources[index].id
+                            ))));
+                        }
+                        if (!Number.isSafeInteger(priority) || priority < 0 || priority > maxFeedPriority || (query ? score === lastScore && priority > lastPriority : priority > lastPriority)) {
+                            throw ( new Error(( localize(
+                                2585,
+                                "The marketplace source '{0}' returned invalid priority ordering.",
+                                sources[index].id
+                            ))));
+                        }
+                        lastScore = score;
+                        lastPriority = priority;
+                    }
+                    state.items = [...page.items];
+                    state.cacheToken = page.cacheToken;
+                    state.cursor = page.nextCursor;
+                    state.total = page.total;
+                    state.error = page.error ?? state.error ?? page.warning;
+                    state.exhausted = page.error !== undefined || page.nextCursor === undefined;
+                    state.lastScore = lastScore;
+                    state.lastPriority = lastPriority;
+                })), cancellation.token);
+                if (( states.some(state => state.cacheToken?.isCancellationRequested))) {
+                    throw ( new Error(( localize(2582, "The marketplace page is invalid. Start a new search."))));
+                }
+                let selected = -1;
+                for (let offset = 0; offset < states.length; offset++) {
+                    const index = (nextSourceIndex + offset) % states.length;
+                    const candidate = states[index].items[0];
+                    const current = selected < 0 ? undefined : states[selected].items[0];
+                    const score = query ? candidate?.score ?? 0 : 0;
+                    const currentScore = query ? current?.score ?? 0 : 0;
+                    if (candidate && (!current || score > currentScore || (score === currentScore && (candidate.priority ?? 0) > (current.priority ?? 0)))) {
+                        selected = index;
+                    }
+                }
+                if (selected < 0) {
+                    break;
+                }
+                const {
+                    priority: _priority,
+                    ...item
+                } = states[selected].items.shift();
+                items.push({
+                    ...item,
+                    sourceId: sources[selected].sourceId ?? sources[selected].id
+                });
+                nextSourceIndex = (selected + 1) % states.length;
+            }
+            let nextCursor;
+            if (( states.some(state => state.items.length || !state.exhausted))) {
+                nextCursor = {
+                    token: generateUuid()
+                };
+                this.continuations.set(nextCursor.token, {
+                    query,
+                    mediaType: options.mediaType,
+                    pageSize,
+                    sourceIds: sources.map(source => source.id),
+                    states,
+                    nextSourceIndex,
+                    expiresAt: Date.now() + continuationLifetimeMs
+                });
+            }
+            const sourceErrorMessages = ( new Map());
+            for (let index = 0; index < states.length; index++) {
+                const error = states[index].error;
+                if (error !== undefined) {
+                    const sourceId = sources[index].sourceId ?? sources[index].id;
+                    const messages = sourceErrorMessages.get(sourceId) ?? [];
+                    if (!messages.includes(error)) {
+                        messages.push(error);
+                    }
+                    sourceErrorMessages.set(sourceId, messages);
+                }
+            }
+            const sourceErrors = [...sourceErrorMessages].map(([sourceId, messages]) => ({
+                sourceId,
+                message: messages.join("; ")
+            }));
+            return {
+                items,
+                total: !sourceErrors.length && states.every(state => state.total !== undefined) ? states.reduce((total, state) => total + state.total, 0) : undefined,
+                nextCursor,
+                ...(sourceErrors.length ? {
+                    sourceErrors
+                } : {})
+            };
+        } finally {
+            cancellation.cancel();
+            store.dispose();
+        }
+    }
+}
+
+export { CustomizationMarketplaceMediaType, CustomizationMarketplaceRecoveryGroup, CustomizationMarketplaceService, createLazyCustomizationMarketplaceProvider, getCustomizationMarketplaceIconUri, getCustomizationMarketplaceResourceKey, isCustomizationMarketplaceIconEqual };

package/vscode/src/vs/platform/customizationMarketplace/common/customizationMarketplaceService.service.d.ts

@@ -0,0 +1,15 @@
+import { CancellationToken } from "../../../base/common/cancellation.js";
+import { Event } from "../../../sessions/sessions.web.main.internal.js";
+import { ICustomizationMarketplaceSourceInfo, ICustomizationMarketplaceQuery, ICustomizationMarketplacePage, ICustomizationMarketplaceSourceRecoveryAction } from "./customizationMarketplaceService.js";
+export declare const ICustomizationMarketplaceService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<ICustomizationMarketplaceService>;
+export interface ICustomizationMarketplaceService {
+    readonly _serviceBrand: undefined;
+    readonly sources: readonly ICustomizationMarketplaceSourceInfo[];
+    /** Complete source metadata, including sources that are not currently available. */
+    readonly allSources?: readonly ICustomizationMarketplaceSourceInfo[];
+    /** Fires when non-configuration inputs change source availability or query identity. */
+    readonly onDidChangeSources?: Event<void>;
+    query(options: ICustomizationMarketplaceQuery, token: CancellationToken): Promise<ICustomizationMarketplacePage>;
+    /** Optional renderer-owned recovery; not part of the catalog transport. */
+    getSourceRecoveryAction?(sourceId: string): ICustomizationMarketplaceSourceRecoveryAction | undefined;
+}

package/vscode/src/vs/platform/customizationMarketplace/common/customizationMarketplaceService.service.js

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+
+const ICustomizationMarketplaceService = ( createDecorator("customizationMarketplaceService"));
+
+export { ICustomizationMarketplaceService };

package/vscode/src/vs/platform/customizationMarketplace/common/customizationMarketplaceSources.d.ts

@@ -0,0 +1,39 @@
+import { CancellationToken } from "../../../base/common/cancellation.js";
+import { IConfigurationChangeEvent } from "../../configuration/common/configuration.js";
+import { IConfigurationService } from "../../configuration/common/configuration.service.js";
+import { ICustomizationMarketplacePage, ICustomizationMarketplaceQuery, ICustomizationMarketplaceRequest, ICustomizationMarketplaceSourceInfo } from "./customizationMarketplaceService.js";
+export declare enum CustomizationMarketplaceConfiguration {
+    MarketplaceEnabled = "chat.customizations.marketplace.enabled",
+    AgentFinderPublicFeedEnabled = "chat.customizations.marketplace.sources.publicFeed.enabled",
+    CopilotConnectorsEnabled = "chat.customizations.copilotConnectors.enabled"
+}
+export declare const CustomizationMarketplaceSources: {
+    readonly PluginMarketplaces: {
+        readonly id: "pluginMarketplaces";
+        readonly displayName: string;
+        readonly enablementSetting: CustomizationMarketplaceConfiguration.MarketplaceEnabled;
+    };
+    readonly McpGallery: {
+        readonly id: "mcpGallery";
+        readonly displayName: string;
+        readonly enablementSetting: CustomizationMarketplaceConfiguration.MarketplaceEnabled;
+        readonly configurationDependencies: readonly [
+            "chat.mcp.gallery.serviceUrl"
+        ];
+    };
+    readonly AgentFinderPublicFeed: {
+        readonly id: "agentFinder";
+        readonly displayName: string;
+        readonly enablementSetting: CustomizationMarketplaceConfiguration.AgentFinderPublicFeedEnabled;
+        readonly requiresMarketplaceVisibility: true;
+    };
+    readonly CopilotConnectors: {
+        readonly id: "copilotConnectors";
+        readonly displayName: string;
+        readonly enablementSetting: CustomizationMarketplaceConfiguration.CopilotConnectorsEnabled;
+    };
+};
+export declare function getEnabledCustomizationMarketplaceSources(configurationService: IConfigurationService, sources: readonly ICustomizationMarketplaceSourceInfo[]): readonly ICustomizationMarketplaceSourceInfo[];
+export declare function getVisibleCustomizationMarketplaceSources(configurationService: IConfigurationService, sources: readonly ICustomizationMarketplaceSourceInfo[]): readonly ICustomizationMarketplaceSourceInfo[];
+export declare function affectsCustomizationMarketplaceSources(event: IConfigurationChangeEvent, sources: readonly ICustomizationMarketplaceSourceInfo[]): boolean;
+export declare function queryEnabledCustomizationMarketplaceSources(configurationService: IConfigurationService, sources: readonly ICustomizationMarketplaceSourceInfo[], options: ICustomizationMarketplaceQuery, token: CancellationToken, query: (request: ICustomizationMarketplaceRequest, token: CancellationToken) => Promise<ICustomizationMarketplacePage>): Promise<ICustomizationMarketplacePage>;

package/vscode/src/vs/platform/customizationMarketplace/common/customizationMarketplaceSources.js

@@ -0,0 +1,83 @@
+
+import { equals } from '../../../base/common/arrays.js';
+import { raceCancellationError } from '../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../base/common/cancellation.js';
+import { CancellationError } from '../../../base/common/errors.js';
+import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { localize } from '../../../nls.js';
+import { mcpGalleryServiceUrlConfig } from '../../mcp/common/mcpManagement.js';
+
+var CustomizationMarketplaceConfiguration;
+(function(CustomizationMarketplaceConfiguration) {
+    CustomizationMarketplaceConfiguration["MarketplaceEnabled"] = "chat.customizations.marketplace.enabled";
+    CustomizationMarketplaceConfiguration["AgentFinderPublicFeedEnabled"] = "chat.customizations.marketplace.sources.publicFeed.enabled";
+    CustomizationMarketplaceConfiguration["CopilotConnectorsEnabled"] = "chat.customizations.copilotConnectors.enabled";
+})(
+    CustomizationMarketplaceConfiguration || (CustomizationMarketplaceConfiguration = {})
+);
+const CustomizationMarketplaceSources = {
+    PluginMarketplaces: {
+        id: "pluginMarketplaces",
+        displayName: ( localize(2586, "Configured Plugin Marketplaces")),
+        enablementSetting: CustomizationMarketplaceConfiguration.MarketplaceEnabled
+    },
+    McpGallery: {
+        id: "mcpGallery",
+        displayName: ( localize(2587, "MCP Gallery")),
+        enablementSetting: CustomizationMarketplaceConfiguration.MarketplaceEnabled,
+        configurationDependencies: [mcpGalleryServiceUrlConfig]
+    },
+    AgentFinderPublicFeed: {
+        id: "agentFinder",
+        displayName: ( localize(2588, "GitHub Feed")),
+        enablementSetting: CustomizationMarketplaceConfiguration.AgentFinderPublicFeedEnabled,
+        requiresMarketplaceVisibility: true
+    },
+    CopilotConnectors: {
+        id: "copilotConnectors",
+        displayName: ( localize(2589, "Copilot Connectors")),
+        enablementSetting: CustomizationMarketplaceConfiguration.CopilotConnectorsEnabled
+    }
+};
+function getEnabledCustomizationMarketplaceSources(configurationService, sources) {
+    return sources.filter(
+        source => configurationService.getValue(source.enablementSetting) === true && (!source.requiresMarketplaceVisibility || configurationService.getValue(CustomizationMarketplaceConfiguration.MarketplaceEnabled) === true)
+    );
+}
+function getVisibleCustomizationMarketplaceSources(configurationService, sources) {
+    return configurationService.getValue(CustomizationMarketplaceConfiguration.MarketplaceEnabled) === true ? getEnabledCustomizationMarketplaceSources(configurationService, sources) : [];
+}
+function affectsCustomizationMarketplaceSources(event, sources) {
+    return event.affectsConfiguration(CustomizationMarketplaceConfiguration.MarketplaceEnabled) || ( sources.some(
+        source => event.affectsConfiguration(source.enablementSetting) || source.configurationDependencies?.some(setting => event.affectsConfiguration(setting))
+    ));
+}
+async function queryEnabledCustomizationMarketplaceSources(configurationService, sources, options, token, query) {
+    const getSourceIds = () => getEnabledCustomizationMarketplaceSources(configurationService, sources).filter(source => !options.sourceIds || options.sourceIds.includes(source.id)).map(source => source.id);
+    const sourceIds = getSourceIds();
+    if (token.isCancellationRequested || sourceIds.length === 0) {
+        throw ( new CancellationError());
+    }
+    const store = ( new DisposableStore());
+    const cancellation = store.add(( new CancellationTokenSource(token)));
+    const selectedSources = sources.filter(source => sourceIds.includes(source.id));
+    store.add(configurationService.onDidChangeConfiguration(event => {
+        const queryConfigurationChanged = ( selectedSources.some(
+            source => source.configurationDependencies?.some(setting => event.affectsConfiguration(setting))
+        ));
+        if (queryConfigurationChanged || (affectsCustomizationMarketplaceSources(event, sources) && !equals(sourceIds, getSourceIds()))) {
+            cancellation.cancel();
+        }
+    }));
+    try {
+        return await raceCancellationError(query({
+            ...options,
+            sourceIds
+        }, cancellation.token), cancellation.token);
+    } finally {
+        cancellation.cancel();
+        store.dispose();
+    }
+}
+
+export { CustomizationMarketplaceConfiguration, CustomizationMarketplaceSources, affectsCustomizationMarketplaceSources, getEnabledCustomizationMarketplaceSources, getVisibleCustomizationMarketplaceSources, queryEnabledCustomizationMarketplaceSources };

package/vscode/src/vs/platform/customizationMarketplace/common/platformCustomizationMarketplaceService.service.d.ts

@@ -0,0 +1,2 @@
+import { ICustomizationMarketplaceService } from "./customizationMarketplaceService.service.js";
+export declare const IPlatformCustomizationMarketplaceService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<ICustomizationMarketplaceService>;

package/vscode/src/vs/platform/customizationMarketplace/common/platformCustomizationMarketplaceService.service.js

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+
+const IPlatformCustomizationMarketplaceService = ( createDecorator("platformCustomizationMarketplaceService"));
+
+export { IPlatformCustomizationMarketplaceService };

package/vscode/src/vs/platform/defaultAccount/common/defaultAccount.d.ts

@@ -50,13 +50,10 @@ export interface IDefaultAccountProvider {
     readonly onDidChangeManagedSettingsFreshness: Event<IManagedSettingsFreshness>;
     getDefaultAccountAuthenticationProvider(): IDefaultAccountAuthenticationProvider;
     /**
-     * Resolves a GitHub URL path to a full URL, using the GitHub Enterprise
-     * base URL when the user is authenticated via a GHE provider, or
-     * `https://github.com` otherwise.
-     *
-     * @param path The path portion of the URL (e.g. `settings/copilot/features`).
+     * Resolves a GitHub path against the selected session's enterprise server, or `https://github.com` for a non-enterprise provider.
+     * Returns `undefined` when enterprise authentication is selected but the session's server is unavailable.
      */
-    resolveGitHubUrl(path: string): string;
+    resolveGitHubUrl(path: string): string | undefined;
     refresh(options?: IDefaultAccountRefreshOptions): Promise<IDefaultAccount | null>;
     signIn(options?: {
         additionalScopes?: readonly string[];

package/vscode/src/vs/platform/defaultAccount/common/defaultAccount.service.d.ts

@@ -30,11 +30,8 @@ export interface IDefaultAccountService {
     }): Promise<IDefaultAccount | null>;
     signOut(): Promise<void>;
     /**
-    * Resolves a GitHub URL path to a full URL, using the GitHub Enterprise
-    * base URL when the user is authenticated via a GHE provider, or
-    * `https://github.com` otherwise.
-    *
-    * @param path The path portion of the URL (e.g. `settings/copilot/features`).
+    * Resolves a GitHub path against the selected session's enterprise server, or `https://github.com` for a non-enterprise provider.
+    * Returns `undefined` when enterprise authentication is selected but the session's server is unavailable.
     */
-    resolveGitHubUrl(path: string): string;
+    resolveGitHubUrl(path: string): string | undefined;
 }

package/vscode/src/vs/platform/dialogs/common/dialogs.js

@@ -28,12 +28,12 @@ class AbstractDialogHandler {
                 if (confirmationDialog.primaryButton) {
                     buttons.push(confirmationDialog.primaryButton);
                 } else {
-                    buttons.push(( localize(2218, "&&Yes")));
+                    buttons.push(( localize(2592, "&&Yes")));
                 }
                 if (confirmationDialog.cancelButton) {
                     buttons.push(confirmationDialog.cancelButton);
                 } else {
-                    buttons.push(( localize(2219, "Cancel")));
+                    buttons.push(( localize(2593, "Cancel")));
                 }
                 break;
             }
@@ -45,19 +45,19 @@ class AbstractDialogHandler {
                 }
                 if (promptDialog.cancelButton) {
                     if (promptDialog.cancelButton === true) {
-                        buttons.push(( localize(2219, "Cancel")));
+                        buttons.push(( localize(2593, "Cancel")));
                     } else if (typeof promptDialog.cancelButton === "string") {
                         buttons.push(promptDialog.cancelButton);
                     } else {
                         if (promptDialog.cancelButton.label) {
                             buttons.push(promptDialog.cancelButton.label);
                         } else {
-                            buttons.push(( localize(2219, "Cancel")));
+                            buttons.push(( localize(2593, "Cancel")));
                         }
                     }
                 }
                 if (buttons.length === 0) {
-                    buttons.push(( localize(2220, "&&OK")));
+                    buttons.push(( localize(2594, "&&OK")));
                 }
                 break;
             }
@@ -67,12 +67,12 @@ class AbstractDialogHandler {
                 if (inputDialog.primaryButton) {
                     buttons.push(inputDialog.primaryButton);
                 } else {
-                    buttons.push(( localize(2220, "&&OK")));
+                    buttons.push(( localize(2594, "&&OK")));
                 }
                 if (inputDialog.cancelButton) {
                     buttons.push(inputDialog.cancelButton);
                 } else {
-                    buttons.push(( localize(2219, "Cancel")));
+                    buttons.push(( localize(2593, "Cancel")));
                 }
                 break;
             }
@@ -119,10 +119,10 @@ function getFileNamesMessage(fileNamesOrResources) {
     ));
     if (fileNamesOrResources.length > MAX_CONFIRM_FILES) {
         if (fileNamesOrResources.length - MAX_CONFIRM_FILES === 1) {
-            message.push(( localize(2221, "...1 additional file not shown")));
+            message.push(( localize(2595, "...1 additional file not shown")));
         } else {
             message.push(( localize(
-                2222,
+                2596,
                 "...{0} additional files not shown",
                 fileNamesOrResources.length - MAX_CONFIRM_FILES
             )));

package/vscode/src/vs/platform/dnd/browser/dnd.js

@@ -193,7 +193,7 @@ async function extractFileListData(accessor, files) {
         if (file) {
             if (file.size > 100 * ByteSize.MB) {
                 dialogService.warn(( localize(
-                    2223,
+                    2597,
                     "File is too large to open as untitled editor. Please upload it first into the file explorer and then try again."
                 )));
                 continue;

package/vscode/src/vs/platform/editor/common/editor.d.ts

@@ -139,6 +139,22 @@ export declare enum EditorOpenSource {
      */
     USER = 1
 }
+/**
+ * An editor column or symbolic placement relative to the active editor.
+ */
+export declare enum ViewColumn {
+    Active = -1,
+    Beside = -2,
+    One = 1,
+    Two = 2,
+    Three = 3,
+    Four = 4,
+    Five = 5,
+    Six = 6,
+    Seven = 7,
+    Eight = 8,
+    Nine = 9
+}
 export interface IEditorOptions {
     /**
      * Tells the editor to not receive keyboard focus when the editor is being opened.
@@ -325,6 +341,10 @@ export interface IModalEditorOptions {
      * for editors that provide their own header chrome.
      */
     readonly compactHeader?: boolean;
+    /**
+     * Whether the modal editor can be moved into an editor area.
+     */
+    readonly canMoveToEditorArea?: boolean;
 }
 /**
  * Marker interface for editor inputs that want to customize how they are
@@ -334,6 +354,7 @@ export interface IModalEditorOptionsProvider {
     getModalEditorOptions(): IModalEditorOptions | undefined;
 }
 export declare function isModalEditorOptionsProvider(obj: unknown): obj is IModalEditorOptionsProvider;
+export declare function canMoveModalEditorToEditorArea(obj: unknown): boolean;
 /**
  * Modal sidebar supports rendering custom content in a sidebar next to the main editor content.
  */

package/vscode/src/vs/platform/editor/common/editor.js

@@ -22,9 +22,26 @@ var EditorOpenSource;
     EditorOpenSource[EditorOpenSource["API"] = 0] = "API";
     EditorOpenSource[EditorOpenSource["USER"] = 1] = "USER";
 })(EditorOpenSource || (EditorOpenSource = {}));
+var ViewColumn;
+(function (ViewColumn) {
+    ViewColumn[ViewColumn["Active"] = -1] = "Active";
+    ViewColumn[ViewColumn["Beside"] = -2] = "Beside";
+    ViewColumn[ViewColumn["One"] = 1] = "One";
+    ViewColumn[ViewColumn["Two"] = 2] = "Two";
+    ViewColumn[ViewColumn["Three"] = 3] = "Three";
+    ViewColumn[ViewColumn["Four"] = 4] = "Four";
+    ViewColumn[ViewColumn["Five"] = 5] = "Five";
+    ViewColumn[ViewColumn["Six"] = 6] = "Six";
+    ViewColumn[ViewColumn["Seven"] = 7] = "Seven";
+    ViewColumn[ViewColumn["Eight"] = 8] = "Eight";
+    ViewColumn[ViewColumn["Nine"] = 9] = "Nine";
+})(ViewColumn || (ViewColumn = {}));
 function isModalEditorOptionsProvider(obj) {
     return !!obj && typeof obj.getModalEditorOptions === 'function';
 }
+function canMoveModalEditorToEditorArea(obj) {
+    return !isModalEditorOptionsProvider(obj) || obj.getModalEditorOptions()?.canMoveToEditorArea !== false;
+}
 var TextEditorSelectionRevealType;
 (function (TextEditorSelectionRevealType) {
     TextEditorSelectionRevealType[TextEditorSelectionRevealType["Center"] = 0] = "Center";
@@ -47,4 +64,4 @@ function isTextEditorDiffInformationEqual(uriIdentityService, diff1, diff2) {
         });
 }
 
-export { EditorActivation, EditorOpenSource, EditorResolution, TextEditorSelectionRevealType, TextEditorSelectionSource, isModalEditorOptionsProvider, isResolvedEditorModel, isTextEditorDiffInformationEqual };
+export { EditorActivation, EditorOpenSource, EditorResolution, TextEditorSelectionRevealType, TextEditorSelectionSource, ViewColumn, canMoveModalEditorToEditorArea, isModalEditorOptionsProvider, isResolvedEditorModel, isTextEditorDiffInformationEqual };

package/vscode/src/vs/platform/{agentHost → environment}/common/copilotHome.d.ts

@@ -1,3 +1,4 @@
 import { IProcessEnvironment } from "../../../base/common/platform.js";
 export declare function getCopilotHomePath(userHomePath: string, environment: IProcessEnvironment): string;
+export declare function getCopilotMcpConfigurationPath(userHomePath: string, environment: IProcessEnvironment): string;
 export declare function getCopilotRootPaths(userHomePath: string, environment: IProcessEnvironment): string[];

package/vscode/src/vs/platform/{agentHost → environment}/common/copilotHome.js

@@ -2,7 +2,7 @@
 import { join } from '../../../base/common/path.js';
 
 function getCopilotHomePath(userHomePath, environment) {
-    return environment["COPILOT_HOME"] || join(userHomePath, ".copilot");
+    return environment.COPILOT_HOME || join(userHomePath, ".copilot");
 }
 
 export { getCopilotHomePath };