@codingame/monaco-vscode-chat-service-override 33.0.8 → 34.0.0

package/vscode/src/vs/workbench/contrib/chat/common/plugins/marketplaceReference.js

@@ -1,5 +1,6 @@
 
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 
 var MarketplaceReferenceKind;
 (function(MarketplaceReferenceKind) {
@@ -7,22 +8,102 @@ var MarketplaceReferenceKind;
     MarketplaceReferenceKind["GitUri"] = "gitUri";
     MarketplaceReferenceKind["LocalFileUri"] = "localFileUri";
 })(MarketplaceReferenceKind || (MarketplaceReferenceKind = {}));
+const _githubShorthandRe = /^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+(?:#.+)?$/;
+function extraKnownMarketplacesToConfigDict(entries) {
+    if (!entries?.length) {
+        return undefined;
+    }
+    const obj = {};
+    for (const entry of entries) {
+        if (typeof entry === "string") {
+            obj[entry] = entry;
+        } else {
+            const s = entry.source;
+            const base = s.source === "github" ? s.repo : s.url;
+            obj[entry.name] = s.ref ? `${base}#${s.ref}` : base;
+        }
+    }
+    return obj;
+}
+function readConfiguredMarketplaces(configurationService) {
+    const userValues = configurationService.getValue(ChatConfiguration.PluginMarketplaces) ?? [];
+    const extraObj = configurationService.getValue(ChatConfiguration.ExtraMarketplaces) ?? {};
+    const extraValues = ( Object.entries(extraObj).map(([name, src]) => {
+        const isGithubShorthand = _githubShorthandRe.test(src);
+        return isGithubShorthand ? {
+            name,
+            source: {
+                source: "github",
+                repo: src
+            }
+        } : {
+            name,
+            source: {
+                source: "git",
+                url: src
+            }
+        };
+    }));
+    return {
+        userValues,
+        extraValues,
+        effectiveValues: [...userValues, ...extraValues]
+    };
+}
 function parseMarketplaceReferences(values) {
     const byCanonicalId = ( new Map());
     for (const value of values) {
-        if (typeof value !== "string") {
-            continue;
-        }
-        const parsed = parseMarketplaceReference(value);
-        if (!parsed) {
-            continue;
+        let parsed;
+        if (typeof value === "string") {
+            parsed = parseMarketplaceReference(value);
+        } else if (value && typeof value === "object") {
+            parsed = parseMarketplaceObjectEntry(value);
         }
-        if (!( byCanonicalId.has(parsed.canonicalId))) {
+        if (parsed && !( byCanonicalId.has(parsed.canonicalId))) {
             byCanonicalId.set(parsed.canonicalId, parsed);
         }
     }
     return [...( byCanonicalId.values())];
 }
+function parseMarketplaceObjectEntry(entry) {
+    let sourceType;
+    let repo;
+    let url;
+    let ref;
+    if (entry.source && typeof entry.source === "object") {
+        const nested = entry.source;
+        sourceType = nested.source;
+        repo = nested.repo;
+        url = nested.url;
+        ref = nested.ref;
+    } else {
+        sourceType = entry.source;
+        repo = entry.repo;
+        url = entry.url;
+        ref = entry.ref;
+    }
+    let parsed;
+    if (sourceType === "github" && typeof repo === "string") {
+        parsed = parseMarketplaceReference(appendMarketplaceRef(repo, ref));
+    } else if (sourceType === "git" && typeof url === "string") {
+        parsed = parseMarketplaceReference(appendMarketplaceRef(url, ref));
+    }
+    if (parsed && typeof entry.name === "string" && entry.name.length > 0) {
+        parsed = {
+            ...parsed,
+            displayLabel: entry.name
+        };
+    }
+    return parsed;
+}
+function appendMarketplaceRef(value, ref) {
+    if (!ref) {
+        return value;
+    }
+    const fragmentIndex = value.indexOf("#");
+    const base = fragmentIndex === -1 ? value : value.slice(0, fragmentIndex);
+    return `${base}#${ref}`;
+}
 function deduplicateMarketplaceReferences(primary, secondary) {
     const byCanonicalId = ( new Map());
     for (const ref of primary) {
@@ -48,17 +129,19 @@ function parseMarketplaceReference(value) {
     if (scpReference) {
         return scpReference;
     }
-    const shorthandMatch = /^([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)$/.exec(rawValue);
+    const shorthandMatch = /^([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)(?:#(.+))?$/.exec(rawValue);
     if (shorthandMatch) {
         const owner = shorthandMatch[1];
         const repo = shorthandMatch[2];
+        const ref = shorthandMatch[3];
         return {
             rawValue,
-            displayLabel: `${owner}/${repo}`,
+            displayLabel: rawValue,
             cloneUrl: `https://github.com/${owner}/${repo}.git`,
-            canonicalId: getGitHubCanonicalId(owner, repo),
-            cacheSegments: ["github.com", owner, repo],
+            canonicalId: getGitHubCanonicalId(owner, repo, ref),
+            cacheSegments: ["github.com", owner, repo, ...getRefCacheSegments(ref)],
             kind: MarketplaceReferenceKind.GitHubShorthand,
+            ref,
             githubRepo: `${owner}/${repo}`
         };
     }
@@ -73,6 +156,9 @@ function parseUriMarketplaceReference(rawValue) {
     }
     const scheme = uri.scheme.toLowerCase();
     if (scheme === "file" && /^file:\/\//i.test(rawValue)) {
+        if (uri.fragment) {
+            return undefined;
+        }
         const localRepositoryUri = URI.file(uri.fsPath);
         return {
             rawValue,
@@ -90,61 +176,84 @@ function parseUriMarketplaceReference(rawValue) {
     if (!uri.authority) {
         return undefined;
     }
-    const normalizedPath = normalizeGitRepoPath(uri.path);
-    if (!normalizedPath) {
-        return undefined;
+    const ref = uri.fragment || undefined;
+    const cloneUri = uri.fragment ? uri.with({
+        fragment: ""
+    }) : uri;
+    const sanitizedAuthority = sanitizePathSegment(uri.authority.toLowerCase());
+    const trimmedPath = uri.path.replace(/\/+/g, "/").replace(/\/+$/g, "").replace(/^\/+/, "");
+    if (!trimmedPath) {
+        return {
+            rawValue,
+            displayLabel: rawValue,
+            cloneUrl: ( cloneUri.toString()),
+            canonicalId: appendRefSuffix(`git:${uri.authority.toLowerCase()}/`, ref),
+            cacheSegments: [sanitizedAuthority, ...getRefCacheSegments(ref)],
+            kind: MarketplaceReferenceKind.GitUri,
+            ref
+        };
     }
     const gitSuffix = ".git";
-    const sanitizedAuthority = sanitizePathSegment(uri.authority.toLowerCase());
-    const pathHasGitSuffix = normalizedPath.toLowerCase().endsWith(gitSuffix);
-    const pathWithoutGit = pathHasGitSuffix ? normalizedPath.slice(1, normalizedPath.length - gitSuffix.length) : normalizedPath.slice(1);
+    const pathHasGitSuffix = trimmedPath.toLowerCase().endsWith(gitSuffix);
+    const pathWithoutGit = pathHasGitSuffix ? trimmedPath.slice(0, trimmedPath.length - gitSuffix.length) : trimmedPath;
     const pathSegments = ( pathWithoutGit.split("/").map(sanitizePathSegment));
-    const canonicalPath = pathHasGitSuffix ? normalizedPath.slice(1).toLowerCase() : `${normalizedPath.slice(1).toLowerCase()}${gitSuffix}`;
+    const canonicalPath = pathHasGitSuffix ? trimmedPath.toLowerCase() : `${trimmedPath.toLowerCase()}${gitSuffix}`;
     const githubRepo = extractGitHubRepo(uri.authority, pathWithoutGit);
+    let canonicalId;
+    if (githubRepo) {
+        const [owner, repo] = githubRepo.split("/");
+        canonicalId = getGitHubCanonicalId(owner, repo, ref);
+    } else {
+        canonicalId = appendRefSuffix(`git:${uri.authority.toLowerCase()}/${canonicalPath}`, ref);
+    }
     return {
         rawValue,
         displayLabel: rawValue,
-        cloneUrl: rawValue,
-        canonicalId: `git:${uri.authority.toLowerCase()}/${canonicalPath}`,
-        cacheSegments: [sanitizedAuthority, ...pathSegments],
+        cloneUrl: ( cloneUri.toString()),
+        canonicalId,
+        cacheSegments: [sanitizedAuthority, ...pathSegments, ...getRefCacheSegments(ref)],
         kind: MarketplaceReferenceKind.GitUri,
+        ref,
         githubRepo
     };
 }
 function parseScpMarketplaceReference(rawValue) {
-    const match = /^([^@\s]+)@([^:\s]+):(.+\.git)$/i.exec(rawValue);
+    const match = /^([^@\s]+)@([^:\s]+):(.+?\.git)(?:#(.+))?$/i.exec(rawValue);
     if (!match) {
         return undefined;
     }
     const gitSuffix = ".git";
     const authority = match[2];
     const pathWithGit = match[3].replace(/^\/+/, "");
+    const ref = match[4];
     if (!pathWithGit.toLowerCase().endsWith(gitSuffix)) {
         return undefined;
     }
     const pathWithoutGit = pathWithGit.slice(0, -gitSuffix.length);
     const pathSegments = ( pathWithoutGit.split("/").map(sanitizePathSegment));
     const githubRepo = extractGitHubRepo(authority, pathWithoutGit);
+    let canonicalId;
+    if (githubRepo) {
+        const [owner, repo] = githubRepo.split("/");
+        canonicalId = getGitHubCanonicalId(owner, repo, ref);
+    } else {
+        canonicalId = appendRefSuffix(`git:${authority.toLowerCase()}/${pathWithGit.toLowerCase()}`, ref);
+    }
     return {
         rawValue,
         displayLabel: rawValue,
-        cloneUrl: rawValue,
-        canonicalId: `git:${authority.toLowerCase()}/${pathWithGit.toLowerCase()}`,
-        cacheSegments: [sanitizePathSegment(authority.toLowerCase()), ...pathSegments],
+        cloneUrl: `${match[1]}@${authority}:${pathWithGit}`,
+        canonicalId,
+        cacheSegments: [
+            sanitizePathSegment(authority.toLowerCase()),
+            ...pathSegments,
+            ...getRefCacheSegments(ref)
+        ],
         kind: MarketplaceReferenceKind.GitUri,
+        ref,
         githubRepo
     };
 }
-function normalizeGitRepoPath(path) {
-    const gitSuffix = ".git";
-    const trimmed = path.replace(/\/+/g, "/").replace(/\/+$/g, "");
-    const withLeadingSlash = trimmed.startsWith("/") ? trimmed : `/${trimmed}`;
-    const pathWithoutGit = withLeadingSlash.toLowerCase().endsWith(gitSuffix) ? withLeadingSlash.slice(1, withLeadingSlash.length - gitSuffix.length) : withLeadingSlash.slice(1);
-    if (!pathWithoutGit || !pathWithoutGit.includes("/")) {
-        return undefined;
-    }
-    return withLeadingSlash;
-}
 function extractGitHubRepo(authority, pathWithoutGit) {
     if (authority.toLowerCase() !== "github.com") {
         return undefined;
@@ -155,11 +264,17 @@ function extractGitHubRepo(authority, pathWithoutGit) {
     }
     return undefined;
 }
-function getGitHubCanonicalId(owner, repo) {
-    return `github:${owner.toLowerCase()}/${repo.toLowerCase()}`;
+function getGitHubCanonicalId(owner, repo, ref) {
+    return appendRefSuffix(`github:${owner.toLowerCase()}/${repo.toLowerCase()}`, ref);
+}
+function appendRefSuffix(canonicalId, ref) {
+    return ref ? `${canonicalId}#${encodeURIComponent(ref)}` : canonicalId;
+}
+function getRefCacheSegments(ref) {
+    return ref ? [`ref_${encodeURIComponent(ref)}`] : [];
 }
 function sanitizePathSegment(value) {
     return value.replace(/[\\/:*?"<>|]/g, "_");
 }
 
-export { MarketplaceReferenceKind, deduplicateMarketplaceReferences, parseMarketplaceReference, parseMarketplaceReferences };
+export { MarketplaceReferenceKind, deduplicateMarketplaceReferences, extraKnownMarketplacesToConfigDict, parseMarketplaceObjectEntry, parseMarketplaceReference, parseMarketplaceReferences, readConfiguredMarketplaces };

package/vscode/src/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.d.ts

@@ -9,13 +9,14 @@ import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IRequestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { IExtensionsWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service";
 import { IAgentPluginRepositoryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service";
 import { IWorkspacePluginSettingsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/workspacePluginSettingsService.service";
 import { IWorkspaceTrustManagementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service";
 import { type IMarketplaceReference } from "./marketplaceReference.js";
 import { IPluginMarketplaceService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service";
-export { deduplicateMarketplaceReferences, MarketplaceReferenceKind, parseMarketplaceReference, parseMarketplaceReferences } from "./marketplaceReference.js";
-export type { IMarketplaceReference } from "./marketplaceReference.js";
+export { deduplicateMarketplaceReferences, extraKnownMarketplacesToConfigDict, MarketplaceReferenceKind, parseMarketplaceReference, parseMarketplaceReferences, readConfiguredMarketplaces } from "./marketplaceReference.js";
+export type { IConfiguredMarketplaces, IMarketplaceReference } from "./marketplaceReference.js";
 export declare enum MarketplaceType {
     Copilot = "copilot",
     Claude = "claude",
@@ -46,6 +47,8 @@ export interface IGitUrlPluginSource {
     readonly url: string;
     readonly ref?: string;
     readonly sha?: string;
+    /** Subdirectory within the repository where the plugin lives (for `git-subdir` sources). */
+    readonly path?: string;
 }
 export interface INpmPluginSource {
     readonly kind: PluginSourceKind.Npm;
@@ -101,6 +104,7 @@ export declare class PluginMarketplaceService extends Disposable implements IPlu
     private readonly _storageService;
     private readonly _workspacePluginSettingsService;
     private readonly _workspaceTrustService;
+    private readonly _extensionsWorkbenchService;
     readonly _serviceBrand: undefined;
     private readonly _gitHubMarketplaceCache;
     private readonly _installedPluginsStore;
@@ -114,7 +118,7 @@ export declare class PluginMarketplaceService extends Disposable implements IPlu
     readonly hasUpdatesAvailable: IObservable<boolean>;
     readonly lastFetchedPlugins: IObservable<readonly IMarketplacePlugin[]>;
     readonly recommendedPlugins: IObservable<ReadonlySet<string>>;
-    constructor(_configurationService: IConfigurationService, _requestService: IRequestService, environmentService: IEnvironmentService, _fileService: IFileService, _pluginRepositoryService: IAgentPluginRepositoryService, _logService: ILogService, _storageService: IStorageService, _workspacePluginSettingsService: IWorkspacePluginSettingsService, _workspaceTrustService: IWorkspaceTrustManagementService);
+    constructor(_configurationService: IConfigurationService, _requestService: IRequestService, environmentService: IEnvironmentService, _fileService: IFileService, _pluginRepositoryService: IAgentPluginRepositoryService, _logService: ILogService, _storageService: IStorageService, _workspacePluginSettingsService: IWorkspacePluginSettingsService, _workspaceTrustService: IWorkspaceTrustManagementService, _extensionsWorkbenchService: IExtensionsWorkbenchService);
     dispose(): void;
     clearUpdatesAvailable(): void;
     fetchMarketplacePlugins(token: CancellationToken): Promise<IMarketplacePlugin[]>;
@@ -127,16 +131,17 @@ export declare class PluginMarketplaceService extends Disposable implements IPlu
     removeInstalledPlugin(pluginUri: URI): void;
     isMarketplaceTrusted(ref: IMarketplaceReference): boolean;
     /**
-     * For each plugin URI that has no cached metadata, walk up the directory
-     * tree from the plugin towards the agent-plugins root looking for a
-     * marketplace definition file. When found, read the marketplace plugins
-     * and match by source path to populate {@link _pluginMetadata}.
+     * Hydrates installed entries from marketplace metadata. Entries written
+     * by current builds include the marketplace plugin name, which is enough
+     * to re-read the full plugin descriptor from the marketplace source. Old
+     * entries without a name fall back to matching by install URI.
      *
      * After hydration completes the installed-plugins store is "touched" so
      * that the derived {@link installedPlugins} observable re-evaluates with
      * the newly available metadata.
      */
     private _hydratePluginMetadata;
+    private _readPluginsForInstalledEntry;
     /**
      * Shared logic to parse a marketplace.json into {@link IMarketplacePlugin}
      * objects. Used by both fetch and hydration paths.

package/vscode/src/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.js

@@ -1,6 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { runWhenGlobalIdle } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { parse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
@@ -19,12 +20,14 @@ import { IRequestService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 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 { AutoUpdateConfigurationKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions';
+import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IAgentPluginRepositoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service';
 import { FileBackedInstalledPluginsStore } from './fileBackedInstalledPluginsStore.js';
 import { IWorkspacePluginSettingsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/workspacePluginSettingsService.service';
 import { IWorkspaceTrustManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
-import { parseMarketplaceReferences, deduplicateMarketplaceReferences, parseMarketplaceReference, MarketplaceReferenceKind } from './marketplaceReference.js';
+import { readConfiguredMarketplaces, parseMarketplaceReferences, deduplicateMarketplaceReferences, parseMarketplaceReference, parseMarketplaceObjectEntry, MarketplaceReferenceKind } from './marketplaceReference.js';
+export { extraKnownMarketplacesToConfigDict } from './marketplaceReference.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
@@ -120,7 +123,8 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
         _logService,
         _storageService,
         _workspacePluginSettingsService,
-        _workspaceTrustService
+        _workspaceTrustService,
+        _extensionsWorkbenchService
     ) {
         super();
         this._configurationService = _configurationService;
@@ -131,6 +135,7 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
         this._storageService = _storageService;
         this._workspacePluginSettingsService = _workspacePluginSettingsService;
         this._workspaceTrustService = _workspaceTrustService;
+        this._extensionsWorkbenchService = _extensionsWorkbenchService;
         this._gitHubMarketplaceCache = ( new Lazy(() => this._loadPersistedGitHubMarketplaceCache()));
         this._pluginMetadata = ( new Map());
         this._hasUpdatesAvailable = observableValue("hasUpdatesAvailable", false);
@@ -186,7 +191,7 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
         });
         this.onDidChangeMarketplaces = Event.any(Event.filter(
             _configurationService.onDidChangeConfiguration,
-            e => e.affectsConfiguration(ChatConfiguration.PluginsEnabled) || e.affectsConfiguration(ChatConfiguration.PluginMarketplaces)
+            e => e.affectsConfiguration(ChatConfiguration.PluginsEnabled) || e.affectsConfiguration(ChatConfiguration.PluginMarketplaces) || e.affectsConfiguration(ChatConfiguration.ExtraMarketplaces)
         ), Event.fromObservableLight(this._workspacePluginSettingsService.extraMarketplaces), ( Event.map(this._workspaceTrustService.onDidChangeTrust, () => {})));
         this._register(runWhenGlobalIdle(() => {
             this._scheduleUpdateCheck();
@@ -217,8 +222,10 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
         if (!this._configurationService.getValue(ChatConfiguration.PluginsEnabled)) {
             return [];
         }
-        const configuredRefs = this._configurationService.getValue(ChatConfiguration.PluginMarketplaces) ?? [];
-        const configRefs = parseMarketplaceReferences(configuredRefs);
+        const {
+            effectiveValues
+        } = readConfiguredMarketplaces(this._configurationService);
+        const configRefs = parseMarketplaceReferences(effectiveValues);
         let allRefs;
         if (this._workspaceTrustService.isWorkspaceTrusted()) {
             const workspaceEntries = this._workspacePluginSettingsService.extraMarketplaces.get();
@@ -226,8 +233,9 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
         } else {
             allRefs = configRefs;
         }
-        for (const value of configuredRefs) {
-            if (typeof value !== "string" || !parseMarketplaceReference(value)) {
+        for (const value of effectiveValues) {
+            const parsed = typeof value === "string" ? parseMarketplaceReference(value) : (value && typeof value === "object" ? parseMarketplaceObjectEntry(value) : undefined);
+            if (!parsed) {
                 this._logService.debug(
                     `[PluginMarketplaceService] Ignoring invalid marketplace entry: ${String(value)}`
                 );
@@ -261,7 +269,8 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
             if (token.isCancellationRequested) {
                 return undefined;
             }
-            const url = `https://raw.githubusercontent.com/${repo}/main/${defPath}`;
+            const ref = encodeURIComponent(reference.ref ?? "main");
+            const url = `https://raw.githubusercontent.com/${repo}/${ref}/${defPath}`;
             try {
                 const context = await this._requestService.request({
                     type: "GET",
@@ -372,18 +381,17 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
     }
     addInstalledPlugin(pluginUri, plugin) {
         this._pluginMetadata.set(( pluginUri.toString()), plugin);
+        const entry = {
+            pluginUri,
+            marketplace: plugin.marketplaceReference.rawValue,
+            name: plugin.name
+        };
         const current = this._installedPluginsStore.get();
         const existing = current.find(e => isEqual(e.pluginUri, pluginUri));
         if (existing) {
-            this._installedPluginsStore.set(( current.map(c => c === existing ? {
-                pluginUri,
-                marketplace: plugin.marketplaceReference.rawValue
-            } : c)), undefined);
+            this._installedPluginsStore.set(( current.map(c => c === existing ? entry : c)), undefined);
         } else {
-            this._installedPluginsStore.set([...current, {
-                pluginUri,
-                marketplace: plugin.marketplaceReference.rawValue
-            }], undefined);
+            this._installedPluginsStore.set([...current, entry], undefined);
         }
     }
     removeInstalledPlugin(pluginUri) {
@@ -392,6 +400,10 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
         this._installedPluginsStore.set(current.filter(e => !isEqual(e.pluginUri, pluginUri)), undefined);
     }
     isMarketplaceTrusted(ref) {
+        if (this._configurationService.getValue(ChatConfiguration.StrictMarketplaces)) {
+            const refs = parseMarketplaceReferences(readConfiguredMarketplaces(this._configurationService).extraValues);
+            return ( refs.some(r => r.canonicalId === ref.canonicalId));
+        }
         return this._trustedMarketplacesStore.get().includes(ref.canonicalId);
     }
     async _hydratePluginMetadata(entries) {
@@ -409,18 +421,10 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
                 continue;
             }
             try {
-                const repoDir = this._pluginRepositoryService.getRepositoryUri(reference);
-                let plugins = await this._readPluginsFromDirectory(repoDir, reference);
-                if (plugins.length === 0) {
-                    const single = await this.readSinglePluginManifest(repoDir, reference);
-                    if (single) {
-                        plugins = [single];
-                    }
-                }
-                const match = plugins.find(p => {
-                    const installUri = this._pluginRepositoryService.getPluginInstallUri(p);
-                    return isEqual(installUri, entry.pluginUri);
-                });
+                const plugins = await this._readPluginsForInstalledEntry(reference, CancellationToken.None);
+                const match = plugins.find(
+                    p => entry.name ? p.name === entry.name : isEqual(this._pluginRepositoryService.getPluginInstallUri(p), entry.pluginUri)
+                );
                 if (match) {
                     this._pluginMetadata.set(key, match);
                     hydrated++;
@@ -434,6 +438,20 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
             this._installedPluginsStore.set([...current], undefined);
         }
     }
+    async _readPluginsForInstalledEntry(reference, token) {
+        if (reference.kind === MarketplaceReferenceKind.GitHubShorthand && reference.githubRepo) {
+            return this._fetchFromGitHubRepo(reference, reference.githubRepo, token);
+        }
+        const repoDir = this._pluginRepositoryService.getRepositoryUri(reference);
+        let plugins = await this._readPluginsFromDirectory(repoDir, reference, token);
+        if (plugins.length === 0) {
+            const single = await this.readSinglePluginManifest(repoDir, reference);
+            if (single) {
+                plugins = [single];
+            }
+        }
+        return plugins;
+    }
     _parseMarketplacePlugins(json, reference, marketplaceType, repoDir) {
         if (!json.plugins || !Array.isArray(json.plugins)) {
             return [];
@@ -468,7 +486,7 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
         }
     }
     _isAutoUpdateEnabled() {
-        return this._configurationService.getValue(AutoUpdateConfigurationKey);
+        return this._extensionsWorkbenchService.getAutoUpdateValue() === true;
     }
     _scheduleUpdateCheck() {
         if (this._updateCheckTimer !== undefined) {
@@ -615,7 +633,7 @@ let PluginMarketplaceService = class PluginMarketplaceService extends Disposable
         return [];
     }
 };
-PluginMarketplaceService = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, IRequestService)), ( __param(2, IEnvironmentService)), ( __param(3, IFileService)), ( __param(4, IAgentPluginRepositoryService)), ( __param(5, ILogService)), ( __param(6, IStorageService)), ( __param(7, IWorkspacePluginSettingsService)), ( __param(8, IWorkspaceTrustManagementService))], PluginMarketplaceService));
+PluginMarketplaceService = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, IRequestService)), ( __param(2, IEnvironmentService)), ( __param(3, IFileService)), ( __param(4, IAgentPluginRepositoryService)), ( __param(5, ILogService)), ( __param(6, IStorageService)), ( __param(7, IWorkspacePluginSettingsService)), ( __param(8, IWorkspaceTrustManagementService)), ( __param(9, IExtensionsWorkbenchService))], PluginMarketplaceService));
 function normalizeMarketplacePath(value) {
     let normalized = value.trim().replace(/\\/g, "/");
     normalized = normalized.replace(/^\.?\/+/, "").replace(/\/+$/g, "");
@@ -701,14 +719,15 @@ function parsePluginSource(rawSource, pluginRoot, logContext) {
             };
         }
     case "url":
+    case "git-subdir":
         {
             if (typeof rawSource.url !== "string" || !rawSource.url) {
                 logContext.logService.warn(
-                    `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': url source is missing required 'url' field`
+                    `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': ${rawSource.source} source is missing required 'url' field`
                 );
                 return undefined;
             }
-            if (!rawSource.url.toLowerCase().endsWith(".git")) {
+            if (rawSource.source === "url" && !rawSource.url.toLowerCase().endsWith(".git")) {
                 logContext.logService.warn(
                     `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': url source must end with '.git'`
                 );
@@ -716,13 +735,26 @@ function parsePluginSource(rawSource, pluginRoot, logContext) {
             }
             if (!isOptionalString(rawSource.ref)) {
                 logContext.logService.warn(
-                    `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': url source 'ref' must be a string when provided`
+                    `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': ${rawSource.source} source 'ref' must be a string when provided`
                 );
                 return undefined;
             }
             if (!isOptionalGitSha(rawSource.sha)) {
                 logContext.logService.warn(
-                    `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': url source 'sha' must be a full 40-character commit hash when provided`
+                    `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': ${rawSource.source} source 'sha' must be a full 40-character commit hash when provided`
+                );
+                return undefined;
+            }
+            if (rawSource.source === "git-subdir") {
+                if (typeof rawSource.path !== "string" || !rawSource.path) {
+                    logContext.logService.warn(
+                        `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': git-subdir source is missing required 'path' field`
+                    );
+                    return undefined;
+                }
+            } else if (!isOptionalString(rawSource.path)) {
+                logContext.logService.warn(
+                    `${logContext.logPrefix} Skipping plugin '${logContext.pluginName}': url source 'path' must be a string when provided`
                 );
                 return undefined;
             }
@@ -730,7 +762,8 @@ function parsePluginSource(rawSource, pluginRoot, logContext) {
                 kind: PluginSourceKind.GitUrl,
                 url: rawSource.url,
                 ref: rawSource.ref,
-                sha: rawSource.sha
+                sha: rawSource.sha,
+                path: rawSource.path
             };
         }
     case "npm":
@@ -799,7 +832,7 @@ function hasSourceChanged(installed, marketplace) {
     case PluginSourceKind.GitHub:
         return installed.ref !== marketplace.ref || installed.sha !== marketplace.sha || installed.path !== marketplace.path;
     case PluginSourceKind.GitUrl:
-        return installed.ref !== marketplace.ref || installed.sha !== marketplace.sha;
+        return installed.ref !== marketplace.ref || installed.sha !== marketplace.sha || installed.path !== marketplace.path;
     case PluginSourceKind.Npm:
         return installed.version !== marketplace.version;
     case PluginSourceKind.Pip:
@@ -818,4 +851,4 @@ function getMarketplaceReadmeFileUri(repoDir, source) {
     return normalizedSource ? joinPath(repoDir, normalizedSource, "README.md") : joinPath(repoDir, "README.md");
 }
 
-export { MarketplaceReferenceKind, MarketplaceType, PluginMarketplaceService, PluginSourceKind, deduplicateMarketplaceReferences, hasSourceChanged, parseMarketplaceReference, parseMarketplaceReferences, parsePluginSource };
+export { MarketplaceReferenceKind, MarketplaceType, PluginMarketplaceService, PluginSourceKind, deduplicateMarketplaceReferences, hasSourceChanged, parseMarketplaceReference, parseMarketplaceReferences, parsePluginSource, readConfiguredMarketplaces };

package/vscode/src/vs/workbench/contrib/chat/common/plugins/workspacePluginSettingsService.js

@@ -9,7 +9,7 @@ import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { CLAUDE_CONFIG_FOLDER } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
-import { parseMarketplaceReference } from './marketplaceReference.js';
+import { parseMarketplaceObjectEntry } from './marketplaceReference.js';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
@@ -18,28 +18,6 @@ import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/obse
 const SETTINGS_FILENAME = "settings.json";
 const SETTINGS_LOCAL_FILENAME = "settings.local.json";
 const COPILOT_CONFIG_FOLDER = ".github/copilot";
-function marketplaceEntryToReference(entry) {
-    let sourceType;
-    let repo;
-    let url;
-    if (typeof entry.source === "object" && entry.source !== null) {
-        const nested = entry.source;
-        sourceType = nested.source;
-        repo = nested.repo;
-        url = nested.url;
-    } else {
-        sourceType = entry.source;
-        repo = entry.repo;
-        url = entry.url;
-    }
-    if (sourceType === "github" && typeof repo === "string") {
-        return parseMarketplaceReference(repo);
-    }
-    if (sourceType === "git" && typeof url === "string") {
-        return parseMarketplaceReference(url);
-    }
-    return undefined;
-}
 function parseEnabledPlugins(json) {
     const result = ( new Map());
     if (!json || typeof json !== "object" || Array.isArray(json)) {
@@ -64,17 +42,17 @@ function parseExtraMarketplaces(json, logPrefix, logService) {
             logService.debug(`${logPrefix} Ignoring non-object extraKnownMarketplaces entry: ${name}`);
             continue;
         }
-        const reference = marketplaceEntryToReference(value);
+        const reference = parseMarketplaceObjectEntry({
+            ...value,
+            name
+        });
         if (!reference) {
             logService.debug(`${logPrefix} Could not parse marketplace reference for: ${name}`);
             continue;
         }
         entries.push({
             name,
-            reference: {
-                ...reference,
-                displayLabel: name
-            }
+            reference
         });
     }
     return entries;