ai-cli-mcp 2.2.0 → 2.3.1

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);
@@ -145,24 +147,15 @@ describe('Error Handling Tests', () => {
       });
       
       // Call handler
-      try {
-        await callToolHandler({
-          params: {
-            name: 'claude_code',
-            arguments: {
-              prompt: 'test',
-              workFolder: '/tmp'
-            }
+      await expect(callToolHandler({
+        params: {
+          name: 'run',
+          arguments: {
+            prompt: 'test',
+            workFolder: '/tmp'
           }
-        });
-        expect.fail('Should have thrown');
-      } catch (err: any) {
-        // Check if McpError was called with the process start failure message
-        expect(McpError).toHaveBeenCalledWith(
-          'InternalError',
-          'Failed to start Claude CLI process'
-        );
-      }
+        }
+      })).rejects.toThrow('Failed to start claude CLI process');
     });
 
     it('should handle invalid argument types', async () => {
@@ -185,7 +178,7 @@ describe('Error Handling Tests', () => {
       await expect(
         handler({
           params: {
-            name: 'claude_code',
+            name: 'run',
             arguments: 'invalid-should-be-object'
           }
         })
@@ -244,7 +237,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',
@@ -259,20 +259,20 @@ describe('Process Management Tests', () => {
         expect.arrayContaining(['-p', longJapanesePrompt]),
         expect.any(Object)
       );
-      
-      // Check list_claude_processes truncates long prompts correctly
+
+      // Verify list_processes returns basic info
       const listResult = await callToolHandler!({
         params: {
-          name: 'list_claude_processes',
+          name: 'list_processes',
           arguments: {}
         }
       });
-      
+
       const processes = JSON.parse(listResult.content[0].text);
       const process = processes.find((p: any) => p.pid === 12361);
-      expect(process.prompt).toHaveLength(103); // 100 chars + '...'
-      expect(process.prompt.endsWith('...')).toBe(true);
-      expect(process.prompt).toContain('タスク：ファイル管理システムの作成');
+      expect(process.pid).toBe(12361);
+      expect(process.agent).toBe('claude');
+      expect(process.status).toBe('running');
     });
 
     it('should handle prompts with special characters and escape sequences', async () => {
@@ -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,17 +331,17 @@ Unicodeテスト: 🎌 🗾 ✨
       const callToolHandler = handlers.get('callTool')!;
       await expect(callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: 'test prompt',
             workFolder: '/tmp/test'
           }
         }
-      })).rejects.toThrow('Failed to start Claude CLI process');
+      })).rejects.toThrow('Failed to start claude CLI process');
     });
   });
 
-  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: {}
         }
       });
@@ -387,51 +387,49 @@ Unicodeテスト: 🎌 🗾 ✨
       expect(processes).toHaveLength(1);
       expect(processes[0].pid).toBe(12347);
       expect(processes[0].status).toBe('running');
-      expect(processes[0].prompt).toContain('test prompt for listing');
-      expect(processes[0].model).toBe('sonnet');
-      expect(processes[0].session_id).toBe('list-test-session-789');
+      expect(processes[0].agent).toBe('claude');
     });
 
-    it('should truncate long prompts in list', async () => {
+    it('should list process with correct agent type', async () => {
       const { handlers } = await setupServer();
-      
+
       const mockProcess = new EventEmitter() as any;
       mockProcess.pid = 12348;
       mockProcess.stdout = new EventEmitter();
       mockProcess.stderr = new EventEmitter();
       mockProcess.kill = vi.fn();
-      
+
       mockSpawn.mockReturnValue(mockProcess);
-      
+
       const callToolHandler = handlers.get('callTool');
-      
-      // Start a process with a very long prompt
-      const longPrompt = 'a'.repeat(150);
+
+      // Start a process
       await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
-            prompt: longPrompt,
+            prompt: 'test prompt',
             workFolder: '/tmp'
           }
         }
       });
-      
+
       // List processes
       const listResult = await callToolHandler!({
         params: {
-          name: 'list_claude_processes',
+          name: 'list_processes',
           arguments: {}
         }
       });
-      
+
       const processes = JSON.parse(listResult.content[0].text);
