ai-cli-mcp 2.3.1 → 2.3.2

package/dist/__tests__/e2e.test.js

@@ -2,22 +2,17 @@ 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 } from './utils/mcp-client.js';
 import { getSharedMock, cleanupSharedMock } from './utils/persistent-mock.js';
 describe('Claude Code MCP E2E Tests', () => {
     let client;
     let testDir;
-    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-'));
-        // 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();
     });
     afterEach(async () => {
@@ -198,9 +193,7 @@ describe('Integration Tests (Local Only)', () => {
     beforeEach(async () => {
         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 () => {
         if (client) {

package/dist/__tests__/edge-cases.test.js

@@ -2,22 +2,17 @@ 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 } from './utils/mcp-client.js';
 import { getSharedMock, cleanupSharedMock } from './utils/persistent-mock.js';
 describe('Claude Code Edge Cases', () => {
     let client;
     let testDir;
-    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();
     });
     afterEach(async () => {
@@ -80,10 +75,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(errorClient.callTool('run', {
                 prompt: 'Test prompt',

package/dist/__tests__/utils/mcp-client.js

@@ -102,3 +102,20 @@ export class MCPTestClient extends EventEmitter {
         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 = {}) {
+    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/dist/__tests__/version-print.test.js

@@ -2,13 +2,12 @@ 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 } from './utils/mcp-client.js';
 import { getSharedMock } from './utils/persistent-mock.js';
 describe('Version Print on First Use', () => {
     let client;
     let testDir;
     let consoleErrorSpy;
-    const serverPath = 'dist/server.js';
     beforeEach(async () => {
         // Ensure mock exists
         await getSharedMock();
@@ -16,10 +15,7 @@ describe('Version Print on First Use', () => {
         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();
     });
     afterEach(async () => {

package/dist/server.js

@@ -6,7 +6,6 @@ import { spawn } from 'node:child_process';
 import { existsSync, readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join, resolve as pathResolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
 import * as path from 'path';
 import { parseCodexOutput, parseClaudeOutput, parseGeminiOutput } from './parsers.js';
 // Server version - update this when releasing new versions
@@ -766,9 +765,8 @@ export class ClaudeCodeServer {
         await this.server.close();
     }
 }
-// Create and run the server if this is the main module
-const __filename = fileURLToPath(import.meta.url);
-if (process.argv[1] === __filename) {
+// Create and run the server (skip during tests)
+if (!process.env.VITEST) {
     const server = new ClaudeCodeServer();
     server.run().catch(console.error);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-cli-mcp",
-  "version": "2.3.1",
+  "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();
   });
@@ -241,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__/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__/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

@@ -12,7 +12,6 @@ import { spawn, ChildProcess } from 'node:child_process';
 import { existsSync, readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join, resolve as pathResolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
 import * as path from 'path';
 import { parseCodexOutput, parseClaudeOutput, parseGeminiOutput } from './parsers.js';
 
@@ -917,9 +916,8 @@ export class ClaudeCodeServer {
   }
 }
 
-// Create and run the server if this is the main module
-const __filename = fileURLToPath(import.meta.url);
-if (process.argv[1] === __filename) {
+// Create and run the server (skip during tests)
+if (!process.env.VITEST) {
   const server = new ClaudeCodeServer();
   server.run().catch(console.error);
 }