0xray 3.5.4 → 3.5.5

package/src/mcps/orchestrator/server.ts

@@ -133,14 +133,39 @@ export class OrchestratorServer {
                   default: 'optimized',
                 },
                 timeout: { type: 'number', default: 300000 },
+                confer: {
+                  type: 'boolean',
+                  description:
+                    'Run mandatory 3-agent confer quorum (researcher, architect-tools, code-review) instead of task execution',
+                },
+                conferFixture: {
+                  type: 'boolean',
+                  description: 'Use fixture confer receipts (CI/verify)',
+                },
+                collocatedText: {
+                  type: 'string',
+                  description: 'Collocated synthesis context for confer prompts',
+                },
+                userAsideId: {
+                  type: 'string',
+                  description: 'Activate an existing user aside for spawn routing',
+                },
+                setActiveAside: {
+                  type: 'boolean',
+                  description: 'Set userAsideId as the active aside (default true)',
+                },
+                clearActiveAside: {
+                  type: 'boolean',
+                  description: 'Clear active aside — resume main lead-dev plan spawns',
+                },
               },
-              required: ['description', 'tasks'],
+              required: ['description'],
             },
           },
           {
             name: 'analyze-complexity',
             description:
-              'Analyze task complexity and recommend orchestration strategy. When lead_dev_mode is on (features.json), includes phased plan + todos + subagent routes. During synthesis checkpoint, returns collocated context and mandatory-consult realignment plan — pass sessionId from the active session.',
+              'Analyze task complexity and recommend orchestration strategy. When lead_dev_mode is on (features.json), includes phased plan + todos + subagent routes. Pass userAsideId to intake a parallel user aside ({asideId}.a.* namespaced todos, worktree-like). During synthesis checkpoint, returns collocated context and mandatory-consult realignment plan — pass sessionId from the active session.',
             inputSchema: {
               type: 'object',
               properties: {
@@ -149,6 +174,27 @@ export class OrchestratorServer {
                   description:
                     'Active session id (required to clear synthesis checkpoint; inferred from checkpoint state when omitted)',
                 },
+                userAsideId: {
+                  type: 'string',
+                  description:
+                    'User aside id — persists .xray/state/asides/{id}.json with {asideId}.a.* todos (parallel track)',
+                },
+                userAsideTitle: {
+                  type: 'string',
+                  description: 'Display title for the user aside (defaults to userAsideId)',
+                },
+                worktree: {
+                  type: 'string',
+                  description: 'Optional worktree path for aside isolation',
+                },
+                branch: {
+                  type: 'string',
+                  description: 'Optional git branch for the aside',
+                },
+                setActiveAside: {
+                  type: 'boolean',
+                  description: 'Activate aside for spawn routing (default true when userAsideId set)',
+                },
                 tasks: {
                   type: 'array',
                   items: {
@@ -391,7 +437,12 @@ export class OrchestratorServer {
                   ...complexityArgs,
                   ...(sessionId ? { sessionId } : {}),
                   ...(synthesisDue
-                    ? { synthesisCheckpoint: true, synthesisDueReason: dueReason }
+                    ? {
+                        synthesisCheckpoint: true,
+                        synthesisDueReason: dueReason,
+                        collocatedText: collocated?.collatedText ?? null,
+                        conferFixture: process.env.XRAY_CONFER_FIXTURE === '1',
+                      }
                     : {}),
                 },
                 aside.asideId,
@@ -402,13 +453,13 @@ export class OrchestratorServer {
                 content = appendSynthesisContextToResponse(content, collocated.collatedText);
               }
 
-              if (synthesisDue && result.ok) {
+              if (synthesisDue && result.ok && !result.content[0]?.text?.includes('Confer quorum')) {
                 content = content.map((block, index) =>
                   index === 0
                     ? {
                         ...block,
                         text:
-                          `${block.text}\n\n**Synthesis checkpoint remains active** until mandatory consult todos (s.1–s.3) are completed via Task spawns.`,
+                          `${block.text}\n\n**Confer** runs automatically at synthesis checkpoint (researcher → architect-tools → code-review). Checkpoint clears when all consult todos complete.`,
                       }
                     : block,
                 );

package/xray/features.json

@@ -36,7 +36,11 @@
     "phased_plan_threshold": 25,
     "auto_consult_major_work": true,
     "no_new_surface": true,
-    "auto_chain_delegations": true
+    "auto_chain_delegations": true,
+    "user_asides": {
+      "enabled": true,
+      "auto_provision_worktree": false
+    }
   },
   "autonomous_reporting": {
     "enabled": true,

package/xray/features.schema.json

@@ -28,6 +28,62 @@
         "required": ["module_path"]
       }
     },
+    "multi_agent_orchestration": {
+      "type": "object",
+      "properties": {
+        "enabled": { "type": "boolean" },
+        "lead_dev_mode": { "type": "boolean" },
+        "plan_stale_hours": {
+          "type": "number",
+          "minimum": 1,
+          "description": "Archive lead-dev-plan when all todos still pending after N hours"
+        },
+        "plan_archive_marker_hours": {
+          "type": "number",
+          "minimum": 1,
+          "description": "How long spawn-plan-stale persists after a stale plan was archived (hours)"
+        },
+        "confer_on_synthesis": {
+          "type": "boolean",
+          "description": "Auto-run 3-agent confer quorum at synthesis checkpoint (default true)"
+        },
+        "confer": {
+          "type": "object",
+          "properties": {
+            "enabled": { "type": "boolean" },
+            "on_synthesis": { "type": "boolean" }
+          },
+          "description": "Mandatory researcher/architect-tools/code-review quorum"
+        },
+        "sibling_repos": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              { "type": "string" },
+              {
+                "type": "object",
+                "properties": {
+                  "path": { "type": "string" },
+                  "label": { "type": "string" }
+                },
+                "required": ["path"]
+              }
+            ]
+          },
+          "description": "Sibling workspace roots (e.g. UI repo when MCP host is cwd)"
+        },
+        "user_asides": {
+          "type": "object",
+          "properties": {
+            "enabled": { "type": "boolean" },
+            "auto_provision_worktree": {
+              "type": "boolean",
+              "description": "Run guarded git worktree add on analyze-complexity aside intake when worktree+branch set"
+            }
+          }
+        }
+      }
+    },
     "synthesis": {
       "type": "object",
       "properties": {