ai-cli-mcp 2.2.0 → 2.3.0

package/.claude/settings.local.json

@@ -13,8 +13,9 @@
       "mcp__chat__agent_communication_list_rooms",
       "mcp__chat__agent_communication_get_messages",
       "mcp__ccm__list_claude_processes",
-      "Bash(gemini:*)"
+      "Bash(gemini:*)",
+      "WebSearch"
     ],
     "deny": []
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-cli-mcp",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "MCP server for AI CLI tools (Claude, Codex, and Gemini) with background process management",
   "author": "mkXultra",
   "license": "MIT",

package/src/__tests__/e2e.test.ts

@@ -40,13 +40,13 @@ describe('Claude Code MCP E2E Tests', () => {
   });
 
   describe('Tool Registration', () => {
-    it('should register claude_code tool', async () => {
+    it('should register run tool', async () => {
       const tools = await client.listTools();
       
       expect(tools).toHaveLength(4);
-      const claudeCodeTool = tools.find((t: any) => t.name === 'claude_code');
+      const claudeCodeTool = tools.find((t: any) => t.name === 'run');
       expect(claudeCodeTool).toEqual({
-        name: 'claude_code',
+        name: 'run',
         description: expect.stringContaining('Claude Code Agent'),
         inputSchema: {
           type: 'object',
@@ -77,15 +77,15 @@ describe('Claude Code MCP E2E Tests', () => {
       });
       
       // Verify other tools exist
-      expect(tools.some((t: any) => t.name === 'list_claude_processes')).toBe(true);
-      expect(tools.some((t: any) => t.name === 'get_claude_result')).toBe(true);
-      expect(tools.some((t: any) => t.name === 'kill_claude_process')).toBe(true);
+      expect(tools.some((t: any) => t.name === 'list_processes')).toBe(true);
+      expect(tools.some((t: any) => t.name === 'get_result')).toBe(true);
+      expect(tools.some((t: any) => t.name === 'kill_process')).toBe(true);
     });
   });
 
   describe('Basic Operations', () => {
     it('should execute a simple prompt', async () => {
-      const response = await client.callTool('claude_code', {
+      const response = await client.callTool('run', {
         prompt: 'create a file called test.txt with content "Hello World"',
         workFolder: testDir,
       });
@@ -97,8 +97,8 @@ describe('Claude Code MCP E2E Tests', () => {
     });
 
     it('should handle process management correctly', async () => {
-      // claude_code now returns a PID immediately
-      const response = await client.callTool('claude_code', {
+      // run now returns a PID immediately
+      const response = await client.callTool('run', {
         prompt: 'error',
         workFolder: testDir,
       });
@@ -116,7 +116,7 @@ describe('Claude Code MCP E2E Tests', () => {
 
     it('should reject missing workFolder', async () => {
       await expect(
-        client.callTool('claude_code', {
+        client.callTool('run', {
           prompt: 'List files in current directory',
         })
       ).rejects.toThrow(/workFolder/i);
@@ -125,7 +125,7 @@ describe('Claude Code MCP E2E Tests', () => {
 
   describe('Working Directory Handling', () => {
     it('should respect custom working directory', async () => {
-      const response = await client.callTool('claude_code', {
+      const response = await client.callTool('run', {
         prompt: 'Show current working directory',
         workFolder: testDir,
       });
@@ -137,7 +137,7 @@ describe('Claude Code MCP E2E Tests', () => {
       const nonExistentDir = join(testDir, 'non-existent');
       
       await expect(
-        client.callTool('claude_code', {
+        client.callTool('run', {
           prompt: 'Test prompt',
           workFolder: nonExistentDir,
         })
@@ -154,8 +154,8 @@ describe('Claude Code MCP E2E Tests', () => {
   });
 
   describe('Model Alias Handling', () => {
-    it('should resolve haiku alias when calling claude_code', async () => {
-      const response = await client.callTool('claude_code', {
+    it('should resolve haiku alias when calling run', async () => {
+      const response = await client.callTool('run', {
         prompt: 'Test with haiku model',
         workFolder: testDir,
         model: 'haiku'
@@ -173,7 +173,7 @@ describe('Claude Code MCP E2E Tests', () => {
       
       // Get the PID and check the process
       const pid = parseInt(pidMatch![1]);
-      const processes = await client.callTool('list_claude_processes', {});
+      const processes = await client.callTool('list_processes', {});
       const processesText = processes[0].text;
       const processData = JSON.parse(processesText);
       
@@ -186,7 +186,7 @@ describe('Claude Code MCP E2E Tests', () => {
     });
 
     it('should pass non-alias model names unchanged', async () => {
-      const response = await client.callTool('claude_code', {
+      const response = await client.callTool('run', {
         prompt: 'Test with sonnet model',
         workFolder: testDir,
         model: 'sonnet'
@@ -203,7 +203,7 @@ describe('Claude Code MCP E2E Tests', () => {
       const pid = parseInt(pidMatch![1]);
       
       // Check the process
-      const processes = await client.callTool('list_claude_processes', {});
+      const processes = await client.callTool('list_processes', {});
       const processesText = processes[0].text;
       const processData = JSON.parse(processesText);
       
@@ -216,7 +216,7 @@ describe('Claude Code MCP E2E Tests', () => {
     });
     
     it('should work without specifying a model', async () => {
-      const response = await client.callTool('claude_code', {
+      const response = await client.callTool('run', {
         prompt: 'Test without model parameter',
         workFolder: testDir
       });
@@ -231,7 +231,7 @@ describe('Claude Code MCP E2E Tests', () => {
   describe('Debug Mode', () => {
     it('should log debug information when enabled', async () => {
       // Debug logs go to stderr, which we capture in the client
-      const response = await client.callTool('claude_code', {
+      const response = await client.callTool('run', {
         prompt: 'Debug test prompt',
         workFolder: testDir,
       });
@@ -265,7 +265,7 @@ describe('Integration Tests (Local Only)', () => {
   it.skip('should create a file with real Claude CLI', async () => {
     await client.connect();
     
-    const response = await client.callTool('claude_code', {
+    const response = await client.callTool('run', {
       prompt: 'Create a file called hello.txt with content "Hello from Claude"',
       workFolder: testDir,
     });
@@ -279,7 +279,7 @@ describe('Integration Tests (Local Only)', () => {
     await client.connect();
     
     // Initialize git repo
-    const response = await client.callTool('claude_code', {
+    const response = await client.callTool('run', {
       prompt: 'Initialize a git repository and create a README.md file',
       workFolder: testDir,
     });

package/src/__tests__/edge-cases.test.ts

@@ -39,7 +39,7 @@ describe('Claude Code Edge Cases', () => {
   describe('Input Validation', () => {
     it('should reject missing prompt', async () => {
       await expect(
-        client.callTool('claude_code', {
+        client.callTool('run', {
           workFolder: testDir,
         })
       ).rejects.toThrow(/prompt/i);
@@ -47,7 +47,7 @@ describe('Claude Code Edge Cases', () => {
 
     it('should reject invalid prompt type', async () => {
       await expect(
-        client.callTool('claude_code', {
+        client.callTool('run', {
           prompt: 123, // Should be string
           workFolder: testDir,
         })
@@ -56,7 +56,7 @@ describe('Claude Code Edge Cases', () => {
 
     it('should reject invalid workFolder type', async () => {
       await expect(
-        client.callTool('claude_code', {
+        client.callTool('run', {
           prompt: 'Test prompt',
           workFolder: 123, // Should be string
         })
@@ -65,7 +65,7 @@ describe('Claude Code Edge Cases', () => {
 
     it('should reject empty prompt', async () => {
       await expect(
-        client.callTool('claude_code', {
+        client.callTool('run', {
           prompt: '',
           workFolder: testDir,
         })
@@ -76,7 +76,7 @@ describe('Claude Code Edge Cases', () => {
   describe('Special Characters', () => {
     it.skip('should handle prompts with quotes', async () => {
       // Skipping: This test fails in CI when mock is not found at expected path
-      const response = await client.callTool('claude_code', {
+      const response = await client.callTool('run', {
         prompt: 'Create a file with content "Hello \\"World\\""',
         workFolder: testDir,
       });
@@ -85,7 +85,7 @@ describe('Claude Code Edge Cases', () => {
     });
 
     it('should handle prompts with newlines', async () => {
-      const response = await client.callTool('claude_code', {
+      const response = await client.callTool('run', {
         prompt: 'Create a file with content:\\nLine 1\\nLine 2',
         workFolder: testDir,
       });
@@ -94,7 +94,7 @@ describe('Claude Code Edge Cases', () => {
     });
 
     it('should handle prompts with shell special characters', async () => {
-      const response = await client.callTool('claude_code', {
+      const response = await client.callTool('run', {
         prompt: 'Create a file named test$file.txt',
         workFolder: testDir,
       });
@@ -113,7 +113,7 @@ describe('Claude Code Edge Cases', () => {
       await errorClient.connect();
       
       await expect(
-        errorClient.callTool('claude_code', {
+        errorClient.callTool('run', {
           prompt: 'Test prompt',
           workFolder: testDir,
         })
@@ -127,7 +127,7 @@ describe('Claude Code Edge Cases', () => {
       
       // Non-existent directories now throw an error
       await expect(
-        client.callTool('claude_code', {
+        client.callTool('run', {
           prompt: 'Test prompt',
           workFolder: restrictedDir,
         })
@@ -138,7 +138,7 @@ describe('Claude Code Edge Cases', () => {
   describe('Concurrent Requests', () => {
     it('should handle multiple simultaneous requests', async () => {
       const promises = Array(5).fill(null).map((_, i) => 
-        client.callTool('claude_code', {
+        client.callTool('run', {
           prompt: `Create file test${i}.txt`,
           workFolder: testDir,
         })
@@ -155,7 +155,7 @@ describe('Claude Code Edge Cases', () => {
     it('should handle very long prompts', async () => {
       const longPrompt = 'Create a file with content: ' + 'x'.repeat(10000);
       
-      const response = await client.callTool('claude_code', {
+      const response = await client.callTool('run', {
         prompt: longPrompt,
         workFolder: testDir,
       });
@@ -171,7 +171,7 @@ describe('Claude Code Edge Cases', () => {
       // Server resolves paths and checks existence
       // The path /etc/passwd may exist but be a file, not a directory
       await expect(
-        client.callTool('claude_code', {
+        client.callTool('run', {
           prompt: 'Read file',
           workFolder: maliciousPath,
         })

package/src/__tests__/error-cases.test.ts

@@ -33,11 +33,13 @@ vi.mock('@modelcontextprotocol/sdk/types.js', () => ({
     MethodNotFound: 'MethodNotFound',
     InvalidParams: 'InvalidParams'
   },
-  McpError: vi.fn().mockImplementation((code, message) => {
-    const error = new Error(message);
-    (error as any).code = code;
-    return error;
-  })
+  McpError: class extends Error {
+    code: any;
+    constructor(code: any, message: string) {
+      super(message);
+      this.code = code;
+    }
+  }
 }));
 
 const mockExistsSync = vi.mocked(existsSync);
@@ -148,7 +150,7 @@ describe('Error Handling Tests', () => {
       try {
         await callToolHandler({
           params: {
-            name: 'claude_code',
+            name: 'run',
             arguments: {
               prompt: 'test',
               workFolder: '/tmp'
@@ -160,7 +162,7 @@ describe('Error Handling Tests', () => {
         // Check if McpError was called with the process start failure message
         expect(McpError).toHaveBeenCalledWith(
           'InternalError',
-          'Failed to start Claude CLI process'
+          'Failed to start claude CLI process'
         );
       }
     });
@@ -185,7 +187,7 @@ describe('Error Handling Tests', () => {
       await expect(
         handler({
           params: {
-            name: 'claude_code',
+            name: 'run',
             arguments: 'invalid-should-be-object'
           }
         })
@@ -244,7 +246,7 @@ describe('Error Handling Tests', () => {
       await expect(
         handler({
           params: {
-            name: 'claude_code',
+            name: 'run',
             arguments: {
               prompt: 'test',
               workFolder: '/tmp'

package/src/__tests__/process-management.test.ts

@@ -88,7 +88,7 @@ describe('Process Management Tests', () => {
     return { server, module, handlers };
   }
 
-  describe('claude_code tool with PID return', () => {
+  describe('run tool with PID return', () => {
     it('should return PID immediately when starting a process', async () => {
       const { handlers } = await setupServer();
       
@@ -104,7 +104,7 @@ describe('Process Management Tests', () => {
       const callToolHandler = handlers.get('callTool')!;
       const result = await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: 'test prompt',
             workFolder: '/tmp'
@@ -115,7 +115,7 @@ describe('Process Management Tests', () => {
       const response = JSON.parse(result.content[0].text);
       expect(response.pid).toBe(12345);
       expect(response.status).toBe('started');
-      expect(response.message).toBe('Claude Code process started successfully');
+      expect(response.message).toBe('claude process started successfully');
     });
 
     it('should handle process with model parameter', async () => {
@@ -132,7 +132,7 @@ describe('Process Management Tests', () => {
       const callToolHandler = handlers.get('callTool')!;
       await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: 'test prompt',
             workFolder: '/tmp',
@@ -167,7 +167,7 @@ describe('Process Management Tests', () => {
       const callToolHandler = handlers.get('callTool')!;
       const result = await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: japanesePrompt,
             workFolder: '/tmp'
@@ -189,7 +189,7 @@ describe('Process Management Tests', () => {
       // Verify the prompt is stored correctly in process manager
       const getResult = await callToolHandler!({
         params: {
-          name: 'get_claude_result',
+          name: 'get_result',
           arguments: {
             pid: 12360
           }
@@ -240,7 +240,7 @@ describe('Process Management Tests', () => {
       const callToolHandler = handlers.get('callTool')!;
       const result = await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: longJapanesePrompt,
             workFolder: '/tmp',
@@ -260,10 +260,10 @@ describe('Process Management Tests', () => {
         expect.any(Object)
       );
       
-      // Check list_claude_processes truncates long prompts correctly
+      // Check list_processes truncates long prompts correctly
       const listResult = await callToolHandler!({
         params: {
-          name: 'list_claude_processes',
+          name: 'list_processes',
           arguments: {}
         }
       });
@@ -298,7 +298,7 @@ Unicodeテスト: 🎌 🗾 ✨
       const callToolHandler = handlers.get('callTool')!;
       const result = await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: specialPrompt,
             workFolder: '/tmp'
@@ -331,7 +331,7 @@ Unicodeテスト: 🎌 🗾 ✨
       const callToolHandler = handlers.get('callTool')!;
       await expect(callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: 'test prompt',
             workFolder: '/tmp/test'
@@ -341,7 +341,7 @@ Unicodeテスト: 🎌 🗾 ✨
     });
   });
 
-  describe('list_claude_processes tool', () => {
+  describe('list_processes tool', () => {
     it('should list all processes', async () => {
       const { handlers } = await setupServer();
       
@@ -359,7 +359,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Start a process
       await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: 'test prompt for listing',
             workFolder: '/tmp',
@@ -378,7 +378,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // List processes
       const listResult = await callToolHandler!({
         params: {
-          name: 'list_claude_processes',
+          name: 'list_processes',
           arguments: {}
         }
       });
@@ -409,7 +409,7 @@ Unicodeテスト: 🎌 🗾 ✨
       const longPrompt = 'a'.repeat(150);
       await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: longPrompt,
             workFolder: '/tmp'
@@ -420,7 +420,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // List processes
       const listResult = await callToolHandler!({
         params: {
-          name: 'list_claude_processes',
+          name: 'list_processes',
           arguments: {}
         }
       });
@@ -431,7 +431,7 @@ Unicodeテスト: 🎌 🗾 ✨
     });
   });
 
-  describe('get_claude_result tool', () => {
+  describe('get_result tool', () => {
     it('should get process output', async () => {
       const { handlers } = await setupServer();
       
@@ -448,7 +448,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Start a process
       await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: 'test prompt',
             workFolder: '/tmp'
@@ -468,7 +468,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Get result
       const result = await callToolHandler!({
         params: {
-          name: 'get_claude_result',
+          name: 'get_result',
           arguments: {
             pid: 12349
           }
@@ -498,7 +498,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Start a process
       await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: 'test prompt',
             workFolder: '/tmp'
@@ -519,7 +519,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Get result
       const result = await callToolHandler!({
         params: {
-          name: 'get_claude_result',
+          name: 'get_result',
           arguments: {
             pid: 12350
           }
@@ -540,7 +540,7 @@ Unicodeテスト: 🎌 🗾 ✨
       
       await expect(callToolHandler!({
         params: {
-          name: 'get_claude_result',
+          name: 'get_result',
           arguments: {
             pid: 99999
           }
@@ -555,7 +555,7 @@ Unicodeテスト: 🎌 🗾 ✨
       
       await expect(callToolHandler!({
         params: {
-          name: 'get_claude_result',
+          name: 'get_result',
           arguments: {
             pid: 'not-a-number'
           }
@@ -579,7 +579,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Start a process
       await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: 'test prompt',
             workFolder: '/tmp'
@@ -594,7 +594,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Get result
       const result = await callToolHandler!({
         params: {
-          name: 'get_claude_result',
+          name: 'get_result',
           arguments: {
             pid: 12355
           }
@@ -611,7 +611,7 @@ Unicodeテスト: 🎌 🗾 ✨
     });
   });
 
-  describe('kill_claude_process tool', () => {
+  describe('kill_process tool', () => {
     it('should kill a running process', async () => {
       const { handlers } = await setupServer();
       
@@ -628,7 +628,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Start a process
       await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: 'test prompt',
             workFolder: '/tmp'
@@ -639,7 +639,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Kill the process
       const killResult = await callToolHandler!({
         params: {
-          name: 'kill_claude_process',
+          name: 'kill_process',
           arguments: {
             pid: 12351
           }
@@ -668,7 +668,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Start and complete a process
       await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: 'test prompt',
             workFolder: '/tmp'
@@ -682,7 +682,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Try to kill the already completed process
       const killResult = await callToolHandler!({
         params: {
-          name: 'kill_claude_process',
+          name: 'kill_process',
           arguments: {
             pid: 12352
           }
@@ -702,7 +702,7 @@ Unicodeテスト: 🎌 🗾 ✨
       
       await expect(callToolHandler!({
         params: {
-          name: 'kill_claude_process',
+          name: 'kill_process',
           arguments: {
             pid: 99999
           }
@@ -743,7 +743,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Start a process
       await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: 'test prompt',
             workFolder: '/tmp'
@@ -757,7 +757,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Get result to check error was recorded
       const result = await callToolHandler!({
         params: {
-          name: 'get_claude_result',
+          name: 'get_result',
           arguments: {
             pid: 12353
           }