Skip to content

Filter out global slash command suggestions for chatSession-contributed participants #290652

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

Merged
joshspicer merged 3 commits into from
Jan 27, 2026
Merged

Filter out global slash command suggestions for chatSession-contributed participants #290652

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
834eb34
fix https://github.com/microsoft/vscode/issues/288172
joshspicer Jan 27, 2026
7fb9df4
Update src/vs/workbench/contrib/chat/browser/widget/input/editor/chat…
joshspicer Jan 27, 2026
c8d39f4
fix
joshspicer Jan 27, 2026
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
13 changes: 11 additions & 2 deletions src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ import { IChatRequestVariableEntry } from '../../../../common/attachments/chatVa
import { IDynamicVariable } from '../../../../common/attachments/chatVariables.js';
import { ChatAgentLocation, ChatModeKind, isSupportedChatFileScheme } from '../../../../common/constants.js';
import { isToolSet } from '../../../../common/tools/languageModelToolsService.js';
import { IChatSessionsService } from '../../../../common/chatSessionsService.js';
import { IPromptsService } from '../../../../common/promptSyntax/service/promptsService.js';
import { ChatSubmitAction, IChatExecuteActionContext } from '../../../actions/chatExecuteActions.js';
import { IChatWidget, IChatWidgetService } from '../../../chat.js';
Expand Down Expand Up @@ -270,6 +271,7 @@ class AgentCompletions extends Disposable {
@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
@IChatAgentService private readonly chatAgentService: IChatAgentService,
@IChatAgentNameService private readonly chatAgentNameService: IChatAgentNameService,
@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
) {
super();

Expand Down Expand Up @@ -337,6 +339,11 @@ class AgentCompletions extends Disposable {
const agents = this.chatAgentService.getAgents()
.filter(a => a.locations.includes(widget.location));

// Filter out chatSessions contributions for slash command completions
const chatSessionContributions = this.chatSessionsService.getAllChatSessionContributions();
const chatSessionAgentIds = new Set(chatSessionContributions.map(contribution => contribution.type));
const agentsForSlashCommands = agents.filter(a => !chatSessionAgentIds.has(a.id));

// When the input is only `/`, items are sorted by sortText.
// When typing, filterText is used to score and sort.
// The same list is refiltered/ranked while typing.
Expand Down Expand Up @@ -369,7 +376,7 @@ class AgentCompletions extends Disposable {

return {
suggestions: justAgents.concat(
coalesce(agents.flatMap(agent => agent.slashCommands.map((c, i) => {
coalesce(agentsForSlashCommands.flatMap(agent => agent.slashCommands.map((c, i) => {
if (agent.isDefault && this.chatAgentService.getDefaultAgent(widget.location, widget.input.currentModeKind)?.id !== agent.id) {
return;
}
Expand Down Expand Up @@ -429,7 +436,9 @@ class AgentCompletions extends Disposable {
}

const agents = this.chatAgentService.getAgents()
.filter(a => a.locations.includes(widget.location) && a.modes.includes(widget.input.currentModeKind));
.filter(a => a.locations.includes(widget.location) && a.modes.includes(widget.input.currentModeKind))
// Filter out chatSessions contributions for slash command completions
.filter(a => !this.chatSessionsService.getChatSessionContribution(a.id));

return {
suggestions: coalesce(agents.flatMap(agent => agent.slashCommands.map((c, i) => {
Expand Down
Loading