0xray 2.1.3 → 2.2.0

package/dist/mcps/governance.server.js

@@ -21,7 +21,7 @@ import * as fs from "fs";
 import * as path from "path";
 import { fileURLToPath } from "url";
 import { randomUUID } from "crypto";
-import { getGovernanceService } from "../governance/governance-service.js";
+import { handleGovernRequest } from "../nucleus/index.js";
 import { getCodexPolicyService } from "../governance/codex-policy.service.js";
 import { initializeGovernanceIntegration } from "../integrations/governance/index.js";
 import { featuresConfigLoader } from "../core/features-config.js";
@@ -29,7 +29,7 @@ class GovernanceServer {
     server;
     constructor() {
         this.server = new Server({
-            name: "governance", version: "2.1.1",
+            name: "governance", version: "2.1.3",
         }, {
             capabilities: {
                 tools: {},
@@ -192,7 +192,6 @@ class GovernanceServer {
         });
     }
     async handleGovernProposals(args) {
-        const service = getGovernanceService();
         const request = {
             proposals: args.proposals.map((p, i) => ({
                 id: p.id || `prop-${Date.now()}-${i}`,
@@ -208,10 +207,10 @@ class GovernanceServer {
                 requireExternalDynamo: args.options?.require_external ?? !process.env.XRAY_LOCAL_MODE,
             },
         };
-        frameworkLogger.log("governance-mcp", "delegating-to-governance-service", "info", {
+        frameworkLogger.log("governance-mcp", "delegating-to-kernel", "info", {
             proposalCount: request.proposals.length,
         });
-        const response = await service.govern(request);
+        const response = await handleGovernRequest(request);
         return {
             content: [
                 {

package/dist/mcps/knowledge-skills/api-design.server.js

@@ -6,6 +6,7 @@
  */
 import { XrayKnowledgeSkillBase } from "../shared/knowledge-skill-base.js";
 import { frameworkLogger } from "../../core/framework-logger.js";
+import { pluginRegistry } from "../../nucleus/plugin-registry.js";
 class XrayApiDesignServer extends XrayKnowledgeSkillBase {
     constructor() {
         super("api-design", "2.0.1");
@@ -41,6 +42,15 @@ class XrayApiDesignServer extends XrayKnowledgeSkillBase {
             "validate-api-design": async (args) => this.validateApiDesign(args),
         };
         this.setupToolHandlers();
+        pluginRegistry.registerToolPlugin({
+            name: "api-design",
+            callTool: async (toolName, args) => {
+                const handler = this.handlers[toolName];
+                if (!handler)
+                    throw new Error(`Unknown tool: ${toolName}`);
+                return handler(args);
+            },
+        });
     }
     async designApiEndpoints(args) {
         const { resource, operations, relationships } = args;

package/dist/mcps/knowledge-skills/architecture-patterns.server.js

@@ -1,5 +1,6 @@
 import { XrayKnowledgeSkillBase } from "../shared/knowledge-skill-base.js";
 import { frameworkLogger } from "../../core/framework-logger.js";
+import { pluginRegistry } from "../../nucleus/plugin-registry.js";
 class XrayArchitecturePatternsServer extends XrayKnowledgeSkillBase {
     constructor() {
         super("architecture-patterns", "2.0.1");
@@ -35,6 +36,15 @@ class XrayArchitecturePatternsServer extends XrayKnowledgeSkillBase {
             "recommend-patterns": async (args) => this.recommendPatterns(args),
         };
         this.setupToolHandlers();
+        pluginRegistry.registerToolPlugin({
+            name: "architecture-patterns",
+            callTool: async (toolName, args) => {
+                const handler = this.handlers[toolName];
+                if (!handler)
+                    throw new Error(`Unknown tool: ${toolName}`);
+                return handler(args);
+            },
+        });
     }
     async analyzeArchitecture(args) {
         const { projectRoot, focusPatterns } = args;

package/dist/mcps/knowledge-skills/bug-triage-specialist.server.js

@@ -9,6 +9,7 @@ import * as path from "path";
 import { fileURLToPath } from "url";
 import { XrayKnowledgeSkillBase } from "../shared/knowledge-skill-base.js";
 import { frameworkLogger } from "../../core/framework-logger.js";
+import { pluginRegistry } from "../../nucleus/plugin-registry.js";
 class BugTriageSpecialistServer extends XrayKnowledgeSkillBase {
     constructor() {
         super("bug-triage-specialist", "2.0.1");
@@ -169,6 +170,15 @@ class BugTriageSpecialistServer extends XrayKnowledgeSkillBase {
             },
         };
         this.setupToolHandlers();
+        pluginRegistry.registerToolPlugin({
+            name: "bug-triage-specialist",
+            callTool: async (toolName, args) => {
+                const handler = this.handlers[toolName];
+                if (!handler)
+                    throw new Error(`Unknown tool: ${toolName}`);
+                return handler(args);
+            },
+        });
     }
     triageBugs(errorLogs, context) {
         const bugs = errorLogs.map((log, idx) => {

package/dist/mcps/knowledge-skills/code-analyzer.server.js

@@ -11,6 +11,7 @@
  */
 import { XrayKnowledgeSkillBase } from "../shared/knowledge-skill-base.js";
 import { frameworkLogger } from "../../core/framework-logger.js";
+import { pluginRegistry } from "../../nucleus/plugin-registry.js";
 import * as fs from "fs";
 import * as path from "path";
 class CodeAnalyzerServer extends XrayKnowledgeSkillBase {
@@ -254,6 +255,15 @@ class CodeAnalyzerServer extends XrayKnowledgeSkillBase {
             "find_duplicates": async (args) => this.handleFindDuplicates(args),
         };
         this.setupToolHandlers();
+        pluginRegistry.registerToolPlugin({
+            name: "code-analyzer",
+            callTool: async (toolName, args) => {
+                const handler = this.handlers[toolName];
+                if (!handler)
+                    throw new Error(`Unknown tool: ${toolName}`);
+                return handler(args);
+            },
+        });
     }
     handleAnalyzeCode(args) {
         const { files = [], language = "typescript" } = args;

package/dist/mcps/knowledge-skills/code-review.server.js

@@ -6,6 +6,7 @@
  */
 import { XrayKnowledgeSkillBase } from "../shared/knowledge-skill-base.js";
 import { frameworkLogger } from "../../core/framework-logger.js";
+import { pluginRegistry } from "../../nucleus/plugin-registry.js";
 import * as fs from "fs";
 import * as path from "path";
 class XrayCodeReviewServer extends XrayKnowledgeSkillBase {
@@ -124,6 +125,15 @@ class XrayCodeReviewServer extends XrayKnowledgeSkillBase {
             "analyze_proposal": async (args) => this.analyzeProposal(args),
         };
         this.setupToolHandlers();
+        pluginRegistry.registerToolPlugin({
+            name: "code-review",
+            callTool: async (toolName, args) => {
+                const handler = this.handlers[toolName];
+                if (!handler)
+                    throw new Error(`Unknown tool: ${toolName}`);
+                return handler(args);
+            },
+        });
     }
     async analyzeCodeQuality(args) {
         const { filePath, includeMetrics = true, focusAreas } = args;

package/dist/mcps/knowledge-skills/content-creator.server.js

@@ -8,6 +8,7 @@ import * as path from "path";
 import { fileURLToPath } from "url";
 import { XrayKnowledgeSkillBase } from "../shared/knowledge-skill-base.js";
 import { frameworkLogger } from "../../core/framework-logger.js";
+import { pluginRegistry } from "../../nucleus/plugin-registry.js";
 class SEOCopywriterServer extends XrayKnowledgeSkillBase {
     constructor() {
         super("content-creator", "2.0.1");
@@ -225,6 +226,15 @@ class SEOCopywriterServer extends XrayKnowledgeSkillBase {
             },
         };
         this.setupToolHandlers();
+        pluginRegistry.registerToolPlugin({
+            name: "content-creator",
+            callTool: async (toolName, args) => {
+                const handler = this.handlers[toolName];
+                if (!handler)
+                    throw new Error(`Unknown tool: ${toolName}`);
+                return handler(args);
+            },
+        });
     }
 }
 const entryPoint = path.resolve(process.argv[1] ?? "");

package/dist/mcps/knowledge-skills/database-design.server.js

@@ -6,6 +6,7 @@
  */
 import { XrayKnowledgeSkillBase } from "../shared/knowledge-skill-base.js";
 import { frameworkLogger } from "../../core/framework-logger.js";
+import { pluginRegistry } from "../../nucleus/plugin-registry.js";
 import * as fs from "fs";
 import * as path from "path";
 class XrayDatabaseDesignServer extends XrayKnowledgeSkillBase {
@@ -134,6 +135,15 @@ class XrayDatabaseDesignServer extends XrayKnowledgeSkillBase {
             "migrate_schema": async (args) => this.migrateSchema(args),
         };
         this.setupToolHandlers();
+        pluginRegistry.registerToolPlugin({
+            name: "database-design",
+            callTool: async (toolName, args) => {
+                const handler = this.handlers[toolName];
+                if (!handler)
+                    throw new Error(`Unknown tool: ${toolName}`);
+                return handler(args);
+            },
+        });
     }
     async analyzeSchema(args) {
         const { schemaFile, databaseType = "postgresql", includeIndexes = true, } = args;

package/dist/mcps/knowledge-skills/devops-deployment.server.js

@@ -6,6 +6,7 @@
  */
 import { XrayKnowledgeSkillBase } from "../shared/knowledge-skill-base.js";
 import { frameworkLogger } from "../../core/framework-logger.js";
+import { pluginRegistry } from "../../nucleus/plugin-registry.js";
 class XrayDevOpsDeploymentServer extends XrayKnowledgeSkillBase {
     constructor() {
         super("devops-deployment", "2.0.1");
@@ -87,6 +88,15 @@ class XrayDevOpsDeploymentServer extends XrayKnowledgeSkillBase {
             "optimize_deployment_performance": async (args) => this.optimizeDeploymentPerformance(args),
         };
         this.setupToolHandlers();
+        pluginRegistry.registerToolPlugin({
+            name: "devops-deployment",
+            callTool: async (toolName, args) => {
+                const handler = this.handlers[toolName];
+                if (!handler)
+                    throw new Error(`Unknown tool: ${toolName}`);
+                return handler(args);
+            },
+        });
     }
     async analyzeCICDPipeline(args) {
         const { pipelineConfig, platform, includeSecurity = true } = args;

package/dist/mcps/knowledge-skills/git-workflow.server.js

@@ -6,6 +6,7 @@
  */
 import { XrayKnowledgeSkillBase } from "../shared/knowledge-skill-base.js";
 import { frameworkLogger } from "../../core/framework-logger.js";
+import { pluginRegistry } from "../../nucleus/plugin-registry.js";
 class XrayGitWorkflowServer extends XrayKnowledgeSkillBase {
     constructor() {
         super("git-workflow", "2.0.1");
@@ -42,6 +43,15 @@ class XrayGitWorkflowServer extends XrayKnowledgeSkillBase {
             "recommend-branching-strategy": async (args) => this.recommendBranchingStrategy(args),
         };
         this.setupToolHandlers();
+        pluginRegistry.registerToolPlugin({
+            name: "git-workflow",
+            callTool: async (toolName, args) => {
+                const handler = this.handlers[toolName];
+                if (!handler)
+                    throw new Error(`Unknown tool: ${toolName}`);
+                return handler(args);
+            },
+        });
     }
     async analyzeGitHistory(args) {
         const { projectRoot, since, author } = args;

package/dist/mcps/knowledge-skills/growth-strategist.server.js

@@ -8,6 +8,7 @@ import * as path from "path";
 import { fileURLToPath } from "url";
 import { XrayKnowledgeSkillBase } from "../shared/knowledge-skill-base.js";
 import { frameworkLogger } from "../../core/framework-logger.js";
+import { pluginRegistry } from "../../nucleus/plugin-registry.js";
 class MarketingExpertServer extends XrayKnowledgeSkillBase {
     constructor() {
         super("growth-strategist", "2.0.1");
@@ -330,6 +331,15 @@ class MarketingExpertServer extends XrayKnowledgeSkillBase {
             },
         };
         this.setupToolHandlers();
+        pluginRegistry.registerToolPlugin({
+            name: "growth-strategist",
+            callTool: async (toolName, args) => {
+                const handler = this.handlers[toolName];
+                if (!handler)
+                    throw new Error(`Unknown tool: ${toolName}`);
+                return handler(args);
+            },
+        });
     }
 }
 const entryPoint = path.resolve(process.argv[1] ?? "");

package/dist/mcps/knowledge-skills/log-monitor.server.js

@@ -9,6 +9,7 @@ import * as path from "path";
 import { fileURLToPath } from "url";
 import { XrayKnowledgeSkillBase } from "../shared/knowledge-skill-base.js";
 import { frameworkLogger } from "../../core/framework-logger.js";
+import { pluginRegistry } from "../../nucleus/plugin-registry.js";
 class LogMonitorServer extends XrayKnowledgeSkillBase {
     patternLibrary = [
         {
@@ -219,6 +220,15 @@ class LogMonitorServer extends XrayKnowledgeSkillBase {
             },
         };
         this.setupToolHandlers();
+        pluginRegistry.registerToolPlugin({
+            name: "log-monitor",
+            callTool: async (toolName, args) => {
+                const handler = this.handlers[toolName];
+                if (!handler)
+                    throw new Error(`Unknown tool: ${toolName}`);
+                return handler(args);
+            },
+        });
     }
     analyzeLogs(logs, options) {
         const entries = logs.map(this.parseLogEntry);

package/dist/mcps/knowledge-skills/mobile-development.server.js

@@ -8,6 +8,7 @@ import { XrayKnowledgeSkillBase } from "../shared/knowledge-skill-base.js";
 import * as path from "path";
 import { fileURLToPath } from "url";
 import { frameworkLogger } from "../../core/framework-logger.js";
+import { pluginRegistry } from "../../nucleus/plugin-registry.js";
 class XrayMobileDevelopmentServer extends XrayKnowledgeSkillBase {
     constructor() {
         super("mobile-development", "2.0.1");
@@ -104,6 +105,15 @@ class XrayMobileDevelopmentServer extends XrayKnowledgeSkillBase {
             "app_store_metadata": async (args) => this.generateAppStoreMetadata(args),
         };
         this.setupToolHandlers();
+        pluginRegistry.registerToolPlugin({
+            name: "mobile-development",
+            callTool: async (toolName, args) => {
+                const handler = this.handlers[toolName];
+                if (!handler)
+                    throw new Error(`Unknown tool: ${toolName}`);
+                return handler(args);
+            },
+        });
     }
     async generateIOSBlueprint(args) {
         const { projectName, language = "swiftui", architecture = "mvvm", features = [] } = args;

package/dist/mcps/knowledge-skills/multimodal-looker.server.js

@@ -10,6 +10,7 @@
 import * as path from "path";
 import { fileURLToPath } from "url";
 import { frameworkLogger } from "../../core/framework-logger.js";
+import { pluginRegistry } from "../../nucleus/plugin-registry.js";
 import { XrayKnowledgeSkillBase } from "../shared/knowledge-skill-base.js";
 /* ============================================================================
  * Analysis Engine
@@ -151,6 +152,15 @@ class MultimodalLookerServer extends XrayKnowledgeSkillBase {
             "compare-designs": async (args) => this.handleCompareDesigns(args),
         };
         this.setupToolHandlers();
+        pluginRegistry.registerToolPlugin({
+            name: "multimodal-looker",
+            callTool: async (toolName, args) => {
+                const handler = this.handlers[toolName];
+                if (!handler)
+                    throw new Error(`Unknown tool: ${toolName}`);
+                return handler(args);
+            },
+        });
     }
     /* --------------------------------------------------------------------------
      * Tool Handlers

package/dist/mcps/knowledge-skills/performance-optimization.server.js

@@ -6,6 +6,7 @@
  */
 import { XrayKnowledgeSkillBase } from "../shared/knowledge-skill-base.js";
 import { frameworkLogger, generateJobId } from "../../core/framework-logger.js";
+import { pluginRegistry } from "../../nucleus/plugin-registry.js";
 import fs from "fs";
 import path from "path";
 class XrayPerformanceOptimizationServer extends XrayKnowledgeSkillBase {
@@ -103,6 +104,15 @@ class XrayPerformanceOptimizationServer extends XrayKnowledgeSkillBase {
             "measure-core-web-vitals": async (args) => this.handleMeasureCoreWebVitals(args),
         };
         this.setupToolHandlers();
+        pluginRegistry.registerToolPlugin({
+            name: "performance-optimization",
+            callTool: async (toolName, args) => {
+                const handler = this.handlers[toolName];
+                if (!handler)
+                    throw new Error(`Unknown tool: ${toolName}`);
+                return handler(args);
+            },
+        });
     }
     async handleProfileApplication(args) {
         const { projectRoot, scope = "full", duration = 30, includeHotPaths = true } = args;

package/dist/mcps/knowledge-skills/project-analysis.server.js

@@ -8,6 +8,7 @@ import { XrayKnowledgeSkillBase } from "../shared/knowledge-skill-base.js";
 import * as fs from "fs";
 import * as path from "path";
 import { frameworkLogger } from "../../core/framework-logger.js";
+import { pluginRegistry } from "../../nucleus/plugin-registry.js";
 class ProjectAnalysisServer extends XrayKnowledgeSkillBase {
     constructor() {
         super("project-analysis", "2.0.1");
@@ -87,6 +88,15 @@ class ProjectAnalysisServer extends XrayKnowledgeSkillBase {
             "analyze_proposal": async (args) => this.analyzeProposal(args),
         };
         this.setupToolHandlers();
+        pluginRegistry.registerToolPlugin({
+            name: "project-analysis",
+            callTool: async (toolName, args) => {
+                const handler = this.handlers[toolName];
+                if (!handler)
+                    throw new Error(`Unknown tool: ${toolName}`);
+                return handler(args);
+            },
+        });
     }
     async analyzeProjectStructure(args) {
         const { projectRoot, includeMetrics = true, maxDepth = 10 } = args;

package/dist/mcps/knowledge-skills/refactoring-strategies.server.js

@@ -6,6 +6,7 @@
  */
 import { XrayKnowledgeSkillBase } from "../shared/knowledge-skill-base.js";
 import { frameworkLogger } from "../../core/framework-logger.js";
+import { pluginRegistry } from "../../nucleus/plugin-registry.js";
 class XrayRefactoringStrategiesServer extends XrayKnowledgeSkillBase {
     constructor() {
         super("refactoring-strategies", "2.0.1");
@@ -71,6 +72,15 @@ class XrayRefactoringStrategiesServer extends XrayKnowledgeSkillBase {
             "modernize_codebase": async (args) => this.modernizeCodebase(args),
         };
         this.setupToolHandlers();
+        pluginRegistry.registerToolPlugin({
+            name: "refactoring-strategies",
+            callTool: async (toolName, args) => {
+                const handler = this.handlers[toolName];
+                if (!handler)
+                    throw new Error(`Unknown tool: ${toolName}`);
+                return handler(args);
+            },
+        });
     }
     async analyzeTechnicalDebt(args) {
         const { codePath, includeModernization = true, debtThreshold = 20 } = args;

package/dist/mcps/knowledge-skills/security-audit.server.js

@@ -6,6 +6,7 @@
  */
 import { XrayKnowledgeSkillBase } from "../shared/knowledge-skill-base.js";
 import { frameworkLogger } from "../../core/framework-logger.js";
+import { pluginRegistry } from "../../nucleus/plugin-registry.js";
 import * as fs from "fs";
 import * as path from "path";
 class XraySecurityAuditServer extends XrayKnowledgeSkillBase {
@@ -117,6 +118,15 @@ class XraySecurityAuditServer extends XrayKnowledgeSkillBase {
             "analyze_proposal": async (args) => this.analyzeProposal(args),
         };
         this.setupToolHandlers();
+        pluginRegistry.registerToolPlugin({
+            name: "security-audit",
+            callTool: async (toolName, args) => {
+                const handler = this.handlers[toolName];
+                if (!handler)
+                    throw new Error(`Unknown tool: ${toolName}`);
+                return handler(args);
+            },
+        });
     }
     async auditSecurity(args) {
         const { files, includeDependencies = true, complianceFrameworks = ["owasp-top-10"], } = args;

package/dist/mcps/knowledge-skills/seo-consultant.server.js

@@ -7,6 +7,7 @@
  */
 import { XrayKnowledgeSkillBase } from "../shared/knowledge-skill-base.js";
 import { frameworkLogger } from "../../core/framework-logger.js";
+import { pluginRegistry } from "../../nucleus/plugin-registry.js";
 class SEOSpecialistServer extends XrayKnowledgeSkillBase {
     constructor() {
         super("seo-consultant", "2.0.1");
@@ -97,6 +98,15 @@ class SEOSpecialistServer extends XrayKnowledgeSkillBase {
             "optimize-robots-txt": async (args) => this.optimizeRobotsTxt(args),
         };
         this.setupToolHandlers();
+        pluginRegistry.registerToolPlugin({
+            name: "seo-consultant",
+            callTool: async (toolName, args) => {
+                const handler = this.handlers[toolName];
+                if (!handler)
+                    throw new Error(`Unknown tool: ${toolName}`);
+                return handler(args);
+            },
+        });
     }
     auditTechnicalSEO(args) {
         const targetUrl = args.targetUrl || "https://example.com";

package/dist/mcps/knowledge-skills/skill-invocation.server.d.ts

@@ -7,6 +7,10 @@ declare class SkillInvocationServer extends XrayKnowledgeSkillBase {
      */
     private recordSkillOutcome;
     private handleListSkills;
+    /**
+     * Dispatch a skill tool call: prefer in-process pluginRegistry, fall back to external MCP process.
+     */
+    private callSkillTool;
     private handleInvokeSkill;
     private handleSkillCodeReview;
     private handleSkillSecurityAudit;

package/dist/mcps/knowledge-skills/skill-invocation.server.js

@@ -6,6 +6,7 @@ import { fileURLToPath } from "url";
 import { randomUUID } from "crypto";
 import { mcpClientManager } from "../mcp-client.js";
 import { frameworkLogger } from "../../core/framework-logger.js";
+import { pluginRegistry } from "../../nucleus/plugin-registry.js";
 class SkillInvocationServer extends XrayKnowledgeSkillBase {
     constructor() {
         super("xray/skill-invocation", "2.0.1");
@@ -186,6 +187,15 @@ class SkillInvocationServer extends XrayKnowledgeSkillBase {
             "skill-storyteller": async (args) => this.handleSkillStoryteller(args),
         };
         this.setupToolHandlers();
+        pluginRegistry.registerToolPlugin({
+            name: "xray/skill-invocation",
+            callTool: async (toolName, args) => {
+                const handler = this.handlers[toolName];
+                if (!handler)
+                    throw new Error(`Unknown tool: ${toolName}`);
+                return handler(args);
+            },
+        });
     }
     skillMetrics = new Map();
     /**
@@ -228,7 +238,7 @@ class SkillInvocationServer extends XrayKnowledgeSkillBase {
             "bug-triage-specialist", "log-monitor",
             "mobile-development", "git-workflow", "session-management",
             "code-analyzer", "refactoring-strategies", "project-analysis",
-            "testing-best-practices", "database-design", "devops-deployment",
+            "database-design", "devops-deployment",
             "api-design", "ui-ux-design", "database-engineer",
         ];
         let skills;
@@ -252,6 +262,15 @@ class SkillInvocationServer extends XrayKnowledgeSkillBase {
         ];
         return { content: [{ type: "text", text: lines.join("\n") }] };
     }
+    /**
+     * Dispatch a skill tool call: prefer in-process pluginRegistry, fall back to external MCP process.
+     */
+    async callSkillTool(skillName, toolName, args) {
+        if (pluginRegistry.hasToolPlugin(skillName)) {
+            return pluginRegistry.callSkillTool(skillName, toolName, args);
+        }
+        return mcpClientManager.callServerTool(skillName, toolName, args);
+    }
     async handleInvokeSkill(args) {
         const { skillName, toolName, args: toolArgs = {} } = args;
         const skillAliases = {
@@ -282,7 +301,7 @@ class SkillInvocationServer extends XrayKnowledgeSkillBase {
             "mobile-development", "seo-consultant",
             "git-workflow", "content-creator", "ui-ux-design",
             "multimodal-looker", "refactoring-strategies",
-            "project-analysis", "testing-best-practices",
+            "project-analysis",
             "architecture-patterns",
         ];
         if (!availableServers.includes(resolvedSkill)) {
@@ -299,7 +318,7 @@ class SkillInvocationServer extends XrayKnowledgeSkillBase {
         try {
             // Track skill usage for adaptive learning
             const skillStartTime = Date.now();
-            const result = await mcpClientManager.callServerTool(resolvedSkill, toolName, toolArgs);
+            const result = await this.callSkillTool(resolvedSkill, toolName, toolArgs);
             // Record outcome for adaptive learning (success = no error)
             const duration = Date.now() - skillStartTime;
             this.recordSkillOutcome(skillName, resolvedSkill, toolName, duration, result);
@@ -331,7 +350,7 @@ class SkillInvocationServer extends XrayKnowledgeSkillBase {
         }
     }
     async handleSkillCodeReview(args) {
-        const result = await mcpClientManager.callServerTool("code-review", "analyze_code_quality", args);
+        const result = await this.callSkillTool("code-review", "analyze_code_quality", args);
         return {
             content: [
                 {
@@ -346,7 +365,7 @@ class SkillInvocationServer extends XrayKnowledgeSkillBase {
         };
     }
     async handleSkillSecurityAudit(args) {
-        const result = await mcpClientManager.callServerTool("security-audit", "scan_vulnerabilities", args);
+        const result = await this.callSkillTool("security-audit", "scan_vulnerabilities", args);
         return {
             content: [
                 {
@@ -361,7 +380,7 @@ class SkillInvocationServer extends XrayKnowledgeSkillBase {
         };
     }
     async handleSkillPerformanceOptimization(args) {
-        const result = await mcpClientManager.callServerTool("performance-optimization", "analyze_performance", args);
+        const result = await this.callSkillTool("performance-optimization", "analyze_performance", args);
         return {
             content: [
                 {
@@ -376,7 +395,7 @@ class SkillInvocationServer extends XrayKnowledgeSkillBase {
         };
     }
     async handleSkillTestingStrategy(args) {
-        const result = await mcpClientManager.callServerTool("testing-strategy", "analyze_test_coverage", args);
+        const result = await this.callSkillTool("testing-strategy", "analyze_test_coverage", args);
         return {
             content: [
                 {
@@ -391,7 +410,7 @@ class SkillInvocationServer extends XrayKnowledgeSkillBase {
         };
     }
     async handleSkillProjectAnalysis(args) {
-        const result = await mcpClientManager.callServerTool("researcher", "analyze-project-health", args);
+        const result = await this.callSkillTool("researcher", "analyze-project-health", args);
         return {
             content: [
                 {
@@ -406,7 +425,7 @@ class SkillInvocationServer extends XrayKnowledgeSkillBase {
         };
     }
     async handleSkillDatabaseDesign(args) {
-        const result = await mcpClientManager.callServerTool("database-design", "schema_analysis", args);
+        const result = await this.callSkillTool("database-design", "schema_analysis", args);
         return {
             content: [
                 {
@@ -421,7 +440,7 @@ class SkillInvocationServer extends XrayKnowledgeSkillBase {
         };
     }
     async handleSkillDevopsDeployment(args) {
-        const result = await mcpClientManager.callServerTool("devops-deployment", "pipeline_generation", args);
+        const result = await this.callSkillTool("devops-deployment", "pipeline_generation", args);
         return {
             content: [
                 {
@@ -436,7 +455,7 @@ class SkillInvocationServer extends XrayKnowledgeSkillBase {
         };
     }
     async handleSkillApiDesign(args) {
-        const result = await mcpClientManager.callServerTool("api-design", "endpoint_design", args);
+        const result = await this.callSkillTool("api-design", "endpoint_design", args);
         return {
             content: [
                 {
@@ -451,7 +470,7 @@ class SkillInvocationServer extends XrayKnowledgeSkillBase {
         };
     }
     async handleSkillUiUxDesign(args) {
-        const result = await mcpClientManager.callServerTool("ui-ux-design", "design_component", args);
+        const result = await this.callSkillTool("ui-ux-design", "design_component", args);
         return {
             content: [
                 {
@@ -466,7 +485,7 @@ class SkillInvocationServer extends XrayKnowledgeSkillBase {
         };
     }
     async handleSkillDocumentationGeneration(args) {
-        const result = await mcpClientManager.callServerTool("documentation-generation", "generate_documentation", args);
+        const result = await this.callSkillTool("documentation-generation", "generate_documentation", args);
         return {
             content: [
                 {
@@ -482,7 +501,7 @@ class SkillInvocationServer extends XrayKnowledgeSkillBase {
     }
     async handleSkillStoryteller(args) {
         const { storyType, title, context, framework } = args;
-        const result = await mcpClientManager.callServerTool("storyteller", `write_${storyType}`, { title, context, framework });
+        const result = await this.callSkillTool("storyteller", `write_${storyType}`, { title, context, framework });
         return {
             content: [
                 {