genexus-mcp 2.50.0 → 2.51.0

package/cli/lib/client-adapters.js

@@ -0,0 +1,189 @@
+const fs = require('fs');
+
+class BaseClientAdapter {
+    apply(_client, _launcher, _targetConfigPath, _opts = {}) {
+        throw new Error('apply() must be implemented by subclass');
+    }
+    remove(_client, _opts = {}) {
+        throw new Error('remove() must be implemented by subclass');
+    }
+    read(_client, _serverName) {
+        throw new Error('read() must be implemented by subclass');
+    }
+}
+
+class McpServersJsonAdapter extends BaseClientAdapter {
+    constructor(configModule) {
+        super();
+        this.config = configModule || require('./config');
+    }
+    apply(client, launcher, targetConfigPath, opts = {}) {
+        return this.config.applyMcpServersJson(client.path, launcher, targetConfigPath, opts);
+    }
+    remove(client, opts = {}) {
+        return this.config.removeMcpServersJson(client.path, opts);
+    }
+    read(client, serverName) {
+        if (!fs.existsSync(client.path)) return null;
+        const parsed = this.config.readJsonFileSafe(client.path);
+        if (!parsed || typeof parsed !== 'object') return null;
+        let entry = parsed.mcpServers && parsed.mcpServers[serverName];
+        if (!entry && serverName === 'genexus18mcp') {
+            const legacyGx = parsed.mcpServers && parsed.mcpServers.genexus;
+            if (legacyGx && !this.config.isThirdPartyMcpEntry(legacyGx)) entry = legacyGx;
+            else if (parsed.mcpServers && parsed.mcpServers.genexus18) entry = parsed.mcpServers.genexus18;
+        }
+        if (!entry) return null;
+        return {
+            command: entry.command,
+            args: Array.isArray(entry.args) ? entry.args : [],
+            env: (entry.env && typeof entry.env === 'object') ? entry.env : {}
+        };
+    }
+}
+
+class VsCodeServersAdapter extends BaseClientAdapter {
+    constructor(configModule) {
+        super();
+        this.config = configModule || require('./config');
+    }
+    apply(client, launcher, targetConfigPath, opts = {}) {
+        return this.config.applyVsCodeServersJson(client.path, launcher, targetConfigPath, opts);
+    }
+    remove(client, opts = {}) {
+        return this.config.removeVsCodeServersJson(client.path, opts);
+    }
+    read(client, serverName) {
+        if (!fs.existsSync(client.path)) return null;
+        const parsed = this.config.readJsonFileSafe(client.path);
+        if (!parsed || typeof parsed !== 'object') return null;
+        let entry = parsed.servers && parsed.servers[serverName];
+        if (!entry && serverName === 'genexus18mcp') {
+            const legacyGx = parsed.servers && parsed.servers.genexus;
+            if (legacyGx && !this.config.isThirdPartyMcpEntry(legacyGx)) entry = legacyGx;
+            else if (parsed.servers && parsed.servers.genexus18) entry = parsed.servers.genexus18;
+        }
+        if (!entry) return null;
+        return {
+            command: entry.command,
+            args: Array.isArray(entry.args) ? entry.args : [],
+            env: (entry.env && typeof entry.env === 'object') ? entry.env : {}
+        };
+    }
+}
+
+class OpenCodeJsoncAdapter extends BaseClientAdapter {
+    constructor(configModule) {
+        super();
+        this.config = configModule || require('./config');
+    }
+    apply(client, launcher, targetConfigPath, opts = {}) {
+        return this.config.applyOpenCodeJson(client.path, launcher, targetConfigPath, opts);
+    }
+    remove(client, opts = {}) {
+        return this.config.removeOpenCodeJson(client.path, opts);
+    }
+    read(client, serverName) {
+        if (!fs.existsSync(client.path)) return null;
+        const parsed = this.config.readJsonFileSafe(client.path);
+        if (!parsed || typeof parsed !== 'object' || !parsed.mcp || typeof parsed.mcp !== 'object') return null;
+        const nested = parsed.mcp.servers && typeof parsed.mcp.servers === 'object' && !Array.isArray(parsed.mcp.servers);
+        const container = nested ? parsed.mcp.servers : parsed.mcp;
+        let entry = container[serverName];
+        if (!entry && serverName === 'genexus18mcp') {
+            const legacyGx = container.genexus;
+            if (legacyGx && !this.config.isThirdPartyMcpEntry(legacyGx)) entry = legacyGx;
+            else if (container.genexus18) entry = container.genexus18;
+        }
+        if (!entry) return null;
+        const cmd = Array.isArray(entry.command) ? entry.command[0] : entry.command;
+        const args = Array.isArray(entry.command) ? entry.command.slice(1) : (Array.isArray(entry.args) ? entry.args : []);
+        const env = (entry.environment && typeof entry.environment === 'object') ? entry.environment
+            : ((entry.env && typeof entry.env === 'object') ? entry.env : {});
+        return { command: cmd, args, env };
+    }
+}
+
+class CodexTomlAdapter extends BaseClientAdapter {
+    constructor(configModule) {
+        super();
+        this.config = configModule || require('./config');
+    }
+    apply(client, launcher, targetConfigPath, opts = {}) {
+        return this.config.applyCodexToml(client.path, launcher, targetConfigPath, opts);
+    }
+    remove(client, opts = {}) {
+        return this.config.removeCodexToml(client.path, opts);
+    }
+    read(client, serverName) {
+        if (!fs.existsSync(client.path)) return null;
+        let content = '';
+        try {
+            content = fs.readFileSync(client.path, 'utf8');
+        } catch {
+            return null;
+        }
+        let parsed = this.config.extractCodexTomlEntry(content, serverName);
+        if (!parsed && serverName === 'genexus18mcp') {
+            const legacyGx = this.config.extractCodexTomlEntry(content, 'genexus');
+            if (legacyGx && !this.config.isThirdPartyMcpEntry(legacyGx)) parsed = legacyGx;
+            else {
+                const legacyGx18 = this.config.extractCodexTomlEntry(content, 'genexus18');
+                if (legacyGx18) parsed = legacyGx18;
+            }
+        }
+        if (!parsed) return null;
+        return {
+            command: parsed.command,
+            args: Array.isArray(parsed.args) ? parsed.args : [],
+            env: (parsed.env && typeof parsed.env === 'object') ? parsed.env : {}
+        };
+    }
+}
+
+const adapters = {
+    'mcpServers': new McpServersJsonAdapter(),
+    'vscode-servers': new VsCodeServersAdapter(),
+    'opencode': new OpenCodeJsoncAdapter(),
+    'codex-toml': new CodexTomlAdapter()
+};
+
+function getClientAdapter(format) {
+    const adapter = adapters[format];
+    if (!adapter) {
+        throw new Error(`Unknown client format: ${format}`);
+    }
+    return adapter;
+}
+
+class ClientConfigManager {
+    constructor(configModule) {
+        this.config = configModule || require('./config');
+    }
+
+    apply(client, launcher, targetConfigPath, opts = {}) {
+        const adapter = getClientAdapter(client.format);
+        return adapter.apply(client, launcher, targetConfigPath, opts);
+    }
+
+    remove(client, opts = {}) {
+        const adapter = getClientAdapter(client.format);
+        return adapter.remove(client, opts);
+    }
+
+    read(client, serverName) {
+        if (client.writeSupported === false) return null;
+        const adapter = getClientAdapter(client.format);
+        return adapter.read(client, serverName);
+    }
+}
+
+module.exports = {
+    BaseClientAdapter,
+    McpServersJsonAdapter,
+    VsCodeServersAdapter,
+    OpenCodeJsoncAdapter,
+    CodexTomlAdapter,
+    getClientAdapter,
+    ClientConfigManager
+};

