agent-orchestrator-mcp-server 0.4.1 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-orchestrator-mcp-server",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Local implementation of agent-orchestrator MCP server",
   "main": "build/index.js",
   "type": "module",

package/shared/allowed-agent-roots.d.ts

@@ -26,11 +26,15 @@ export interface AgentRootValidationResult {
  * Validate a start_session request against the allowed agent roots constraints.
  *
  * When ALLOWED_AGENT_ROOTS is set:
- * - git_root must match one of the allowed agent roots
+ * - git_root (and optionally branch/subdirectory) must match one of the allowed agent roots
  * - mcp_servers must exactly match the default_mcp_servers of that agent root
  *   (no more, no less — any deviation is rejected)
  *
+ * When multiple allowed agent roots share the same git_root, branch and subdirectory
+ * are used to disambiguate. This is critical for monorepo setups where multiple agent
+ * roots point to the same repository but different subdirectories.
+ *
  * Returns { valid: true } if the request is allowed, or { valid: false, error: string } if not.
  */
-export declare function validateAgentRootConstraints(allowedRoots: string[] | null, agentRoots: AgentRootInfo[], gitRoot?: string, mcpServers?: string[]): AgentRootValidationResult;
+export declare function validateAgentRootConstraints(allowedRoots: string[] | null, agentRoots: AgentRootInfo[], gitRoot?: string, mcpServers?: string[], branch?: string, subdirectory?: string): AgentRootValidationResult;
 //# sourceMappingURL=allowed-agent-roots.d.ts.map

package/shared/allowed-agent-roots.js

@@ -39,18 +39,34 @@ export function filterAgentRoots(agentRoots, allowedRoots) {
  * Validate a start_session request against the allowed agent roots constraints.
  *
  * When ALLOWED_AGENT_ROOTS is set:
- * - git_root must match one of the allowed agent roots
+ * - git_root (and optionally branch/subdirectory) must match one of the allowed agent roots
  * - mcp_servers must exactly match the default_mcp_servers of that agent root
  *   (no more, no less — any deviation is rejected)
  *
+ * When multiple allowed agent roots share the same git_root, branch and subdirectory
+ * are used to disambiguate. This is critical for monorepo setups where multiple agent
+ * roots point to the same repository but different subdirectories.
+ *
  * Returns { valid: true } if the request is allowed, or { valid: false, error: string } if not.
  */
-export function validateAgentRootConstraints(allowedRoots, agentRoots, gitRoot, mcpServers) {
+export function validateAgentRootConstraints(allowedRoots, agentRoots, gitRoot, mcpServers, branch, subdirectory) {
     if (allowedRoots === null) {
         return { valid: true };
     }
-    // Find the matching agent root by git_root
-    const matchingRoot = agentRoots.find((root) => allowedRoots.includes(root.name) && root.git_root === gitRoot);
+    // Find all allowed agent roots that match by git_root
+    const candidates = agentRoots.filter((root) => allowedRoots.includes(root.name) && root.git_root === gitRoot);
+    // When multiple candidates share the same git_root, disambiguate using branch and subdirectory
+    let matchingRoot;
+    if (candidates.length > 1) {
+        matchingRoot = candidates.find((root) => {
+            const branchMatch = !branch || (root.default_branch ?? 'main') === branch;
+            const subdirMatch = !subdirectory || root.default_subdirectory === subdirectory;
+            return branchMatch && subdirMatch;
+        });
+    }
+    else {
+        matchingRoot = candidates[0];
+    }
     if (!matchingRoot) {
         const allowedNames = allowedRoots.join(', ');
         const allowedGitRoots = agentRoots

package/shared/tools/start-session.js

@@ -129,7 +129,7 @@ export function startSessionTool(_server, clientFactory) {
                         configs = await client.getConfigs();
                         setConfigsCache(configs);
                     }
-                    const validation = validateAgentRootConstraints(allowedRoots, configs.agent_roots, validatedArgs.git_root, validatedArgs.mcp_servers);
+                    const validation = validateAgentRootConstraints(allowedRoots, configs.agent_roots, validatedArgs.git_root, validatedArgs.mcp_servers, validatedArgs.branch, validatedArgs.subdirectory);
                     if (!validation.valid) {
                         return {
                             content: [{ type: 'text', text: `Error starting session: ${validation.error}` }],