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

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

@@ -11,11 +11,13 @@ import { IEnsureRepositoryOptions, IPullRepositoryOptions } from "@codingame/mon
 import { IAgentPluginRepositoryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service";
 import { IMarketplacePlugin, IMarketplaceReference, IPluginSourceDescriptor, MarketplaceType, 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";
 export declare class AgentPluginRepositoryService implements IAgentPluginRepositoryService {
     private readonly _commandService;
     private readonly _fileService;
     private readonly _logService;
     private readonly _notificationService;
+    private readonly _pluginGit;
     private readonly _progressService;
     private readonly _storageService;
     readonly _serviceBrand: undefined;
@@ -25,7 +27,7 @@ export declare class AgentPluginRepositoryService implements IAgentPluginReposit
     private readonly _pluginSources;
     private readonly _cloneSequencer;
     private readonly _migrationDone;
-    constructor(_commandService: ICommandService, environmentService: IWorkbenchEnvironmentService, _fileService: IFileService, instantiationService: IInstantiationService, _logService: ILogService, _notificationService: INotificationService, _progressService: IProgressService, _storageService: IStorageService);
+    constructor(_commandService: ICommandService, environmentService: IWorkbenchEnvironmentService, _fileService: IFileService, instantiationService: IInstantiationService, _logService: ILogService, _notificationService: INotificationService, _pluginGit: IPluginGitService, _progressService: IProgressService, _storageService: IStorageService);
     getPluginSource(kind: PluginSourceKind): IPluginSource;
     getRepositoryUri(marketplace: IMarketplaceReference, marketplaceType?: MarketplaceType): URI;
     getPluginInstallUri(plugin: IMarketplacePlugin): URI;

package/vscode/src/vs/workbench/contrib/chat/browser/agentPluginRepositoryService.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 { SequencerByKey } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
 import { joinPath, isEqual, dirname, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
@@ -18,6 +19,7 @@ import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 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 { PluginSourceKind } from '../common/plugins/pluginMarketplaceService.js';
+import { IPluginGitService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginGitService.service';
 import { RelativePathPluginSource, GitHubPluginSource, GitUrlPluginSource, NpmPluginSource, PipPluginSource } from './pluginSources.js';
 import { MarketplaceReferenceKind } from '../common/plugins/marketplaceReference.js';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
@@ -31,6 +33,7 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         instantiationService,
         _logService,
         _notificationService,
+        _pluginGit,
         _progressService,
         _storageService
     ) {
@@ -38,6 +41,7 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         this._fileService = _fileService;
         this._logService = _logService;
         this._notificationService = _notificationService;
+        this._pluginGit = _pluginGit;
         this._progressService = _progressService;
         this._storageService = _storageService;
         this._marketplaceIndex = ( new Lazy(() => this._loadMarketplaceIndex()));
@@ -92,7 +96,7 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
             if (marketplace.kind === MarketplaceReferenceKind.LocalFileUri) {
                 throw ( new Error(`Local marketplace repository does not exist: ${repoDir.fsPath}`));
             }
-            const progressTitle = options?.progressTitle ?? ( localize(5085, "Preparing plugin marketplace '{0}'...", marketplace.displayLabel));
+            const progressTitle = options?.progressTitle ?? ( localize(5092, "Preparing plugin marketplace '{0}'...", marketplace.displayLabel));
             const failureLabel = options?.failureLabel ?? marketplace.displayLabel;
             await this._cloneRepository(repoDir, marketplace.cloneUrl, progressTitle, failureLabel);
             this._updateMarketplaceIndex(marketplace, repoDir, options?.marketplaceType);
@@ -110,17 +114,19 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         }
         const updateLabel = options?.pluginName ?? marketplace.displayLabel;
         try {
-            const doPull = async () => {
-                return !!(await this._commandService.executeCommand("_git.pull", repoDir.fsPath));
-            };
             if (options?.silent) {
-                return await doPull();
+                return await this._pluginGit.pull(repoDir);
+            }
+            const cts = ( new CancellationTokenSource());
+            try {
+                return await this._progressService.withProgress({
+                    location: ProgressLocation.Notification,
+                    title: ( localize(5093, "Updating plugin '{0}'...", updateLabel)),
+                    cancellable: true
+                }, () => this._pluginGit.pull(repoDir, cts.token), () => cts.dispose(true));
+            } finally {
+                cts.dispose();
             }
-            return await this._progressService.withProgress({
-                location: ProgressLocation.Notification,
-                title: ( localize(5086, "Updating plugin '{0}'...", updateLabel)),
-                cancellable: false
-            }, doPull);
         } catch (err) {
             this._logService.error(
                 `[AgentPluginRepositoryService] Failed to update ${marketplace.displayLabel}:`,
@@ -130,13 +136,13 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        5087,
+                        5094,
                         "Failed to update plugin '{0}': {1}",
                         options?.failureLabel ?? updateLabel,
                         err?.message ?? String(err)
                     )),
                     actions: {
-                        primary: [( new Action("showGitOutput", ( localize(5088, "Show Git Output")), undefined, true, () => {
+                        primary: [( new Action("showGitOutput", ( localize(5095, "Show Git Output")), undefined, true, () => {
                             this._commandService.executeCommand("git.showOutput");
                         }))]
                     }
@@ -200,32 +206,35 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         );
     }
     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(`[AgentPluginRepositoryService] Failed to clone ${cloneUrl}:`, err);
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    5089,
+                    5096,
                     "Failed to install plugin '{0}': {1}",
                     failureLabel,
                     err?.message ?? String(err)
                 )),
                 actions: {
-                    primary: [( new Action("showGitOutput", ( localize(5088, "Show Git Output")), undefined, true, () => {
+                    primary: [( new Action("showGitOutput", ( localize(5095, "Show Git Output")), undefined, true, () => {
                         this._commandService.executeCommand("git.showOutput");
                     }))]
                 }
             });
             throw err;
+        } finally {
+            cts.dispose();
         }
     }
     _getPluginDir(repoDir, source) {
@@ -261,8 +270,8 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
             return false;
         }
         try {
-            await this._commandService.executeCommand("_git.fetchRepository", repoDir.fsPath);
-            const behindCount = (await this._commandService.executeCommand("_git.revListCount", repoDir.fsPath, "HEAD", "@{u}")) ?? 0;
+            await this._pluginGit.fetchRepository(repoDir);
+            const behindCount = await this._pluginGit.revListCount(repoDir, "HEAD", "@{u}");
             return behindCount > 0;
         } catch (err) {
             this._logService.debug(
@@ -353,6 +362,6 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         }
     }
 };
-AgentPluginRepositoryService = ( __decorate([( __param(0, ICommandService)), ( __param(1, IWorkbenchEnvironmentService)), ( __param(2, IFileService)), ( __param(3, IInstantiationService)), ( __param(4, ILogService)), ( __param(5, INotificationService)), ( __param(6, IProgressService)), ( __param(7, IStorageService))], AgentPluginRepositoryService));
+AgentPluginRepositoryService = ( __decorate([( __param(0, ICommandService)), ( __param(1, IWorkbenchEnvironmentService)), ( __param(2, IFileService)), ( __param(3, IInstantiationService)), ( __param(4, ILogService)), ( __param(5, INotificationService)), ( __param(6, IPluginGitService)), ( __param(7, IProgressService)), ( __param(8, IStorageService))], AgentPluginRepositoryService));
 
 export { AgentPluginRepositoryService };

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

@@ -93,7 +93,7 @@ let UpdatePluginAction = class UpdatePluginAction extends Action {
         pluginInstallService,
         pluginMarketplaceService
     ) {
-        super(UpdatePluginAction_1.ID, ( localize(5090, "Update")), "extension-action label prominent install");
+        super(UpdatePluginAction_1.ID, ( localize(5097, "Update")), "extension-action label prominent install");
         this.plugin = plugin;
         this.liveMarketplacePlugin = liveMarketplacePlugin;
         this.pluginInstallService = pluginInstallService;
@@ -121,7 +121,7 @@ let ManagePluginAction = class ManagePluginAction extends Action {
         this.getActionGroups = getActionGroups;
         this.instantiationService = instantiationService;
         this._actionViewItem = null;
-        this.tooltip = ( localize(5091, "Manage"));
+        this.tooltip = ( localize(5098, "Manage"));
     }
     createActionViewItem(options) {
         this._actionViewItem = this.instantiationService.createInstance(DropDownActionViewItem, this, options);
@@ -358,7 +358,7 @@ let AgentPluginsListView = class AgentPluginsListView extends AbstractExtensions
                         return item?.name ?? "";
                     },
                     getWidgetAriaLabel() {
-                        return localize(5092, "Agent Plugins");
+                        return localize(5099, "Agent Plugins");
                     }
                 },
                 overrideStyles: getLocationBasedViewColors(this.viewDescriptorService.getViewLocationById(this.id)).listOverrideStyles
@@ -533,7 +533,7 @@ let AgentPluginsListView = class AgentPluginsListView extends AbstractExtensions
             this.bodyTemplate.pluginsList.classList.toggle("hidden", count === 0);
             this.bodyTemplate.messageContainer.classList.toggle("hidden", count > 0);
             if (count === 0 && this.isBodyVisible()) {
-                this.bodyTemplate.messageBox.textContent = ( localize(5093, "No agent plugins found."));
+                this.bodyTemplate.messageBox.textContent = ( localize(5100, "No agent plugins found."));
             }
         }
     }
@@ -543,18 +543,18 @@ class AgentPluginsBrowseCommand extends Action2 {
     constructor() {
         super({
             id: "workbench.agentPlugins.browse",
-            title: ( localize2(5094, "Agent Plugins")),
-            tooltip: ( localize2(5095, "Browse Agent Plugins")),
+            title: ( localize2(5101, "Agent Plugins")),
+            tooltip: ( localize2(5102, "Browse Agent Plugins")),
             icon: Codicon.search,
-            precondition: ( ChatContextKeys.Setup.hidden.negate()),
+            precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))),
             menu: [{
                 id: extensionsFilterSubMenu,
                 group: "1_predefined",
                 order: 2,
-                when: ( ChatContextKeys.Setup.hidden.negate())
+                when: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate())))
             }, {
                 id: MenuId.ViewTitle,
-                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("view", InstalledAgentPluginsViewId)), ( ChatContextKeys.Setup.hidden.negate()))),
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("view", InstalledAgentPluginsViewId)), ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))),
                 group: "navigation"
             }]
         });
