0xray 3.1.1 → 3.2.0

package/dist/mcps/orchestrator/aside-context.js

@@ -0,0 +1,207 @@
+/**
+ * AsideContext — bounded subcontext for depth, continuity, and layered exploration
+ *
+ * Enables the orchestrator to spawn sub-investigations that inherit session context,
+ * accumulate structured observations from v3 subsystems (governance, orchestration,
+ * complexity analysis), and feed results back into the governance loop.
+ */
+import { frameworkLogger } from "../../core/framework-logger.js";
+let asideCounter = 0;
+const activeAsides = new Map();
+export function getActiveAsideCount() {
+    return activeAsides.size;
+}
+export function getActiveAsideIds() {
+    return Array.from(activeAsides.keys());
+}
+export function getAsideState(asideId) {
+    return activeAsides.get(asideId);
+}
+export function addObservations(asideId, observations) {
+    const aside = activeAsides.get(asideId);
+    if (!aside)
+        return false;
+    aside.observations.push(...observations);
+    return true;
+}
+export function extractGovernanceObservations(result) {
+    const obs = [];
+    obs.push({
+        key: "governanceCycleId",
+        value: result.cycleId,
+        source: "inference/inference-cycle.ts",
+    });
+    obs.push({
+        key: "governanceVoteCount",
+        value: String(result.votes.length),
+        source: "inference/inference-cycle.ts",
+    });
+    const approved = result.votes.filter((v) => v.decision === "approve").length;
+    const rejected = result.votes.filter((v) => v.decision === "reject").length;
+    obs.push({
+        key: "governanceApprovedCount",
+        value: String(approved),
+        source: "inference/inference-cycle.ts",
+    });
+    obs.push({
+        key: "governanceRejectedCount",
+        value: String(rejected),
+        source: "inference/inference-cycle.ts",
+    });
+    if (result.corpusSummary) {
+        obs.push({
+            key: "corpusSessionCount",
+            value: String(result.corpusSummary.sessions),
+            source: "inference/inference-cycle.ts",
+        });
+        obs.push({
+            key: "corpusPatternCount",
+            value: String(result.corpusSummary.recurringPatterns),
+            source: "inference/inference-cycle.ts",
+        });
+    }
+    return obs;
+}
+export function extractOrchestrationObservations(result) {
+    const obs = [];
+    obs.push({
+        key: "orchestrationSuccess",
+        value: String(result.success),
+        source: "mcps/orchestrator/types.ts",
+    });
+    obs.push({
+        key: "tasksCompleted",
+        value: String(result.completedTasks),
+        source: "mcps/orchestrator/types.ts",
+    });
+    obs.push({
+        key: "tasksFailed",
+        value: String(result.failedTasks),
+        source: "mcps/orchestrator/types.ts",
+    });
+    obs.push({
+        key: "orchestrationDuration",
+        value: `${result.duration}ms`,
+        source: "mcps/orchestrator/types.ts",
+    });
+    for (const b of result.bottlenecks) {
+        obs.push({
+            key: "bottleneck",
+            value: b.substring(0, 200),
+            source: "mcps/orchestrator/types.ts",
+        });
+    }
+    for (const r of result.recommendations) {
+        obs.push({
+            key: "recommendation",
+            value: r.substring(0, 200),
+            source: "mcps/orchestrator/types.ts",
+        });
+    }
+    return obs;
+}
+export function extractComplexityObservations(analysis) {
+    const obs = [];
+    obs.push({
+        key: "complexityScore",
+        value: String(analysis.overallComplexity),
+        source: "mcps/orchestrator/execution/execution-planner.ts",
+    });
+    obs.push({
+        key: "recommendedStrategy",
+        value: analysis.recommendedStrategy,
+        source: "mcps/orchestrator/execution/execution-planner.ts",
+    });
+    obs.push({
+        key: "parallelPotential",
+        value: String(analysis.parallelPotential),
+        source: "mcps/orchestrator/execution/execution-planner.ts",
+    });
+    obs.push({
+        key: "estimatedDuration",
+        value: `${analysis.estimatedDuration}ms`,
+        source: "mcps/orchestrator/execution/execution-planner.ts",
+    });
+    for (const tc of analysis.taskComplexity) {
+        obs.push({
+            key: `taskComplexity`,
+            value: `${tc.complexity} (${tc.category})`,
+            source: "mcps/orchestrator/execution/execution-planner.ts",
+        });
+    }
+    return obs;
+}
+export async function spawnAside(options) {
+    const asideId = options.parentAsideId
+        ? `${options.parentAsideId}.aside-${++asideCounter}`
+        : `aside-${++asideCounter}-${Date.now()}`;
+    const startTime = Date.now();
+    const aside = {
+        asideId,
+        description: options.description,
+        startedAt: startTime,
+        observations: [],
+        ...(options.inheritedContext !== undefined ? { inheritedContext: options.inheritedContext } : {}),
+        ...(options.parentAsideId !== undefined ? { parentAsideId: options.parentAsideId } : {}),
+        ...(options.sessionId !== undefined ? { sessionId: options.sessionId } : {}),
+        ...(options.priorVerdictContext !== undefined ? { priorVerdictContext: options.priorVerdictContext } : {}),
+    };
+    activeAsides.set(asideId, aside);
+    frameworkLogger.log("aside-context", "aside-spawn", "info", {
+        asideId,
+        description: options.description,
+        sessionId: options.sessionId,
+        parentAsideId: options.parentAsideId,
+        activeAsideCount: activeAsides.size,
+    });
+    if (options.priorVerdictContext) {
+        const decision = options.priorVerdictContext["decision"];
+        if (decision) {
+            aside.observations.push({
+                key: "governanceDecision",
+                value: String(decision),
+                source: "priorVerdictContext",
+            });
+        }
+    }
+    const duration = Date.now() - startTime;
+    const result = {
+        asideId,
+        description: options.description,
+        success: true,
+        duration,
+        observations: aside.observations,
+        ...(options.priorVerdictContext !== undefined ? { priorVerdictContext: options.priorVerdictContext } : {}),
+    };
+    frameworkLogger.log("aside-context", "aside-complete", "info", {
+        asideId,
+        duration,
+        observationCount: aside.observations.length,
+        activeAsideCount: activeAsides.size,
+    });
+    return result;
+}
+export function closeAside(asideId) {
+    const aside = activeAsides.get(asideId);
+    if (!aside)
+        return false;
+    activeAsides.delete(asideId);
+    frameworkLogger.log("aside-context", "aside-closed", "info", {
+        asideId,
+        duration: Date.now() - aside.startedAt,
+        remainingActive: activeAsides.size,
+    });
+    return true;
+}
+export function closeAllAsides() {
+    const count = activeAsides.size;
+    activeAsides.clear();
+    frameworkLogger.log("aside-context", "aside-close-all", "info", {
+        closedCount: count,
+    });
+    return count;
+}
+export function resetAsideContext() {
+    activeAsides.clear();
+    asideCounter = 0;
+}

