Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
58 changes: 57 additions & 1 deletion client/src/lib/hooks/__tests__/useConnection.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -518,12 +518,68 @@ describe("useConnection", () => {
}),
expect.objectContaining({
capabilities: expect.objectContaining({
elicitation: {},
elicitation: expect.objectContaining({
form: {},
}),
}),
}),
);
});

test("declines URL elicitation requests and continues supporting form requests", async () => {
const mockOnElicitationRequest = jest.fn();
const propsWithElicitation = {
...defaultProps,
onElicitationRequest: mockOnElicitationRequest,
};

const { result } = renderHook(() => useConnection(propsWithElicitation));

await act(async () => {
await result.current.connect();
});

const elicitRequestHandlerCall =
mockClient.setRequestHandler.mock.calls.find((call) => {
try {
const schema = call[0];
const testRequest = {
method: "elicitation/create",
params: {
mode: "url",
message: "please continue",
url: "https://example.com",
elicitationId: "id-1",
},
};
const parseResult =
schema.safeParse && schema.safeParse(testRequest);
return parseResult?.success;
} catch {
return false;
}
});

expect(elicitRequestHandlerCall).toBeDefined();
const [, handler] = elicitRequestHandlerCall;

let urlResult: unknown;
await act(async () => {
urlResult = await handler({
method: "elicitation/create",
params: {
mode: "url",
message: "please continue",
url: "https://example.com",
elicitationId: "id-1",
},
});
});

expect(urlResult).toEqual({ action: "decline" });
expect(mockOnElicitationRequest).not.toHaveBeenCalled();
});

test("sets up elicitation request handler when onElicitationRequest is provided", async () => {
const mockOnElicitationRequest = jest.fn();
const propsWithElicitation = {
Expand Down
12 changes: 11 additions & 1 deletion client/src/lib/hooks/useConnection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,9 @@ export function useConnection({
const clientCapabilities = {
capabilities: {
sampling: {},
elicitation: {},
elicitation: {
form: {},
},
roots: {
listChanged: true,
},
Expand Down Expand Up @@ -1056,6 +1058,14 @@ export function useConnection({

if (onElicitationRequest) {
client.setRequestHandler(ElicitRequestSchema, (request) => {
const requestedMode = (
request as { params?: { mode?: "form" | "url" } }
).params?.mode;

if (requestedMode === "url") {
return Promise.resolve({ action: "decline" });
}

const taskSpec = (request as { params?: { task?: { ttl?: number } } })
.params?.task;

Expand Down