-
Notifications
You must be signed in to change notification settings - Fork 2
Expand file tree
/
Copy pathcli-tool-registry.test.ts
More file actions
735 lines (604 loc) · 21.3 KB
/
cli-tool-registry.test.ts
File metadata and controls
735 lines (604 loc) · 21.3 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
/**
* Tests for CLI tool registry
*/
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { McpServer } from '@modelcontextprotocol/sdk/server/mcp';
import { z } from 'zod';
import {
registerCLITool,
defaultCLIResultProcessor,
createCodeQLSchemas,
createQLTSchemas,
createBQRSResultProcessor,
createDatabaseResultProcessor,
CLIToolDefinition
} from '../../../src/lib/cli-tool-registry';
import { CLIExecutionResult } from '../../../src/lib/cli-executor';
// Mock the CLI executor
vi.mock('../../../src/lib/cli-executor', () => ({
executeCodeQLCommand: vi.fn(),
executeQLTCommand: vi.fn()
}));
describe('defaultCLIResultProcessor', () => {
it('should format successful results with stdout', () => {
const result: CLIExecutionResult = {
stdout: 'Success output',
stderr: '',
success: true
};
const formatted = defaultCLIResultProcessor(result, {});
expect(formatted).toBe('Success output');
});
it('should format successful results with both stdout and stderr', () => {
const result: CLIExecutionResult = {
stdout: 'Success output',
stderr: 'Warning message',
success: true
};
const formatted = defaultCLIResultProcessor(result, {});
expect(formatted).toBe('Success output\n\nWarnings/Info:\nWarning message');
});
it('should format failed results', () => {
const result: CLIExecutionResult = {
stdout: '',
stderr: 'Error message',
success: false,
error: 'Command failed',
exitCode: 1
};
const formatted = defaultCLIResultProcessor(result, {});
expect(formatted).toBe('Command failed (exit code 1):\nCommand failed');
});
it('should handle empty output', () => {
const result: CLIExecutionResult = {
stdout: '',
stderr: '',
success: true
};
const formatted = defaultCLIResultProcessor(result, {});
expect(formatted).toBe('Command executed successfully (no output)');
});
});
describe('createCodeQLSchemas', () => {
it('should create database schema', () => {
const schema = createCodeQLSchemas.database();
expect(schema).toBeInstanceOf(z.ZodString);
});
it('should create query schema', () => {
const schema = createCodeQLSchemas.query();
expect(schema).toBeInstanceOf(z.ZodString);
});
it('should create output format schema', () => {
const schema = createCodeQLSchemas.outputFormat();
expect(schema).toBeInstanceOf(z.ZodOptional);
});
it('should create threads schema', () => {
const schema = createCodeQLSchemas.threads();
expect(schema).toBeInstanceOf(z.ZodOptional);
});
it('should create positional args schema with transformation', () => {
const schema = createCodeQLSchemas.positionalArgs();
expect(schema).toBeDefined();
// Test the transformation
const parsed = schema.parse(['arg1', 'arg2']);
expect(parsed).toEqual({ _positional: ['arg1', 'arg2'] });
});
});
describe('createQLTSchemas', () => {
it('should create language schema', () => {
const schema = createQLTSchemas.language();
expect(schema).toBeInstanceOf(z.ZodString);
});
it('should create template schema', () => {
const schema = createQLTSchemas.template();
expect(schema).toBeInstanceOf(z.ZodOptional);
});
it('should create force schema', () => {
const schema = createQLTSchemas.force();
expect(schema).toBeInstanceOf(z.ZodOptional);
});
});
describe('createBQRSResultProcessor', () => {
it('should format BQRS results with output path', () => {
const processor = createBQRSResultProcessor();
const result: CLIExecutionResult = {
stdout: 'BQRS decoded successfully',
stderr: '',
success: true
};
const formatted = processor(result, { output: '/path/to/output.csv' });
expect(formatted).toContain('BQRS decoded successfully');
expect(formatted).toContain('Results saved to: /path/to/output.csv');
});
it('should handle failed BQRS results', () => {
const processor = createBQRSResultProcessor();
const result: CLIExecutionResult = {
stdout: '',
stderr: 'BQRS error',
success: false,
error: 'Failed to decode',
exitCode: 1
};
const formatted = processor(result, {});
expect(formatted).toContain('Command failed (exit code 1)');
expect(formatted).toContain('Failed to decode');
});
});
describe('createDatabaseResultProcessor', () => {
it('should format database creation results', () => {
const processor = createDatabaseResultProcessor();
const result: CLIExecutionResult = {
stdout: 'Database created',
stderr: 'Info: Using Java extractor',
success: true
};
const formatted = processor(result, { database: '/path/to/db' });
expect(formatted).toContain('Database creation completed successfully');
expect(formatted).toContain('Database location: /path/to/db');
expect(formatted).toContain('Output:\nDatabase created');
expect(formatted).toContain('Additional information:\nInfo: Using Java extractor');
});
it('should handle positional database argument', () => {
const processor = createDatabaseResultProcessor();
const result: CLIExecutionResult = {
stdout: 'Database created',
stderr: '',
success: true
};
const formatted = processor(result, { _positional: ['my-database'] });
expect(formatted).toContain('Database location: my-database');
});
});
describe('registerCLITool', () => {
let mockServer: McpServer;
beforeEach(() => {
vi.clearAllMocks();
mockServer = {
tool: vi.fn()
} as unknown as McpServer;
});
it('should register a CodeQL tool correctly', () => {
const definition: CLIToolDefinition = {
name: 'test_codeql_tool',
description: 'Test CodeQL tool',
command: 'codeql',
subcommand: 'query run',
inputSchema: {
query: z.string(),
database: z.string()
}
};
registerCLITool(mockServer, definition);
expect(mockServer.tool).toHaveBeenCalledWith(
'test_codeql_tool',
'Test CodeQL tool',
definition.inputSchema,
expect.any(Function)
);
});
it('should register a QLT tool correctly', () => {
const definition: CLIToolDefinition = {
name: 'test_qlt_tool',
description: 'Test QLT tool',
command: 'qlt',
subcommand: 'query generate',
inputSchema: {
language: z.string(),
output: z.string().optional()
}
};
registerCLITool(mockServer, definition);
expect(mockServer.tool).toHaveBeenCalledWith(
'test_qlt_tool',
'Test QLT tool',
definition.inputSchema,
expect.any(Function)
);
});
it('should use custom result processor if provided', () => {
const customProcessor = vi.fn().mockReturnValue('Custom result');
const definition: CLIToolDefinition = {
name: 'test_custom_tool',
description: 'Test tool with custom processor',
command: 'codeql',
subcommand: 'test',
inputSchema: {},
resultProcessor: customProcessor
};
registerCLITool(mockServer, definition);
// Verify the tool was registered
expect(mockServer.tool).toHaveBeenCalled();
});
});
describe('registerCLITool handler behavior', () => {
let mockServer: McpServer;
let executeCodeQLCommand: ReturnType<typeof vi.fn>;
beforeEach(async () => {
vi.clearAllMocks();
mockServer = {
tool: vi.fn()
} as unknown as McpServer;
// Get the mocked function
const cliExecutor = await import('../../../src/lib/cli-executor');
executeCodeQLCommand = cliExecutor.executeCodeQLCommand as ReturnType<typeof vi.fn>;
});
it('should handle qlref parameter as positional argument for codeql_resolve_qlref', async () => {
const definition: CLIToolDefinition = {
name: 'codeql_resolve_qlref',
description: 'Resolve qlref files',
command: 'codeql',
subcommand: 'resolve qlref',
inputSchema: {
qlref: z.string()
}
};
registerCLITool(mockServer, definition);
// Get the handler function that was registered
const handler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][3];
// Mock successful command execution
executeCodeQLCommand.mockResolvedValueOnce({
stdout: '/path/to/resolved.ql',
stderr: '',
success: true
});
// Call the handler with qlref parameter
const result = await handler({ qlref: '/path/to/test.qlref' });
// Verify the command was called with the qlref as positional argument
// executeCodeQLCommand signature: (subcommand, options, additionalArgs, cwd)
expect(executeCodeQLCommand).toHaveBeenCalledWith(
'resolve qlref',
expect.any(Object),
['/path/to/test.qlref'],
undefined
);
expect(result.content[0].text).toBe('/path/to/resolved.ql');
});
it('should handle database parameter as positional argument for codeql_resolve_database', async () => {
const definition: CLIToolDefinition = {
name: 'codeql_resolve_database',
description: 'Resolve database',
command: 'codeql',
subcommand: 'resolve database',
inputSchema: {
database: z.string()
}
};
registerCLITool(mockServer, definition);
const handler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][3];
executeCodeQLCommand.mockResolvedValueOnce({
stdout: '{"languages": ["javascript"]}',
stderr: '',
success: true
});
await handler({ database: '/path/to/db' });
// executeCodeQLCommand signature: (subcommand, options, additionalArgs, cwd)
expect(executeCodeQLCommand).toHaveBeenCalledWith(
'resolve database',
expect.any(Object),
['/path/to/db'],
undefined
);
});
it('should handle database parameter as positional argument for codeql_database_create', async () => {
const definition: CLIToolDefinition = {
name: 'codeql_database_create',
description: 'Create database',
command: 'codeql',
subcommand: 'database create',
inputSchema: {
database: z.string(),
language: z.string().optional()
}
};
registerCLITool(mockServer, definition);
const handler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][3];
executeCodeQLCommand.mockResolvedValueOnce({
stdout: 'Database created successfully',
stderr: '',
success: true
});
await handler({ database: '/path/to/new-db', language: 'javascript' });
// executeCodeQLCommand signature: (subcommand, options, additionalArgs, cwd)
expect(executeCodeQLCommand).toHaveBeenCalledWith(
'database create',
expect.objectContaining({
language: 'javascript'
}),
['/path/to/new-db'],
undefined
);
});
it('should handle database and queries parameters as positional arguments for codeql_database_analyze', async () => {
const definition: CLIToolDefinition = {
name: 'codeql_database_analyze',
description: 'Analyze database',
command: 'codeql',
subcommand: 'database analyze',
inputSchema: {
database: z.string(),
queries: z.string(),
format: z.string().optional()
}
};
registerCLITool(mockServer, definition);
const handler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][3];
executeCodeQLCommand.mockResolvedValueOnce({
stdout: 'Analysis complete',
stderr: '',
success: true
});
await handler({ database: '/path/to/db', queries: 'security-queries', format: 'sarif-latest' });
// executeCodeQLCommand signature: (subcommand, options, additionalArgs, cwd)
expect(executeCodeQLCommand).toHaveBeenCalledWith(
'database analyze',
expect.objectContaining({
format: 'sarif-latest'
}),
['/path/to/db', 'security-queries'],
undefined
);
});
it('should handle query parameter as positional argument for codeql_generate_query-help', async () => {
const definition: CLIToolDefinition = {
name: 'codeql_generate_query-help',
description: 'Generate query help',
command: 'codeql',
subcommand: 'generate query-help',
inputSchema: {
query: z.string(),
format: z.string().optional()
}
};
registerCLITool(mockServer, definition);
const handler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][3];
executeCodeQLCommand.mockResolvedValueOnce({
stdout: '# Query Help\nThis is help content',
stderr: '',
success: true
});
await handler({ query: '/path/to/query.ql', format: 'markdown' });
// executeCodeQLCommand signature: (subcommand, options, additionalArgs, cwd)
expect(executeCodeQLCommand).toHaveBeenCalledWith(
'generate query-help',
expect.objectContaining({
format: 'markdown'
}),
['/path/to/query.ql'],
undefined
);
});
it('should pass format to CLI for codeql_bqrs_interpret', async () => {
const definition: CLIToolDefinition = {
name: 'codeql_bqrs_interpret',
description: 'Interpret BQRS',
command: 'codeql',
subcommand: 'bqrs interpret',
inputSchema: {
file: z.string(),
format: z.string().optional()
}
};
registerCLITool(mockServer, definition);
const handler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][3];
executeCodeQLCommand.mockResolvedValueOnce({
stdout: 'Interpreted',
stderr: '',
success: true
});
await handler({ file: '/path/to/results.bqrs', format: 'sarif-latest' });
// executeCodeQLCommand signature: (subcommand, options, additionalArgs, cwd)
expect(executeCodeQLCommand).toHaveBeenCalledWith(
'bqrs interpret',
expect.objectContaining({
format: 'sarif-latest'
}),
['/path/to/results.bqrs'],
undefined
);
});
it('should NOT pass format to CLI options for tools where format should not be on CLI', async () => {
const definition: CLIToolDefinition = {
name: 'codeql_query_run',
description: 'Run query',
command: 'codeql',
subcommand: 'query run',
inputSchema: {
database: z.string(),
format: z.string().optional()
}
};
registerCLITool(mockServer, definition);
const handler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][3];
executeCodeQLCommand.mockResolvedValueOnce({
stdout: 'Query completed',
stderr: '',
success: true
});
await handler({ database: '/path/to/db', format: 'csv' });
// format should be extracted and NOT passed to CLI options for codeql_query_run
// The first argument (options object) should not contain 'format'
const callArgs = executeCodeQLCommand.mock.calls[0];
const options = callArgs[1] as Record<string, unknown>;
expect(options).not.toHaveProperty('format');
});
it('should handle file parameter as positional for BQRS tools', async () => {
const definition: CLIToolDefinition = {
name: 'codeql_bqrs_decode',
description: 'Decode BQRS',
command: 'codeql',
subcommand: 'bqrs decode',
inputSchema: {
file: z.string()
}
};
registerCLITool(mockServer, definition);
const handler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][3];
executeCodeQLCommand.mockResolvedValueOnce({
stdout: '{"results": []}',
stderr: '',
success: true
});
await handler({ file: '/path/to/results.bqrs' });
// executeCodeQLCommand signature: (subcommand, options, additionalArgs, cwd)
expect(executeCodeQLCommand).toHaveBeenCalledWith(
'bqrs decode',
expect.any(Object),
['/path/to/results.bqrs'],
undefined
);
});
it('should handle tests parameter as positional for test tools', async () => {
const definition: CLIToolDefinition = {
name: 'codeql_test_run',
description: 'Run tests',
command: 'codeql',
subcommand: 'test run',
inputSchema: {
tests: z.array(z.string())
}
};
registerCLITool(mockServer, definition);
const handler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][3];
executeCodeQLCommand.mockResolvedValueOnce({
stdout: 'All tests passed',
stderr: '',
success: true
});
await handler({ tests: ['/path/to/test1.ql', '/path/to/test2.ql'] });
// executeCodeQLCommand signature: (subcommand, options, additionalArgs, cwd)
expect(executeCodeQLCommand).toHaveBeenCalledWith(
'test run',
expect.any(Object),
['/path/to/test1.ql', '/path/to/test2.ql'],
undefined
);
});
it('should resolve relative tests parameter against user workspace dir', async () => {
const definition: CLIToolDefinition = {
name: 'codeql_test_run',
description: 'Run tests',
command: 'codeql',
subcommand: 'test run',
inputSchema: {
tests: z.array(z.string())
}
};
registerCLITool(mockServer, definition);
const handler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][3];
executeCodeQLCommand.mockResolvedValueOnce({
stdout: 'All tests passed',
stderr: '',
success: true
});
// Test with relative paths
await handler({ tests: ['relative/test1.ql', '/absolute/test2.ql'] });
// executeCodeQLCommand signature: (subcommand, options, additionalArgs, cwd)
const call = executeCodeQLCommand.mock.calls[0];
const positionalArgs = call[2];
// First relative path should be resolved to absolute
expect(positionalArgs[0]).not.toBe('relative/test1.ql');
expect(positionalArgs[0]).toContain('relative/test1.ql');
// Second absolute path should remain unchanged
expect(positionalArgs[1]).toBe('/absolute/test2.ql');
});
it('should resolve relative database parameter against user workspace dir', async () => {
const definition: CLIToolDefinition = {
name: 'codeql_query_run',
description: 'Run query',
command: 'codeql',
subcommand: 'query run',
inputSchema: {
database: z.string(),
query: z.string()
}
};
registerCLITool(mockServer, definition);
const handler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][3];
executeCodeQLCommand.mockResolvedValueOnce({
stdout: '{"columns":[]}',
stderr: '',
success: true
});
// Test with relative database path
await handler({ database: 'my-database', query: '/path/to/query.ql' });
// executeCodeQLCommand signature: (subcommand, options, additionalArgs, cwd)
const call = executeCodeQLCommand.mock.calls[0];
const options = call[1];
// Relative database path should be resolved to absolute
expect(options.database).not.toBe('my-database');
expect(options.database).toContain('my-database');
});
it('should resolve relative dir/packDir parameter against user workspace dir', async () => {
const definition: CLIToolDefinition = {
name: 'codeql_pack_install',
description: 'Install packs',
command: 'codeql',
subcommand: 'pack install',
inputSchema: {
dir: z.string()
}
};
registerCLITool(mockServer, definition);
const handler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][3];
executeCodeQLCommand.mockResolvedValueOnce({
stdout: 'Installed successfully',
stderr: '',
success: true
});
// Test with relative dir path
await handler({ dir: 'my-pack-dir' });
// executeCodeQLCommand signature: (subcommand, options, additionalArgs, cwd)
const call = executeCodeQLCommand.mock.calls[0];
const cwd = call[3];
// Relative dir should be resolved to absolute for cwd
expect(cwd).not.toBe('my-pack-dir');
expect(cwd).toContain('my-pack-dir');
});
it('should handle dir parameter as positional for pack_ls', async () => {
const definition: CLIToolDefinition = {
name: 'codeql_pack_ls',
description: 'List packs',
command: 'codeql',
subcommand: 'pack ls',
inputSchema: {
dir: z.string()
}
};
registerCLITool(mockServer, definition);
const handler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][3];
executeCodeQLCommand.mockResolvedValueOnce({
stdout: 'pack1\npack2',
stderr: '',
success: true
});
await handler({ dir: '/path/to/packs' });
// executeCodeQLCommand signature: (subcommand, options, additionalArgs, cwd)
// For pack_ls, the dir is passed both as positional arg and as cwd
expect(executeCodeQLCommand).toHaveBeenCalledWith(
'pack ls',
expect.any(Object),
['/path/to/packs'],
'/path/to/packs'
);
});
it('should return error content when command fails', async () => {
const definition: CLIToolDefinition = {
name: 'codeql_test_tool',
description: 'Test tool',
command: 'codeql',
subcommand: 'test',
inputSchema: {}
};
registerCLITool(mockServer, definition);
const handler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][3];
executeCodeQLCommand.mockResolvedValueOnce({
stdout: '',
stderr: 'Some error occurred',
success: false,
error: 'Command failed',
exitCode: 1
});
const result = await handler({});
expect(result.content[0].text).toContain('Command failed');
});
});