Add URL Elicitation cases (#3334)

* url elicitation

* single tool for normal and error path

* Address review feedback on URL elicitation tool

- Remove src/everything/pnpm-lock.yaml (monorepo uses npm workspaces)
- Drop redundant TriggerUrlElicitationSchema.parse(args) in the handler;
  destructure directly from args like the other tools, since the SDK
  validates against the registered schema before invoking the handler
- Add explicit accept/decline/cancel messaging in the request path,
  mirroring trigger-elicitation-request.ts
- Clarify the registerTool count comment in registrations.test.ts
  (task-based tools register via registerToolTask, counted separately)
- Add tests covering the no-url / undefined-capability registration
  guards, the randomUUID() elicitationId fallback, and the
  decline/cancel response paths (100% coverage of the tool)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* Add tool annotations to trigger-url-elicitation

Match the annotations block on sibling elicitation tools and the
CLAUDE.md guidance. Uses openWorldHint: true since the tool drives an
external browser flow.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: cliffhall <cliff@futurescale.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
shaun smith 2026-06-04 02:10:07 +01:00 • committed by GitHub
commit 3a32d1024b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 410 additions and 7 deletions

View file

@ -17,6 +17,7 @@ import { registerTriggerSamplingRequestTool } from "./trigger-sampling-request.j
import { registerTriggerSamplingRequestAsyncTool } from "./trigger-sampling-request-async.js";
import { registerTriggerElicitationRequestAsyncTool } from "./trigger-elicitation-request-async.js";
import { registerSimulateResearchQueryTool } from "./simulate-research-query.js";
import { registerTriggerUrlElicitationTool } from "./trigger-url-elicitation.js";
/**
* Register the tools with the MCP server.
@ -44,6 +45,7 @@ export const registerTools = (server: McpServer) => {
export const registerConditionalTools = (server: McpServer) => {
registerGetRootsListTool(server);
registerTriggerElicitationRequestTool(server);
registerTriggerUrlElicitationTool(server);
registerTriggerSamplingRequestTool(server);
// Task-based research tool (uses experimental tasks API)
registerSimulateResearchQueryTool(server);

View file

@ -0,0 +1,147 @@
import { randomUUID } from "node:crypto";
import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
import {
CallToolResult,
ElicitRequestURLParams,
ElicitResultSchema,
UrlElicitationRequiredError,
} from "@modelcontextprotocol/sdk/types.js";
import { z } from "zod";
// Tool input schema
const TriggerUrlElicitationSchema = z.object({
url: z.string().url().describe("The URL the user should open"),
message: z
.string()
.default("Please open the link to complete this action.")
.describe("Message shown to the user before opening the URL"),
elicitationId: z
.string()
.optional()
.describe("Optional explicit elicitation ID. Defaults to a random UUID."),
errorPath: z
.boolean()
.default(false)
.describe(
"Controls which elicitation mechanism is used. " +
"When false (default), sends an elicitation/create request (request path). " +
"When true, throws a UrlElicitationRequiredError (MCP error code -32042) so the client handles " +
"the URL elicitation via the error path rather than waiting for a response."
),
});
// Tool configuration
const name = "trigger-url-elicitation";
const config = {
title: "Trigger URL Elicitation Tool",
description:
"Trigger a URL elicitation so the client can direct the user to a browser flow. " +
"Supports two mechanisms: the request path (elicitation/create, default) which awaits the user's " +
"response, and the error path (UrlElicitationRequiredError, -32042) which signals the client " +
"to handle URL elicitation via the error response. Set errorPath=true to use the error path.",
inputSchema: TriggerUrlElicitationSchema,
annotations: {
readOnlyHint: false,
destructiveHint: false,
idempotentHint: false,
openWorldHint: true,
},
};
/**
* Registers the 'trigger-url-elicitation' tool.
*
* This tool only registers when the client advertises URL-mode elicitation
* capability (clientCapabilities.elicitation.url).
*
* Depending on the `errorPath` argument it either:
* - Sends an `elicitation/create` request and awaits the result (request path), or
* - Throws a `UrlElicitationRequiredError` (MCP error -32042) for the client to
* handle via the error path.
*
* @param {McpServer} server - The McpServer instance where the tool will be registered.
*/
export const registerTriggerUrlElicitationTool = (server: McpServer) => {
const clientCapabilities = server.server.getClientCapabilities() || {};
const clientElicitationCapabilities = clientCapabilities.elicitation as
| {
url?: object;
}
| undefined;
const clientSupportsUrlElicitation =
clientElicitationCapabilities?.url !== undefined;
if (clientSupportsUrlElicitation) {
server.registerTool(
name,
config,
async (args, extra): Promise<CallToolResult> => {
const {
url,
message,
elicitationId: requestedElicitationId,
errorPath,
} = args;
const elicitationId = requestedElicitationId ?? randomUUID();
const elicitationParams: ElicitRequestURLParams = {
mode: "url",
url,
message,
elicitationId,
};
// Error path: throw UrlElicitationRequiredError (-32042) for the client to handle
if (errorPath) {
throw new UrlElicitationRequiredError(
[elicitationParams],
"This request requires browser-based authorization."
);
}
// Request path: send elicitation/create and await the user's response
const elicitationResult = await extra.sendRequest(
{
method: "elicitation/create",
params: elicitationParams,
},
ElicitResultSchema,
{ timeout: 10 * 60 * 1000 /* 10 minutes */ }
);
// Handle different response actions
const content: CallToolResult["content"] = [];
if (elicitationResult.action === "accept") {
content.push({
type: "text",
text:
`✅ User completed the URL elicitation flow.\n` +
`Elicitation ID: ${elicitationId}\n` +
`URL: ${url}`,
});
} else if (elicitationResult.action === "decline") {
content.push({
type: "text",
text: `❌ User declined to open the URL (Elicitation ID: ${elicitationId}).`,
});
} else if (elicitationResult.action === "cancel") {
content.push({
type: "text",
text: `⚠️ User cancelled the URL elicitation (Elicitation ID: ${elicitationId}).`,
});
}
// Include raw result for debugging
content.push({
type: "text",
text: `\nRaw result: ${JSON.stringify(elicitationResult, null, 2)}`,
});
return { content };
}
);
}
};