-      expect(processes[0].prompt).toHaveLength(103); // 100 chars + '...'
-      expect(processes[0].prompt.endsWith('...')).toBe(true);
+      expect(processes[0].pid).toBe(12348);
+      expect(processes[0].agent).toBe('claude');
+      expect(processes[0].status).toBe('running');
     });
   });
 
-  describe('get_claude_result tool', () => {
+  describe('get_result tool', () => {
     it('should get process output', async () => {
       const { handlers } = await setupServer();
       
@@ -448,7 +446,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Start a process
       await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: 'test prompt',
             workFolder: '/tmp'
@@ -468,7 +466,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Get result
       const result = await callToolHandler!({
         params: {
-          name: 'get_claude_result',
+          name: 'get_result',
           arguments: {
             pid: 12349
           }
@@ -478,7 +476,7 @@ Unicodeテスト: 🎌 🗾 ✨
       const processInfo = JSON.parse(result.content[0].text);
       expect(processInfo.pid).toBe(12349);
       expect(processInfo.status).toBe('running');
-      expect(processInfo.claudeOutput).toEqual(claudeJsonOutput);
+      expect(processInfo.agentOutput).toEqual(claudeJsonOutput);
       expect(processInfo.session_id).toBe('test-session-123');
     });
 
@@ -498,7 +496,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Start a process
       await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: 'test prompt',
             workFolder: '/tmp'
@@ -519,7 +517,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Get result
       const result = await callToolHandler!({
         params: {
-          name: 'get_claude_result',
+          name: 'get_result',
           arguments: {
             pid: 12350
           }
@@ -529,7 +527,7 @@ Unicodeテスト: 🎌 🗾 ✨
       const processInfo = JSON.parse(result.content[0].text);
       expect(processInfo.status).toBe('completed');
       expect(processInfo.exitCode).toBe(0);
-      expect(processInfo.claudeOutput).toEqual(completedJsonOutput);
+      expect(processInfo.agentOutput).toEqual(completedJsonOutput);
       expect(processInfo.session_id).toBe('completed-session-456');
     });
 
@@ -540,7 +538,7 @@ Unicodeテスト: 🎌 🗾 ✨
       
       await expect(callToolHandler!({
         params: {
-          name: 'get_claude_result',
+          name: 'get_result',
           arguments: {
             pid: 99999
           }
@@ -555,7 +553,7 @@ Unicodeテスト: 🎌 🗾 ✨
       
       await expect(callToolHandler!({
         params: {
-          name: 'get_claude_result',
+          name: 'get_result',
           arguments: {
             pid: 'not-a-number'
           }
@@ -579,7 +577,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Start a process
       await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: 'test prompt',
             workFolder: '/tmp'
@@ -594,7 +592,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Get result
       const result = await callToolHandler!({
         params: {
-          name: 'get_claude_result',
+          name: 'get_result',
           arguments: {
             pid: 12355
           }
@@ -611,7 +609,7 @@ Unicodeテスト: 🎌 🗾 ✨
     });
   });
 
-  describe('kill_claude_process tool', () => {
+  describe('kill_process tool', () => {
     it('should kill a running process', async () => {
       const { handlers } = await setupServer();
       
@@ -628,7 +626,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Start a process
       await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: 'test prompt',
             workFolder: '/tmp'
@@ -639,7 +637,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Kill the process
       const killResult = await callToolHandler!({
         params: {
-          name: 'kill_claude_process',
+          name: 'kill_process',
           arguments: {
             pid: 12351
           }
@@ -668,7 +666,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Start and complete a process
       await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: 'test prompt',
             workFolder: '/tmp'
@@ -682,7 +680,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 +700,7 @@ Unicodeテスト: 🎌 🗾 ✨
       
       await expect(callToolHandler!({
         params: {
-          name: 'kill_claude_process',
+          name: 'kill_process',
           arguments: {
             pid: 99999
           }
@@ -743,7 +741,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Start a process
       await callToolHandler!({
         params: {
-          name: 'claude_code',
+          name: 'run',
           arguments: {
             prompt: 'test prompt',
             workFolder: '/tmp'
@@ -757,7 +755,7 @@ Unicodeテスト: 🎌 🗾 ✨
       // Get result to check error was recorded
       const result = await callToolHandler!({
         params: {
-          name: 'get_claude_result',
+          name: 'get_result',
           arguments: {
             pid: 12353
           }