code-graph-context 2.5.1 → 2.5.3

package/dist/mcp/tools/swarm-claim-task.tool.js

@@ -23,6 +23,12 @@ const CLAIM_TASK_BY_ID_QUERY = `
   // Only claim if all dependencies are complete
   WHERE incompleteDeps = 0
 
+  // Acquire exclusive lock to prevent race conditions
+  CALL apoc.lock.nodes([t])
+
+  // Double-check status after acquiring lock
+  WITH t WHERE t.status IN ['available', 'blocked']
+
   // Atomic claim
   SET t.status = 'claimed',
       t.claimedBy = $agentId,
@@ -57,11 +63,12 @@ const CLAIM_TASK_BY_ID_QUERY = `
 `;
 /**
  * Query to claim the highest priority available task matching criteria
+ * Uses APOC locking to prevent race conditions between parallel workers
  */
 const CLAIM_NEXT_TASK_QUERY = `
-  // Find available tasks not blocked by dependencies
+  // Find available or blocked tasks (blocked tasks may have deps completed now)
   MATCH (t:SwarmTask {projectId: $projectId, swarmId: $swarmId})
-  WHERE t.status = 'available'
+  WHERE t.status IN ['available', 'blocked']
     AND ($types IS NULL OR size($types) = 0 OR t.type IN $types)
     AND ($minPriority IS NULL OR t.priorityScore >= $minPriority)
 
@@ -75,6 +82,12 @@ const CLAIM_NEXT_TASK_QUERY = `
   ORDER BY t.priorityScore DESC, t.createdAt ASC
   LIMIT 1
 
+  // Acquire exclusive lock to prevent race conditions
+  CALL apoc.lock.nodes([t])
+
+  // Double-check status after acquiring lock (another worker may have claimed it)
+  WITH t WHERE t.status IN ['available', 'blocked']
+
   // Atomic claim
   SET t.status = 'claimed',
       t.claimedBy = $agentId,

package/dist/mcp/tools/swarm-complete-task.tool.js

@@ -11,7 +11,7 @@ import { createErrorResponse, createSuccessResponse, resolveProjectIdOrError, de
  */
 const COMPLETE_TASK_QUERY = `
   MATCH (t:SwarmTask {id: $taskId, projectId: $projectId})
-  WHERE t.status = 'in_progress' AND t.claimedBy = $agentId
+  WHERE t.status IN ['in_progress', 'claimed'] AND t.claimedBy = $agentId
 
   SET t.status = 'completed',
       t.completedAt = timestamp(),
@@ -29,17 +29,21 @@ const COMPLETE_TASK_QUERY = `
 
   // Check if waiting tasks now have all dependencies completed
   WITH t, collect(waiting) as waitingTasks
+
+  // Unblock tasks that have all dependencies met
   UNWIND (CASE WHEN size(waitingTasks) = 0 THEN [null] ELSE waitingTasks END) as waiting
   OPTIONAL MATCH (waiting)-[:DEPENDS_ON]->(otherDep:SwarmTask)
   WHERE otherDep.status <> 'completed' AND otherDep.id <> t.id
   WITH t, waiting, count(otherDep) as remainingDeps
-  WHERE waiting IS NOT NULL AND remainingDeps = 0
 
-  // Unblock tasks that now have all dependencies met
-  SET waiting.status = 'available',
-      waiting.updatedAt = timestamp()
+  // Update status for tasks with no remaining deps (but don't filter out the row)
+  FOREACH (_ IN CASE WHEN waiting IS NOT NULL AND remainingDeps = 0 THEN [1] ELSE [] END |
+    SET waiting.status = 'available', waiting.updatedAt = timestamp()
+  )
 
-  WITH t, collect(waiting.id) as unblockedTaskIds
+  WITH t, CASE WHEN waiting IS NOT NULL AND remainingDeps = 0 THEN waiting.id ELSE null END as unblockedId
+  WITH t, collect(unblockedId) as allUnblockedIds
+  WITH t, [id IN allUnblockedIds WHERE id IS NOT NULL] as unblockedTaskIds
 
   RETURN t.id as id,
          t.title as title,
@@ -112,16 +116,21 @@ const APPROVE_TASK_QUERY = `
 
   // Check if waiting tasks now have all dependencies completed
   WITH t, collect(waiting) as waitingTasks
