0xray 3.0.14 → 3.1.1

package/src/mcps/auto-format.server.ts

@@ -40,7 +40,7 @@ class XrayAutoFormatServer {
   constructor() {
     this.server = new Server(
       {
-        name: "auto-format", version: "1.22.67",
+        name: "auto-format", version: "3.1.0",
       },
       {
         capabilities: {
@@ -521,7 +521,7 @@ ${checkResults.details.map((d) => `• ${d}`).join("\n")}
 }
 
 // Start the server if run directly
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (import.meta.url === `file://${fs.realpathSync(process.argv[1]!)}`) {
   const server = new XrayAutoFormatServer();
   server.run().catch((error) => frameworkLogger.log("mcps/auto-format", "run", "error", { error: String(error) }));
 }

package/src/mcps/boot-orchestrator.server.ts

@@ -120,7 +120,7 @@ class XrayBootOrchestratorServer {
   constructor() {
     this.server = new Server(
       {
-        name: "boot-orchestrator", version: "1.22.67",
+        name: "boot-orchestrator", version: "3.1.0",
       },
       {
         capabilities: {
@@ -1074,7 +1074,7 @@ ${results.warnings.length > 0 ? `**Warnings:**\n${results.warnings.map((w: strin
 }
 
 // Start the server if run directly
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (import.meta.url === `file://${fs.realpathSync(process.argv[1]!)}`) {
   const server = new XrayBootOrchestratorServer();
   server.run().catch((error) => frameworkLogger.log("mcps/boot-orchestrator", "run", "error", { error: String(error) }));
 }

package/src/mcps/config/__tests__/config-loader.test.ts

@@ -17,25 +17,19 @@ describe('ConfigLoader', () => {
 
   beforeEach(() => {
     loader = new ConfigLoader();
+    // Remove default paths so tests don't pick up the real .mcp.json
+    loader.resetConfigPaths();
     // Clean up any existing test files
-    if (fs.existsSync(testConfigPath)) {
-      fs.unlinkSync(testConfigPath);
-    }
-    if (fs.existsSync(testConfigPath2)) {
-      fs.unlinkSync(testConfigPath2);
-    }
-    if (fs.existsSync(testDir)) {
-      fs.rmdirSync(testDir);
+    for (const p of [testConfigPath, testConfigPath2]) {
+      if (fs.existsSync(p)) fs.unlinkSync(p);
     }
+    if (fs.existsSync(testDir)) fs.rmdirSync(testDir);
   });
 
   afterEach(() => {
     // Clean up test files
-    if (fs.existsSync(testConfigPath)) {
-      fs.unlinkSync(testConfigPath);
-    }
-    if (fs.existsSync(testConfigPath2)) {
-      fs.unlinkSync(testConfigPath2);
+    for (const p of [testConfigPath, testConfigPath2]) {
+      if (fs.existsSync(p)) fs.unlinkSync(p);
     }
     if (fs.existsSync(testDir)) {
       fs.rmdirSync(testDir);
@@ -163,20 +157,24 @@ describe('ConfigLoader', () => {
   });
 
   describe('getConfigPaths', () => {
-    it('should return default paths', () => {
-      const paths = loader.getConfigPaths();
-      expect(paths).toContain('.mcp.json');
-      expect(paths).toContain('.opencode/mcp.json');
-      expect(paths).toContain('mcp.config.json');
-    });
-
     it('should return added paths', () => {
+      loader.addConfigPath('.mcp.json');
       loader.addConfigPath('custom/path.json');
       const paths = loader.getConfigPaths();
+      expect(paths).toContain('.mcp.json');
       expect(paths).toContain('custom/path.json');
     });
 
+    it('should return default paths via new instance', () => {
+      const fresh = new ConfigLoader();
+      const paths = fresh.getConfigPaths();
+      expect(paths).toContain('.mcp.json');
+      expect(paths).toContain('.opencode/mcp.json');
+      expect(paths).toContain('mcp.config.json');
+    });
+
     it('should return copy of paths array', () => {
+      loader.addConfigPath('.mcp.json');
       const paths = loader.getConfigPaths();
       paths.push('modified');
       const paths2 = loader.getConfigPaths();
@@ -186,10 +184,12 @@ describe('ConfigLoader', () => {
 
   describe('resetConfigPaths', () => {
     it('should reset to default paths', () => {
-      loader.addConfigPath('custom/path.json');
-      loader.resetConfigPaths();
+      // Add a custom path, then reset — must use fresh loader for baseline
+      const fresh = new ConfigLoader();
+      fresh.addConfigPath('custom/path.json');
+      fresh.resetConfigPaths();
       
-      const paths = loader.getConfigPaths();
+      const paths = fresh.getConfigPaths();
       expect(paths).not.toContain('custom/path.json');
       expect(paths).toContain('.mcp.json');
     });
@@ -269,15 +269,6 @@ describe('ConfigLoader', () => {
       expect(loader.hasConfigFile()).toBe(false);
     });
 
-    it('should return true when default config file exists', () => {
-      const testConfigs = [{ serverName: 'test', command: 'node', args: ['test.js'], timeout: 30000 }];
-      fs.writeFileSync('.mcp.json', JSON.stringify(testConfigs));
-      
-      expect(loader.hasConfigFile()).toBe(true);
-      
-      fs.unlinkSync('.mcp.json');
-    });
-
     it('should return true when added config file exists', () => {
       const testConfigs = [{ serverName: 'test', command: 'node', args: ['test.js'], timeout: 30000 }];
       fs.writeFileSync(testConfigPath, JSON.stringify(testConfigs));
@@ -285,6 +276,11 @@ describe('ConfigLoader', () => {
       
       expect(loader.hasConfigFile()).toBe(true);
     });
+
+    it('should return false when only real .mcp.json exists but not in paths', () => {
+      // After resetConfigPaths, the real .mcp.json is not in the path list
+      expect(loader.hasConfigFile()).toBe(false);
+    });
   });
 
   describe('default singleton', () => {
@@ -294,7 +290,7 @@ describe('ConfigLoader', () => {
 
     it('defaultConfigLoader should have default paths', () => {
       const paths = defaultConfigLoader.getConfigPaths();
-      expect(paths).toContain('.mcp.json');
+      expect(paths.length).toBeGreaterThan(0);
     });
   });
 

package/src/mcps/config/__tests__/server-config-registry.test.ts

@@ -164,38 +164,38 @@ describe('ServerConfigRegistry', () => {
       expect(config.timeout).toBe(30000);
     });
 
-    it('should use STRRAY_DEV_PATH env var in dynamic config', () => {
-      const originalEnv = process.env.STRRAY_DEV_PATH;
-      process.env.STRRAY_DEV_PATH = 'custom-dist';
+    it('should use XRAY_DEV_PATH env var in dynamic config', () => {
+      const originalEnv = process.env.XRAY_DEV_PATH;
+      process.env.XRAY_DEV_PATH = 'custom-dist';
       
       const config = registry.createDynamicConfig('test-server');
       expect(config.args[0]).toContain('custom-dist');
       
-      process.env.STRRAY_DEV_PATH = originalEnv;
+      process.env.XRAY_DEV_PATH = originalEnv;
     });
   });
 
   describe('environment path handling', () => {
-    it('should use resolved framework path when STRRAY_DEV_PATH is not set', () => {
-      const originalEnv = process.env.STRRAY_DEV_PATH;
-      delete process.env.STRRAY_DEV_PATH;
+    it('should use resolved framework path when XRAY_DEV_PATH is not set', () => {
+      const originalEnv = process.env.XRAY_DEV_PATH;
+      delete process.env.XRAY_DEV_PATH;
       
       const freshRegistry = new ServerConfigRegistry();
       const config = freshRegistry.get('code-review');
       expect(config?.args[0]).toContain('.server.js');
       
-      process.env.STRRAY_DEV_PATH = originalEnv;
+      process.env.XRAY_DEV_PATH = originalEnv;
     });
 
-    it('should use STRRAY_DEV_PATH when set', () => {
-      const originalEnv = process.env.STRRAY_DEV_PATH;
-      process.env.STRRAY_DEV_PATH = 'dist';
+    it('should use XRAY_DEV_PATH when set', () => {
+      const originalEnv = process.env.XRAY_DEV_PATH;
+      process.env.XRAY_DEV_PATH = 'dist';
       
       const freshRegistry = new ServerConfigRegistry();
       const config = freshRegistry.get('code-review');
       expect(config?.args[0]).toContain('dist/');
       
-      process.env.STRRAY_DEV_PATH = originalEnv;
+      process.env.XRAY_DEV_PATH = originalEnv;
     });
   });
 

package/src/mcps/config/config-loader.ts

@@ -41,12 +41,31 @@ export class ConfigLoader {
           const content = fs.readFileSync(configPath, 'utf-8');
           const parsed = JSON.parse(content);
           
-          // Handle both array format and object with servers property
-          const configs: IServerConfig[] = Array.isArray(parsed) 
-            ? parsed 
-            : parsed.servers || [];
-          
-          return { success: true, configs };
+          // Handle array format
+          if (Array.isArray(parsed)) {
+            return { success: true, configs: parsed };
+          }
+
+          // Handle standard MCP format (mcpServers object — Claude/OpenCode .mcp.json)
+          if (parsed.mcpServers && typeof parsed.mcpServers === 'object') {
+            const configs: IServerConfig[] = Object.entries(parsed.mcpServers).map(
+              ([serverName, config]: [string, any]) => ({
+                serverName,
+                command: config.command || '',
+                args: config.args || [],
+                timeout: config.timeout ?? 30000,
+                env: config.env,
+              }),
+            );
+            return { success: true, configs };
+          }
+
+          // Handle object with servers property
+          if (parsed.servers) {
+            return { success: true, configs: parsed.servers };
+          }
+
+          return { success: true, configs: [] };
         } catch (error) {
           return {
             success: false,
@@ -100,11 +119,31 @@ export class ConfigLoader {
       const content = fs.readFileSync(filePath, 'utf-8');
       const parsed = JSON.parse(content);
       
-      const configs: IServerConfig[] = Array.isArray(parsed) 
-        ? parsed 
-        : parsed.servers || [];
-      
-      return { success: true, configs };
+      // Handle array format
+      if (Array.isArray(parsed)) {
+        return { success: true, configs: parsed };
+      }
+
+      // Handle standard MCP format (mcpServers object)
+      if (parsed.mcpServers && typeof parsed.mcpServers === 'object') {
+        const configs: IServerConfig[] = Object.entries(parsed.mcpServers).map(
+          ([serverName, config]: [string, any]) => ({
+            serverName,
+            command: config.command || '',
+            args: config.args || [],
+            timeout: config.timeout ?? 30000,
+            env: config.env,
+          }),
+        );
+        return { success: true, configs };
+      }
+
+      // Handle object with servers property
+      if (parsed.servers) {
+        return { success: true, configs: parsed.servers };
+      }
+
+      return { success: true, configs: [] };
     } catch (error) {
       return {
         success: false,

package/src/mcps/config/server-config-registry.ts

@@ -20,21 +20,21 @@ import fs from 'fs';
 /**
  * Resolve the correct framework root and MCP servers path.
  * Priority:
- *   1. STRRAY_DEV_PATH env var (explicit dev override)
- *   2. The "strray" field in the nearest package.json that declares it (works in both source tree and installed package)
+ *   1. XRAY_DEV_PATH env var (explicit dev override)
+ *   2. The "xray" field in the nearest package.json that declares it (works in both source tree and installed package)
  *   3. Safe fallback to node_modules/0xray/dist
  */
 function resolveFrameworkPaths(): { frameworkRoot: string; mcpServersPath: string } {
   // Highest priority: explicit environment override
-  if (process.env.STRRAY_DEV_PATH) {
-    const devPath = process.env.STRRAY_DEV_PATH;
+  if (process.env.XRAY_DEV_PATH) {
+    const devPath = process.env.XRAY_DEV_PATH;
     return {
       frameworkRoot: devPath,
       mcpServersPath: join(devPath, 'mcps'),
     };
   }
 
-  // Walk upward from this module to find the package that owns the "strray" config
+  // Walk upward from this module to find the package that owns the "xray" config
   let currentDir = dirname(fileURLToPath(import.meta.url));
 
   // Safety limit to avoid walking the entire filesystem
@@ -44,10 +44,10 @@ function resolveFrameworkPaths(): { frameworkRoot: string; mcpServersPath: strin
     if (fs.existsSync(pkgPath)) {
       try {
         const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
-        if (pkg.name === '0xray' && pkg.strray) {
-          const strrayCfg = pkg.strray as Record<string, string>;
+        if (pkg.name === '0xray' && pkg.xray) {
+          const xrayCfg = pkg.xray as Record<string, string>;
           const frameworkRoot = currentDir;
-          const declaredMcp = strrayCfg.mcpServersPath || (strrayCfg.dist ? join(strrayCfg.dist, 'mcps') : 'dist/mcps');
+          const declaredMcp = xrayCfg.mcpServersPath || (xrayCfg.dist ? join(xrayCfg.dist, 'mcps') : 'dist/mcps');
           return {
             frameworkRoot,
             mcpServersPath: join(frameworkRoot, declaredMcp),
@@ -65,7 +65,7 @@ function resolveFrameworkPaths(): { frameworkRoot: string; mcpServersPath: strin
   // Final fallback (should almost never be reached)
   const fallback = 'node_modules/0xray/dist';
   frameworkLogger.log('server-config-registry', 'using-fallback-path', 'warning', {
-    reason: 'Could not locate strray package.json with "strray" field',
+    reason: 'Could not locate xray package.json with "xray" field',
     fallback,
   });
   return {
@@ -367,7 +367,7 @@ export class ServerConfigRegistry {
   /**
    * Create a dynamic configuration for an unknown server
    * Uses the knowledge-skills directory as default location.
-   * Now respects the "strray" field declared in package.json.
+   * Now respects the "xray" field declared in package.json.
    */
   createDynamicConfig(serverName: string): IServerConfig {
     // Validate serverName against path traversal attacks

package/src/mcps/connection/mcp-connection.ts

@@ -77,7 +77,7 @@ export class McpConnection extends EventEmitter implements IMcpConnection {
           protocolVersion: MCP_PROTOCOL_VERSION,
           capabilities: {},
           clientInfo: {
-            name: 'strray-mcp-client',
+            name: 'xray-mcp-client',
             version: '1.7.5',
           },
         },

package/src/mcps/enforcer-tools.server.ts

@@ -144,7 +144,7 @@ class XrayEnforcerToolsServer {
   constructor() {
     this.server = new Server(
       {
-        name: "enforcer", version: "1.22.67",
+        name: "enforcer", version: "3.1.0",
       },
       {
         capabilities: {
@@ -1098,7 +1098,7 @@ class XrayEnforcerToolsServer {
   }
 }
 
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (import.meta.url === `file://${fs.realpathSync(process.argv[1]!)}`) {
   const server = new XrayEnforcerToolsServer();
   server.run().catch((error) => frameworkLogger.log("mcps/enforcer", "run", "error", { error: String(error) }));
 }

package/src/mcps/estimation.server.ts

@@ -10,6 +10,7 @@ import {
   CallToolRequestSchema,
   ListToolsRequestSchema,
 } from "@modelcontextprotocol/sdk/types.js";
+import * as fs from "fs";
 import { frameworkLogger } from "../core/framework-logger.js";
 import { getEstimationValidator } from "../validation/estimation-validator.js";
 
@@ -24,7 +25,7 @@ class EstimationServer {
   constructor() {
     this.server = new Server(
       {
-        name: "estimation-validator", version: "1.22.67",
+        name: "estimation-validator", version: "3.1.0",
       },
       {
         capabilities: { tools: {} },
@@ -221,7 +222,7 @@ class EstimationServer {
 }
 
 // Run if called directly
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (import.meta.url === `file://${fs.realpathSync(process.argv[1]!)}`) {
   const server = new EstimationServer();
   server.start().catch((error) => frameworkLogger.log("mcps/estimation", "run", "error", { error: String(error) }));
 }

package/src/mcps/framework-compliance-audit.server.ts

@@ -39,7 +39,7 @@ class XrayFrameworkComplianceAuditServer {
   constructor() {
     this.server = new Server(
       {
-        name: "framework-compliance-audit", version: "1.22.67",
+        name: "framework-compliance-audit", version: "3.1.0",
       },
       {
         capabilities: {
@@ -627,7 +627,7 @@ ${results.recommendations.map((r) => `• 💡 ${r}`).join("\n")}
 }
 
 // Start the server if run directly
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (import.meta.url === `file://${fs.realpathSync(process.argv[1]!)}`) {
   const server = new XrayFrameworkComplianceAuditServer();
   server.run().catch((error) => frameworkLogger.log("mcps/framework-compliance-audit", "run", "error", { error: String(error) }));
 }

package/src/mcps/framework-help.server.ts

@@ -6,6 +6,7 @@ import {
   ListToolsRequestSchema,
   McpError,
 } from "@modelcontextprotocol/sdk/types.js";
+import * as fs from "fs";
 import { frameworkLogger } from "../core/framework-logger.js";
 import { AGENT_REGISTRY, getActiveAgents } from "../agents/registry.js";
 
@@ -22,7 +23,7 @@ class FrameworkHelpServer {
   constructor() {
     this.server = new Server(
       {
-        name: "xray/framework-help", version: "1.22.67",
+        name: "xray/framework-help", version: "3.1.0",
       },
       {
         capabilities: {
@@ -40,7 +41,7 @@ class FrameworkHelpServer {
       return {
         tools: [
           {
-            name: "strray_get_capabilities",
+            name: "xray_get_capabilities",
             description:
               "Get comprehensive list of all 0xRay framework capabilities, commands, and available tools",
             inputSchema: {
@@ -63,7 +64,7 @@ class FrameworkHelpServer {
             },
           },
           {
-            name: "strray_get_commands",
+            name: "xray_get_commands",
             description:
               "Get list of available 0xRay commands and their usage",
             inputSchema: {
@@ -84,7 +85,7 @@ class FrameworkHelpServer {
             },
           },
           {
-            name: "strray_explain_capability",
+            name: "xray_explain_capability",
             description:
               "Get detailed explanation of a specific 0xRay capability",
             inputSchema: {
@@ -108,11 +109,11 @@ class FrameworkHelpServer {
 
       try {
         switch (name) {
-          case "strray_get_capabilities":
+          case "xray_get_capabilities":
             return this.handleGetCapabilities(args);
-          case "strray_get_commands":
+          case "xray_get_commands":
             return this.handleGetCommands(args);
-          case "strray_explain_capability":
+          case "xray_explain_capability":
             return this.handleExplainCapability(args);
           default:
             throw new McpError(ErrorCode.MethodNotFound, `Unknown tool: ${name}`);
@@ -459,7 +460,7 @@ ${items.map(([name, desc]) => `- **${name}**: ${desc}`).join("\n")}
 }
 
 // Auto-start if this file is run directly - conditional server initialization for development/testing
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (import.meta.url === `file://${fs.realpathSync(process.argv[1]!)}`) {
   const server = new FrameworkHelpServer();
   server.start().catch((error) => frameworkLogger.log("mcps/framework-help", "run", "error", { error: String(error) }));
 }

package/src/mcps/governance.server.ts

@@ -68,7 +68,7 @@ class GovernanceServer {
   constructor() {
     this.server = new Server(
       {
-        name: "governance", version: "1.22.67",
+        name: "governance", version: "3.1.0",
       },
       {
         capabilities: {
@@ -475,7 +475,12 @@ class GovernanceServer {
   async runHttp(port: number = parseInt(process.env.MCP_PORT ?? "3100", 10)): Promise<void> {
     await this.initializeGovernance();
 
-    const app = createMcpExpressApp();
+    const mcpHost = process.env.MCP_HOST || "127.0.0.1";
+    const allowedHosts = process.env.MCP_ALLOWED_HOSTS?.split(",");
+    const app = createMcpExpressApp({
+      host: mcpHost,
+      ...(allowedHosts ? { allowedHosts } : {}),
+    });
     const transport = new StreamableHTTPServerTransport({
       sessionIdGenerator: () => randomUUID(),
     });
@@ -527,7 +532,7 @@ class GovernanceServer {
 }
 
 // Start the server if this file is run directly
-const entryPoint = path.resolve(process.argv[1] ?? "");
+const entryPoint = fs.realpathSync(process.argv[1] ?? "");
 if (entryPoint && fileURLToPath(import.meta.url) === entryPoint) {
   // If --port or MCP_PORT is set, use HTTP transport (for Grok CLI compatibility)
   const cliPort = process.argv.find((a) => a.startsWith("--port="))?.split("=")[1];

package/src/mcps/knowledge-skills/api-design.server.ts

@@ -11,6 +11,7 @@ import {
   CallToolRequestSchema,
   ListToolsRequestSchema,
 } from "@modelcontextprotocol/sdk/types.js";
+import * as fs from "fs";
 import { frameworkLogger } from "../../core/framework-logger.js";
 import { createGracefulShutdown } from "../../utils/shutdown-handler.js";
 
@@ -31,7 +32,7 @@ class XrayApiDesignServer {
   constructor() {
     this.server = new Server(
       {
-        name: "api-design", version: "1.22.67",
+        name: "api-design", version: "3.1.0",
       },
       {
         capabilities: {
@@ -152,7 +153,7 @@ class XrayApiDesignServer {
   }
 }
 
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (import.meta.url === `file://${fs.realpathSync(process.argv[1]!)}`) {
   const server = new XrayApiDesignServer();
   server.run().catch(() => {});
 }

package/src/mcps/knowledge-skills/architecture-patterns.server.ts

@@ -33,7 +33,7 @@ class XrayArchitecturePatternsServer {
   constructor() {
     this.server = new Server(
       {
-        name: "architecture-patterns", version: "1.22.67",
+        name: "architecture-patterns", version: "3.1.0",
       },
       {
         capabilities: {
@@ -144,7 +144,7 @@ class XrayArchitecturePatternsServer {
   }
 }
 
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (import.meta.url === `file://${fs.realpathSync(process.argv[1]!)}`) {
   const server = new XrayArchitecturePatternsServer();
   server.run().catch(() => {});
 }

package/src/mcps/knowledge-skills/bug-triage-specialist.server.ts

@@ -81,7 +81,7 @@ class BugTriageSpecialistServer {
 
   constructor() {
     this.server = new Server(
-      { name: "bug-triage-specialist", version: "1.22.67" },
+      { name: "bug-triage-specialist", version: "3.1.0" },
       { capabilities: { tools: {} } },
     );
     this.setupToolHandlers();
@@ -615,7 +615,7 @@ class BugTriageSpecialistServer {
   }
 }
 
-const entryPoint = path.resolve(process.argv[1] ?? "");
+const entryPoint = fs.realpathSync(process.argv[1] ?? "");
 if (entryPoint && fileURLToPath(import.meta.url) === entryPoint) {
   const server = new BugTriageSpecialistServer();
   server.run();

package/src/mcps/knowledge-skills/code-analyzer.server.ts

@@ -303,7 +303,7 @@ class CodeAnalyzerServer {
 
   constructor() {
     this.server = new Server(
-      { name: "code-analyzer", version: "1.22.67" },
+      { name: "code-analyzer", version: "3.1.0" },
       { capabilities: { tools: {} } },
     );
 
@@ -587,5 +587,5 @@ class CodeAnalyzerServer {
   }
 }
 
-if (import.meta.url === `file://${process.argv[1]}`) { new CodeAnalyzerServer().run().catch(() => {}); }
+if (import.meta.url === `file://${fs.realpathSync(process.argv[1]!)}`) { new CodeAnalyzerServer().run().catch(() => {}); }
 export default CodeAnalyzerServer;