@codingame/monaco-vscode-chat-service-override 30.0.0 → 31.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/defaultModelContribution.js

@@ -13,8 +13,8 @@ const configurationRegistry = ( Registry.as(Extensions.Configuration));
 function createDefaultModelArrays() {
     return {
         modelIds: [""],
-        modelLabels: [( localize(6422, "Auto (Vendor Default)"))],
-        modelDescriptions: [( localize(6423, "Use the vendor's default model"))]
+        modelLabels: [( localize(6479, "Auto (Vendor Default)"))],
+        modelDescriptions: [( localize(6480, "Use the vendor's default model"))]
     };
 }
 let DefaultModelContribution = class DefaultModelContribution extends Disposable {
@@ -46,8 +46,8 @@ let DefaultModelContribution = class DefaultModelContribution extends Disposable
             modelLabels.length = 0;
             modelDescriptions.length = 0;
             modelIds.push("");
-            modelLabels.push(( localize(6422, "Auto (Vendor Default)")));
-            modelDescriptions.push(( localize(6423, "Use the vendor's default model")));
+            modelLabels.push(( localize(6479, "Auto (Vendor Default)")));
+            modelDescriptions.push(( localize(6480, "Use the vendor's default model")));
             const models = [];
             const allModelIds = this._languageModelsService.getLanguageModelIds();
             for (const modelId of allModelIds) {

package/vscode/src/vs/workbench/contrib/chat/browser/enablementActions.js

@@ -5,16 +5,16 @@ import { WorkbenchState } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { ContributionEnablementState, isContributionDisabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
 
 function createEnablementActions(key, enablementModel, idPrefix) {
-    return [( new Action(`${idPrefix}.enable`, ( localize(6424, "Enable")), undefined, true, () => {
+    return [( new Action(`${idPrefix}.enable`, ( localize(6481, "Enable")), undefined, true, () => {
         enablementModel.setEnabled(key, ContributionEnablementState.EnabledProfile);
         return Promise.resolve();
-    })), ( new Action(`${idPrefix}.enableForWorkspace`, ( localize(6425, "Enable (Workspace)")), undefined, true, () => {
+    })), ( new Action(`${idPrefix}.enableForWorkspace`, ( localize(6482, "Enable (Workspace)")), undefined, true, () => {
         enablementModel.setEnabled(key, ContributionEnablementState.EnabledWorkspace);
         return Promise.resolve();
-    })), ( new Action(`${idPrefix}.disable`, ( localize(6426, "Disable")), undefined, true, () => {
+    })), ( new Action(`${idPrefix}.disable`, ( localize(6483, "Disable")), undefined, true, () => {
         enablementModel.setEnabled(key, ContributionEnablementState.DisabledProfile);
         return Promise.resolve();
-    })), ( new Action(`${idPrefix}.disableForWorkspace`, ( localize(6427, "Disable (Workspace)")), undefined, true, () => {
+    })), ( new Action(`${idPrefix}.disableForWorkspace`, ( localize(6484, "Disable (Workspace)")), undefined, true, () => {
         enablementModel.setEnabled(key, ContributionEnablementState.DisabledWorkspace);
         return Promise.resolve();
     }))];

package/vscode/src/vs/workbench/contrib/chat/browser/enablementStatusWidget.js

@@ -46,8 +46,8 @@ let EnablementStatusWidget = class EnablementStatusWidget extends Disposable {
 };
 EnablementStatusWidget = ( __decorate([( __param(3, IMarkdownRendererService))], EnablementStatusWidget));
 const pluginEnablementLabels = {
-    disabledProfile: ( localize(6428, "This plugin is disabled.")),
-    disabledWorkspace: ( localize(6429, "This plugin is disabled for this workspace."))
+    disabledProfile: ( localize(6485, "This plugin is disabled.")),
+    disabledWorkspace: ( localize(6486, "This plugin is disabled for this workspace."))
 };
 
 export { EnablementStatusWidget, pluginEnablementLabels };

package/vscode/src/vs/workbench/contrib/chat/browser/languageModelsConfigurationService.js

@@ -340,7 +340,7 @@ let ChatLanguageModelsDataContribution = class ChatLanguageModelsDataContributio
                     },
                     settings: {
                         type: "object",
-                        description: ( localize(6430, "Per-model settings"))
+                        description: ( localize(6487, "Per-model settings"))
                     }
                 },
                 allOf: [...( vendors.map(vendor => ({

package/vscode/src/vs/workbench/contrib/chat/browser/pluginGitCommandService.d.ts

@@ -0,0 +1,18 @@
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IPluginGitService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginGitService.service";
+/**
+ * Stub implementation of {@link IPluginGitService} that throws on
+ * every call. On desktop the native implementation is registered instead;
+ * this exists only so the browser layer has a default registration.
+ */
+export declare class BrowserPluginGitCommandService implements IPluginGitService {
+    readonly _serviceBrand: undefined;
+    cloneRepository(_cloneUrl: string, _targetDir: URI, _ref?: string, _token?: CancellationToken): Promise<void>;
+    pull(_repoDir: URI, _token?: CancellationToken): Promise<boolean>;
+    checkout(_repoDir: URI, _treeish: string, _detached?: boolean, _token?: CancellationToken): Promise<void>;
+    revParse(_repoDir: URI, _ref: string): Promise<string>;
+    fetch(_repoDir: URI, _token?: CancellationToken): Promise<void>;
+    fetchRepository(_repoDir: URI, _token?: CancellationToken): Promise<void>;
+    revListCount(_repoDir: URI, _fromRef: string, _toRef: string): Promise<number>;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/pluginGitCommandService.js

@@ -0,0 +1,31 @@
+
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+
+function notSupported() {
+    throw ( new Error(( localize(6488, "Agent plugins are not available in this environment"))));
+}
+class BrowserPluginGitCommandService {
+    async cloneRepository(_cloneUrl, _targetDir, _ref, _token) {
+        notSupported();
+    }
+    async pull(_repoDir, _token) {
+        notSupported();
+    }
+    async checkout(_repoDir, _treeish, _detached, _token) {
+        notSupported();
+    }
+    async revParse(_repoDir, _ref) {
+        notSupported();
+    }
+    async fetch(_repoDir, _token) {
+        notSupported();
+    }
+    async fetchRepository(_repoDir, _token) {
+        notSupported();
+    }
+    async revListCount(_repoDir, _fromRef, _toRef) {
+        notSupported();
+    }
+}
+
+export { BrowserPluginGitCommandService };

package/vscode/src/vs/workbench/contrib/chat/browser/pluginInstallService.js

@@ -2,6 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
@@ -46,7 +47,7 @@ let PluginInstallService = class PluginInstallService {
     }
     async installPlugin(plugin) {
         if (!(await this._ensureMarketplaceTrusted(plugin))) {
-            return;
+            throw ( new CancellationError());
         }
         const kind = plugin.sourceDescriptor.kind;
         if (kind === PluginSourceKind.RelativePath) {
@@ -64,7 +65,7 @@ let PluginInstallService = class PluginInstallService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6431,
+                    6489,
                     "'{0}' is not a valid plugin source. Enter a GitHub repository (owner/repo) or a git clone URL.",
                     source
                 ))
@@ -75,7 +76,7 @@ let PluginInstallService = class PluginInstallService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6432,
+                    6490,
                     "Local file paths are not supported. Enter a GitHub repository (owner/repo) or a git clone URL."
                 ))
             });
@@ -93,14 +94,14 @@ let PluginInstallService = class PluginInstallService {
         const reference = parseMarketplaceReference(source);
         if (!reference) {
             return localize(
-                6431,
+                6489,
                 "'{0}' is not a valid plugin source. Enter a GitHub repository (owner/repo) or a git clone URL.",
                 source
             );
         }
         if (reference.kind === MarketplaceReferenceKind.LocalFileUri) {
             return localize(
-                6432,
+                6490,
                 "Local file paths are not supported. Enter a GitHub repository (owner/repo) or a git clone URL."
             );
         }
@@ -112,7 +113,7 @@ let PluginInstallService = class PluginInstallService {
             return {
                 success: false,
                 message: ( localize(
-                    6431,
+                    6489,
                     "'{0}' is not a valid plugin source. Enter a GitHub repository (owner/repo) or a git clone URL.",
                     source
                 ))
@@ -122,7 +123,7 @@ let PluginInstallService = class PluginInstallService {
             return {
                 success: false,
                 message: ( localize(
-                    6432,
+                    6490,
                     "Local file paths are not supported. Enter a GitHub repository (owner/repo) or a git clone URL."
                 ))
             };
@@ -155,7 +156,7 @@ let PluginInstallService = class PluginInstallService {
         let repoDir;
         try {
             repoDir = await this._pluginRepositoryService.ensurePluginSource(tempPlugin, {
-                progressTitle: ( localize(6433, "Cloning plugin source '{0}'...", reference.displayLabel)),
+                progressTitle: ( localize(6491, "Cloning plugin source '{0}'...", reference.displayLabel)),
                 failureLabel: reference.displayLabel,
                 marketplaceType: MarketplaceType.OpenPlugin
             });
@@ -164,7 +165,7 @@ let PluginInstallService = class PluginInstallService {
             return {
                 success: false,
                 message: ( localize(
-                    6434,
+                    6492,
                     "Failed to clone plugin source '{0}': {1}",
                     reference.displayLabel,
                     detail
@@ -175,7 +176,7 @@ let PluginInstallService = class PluginInstallService {
         if (!repoExists) {
             return {
                 success: false,
-                message: ( localize(6435, "Failed to clone plugin source '{0}'.", reference.displayLabel))
+                message: ( localize(6493, "Failed to clone plugin source '{0}'.", reference.displayLabel))
             };
         }
         const discoveredPlugins = await this._pluginMarketplaceService.readPluginsFromDirectory(repoDir, reference);
@@ -184,7 +185,7 @@ let PluginInstallService = class PluginInstallService {
             return {
                 success: false,
                 message: ( localize(
-                    6436,
+                    6494,
                     "No plugins found in '{0}'. This does not appear to be a valid plugin marketplace.",
                     reference.displayLabel
                 ))
@@ -196,7 +197,7 @@ let PluginInstallService = class PluginInstallService {
                 return {
                     success: false,
                     message: ( localize(
-                        6437,
+                        6495,
                         "Plugin '{0}' not found in '{1}'.",
                         options.plugin,
                         reference.displayLabel
@@ -223,7 +224,7 @@ let PluginInstallService = class PluginInstallService {
             plugin: p
         })));
         const selected = await this._quickInputService.pick(picks, {
-            placeHolder: ( localize(6438, "Select a plugin to install from '{0}'", reference.displayLabel)),
+            placeHolder: ( localize(6496, "Select a plugin to install from '{0}'", reference.displayLabel)),
             canPickMany: false
         });
         if (!selected) {
@@ -381,15 +382,15 @@ let PluginInstallService = class PluginInstallService {
         } else {
             await this._progressService.withProgress({
                 location: ProgressLocation.Notification,
-                title: ( localize(6439, "Updating plugins..."))
+                title: ( localize(6497, "Updating plugins..."))
             }, doUpdate);
         }
         if (failedNames.length > 0) {
             this._notificationService.notify({
                 severity: Severity.Error,
-                message: ( localize(6440, "Failed to update: {0}", failedNames.join(", "))),
+                message: ( localize(6498, "Failed to update: {0}", failedNames.join(", "))),
                 actions: {
-                    primary: [( new Action("showGitOutput", ( localize(6441, "Show Output")), undefined, true, () => {
+                    primary: [( new Action("showGitOutput", ( localize(6499, "Show Output")), undefined, true, () => {
                         this._commandService.executeCommand("git.showOutput");
                     }))]
                 }
@@ -398,7 +399,7 @@ let PluginInstallService = class PluginInstallService {
             this._pluginMarketplaceService.clearUpdatesAvailable();
             this._notificationService.notify({
                 severity: Severity.Info,
-                message: ( localize(6442, "Updated plugins: {0}", updatedNames.join(", ")))
+                message: ( localize(6500, "Updated plugins: {0}", updatedNames.join(", ")))
             });
         } else if (!token.isCancellationRequested) {
             this._pluginMarketplaceService.clearUpdatesAvailable();
@@ -423,16 +424,16 @@ let PluginInstallService = class PluginInstallService {
         } = await this._dialogService.confirm({
             type: "question",
             message: ( localize(
-                6443,
+                6501,
                 "Trust Plugins from '{0}'?",
                 plugin.marketplaceReference.displayLabel
             )),
             detail: ( localize(
-                6444,
+                6502,
                 "Plugins can run code on your machine. Only install plugins from sources you trust.\n\nSource: {0}",
                 plugin.marketplaceReference.rawValue
             )),
-            primaryButton: ( localize(6445, "&&Trust")),
+            primaryButton: ( localize(6503, "&&Trust")),
             custom: {
                 icon: Codicon.shield
             }
@@ -446,7 +447,7 @@ let PluginInstallService = class PluginInstallService {
     async _installRelativePathPlugin(plugin) {
         try {
             await this._pluginRepositoryService.ensureRepository(plugin.marketplaceReference, {
-                progressTitle: ( localize(6446, "Installing plugin '{0}'...", plugin.name)),
+                progressTitle: ( localize(6504, "Installing plugin '{0}'...", plugin.name)),
                 failureLabel: plugin.name,
                 marketplaceType: plugin.marketplaceType
             });
@@ -460,7 +461,7 @@ let PluginInstallService = class PluginInstallService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6447,
+                    6505,
                     "Plugin source directory '{0}' is invalid for repository '{1}'.",
                     plugin.source,
                     plugin.marketplace
@@ -473,7 +474,7 @@ let PluginInstallService = class PluginInstallService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6448,
+                    6506,
                     "Plugin source directory '{0}' not found in repository '{1}'.",
                     plugin.source,
                     plugin.marketplace
@@ -488,7 +489,7 @@ let PluginInstallService = class PluginInstallService {
         let pluginDir;
         try {
             pluginDir = await this._pluginRepositoryService.ensurePluginSource(plugin, {
-                progressTitle: ( localize(6446, "Installing plugin '{0}'...", plugin.name)),
+                progressTitle: ( localize(6504, "Installing plugin '{0}'...", plugin.name)),
                 failureLabel: plugin.name,
                 marketplaceType: plugin.marketplaceType
             });
@@ -500,7 +501,7 @@ let PluginInstallService = class PluginInstallService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6449,
+                    6507,
                     "Plugin source '{0}' not found after cloning.",
                     repo.getLabel(plugin.sourceDescriptor)
                 ))

package/vscode/src/vs/workbench/contrib/chat/browser/pluginSources.d.ts

@@ -9,14 +9,16 @@ import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workben
 import { IEnsureRepositoryOptions, IPullRepositoryOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService";
 import { IMarketplacePlugin, IPluginSourceDescriptor, PluginSourceKind } from "../common/plugins/pluginMarketplaceService.js";
 import { IPluginSource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginSource";
+import { IPluginGitService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginGitService.service";
 declare abstract class AbstractGitPluginSource implements IPluginSource {
     protected readonly _commandService: ICommandService;
     protected readonly _fileService: IFileService;
     protected readonly _logService: ILogService;
     protected readonly _notificationService: INotificationService;
+    protected readonly _pluginGit: IPluginGitService;
     protected readonly _progressService: IProgressService;
     abstract readonly kind: PluginSourceKind;
-    constructor(_commandService: ICommandService, _fileService: IFileService, _logService: ILogService, _notificationService: INotificationService, _progressService: IProgressService);
+    constructor(_commandService: ICommandService, _fileService: IFileService, _logService: ILogService, _notificationService: INotificationService, _pluginGit: IPluginGitService, _progressService: IProgressService);
     abstract getInstallUri(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI;
     abstract getLabel(descriptor: IPluginSourceDescriptor): string;
     protected abstract _cloneUrl(descriptor: IPluginSourceDescriptor): string;

package/vscode/src/vs/workbench/contrib/chat/browser/pluginSources.js

@@ -2,6 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { isWindows } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
@@ -19,6 +20,7 @@ import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { PluginSourceKind } from '../common/plugins/pluginMarketplaceService.js';
+import { IPluginGitService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginGitService.service';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
 function sanitizeCacheSegment(name) {
@@ -33,17 +35,6 @@ function gitRevisionCacheSuffix(ref, sha) {
     }
     return [];
 }
-function showGitOutputAction(commandService) {
-    return (new Action(
-        "showGitOutput",
-        localize(6450, "Show Git Output"),
-        undefined,
-        true,
-        () => {
-            commandService.executeCommand("git.showOutput");
-        }
-    ));
-}
 function shellEscapeArg(value) {
     if (isWindows) {
         return `"${value.replace(/[`$"]/g, "`$&")}"`;
@@ -60,12 +51,14 @@ let AbstractGitPluginSource = class AbstractGitPluginSource {
         _fileService,
         _logService,
         _notificationService,
+        _pluginGit,
         _progressService
     ) {
         this._commandService = _commandService;
         this._fileService = _fileService;
         this._logService = _logService;
         this._notificationService = _notificationService;
+        this._pluginGit = _pluginGit;
         this._progressService = _progressService;
     }
     getCleanupTarget(cacheRoot, descriptor) {
@@ -83,7 +76,7 @@ let AbstractGitPluginSource = class AbstractGitPluginSource {
             await this._checkoutRevision(repoDir, descriptor, options?.failureLabel ?? label);
             return this.getInstallUri(cacheRoot, descriptor);
         }
-        const progressTitle = options?.progressTitle ?? ( localize(6451, "Cloning plugin source '{0}'...", label));
+        const progressTitle = options?.progressTitle ?? ( localize(6508, "Cloning plugin source '{0}'...", label));
         const failureLabel = options?.failureLabel ?? label;
         const ref = descriptor.ref;
         await this._cloneRepository(repoDir, this._cloneUrl(descriptor), progressTitle, failureLabel, ref);
@@ -103,106 +96,104 @@ let AbstractGitPluginSource = class AbstractGitPluginSource {
         const updateLabel = options?.pluginName ?? plugin.name;
         const failureLabel = options?.failureLabel ?? updateLabel;
         try {
-            const doUpdate = async () => {
-                await this._commandService.executeCommand("git.openRepository", repoDir.fsPath);
+            const doUpdate = async cts => {
                 const git = descriptor;
                 let changed;
                 if (git.sha) {
-                    const headBefore = await this._commandService.executeCommand("_git.revParse", repoDir.fsPath, "HEAD").catch(() => undefined);
-                    await this._commandService.executeCommand("git.fetch", repoDir.fsPath);
-                    await this._checkoutRevision(repoDir, descriptor, failureLabel);
-                    const headAfter = await this._commandService.executeCommand("_git.revParse", repoDir.fsPath, "HEAD").catch(() => undefined);
+                    const headBefore = await this._pluginGit.revParse(repoDir, "HEAD").catch(() => undefined);
+                    await this._pluginGit.fetch(repoDir, cts?.token);
+                    await this._checkoutRevision(repoDir, descriptor, failureLabel, cts?.token);
+                    const headAfter = await this._pluginGit.revParse(repoDir, "HEAD").catch(() => undefined);
                     changed = headBefore !== headAfter;
                 } else {
-                    changed = !!(await this._commandService.executeCommand("_git.pull", repoDir.fsPath));
-                    await this._checkoutRevision(repoDir, descriptor, failureLabel);
+                    changed = await this._pluginGit.pull(repoDir, cts?.token);
+                    await this._checkoutRevision(repoDir, descriptor, failureLabel, cts?.token);
                 }
                 return changed;
             };
             if (options?.silent) {
                 return await doUpdate();
             }
-            return await this._progressService.withProgress({
-                location: ProgressLocation.Notification,
-                title: ( localize(6452, "Updating plugin '{0}'...", updateLabel)),
-                cancellable: false
-            }, doUpdate);
+            const cts = ( new CancellationTokenSource());
+            try {
+                return await this._progressService.withProgress({
+                    location: ProgressLocation.Notification,
+                    title: ( localize(6509, "Updating plugin '{0}'...", updateLabel)),
+                    cancellable: true
+                }, () => doUpdate(cts), () => cts.dispose(true));
+            } finally {
+                cts.dispose();
+            }
         } catch (err) {
             this._logService.error(`[${this.kind}] Failed to update plugin source '${updateLabel}':`, err);
             if (!options?.silent) {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        6453,
+                        6510,
                         "Failed to update plugin '{0}': {1}",
                         failureLabel,
                         err?.message ?? String(err)
-                    )),
-                    actions: {
-                        primary: [showGitOutputAction(this._commandService)]
-                    }
+                    ))
                 });
             }
             throw err;
         }
     }
     async _cloneRepository(repoDir, cloneUrl, progressTitle, failureLabel, ref) {
+        const cts = ( new CancellationTokenSource());
         try {
             await this._progressService.withProgress({
                 location: ProgressLocation.Notification,
                 title: progressTitle,
-                cancellable: false
+                cancellable: true
             }, async () => {
                 await this._fileService.createFolder(dirname(repoDir));
-                await this._commandService.executeCommand("_git.cloneRepository", cloneUrl, repoDir.fsPath, ref);
-            });
+                await this._pluginGit.cloneRepository(cloneUrl, repoDir, ref, cts.token);
+            }, () => cts.dispose(true));
         } catch (err) {
             this._logService.error(`[${this.kind}] Failed to clone ${cloneUrl}:`, err);
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6454,
+                    6511,
                     "Failed to install plugin '{0}': {1}",
                     failureLabel,
                     err?.message ?? String(err)
-                )),
-                actions: {
-                    primary: [showGitOutputAction(this._commandService)]
-                }
+                ))
             });
             throw err;
+        } finally {
+            cts.dispose();
         }
     }
-    async _checkoutRevision(repoDir, descriptor, failureLabel) {
+    async _checkoutRevision(repoDir, descriptor, failureLabel, token) {
         const git = descriptor;
         if (!git.sha && !git.ref) {
             return;
         }
         try {
             if (git.sha) {
-                await this._commandService.executeCommand("_git.checkout", repoDir.fsPath, git.sha, true);
+                await this._pluginGit.checkout(repoDir, git.sha, true, token);
                 return;
             }
-            await this._commandService.executeCommand("_git.checkout", repoDir.fsPath, git.ref);
+            await this._pluginGit.checkout(repoDir, git.ref, undefined, token);
         } catch (err) {
             this._logService.error(`[${this.kind}] Failed to checkout revision for '${failureLabel}':`, err);
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6455,
+                    6512,
                     "Failed to checkout plugin '{0}' to requested revision: {1}",
                     failureLabel,
                     err?.message ?? String(err)
-                )),
-                actions: {
-                    primary: [showGitOutputAction(this._commandService)]
-                }
+                ))
             });
             throw err;
         }
     }
 };
-AbstractGitPluginSource = ( __decorate([( __param(0, ICommandService)), ( __param(1, IFileService)), ( __param(2, ILogService)), ( __param(3, INotificationService)), ( __param(4, IProgressService))], AbstractGitPluginSource));
+AbstractGitPluginSource = ( __decorate([( __param(0, ICommandService)), ( __param(1, IFileService)), ( __param(2, ILogService)), ( __param(3, INotificationService)), ( __param(4, IPluginGitService)), ( __param(5, IProgressService))], AbstractGitPluginSource));
 class RelativePathPluginSource {
     constructor() {
         this.kind = PluginSourceKind.RelativePath;
@@ -338,7 +329,7 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
         if (!confirmed) {
             return undefined;
         }
-        const progressTitle = ( localize(6456, "Installing {0} plugin '{1}'...", this._managerName, plugin.name));
+        const progressTitle = ( localize(6513, "Installing {0} plugin '{1}'...", this._managerName, plugin.name));
         const {
             success,
             terminal
@@ -351,7 +342,7 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6457,
+                    6514,
                     "{0} package '{1}' was not found after installation.",
                     this._managerName,
                     this.getLabel(plugin.sourceDescriptor)
@@ -369,9 +360,9 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
             return (new Promise(resolve => {
                 const n = this._notificationService.notify({
                     severity: Severity.Info,
-                    message: ( localize(6458, "Plugin '{0}' wants to run: {1}", pluginName, command)),
+                    message: ( localize(6515, "Plugin '{0}' wants to run: {1}", pluginName, command)),
                     actions: {
-                        primary: [( new Action("installPlugin", ( localize(6459, "Install")), undefined, true, async () => resolve(true)))]
+                        primary: [( new Action("installPlugin", ( localize(6516, "Install")), undefined, true, async () => resolve(true)))]
                     }
                 });
                 Event.once(n.onDidClose)(() => resolve(false));
@@ -381,9 +372,9 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
             confirmed
         } = await this._dialogService.confirm({
             type: "question",
-            message: ( localize(6460, "Install Plugin '{0}'?", pluginName)),
-            detail: ( localize(6461, "This will run the following command in a terminal:\n\n{0}", command)),
-            primaryButton: ( localize(6462, "&&Install"))
+            message: ( localize(6517, "Install Plugin '{0}'?", pluginName)),
+            detail: ( localize(6518, "This will run the following command in a terminal:\n\n{0}", command)),
+            primaryButton: ( localize(6519, "&&Install"))
         });
         return confirmed;
     }
@@ -397,7 +388,7 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
             }, async () => {
                 terminal = await this._terminalService.createTerminal({
                     config: {
-                        name: ( localize(6463, "Plugin Install")),
+                        name: ( localize(6520, "Plugin Install")),
                         forceShellIntegration: true,
                         isTransient: true,
                         isFeatureTerminal: true
@@ -409,7 +400,7 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
                 await terminal.runCommand(command, true);
                 const exitCode = await commandResultPromise;
                 if (exitCode !== 0) {
-                    throw ( new Error(( localize(6464, "Command exited with code {0}", exitCode))));
+                    throw ( new Error(( localize(6521, "Command exited with code {0}", exitCode))));
                 }
             });
             return {
@@ -421,7 +412,7 @@ let AbstractPackagePluginSource = class AbstractPackagePluginSource {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    6465,
+                    6522,
                     "Plugin installation command failed: {0}",
                     err?.message ?? String(err)
                 ))

package/vscode/src/vs/workbench/contrib/chat/browser/pluginUrlHandler.js

@@ -83,13 +83,13 @@ let PluginUrlHandler = class PluginUrlHandler extends Disposable {
             confirmed
         } = await this._dialogService.confirm({
             type: "question",
-            message: ( localize(6466, "Install Plugin from '{0}'?", ref.displayLabel)),
+            message: ( localize(6523, "Install Plugin from '{0}'?", ref.displayLabel)),
             detail: ( localize(
-                6467,
+                6524,
                 "An external application wants to install a plugin from this source. Plugins can run code on your machine. Only install plugins from sources you trust.\n\nSource: {0}",
                 ref.rawValue
             )),
-            primaryButton: ( localize(6468, "&&Install")),
+            primaryButton: ( localize(6525, "&&Install")),
             custom: {
                 icon: Codicon.shield
             }
@@ -148,13 +148,13 @@ let PluginUrlHandler = class PluginUrlHandler extends Disposable {
             confirmed
         } = await this._dialogService.confirm({
             type: "question",
-            message: ( localize(6469, "Add Plugin Marketplace '{0}'?", ref.displayLabel)),
+            message: ( localize(6526, "Add Plugin Marketplace '{0}'?", ref.displayLabel)),
             detail: ( localize(
-                6470,
+                6527,
                 "An external application wants to add a plugin marketplace. Plugins from this marketplace will appear in the plugin catalog and can be installed.\n\nSource: {0}",
                 ref.rawValue
             )),
-            primaryButton: ( localize(6471, "&&Add Marketplace")),
+            primaryButton: ( localize(6528, "&&Add Marketplace")),
             custom: {
                 icon: Codicon.shield
             }