+
+  // Unblock tasks that have all dependencies met
   UNWIND (CASE WHEN size(waitingTasks) = 0 THEN [null] ELSE waitingTasks END) as waiting
   OPTIONAL MATCH (waiting)-[:DEPENDS_ON]->(otherDep:SwarmTask)
   WHERE otherDep.status <> 'completed' AND otherDep.id <> t.id
   WITH t, waiting, count(otherDep) as remainingDeps
-  WHERE waiting IS NOT NULL AND remainingDeps = 0
 
-  SET waiting.status = 'available',
-      waiting.updatedAt = timestamp()
+  // Update status for tasks with no remaining deps (but don't filter out the row)
+  FOREACH (_ IN CASE WHEN waiting IS NOT NULL AND remainingDeps = 0 THEN [1] ELSE [] END |
+    SET waiting.status = 'available', waiting.updatedAt = timestamp()
+  )
 
-  WITH t, collect(waiting.id) as unblockedTaskIds
+  WITH t, CASE WHEN waiting IS NOT NULL AND remainingDeps = 0 THEN waiting.id ELSE null END as unblockedId
+  WITH t, collect(unblockedId) as allUnblockedIds
+  WITH t, [id IN allUnblockedIds WHERE id IS NOT NULL] as unblockedTaskIds
 
   RETURN t.id as id,
          t.title as title,

package/dist/mcp/tools/swarm-orchestrate.tool.js

