Merge pull request #537 from yamadashy/devin/1746862382-add-mcp-tool-annotations

Add support for MCP tool annotations

package-lock.json

@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@clack/prompts": "^0.10.1",
-        "@modelcontextprotocol/sdk": "^1.10.1",
+        "@modelcontextprotocol/sdk": "^1.11.0",
         "@secretlint/core": "^9.3.1",
         "@secretlint/secretlint-rule-preset-recommend": "^9.3.1",
         "cli-spinners": "^2.9.2",
@@ -900,9 +900,9 @@
       }
     },
     "node_modules/@modelcontextprotocol/sdk": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.10.1.tgz",
-      "integrity": "sha512-xNYdFdkJqEfIaTVP1gPKoEvluACHZsHZegIoICX8DM1o6Qf3G5u2BQJHmgd0n4YgRPqqK/u1ujQvrgAxxSJT9w==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.11.1.tgz",
+      "integrity": "sha512-9LfmxKTb1v+vUS1/emSk1f5ePmTLkb9Le9AxOB5T0XM59EUumwcS45z05h7aiZx3GI0Bl7mjb3FMEglYj+acuQ==",
       "license": "MIT",
       "dependencies": {
         "content-type": "^1.0.5",

package.json

@@ -65,7 +65,7 @@
   "type": "module",
   "dependencies": {
     "@clack/prompts": "^0.10.1",
-    "@modelcontextprotocol/sdk": "^1.10.1",
+    "@modelcontextprotocol/sdk": "^1.11.0",
     "@secretlint/core": "^9.3.1",
     "@secretlint/secretlint-rule-preset-recommend": "^9.3.1",
     "cli-spinners": "^2.9.2",

src/mcp/tools/fileSystemReadDirectoryTool.ts

@@ -15,6 +15,13 @@ export const registerFileSystemReadDirectoryTool = (mcpServer: McpServer) => {
     {
       path: z.string().describe('Absolute path to the directory to list'),
     },
+    {
+      title: 'Read Directory',
+      readOnlyHint: true,
+      destructiveHint: false,
+      idempotentHint: true,
+      openWorldHint: false,
+    },
     async ({ path: directoryPath }): Promise<CallToolResult> => {
       try {
         logger.trace(`Listing directory at absolute path: ${directoryPath}`);

src/mcp/tools/fileSystemReadFileTool.ts

@@ -17,6 +17,13 @@ export const registerFileSystemReadFileTool = (mcpServer: McpServer) => {
     {
       path: z.string().describe('Absolute path to the file to read'),
     },
+    {
+      title: 'Read File',
+      readOnlyHint: true,
+      destructiveHint: false,
+      idempotentHint: true,
+      openWorldHint: false,
+    },
     async ({ path: filePath }): Promise<CallToolResult> => {
       try {
         logger.trace(`Reading file at absolute path: ${filePath}`);

src/mcp/tools/packCodebaseTool.ts

@@ -36,6 +36,13 @@ export const registerPackCodebaseTool = (mcpServer: McpServer) => {
         .default(10)
         .describe('Number of top files to display in the metrics (default: 10)'),
     },
+    {
+      title: 'Pack Local Codebase',
+      readOnlyHint: true,
+      destructiveHint: false,
+      idempotentHint: false,
+      openWorldHint: false,
+    },
     async ({ directory, compress, includePatterns, ignorePatterns, topFilesLength }): Promise<CallToolResult> => {
       let tempDir = '';
 

src/mcp/tools/packRemoteRepositoryTool.ts

@@ -36,6 +36,13 @@ export const registerPackRemoteRepositoryTool = (mcpServer: McpServer) => {
         .default(10)
         .describe('Number of top files to display in the metrics (default: 10)'),
     },
+    {
+      title: 'Pack Remote Repository',
+      readOnlyHint: true,
+      destructiveHint: false,
+      idempotentHint: false,
+      openWorldHint: true,
+    },
     async ({ remote, compress, includePatterns, ignorePatterns, topFilesLength }): Promise<CallToolResult> => {
       let tempDir = '';
 

src/mcp/tools/readRepomixOutputTool.ts

@@ -15,6 +15,13 @@ export const registerReadRepomixOutputTool = (mcpServer: McpServer) => {
     {
       outputId: z.string().describe('ID of the Repomix output file to read'),
     },
+    {
+      title: 'Read Repomix Output',
+      readOnlyHint: true,
+      destructiveHint: false,
+      idempotentHint: true,
+      openWorldHint: false,
+    },
     async ({ outputId }): Promise<CallToolResult> => {
       try {
         logger.trace(`Reading Repomix output with ID: ${outputId}`);

tests/mcp/tools/fileSystemReadDirectoryTool.test.ts

@@ -21,7 +21,7 @@ describe('FileSystemReadDirectoryTool', () => {
   beforeEach(() => {
     vi.resetAllMocks();
     registerFileSystemReadDirectoryTool(mockServer);
-    toolHandler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][3];
+    toolHandler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][4];
 
     // デフォルトのpath.isAbsoluteの動作をモック
     vi.mocked(path.isAbsolute).mockImplementation((p: string) => p.startsWith('/'));
@@ -32,6 +32,7 @@ describe('FileSystemReadDirectoryTool', () => {
       'file_system_read_directory',
       'List contents of a directory using an absolute path.',
       expect.any(Object),
+      expect.any(Object), // annotations
       expect.any(Function),
     );
   });

tests/mcp/tools/fileSystemReadFileTool.test.ts

@@ -23,7 +23,7 @@ describe('FileSystemReadFileTool', () => {
   beforeEach(() => {
     vi.resetAllMocks();
     registerFileSystemReadFileTool(mockServer);
-    toolHandler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][3];
+    toolHandler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][4];
 
     // デフォルトのpath.isAbsoluteの動作をモック
     vi.mocked(path.isAbsolute).mockImplementation((p: string) => p.startsWith('/'));
@@ -34,6 +34,7 @@ describe('FileSystemReadFileTool', () => {
       'file_system_read_file',
       'Read a file using an absolute path with security validation.',
       expect.any(Object),
+      expect.any(Object), // annotations
       expect.any(Function),
     );
   });

tests/mcp/tools/packCodebaseTool.test.ts

@@ -37,7 +37,7 @@ describe('PackCodebaseTool', () => {
   beforeEach(() => {
     vi.resetAllMocks();
     registerPackCodebaseTool(mockServer);
-    toolHandler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][3];
+    toolHandler = (mockServer.tool as ReturnType<typeof vi.fn>).mock.calls[0][4];
 
     // デフォルトのパスの動作をモック
     vi.mocked(path.join).mockImplementation((...args) => args.join('/'));
@@ -102,6 +102,7 @@ describe('PackCodebaseTool', () => {
       'pack_codebase',
       'Package local code directory into a consolidated file for AI analysis',
       expect.any(Object),
+      expect.any(Object), // annotations
       expect.any(Function),
     );
   });