@codingame/monaco-vscode-mcp-service-override 22.1.8 → 23.0.0

package/vscode/src/vs/platform/mcp/common/mcpGalleryService.js

@@ -9,20 +9,34 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { asJson, asText } from '@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request';
+import { asText, asJson } from '@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request';
 import { IRequestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service';
 import { TransportType, RegistryType, GalleryMcpServerStatus } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement';
 import { McpGalleryManifestStatus, getMcpGalleryManifestResourceUri, McpGalleryResourceType } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpGalleryManifest';
 import { IMcpGalleryManifestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpGalleryManifest.service';
-import { singlePagePager, PageIteratorPager } from '@codingame/monaco-vscode-62190c26-af1c-5f7a-a364-e05a59cfb7c7-common/vscode/vs/base/common/paging';
 import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
-import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
+import { isString, isObject } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 
-var McpServerOldSchema;
-(function (McpServerOldSchema) {
+var IconMimeType;
+(function (IconMimeType) {
+    IconMimeType["PNG"] = "image/png";
+    IconMimeType["JPEG"] = "image/jpeg";
+    IconMimeType["JPG"] = "image/jpg";
+    IconMimeType["SVG"] = "image/svg+xml";
+    IconMimeType["WEBP"] = "image/webp";
+})(IconMimeType || (IconMimeType = {}));
+var IconTheme;
+(function (IconTheme) {
+    IconTheme["LIGHT"] = "light";
+    IconTheme["DARK"] = "dark";
+})(IconTheme || (IconTheme = {}));
+var McpServerSchemaVersion_v2025_07_09;
+(function (McpServerSchemaVersion_v2025_07_09) {
+    McpServerSchemaVersion_v2025_07_09.VERSION = 'v0-2025-07-09';
+    McpServerSchemaVersion_v2025_07_09.SCHEMA = `https://static.modelcontextprotocol.io/schemas/2025-07-09/server.schema.json`;
     class Serializer {
         toRawGalleryMcpServerResult(input) {
-            if (!input || !Array.isArray(input.servers)) {
+            if (!input || typeof input !== 'object' || !Array.isArray(input.servers)) {
                 return undefined;
             }
             const from = input;
@@ -35,167 +49,27 @@ var McpServerOldSchema;
                 servers.push(rawServer);
             }
             return {
-                metadata: from.metadata,
+                metadata: {
+                    count: from.metadata.count ?? 0,
+                    nextCursor: from.metadata?.next_cursor
+                },
                 servers
             };
         }
         toRawGalleryMcpServer(input) {
-            if (!input || !input.server) {
+            if (!input || typeof input !== 'object') {
                 return undefined;
             }
             const from = input;
-            const registryInfo = from['x-io.modelcontextprotocol.registry'];
-            function convertServerInput(input) {
-                return {
-                    ...input,
-                    isRequired: input.is_required,
-                    isSecret: input.is_secret,
-                };
-            }
-            function convertVariables(variables) {
-                const result = {};
-                for (const [key, value] of Object.entries(variables)) {
-                    result[key] = convertServerInput(value);
-                }
-                return result;
-            }
-            function convertServerArgument(arg) {
-                if (arg.type === 'positional') {
-                    return {
-                        ...arg,
-                        valueHint: arg.value_hint,
-                        isRepeated: arg.is_repeated,
-                        isRequired: arg.is_required,
-                        isSecret: arg.is_secret,
-                        variables: arg.variables ? convertVariables(arg.variables) : undefined,
-                    };
-                }
-                return {
-                    ...arg,
-                    isRepeated: arg.is_repeated,
-                    isRequired: arg.is_required,
-                    isSecret: arg.is_secret,
-                    variables: arg.variables ? convertVariables(arg.variables) : undefined,
-                };
-            }
-            function convertKeyValueInput(input) {
-                return {
-                    ...input,
-                    isRequired: input.is_required,
-                    isSecret: input.is_secret,
-                    variables: input.variables ? convertVariables(input.variables) : undefined,
-                };
-            }
-            function convertTransport(input) {
-                switch (input.type) {
-                    case 'stdio':
-                        return {
-                            type: TransportType.STDIO,
-                        };
-                    case 'streamable-http':
-                        return {
-                            type: TransportType.STREAMABLE_HTTP,
-                            url: input.url,
-                            headers: input.headers?.map(convertKeyValueInput),
-                        };
-                    case 'sse':
-                        return {
-                            type: TransportType.SSE,
-                            url: input.url,
-                            headers: input.headers?.map(convertKeyValueInput),
-                        };
-                    default:
-                        return undefined;
-                }
-            }
-            function convertRegistryType(input) {
-                switch (input) {
-                    case 'npm':
-                        return RegistryType.NODE;
-                    case 'docker':
-                    case 'docker-hub':
-                    case 'oci':
-                        return RegistryType.DOCKER;
-                    case 'pypi':
-                        return RegistryType.PYTHON;
-                    case 'nuget':
-                        return RegistryType.NUGET;
-                    case 'mcpb':
-                        return RegistryType.MCPB;
-                    default:
-                        return RegistryType.NODE;
-                }
-            }
-            return {
-                name: from.server.name,
-                description: from.server.description,
-                repository: from.server.repository ? {
-                    url: from.server.repository.url,
-                    source: from.server.repository.source,
-                    id: from.server.repository.id,
-                    readme: from.server.repository.readme
-                } : undefined,
-                version: from.server.version_detail.version,
-                createdAt: from.server.created_at,
-                updatedAt: from.server.updated_at,
-                packages: from.server.packages?.map(p => ({
-                    identifier: p.identifier ?? p.name,
-                    registryType: convertRegistryType(p.registry_type ?? p.registry_name),
-                    version: p.version,
-                    fileSha256: p.file_sha256,
-                    registryBaseUrl: p.registry_base_url,
-                    transport: p.transport ? convertTransport(p.transport) : undefined,
-                    packageArguments: p.package_arguments?.map(convertServerArgument),
-                    runtimeHint: p.runtime_hint,
-                    runtimeArguments: p.runtime_arguments?.map(convertServerArgument),
-                    environmentVariables: p.environment_variables?.map(convertKeyValueInput),
-                })),
-                remotes: from.server.remotes?.map(remote => {
-                    const type = remote.type ?? remote.transport_type ?? remote.transport;
-                    return {
-                        type: type === TransportType.SSE ? TransportType.SSE : TransportType.STREAMABLE_HTTP,
-                        url: remote.url,
-                        headers: remote.headers?.map(convertKeyValueInput)
-                    };
-                }),
-                registryInfo: {
-                    id: registryInfo.id,
-                    isLatest: registryInfo.is_latest,
-                    publishedAt: registryInfo.published_at,
-                    updatedAt: registryInfo.updated_at,
-                },
-                githubInfo: from['x-github'],
-            };
-        }
-    }
-    McpServerOldSchema.SERIALIZER = ( new Serializer());
-})(McpServerOldSchema || (McpServerOldSchema = {}));
-var McpServer1ESSchema;
-(function (McpServer1ESSchema) {
-    class Serializer {
-        toRawGalleryMcpServerResult(input) {
-            if (!input || !Array.isArray(input.servers)) {
+            if ((!from.name || !isString(from.name))
+                || (!from.description || !isString(from.description))
+                || (!from.version || !isString(from.version))) {
                 return undefined;
             }
-            const from = input;
-            const servers = [];
-            for (const server of from.servers) {
-                const rawServer = this.toRawGalleryMcpServer(server);
-                if (!rawServer) {
-                    return undefined;
-                }
-                servers.push(rawServer);
-            }
-            return {
-                metadata: from.metadata,
-                servers
-            };
-        }
-        toRawGalleryMcpServer(input) {
-            if (!input || input.server || input.$schema) {
+            if (from.$schema && from.$schema !== McpServerSchemaVersion_v2025_07_09.SCHEMA) {
                 return undefined;
             }
-            const from = input;
+            const registryInfo = from._meta?.['io.modelcontextprotocol.registry/official'];
             function convertServerInput(input) {
                 return {
                     ...input,
@@ -256,159 +130,9 @@ var McpServer1ESSchema;
                             headers: input.headers?.map(convertKeyValueInput),
                         };
                     default:
-                        return undefined;
-                }
-            }
-            function convertRegistryType(input) {
-                switch (input) {
-                    case 'npm':
-                        return RegistryType.NODE;
-                    case 'docker':
-                    case 'docker-hub':
-                    case 'oci':
-                        return RegistryType.DOCKER;
-                    case 'pypi':
-                        return RegistryType.PYTHON;
-                    case 'nuget':
-                        return RegistryType.NUGET;
-                    case 'mcpb':
-                        return RegistryType.MCPB;
-                    default:
-                        return RegistryType.NODE;
-                }
-            }
-            return {
-                name: from.name,
-                description: from.description,
-                repository: from.repository ? {
-                    url: from.repository.url,
-                    source: from.repository.source,
-                    id: from.repository.id,
-                    readme: from.repository.readme
-                } : undefined,
-                version: from.version_detail.version,
-                createdAt: from.created_at,
-                updatedAt: from.updated_at,
-                packages: from.packages?.map(p => ({
-                    identifier: p.identifier ?? p.name,
-                    registryType: convertRegistryType(p.registry_type ?? p.registry_name),
-                    version: p.version,
-                    fileSha256: p.file_sha256,
-                    registryBaseUrl: p.registry_base_url,
-                    transport: p.transport ? convertTransport(p.transport) : undefined,
-                    packageArguments: p.package_arguments?.map(convertServerArgument),
-                    runtimeHint: p.runtime_hint,
-                    runtimeArguments: p.runtime_arguments?.map(convertServerArgument),
-                    environmentVariables: p.environment_variables?.map(convertKeyValueInput),
-                })),
-                remotes: from.remotes?.map(remote => {
-                    const type = remote.type ?? remote.transport_type ?? remote.transport;
-                    return {
-                        type: type === TransportType.SSE ? TransportType.SSE : TransportType.STREAMABLE_HTTP,
-                        url: remote.url,
-                        headers: remote.headers?.map(convertKeyValueInput)
-                    };
-                }),
-                registryInfo: {
-                    id: from.id,
-                    isLatest: true,
-                    updatedAt: from.updated_at,
-                },
-            };
-        }
-    }
-    McpServer1ESSchema.SERIALIZER = ( new Serializer());
-})(McpServer1ESSchema || (McpServer1ESSchema = {}));
-var McpServerSchemaVersion_2025_01_09;
-(function (McpServerSchemaVersion_2025_01_09) {
-    McpServerSchemaVersion_2025_01_09.VERSION = '2025-09-01';
-    McpServerSchemaVersion_2025_01_09.SCHEMA = `https://static.modelcontextprotocol.io/schemas/${McpServerSchemaVersion_2025_01_09.VERSION}/server.schema.json`;
-    class Serializer {
-        toRawGalleryMcpServerResult(input) {
-            if (!input || !Array.isArray(input.servers)) {
-                return undefined;
-            }
-            const from = input;
-            const servers = [];
-            for (const server of from.servers) {
-                const rawServer = this.toRawGalleryMcpServer(server);
-                if (!rawServer) {
-                    return undefined;
-                }
-                servers.push(rawServer);
-            }
-            return {
-                metadata: from.metadata,
-                servers
-            };
-        }
-        toRawGalleryMcpServer(input) {
-            if (!input || input.$schema !== McpServerSchemaVersion_2025_01_09.SCHEMA) {
-                return undefined;
-            }
-            const from = input;
-            const registryInfo = from._meta?.['io.modelcontextprotocol.registry'];
-            function convertServerInput(input) {
-                return {
-                    ...input,
-                    isRequired: input.is_required,
-                    isSecret: input.is_secret,
-                };
-            }
-            function convertVariables(variables) {
-                const result = {};
-                for (const [key, value] of Object.entries(variables)) {
-                    result[key] = convertServerInput(value);
-                }
-                return result;
-            }
-            function convertServerArgument(arg) {
-                if (arg.type === 'positional') {
-                    return {
-                        ...arg,
-                        valueHint: arg.value_hint,
-                        isRepeated: arg.is_repeated,
-                        isRequired: arg.is_required,
-                        isSecret: arg.is_secret,
-                        variables: arg.variables ? convertVariables(arg.variables) : undefined,
-                    };
-                }
-                return {
-                    ...arg,
-                    isRepeated: arg.is_repeated,
-                    isRequired: arg.is_required,
-                    isSecret: arg.is_secret,
-                    variables: arg.variables ? convertVariables(arg.variables) : undefined,
-                };
-            }
-            function convertKeyValueInput(input) {
-                return {
-                    ...input,
-                    isRequired: input.is_required,
-                    isSecret: input.is_secret,
-                    variables: input.variables ? convertVariables(input.variables) : undefined,
-                };
-            }
-            function convertTransport(input) {
-                switch (input.type) {
-                    case 'stdio':
                         return {
                             type: TransportType.STDIO,
                         };
-                    case 'streamable-http':
-                        return {
-                            type: TransportType.STREAMABLE_HTTP,
-                            url: input.url,
-                            headers: input.headers?.map(convertKeyValueInput),
-                        };
-                    case 'sse':
-                        return {
-                            type: TransportType.SSE,
-                            url: input.url,
-                            headers: input.headers?.map(convertKeyValueInput),
-                        };
-                    default:
-                        return undefined;
                 }
             }
             function convertRegistryType(input) {
@@ -429,16 +153,18 @@ var McpServerSchemaVersion_2025_01_09;
                         return RegistryType.NODE;
                 }
             }
+            const gitHubInfo = from._meta['io.modelcontextprotocol.registry/publisher-provided']?.github;
             return {
+                id: registryInfo.id,
                 name: from.name,
                 description: from.description,
                 repository: from.repository ? {
                     url: from.repository.url,
                     source: from.repository.source,
                     id: from.repository.id,
-                    readme: from.repository.readme
                 } : undefined,
-                version: from.version_detail.version,
+                readme: from.repository?.readme,
+                version: from.version,
                 createdAt: from.created_at,
                 updatedAt: from.updated_at,
                 packages: from.packages?.map(p => ({
@@ -447,7 +173,7 @@ var McpServerSchemaVersion_2025_01_09;
                     version: p.version,
                     fileSha256: p.file_sha256,
                     registryBaseUrl: p.registry_base_url,
-                    transport: p.transport ? convertTransport(p.transport) : undefined,
+                    transport: p.transport ? convertTransport(p.transport) : { type: TransportType.STDIO },
                     packageArguments: p.package_arguments?.map(convertServerArgument),
                     runtimeHint: p.runtime_hint,
                     runtimeArguments: p.runtime_arguments?.map(convertServerArgument),
@@ -462,24 +188,37 @@ var McpServerSchemaVersion_2025_01_09;
                     };
                 }),
                 registryInfo: {
-                    id: registryInfo.id,
                     isLatest: registryInfo.is_latest,
                     publishedAt: registryInfo.published_at,
                     updatedAt: registryInfo.updated_at,
                 },
-                githubInfo: from._meta.github,
+                githubInfo: gitHubInfo ? {
+                    name: gitHubInfo.name,
+                    nameWithOwner: gitHubInfo.name_with_owner,
+                    displayName: gitHubInfo.display_name,
+                    isInOrganization: gitHubInfo.is_in_organization,
+                    license: gitHubInfo.license,
+                    opengraphImageUrl: gitHubInfo.opengraph_image_url,
+                    ownerAvatarUrl: gitHubInfo.owner_avatar_url,
+                    primaryLanguage: gitHubInfo.primary_language,
+                    primaryLanguageColor: gitHubInfo.primary_language_color,
+                    pushedAt: gitHubInfo.pushed_at,
+                    stargazerCount: gitHubInfo.stargazer_count,
+                    topics: gitHubInfo.topics,
+                    usesCustomOpengraphImage: gitHubInfo.uses_custom_opengraph_image
+                } : undefined
             };
         }
     }
-    McpServerSchemaVersion_2025_01_09.SERIALIZER = ( new Serializer());
-})(McpServerSchemaVersion_2025_01_09 || (McpServerSchemaVersion_2025_01_09 = {}));
-var McpServerSchemaVersion_2025_07_09;
-(function (McpServerSchemaVersion_2025_07_09) {
-    McpServerSchemaVersion_2025_07_09.VERSION = '2025-07-09';
-    McpServerSchemaVersion_2025_07_09.SCHEMA = `https://static.modelcontextprotocol.io/schemas/${McpServerSchemaVersion_2025_07_09.VERSION}/server.schema.json`;
+    McpServerSchemaVersion_v2025_07_09.SERIALIZER = ( new Serializer());
+})(McpServerSchemaVersion_v2025_07_09 || (McpServerSchemaVersion_v2025_07_09 = {}));
+var McpServerSchemaVersion_v0_1;
+(function (McpServerSchemaVersion_v0_1) {
+    McpServerSchemaVersion_v0_1.VERSION = 'v0.1';
+    McpServerSchemaVersion_v0_1.SCHEMA = `https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json`;
     class Serializer {
         toRawGalleryMcpServerResult(input) {
-            if (!input || !Array.isArray(input.servers)) {
+            if (!input || typeof input !== 'object' || !Array.isArray(input.servers)) {
                 return undefined;
             }
             const from = input;
@@ -487,7 +226,12 @@ var McpServerSchemaVersion_2025_07_09;
             for (const server of from.servers) {
                 const rawServer = this.toRawGalleryMcpServer(server);
                 if (!rawServer) {
-                    return undefined;
+                    if (servers.length === 0) {
+                        return undefined;
+                    }
+                    else {
+                        continue;
+                    }
                 }
                 servers.push(rawServer);
             }
@@ -497,187 +241,75 @@ var McpServerSchemaVersion_2025_07_09;
             };
         }
         toRawGalleryMcpServer(input) {
-            if (!input || input.$schema !== McpServerSchemaVersion_2025_07_09.SCHEMA) {
+            if (!input || typeof input !== 'object') {
                 return undefined;
             }
             const from = input;
-            const registryInfo = from._meta?.['io.modelcontextprotocol.registry/official'];
-            function convertServerInput(input) {
-                return {
-                    ...input,
-                    isRequired: input.is_required,
-                    isSecret: input.is_secret,
-                };
-            }
-            function convertVariables(variables) {
-                const result = {};
-                for (const [key, value] of Object.entries(variables)) {
-                    result[key] = convertServerInput(value);
-                }
-                return result;
-            }
-            function convertServerArgument(arg) {
-                if (arg.type === 'positional') {
-                    return {
-                        ...arg,
-                        valueHint: arg.value_hint,
-                        isRepeated: arg.is_repeated,
-                        isRequired: arg.is_required,
-                        isSecret: arg.is_secret,
-                        variables: arg.variables ? convertVariables(arg.variables) : undefined,
-                    };
-                }
-                return {
-                    ...arg,
-                    isRepeated: arg.is_repeated,
-                    isRequired: arg.is_required,
-                    isSecret: arg.is_secret,
-                    variables: arg.variables ? convertVariables(arg.variables) : undefined,
-                };
-            }
-            function convertKeyValueInput(input) {
-                return {
-                    ...input,
-                    isRequired: input.is_required,
-                    isSecret: input.is_secret,
-                    variables: input.variables ? convertVariables(input.variables) : undefined,
-                };
-            }
-            function convertTransport(input) {
-                switch (input.type) {
-                    case 'stdio':
-                        return {
-                            type: TransportType.STDIO,
-                        };
-                    case 'streamable-http':
-                        return {
-                            type: TransportType.STREAMABLE_HTTP,
-                            url: input.url,
-                            headers: input.headers?.map(convertKeyValueInput),
-                        };
-                    case 'sse':
-                        return {
-                            type: TransportType.SSE,
-                            url: input.url,
-                            headers: input.headers?.map(convertKeyValueInput),
-                        };
-                    default:
-                        return undefined;
-                }
+            if ((!from.server || !isObject(from.server))
+                || (!from.server.name || !isString(from.server.name))
+                || (!from.server.description || !isString(from.server.description))
+                || (!from.server.version || !isString(from.server.version))) {
+                return undefined;
             }
-            function convertRegistryType(input) {
-                switch (input) {
-                    case 'npm':
-                        return RegistryType.NODE;
-                    case 'docker':
-                    case 'docker-hub':
-                    case 'oci':
-                        return RegistryType.DOCKER;
-                    case 'pypi':
-                        return RegistryType.PYTHON;
-                    case 'nuget':
-                        return RegistryType.NUGET;
-                    case 'mcpb':
-                        return RegistryType.MCPB;
-                    default:
-                        return RegistryType.NODE;
-                }
+            if (from.server.$schema && from.server.$schema !== McpServerSchemaVersion_v0_1.SCHEMA) {
+                return undefined;
             }
+            const { 'io.modelcontextprotocol.registry/official': registryInfo, ...apicInfo } = from._meta;
+            const githubInfo = from.server._meta?.['io.modelcontextprotocol.registry/publisher-provided']?.github;
             return {
-                name: from.name,
-                description: from.description,
-                repository: from.repository ? {
-                    url: from.repository.url,
-                    source: from.repository.source,
-                    id: from.repository.id,
-                    readme: from.repository.readme
+                name: from.server.name,
+                description: from.server.description,
+                version: from.server.version,
+                title: from.server.title,
+                repository: from.server.repository ? {
+                    url: from.server.repository.url,
+                    source: from.server.repository.source,
+                    id: from.server.repository.id,
                 } : undefined,
-                version: from.version,
-                createdAt: from.created_at,
-                updatedAt: from.updated_at,
-                packages: from.packages?.map(p => ({
-                    identifier: p.identifier ?? p.name,
-                    registryType: convertRegistryType(p.registry_type ?? p.registry_name),
-                    version: p.version,
-                    fileSha256: p.file_sha256,
-                    registryBaseUrl: p.registry_base_url,
-                    transport: p.transport ? convertTransport(p.transport) : undefined,
-                    packageArguments: p.package_arguments?.map(convertServerArgument),
-                    runtimeHint: p.runtime_hint,
-                    runtimeArguments: p.runtime_arguments?.map(convertServerArgument),
-                    environmentVariables: p.environment_variables?.map(convertKeyValueInput),
-                })),
-                remotes: from.remotes?.map(remote => {
-                    const type = remote.type ?? remote.transport_type ?? remote.transport;
-                    return {
-                        type: type === TransportType.SSE ? TransportType.SSE : TransportType.STREAMABLE_HTTP,
-                        url: remote.url,
-                        headers: remote.headers?.map(convertKeyValueInput)
-                    };
-                }),
-                registryInfo: {
-                    id: registryInfo.id,
-                    isLatest: registryInfo.is_latest,
-                    publishedAt: registryInfo.published_at,
-                    updatedAt: registryInfo.updated_at,
-                },
-                githubInfo: from._meta['io.modelcontextprotocol.registry/publisher-provided']?.github,
+                readme: githubInfo?.readme,
+                icons: from.server.icons,
+                websiteUrl: from.server.websiteUrl,
+                packages: from.server.packages,
+                remotes: from.server.remotes,
+                status: registryInfo?.status,
+                registryInfo,
+                githubInfo,
+                apicInfo
             };
         }
     }
-    McpServerSchemaVersion_2025_07_09.SERIALIZER = ( new Serializer());
-})(McpServerSchemaVersion_2025_07_09 || (McpServerSchemaVersion_2025_07_09 = {}));
-var McpServerSchemaVersion_2025_16_09;
-(function (McpServerSchemaVersion_2025_16_09) {
-    McpServerSchemaVersion_2025_16_09.VERSION = '2025-16-09';
-    McpServerSchemaVersion_2025_16_09.SCHEMA = `https://static.modelcontextprotocol.io/schemas/${McpServerSchemaVersion_2025_16_09.VERSION}/server.schema.json`;
+    McpServerSchemaVersion_v0_1.SERIALIZER = ( new Serializer());
+})(McpServerSchemaVersion_v0_1 || (McpServerSchemaVersion_v0_1 = {}));
+var McpServerSchemaVersion_v0;
+(function (McpServerSchemaVersion_v0) {
+    McpServerSchemaVersion_v0.VERSION = 'v0';
     class Serializer {
+        constructor() {
+            this.galleryMcpServerDataSerializers = [];
+            this.galleryMcpServerDataSerializers.push(McpServerSchemaVersion_v0_1.SERIALIZER);
+            this.galleryMcpServerDataSerializers.push(McpServerSchemaVersion_v2025_07_09.SERIALIZER);
+        }
         toRawGalleryMcpServerResult(input) {
-            if (!input || !Array.isArray(input.servers)) {
-                return undefined;
-            }
-            const from = input;
-            const servers = [];
-            for (const server of from.servers) {
-                const rawServer = this.toRawGalleryMcpServer(server);
-                if (!rawServer) {
-                    return undefined;
+            for (const serializer of this.galleryMcpServerDataSerializers) {
+                const result = serializer.toRawGalleryMcpServerResult(input);
+                if (result) {
+                    return result;
                 }
-                servers.push(rawServer);
             }
-            return {
-                metadata: from.metadata,
-                servers
-            };
+            return undefined;
         }
         toRawGalleryMcpServer(input) {
-            if (!input || input.$schema !== McpServerSchemaVersion_2025_16_09.SCHEMA) {
-                return undefined;
+            for (const serializer of this.galleryMcpServerDataSerializers) {
+                const result = serializer.toRawGalleryMcpServer(input);
+                if (result) {
+                    return result;
+                }
             }
-            const from = input;
-            return {
-                name: from.name,
-                description: from.description,
-                repository: from.repository ? {
-                    url: from.repository.url,
-                    source: from.repository.source,
-                    id: from.repository.id,
-                    readme: from.repository.readme
-                } : undefined,
-                version: from.version,
-                status: from.status,
-                websiteUrl: from.websiteUrl,
-                createdAt: from.createdAt,
-                updatedAt: from.updatedAt,
-                packages: from.packages,
-                remotes: from.remotes,
-                registryInfo: from._meta?.['io.modelcontextprotocol.registry/official'],
-                githubInfo: from._meta['io.modelcontextprotocol.registry/publisher-provided']?.github,
-            };
+            return undefined;
         }
     }
-    McpServerSchemaVersion_2025_16_09.SERIALIZER = ( new Serializer());
-})(McpServerSchemaVersion_2025_16_09 || (McpServerSchemaVersion_2025_16_09 = {}));
+    McpServerSchemaVersion_v0.SERIALIZER = ( new Serializer());
+})(McpServerSchemaVersion_v0 || (McpServerSchemaVersion_v0 = {}));
 const DefaultPageSize = 50;
 const DefaultQueryState = {
     pageSize: DefaultPageSize,
@@ -704,11 +336,8 @@ let McpGalleryService = class McpGalleryService extends Disposable {
         this.logService = logService;
         this.mcpGalleryManifestService = mcpGalleryManifestService;
         this.galleryMcpServerDataSerializers = ( new Map());
-        this.galleryMcpServerDataSerializers.set(McpServerSchemaVersion_2025_07_09.VERSION, McpServerSchemaVersion_2025_07_09.SERIALIZER);
-        this.galleryMcpServerDataSerializers.set(McpServerSchemaVersion_2025_01_09.VERSION, McpServerSchemaVersion_2025_01_09.SERIALIZER);
-        this.galleryMcpServerDataSerializers.set('old', McpServerOldSchema.SERIALIZER);
-        this.galleryMcpServerDataSerializers.set('1es', McpServer1ESSchema.SERIALIZER);
-        this.galleryMcpServerDataSerializers.set(McpServerSchemaVersion_2025_16_09.VERSION, McpServerSchemaVersion_2025_16_09.SERIALIZER);
+        this.galleryMcpServerDataSerializers.set(McpServerSchemaVersion_v0.VERSION, McpServerSchemaVersion_v0.SERIALIZER);
+        this.galleryMcpServerDataSerializers.set(McpServerSchemaVersion_v0_1.VERSION, McpServerSchemaVersion_v0_1.SERIALIZER);
     }
     isEnabled() {
         return this.mcpGalleryManifestService.mcpGalleryManifestStatus === McpGalleryManifestStatus.Available;
@@ -716,80 +345,74 @@ let McpGalleryService = class McpGalleryService extends Disposable {
     async query(options, token = CancellationToken.None) {
         const mcpGalleryManifest = await this.mcpGalleryManifestService.getMcpGalleryManifest();
         if (!mcpGalleryManifest) {
-            return singlePagePager([]);
+            return {
+                firstPage: { items: [], hasMore: false },
+                getNextPage: async () => ({ items: [], hasMore: false })
+            };
         }
         let query = ( new Query());
         if (options?.text) {
             query = query.withSearchText(options.text.trim());
         }
         const { servers, metadata } = await this.queryGalleryMcpServers(query, mcpGalleryManifest, token);
-        const total = metadata?.total ?? metadata?.count ?? servers.length;
-        const getNextPage = async (cursor, ct) => {
-            if (ct.isCancellationRequested) {
-                throw ( new CancellationError());
+        let currentCursor = metadata.nextCursor;
+        return {
+            firstPage: { items: servers, hasMore: !!metadata.nextCursor },
+            getNextPage: async (ct) => {
+                if (ct.isCancellationRequested) {
+                    throw ( new CancellationError());
+                }
+                if (!currentCursor) {
+                    return { items: [], hasMore: false };
+                }
+                const { servers, metadata: nextMetadata } = await this.queryGalleryMcpServers(query.withPage(currentCursor).withSearchText(undefined), mcpGalleryManifest, ct);
+                currentCursor = nextMetadata.nextCursor;
+                return { items: servers, hasMore: !!nextMetadata.nextCursor };
             }
-            const { servers, metadata } = cursor ? await this.queryGalleryMcpServers(query.withPage(cursor).withSearchText(undefined), mcpGalleryManifest, token) : { servers: [], metadata: undefined };
-            return {
-                elements: servers,
-                total,
-                hasNextPage: !!cursor,
-                getNextPage: (token) => getNextPage(metadata?.next_cursor, token)
-            };
         };
-        return ( new PageIteratorPager({
-            elements: servers,
-            total,
-            hasNextPage: !!metadata?.next_cursor,
-            getNextPage: (token) => getNextPage(metadata?.next_cursor, token),
-        }));
     }
-    async getMcpServersFromGallery(urls) {
+    async getMcpServersFromGallery(infos) {
         const mcpGalleryManifest = await this.mcpGalleryManifestService.getMcpGalleryManifest();
         if (!mcpGalleryManifest) {
             return [];
         }
         const mcpServers = [];
-        await Promise.allSettled(( urls.map(async (url) => {
-            const mcpServerUrl = this.getServerUrl(basename(url), mcpGalleryManifest);
-            if (mcpServerUrl !== url) {
-                return;
-            }
-            const mcpServer = await this.getMcpServer(mcpServerUrl);
+        await Promise.allSettled(( infos.map(async (info) => {
+            const mcpServer = await this.getMcpServerByName(info, mcpGalleryManifest);
             if (mcpServer) {
                 mcpServers.push(mcpServer);
             }
         })));
         return mcpServers;
     }
-    async getMcpServerConfiguration(gallery, token) {
-        if (gallery.configuration) {
-            return gallery.configuration;
-        }
-        if (!gallery.url) {
-            throw ( new Error(`No manifest URL found for ${gallery.name}`));
-        }
-        const context = await this.requestService.request({
-            type: 'GET',
-            url: gallery.url,
-        }, token);
-        const result = await asJson(context);
-        if (!result) {
-            throw ( new Error(`Failed to fetch configuration from ${gallery.url}`));
+    async getMcpServerByName({ name, id }, mcpGalleryManifest) {
+        const mcpServerUrl = this.getLatestServerVersionUrl(name, mcpGalleryManifest);
+        if (mcpServerUrl) {
+            const mcpServer = await this.getMcpServer(mcpServerUrl);
+            if (mcpServer) {
+                return mcpServer;
+            }
         }
-        const server = this.serializeMcpServer(result);
-        if (!server) {
-            throw ( new Error(`Failed to serialize MCP server data from ${gallery.url}`, result));
+        const byNameUrl = this.getNamedServerUrl(name, mcpGalleryManifest);
+        if (byNameUrl) {
+            const mcpServer = await this.getMcpServer(byNameUrl);
+            if (mcpServer) {
+                return mcpServer;
+            }
         }
-        const configuration = this.toGalleryMcpServerConfiguration(server.packages, server.remotes);
-        if (!configuration) {
-            throw ( new Error(`Failed to fetch configuration for ${gallery.url}`));
+        const byIdUrl = id ? this.getServerIdUrl(id, mcpGalleryManifest) : undefined;
+        if (byIdUrl) {
+            const mcpServer = await this.getMcpServer(byIdUrl);
+            if (mcpServer) {
+                return mcpServer;
+            }
         }
-        return configuration;
+        return undefined;
     }
     async getReadme(gallery, token) {
         const readmeUrl = gallery.readmeUrl;
         if (!readmeUrl) {
-            return Promise.resolve(( localize(1973, 'No README available')));
+            return Promise.resolve(( localize(1982, 'No README available')));
         }
         const uri = ( URI.parse(readmeUrl));
         if (uri.scheme === Schemas.file) {
@@ -802,7 +425,7 @@ let McpGalleryService = class McpGalleryService extends Disposable {
             }
         }
         if (uri.authority !== 'raw.githubusercontent.com') {
-            return ( new MarkdownString(( localize(1974, "You can find information about this server [here]({0})", readmeUrl)))).value;
+            return ( new MarkdownString(( localize(1983, "You can find information about this server [here]({0})", readmeUrl)))).value;
         }
         const context = await this.requestService.request({
             type: 'GET',
@@ -816,12 +439,14 @@ let McpGalleryService = class McpGalleryService extends Disposable {
     }
     toGalleryMcpServer(server, manifest) {
         let publisher = '';
-        let displayName = '';
+        let displayName = server.title;
         if (server.githubInfo?.name) {
-            displayName = ( server.githubInfo.name.split('-').map(
-                s => s.toLowerCase() === 'mcp' ? 'MCP' : s.toLowerCase() === 'github' ? 'GitHub' : uppercaseFirstLetter(s)
-            )).join(' ');
-            publisher = server.githubInfo.name_with_owner.split('/')[0];
+            if (!displayName) {
+                displayName = ( server.githubInfo.name.split('-').map(
+                    s => s.toLowerCase() === 'mcp' ? 'MCP' : s.toLowerCase() === 'github' ? 'GitHub' : uppercaseFirstLetter(s)
+                )).join(' ');
+            }
+            publisher = server.githubInfo.nameWithOwner.split('/')[0];
         }
         else {
             const nameParts = server.name.split('/');
@@ -831,48 +456,66 @@ let McpGalleryService = class McpGalleryService extends Disposable {
                     publisher = domainParts[domainParts.length - 1];
                 }
             }
-            displayName = ( nameParts[nameParts.length - 1].split('-').map(s => uppercaseFirstLetter(s))).join(' ');
+            if (!displayName) {
+                displayName = ( nameParts[nameParts.length - 1].split('-').map(s => uppercaseFirstLetter(s))).join(' ');
+            }
+        }
+        if (server.githubInfo?.displayName) {
+            displayName = server.githubInfo.displayName;
         }
-        if (server.githubInfo?.display_name) {
-            displayName = server.githubInfo.display_name;
+        let icon;
+        if (server.githubInfo?.preferredImage) {
+            icon = {
+                light: server.githubInfo.preferredImage,
+                dark: server.githubInfo.preferredImage
+            };
+        }
+        else if (server.githubInfo?.ownerAvatarUrl) {
+            icon = {
+                light: server.githubInfo.ownerAvatarUrl,
+                dark: server.githubInfo.ownerAvatarUrl
+            };
+        }
+        else if (server.apicInfo?.['x-ms-icon']) {
+            icon = {
+                light: server.apicInfo['x-ms-icon'],
+                dark: server.apicInfo['x-ms-icon']
+            };
+        }
+        else if (server.icons && server.icons.length > 0) {
+            const lightIcon = server.icons.find(icon => icon.theme === 'light') ?? server.icons[0];
+            const darkIcon = server.icons.find(icon => icon.theme === 'dark') ?? lightIcon;
+            icon = {
+                light: lightIcon.src,
+                dark: darkIcon.src
+            };
         }
-        const icon = server.githubInfo?.owner_avatar_url ? {
-            light: server.githubInfo.owner_avatar_url,
-            dark: server.githubInfo.owner_avatar_url
-        } : undefined;
-        const serverUrl = manifest ? this.getServerUrl(server.registryInfo.id, manifest) : undefined;
         const webUrl = manifest ? this.getWebUrl(server.name, manifest) : undefined;
         const publisherUrl = manifest ? this.getPublisherUrl(publisher, manifest) : undefined;
         return {
-            id: server.registryInfo.id,
+            id: server.id,
             name: server.name,
             displayName,
-            url: serverUrl,
+            galleryUrl: manifest?.url,
             webUrl,
             description: server.description,
             status: server.status ?? GalleryMcpServerStatus.Active,
             version: server.version,
-            isLatest: server.registryInfo.isLatest,
-            publishDate: server.registryInfo.publishedAt ? Date.parse(server.registryInfo.publishedAt) : undefined,
-            lastUpdated: server.githubInfo?.pushed_at ? Date.parse(server.githubInfo.pushed_at) : server.registryInfo ? Date.parse(server.registryInfo.updatedAt) : undefined,
+            isLatest: server.registryInfo?.isLatest ?? true,
+            publishDate: server.registryInfo?.publishedAt ? Date.parse(server.registryInfo.publishedAt) : undefined,
+            lastUpdated: server.githubInfo?.pushedAt ? Date.parse(server.githubInfo.pushedAt) : server.registryInfo?.updatedAt ? Date.parse(server.registryInfo.updatedAt) : undefined,
             repositoryUrl: server.repository?.url,
-            readme: server.repository?.readme,
+            readme: server.readme,
             icon,
             publisher,
             publisherUrl,
             license: server.githubInfo?.license,
-            starsCount: server.githubInfo?.stargazer_count,
+            starsCount: server.githubInfo?.stargazerCount,
             topics: server.githubInfo?.topics,
-            configuration: this.toGalleryMcpServerConfiguration(server.packages, server.remotes)
-        };
-    }
-    toGalleryMcpServerConfiguration(packages, remotes) {
-        if (!packages && !remotes) {
-            return undefined;
-        }
-        return {
-            packages,
-            remotes
+            configuration: {
+                packages: server.packages,
+                remotes: server.remotes
+            }
         };
     }
     async queryGalleryMcpServers(query, mcpGalleryManifest, token) {
@@ -883,9 +526,9 @@ let McpGalleryService = class McpGalleryService extends Disposable {
         };
     }
     async queryRawGalleryMcpServers(query, mcpGalleryManifest, token) {
-        const mcpGalleryUrl = query.searchText ? this.getSearchUrl(mcpGalleryManifest) : this.getMcpGalleryUrl(mcpGalleryManifest);
+        const mcpGalleryUrl = this.getMcpGalleryUrl(mcpGalleryManifest);
         if (!mcpGalleryUrl) {
-            return { servers: [] };
+            return { servers: [], metadata: { count: 0 } };
         }
         const uri = ( URI.parse(mcpGalleryUrl));
         if (uri.scheme === Schemas.file) {
@@ -904,7 +547,7 @@ let McpGalleryService = class McpGalleryService extends Disposable {
         }
         if (query.searchText) {
             const text = encodeURIComponent(query.searchText);
-            url += `&q=${text}`;
+            url += `&search=${text}`;
         }
         const context = await this.requestService.request({
             type: 'GET',
@@ -912,9 +555,9 @@ let McpGalleryService = class McpGalleryService extends Disposable {
         }, token);
         const data = await asJson(context);
         if (!data) {
-            return { servers: [] };
+            return { servers: [], metadata: { count: 0 } };
         }
-        const result = this.serializeMcpServersResult(data);
+        const result = this.serializeMcpServersResult(data, mcpGalleryManifest);
         if (!result) {
             throw ( new Error(`Failed to serialize MCP servers result from ${mcpGalleryUrl}`, data));
         }
@@ -932,68 +575,25 @@ let McpGalleryService = class McpGalleryService extends Disposable {
         if (!data) {
             return undefined;
         }
-        const server = this.serializeMcpServer(data);
-        if (!server) {
-            throw ( new Error(`Failed to serialize MCP server from ${mcpServerUrl}`, data));
-        }
         if (!mcpGalleryManifest) {
             mcpGalleryManifest = await this.mcpGalleryManifestService.getMcpGalleryManifest();
-            if (mcpGalleryManifest && mcpServerUrl !== this.getServerUrl(basename(mcpServerUrl), mcpGalleryManifest)) {
-                mcpGalleryManifest = null;
-            }
-        }
-        return this.toGalleryMcpServer(server, mcpGalleryManifest);
-    }
-    async getMcpServerByName(name) {
-        const mcpGalleryManifest = await this.mcpGalleryManifestService.getMcpGalleryManifest();
-        if (!mcpGalleryManifest) {
-            return undefined;
         }
-        const mcpServerUrl = this.getNamedServerUrl(name, mcpGalleryManifest);
-        if (!mcpServerUrl) {
-            return undefined;
-        }
-        const context = await this.requestService.request({
-            type: 'GET',
-            url: mcpServerUrl,
-        }, CancellationToken.None);
-        if (context.res.statusCode && context.res.statusCode >= 400 && context.res.statusCode < 500) {
-            return undefined;
-        }
-        const data = await asJson(context);
-        if (!data) {
-            return undefined;
-        }
-        const server = this.serializeMcpServer(data);
+        mcpGalleryManifest = mcpGalleryManifest && mcpServerUrl.startsWith(mcpGalleryManifest.url) ? mcpGalleryManifest : null;
+        const server = this.serializeMcpServer(data, mcpGalleryManifest);
         if (!server) {
             throw ( new Error(`Failed to serialize MCP server from ${mcpServerUrl}`, data));
         }
         return this.toGalleryMcpServer(server, mcpGalleryManifest);
     }
-    serializeMcpServer(data) {
-        for (const [, serializer] of this.galleryMcpServerDataSerializers) {
-            const result = serializer.toRawGalleryMcpServer(data);
-            if (result) {
-                return result;
-            }
-        }
-        return undefined;
+    serializeMcpServer(data, mcpGalleryManifest) {
+        return this.getSerializer(mcpGalleryManifest)?.toRawGalleryMcpServer(data);
     }
-    serializeMcpServersResult(data) {
-        for (const [, serializer] of this.galleryMcpServerDataSerializers) {
-            const result = serializer.toRawGalleryMcpServerResult(data);
-            if (result) {
-                return result;
-            }
-        }
-        return undefined;
+    serializeMcpServersResult(data, mcpGalleryManifest) {
+        return this.getSerializer(mcpGalleryManifest)?.toRawGalleryMcpServerResult(data);
     }
-    getServerUrl(id, mcpGalleryManifest) {
-        const resourceUriTemplate = getMcpGalleryManifestResourceUri(mcpGalleryManifest, McpGalleryResourceType.McpServerResourceUri);
-        if (!resourceUriTemplate) {
-            return undefined;
-        }
-        return format2(resourceUriTemplate, { id });
+    getSerializer(mcpGalleryManifest) {
+        const version = mcpGalleryManifest?.version ?? 'v0';
+        return this.galleryMcpServerDataSerializers.get(version);
     }
     getNamedServerUrl(name, mcpGalleryManifest) {
         const namedResourceUriTemplate = getMcpGalleryManifestResourceUri(mcpGalleryManifest, McpGalleryResourceType.McpServerNamedResourceUri);
@@ -1002,8 +602,19 @@ let McpGalleryService = class McpGalleryService extends Disposable {
         }
         return format2(namedResourceUriTemplate, { name });
     }
-    getSearchUrl(mcpGalleryManifest) {
-        return getMcpGalleryManifestResourceUri(mcpGalleryManifest, McpGalleryResourceType.McpServersSearchService);
+    getServerIdUrl(id, mcpGalleryManifest) {
+        const resourceUriTemplate = getMcpGalleryManifestResourceUri(mcpGalleryManifest, McpGalleryResourceType.McpServerIdUri);
+        if (!resourceUriTemplate) {
+            return undefined;
+        }
+        return format2(resourceUriTemplate, { id });
+    }
+    getLatestServerVersionUrl(name, mcpGalleryManifest) {
+        const latestVersionResourceUriTemplate = getMcpGalleryManifestResourceUri(mcpGalleryManifest, McpGalleryResourceType.McpServerLatestVersionUri);
+        if (!latestVersionResourceUriTemplate) {
+            return undefined;
+        }
+        return format2(latestVersionResourceUriTemplate, { name: encodeURIComponent(name) });
     }
     getWebUrl(name, mcpGalleryManifest) {
         const resourceUriTemplate = getMcpGalleryManifestResourceUri(mcpGalleryManifest, McpGalleryResourceType.McpServerWebUri);