@@ -352,33 +352,129 @@ export const createSwarmOrchestrateTool = (server) => {
  */
 function generateWorkerInstructions(swarmId, projectId, maxAgents, taskCount) {
     const recommendedAgents = Math.min(maxAgents, Math.ceil(taskCount / 2), taskCount);
-    return `
-## Worker Agent Instructions
+    // Generate unique agent IDs for each worker
+    const agentIds = Array.from({ length: recommendedAgents }, (_, i) => `${swarmId}_worker_${i + 1}`);
+    const workerPrompt = `You are a swarm worker agent.
+- Agent ID: {AGENT_ID}
+- Swarm ID: ${swarmId}
+- Project: ${projectId}
 
-To execute this swarm, spawn ${recommendedAgents} worker agent(s) using the Task tool:
+## CRITICAL RULES
+1. NEVER fabricate node IDs - get them from graph tool responses
+2. ALWAYS use the blackboard task queue (swarm_claim_task, swarm_complete_task)
+3. Use graph tools (traverse_from_node, search_codebase) to understand context
+4. Exit when swarm_claim_task returns "no_tasks"
 
-\`\`\`
-Task({
-  subagent_type: "general-purpose",
-  prompt: "You are a swarm worker for swarm ${swarmId}. Project: ${projectId}.
+## WORKFLOW - Follow these steps exactly:
 
-Your workflow:
-1. swarm_sense({ projectId: '${projectId}', swarmId: '${swarmId}', types: ['modifying', 'claiming'] })
-2. swarm_claim_task({ projectId: '${projectId}', swarmId: '${swarmId}', agentId: '<your-id>' })
-3. If task claimed: execute it, then swarm_complete_task with action: 'complete'
-4. Loop until no tasks remain
+### Step 1: Claim a task from the blackboard
+swarm_claim_task({
+  projectId: "${projectId}",
+  swarmId: "${swarmId}",
+  agentId: "{AGENT_ID}"
+})
+// If returns "no_tasks" → exit, swarm is complete
+// Otherwise you now own the returned task
 
-Always leave pheromones when working. Exit when swarm_get_tasks shows no available/in_progress tasks.",
-  run_in_background: true
+### Step 2: Start working and check for conflicts
+swarm_claim_task({
+  projectId: "${projectId}",
+  swarmId: "${swarmId}",
+  agentId: "{AGENT_ID}",
+  taskId: "<TASK_ID_FROM_STEP_1>",
+  action: "start"
 })
+
+// Check if another agent is working on related code
+swarm_sense({
+  projectId: "${projectId}",
+  swarmId: "${swarmId}",
+  types: ["modifying", "warning"],
+  excludeAgentId: "{AGENT_ID}"
+})
+
+### Step 3: Understand the code context (USE GRAPH TOOLS!)
+// Use traverse_from_node to see relationships and callers
+traverse_from_node({
+  projectId: "${projectId}",
+  filePath: "<TARGET_FILE_FROM_TASK>",
+  maxDepth: 2,
+  includeCode: true
+})
+
+// Or search for related code
+search_codebase({
+  projectId: "${projectId}",
+  query: "<WHAT_YOU_NEED_TO_UNDERSTAND>"
+})
+
+### Step 4: Do the work
+- Use Read tool for full source code of files to modify
+- Use Edit tool to make changes
+- Mark nodes you're modifying:
+swarm_pheromone({
+  projectId: "${projectId}",
+  nodeId: "<NODE_ID_FROM_GRAPH>",
+  type: "modifying",
+  agentId: "{AGENT_ID}",
+  swarmId: "${swarmId}"
+})
+
+### Step 5: Complete the task via blackboard
+swarm_pheromone({
+  projectId: "${projectId}",
+  nodeId: "<NODE_ID>",
+  type: "completed",
+  agentId: "{AGENT_ID}",
+  swarmId: "${swarmId}",
+  data: { summary: "<WHAT_YOU_DID>" }
+})
+
+swarm_complete_task({
+  projectId: "${projectId}",
+  taskId: "<TASK_ID>",
+  agentId: "{AGENT_ID}",
+  action: "complete",
+  summary: "<DESCRIBE_WHAT_YOU_DID>",
+  filesChanged: ["<LIST_OF_FILES_YOU_MODIFIED>"]
+})
+
+### Step 6: Loop back to Step 1
+Claim the next available task. Continue until no tasks remain.
+
+## IF YOU GET STUCK
+swarm_complete_task({
+  projectId: "${projectId}",
+  taskId: "<TASK_ID>",
+  agentId: "{AGENT_ID}",
+  action: "fail",
+  reason: "<WHY_YOU_ARE_STUCK>",
+  retryable: true
+})
+Then claim another task.`;
+    const taskCalls = agentIds.map(agentId => {
+        const prompt = workerPrompt.replace(/\{AGENT_ID\}/g, agentId);
+        return `Task({
+  subagent_type: "general-purpose",
+  run_in_background: false,
+  prompt: \`${prompt}\`
+})`;
+    }).join('\n\n');
+    return `
+## Worker Agent Instructions
+
+Spawn ${recommendedAgents} worker agent(s) IN PARALLEL (all Task calls in ONE message):
+
+\`\`\`javascript
+${taskCalls}
 \`\`\`
 
-Launch ${recommendedAgents} agents in parallel for optimal execution.
+**CRITICAL:** Include ALL ${recommendedAgents} Task calls in a single message to run them in parallel.
 
 ## Monitoring Progress
 
 Check swarm progress:
-\`\`\`
+\`\`\`javascript
 swarm_get_tasks({
   projectId: "${projectId}",
   swarmId: "${swarmId}",
@@ -386,9 +482,9 @@ swarm_get_tasks({
 })
 \`\`\`
 
-## Cleanup (after completion)
+## Cleanup (after all workers complete)
 
-\`\`\`
+\`\`\`javascript
 swarm_cleanup({
   projectId: "${projectId}",
   swarmId: "${swarmId}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-graph-context",
-  "version": "2.5.1",
+  "version": "2.5.3",
   "description": "MCP server that builds code graphs to provide rich context to LLMs",
   "type": "module",
   "homepage": "https://github.com/drewdrewH/code-graph-context#readme",