package/cli/lib/client-adapters.test.js

@@ -0,0 +1,50 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const path = require('node:path');
+const fs = require('node:fs');
+const os = require('node:os');
+const {
+    getClientAdapter,
+    McpServersJsonAdapter,
+    VsCodeServersAdapter,
+    OpenCodeJsoncAdapter,
+    CodexTomlAdapter,
+    ClientConfigManager
+} = require('./client-adapters');
+
+test('getClientAdapter returns correct strategy for each format', () => {
+    assert.ok(getClientAdapter('mcpServers') instanceof McpServersJsonAdapter);
+    assert.ok(getClientAdapter('vscode-servers') instanceof VsCodeServersAdapter);
+    assert.ok(getClientAdapter('opencode') instanceof OpenCodeJsoncAdapter);
+    assert.ok(getClientAdapter('codex-toml') instanceof CodexTomlAdapter);
+});
+
+test('ClientConfigManager applies and reads mcpServers format cleanly', () => {
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gx-cli-test-'));
+    const configPath = path.join(tmpDir, 'mcp.json');
+    const client = { id: 'test-cursor', name: 'Test Cursor', format: 'mcpServers', path: configPath };
+    const launcher = { command: 'node', args: ['run.js'] };
+
+    try {
+        const manager = new ClientConfigManager();
+        manager.apply(client, launcher, 'C:\\MyKb\\config.json', { serverName: 'genexus18mcp' });
+
+        const raw = fs.readFileSync(configPath, 'utf8');
+        const parsed = JSON.parse(raw);
+        assert.ok(parsed.mcpServers);
+        assert.ok(parsed.mcpServers.genexus18mcp);
+        assert.equal(parsed.mcpServers.genexus18mcp.command, 'node');
+
+        const readEntry = manager.read(client, 'genexus18mcp');
+        assert.ok(readEntry);
+        assert.equal(readEntry.command, 'node');
+
+        const wasRemoved = manager.remove(client, { serverName: 'genexus18mcp' });
+        assert.equal(wasRemoved, true);
+
+        const afterRemove = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+        assert.equal(afterRemove.mcpServers.genexus18mcp, undefined);
+    } finally {
+        try { fs.rmSync(tmpDir, { recursive: true, force: true }); } catch { }
+    }
+});

