Skip to content

WIP - Allow installPluginFromSource command to accept source and sha programmatically #302309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JakeRadMSFT wants to merge 1 commit into
base: main
Choose a base branch
from
Open

WIP - Allow installPluginFromSource command to accept source and sha programmatically #302309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/vs/workbench/contrib/chat/browser/actions/chatPluginActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ class InstallFromSourceAction extends Action2 {
});
}

async run(accessor: ServicesAccessor): Promise<void> {
async run(accessor: ServicesAccessor, args?: { source?: string; sha?: string }): Promise<void> {
const quickInputService = accessor.get(IQuickInputService);
const pluginInstallService = accessor.get(IPluginInstallService);

const source = await quickInputService.input({
const source = args?.source ?? await quickInputService.input({
placeHolder: localize('pluginSourcePlaceholder', "owner/repo or git clone URL"),
prompt: localize('pluginSourcePrompt', "Enter a GitHub repository or git URL to install a plugin from"),
});
Expand All @@ -73,7 +73,7 @@ class InstallFromSourceAction extends Action2 {
return;
}

await pluginInstallService.installPluginFromSource(source.trim());
await pluginInstallService.installPluginFromSource(source.trim(), args?.sha);
Comment on lines 63 to +76
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/vs/workbench/contrib/chat/browser/pluginInstallService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export class PluginInstallService implements IPluginInstallService {
return this._installGitPlugin(plugin);
}

async installPluginFromSource(source: string): Promise<void> {
async installPluginFromSource(source: string, sha?: string): Promise<void> {
const reference = parseMarketplaceReference(source);
if (!reference) {
this._notificationService.notify({
Expand All @@ -75,8 +75,8 @@ export class PluginInstallService implements IPluginInstallService {

// Build a source descriptor for the git clone.
const sourceDescriptor = reference.kind === MarketplaceReferenceKind.GitHubShorthand
? { kind: PluginSourceKind.GitHub as const, repo: reference.githubRepo! }
: { kind: PluginSourceKind.GitUrl as const, url: reference.cloneUrl };
? { kind: PluginSourceKind.GitHub as const, repo: reference.githubRepo!, sha }
: { kind: PluginSourceKind.GitUrl as const, url: reference.cloneUrl, sha };

Comment on lines 58 to 80
// Build a temporary plugin object for the trust gate and clone step.
const tempPlugin: IMarketplacePlugin = {
Expand Down
5 changes: 4 additions & 1 deletion src/vs/workbench/contrib/chat/common/plugins/pluginInstallService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,11 @@ export interface IPluginInstallService {
* GitHub shorthand (`owner/repo`) or a full git clone URL. Clones the
* repository, reads marketplace metadata to discover plugins, and
* registers the selected plugin.
*
* @param source A GitHub shorthand (`owner/repo`) or full git clone URL.
* @param sha Optional commit SHA to pin the installation to a specific revision.
*/
installPluginFromSource(source: string): Promise<void>;
installPluginFromSource(source: string, sha?: string): Promise<void>;

/**
* Pulls the latest changes for an already-cloned marketplace repository.
Expand Down
Loading