diff --git a/packages/cli/src/acp-integration/session/Session.test.ts b/packages/cli/src/acp-integration/session/Session.test.ts index 2af66114f9c..488897efdf2 100644 --- a/packages/cli/src/acp-integration/session/Session.test.ts +++ b/packages/cli/src/acp-integration/session/Session.test.ts @@ -7399,6 +7399,32 @@ describe('Session', () => { } }); + it('injects MCP server context for @mcp mentions', async () => { + mockConfig.getMcpServers = vi.fn().mockReturnValue({ demo: {} }); + mockConfig.getPromptRegistry = vi.fn().mockReturnValue({ + getPromptsByServer: (name: string) => (name === 'demo' ? ['p'] : []), + }); + mockConfig.getResourceRegistry = vi.fn().mockReturnValue({ + getResourcesByServer: (name: string) => + name === 'demo' ? [{ uri: 'res://1' }] : [], + }); + mockChat.sendMessageStream = vi + .fn() + .mockResolvedValue(createEmptyStream()); + + await session.prompt({ + sessionId: 'test-session-id', + prompt: [{ type: 'text', text: 'Use @mcp:demo now' }], + }); + + const message = firstSentMessage(); + expect(message[0]).toEqual({ text: 'Use @mcp:demo now' }); + const sentText = textParts(message).join('\n'); + expect(sentText).toContain('--- MCP Server: demo ---'); + expect(sentText).toContain('- Resources: 1'); + expect(sentText).toContain('- Prompts: 1'); + }); + it('dedupes repeated extension mentions and skips unknown mentions', async () => { const extension = makeExtension(); mockConfig.getActiveExtensions = vi.fn().mockReturnValue([extension]); diff --git a/packages/cli/src/acp-integration/session/Session.ts b/packages/cli/src/acp-integration/session/Session.ts index 1f887c606f1..3c6cddfc9f7 100644 --- a/packages/cli/src/acp-integration/session/Session.ts +++ b/packages/cli/src/acp-integration/session/Session.ts @@ -177,6 +177,11 @@ import { matchExtensionByRef, parseExtensionRef, } from '../../utils/extension-mention.js'; +import { + buildMcpServerContextText, + matchMcpServerByRef, + parseMcpServerRef, +} from '../../utils/mcp-server-mention.js'; // Import modular session components import type { @@ -686,6 +691,20 @@ function collectExtensionMentionRefs( } } +function collectMcpServerMentionRefs( + text: string, + mentions: Map, +): void { + for (const match of text.matchAll(AT_TOKEN_RE)) { + const pathName = match[1]; + if (!pathName) continue; + const ref = parseMcpServerRef(pathName); + if (ref) { + mentions.set(ref.name.toLowerCase(), ref.name); + } + } +} + export interface AvailableCommandsSnapshot { availableCommands: AvailableCommand[]; availableSkills?: string[]; @@ -5373,6 +5392,7 @@ export class Session implements SessionContext { const embeddedContext: EmbeddedResourceResource[] = []; const extensionMentions = new Map(); + const mcpServerMentions = new Map(); const preserveUnsupportedImageForBridge = shouldRunVisionBridge( this.config, ); @@ -5381,6 +5401,7 @@ export class Session implements SessionContext { switch (part.type) { case 'text': collectExtensionMentionRefs(part.text, extensionMentions); + collectMcpServerMentionRefs(part.text, mcpServerMentions); return { text: part.text }; case 'image': if (preserveUnsupportedImageForBridge) { @@ -5433,18 +5454,21 @@ export class Session implements SessionContext { extensionMentions, abortSignal, ); + const mcpServerParts = + this.#resolveMcpServerMentionParts(mcpServerMentions); if ( atPathCommandParts.length === 0 && embeddedContext.length === 0 && - extensionParts.length === 0 + extensionParts.length === 0 && + mcpServerParts.length === 0 ) { return this.#applyVisionBridgeIfNeeded(parts, abortSignal); } if (atPathCommandParts.length === 0 && embeddedContext.length === 0) { return this.#applyVisionBridgeIfNeeded( - [...parts, ...extensionParts], + [...parts, ...extensionParts, ...mcpServerParts], abortSignal, ); } @@ -5493,6 +5517,7 @@ export class Session implements SessionContext { // Add initial query text first processedQueryParts.push({ text: initialQueryText }); processedQueryParts.push(...extensionParts); + processedQueryParts.push(...mcpServerParts); // Then add content parts (preserving binary files as inlineData) for (const part of contentParts) { @@ -5507,6 +5532,7 @@ export class Session implements SessionContext { } else { processedQueryParts.push({ text: initialQueryText.trim() }); processedQueryParts.push(...extensionParts); + processedQueryParts.push(...mcpServerParts); } // Process embedded context from resource blocks @@ -5650,6 +5676,30 @@ export class Session implements SessionContext { return extensionParts; } + #resolveMcpServerMentionParts( + mcpServerMentions: Map, + ): Part[] { + if (mcpServerMentions.size === 0) return []; + const servers = this.config.getMcpServers?.() ?? {}; + if (Object.keys(servers).length === 0) return []; + + const parts: Part[] = []; + for (const name of mcpServerMentions.values()) { + const matched = matchMcpServerByRef(name, servers); + if (!matched) { + this.debug( + `MCP server "${name}" not found among configured MCP servers. ` + + `Available: ${Object.keys(servers).join(', ') || '(none)'}`, + ); + continue; + } + parts.push({ + text: buildMcpServerContextText(this.config, matched.serverName), + }); + } + return parts; + } + debug(msg: string): void { if (this.config.getDebugMode()) { debugLogger.warn(msg); diff --git a/packages/cli/src/i18n/locales/en.js b/packages/cli/src/i18n/locales/en.js index 4878297dba5..dd5025fc5ad 100644 --- a/packages/cli/src/i18n/locales/en.js +++ b/packages/cli/src/i18n/locales/en.js @@ -1390,6 +1390,7 @@ export default { 'Size:': 'Size:', '{{count}} bytes': '{{count}} bytes', 'Reference in chat': 'Reference in chat', + 'MCP server': 'MCP server', 'MCP resource server': 'MCP resource server', // Invalid tool related translations diff --git a/packages/cli/src/i18n/locales/zh-TW.js b/packages/cli/src/i18n/locales/zh-TW.js index 18c1d42f59f..d3fbe18724b 100644 --- a/packages/cli/src/i18n/locales/zh-TW.js +++ b/packages/cli/src/i18n/locales/zh-TW.js @@ -1225,6 +1225,7 @@ export default { 'Size:': '大小:', '{{count}} bytes': '{{count}} 位元組', 'Reference in chat': '在對話中引用', + 'MCP server': 'MCP 伺服器', 'MCP resource server': 'MCP 資源伺服器', '{{count}} invalid tools': '{{count}} 個無效工具', invalid: '無效', diff --git a/packages/cli/src/i18n/locales/zh.js b/packages/cli/src/i18n/locales/zh.js index d2915433d30..b3096fdef74 100644 --- a/packages/cli/src/i18n/locales/zh.js +++ b/packages/cli/src/i18n/locales/zh.js @@ -1330,6 +1330,7 @@ export default { 'Size:': '大小:', '{{count}} bytes': '{{count}} 字节', 'Reference in chat': '在对话中引用', + 'MCP server': 'MCP 服务器', 'MCP resource server': 'MCP 资源服务器', // Invalid tool related translations diff --git a/packages/cli/src/ui/hooks/atCommandProcessor.test.ts b/packages/cli/src/ui/hooks/atCommandProcessor.test.ts index a8ab13cebb0..4ead67f5a81 100644 --- a/packages/cli/src/ui/hooks/atCommandProcessor.test.ts +++ b/packages/cli/src/ui/hooks/atCommandProcessor.test.ts @@ -67,6 +67,9 @@ describe('handleAtCommand', () => { getPromptRegistry: () => ({ getPromptsByServer: () => [], }), + getResourceRegistry: () => ({ + getResourcesByServer: () => [], + }), getDebugMode: () => false, getFileExclusions: () => ({ getCoreIgnorePatterns: () => COMMON_IGNORE_PATTERNS, @@ -264,6 +267,36 @@ describe('handleAtCommand', () => { ); }); + it('should inject MCP server context for @mcp mentions', async () => { + mockConfig = { + ...mockConfig, + getMcpServers: () => ({ demo: {} }), + getPromptRegistry: () => ({ + getPromptsByServer: (name: string) => (name === 'demo' ? ['p'] : []), + }), + getResourceRegistry: () => ({ + getResourcesByServer: (name: string) => + name === 'demo' ? [{ uri: 'res://1' }] : [], + }), + } as unknown as Config; + + const result = await handleAtCommand({ + query: 'Use @mcp:demo now', + config: mockConfig, + onDebugMessage: mockOnDebugMessage, + messageId: 128, + signal: abortController.signal, + }); + + expect(result.shouldProceed).toBe(true); + expect(result.processedQuery).toEqual([ + { text: 'Use @mcp:demo now' }, + { + text: expect.stringContaining('--- MCP Server: demo ---'), + }, + ]); + }); + it('should handle query with text before and after @command', async () => { const fileContent = 'Markdown content.'; const filePath = await createTestFile( @@ -1315,6 +1348,34 @@ describe('handleAtCommand', () => { expect(result.filesRead).toContain('myserver:res://doc'); }); + it('preserves @mcp: as a resource ref when a server is named mcp', async () => { + const readMcpResource = vi.fn().mockResolvedValue({ + contents: [{ uri: 'res://doc', text: 'RESOURCE BODY' }], + }); + const config = { + ...mockConfig, + getMcpServers: () => ({ mcp: {}, demo: {} }), + getToolRegistry: () => ({ readMcpResource }), + } as unknown as Config; + + const result = await handleAtCommand({ + query: 'Use @mcp:res://doc now', + config, + onDebugMessage: mockOnDebugMessage, + messageId: 606, + signal: abortController.signal, + }); + + expect(readMcpResource).toHaveBeenCalledWith('mcp', 'res://doc', { + signal: abortController.signal, + }); + const parts = result.processedQuery as Array<{ text?: string }>; + const text = parts.map((part) => part.text ?? '').join('\n'); + expect(text).toContain('Use @mcp:res://doc now'); + expect(text).toContain('RESOURCE BODY'); + expect(text).not.toContain('--- MCP Server: demo ---'); + }); + it('injects both a @file and a @server:uri resource, surfacing both tool cards', async () => { const fileContent = 'FILE BODY'; const filePath = await createTestFile( diff --git a/packages/cli/src/ui/hooks/atCommandProcessor.ts b/packages/cli/src/ui/hooks/atCommandProcessor.ts index de27e3dbc1c..88f3b8123f2 100644 --- a/packages/cli/src/ui/hooks/atCommandProcessor.ts +++ b/packages/cli/src/ui/hooks/atCommandProcessor.ts @@ -37,6 +37,12 @@ import { EXTENSION_CONTEXT_BUDGET, getExtensionDisplayName, } from '../../utils/extension-mention.js'; +import { + buildMcpServerContextText, + buildMcpServerRef, + matchMcpServerByRef, + parseMcpServerRef, +} from '../../utils/mcp-server-mention.js'; export interface ResolveAtCommandParams { query: string; @@ -214,6 +220,10 @@ export async function resolveAtCommandQuery({ serverName: string; uri: string; }> = []; + const mcpServerMentions: Array<{ + originalAtPath: string; + serverName: string; + }> = []; // Extension references (`@ext:`) collected during the loop. const activeExtensions = config.getActiveExtensions?.() ?? []; @@ -268,6 +278,34 @@ export async function resolveAtCommandQuery({ continue; } + const mcpServerRef = parseMcpServerRef(pathName); + if (mcpServerRef) { + const matched = matchMcpServerByRef( + mcpServerRef.name, + config.getMcpServers() || {}, + ); + if (matched) { + if ( + !mcpServerMentions.some((m) => m.serverName === matched.serverName) + ) { + mcpServerMentions.push({ + originalAtPath, + serverName: matched.serverName, + }); + } + atPathToResolvedSpecMap.set( + originalAtPath, + buildMcpServerRef(matched.serverName), + ); + continue; + } + onDebugMessage( + `MCP server "${mcpServerRef.name}" not found among configured MCP servers. ` + + `Available: ${Object.keys(config.getMcpServers() || {}).join(', ') || '(none)'}`, + ); + continue; + } + // Check if path should be ignored based on filtering options const workspaceContext = config.getWorkspaceContext(); @@ -487,6 +525,7 @@ export async function resolveAtCommandQuery({ if ( pathSpecsToRead.length === 0 && mcpResourceRefs.length === 0 && + mcpServerMentions.length === 0 && extensionMentions.length === 0 ) { onDebugMessage('No valid file paths found in @ commands to read.'); @@ -511,11 +550,14 @@ export async function resolveAtCommandQuery({ // Aggregate cap across all extensions to prevent unbounded context injection. let extensionContextBudgetRemaining = EXTENSION_CONTEXT_BUDGET; - const extensionParts: Part[] = []; - const extensionDisplays: IndividualToolCallDisplay[] = []; - const extensionLabels: string[] = []; + const scopedMentionEntries: Array<{ + originalAtPath: string; + part: Part; + label: string; + display: IndividualToolCallDisplay; + }> = []; for (let i = 0; i < extensionMentions.length; i++) { - const { extension } = extensionMentions[i]; + const { originalAtPath, extension } = extensionMentions[i]; const displayName = getExtensionDisplayName(extension); const callId = `client-extension-${userMessageTimestamp}-${i}`; @@ -526,18 +568,52 @@ export async function resolveAtCommandQuery({ }); extensionContextBudgetRemaining = context.remainingBudget; - extensionParts.push({ text: context.text }); - extensionLabels.push(buildExtensionRef(extension.name)); - extensionDisplays.push({ - callId, - name: 'Activate Extension', - description: `Activated extension ${displayName}`, - status: ToolCallStatus.Success, - resultDisplay: undefined, - confirmationDetails: undefined, + scopedMentionEntries.push({ + originalAtPath, + part: { text: context.text }, + label: buildExtensionRef(extension.name), + display: { + callId, + name: 'Activate Extension', + description: `Activated extension ${displayName}`, + status: ToolCallStatus.Success, + resultDisplay: undefined, + confirmationDetails: undefined, + }, }); } + for (let i = 0; i < mcpServerMentions.length; i++) { + const { originalAtPath, serverName } = mcpServerMentions[i]; + scopedMentionEntries.push({ + originalAtPath, + part: { text: buildMcpServerContextText(config, serverName) }, + label: buildMcpServerRef(serverName), + display: { + callId: `client-mcp-server-${userMessageTimestamp}-${i}`, + name: 'Activate MCP Server', + description: `Activated MCP server ${serverName}`, + status: ToolCallStatus.Success, + resultDisplay: undefined, + confirmationDetails: undefined, + }, + }); + } + + const scopedMentionOrder = new Map( + atPathCommandParts.map((part, index) => [part.content, index]), + ); + scopedMentionEntries.sort( + (a, b) => + (scopedMentionOrder.get(a.originalAtPath) ?? Number.MAX_SAFE_INTEGER) - + (scopedMentionOrder.get(b.originalAtPath) ?? Number.MAX_SAFE_INTEGER), + ); + const scopedMentionParts = scopedMentionEntries.map((entry) => entry.part); + const scopedMentionLabels = scopedMentionEntries.map((entry) => entry.label); + const scopedMentionDisplays = scopedMentionEntries.map( + (entry) => entry.display, + ); + // Read files (if any). A hard read error aborts the turn, as before — but // any extension/resource tool-cards already gathered are still surfaced. const fileParts: Part[] = []; @@ -588,7 +664,7 @@ export async function resolveAtCommandQuery({ ? errorToolCallDisplay.resultDisplay : undefined; const labelsOnError = [ - ...extensionLabels, + ...scopedMentionLabels, ...contentLabelsForDisplay, ...resourceLabels, ]; @@ -596,7 +672,7 @@ export async function resolveAtCommandQuery({ processedQuery: null, shouldProceed: false, toolDisplays: [ - ...extensionDisplays, + ...scopedMentionDisplays, ...resourceDisplays, errorToolCallDisplay, ], @@ -617,12 +693,12 @@ export async function resolveAtCommandQuery({ // positional alignment, so grouping is safe. const processedQueryParts: PartListUnion = [ { text: initialQueryText }, - ...extensionParts, + ...scopedMentionParts, ...fileParts, ...resourceParts, ]; const allLabels = [ - ...extensionLabels, + ...scopedMentionLabels, ...contentLabelsForDisplay, ...resourceLabels, ]; @@ -630,7 +706,11 @@ export async function resolveAtCommandQuery({ return { processedQuery: processedQueryParts, shouldProceed: true, - toolDisplays: [...extensionDisplays, ...fileDisplays, ...resourceDisplays], + toolDisplays: [ + ...scopedMentionDisplays, + ...fileDisplays, + ...resourceDisplays, + ], filesRead: allLabels, recording: { filesRead: allLabels, diff --git a/packages/cli/src/ui/hooks/useAtCompletion.test.ts b/packages/cli/src/ui/hooks/useAtCompletion.test.ts index 407b5f1e080..e32ce4229af 100644 --- a/packages/cli/src/ui/hooks/useAtCompletion.test.ts +++ b/packages/cli/src/ui/hooks/useAtCompletion.test.ts @@ -857,6 +857,35 @@ describe('useAtCompletion', () => { }); }); + describe('MCP server mention completion', () => { + it('suggests @mcp: mentions for @mcp: queries', async () => { + testRootDir = await createTmpDir({ 'file.txt': '' }); + const resourceConfig = { + ...mockConfig, + getMcpServers: () => ({ demo: {}, other: {} }), + } as unknown as Config; + + const { result } = renderHook(() => + useTestHarnessForAtCompletion( + true, + 'mcp:de', + resourceConfig, + testRootDir, + ), + ); + + await waitFor(() => { + expect(result.current.suggestions.length).toBeGreaterThan(0); + }); + expect(result.current.suggestions.map((s) => s.value)).toContain( + 'mcp:demo', + ); + expect(result.current.suggestions.map((s) => s.value)).not.toContain( + 'demo:', + ); + }); + }); + describe('MCP server discovery', () => { it('suggests matching servers (with resources) alongside files for a bare @', async () => { testRootDir = await createTmpDir({ 'my-notes.txt': '' }); @@ -879,18 +908,20 @@ describe('useAtCompletion', () => { expect(result.current.suggestions.length).toBeGreaterThan(0); }); const values = result.current.suggestions.map((s) => s.value); - // Server entry is prepended (before files) and expands to `@myserver:`. - expect(values[0]).toBe('myserver:'); + expect(values[0]).toBe('mcp:myserver'); + expect(values).toContain('myserver:'); expect(values).toContain('my-notes.txt'); + const mentionSug = result.current.suggestions.find( + (s) => s.value === 'mcp:myserver', + ); + expect(mentionSug?.isDirectory).toBe(false); const serverSug = result.current.suggestions.find( (s) => s.value === 'myserver:', ); - // `isDirectory` => no trailing space => completion re-triggers into the - // resource list once `@myserver:` is inserted. expect(serverSug?.isDirectory).toBe(true); }); - it('does not suggest servers for the empty @ trigger (files only)', async () => { + it('suggests MCP mentions for the empty @ trigger alongside files', async () => { testRootDir = await createTmpDir({ 'file.txt': '' }); const resourceConfig = { ...mockConfig, @@ -911,6 +942,7 @@ describe('useAtCompletion', () => { }); const values = result.current.suggestions.map((s) => s.value); expect(values).toContain('file.txt'); + expect(values).toContain('mcp:myserver'); expect(values).not.toContain('myserver:'); }); diff --git a/packages/cli/src/ui/hooks/useAtCompletion.ts b/packages/cli/src/ui/hooks/useAtCompletion.ts index ee27af90919..ce9d3b49118 100644 --- a/packages/cli/src/ui/hooks/useAtCompletion.ts +++ b/packages/cli/src/ui/hooks/useAtCompletion.ts @@ -11,6 +11,7 @@ import type { Suggestion } from '../components/SuggestionsDisplay.js'; import { MAX_SUGGESTIONS_TO_SHOW } from '../components/SuggestionsDisplay.js'; import { matchMcpServerPrefix, buildMcpResourceRef } from './mcpResourceRef.js'; import { getExtensionSuggestions } from './extension-mention-ref.js'; +import { buildMcpServerRef } from '../../utils/mcp-server-mention.js'; import { t } from '../../i18n/index.js'; /** @@ -140,23 +141,38 @@ function getGlobalMcpResourceSuggestions( } /** - * `@` MCP server discovery. BEFORE any `:` has been typed, - * surface configured MCP servers that (a) expose at least one resource and - * (b) whose name starts (case-insensitively) with the partial, so a user who - * doesn't know a resource URI can drill in without first memorizing the exact - * server name. - * - * Returns `[]` (never `null`): these are PREPENDED to the filesystem results - * rather than replacing them, so typing `@` never hides files. The - * bare `@` trigger (empty partial) is intentionally left as a files-only view - * — both to keep the common case unchanged and because every name - * `.startsWith('')`, so an empty partial would otherwise match every server. - * - * Each suggestion expands to `@:` and is flagged `isDirectory` so - * `handleAutocomplete` appends no trailing space, letting completion re-trigger - * straight into that server's resource list (the `getMcpResourceSuggestions` - * path above). + * `@mcp:` mention suggestions. Bare `@` stays files-only; otherwise + * these are prepended beside file/resource matches without replacing them. */ +function getMcpServerMentionSuggestions( + config: Config | undefined, + pattern: string, +): Suggestion[] { + if (!config) return []; + if (config.isTrustedFolder?.() === false) return []; + const mcpServers = config.getMcpServers?.() || {}; + const query = pattern.startsWith('mcp:') + ? pattern.slice('mcp:'.length).toLowerCase() + : pattern.toLowerCase(); + return Object.keys(mcpServers) + .filter((name) => name.toLowerCase().includes(query)) + .sort((a, b) => { + const aLower = a.toLowerCase(); + const bLower = b.toLowerCase(); + const aPrefix = aLower.startsWith(query) ? 0 : 1; + const bPrefix = bLower.startsWith(query) ? 0 : 1; + if (aPrefix !== bPrefix) return aPrefix - bPrefix; + return aLower.localeCompare(bLower); + }) + .map((name) => ({ + label: buildMcpServerRef(name), + value: buildMcpServerRef(name), + description: t('MCP server'), + isDirectory: false, + })) + .slice(0, MAX_SUGGESTIONS_TO_SHOW); +} + function getMcpServerSuggestions( config: Config | undefined, pattern: string, @@ -411,6 +427,10 @@ export function useAtCompletion(props: UseAtCompletionProps): void { // drill in without knowing a URI) AND resources matched globally by // URI/name across all servers. Both computed synchronously and prepended // below. + const mcpServerMentionSuggestions = getMcpServerMentionSuggestions( + config, + state.pattern, + ); const serverSuggestions = getMcpServerSuggestions(config, state.pattern); const globalResourceSuggestions = getGlobalMcpResourceSuggestions( config, @@ -418,6 +438,7 @@ export function useAtCompletion(props: UseAtCompletionProps): void { ); const mcpSuggestions = [ ...extensionSuggestions, + ...mcpServerMentionSuggestions, ...serverSuggestions, ...globalResourceSuggestions, ]; diff --git a/packages/cli/src/utils/mcp-server-mention.ts b/packages/cli/src/utils/mcp-server-mention.ts new file mode 100644 index 00000000000..4cd7c43b69c --- /dev/null +++ b/packages/cli/src/utils/mcp-server-mention.ts @@ -0,0 +1,63 @@ +/** + * @license + * Copyright 2025 Qwen + * SPDX-License-Identifier: Apache-2.0 + */ + +import type { Config, MCPServerConfig } from '@qwen-code/qwen-code-core'; + +export const MCP_SERVER_REF_PREFIX = 'mcp:'; + +export function parseMcpServerRef(pathName: string): { name: string } | null { + if (!pathName.startsWith(MCP_SERVER_REF_PREFIX)) return null; + const name = pathName.slice(MCP_SERVER_REF_PREFIX.length); + if (!name) return null; + return { name }; +} + +export function buildMcpServerRef(serverName: string): string { + return `${MCP_SERVER_REF_PREFIX}${serverName}`; +} + +export function matchMcpServerByRef( + name: string, + servers: Record, +): { serverName: string; server: MCPServerConfig } | undefined { + const lower = name.toLowerCase(); + const matchedName = Object.keys(servers).find( + (serverName) => serverName.toLowerCase() === lower, + ); + if (!matchedName) return undefined; + return { serverName: matchedName, server: servers[matchedName]! }; +} + +export function buildMcpServerContextText( + config: Config, + serverName: string, +): string { + const lines = [ + `--- MCP Server: ${serverName} ---`, + `The user explicitly mentioned this MCP server. Prefer using tools and resources from this server when relevant for this turn. This is advisory context, not a hard restriction.`, + ]; + + const prompts = + config.getPromptRegistry?.()?.getPromptsByServer(serverName) ?? []; + const resources = + config.getResourceRegistry?.()?.getResourcesByServer(serverName) ?? []; + + const details: string[] = []; + if (resources.length > 0) { + details.push(`- Resources: ${resources.length}`); + } + if (prompts.length > 0) { + details.push(`- Prompts: ${prompts.length}`); + } + + if (details.length > 0) { + lines.push('Available capabilities from this MCP server:'); + lines.push(...details); + } + + lines.push(`--- End MCP Server: ${serverName} ---`); + return lines.join('\n'); +} diff --git a/packages/web-shell/client/assets/icons/at-extension.svg b/packages/web-shell/client/assets/icons/at-extension.svg new file mode 100644 index 00000000000..2f88e163a7e --- /dev/null +++ b/packages/web-shell/client/assets/icons/at-extension.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/packages/web-shell/client/assets/icons/at-file.svg b/packages/web-shell/client/assets/icons/at-file.svg new file mode 100644 index 00000000000..8aae14a36c5 --- /dev/null +++ b/packages/web-shell/client/assets/icons/at-file.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/web-shell/client/assets/icons/at-mcp.svg b/packages/web-shell/client/assets/icons/at-mcp.svg new file mode 100644 index 00000000000..b0602f9e7b7 --- /dev/null +++ b/packages/web-shell/client/assets/icons/at-mcp.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/web-shell/client/assets/icons/at-skill.svg b/packages/web-shell/client/assets/icons/at-skill.svg new file mode 100644 index 00000000000..26c0ab22708 --- /dev/null +++ b/packages/web-shell/client/assets/icons/at-skill.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/web-shell/client/completions/atCompletion.test.ts b/packages/web-shell/client/completions/atCompletion.test.ts index f2aa747d2d0..6b411fe564e 100644 --- a/packages/web-shell/client/completions/atCompletion.test.ts +++ b/packages/web-shell/client/completions/atCompletion.test.ts @@ -5,6 +5,7 @@ import { atCompletionSource, type ExtensionCompletionEntry, type GlobFn, + type McpServerCompletionEntry, } from './atCompletion'; const extensions: ExtensionCompletionEntry[] = [ @@ -27,6 +28,17 @@ const extensions: ExtensionCompletionEntry[] = [ }, ]; +const mcpServers: McpServerCompletionEntry[] = [ + { + name: 'dataworks', + description: 'DataWorks MCP', + }, + { + name: 'clickhouse', + description: 'ClickHouse MCP', + }, +]; + function context(doc: string): CompletionContext { return new CompletionContext(EditorState.create({ doc }), doc.length, true); } @@ -41,19 +53,22 @@ describe('atCompletionSource', () => { context('@'), () => glob, () => async () => ({ extensions }), + () => async () => ({ servers: mcpServers }), ); expect(result?.from).toBe(0); expect(result?.options.map((option) => option.label)).toEqual([ - '@ext:browser', - '@ext:review-tools', - '@README.md', - '@src/index.ts', + 'browser', + 'review-tools', + 'README.md', + 'src/index.ts', + 'clickhouse', + 'dataworks', ]); expect(glob).toHaveBeenCalledWith('**/*', { maxResults: 50 }); }); - it('filters extensions and files by partial input', async () => { + it('filters extensions, MCP servers, and files by partial input', async () => { const glob = vi.fn().mockResolvedValue({ matches: ['browser-test.ts'], }); @@ -62,11 +77,18 @@ describe('atCompletionSource', () => { context('@bro'), () => glob, () => async () => ({ extensions }), + () => async () => ({ + servers: [ + ...mcpServers, + { name: 'browser-mcp', description: 'Browser MCP' }, + ], + }), ); expect(result?.options.map((option) => option.label)).toEqual([ - '@ext:browser', - '@browser-test.ts', + 'browser', + 'browser-test.ts', + 'browser-mcp', ]); expect(glob).toHaveBeenCalledWith('bro*', { maxResults: 50 }); }); @@ -83,7 +105,7 @@ describe('atCompletionSource', () => { ); expect(result?.options.map((option) => option.label)).toEqual([ - '@ext:review-tools', + 'review-tools', ]); expect(result?.options[0]?.apply).toBe('@ext:review-tools '); expect(glob).not.toHaveBeenCalled(); @@ -103,7 +125,7 @@ describe('atCompletionSource', () => { ); expect(result?.options.map((option) => option.label)).toEqual([ - '@README.md', + 'README.md', ]); }); }); diff --git a/packages/web-shell/client/completions/atCompletion.ts b/packages/web-shell/client/completions/atCompletion.ts index 697b9384014..7060acd4970 100644 --- a/packages/web-shell/client/completions/atCompletion.ts +++ b/packages/web-shell/client/completions/atCompletion.ts @@ -1,6 +1,8 @@ import type { + Completion, CompletionContext, CompletionResult, + CompletionSection, } from '@codemirror/autocomplete'; export type GlobFn = ( @@ -15,23 +17,67 @@ export interface ExtensionCompletionEntry { isActive: boolean; } +export interface McpServerCompletionEntry { + name: string; + description?: string; +} + +export interface AtReferenceCompletion extends Completion { + atReferenceKind?: 'extension' | 'mcp' | 'file'; + atReferenceLabel?: string; + atReferenceValue?: string; +} + export type LoadExtensionsFn = () => Promise<{ extensions: ExtensionCompletionEntry[]; }>; +export type LoadMcpServersFn = () => Promise<{ + servers: McpServerCompletionEntry[]; +}>; + +export interface AtCompletionSectionLabels { + extensions: string; + mcpServers: string; + files: string; +} + +function createSection(name: string, rank: number): CompletionSection { + return { name, rank }; +} + export function createAtCompletionSource( getGlob: () => GlobFn | undefined, getLoadExtensions: () => LoadExtensionsFn | undefined = () => undefined, + getLoadMcpServers: () => LoadMcpServersFn | undefined = () => undefined, + sectionLabels: AtCompletionSectionLabels = { + extensions: 'Extensions', + mcpServers: 'MCP Servers', + files: 'Files', + }, ): ( context: CompletionContext, ) => CompletionResult | null | Promise { - return (context) => atCompletionSource(context, getGlob, getLoadExtensions); + return (context) => + atCompletionSource( + context, + getGlob, + getLoadExtensions, + getLoadMcpServers, + sectionLabels, + ); } export function atCompletionSource( context: CompletionContext, getGlob: () => GlobFn | undefined, getLoadExtensions: () => LoadExtensionsFn | undefined = () => undefined, + getLoadMcpServers: () => LoadMcpServersFn | undefined = () => undefined, + sectionLabels: AtCompletionSectionLabels = { + extensions: 'Extensions', + mcpServers: 'MCP Servers', + files: 'Files', + }, ): CompletionResult | null | Promise { const line = context.state.doc.lineAt(context.pos); const textBefore = line.text.slice(0, context.pos - line.from); @@ -42,32 +88,70 @@ export function atCompletionSource( const prefix = match[1]; const atPos = context.pos - match[0].length; const extensionOnly = prefix.startsWith('ext:'); + const mcpOnly = prefix.startsWith('mcp:'); const extensionQuery = extensionOnly ? prefix.slice('ext:'.length) : prefix; - const glob = extensionOnly ? undefined : getGlob(); + const mcpQuery = mcpOnly ? prefix.slice('mcp:'.length) : prefix; + const glob = extensionOnly || mcpOnly ? undefined : getGlob(); const loadExtensions = getLoadExtensions(); + const loadMcpServers = getLoadMcpServers(); return Promise.all([ fetchExtensions(extensionQuery, loadExtensions), + fetchMcpServers(mcpQuery, loadMcpServers), glob ? fetchFiles(prefix, glob) : Promise.resolve([]), - ]).then(([extensions, files]) => { - if (extensions.length === 0 && files.length === 0) return null; + ]).then(([extensions, mcpServers, files]) => { + if ( + extensions.length === 0 && + mcpServers.length === 0 && + files.length === 0 + ) + return null; + const sections = { + extensions: createSection(sectionLabels.extensions, 0), + files: createSection(sectionLabels.files, 1), + mcpServers: createSection(sectionLabels.mcpServers, 2), + }; + return { from: atPos, options: [ - ...extensions.map((ext) => ({ - label: `@ext:${ext.name}`, - apply: `@ext:${ext.name} `, - detail: extensionDetail(ext), - type: 'keyword', - section: 'Extensions', - boost: 20, - })), - ...files.map((f) => ({ - label: `@${f}`, - apply: `@${f} `, - type: 'file', - section: 'Files', - })), + ...extensions.map( + (ext) => + ({ + label: ext.name, + apply: `@ext:${ext.name} `, + detail: extensionDetail(ext), + type: 'keyword', + section: sections.extensions, + boost: 20, + atReferenceKind: 'extension', + atReferenceValue: ext.name, + }) satisfies AtReferenceCompletion, + ), + ...files.map( + (f) => + ({ + label: f, + apply: `@${f} `, + type: 'file', + section: sections.files, + atReferenceKind: 'file', + atReferenceValue: f, + }) satisfies AtReferenceCompletion, + ), + ...mcpServers.map( + (server) => + ({ + label: server.name, + apply: `@mcp:${server.name} `, + detail: server.description, + type: 'keyword', + section: sections.mcpServers, + boost: 18, + atReferenceKind: 'mcp', + atReferenceValue: server.name, + }) satisfies AtReferenceCompletion, + ), ], filter: false, }; @@ -84,6 +168,34 @@ async function fetchFiles(prefix: string, glob: GlobFn): Promise { } } +async function fetchMcpServers( + query: string, + loadMcpServers: LoadMcpServersFn | undefined, +): Promise { + if (!loadMcpServers) return []; + try { + const status = await loadMcpServers(); + const lowerQuery = query.toLowerCase(); + return status.servers + .map((server) => ({ + ...server, + description: sanitizeDisplayText(server.description ?? '') ?? undefined, + })) + .filter((server) => server.name.toLowerCase().includes(lowerQuery)) + .sort((a, b) => { + const aLabel = a.name.toLowerCase(); + const bLabel = b.name.toLowerCase(); + const aPrefix = aLabel.startsWith(lowerQuery) ? 0 : 1; + const bPrefix = bLabel.startsWith(lowerQuery) ? 0 : 1; + if (aPrefix !== bPrefix) return aPrefix - bPrefix; + return aLabel.localeCompare(bLabel); + }) + .slice(0, 50); + } catch { + return []; + } +} + async function fetchExtensions( query: string, loadExtensions: LoadExtensionsFn | undefined, diff --git a/packages/web-shell/client/components/ChatEditor.module.css b/packages/web-shell/client/components/ChatEditor.module.css index 0891125d391..70320147b02 100644 --- a/packages/web-shell/client/components/ChatEditor.module.css +++ b/packages/web-shell/client/components/ChatEditor.module.css @@ -391,6 +391,22 @@ line-height: 1.2; } +.tagLabel, +.tagValue { + color: var(--chat-editor-text-primary); +} + +.tagIcon { + display: block; + width: 12px; + height: 12px; + flex: 0 0 auto; + margin-left: 7px; + background: currentColor; + mask: var(--composer-tag-icon-url) center / contain no-repeat; + -webkit-mask: var(--composer-tag-icon-url) center / contain no-repeat; +} + .tagLabel, .tagValue { min-width: 0; @@ -404,10 +420,15 @@ color: var(--chat-editor-accent-color); } +.tagIcon + .tagLabel { + padding-left: 0.5ch; +} + .tagValue { max-width: 32ch; padding: 3px 0 3px 0.5ch; - color: var(--chat-editor-text-secondary); + color: var(--foreground, #e4e4e4); + opacity: 1; } .tagRemove { diff --git a/packages/web-shell/client/components/ChatEditor.tsx b/packages/web-shell/client/components/ChatEditor.tsx index 6fa6d13b1de..132ce4e567f 100644 --- a/packages/web-shell/client/components/ChatEditor.tsx +++ b/packages/web-shell/client/components/ChatEditor.tsx @@ -30,6 +30,8 @@ import { getComposerTagLabel, getComposerTagValue, } from '../hooks/useComposerCore'; +import { cssUrlVar } from '../utils/cssUrlVar'; +import { getComposerTagIconUrl } from './composerTagIcons'; import { ModeIcon } from './ModeIcon'; import { getModelDisplayName } from '../utils/modelDisplay'; import { VoiceButton } from '../voice/VoiceButton'; @@ -1240,13 +1242,22 @@ export const ChatEditor = memo( } = core.searchState; const renderComposerTagContent = (tag: WebShellComposerTag) => { - const tagLabel = getComposerTagLabel(tag); + const rawTagLabel = getComposerTagLabel(tag); const tagValue = getComposerTagValue(tag); + const tagLabel = tag.kind ? '' : rawTagLabel; + const iconUrl = getComposerTagIconUrl(tag.kind); if (!tagLabel && !tagValue) { return {tag.id}; } return ( <> + {iconUrl && ( +