Merge pull request #51 from michaellatman/devin/1734011974-fix-env-vars

fix: use 'env' instead of 'envVars' in Claude desktop config

.github/workflows/jest-tests.yml

@@ -0,0 +1,23 @@
+name: Jest Tests
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '18'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run Jest tests
+        run: npm test

jest.config.mjs

@@ -16,7 +16,6 @@ const config = {
   },
   testMatch: ['**/__tests__/**/*.test.ts'],
   testPathIgnorePatterns: ['/node_modules/', '/loaders/'],
-  setupFilesAfterEnv: ['<rootDir>/test/setup.ts'],
 };
 
 export default config; 

package.json

@@ -6,6 +6,7 @@
   "scripts": {
     "build": "tsc && chmod +x dist/index.js",
     "start": "node dist/index.js",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest --config jest.config.mjs",
     "test:list": "node --loader ts-node/esm src/index.ts list",
     "test:install": "node --loader ts-node/esm src/index.ts install",
     "test:installed": "node --loader ts-node/esm src/index.ts installed",
@@ -41,7 +42,7 @@
     "@types/inquirer": "^8.2.4",
     "@types/inquirer-autocomplete-prompt": "^3.0.3",
     "@types/jest": "^29.5.14",
-    "@types/node": "^14.0.0",
+    "@types/node": "^14.18.63",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.1"

src/utils/__tests__/config-manager.test.ts

@@ -0,0 +1,42 @@
+import { jest, describe, it, expect, beforeEach } from '@jest/globals';
+import { ConfigManager } from '../config-manager';
+import { Package } from '../../types/package';
+import fs from 'fs';
+import path from 'path';
+
+jest.mock('fs');
+jest.mock('path');
+
+describe('ConfigManager', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('installPackage', () => {
+    it('should create config with "env" key for environment variables', async () => {
+      const mockPackage: Package = {
+        name: 'test-package',
+        description: 'Test package for config manager',
+        runtime: 'node',
+        vendor: 'test-vendor',
+        sourceUrl: 'https://github.com/test/test-package',
+        homepage: 'https://test-package.com',
+        license: 'MIT'
+      };
+
+      const mockEnvVars = {
+        TEST_KEY: 'test-value'
+      };
+
+      const writeFileSpy = jest.spyOn(fs, 'writeFileSync');
+
+      await ConfigManager.installPackage(mockPackage, mockEnvVars);
+
+      expect(writeFileSpy).toHaveBeenCalled();
+      const writtenConfig = JSON.parse(writeFileSpy.mock.calls[0][1] as string);
+      expect(writtenConfig.mcpServers['test-package'].env).toBeDefined();
+      expect(writtenConfig.mcpServers['test-package'].envVars).toBeUndefined();
+      expect(writtenConfig.mcpServers['test-package'].env).toEqual(mockEnvVars);
+    });
+  });
+});

src/utils/config-manager.ts

@@ -7,7 +7,7 @@ export interface MCPServer {
     runtime: 'node' | 'python';
     command?: string;
     args?: string[];
-    envVars?: Record<string, string>;
+    env?: Record<string, string>;
 }
 
 export interface MCPConfig {
@@ -106,10 +106,10 @@ export class ConfigManager {
     static async installPackage(pkg: Package, envVars?: Record<string, string>): Promise<void> {
         const config = this.readConfig();
         const serverName = pkg.name.replace(/\//g, '-');
-        
+
         const serverConfig: MCPServer = {
             runtime: pkg.runtime,
-            envVars
+            env: envVars
         };
 
         // Add command and args based on runtime
@@ -128,12 +128,12 @@ export class ConfigManager {
     static async uninstallPackage(packageName: string): Promise<void> {
         const config = this.readConfig();
         const serverName = packageName.replace(/\//g, '-');
-        
+
         if (!config.mcpServers || !config.mcpServers[serverName]) {
             console.log(`Package ${packageName} is not installed.`);
             return;
         }
-        
+
         delete config.mcpServers[serverName];
         this.writeConfig(config);
     }