code-graph-context 2.5.0 → 2.5.2

package/README.md

@@ -616,12 +616,6 @@ MIT - see [LICENSE](LICENSE)
 
 ---
 
-## Documentation
-
-- [Graph + LLM Inference Research](docs/GRAPH_LLM_INFERENCE_RESEARCH.md) - Research on GNN embeddings, Graph Neural Prompting, and inference integration
-
----
-
 ## Links
 
 - [Issues](https://github.com/drewdrewH/code-graph-context/issues)

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

@@ -20,8 +20,14 @@ const CLAIM_TASK_BY_ID_QUERY = `
   WHERE dep.status <> 'completed'
   WITH t, count(dep) as incompleteDeps
 
-  // Only claim if no incomplete dependencies (or task was already available)
-  WHERE incompleteDeps = 0 OR t.status = 'available'
+  // 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',
@@ -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/dist/mcp/tools/swarm-get-tasks.tool.js

@@ -128,7 +128,7 @@ const GET_ACTIVE_WORKERS_QUERY = `
   WHERE ($swarmId IS NULL OR p.swarmId = $swarmId)
     AND p.type IN ['modifying', 'claiming']
   WITH p.agentId as agentId, p.type as type,
-       max(p.updatedAt) as lastActivity,
+       max(p.timestamp) as lastActivity,
        count(p) as nodeCount
   RETURN agentId, type,
          lastActivity,

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

@@ -14,12 +14,12 @@ import { Neo4jService } from '../../storage/neo4j/neo4j.service.js';
 import { TOOL_NAMES, TOOL_METADATA } from '../constants.js';
 import { TaskDecompositionHandler, } from '../handlers/task-decomposition.handler.js';
 import { createErrorResponse, createSuccessResponse, resolveProjectIdOrError, debugLog } from '../utils.js';
-import { TASK_PRIORITIES, generateSwarmId, ORCHESTRATOR_CONFIG, } from './swarm-constants.js';
+import { TASK_PRIORITIES, generateSwarmId, ORCHESTRATOR_CONFIG, getHalfLife, } from './swarm-constants.js';
 /**
  * Query to search for nodes matching the task description
  */
 const SEMANTIC_SEARCH_QUERY = `
-  CALL db.index.vector.queryNodes('code_embeddings', toInteger($limit), $embedding)
+  CALL db.index.vector.queryNodes('embedded_nodes_idx', toInteger($limit), $embedding)
   YIELD node, score
   WHERE node.projectId = $projectId
     AND score >= $minSimilarity
@@ -73,14 +73,15 @@ const CREATE_PHEROMONE_QUERY = `
     projectId: $projectId
   })
   ON CREATE SET
+    p.id = randomUUID(),
     p.swarmId = $swarmId,
     p.intensity = $intensity,
-    p.createdAt = timestamp(),
-    p.updatedAt = timestamp(),
+    p.timestamp = timestamp(),
+    p.halfLife = $halfLife,
     p.data = $data
   ON MATCH SET
     p.intensity = $intensity,
-    p.updatedAt = timestamp(),
+    p.timestamp = timestamp(),
     p.data = $data
   MERGE (p)-[:MARKS]->(target)
   RETURN p.nodeId AS nodeId
@@ -107,6 +108,25 @@ const CREATE_TASK_QUERY = `
     updatedAt: timestamp(),
     metadata: $metadata
   })
+
+  // Link to target code nodes if they exist
+  WITH t
+  OPTIONAL MATCH (target)
+  WHERE target.id IN $targetNodeIds
+    AND target.projectId = $projectId
+    AND NOT target:SwarmTask
+    AND NOT target:Pheromone
+  WITH t, collect(DISTINCT target) as targets
+  FOREACH (target IN targets | MERGE (t)-[:TARGETS]->(target))
+
+  // Link to dependency tasks if they exist
+  WITH t
+  OPTIONAL MATCH (dep:SwarmTask)
+  WHERE dep.id IN $dependencies
+    AND dep.projectId = $projectId
+  WITH t, collect(DISTINCT dep) as deps
+  FOREACH (dep IN deps | MERGE (t)-[:DEPENDS_ON]->(dep))
+
   RETURN t.id AS id
 `;
 export const createSwarmOrchestrateTool = (server) => {
@@ -278,6 +298,7 @@ export const createSwarmOrchestrateTool = (server) => {
                         swarmId,
                         type: 'proposal',
                         intensity: 1.0,
+                        halfLife: getHalfLife('proposal'),
                         data: JSON.stringify({ task, swarmId }),
                     });
                 }

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

@@ -77,6 +77,14 @@ const CHECK_DEPENDENCIES_QUERY = `
          size(incompleteDeps) as incompleteDeps,
          [d IN incompleteDeps | {id: d.id, title: d.title, status: d.status}] as blockedBy
 `;
+/**
+ * Query to update task status to blocked
+ */
+const SET_TASK_BLOCKED_QUERY = `
+  MATCH (t:SwarmTask {id: $taskId, projectId: $projectId})
+  SET t.status = 'blocked', t.updatedAt = timestamp()
+  RETURN t.id as id
+`;
 export const createSwarmPostTaskTool = (server) => {
     server.registerTool(TOOL_NAMES.swarmPostTask, {
         title: TOOL_METADATA[TOOL_NAMES.swarmPostTask].title,
@@ -180,6 +188,13 @@ export const createSwarmPostTaskTool = (server) => {
                 }
             }
             const isBlocked = dependencyStatus.incompleteDeps > 0;
+            // Update task status to blocked if there are incomplete dependencies
+            if (isBlocked) {
+                await neo4jService.run(SET_TASK_BLOCKED_QUERY, {
+                    taskId,
+                    projectId: resolvedProjectId,
+                });
+            }
             return createSuccessResponse(JSON.stringify({
                 success: true,
                 task: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-graph-context",
-  "version": "2.5.0",
+  "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",