package/dist/mcps/orchestrator/handlers/complexity-handler.js

@@ -5,6 +5,7 @@
  */
 import { frameworkLogger } from '../../../core/framework-logger.js';
 import { getExecutionPlanner } from '../execution/execution-planner.js';
+import { addObservations, extractComplexityObservations } from '../aside-context.js';
 /**
  * Complexity Handler
  * Processes analyze-complexity requests
@@ -14,12 +15,15 @@ export class ComplexityHandler {
     /**
      * Handle analyze-complexity request
      */
-    async handleAnalyzeComplexity(args) {
+    async handleAnalyzeComplexity(args, asideId) {
         const { tasks = [] } = args;
         await frameworkLogger.log('orchestrator.server', 'analyze-complexity-start', 'info', { taskCount: tasks.length });
         try {
             const analysis = await this.planner.analyzeTaskComplexity(tasks);
             const recommendations = this.generateRecommendations(analysis);
+            if (asideId) {
+                addObservations(asideId, extractComplexityObservations(analysis));
+            }
             return {
                 content: [
                     {

package/dist/mcps/orchestrator/handlers/status-handler.js

@@ -41,7 +41,14 @@ export class StatusHandler {
                 // Overall status
                 status = this.getOverallStatus(deps);
             }
-            const response = this.formatStatusResponse(status, detailed);
+            let response = this.formatStatusResponse(status, detailed);
+            if (detailed && deps.asideCount !== undefined) {
+                response += `\n\n**Active Aside Contexts:**`;
+                response += `\n• Count: ${deps.asideCount}`;
+                if (deps.asideIds && deps.asideIds.length > 0) {
+                    response += `\n• IDs: ${deps.asideIds.join(', ')}`;
+                }
+            }
             return { content: [{ type: 'text', text: response }] };
         }
         catch (error) {

package/dist/mcps/orchestrator/handlers/task-handler.js

@@ -6,6 +6,7 @@
 import { frameworkLogger } from '../../../core/framework-logger.js';
 import { getExecutionPlanner } from '../execution/execution-planner.js';
 import { mcpClientManager } from '../../../mcps/mcp-client.js';
+import { addObservations, extractOrchestrationObservations } from '../aside-context.js';
 /**
  * Task Handler
  * Processes orchestrate-task requests
@@ -49,6 +50,10 @@ export class TaskHandler {
             if (results.agentOutputs) {
                 orchestrationResult.agentOutputs = results.agentOutputs;
             }
+            // Push observations into aside context if active
+            if (deps.asideId) {
+                addObservations(deps.asideId, extractOrchestrationObservations(orchestrationResult));
+            }
             // Store in history
             deps.taskHistory.push({
                 sessionId,

package/dist/mcps/orchestrator/index.js

@@ -0,0 +1,5 @@
+export { OrchestratorServer, createOrchestratorServer } from './server.js';
+export { TaskHandler } from './handlers/task-handler.js';
+export { ComplexityHandler } from './handlers/complexity-handler.js';
+export { StatusHandler } from './handlers/status-handler.js';
+export { spawnAside, closeAside, closeAllAsides, addObservations, getActiveAsideCount, getActiveAsideIds, getAsideState, resetAsideContext, extractGovernanceObservations, extractOrchestrationObservations, extractComplexityObservations, } from './aside-context.js';

package/dist/mcps/orchestrator/server.js

@@ -14,6 +14,7 @@ import { MultiAgentOrchestrationCoordinator } from '../../orchestrator/multi-age
 import { TaskHandler } from './handlers/task-handler.js';
 import { ComplexityHandler } from './handlers/complexity-handler.js';
 import { StatusHandler } from './handlers/status-handler.js';
+import { spawnAside, closeAside, closeAllAsides, addObservations, getActiveAsideCount, getActiveAsideIds, getAsideState, extractGovernanceObservations, } from './aside-context.js';
 /**
  * Orchestrator MCP Server
  * Enterprise-grade orchestration with advanced task management and agent coordination
@@ -203,14 +204,55 @@ export class OrchestratorServer {
             try {
                 const { name, arguments: args } = request.params;
                 switch (name) {
-                    case 'orchestrate-task':
-                        return await this.taskHandler.handleOrchestrateTask(args, { taskHistory: this.taskHistory, activeTasks: this.activeTasks });
-                    case 'analyze-complexity':
-                        return await this.complexityHandler.handleAnalyzeComplexity(args);
+                    case 'orchestrate-task': {
+                        const orchArgs = args;
+                        const aside = await spawnAside({
+                            description: `Orchestration: ${orchArgs.description}`,
+                            ...(orchArgs.sessionId ? { sessionId: orchArgs.sessionId } : {}),
+                            inheritedContext: { taskCount: orchArgs.tasks?.length ?? 0, executionMode: orchArgs.executionMode ?? 'optimized' },
+                        });
+                        try {
+                            const result = await this.taskHandler.handleOrchestrateTask(orchArgs, { taskHistory: this.taskHistory, activeTasks: this.activeTasks, asideId: aside.asideId });
+                            return result;
+                        }
+                        finally {
+                            closeAside(aside.asideId);
+                        }
+                    }
+                    case 'analyze-complexity': {
+                        const complexityArgs = args;
+                        const aside = await spawnAside({
+                            description: `Complexity analysis: ${complexityArgs.tasks.length} tasks`,
+                        });
+                        try {
+                            return await this.complexityHandler.handleAnalyzeComplexity(complexityArgs, aside.asideId);
+                        }
+                        finally {
+                            closeAside(aside.asideId);
+                        }
+                    }
                     case 'get-orchestration-status':
-                        return await this.statusHandler.handleGetOrchestrationStatus(args, { taskHistory: this.taskHistory, activeTasks: this.activeTasks });
-                    case 'cancel-orchestration':
-                        return await this.statusHandler.handleCancelOrchestration(args, { taskHistory: this.taskHistory, activeTasks: this.activeTasks });
+                        return await this.statusHandler.handleGetOrchestrationStatus(args, {
+                            taskHistory: this.taskHistory,
+                            activeTasks: this.activeTasks,
+                            asideCount: getActiveAsideCount(),
+                            asideIds: getActiveAsideIds(),
+                        });
+                    case 'cancel-orchestration': {
+                        const cancelArgs = args;
+                        if (cancelArgs.force || (!cancelArgs.sessionId && !cancelArgs.taskId)) {
+                            closeAllAsides();
+                        }
+                        else if (cancelArgs.sessionId) {
+                            const asideIds = getActiveAsideIds().filter((id) => getAsideState(id)?.sessionId === cancelArgs.sessionId);
+                            for (const id of asideIds)
+                                closeAside(id);
+                        }
+                        return await this.statusHandler.handleCancelOrchestration(cancelArgs, {
+                            taskHistory: this.taskHistory,
+                            activeTasks: this.activeTasks,
+                        });
+                    }
                     case 'optimize-orchestration':
                         return await this.statusHandler.handleOptimizeOrchestration(args);
                     case 'govern-and-apply':
@@ -235,7 +277,18 @@ export class OrchestratorServer {
             const cycle = InferenceCycle.getInstance(process.cwd(), {
                 skipApply: args.skipApply ?? false,
             });
-            const result = await cycle.governExternalProposals(args.proposals);
+            const aside = await spawnAside({
+                description: `Governance cycle: ${args.proposals.length} proposals`,
+                priorVerdictContext: { proposalCount: args.proposals.length },
+            });
+            let result;
+            try {
+                result = await cycle.governExternalProposals(args.proposals);
+                addObservations(aside.asideId, extractGovernanceObservations(result));
+            }
+            finally {
+                closeAside(aside.asideId);
+            }
             const approved = result.votes.filter((v) => v.decision === 'approve').length;
             const rejected = result.votes.length - approved;
             return {
@@ -243,6 +296,7 @@ export class OrchestratorServer {
                         type: 'text',
                         text: JSON.stringify({
                             cycleId: result.cycleId,
+                            asideId: aside.asideId,
                             approved,
                             rejected,
                             votes: result.votes,
@@ -280,6 +334,7 @@ export class OrchestratorServer {
      * Stop the server
      */
     async stop() {
+        closeAllAsides();
         await frameworkLogger.log('orchestrator.server', 'shutdown', 'info', {
             message: '0xRay Orchestrator MCP Server shutting down',
         });

package/dist/mcps/performance-analysis.server.js

@@ -3,98 +3,74 @@
  *
  * Comprehensive metrics analysis for framework integration and optimization
  */
-import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { frameworkLogger, generateJobId } from "../core/framework-logger.js";
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { CallToolRequestSchema, ListToolsRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
 import { execSync } from "child_process";
 import fs from "fs";
 import os from "os";
 import path from "path";
-class XrayPerformanceAnalysisServer {
-    server;
+import { XrayKnowledgeSkillBase } from "./shared/knowledge-skill-base.js";
+class XrayPerformanceAnalysisServer extends XrayKnowledgeSkillBase {
     startTime;
     constructor() {
-        this.server = new Server({
-            name: "performance-analysis", version: "3.1.0",
-        }, {
-            capabilities: {
-                tools: {},
-            },
-        });
+        super("performance-analysis", "3.1.0");
         this.startTime = Date.now();
-        this.setupToolHandlers();
-        frameworkLogger.log("mcp-performance-analysis", "server-initialized", "info");
-    }
-    setupToolHandlers() {
-        // List available tools
-        this.server.setRequestHandler(ListToolsRequestSchema, async () => {
-            return {
-                tools: [
-                    {
-                        name: "performance-analysis",
-                        description: "Comprehensive metrics analysis for framework integration and optimization",
-                        inputSchema: {
-                            type: "object",
-                            properties: {
-                                scope: {
-                                    type: "string",
-                                    enum: [
-                                        "full",
-                                        "runtime",
-                                        "build",
-                                        "resources",
-                                        "bottlenecks",
-                                    ],
-                                    default: "full",
-                                    description: "Scope of performance analysis",
-                                },
-                                duration: {
-                                    type: "number",
-                                    default: 30,
-                                    description: "Analysis duration in seconds",
-                                },
-                                detailed: {
-                                    type: "boolean",
-                                    default: false,
-                                    description: "Include detailed metrics and recommendations",
-                                },
-                            },
+        this.tools = [
+            {
+                name: "performance-analysis",
+                description: "Comprehensive metrics analysis for framework integration and optimization",
+                inputSchema: {
+                    type: "object",
+                    properties: {
+                        scope: {
+                            type: "string",
+                            enum: [
+                                "full",
+                                "runtime",
+                                "build",
+                                "resources",
+                                "bottlenecks",
+                            ],
+                            default: "full",
+                            description: "Scope of performance analysis",
+                        },
+                        duration: {
+                            type: "number",
+                            default: 30,
+                            description: "Analysis duration in seconds",
+                        },
+                        detailed: {
+                            type: "boolean",
+                            default: false,
+                            description: "Include detailed metrics and recommendations",
                         },
                     },
-                    {
-                        name: "bottleneck-detection",
-                        description: "Identify performance bottlenecks in framework operations",
-                        inputSchema: {
-                            type: "object",
-                            properties: {
-                                operation: {
-                                    type: "string",
-                                    description: "Specific operation to analyze",
-                                },
-                                threshold: {
-                                    type: "number",
-                                    default: 1000,
-                                    description: "Performance threshold in milliseconds",
-                                },
-                            },
+                },
+            },
+            {
+                name: "bottleneck-detection",
+                description: "Identify performance bottlenecks in framework operations",
+                inputSchema: {
+                    type: "object",
+                    properties: {
+                        operation: {
+                            type: "string",
+                            description: "Specific operation to analyze",
+                        },
+                        threshold: {
+                            type: "number",
+                            default: 1000,
+                            description: "Performance threshold in milliseconds",
                         },
                     },
-                ],
-            };
-        });
-        // Handle tool calls
-        this.server.setRequestHandler(CallToolRequestSchema, async (request) => {
-            const { name, arguments: args } = request.params;
-            switch (name) {
-                case "performance-analysis":
-                    return await this.handlePerformanceAnalysis(args);
-                case "bottleneck-detection":
-                    return await this.handleBottleneckDetection(args);
-                default:
-                    throw new Error(`Unknown tool: ${name}`);
-            }
-        });
+                },
+            },
+        ];
+        this.handlers = {
+            "performance-analysis": async (args) => this.handlePerformanceAnalysis(args),
+            "bottleneck-detection": async (args) => this.handleBottleneckDetection(args),
+        };
+        this.setupToolHandlers();
+        frameworkLogger.log("mcp-performance-analysis", "server-initialized", "info");
     }
     async handlePerformanceAnalysis(args) {
         const scope = args?.scope || "full";
@@ -503,13 +479,6 @@ ${results.recommendations.map((r) => `• 💡 ${r}`).join("\n") || "No recommen
         }
         return report;
     }
-    async run() {
-        const transport = new StdioServerTransport();
-        await this.server.connect(transport);
-        const jobId = generateJobId("mcp-performance-analysis-server");
-        await frameworkLogger.log("mcp-performance-analysis", "server-started", "success", {}, undefined, // sessionId
-        jobId);
-    }
 }
 // Start the server if run directly
 if (import.meta.url === `file://${fs.realpathSync(process.argv[1])}`) {