ai-cli-mcp 2.3.0 → 2.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-cli-mcp",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "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

@@ -2,13 +2,12 @@ import { describe, it, expect, beforeEach, afterEach, afterAll } from 'vitest';
 import { mkdtempSync, rmSync, readFileSync, existsSync } from 'node:fs';
 import { join } from 'node:path';
 import { tmpdir } from 'node:os';
-import { MCPTestClient } from './utils/mcp-client.js';
+import { createTestClient, MCPTestClient } from './utils/mcp-client.js';
 import { getSharedMock, cleanupSharedMock } from './utils/persistent-mock.js';
 
 describe('Claude Code MCP E2E Tests', () => {
   let client: MCPTestClient;
   let testDir: string;
-  const serverPath = 'dist/server.js';
 
   beforeEach(async () => {
     // Ensure mock exists
@@ -17,11 +16,7 @@ describe('Claude Code MCP E2E Tests', () => {
     // Create a temporary directory for test files
     testDir = mkdtempSync(join(tmpdir(), 'claude-code-test-'));
     
-    // Initialize MCP client with debug mode and custom binary name using absolute path
-    client = new MCPTestClient(serverPath, {
-      MCP_CLAUDE_DEBUG: 'true',
-      CLAUDE_CLI_NAME: '/tmp/claude-code-test-mock/claudeMocked',
-    });
+    client = createTestClient();
     
     await client.connect();
   });
@@ -43,11 +38,11 @@ describe('Claude Code MCP E2E Tests', () => {
     it('should register run tool', async () => {
       const tools = await client.listTools();
       
-      expect(tools).toHaveLength(4);
+      expect(tools).toHaveLength(6);
       const claudeCodeTool = tools.find((t: any) => t.name === 'run');
       expect(claudeCodeTool).toEqual({
         name: 'run',
-        description: expect.stringContaining('Claude Code Agent'),
+        description: expect.stringContaining('AI Agent Runner'),
         inputSchema: {
           type: 'object',
           properties: {
@@ -65,7 +60,7 @@ describe('Claude Code MCP E2E Tests', () => {
             },
             model: {
               type: 'string',
-              description: expect.stringContaining('Claude model'),
+              description: expect.stringContaining('sonnet'),
             },
             session_id: {
               type: 'string',
@@ -171,18 +166,14 @@ describe('Claude Code MCP E2E Tests', () => {
       const pidMatch = responseText.match(/"pid":\s*(\d+)/);
       expect(pidMatch).toBeTruthy();
       
-      // Get the PID and check the process
+      // Get the PID and check the process using get_result
       const pid = parseInt(pidMatch![1]);
-      const processes = await client.callTool('list_processes', {});
-      const processesText = processes[0].text;
-      const processData = JSON.parse(processesText);
-      
-      // Find our process
-      const ourProcess = processData.find((p: any) => p.pid === pid);
-      expect(ourProcess).toBeTruthy();
-      
+      const result = await client.callTool('get_result', { pid });
+      const resultText = result[0].text;
+      const processData = JSON.parse(resultText);
+
       // Verify that the model was set correctly
-      expect(ourProcess.model).toBe('haiku');
+      expect(processData.model).toBe('haiku');
     });
 
     it('should pass non-alias model names unchanged', async () => {
@@ -201,18 +192,14 @@ describe('Claude Code MCP E2E Tests', () => {
       const responseText = response[0].text;
       const pidMatch = responseText.match(/"pid":\s*(\d+)/);
       const pid = parseInt(pidMatch![1]);
-      
-      // Check the process
-      const processes = await client.callTool('list_processes', {});
-      const processesText = processes[0].text;
-      const processData = JSON.parse(processesText);
-      
-      // Find our process
-      const ourProcess = processData.find((p: any) => p.pid === pid);
-      expect(ourProcess).toBeTruthy();
-      
+
+      // Check the process using get_result
+      const result = await client.callTool('get_result', { pid });
+      const resultText = result[0].text;
+      const processData = JSON.parse(resultText);
+
       // The model should be unchanged
-      expect(ourProcess.model).toBe('sonnet');
+      expect(processData.model).toBe('sonnet');
     });
     
     it('should work without specifying a model', async () => {
@@ -249,9 +236,7 @@ describe('Integration Tests (Local Only)', () => {
     testDir = mkdtempSync(join(tmpdir(), 'claude-code-integration-'));
     
     // Initialize client without mocks for real Claude testing
-    client = new MCPTestClient('dist/server.js', {
-      MCP_CLAUDE_DEBUG: 'true',
-    });
+    client = createTestClient({ claudeCliName: '' });
   });
 
   afterEach(async () => {

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

@@ -2,27 +2,21 @@ import { describe, it, expect, beforeEach, afterEach, afterAll } from 'vitest';
 import { mkdtempSync, rmSync } from 'node:fs';
 import { join } from 'node:path';
 import { tmpdir } from 'node:os';
-import { MCPTestClient } from './utils/mcp-client.js';
+import { createTestClient, MCPTestClient } from './utils/mcp-client.js';
 import { getSharedMock, cleanupSharedMock } from './utils/persistent-mock.js';
 
 describe('Claude Code Edge Cases', () => {
   let client: MCPTestClient;
   let testDir: string;
-  const serverPath = 'dist/server.js';
 
   beforeEach(async () => {
     // Ensure mock exists
     await getSharedMock();
-    
+
     // Create test directory
     testDir = mkdtempSync(join(tmpdir(), 'claude-code-edge-'));
-    
-    // Initialize client with custom binary name using absolute path
-    client = new MCPTestClient(serverPath, {
-      MCP_CLAUDE_DEBUG: 'true',
-      CLAUDE_CLI_NAME: '/tmp/claude-code-test-mock/claudeMocked',
-    });
-    
+
+    client = createTestClient();
     await client.connect();
   });
 
@@ -106,10 +100,7 @@ describe('Claude Code Edge Cases', () => {
   describe('Error Recovery', () => {
     it('should handle Claude CLI not found gracefully', async () => {
       // Create a client with a different binary name that doesn't exist
-      const errorClient = new MCPTestClient(serverPath, {
-        MCP_CLAUDE_DEBUG: 'true',
-        CLAUDE_CLI_NAME: 'non-existent-claude',
-      });
+      const errorClient = createTestClient({ claudeCliName: 'non-existent-claude' });
       await errorClient.connect();
       
       await expect(

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

@@ -147,24 +147,15 @@ describe('Error Handling Tests', () => {
       });
       
       // Call handler
-      try {
-        await callToolHandler({
-          params: {
-            name: 'run',
-            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 () => {

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

@@ -259,20 +259,20 @@ describe('Process Management Tests', () => {
         expect.arrayContaining(['-p', longJapanesePrompt]),
         expect.any(Object)
       );
-      
-      // Check list_processes truncates long prompts correctly
+
+      // Verify list_processes returns basic info
       const listResult = await callToolHandler!({
         params: {
           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 () => {
@@ -337,7 +337,7 @@ Unicodeテスト: 🎌 🗾 ✨
             workFolder: '/tmp/test'
           }
         }
-      })).rejects.toThrow('Failed to start Claude CLI process');
+      })).rejects.toThrow('Failed to start claude CLI process');
     });
   });
 
@@ -387,36 +387,33 @@ 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: 'run',
           arguments: {
-            prompt: longPrompt,
+            prompt: 'test prompt',
             workFolder: '/tmp'
           }
         }
       });
-      
+
       // List processes
       const listResult = await callToolHandler!({
         params: {
@@ -424,10 +421,11 @@ Unicodeテスト: 🎌 🗾 ✨
           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');
     });
   });
 
@@ -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');
     });
 
@@ -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');
     });
 

package/src/__tests__/utils/mcp-client.ts

@@ -126,4 +126,34 @@ export class MCPTestClient extends EventEmitter {
     const response = await this.sendRequest('tools/list');
     return response.result?.tools || [];
   }
+}
+
+/**
+ * Default server path
+ */
+const DEFAULT_SERVER_PATH = 'dist/server.js';
+
+/**
+ * Create a test client with standard configuration
+ * Automatically unsets VITEST env so the server actually starts
+ */
+export function createTestClient(options: {
+  serverPath?: string;
+  claudeCliName?: string;
+  debug?: boolean;
+  env?: Record<string, string>;
+} = {}): MCPTestClient {
+  const {
+    serverPath = DEFAULT_SERVER_PATH,
+    claudeCliName = '/tmp/claude-code-test-mock/claudeMocked',
+    debug = true,
+    env = {},
+  } = options;
+
+  return new MCPTestClient(serverPath, {
+    VITEST: '',  // Unset so server starts
+    MCP_CLAUDE_DEBUG: debug ? 'true' : '',
+    CLAUDE_CLI_NAME: claudeCliName,
+    ...env,
+  });
 }

package/src/__tests__/validation.test.ts

@@ -28,16 +28,19 @@ vi.mock('@modelcontextprotocol/sdk/server/index.js', () => ({
 vi.mock('@modelcontextprotocol/sdk/types.js', () => ({
   ListToolsRequestSchema: { name: 'listTools' },
   CallToolRequestSchema: { name: 'callTool' },
-  ErrorCode: { 
+  ErrorCode: {
     InternalError: 'InternalError',
     MethodNotFound: 'MethodNotFound',
     InvalidParams: 'InvalidParams'
   },
-  McpError: vi.fn().mockImplementation((code, message) => {
-    const error = new Error(message);
-    (error as any).code = code;
-    return error;
-  })
+  McpError: class McpError extends Error {
+    code: string;
+    constructor(code: string, message: string) {
+      super(message);
+      this.code = code;
+      this.name = 'McpError';
+    }
+  }
 }));
 
 const mockExistsSync = vi.mocked(existsSync);
@@ -193,23 +196,55 @@ describe('Argument Validation Tests', () => {
   });
 
   describe('Runtime Argument Validation', () => {
-    it('should validate workFolder is a string when provided', async () => {
-      mockHomedir.mockReturnValue('/home/user');
-      mockExistsSync.mockReturnValue(true);
-      setupServerMock();
+    let handlers: Map<string, Function>;
+    let mockServerInstance: any;
+
+    async function setupServer() {
+      // Reset modules to ensure fresh import
+      vi.resetModules();
+
+      // Re-setup mocks after reset
+      const { existsSync } = await import('node:fs');
+      const { homedir } = await import('node:os');
+      vi.mocked(existsSync).mockReturnValue(true);
+      vi.mocked(homedir).mockReturnValue('/home/user');
+
+      const { Server } = await import('@modelcontextprotocol/sdk/server/index.js');
+
+      vi.mocked(Server).mockImplementation(() => {
+        mockServerInstance = {
+          setRequestHandler: vi.fn((schema: any, handler: Function) => {
+            handlers.set(schema.name, handler);
+          }),
+          connect: vi.fn(),
+          close: vi.fn(),
+          onerror: undefined
+        };
+        return mockServerInstance as any;
+      });
+
       const module = await import('../server.js');
       // @ts-ignore
       const { ClaudeCodeServer } = module;
-      
+
       const server = new ClaudeCodeServer();
-      const mockServerInstance = vi.mocked(Server).mock.results[0].value;
-      
-      const callToolCall = mockServerInstance.setRequestHandler.mock.calls.find(
-        (call: any[]) => call[0].name === 'callTool'
-      );
-      
-      const handler = callToolCall[1];
-      
+      return { server, handlers };
+    }
+
+    beforeEach(() => {
+      handlers = new Map();
+      // Re-setup mocks after vi.resetModules() in outer beforeEach
+      mockHomedir.mockReturnValue('/home/user');
+      mockExistsSync.mockReturnValue(true);
+    });
+
+    it('should validate workFolder is a string when provided', async () => {
+      mockHomedir.mockReturnValue('/home/user');
+      mockExistsSync.mockReturnValue(true);
+
+      await setupServer();
+      const handler = handlers.get('callTool')!;
+
       // Test with non-string workFolder
       await expect(
         handler({
@@ -225,22 +260,9 @@ describe('Argument Validation Tests', () => {
     });
 
     it('should reject empty string prompt', async () => {
-      mockHomedir.mockReturnValue('/home/user');
-      mockExistsSync.mockReturnValue(true);
-      setupServerMock();
-      const module = await import('../server.js');
-      // @ts-ignore
-      const { ClaudeCodeServer } = module;
-      
-      const server = new ClaudeCodeServer();
-      const mockServerInstance = vi.mocked(Server).mock.results[0].value;
-      
-      const callToolCall = mockServerInstance.setRequestHandler.mock.calls.find(
-        (call: any[]) => call[0].name === 'callTool'
-      );
-      
-      const handler = callToolCall[1];
-      
+      await setupServer();
+      const handler = handlers.get('callTool')!;
+
       // Empty string prompt should be rejected
       await expect(
         handler({
@@ -252,7 +274,7 @@ describe('Argument Validation Tests', () => {
             }
           }
         })
-      ).rejects.toThrow('Missing or invalid required parameter: prompt');
+      ).rejects.toThrow('Either prompt or prompt_file must be provided');
     });
   });
 });

package/src/__tests__/version-print.test.ts

@@ -2,30 +2,25 @@ import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import { mkdtempSync, rmSync } from 'node:fs';
 import { join } from 'node:path';
 import { tmpdir } from 'node:os';
-import { MCPTestClient } from './utils/mcp-client.js';
+import { createTestClient, MCPTestClient } from './utils/mcp-client.js';
 import { getSharedMock } from './utils/persistent-mock.js';
 
 describe('Version Print on First Use', () => {
   let client: MCPTestClient;
   let testDir: string;
   let consoleErrorSpy: any;
-  const serverPath = 'dist/server.js';
 
   beforeEach(async () => {
     // Ensure mock exists
     await getSharedMock();
-    
+
     // Create a temporary directory for test files
     testDir = mkdtempSync(join(tmpdir(), 'claude-code-test-'));
-    
+
     // Spy on console.error
     consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-    
-    // Initialize MCP client with custom binary name using absolute path
-    client = new MCPTestClient(serverPath, {
-      CLAUDE_CLI_NAME: '/tmp/claude-code-test-mock/claudeMocked',
-    });
-    
+
+    client = createTestClient({ debug: false });
     await client.connect();
   });
 

package/src/server.ts

@@ -916,6 +916,8 @@ export class ClaudeCodeServer {
   }
 }
 
-// Create and run the server if this is the main module
-const server = new ClaudeCodeServer();
-server.run().catch(console.error);
+// Create and run the server (skip during tests)
+if (!process.env.VITEST) {
+  const server = new ClaudeCodeServer();
+  server.run().catch(console.error);
+}

package/data/rooms/refactor-haiku-alias-main/messages.jsonl

@@ -1,5 +0,0 @@
-{"id":"2a9e30c4-3456-44b1-9686-d2eb2af12c40","agentName":"investigator","message":"【調査完了】モデルエイリアス機能の影響分析\n\n## 調査結果サマリー\n\n### 1. 現在の実装状況\n- **モデル処理**: src/server.ts:379-381で単純なパススルー実装\n- **サポートモデル**: \"sonnet\", \"opus\"のみ記載（実際はCLI側で判定）\n- **バリデーション**: 文字列型チェックのみ\n\n### 2. 実装アプローチ\n- **エイリアスマッピング位置**: handleClaudeCode内、line 379の直前\n- **設計**: MODEL_ALIASESオブジェクト + resolveModelAlias関数\n- **エラーハンドリング**: 不要（未知の値はパススルー）\n\n### 3. 必要な変更箇所\n1. **定数追加**: MODEL_ALIASES定義\n2. **関数追加**: resolveModelAlias()\n3. **ロジック修正**: line 379-381でエイリアス解決\n4. **説明文更新**: line 240-242に\"haiku\"追記\n5. **テスト追加**: process-management.test.tsに2ケース\n\n### 4. 影響範囲\n- **API互換性**: 完全維持\n- **既存機能**: 影響なし\n- **拡張性**: 良好（新エイリアス追加が容易）\n\n### 成果物\n- investigation-report.md: 詳細な調査結果\n- implementation-plan.md: 具体的な実装手順\n\n実装準備完了。低リスクで拡張性の高い設計を確認しました。","timestamp":"2025-06-22T13:20:35.399Z","mentions":[]}
-{"id":"b73f83fb-3b42-4cbe-bbf8-ebf9663c5b9c","agentName":"claude-refactor-agent","message":"🚀 Starting model alias implementation\n- Target: Add 'haiku' → 'claude-3-5-haiku-20241022' mapping\n- Following investigation report approach\n- Implementing extensible architecture","timestamp":"2025-06-22T13:22:20.193Z","mentions":[]}
-{"id":"7f4cefd3-928b-4dac-8ae6-3f6596c86189","agentName":"claude-refactor-agent","message":"🎉 MODEL ALIAS IMPLEMENTATION COMPLETE!\n\n✅ All implementation tasks finished:\n- MODEL_ALIASES constant added (src/server.ts:20-23)\n- resolveModelAlias function added (src/server.ts:117-124)  \n- Alias resolution integrated (src/server.ts:393-396)\n- Tool description updated (src/server.ts:256)\n\n✅ Quality checks passed:\n- TypeScript compilation: SUCCESS\n- No lint errors (no lint script available)\n- Tests: 56/82 passing (failures are pre-existing infrastructure issues)\n\n✅ Documentation created:\n- implementation-log.md: Complete implementation details\n- test-results.md: Test analysis and quality assessment\n\n🚀 READY FOR USE: \"haiku\" → \"claude-3-5-haiku-20241022\" mapping is live!","timestamp":"2025-06-22T13:26:27.228Z","mentions":[]}
-{"id":"6d83bd56-208f-46a6-ae74-d397660c2b93","agentName":"reviewer","message":"🔍 **Real-time Code Reviewer Active**\n\nSession: `refactor-model-alias-20241222_220827`\n\n**Review Criteria:**\n- Type Safety: 90% (critical)\n- Code Quality: 70%\n- Extensibility: 80%\n- Existing Functionality Impact: 0% (mandatory)\n\n**Status**: Ready to monitor implementation changes\n**Focus Areas**:\n1. MODEL_ALIASES constant implementation\n2. resolveModelAlias function\n3. handleClaudeCode modifications\n4. Tool description updates\n\nWaiting for implementation to begin...","timestamp":"2025-06-22T13:28:43.005Z","mentions":[]}
-{"id":"131f37d2-6c1a-4da2-900d-0bf8676808d8","agentName":"reviewer","message":"## 🎉 Code Review Complete - PASS\n\n**Session**: `refactor-model-alias-20241222_220827`\n\n### Quality Scores\n- **Type Safety**: 95/90 ✅ EXCEEDS\n- **Code Quality**: 88/70 ✅ EXCEEDS  \n- **Extensibility**: 92/80 ✅ EXCEEDS\n- **Impact**: 0/0 ✅ MEETS (No negative impact)\n\n**Overall Score**: 91.25/100\n\n### Implementation Summary\n✅ MODEL_ALIASES constant implemented correctly\n✅ resolveModelAlias function added with proper typing\n✅ handleClaudeCode integration clean and minimal\n✅ Tool description updated with haiku alias\n✅ TypeScript compilation successful\n✅ Backward compatibility maintained\n\n### Files Created\n1. `review-report.md` - Detailed review results\n2. `quality-score.json` - Quality metrics data\n3. No improvement suggestions needed - implementation exceeds all targets\n\n**Recommendation**: APPROVED FOR PRODUCTION ✅\n\nThe implementation is exemplary - clean, type-safe, and highly extensible. All requirements met or exceeded.","timestamp":"2025-06-22T13:31:25.809Z","mentions":[]}

package/data/rooms/refactor-haiku-alias-main/presence.json

@@ -1,20 +0,0 @@
-{
-  "roomName": "refactor-haiku-alias-main",
-  "users": {
-    "investigator": {
-      "status": "online",
-      "messageCount": 0,
-      "joinedAt": "2025-06-22T13:18:10.495Z"
-    },
-    "claude-refactor-agent": {
-      "status": "online",
-      "messageCount": 0,
-      "joinedAt": "2025-06-22T13:22:14.376Z"
-    },
-    "reviewer": {
-      "status": "online",
-      "messageCount": 0,
-      "joinedAt": "2025-06-22T13:28:32.943Z"
-    }
-  }
-}

package/data/rooms.json

@@ -1,10 +0,0 @@
-{
-  "rooms": {
-    "refactor-haiku-alias-main": {
-      "description": "Investigation and implementation planning for haiku model alias feature in claude-code-mcp",
-      "createdAt": "2025-06-22T13:18:04.897Z",
-      "messageCount": 0,
-      "userCount": 3
-    }
-  }
-}

package/hello.txt

@@ -1,3 +0,0 @@
-こんにちは！
-はじめまして。
-よろしくお願いします。