Skip to content

Commit d43cab5

Browse files
ochafikclaude
ochafik
and
claude
committed
fix(test): correct capability structures in server tests
Fixed invalid capability structures exposed by stricter types: - ServerCapabilities.tasks.requests only has 'tools', not 'elicitation' - ClientCapabilities.tasks.requests has 'sampling' and 'elicitation' - Fixed ElicitResult.content to not include undefined values - Handle SamplingMessage.content being array or single block 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
1 parent f4984a2 commit d43cab5

File tree

4 files changed

+63
-140
lines changed

4 files changed

+63
-140
lines changed

‎test/helpers/mcp.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,7 @@ export async function createInMemoryTaskEnvironment(options?: {
2828
capabilities: options?.clientCapabilities ?? {
2929
tasks: {
3030
list: {},
31-
requests: {
32-
tools: {
33-
call: {}
34-
}
35-
}
31+
cancel: {}
3632
}
3733
}
3834
}

‎test/server/elicitation.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import { Client } from '../../src/client/index.js';
1111
import { InMemoryTransport } from '../../src/inMemory.js';
12-
import { ElicitRequestFormParams, ElicitRequestSchema } from '../../src/types.js';
12+
import { ElicitRequestFormParams, ElicitRequestSchema, ElicitResult } from '../../src/types.js';
1313
import { AjvJsonSchemaValidator } from '../../src/validation/ajv-provider.js';
1414
import { CfWorkerJsonSchemaValidator } from '../../src/validation/cfworker-provider.js';
1515
import { Server } from '../../src/server/index.js';
@@ -341,13 +341,13 @@ function testElicitationFlow(validatorProvider: typeof ajvProvider | typeof cfWo
341341
client.setRequestHandler(ElicitRequestSchema, request => {
342342
requestCount++;
343343
if (request.params.message.includes('name')) {
344-
return { action: 'accept', content: { name: 'Alice' } };
344+
return { action: 'accept' as const, content: { name: 'Alice' } } as ElicitResult;
345345
} else if (request.params.message.includes('age')) {
346-
return { action: 'accept', content: { age: 30 } };
346+
return { action: 'accept' as const, content: { age: 30 } } as ElicitResult;
347347
} else if (request.params.message.includes('city')) {
348-
return { action: 'accept', content: { city: 'New York' } };
348+
return { action: 'accept' as const, content: { city: 'New York' } } as ElicitResult;
349349
}
350-
return { action: 'decline' };
350+
return { action: 'decline' as const } as ElicitResult;
351351
});
352352

353353
const nameResult = await server.elicitInput({

‎test/server/index.test.ts‎

Lines changed: 31 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -457,9 +457,9 @@ test('should respect client elicitation capabilities', async () => {
457457
);
458458

459459
client.setRequestHandler(ElicitRequestSchema, params => ({
460-
action: 'accept',
460+
action: 'accept' as const,
461461
content: {
462-
username: params.params.message.includes('username') ? 'test-user' : undefined,
462+
...(params.params.message.includes('username') ? { username: 'test-user' } : {}),
463463
confirmed: true
464464
}
465465
}));
@@ -541,9 +541,9 @@ test('should use elicitInput with mode: "form" by default for backwards compatib
541541
);
542542

543543
client.setRequestHandler(ElicitRequestSchema, params => ({
544-
action: 'accept',
544+
action: 'accept' as const,
545545
content: {
546-
username: params.params.message.includes('username') ? 'test-user' : undefined,
546+
...(params.params.message.includes('username') ? { username: 'test-user' } : {}),
547547
confirmed: true
548548
}
549549
}));
@@ -1955,9 +1955,10 @@ describe('createMessage backwards compatibility', () => {
19551955
// Backwards compat: result.content should be single (not array)
19561956
expect(result.model).toBe('test-model');
19571957
expect(Array.isArray(result.content)).toBe(false);
1958-
expect(result.content.type).toBe('text');
1959-
if (result.content.type === 'text') {
1960-
expect(result.content.text).toBe('Hello from LLM');
1958+
const content = Array.isArray(result.content) ? result.content[0] : result.content;
1959+
expect(content.type).toBe('text');
1960+
if (content.type === 'text') {
1961+
expect(content.text).toBe('Hello from LLM');
19611962
}
19621963
});
19631964

@@ -2233,12 +2234,9 @@ describe('Task-based execution', () => {
22332234
{
22342235
capabilities: {
22352236
tasks: {
2236-
requests: {
2237-
tools: {
2238-
call: {}
2239-
}
2237+
list: {},
2238+
cancel: {}
22402239
}
2241-
}
22422240
},
22432241
taskStore
22442242
}
@@ -2290,12 +2288,9 @@ describe('Task-based execution', () => {
22902288
{
22912289
capabilities: {
22922290
tasks: {
2293-
requests: {
2294-
tools: {
2295-
call: {}
2296-
}
2291+
list: {},
2292+
cancel: {}
22972293
}
2298-
}
22992294
}
23002295
}
23012296
);
@@ -2380,12 +2375,9 @@ describe('Task-based execution', () => {
23802375
{
23812376
capabilities: {
23822377
tasks: {
2383-
requests: {
2384-
tools: {
2385-
call: {}
2386-
}
2378+
list: {},
2379+
cancel: {}
23872380
}
2388-
}
23892381
}
23902382
}
23912383
);
@@ -2410,12 +2402,9 @@ describe('Task-based execution', () => {
24102402
{
24112403
capabilities: {
24122404
tasks: {
2413-
requests: {
2414-
tools: {
2415-
call: {}
2416-
}
2405+
list: {},
2406+
cancel: {}
24172407
}
2418-
}
24192408
},
24202409
taskStore
24212410
}
@@ -2867,11 +2856,8 @@ describe('Task-based execution', () => {
28672856
{
28682857
capabilities: {
28692858
tasks: {
2870-
requests: {
2871-
elicitation: {
2872-
create: {}
2873-
}
2874-
}
2859+
list: {},
2860+
cancel: {}
28752861
}
28762862
}
28772863
}
@@ -2931,12 +2917,9 @@ describe('Task-based execution', () => {
29312917
{
29322918
capabilities: {
29332919
tasks: {
2934-
requests: {
2935-
tools: {
2936-
call: {}
2937-
}
2920+
list: {},
2921+
cancel: {}
29382922
}
2939-
}
29402923
},
29412924
taskStore
29422925
}
@@ -2991,12 +2974,9 @@ describe('Task-based execution', () => {
29912974
{
29922975
capabilities: {
29932976
tasks: {
2994-
requests: {
2995-
tools: {
2996-
call: {}
2997-
}
2977+
list: {},
2978+
cancel: {}
29982979
}
2999-
}
30002980
}
30012981
}
30022982
);
@@ -3067,11 +3047,8 @@ describe('Task-based execution', () => {
30673047
capabilities: {
30683048
tools: {},
30693049
tasks: {
3070-
requests: {
3071-
tools: {
3072-
call: {}
3073-
}
3074-
}
3050+
list: {},
3051+
cancel: {}
30753052
}
30763053
},
30773054
taskStore
@@ -3086,11 +3063,8 @@ describe('Task-based execution', () => {
30863063
{
30873064
capabilities: {
30883065
tasks: {
3089-
requests: {
3090-
tools: {
3091-
call: {}
3092-
}
3093-
}
3066+
list: {},
3067+
cancel: {}
30943068
}
30953069
}
30963070
}
@@ -3138,11 +3112,8 @@ describe('Task-based execution', () => {
31383112
{
31393113
capabilities: {
31403114
tasks: {
3141-
requests: {
3142-
elicitation: {
3143-
create: {}
3144-
}
3145-
}
3115+
list: {},
3116+
cancel: {}
31463117
}
31473118
}
31483119
}
@@ -3210,11 +3181,8 @@ test('should respect client task capabilities', async () => {
32103181
{
32113182
capabilities: {
32123183
tasks: {
3213-
requests: {
3214-
elicitation: {
3215-
create: {}
3216-
}
3217-
}
3184+
list: {},
3185+
cancel: {}
32183186
}
32193187
},
32203188
enforceStrictCapabilities: true
@@ -3227,9 +3195,7 @@ test('should respect client task capabilities', async () => {
32273195
// Client supports task creation for elicitation/create and task methods
32283196
expect(server.getClientCapabilities()).toEqual({
32293197
sampling: {},
3230-
elicitation: {
3231-
form: {}
3232-
},
3198+
elicitation: {},
32333199
tasks: {
32343200
requests: {
32353201
elicitation: {

0 commit comments

Comments
 (0)