code-graph-context 2.5.1 → 2.5.2

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,6 +63,7 @@ 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
@@ -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 = 'available'
+
   // 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/package.json

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