@@ -567,8 +567,8 @@ class CheckForPluginUpdatesCommand extends Action2 {
     constructor() {
         super({
             id: "workbench.agentPlugins.checkForUpdates",
-            title: ( localize2(5096, "Update Plugins")),
-            category: ( localize2(5097, "Chat")),
+            title: ( localize2(5103, "Update Plugins")),
+            category: ( localize2(5104, "Chat")),
             precondition: ChatContextKeys.enabled,
             f1: true
         });
@@ -581,8 +581,8 @@ class ForceUpdatePluginsCommand extends Action2 {
     constructor() {
         super({
             id: "workbench.agentPlugins.forceUpdate",
-            title: ( localize2(5098, "Update Plugins (Force)")),
-            category: ( localize2(5097, "Chat")),
+            title: ( localize2(5105, "Update Plugins (Force)")),
+            category: ( localize2(5104, "Chat")),
             precondition: ChatContextKeys.enabled,
             f1: true
         });
@@ -608,7 +608,7 @@ let AgentPluginsViewsContribution = class AgentPluginsViewsContribution extends
         registerAction2(ForceUpdatePluginsCommand);
         ( Registry.as(Extensions.ViewsRegistry)).registerViews([{
             id: InstalledAgentPluginsViewId,
-            name: ( localize2(5099, "Agent Plugins - Installed")),
+            name: ( localize2(5106, "Agent Plugins - Installed")),
             ctorDescriptor: ( new SyncDescriptor(AgentPluginsListView, [{
                 installedOnly: true
             }])),
@@ -618,7 +618,7 @@ let AgentPluginsViewsContribution = class AgentPluginsViewsContribution extends
             canToggleVisibility: true
         }, {
             id: "workbench.views.agentPlugins.default.marketplace",
-            name: ( localize2(5100, "Agent Plugins")),
+            name: ( localize2(5107, "Agent Plugins")),
             ctorDescriptor: ( new SyncDescriptor(AgentPluginsListView, [{}])),
             when: ( ContextKeyExpr.and(DefaultViewsContext, ( HasInstalledAgentPluginsContext.toNegated()), ( ChatContextKeys.Setup.hidden.negate()))),
             weight: 30,
@@ -627,7 +627,7 @@ let AgentPluginsViewsContribution = class AgentPluginsViewsContribution extends
             hideByDefault: true
         }, {
             id: "workbench.views.agentPlugins.marketplace",
-            name: ( localize2(5100, "Agent Plugins")),
+            name: ( localize2(5107, "Agent Plugins")),
             ctorDescriptor: ( new SyncDescriptor(AgentPluginsListView, [{}])),
             when: ( ContextKeyExpr.and(SearchAgentPluginsContext, ( ChatContextKeys.Setup.hidden.negate())))
         }], VIEW_CONTAINER);

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionWorkingDirectoryResolver.d.ts

@@ -0,0 +1,9 @@
+import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IAgentHostSessionWorkingDirectoryResolver } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionWorkingDirectoryResolver.service";
+export declare class AgentHostSessionWorkingDirectoryResolver implements IAgentHostSessionWorkingDirectoryResolver {
+    readonly _serviceBrand: undefined;
+    private readonly _resolvers;
+    registerResolver(sessionType: string, resolver: (sessionResource: URI) => URI | undefined): IDisposable;
+    resolve(sessionResource: URI): URI | undefined;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionWorkingDirectoryResolver.js

@@ -0,0 +1,23 @@
+
+import { toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+
+class AgentHostSessionWorkingDirectoryResolver {
+    constructor() {
+        this._resolvers = ( new Map());
+    }
+    registerResolver(sessionType, resolver) {
+        this._resolvers.set(sessionType, resolver);
+        return toDisposable(() => {
+            if (this._resolvers.get(sessionType) === resolver) {
+                this._resolvers.delete(sessionType);
+            }
+        });
+    }
+    resolve(sessionResource) {
+        return this._resolvers.get(sessionResource.scheme)?.(sessionResource);
+    }
+}
+
+export { AgentHostSessionWorkingDirectoryResolver };

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.contribution.js

@@ -46,7 +46,7 @@ registerAction2(SetAgentSessionsOrientationStackedAction);
 registerAction2(SetAgentSessionsOrientationSideBySideAction);
 MenuRegistry.appendMenuItem(MenuId.AgentSessionsToolbar, {
     submenu: MenuId.AgentSessionsViewerFilterSubMenu,
-    title: ( localize2(5108, "Filter Agent Sessions")),
+    title: ( localize2(5115, "Filter Agent Sessions")),
     group: "navigation",
     order: 3,
     icon: Codicon.filter
@@ -116,9 +116,9 @@ MenuRegistry.appendMenuItem(MenuId.ChatViewSessionTitleToolbar, {
     prefix: AGENT_SESSIONS_QUICK_ACCESS_PREFIX,
     contextKey: "inAgentSessionsPicker",
     when: ChatContextKeys.enabled,
-    placeholder: ( localize(5109, "Search agent sessions by name")),
+    placeholder: ( localize(5116, "Search agent sessions by name")),
     helpEntries: [{
-        description: ( localize(5110, "Show All Agent Sessions")),
+        description: ( localize(5117, "Show All Agent Sessions")),
         commandId: "workbench.action.chat.history"
     }]
 });

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

@@ -109,11 +109,11 @@ export declare class OpenAgentSessionInNewWindowAction extends BaseOpenAgentSess
 }
 export declare class RefreshAgentSessionsViewerAction extends Action2 {
     constructor();
-    run(accessor: ServicesAccessor, agentSessionsControl: IAgentSessionsControl): void;
+    run(accessor: ServicesAccessor, agentSessionsControl?: IAgentSessionsControl): void;
 }
 export declare class FindAgentSessionInViewerAction extends Action2 {
     constructor();
-    run(accessor: ServicesAccessor, agentSessionsControl: IAgentSessionsControl): void;
+    run(accessor: ServicesAccessor, agentSessionsControl?: IAgentSessionsControl): void | Promise<unknown>;
 }
 declare abstract class UpdateChatViewWidthAction extends Action2 {
     run(accessor: ServicesAccessor): Promise<void>;