package/cli/lib/config.js

@@ -861,33 +861,13 @@ function unpatchClientConfig(opts = {}) {
 }
 
 function applyClientEntry(client, launcher, targetConfigPath, opts = {}) {
-    switch (client.format) {
-        case 'mcpServers':
-            return applyMcpServersJson(client.path, launcher, targetConfigPath, opts);
-        case 'opencode':
-            return applyOpenCodeJson(client.path, launcher, targetConfigPath, opts);
-        case 'codex-toml':
-            return applyCodexToml(client.path, launcher, targetConfigPath, opts);
-        case 'vscode-servers':
-            return applyVsCodeServersJson(client.path, launcher, targetConfigPath, opts);
-        default:
-            throw new Error(`Unknown client format: ${client.format}`);
-    }
+    const { getClientAdapter } = require('./client-adapters');
+    return getClientAdapter(client.format).apply(client, launcher, targetConfigPath, opts);
 }
 
 function removeClientEntry(client, opts = {}) {
-    switch (client.format) {
-        case 'mcpServers':
-            return removeMcpServersJson(client.path, opts);
-        case 'opencode':
-            return removeOpenCodeJson(client.path, opts);
-        case 'codex-toml':
-            return removeCodexToml(client.path, opts);
-        case 'vscode-servers':
-            return removeVsCodeServersJson(client.path, opts);
-        default:
-            throw new Error(`Unknown client format: ${client.format}`);
-    }
+    const { getClientAdapter } = require('./client-adapters');
+    return getClientAdapter(client.format).remove(client, opts);
 }
 
 function applyMcpServersJson(filePath, launcher, targetConfigPath, { serverName = DEFAULT_MCP_SERVER_NAME, force = false } = {}) {
@@ -1534,5 +1514,17 @@ module.exports = {
     getLauncher,
     readClientCommandEntry,
     isOurMcpEntry,
-    DEFAULT_MCP_SERVER_NAME
+    DEFAULT_MCP_SERVER_NAME,
+    applyMcpServersJson,
+    removeMcpServersJson,
+    applyVsCodeServersJson,
+    removeVsCodeServersJson,
+    applyOpenCodeJson,
+    removeOpenCodeJson,
+    applyCodexToml,
+    removeCodexToml,
+    extractCodexTomlEntry,
+    isThirdPartyMcpEntry,
+    applyClientEntry,
+    removeClientEntry
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genexus-mcp",
-  "version": "2.50.0",
+  "version": "2.51.0",
   "mcpName": "io.github.lennix1337/genexus",
   "description": "GeneXus 18 MCP server — read, edit, and analyze GeneXus knowledge base objects (transactions, web panels, procedures, SDTs) directly from Claude, Cursor, and other AI agents over the Model Context Protocol.",
   "keywords": [
@@ -30,7 +30,7 @@
     "automation"
   ],
   "scripts": {
-    "test": "node --test cli/run.test.js",
+    "test": "node --test cli/run.test.js cli/lib/client-adapters.test.js",
     "lint": "eslint cli scripts eslint.config.js --max-warnings=0",
     "test:one": "node scripts/test-one.js",
     "prepack": "node scripts/clean-package.js",

package/publish/GxMcp.Gateway.deps.json

@@ -7,7 +7,7 @@
   "targets": {
     ".NETCoreApp,Version=v8.0": {},
     ".NETCoreApp,Version=v8.0/win-x64": {
-      "GxMcp.Gateway/2.50.0": {
+      "GxMcp.Gateway/2.51.0": {
         "dependencies": {
           "Newtonsoft.Json": "13.0.3",
           "System.Management": "10.0.5",
@@ -66,7 +66,7 @@
     }
   },
   "libraries": {
-    "GxMcp.Gateway/2.50.0": {
+    "GxMcp.Gateway/2.51.0": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

package/publish/config.json

@@ -1,17 +1,17 @@
 {
-  "Logging": {
-    "Level": "Debug",
-    "Path": "logs"
-  },
-  "Server": {
-    "McpStdio": true,
-    "HttpPort": 5000
+  "Environment": {
+    "KBPath": "C:\\\\KBs\\\\YourKB"
   },
   "GeneXus": {
     "WorkerExecutable": "C:\\Projetos\\Genexus18MCP\\publish\\\\worker\\\\GxMcp.Worker.exe",
     "InstallationPath": "C:\\\\Program Files (x86)\\\\GeneXus\\\\GeneXus18"
   },
-  "Environment": {
-    "KBPath": "C:\\\\KBs\\\\YourKB"
+  "Server": {
+    "McpStdio": true,
+    "HttpPort": 5000
+  },
+  "Logging": {
+    "Level": "Debug",
+    "Path": "logs"
   }
 }