@codingame/monaco-vscode-chat-service-override 26.2.2 → 28.0.0

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

@@ -5,7 +5,7 @@ import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/even
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
-import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ITextEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textEditorService.service';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
@@ -27,7 +27,7 @@ let LanguageModelsConfigurationService = class LanguageModelsConfigurationServic
         fileService,
         textFileService,
         textModelService,
-        editorGroupsService,
+        editorService,
         textEditorService,
         userDataProfileService,
         uriIdentityService
@@ -36,9 +36,9 @@ let LanguageModelsConfigurationService = class LanguageModelsConfigurationServic
         this.fileService = fileService;
         this.textFileService = textFileService;
         this.textModelService = textModelService;
-        this.editorGroupsService = editorGroupsService;
+        this.editorService = editorService;
         this.textEditorService = textEditorService;
-        this._onDidChangeLanguageModelGroups = ( new Emitter());
+        this._onDidChangeLanguageModelGroups = this._register(( new Emitter()));
         this.onDidChangeLanguageModelGroups = this._onDidChangeLanguageModelGroups.event;
         this.languageModelsProviderGroups = [];
         this.modelsConfigurationFile = uriIdentityService.extUri.joinPath(userDataProfileService.currentProfile.location, "chatLanguageModels.json");
@@ -136,7 +136,7 @@ let LanguageModelsConfigurationService = class LanguageModelsConfigurationServic
         await this.updateLanguageModelsConfiguration();
     }
     async configureLanguageModels(options) {
-        const editor = await this.editorGroupsService.activeGroup.openEditor(this.textEditorService.createTextEditor({
+        const editor = await this.editorService.openEditor(this.textEditorService.createTextEditor({
             resource: this.modelsConfigurationFile
         }));
         if (!editor || !options?.group) {
@@ -201,7 +201,7 @@ let LanguageModelsConfigurationService = class LanguageModelsConfigurationServic
         }
     }
 };
-LanguageModelsConfigurationService = ( __decorate([( __param(0, IFileService)), ( __param(1, ITextFileService)), ( __param(2, ITextModelService)), ( __param(3, IEditorGroupsService)), ( __param(4, ITextEditorService)), ( __param(5, IUserDataProfileService)), ( __param(6, IUriIdentityService))], LanguageModelsConfigurationService));
+LanguageModelsConfigurationService = ( __decorate([( __param(0, IFileService)), ( __param(1, ITextFileService)), ( __param(2, ITextModelService)), ( __param(3, IEditorService)), ( __param(4, ITextEditorService)), ( __param(5, IUserDataProfileService)), ( __param(6, IUriIdentityService))], LanguageModelsConfigurationService));
 function parseLanguageModelsProviderGroups(model) {
     const configuration = [];
     let currentProperty = null;

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

@@ -0,0 +1,10 @@
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
+import { DefaultModelContribution } from "./defaultModelContribution.js";
+export declare class PlanAgentDefaultModel extends DefaultModelContribution {
+    static readonly ID = "workbench.contrib.planAgentDefaultModel";
+    static readonly modelIds: string[];
+    static readonly modelLabels: string[];
+    static readonly modelDescriptions: string[];
+    constructor(languageModelsService: ILanguageModelsService, logService: ILogService);
+}

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

@@ -0,0 +1,39 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
+import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
+import { createDefaultModelArrays, DefaultModelContribution } from './defaultModelContribution.js';
+
+const arrays = createDefaultModelArrays();
+let PlanAgentDefaultModel = class PlanAgentDefaultModel extends DefaultModelContribution {
+    static {
+        this.ID = "workbench.contrib.planAgentDefaultModel";
+    }
+    static {
+        this.modelIds = arrays.modelIds;
+    }
+    static {
+        this.modelLabels = arrays.modelLabels;
+    }
+    static {
+        this.modelDescriptions = arrays.modelDescriptions;
+    }
+    constructor(languageModelsService, logService) {
+        super(arrays, {
+            configKey: ChatConfiguration.PlanAgentDefaultModel,
+            configSectionId: "chatSidebar",
+            logPrefix: "[PlanAgentDefaultModel]",
+            filter: metadata => !!metadata.capabilities?.toolCalling
+        }, languageModelsService, logService);
+    }
+};
+PlanAgentDefaultModel = ( __decorate([( __param(0, ILanguageModelsService)), ( __param(1, ILogService))], PlanAgentDefaultModel));
+registerWorkbenchContribution2(
+    PlanAgentDefaultModel.ID,
+    PlanAgentDefaultModel,
+    WorkbenchPhase.BlockRestore
+);
+
+export { PlanAgentDefaultModel };

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

@@ -0,0 +1,26 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
+import { IAgentPluginRepositoryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service";
+import { IPluginInstallService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginInstallService.service";
+import { IMarketplacePlugin } from "../common/plugins/pluginMarketplaceService.js";
+import { IPluginMarketplaceService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service";
+export declare class PluginInstallService implements IPluginInstallService {
+    private readonly _pluginRepositoryService;
+    private readonly _pluginMarketplaceService;
+    private readonly _fileService;
+    private readonly _notificationService;
+    private readonly _dialogService;
+    private readonly _logService;
+    readonly _serviceBrand: undefined;
+    constructor(_pluginRepositoryService: IAgentPluginRepositoryService, _pluginMarketplaceService: IPluginMarketplaceService, _fileService: IFileService, _notificationService: INotificationService, _dialogService: IDialogService, _logService: ILogService);
+    installPlugin(plugin: IMarketplacePlugin): Promise<void>;
+    updatePlugin(plugin: IMarketplacePlugin): Promise<void>;
+    getPluginInstallUri(plugin: IMarketplacePlugin): URI;
+    private _ensureMarketplaceTrusted;
+    private _installRelativePathPlugin;
+    private _installGitPlugin;
+    private _installPackagePlugin;
+}

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

@@ -0,0 +1,175 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
+import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
+import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
+import { IAgentPluginRepositoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service';
+import { PluginSourceKind } from '../common/plugins/pluginMarketplaceService.js';
+import { IPluginMarketplaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service';
+import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
+
+let PluginInstallService = class PluginInstallService {
+    constructor(
+        _pluginRepositoryService,
+        _pluginMarketplaceService,
+        _fileService,
+        _notificationService,
+        _dialogService,
+        _logService
+    ) {
+        this._pluginRepositoryService = _pluginRepositoryService;
+        this._pluginMarketplaceService = _pluginMarketplaceService;
+        this._fileService = _fileService;
+        this._notificationService = _notificationService;
+        this._dialogService = _dialogService;
+        this._logService = _logService;
+    }
+    async installPlugin(plugin) {
+        if (!(await this._ensureMarketplaceTrusted(plugin))) {
+            return;
+        }
+        const kind = plugin.sourceDescriptor.kind;
+        if (kind === PluginSourceKind.RelativePath) {
+            return this._installRelativePathPlugin(plugin);
+        }
+        if (kind === PluginSourceKind.Npm || kind === PluginSourceKind.Pip) {
+            return this._installPackagePlugin(plugin);
+        }
+        return this._installGitPlugin(plugin);
+    }
+    async updatePlugin(plugin) {
+        const kind = plugin.sourceDescriptor.kind;
+        if (kind === PluginSourceKind.Npm || kind === PluginSourceKind.Pip) {
+            return this._installPackagePlugin(plugin);
+        }
+        return this._pluginRepositoryService.updatePluginSource(plugin, {
+            pluginName: plugin.name,
+            failureLabel: plugin.name,
+            marketplaceType: plugin.marketplaceType
+        });
+    }
+    getPluginInstallUri(plugin) {
+        if (plugin.sourceDescriptor.kind === PluginSourceKind.RelativePath) {
+            return this._pluginRepositoryService.getPluginInstallUri(plugin);
+        }
+        return this._pluginRepositoryService.getPluginSourceInstallUri(plugin.sourceDescriptor);
+    }
+    async _ensureMarketplaceTrusted(plugin) {
+        if (this._pluginMarketplaceService.isMarketplaceTrusted(plugin.marketplaceReference)) {
+            return true;
+        }
+        const {
+            confirmed
+        } = await this._dialogService.confirm({
+            type: "question",
+            message: ( localize(
+                6241,
+                "Trust Plugins from '{0}'?",
+                plugin.marketplaceReference.displayLabel
+            )),
+            detail: ( localize(
+                6242,
+                "Plugins can run code on your machine. Only install plugins from sources you trust.\n\nSource: {0}",
+                plugin.marketplaceReference.rawValue
+            )),
+            primaryButton: ( localize(6243, "&&Trust")),
+            custom: {
+                icon: Codicon.shield
+            }
+        });
+        if (!confirmed) {
+            return false;
+        }
+        this._pluginMarketplaceService.trustMarketplace(plugin.marketplaceReference);
+        return true;
+    }
+    async _installRelativePathPlugin(plugin) {
+        try {
+            await this._pluginRepositoryService.ensureRepository(plugin.marketplaceReference, {
+                progressTitle: ( localize(6244, "Installing plugin '{0}'...", plugin.name)),
+                failureLabel: plugin.name,
+                marketplaceType: plugin.marketplaceType
+            });
+        } catch {
+            return;
+        }
+        let pluginDir;
+        try {
+            pluginDir = this._pluginRepositoryService.getPluginInstallUri(plugin);
+        } catch {
+            this._notificationService.notify({
+                severity: Severity.Error,
+                message: ( localize(
+                    6245,
+                    "Plugin source directory '{0}' is invalid for repository '{1}'.",
+                    plugin.source,
+                    plugin.marketplace
+                ))
+            });
+            return;
+        }
+        const pluginExists = await this._fileService.exists(pluginDir);
+        if (!pluginExists) {
+            this._notificationService.notify({
+                severity: Severity.Error,
+                message: ( localize(
+                    6246,
+                    "Plugin source directory '{0}' not found in repository '{1}'.",
+                    plugin.source,
+                    plugin.marketplace
+                ))
+            });
+            return;
+        }
+        this._pluginMarketplaceService.addInstalledPlugin(pluginDir, plugin);
+    }
+    async _installGitPlugin(plugin) {
+        const repo = this._pluginRepositoryService.getPluginSource(plugin.sourceDescriptor.kind);
+        let pluginDir;
+        try {
+            pluginDir = await this._pluginRepositoryService.ensurePluginSource(plugin, {
+                progressTitle: ( localize(6244, "Installing plugin '{0}'...", plugin.name)),
+                failureLabel: plugin.name,
+                marketplaceType: plugin.marketplaceType
+            });
+        } catch {
+            return;
+        }
+        const pluginExists = await this._fileService.exists(pluginDir);
+        if (!pluginExists) {
+            this._notificationService.notify({
+                severity: Severity.Error,
+                message: ( localize(
+                    6247,
+                    "Plugin source '{0}' not found after cloning.",
+                    repo.getLabel(plugin.sourceDescriptor)
+                ))
+            });
+            return;
+        }
+        this._pluginMarketplaceService.addInstalledPlugin(pluginDir, plugin);
+    }
+    async _installPackagePlugin(plugin) {
+        const repo = this._pluginRepositoryService.getPluginSource(plugin.sourceDescriptor.kind);
+        if (!repo.runInstall) {
+            this._logService.error(
+                `[PluginInstallService] Expected package repository for kind '${plugin.sourceDescriptor.kind}'`
+            );
+            return;
+        }
+        const installDir = await this._pluginRepositoryService.ensurePluginSource(plugin);
+        const pluginDir = this._pluginRepositoryService.getPluginSourceInstallUri(plugin.sourceDescriptor);
+        const result = await repo.runInstall(installDir, pluginDir, plugin);
+        if (!result) {
+            return;
+        }
+        this._pluginMarketplaceService.addInstalledPlugin(result.pluginDir, plugin);
+    }
+};
+PluginInstallService = ( __decorate([( __param(0, IAgentPluginRepositoryService)), ( __param(1, IPluginMarketplaceService)), ( __param(2, IFileService)), ( __param(3, INotificationService)), ( __param(4, IDialogService)), ( __param(5, ILogService))], PluginInstallService));
+
+export { PluginInstallService };

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

@@ -0,0 +1,99 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
+import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
+import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
+import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
+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";
+declare abstract class AbstractGitPluginSource implements IPluginSource {
+    protected readonly _commandService: ICommandService;
+    protected readonly _fileService: IFileService;
+    protected readonly _logService: ILogService;
+    protected readonly _notificationService: INotificationService;
+    protected readonly _progressService: IProgressService;
+    abstract readonly kind: PluginSourceKind;
+    constructor(_commandService: ICommandService, _fileService: IFileService, _logService: ILogService, _notificationService: INotificationService, _progressService: IProgressService);
+    abstract getInstallUri(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI;
+    abstract getLabel(descriptor: IPluginSourceDescriptor): string;
+    protected abstract _cloneUrl(descriptor: IPluginSourceDescriptor): string;
+    protected abstract _displayLabel(descriptor: IPluginSourceDescriptor): string;
+    getCleanupTarget(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI | undefined;
+    ensure(cacheRoot: URI, plugin: IMarketplacePlugin, options?: IEnsureRepositoryOptions): Promise<URI>;
+    update(cacheRoot: URI, plugin: IMarketplacePlugin, options?: IPullRepositoryOptions): Promise<void>;
+    private _cloneRepository;
+    private _checkoutRevision;
+}
+export declare class RelativePathPluginSource implements IPluginSource {
+    readonly kind = PluginSourceKind.RelativePath;
+    getInstallUri(_cacheRoot: URI, _descriptor: IPluginSourceDescriptor): URI;
+    ensure(_cacheRoot: URI, _plugin: IMarketplacePlugin, _options?: IEnsureRepositoryOptions): Promise<URI>;
+    update(_cacheRoot: URI, _plugin: IMarketplacePlugin, _options?: IPullRepositoryOptions): Promise<void>;
+    getCleanupTarget(_cacheRoot: URI, _descriptor: IPluginSourceDescriptor): URI | undefined;
+    getLabel(descriptor: IPluginSourceDescriptor): string;
+}
+export declare class GitHubPluginSource extends AbstractGitPluginSource {
+    readonly kind = PluginSourceKind.GitHub;
+    getInstallUri(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI;
+    getLabel(descriptor: IPluginSourceDescriptor): string;
+    protected _cloneUrl(descriptor: IPluginSourceDescriptor): string;
+    protected _displayLabel(descriptor: IPluginSourceDescriptor): string;
+}
+export declare class GitUrlPluginSource extends AbstractGitPluginSource {
+    readonly kind = PluginSourceKind.GitUrl;
+    getInstallUri(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI;
+    getLabel(descriptor: IPluginSourceDescriptor): string;
+    protected _cloneUrl(descriptor: IPluginSourceDescriptor): string;
+    protected _displayLabel(descriptor: IPluginSourceDescriptor): string;
+    private _gitUrlCacheSegments;
+}
+export declare abstract class AbstractPackagePluginSource implements IPluginSource {
+    protected readonly _dialogService: IDialogService;
+    protected readonly _fileService: IFileService;
+    protected readonly _logService: ILogService;
+    protected readonly _notificationService: INotificationService;
+    protected readonly _progressService: IProgressService;
+    protected readonly _terminalService: ITerminalService;
+    abstract readonly kind: PluginSourceKind;
+    constructor(_dialogService: IDialogService, _fileService: IFileService, _logService: ILogService, _notificationService: INotificationService, _progressService: IProgressService, _terminalService: ITerminalService);
+    abstract getInstallUri(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI;
+    abstract getLabel(descriptor: IPluginSourceDescriptor): string;
+    getCleanupTarget(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI | undefined;
+    /**
+     * Return the parent directory (prefix / target) where the package
+     * manager installs into. This is above the actual plugin content dir.
+     */
+    protected abstract _getCacheDir(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI;
+    /** Build the terminal command args for install. */
+    protected abstract _buildInstallArgs(installDir: URI, plugin: IMarketplacePlugin): string[];
+    /** Human-readable package manager name for messages. */
+    protected abstract get _managerName(): string;
+    ensure(cacheRoot: URI, plugin: IMarketplacePlugin, _options?: IEnsureRepositoryOptions): Promise<URI>;
+    update(cacheRoot: URI, plugin: IMarketplacePlugin, _options?: IPullRepositoryOptions): Promise<void>;
+    runInstall(installDir: URI, pluginDir: URI, plugin: IMarketplacePlugin): Promise<{
+        pluginDir: URI;
+    } | undefined>;
+    private _confirmTerminalCommand;
+    private _runTerminalCommand;
+    private _waitForTerminalCommandCompletion;
+}
+export declare class NpmPluginSource extends AbstractPackagePluginSource {
+    readonly kind = PluginSourceKind.Npm;
+    protected readonly _managerName = "npm";
+    getInstallUri(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI;
+    getLabel(descriptor: IPluginSourceDescriptor): string;
+    protected _getCacheDir(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI;
+    protected _buildInstallArgs(installDir: URI, plugin: IMarketplacePlugin): string[];
+}
+export declare class PipPluginSource extends AbstractPackagePluginSource {
+    readonly kind = PluginSourceKind.Pip;
+    protected readonly _managerName = "pip";
+    getInstallUri(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI;
+    getLabel(descriptor: IPluginSourceDescriptor): string;
+    protected _getCacheDir(cacheRoot: URI, descriptor: IPluginSourceDescriptor): URI;
+    protected _buildInstallArgs(installDir: URI, plugin: IMarketplacePlugin): string[];
+}
+export {};