Skip to content

[onechat] rewrite tool IDs for MCP endpoint #228896

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
pgayvallet merged 1 commit into from
Jul 22, 2025
Merged

[onechat] rewrite tool IDs for MCP endpoint #228896

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
1 change: 1 addition & 0 deletions x-pack/platform/packages/shared/onechat/onechat-genai-utils/langchain/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export {
toolToLangchain,
toolIdentifierFromToolCall,
sanitizeToolId,
createToolIdMappings,
type ToolIdMapping,
type ToolsAndMappings,
} from './tools';
2 changes: 1 addition & 1 deletion x-pack/platform/packages/shared/onechat/onechat-genai-utils/langchain/tools.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const sanitizeToolId = (toolId: string): string => {
*
* Handles id sanitization (e.g. removing dot prefixes), and potential id conflict.
*/
export const createToolIdMappings = (tools: ExecutableTool[]): ToolIdMapping => {
export const createToolIdMappings = <T extends { id: string }>(tools: T[]): ToolIdMapping => {
const toolIds = new Set<string>();
const mapping: ToolIdMapping = new Map();

Expand Down
5 changes: 4 additions & 1 deletion x-pack/platform/plugins/shared/onechat/server/routes/mcp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
import { ErrorCode } from '@modelcontextprotocol/sdk/types.js';
import { schema } from '@kbn/config-schema';
import { createToolIdMappings } from '@kbn/onechat-genai-utils/langchain';
import { apiPrivileges } from '../../common/features';
import type { RouteDependencies } from './types';
import { getHandlerWrapper } from './wrap_handler';
Expand Down Expand Up @@ -67,10 +68,12 @@ export function registerMCPRoutes({ router, getInternalServices, logger }: Route
const registry = await toolService.getRegistry({ request });
const tools = await registry.list({});

const idMapping = createToolIdMappings(tools);

// Expose tools scoped to the request
for (const tool of tools) {
server.tool(
tool.id,
idMapping.get(tool.id) ?? tool.id,
tool.description,
tool.schema.shape,
async (args: { [x: string]: any }) => {
Expand Down