@graph-tl/graph 0.1.10 → 0.1.14

package/dist/{server-VKTFTBXC.js → server-X36DXLEG.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-WKOEKYTF.js";
 import {
   handleAgentConfig
-} from "./chunk-ILTJI4ZN.js";
+} from "./chunk-JRMFXD5I.js";
 import {
   EngineError,
   ValidationError,
@@ -19,6 +19,7 @@ import {
   getNodeOrThrow,
   getProjectRoot,
   getProjectSummary,
+  getSubtreeProgress,
   listProjects,
   logEvent,
   optionalBoolean,
@@ -28,7 +29,7 @@ import {
   requireString,
   setDbPath,
   updateNode
-} from "./chunk-TWT5GUXW.js";
+} from "./chunk-CCGKUMCW.js";
 
 // src/server.ts
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
@@ -54,15 +55,17 @@ function handleOpen(input, agent) {
     root = createNode({
       project,
       summary: goal ?? project,
-      discovery: "pending",
+      discovery: input?.skip_discovery ? "done" : "pending",
       agent
     });
     isNew = true;
   }
   const summary = getProjectSummary(project);
   const result = { project, root, summary };
-  if (isNew) {
+  if (isNew && root.discovery === "pending") {
     result.hint = `New project created. Discovery is pending \u2014 interview the user to understand scope and goals, then set discovery to "done" via graph_update before decomposing with graph_plan.`;
+  } else if (isNew) {
+    result.hint = `New project created. Ready to decompose \u2014 use graph_plan to add tasks.`;
   } else if (root.discovery === "pending") {
     result.hint = `Discovery is still pending on this project. Complete the discovery interview, then set discovery to "done" via graph_update.`;
   } else if (summary.actionable > 0) {
@@ -216,7 +219,7 @@ function handlePlan(input, agent) {
   const refs = /* @__PURE__ */ new Set();
   for (const node of nodes) {
     if (refs.has(node.ref)) {
-      throw new Error(`Duplicate ref in batch: ${node.ref}`);
+      throw new EngineError("duplicate_ref", `Duplicate ref in batch: ${node.ref}`);
     }
     refs.add(node.ref);
   }
@@ -230,7 +233,8 @@ function handlePlan(input, agent) {
           if (existing) {
             parentId = existing.id;
           } else {
-            throw new Error(
+            throw new EngineError(
+              "invalid_parent_ref",
               `parent_ref "${nodeInput.parent_ref}" is neither a batch ref nor an existing node ID`
             );
           }
@@ -247,7 +251,8 @@ function handlePlan(input, agent) {
         }
         project = parentNode.project;
       } else {
-        throw new Error(
+        throw new EngineError(
+          "missing_parent",
           `Node "${nodeInput.ref}" has no parent_ref. All planned nodes must have a parent (an existing node or a batch ref).`
         );
       }
@@ -272,7 +277,8 @@ function handlePlan(input, agent) {
           if (existing) {
             toId = existing.id;
           } else {
-            throw new Error(
+            throw new EngineError(
+              "invalid_depends_on",
               `depends_on "${dep}" in node "${nodeInput.ref}" is neither a batch ref nor an existing node ID`
             );
           }
@@ -284,7 +290,8 @@ function handlePlan(input, agent) {
           agent
         });
         if (result.rejected) {
-          throw new Error(
+          throw new EngineError(
+            "edge_rejected",
             `Dependency edge from "${nodeInput.ref}" to "${dep}" rejected: ${result.reason}`
           );
         }
@@ -311,6 +318,15 @@ function handleUpdate(input, agent) {
   const resolvedIds = [];
   const resolvedProjects = /* @__PURE__ */ new Set();
   for (const entry of updates) {
+    if (entry.expected_rev !== void 0) {
+      const current = getNodeOrThrow(entry.node_id);
+      if (current.rev !== entry.expected_rev) {
+        throw new EngineError(
+          "rev_mismatch",
+          `Node ${entry.node_id} has rev ${current.rev}, expected ${entry.expected_rev}. Another agent may have modified it. Re-read and retry.`
+        );
+      }
+    }
     let evidence = entry.add_evidence;
     if (entry.resolved_reason) {
       evidence = [...evidence ?? [], { type: "note", ref: entry.resolved_reason }];
@@ -320,6 +336,8 @@ function handleUpdate(input, agent) {
       agent,
       resolved: entry.resolved,
       discovery: entry.discovery,
+      blocked: entry.blocked,
+      blocked_reason: entry.blocked_reason,
       state: entry.state,
       summary: entry.summary,
       properties: entry.properties,
@@ -445,6 +463,7 @@ function buildNodeTree(nodeId, currentDepth, maxDepth) {
   if (children.length === 0) {
     return tree;
   }
+  tree.progress = getSubtreeProgress(nodeId);
   if (currentDepth < maxDepth) {
     tree.children = children.map(
       (child) => buildNodeTree(child.id, currentDepth + 1, maxDepth)
@@ -517,8 +536,10 @@ function handleQuery(input) {
     params.push(...descendantIds);
   }
   if (filter?.has_evidence_type) {
-    conditions.push("n.evidence LIKE ?");
-    params.push(`%"type":"${filter.has_evidence_type}"%`);
+    conditions.push(
+      `EXISTS (SELECT 1 FROM json_each(n.evidence) WHERE json_extract(value, '$.type') = ?)`
+    );
+    params.push(filter.has_evidence_type);
   }
   if (filter?.is_leaf) {
     conditions.push(
@@ -527,6 +548,7 @@ function handleQuery(input) {
   }
   if (filter?.is_actionable) {
     conditions.push("n.resolved = 0");
+    conditions.push("n.blocked = 0");
     conditions.push(
       "NOT EXISTS (SELECT 1 FROM nodes child WHERE child.parent = n.id AND child.resolved = 0)"
     );
@@ -541,11 +563,11 @@ function handleQuery(input) {
   if (filter?.is_blocked) {
     conditions.push("n.resolved = 0");
     conditions.push(
-      `EXISTS (
+      `(n.blocked = 1 OR EXISTS (
         SELECT 1 FROM edges e
         JOIN nodes dep ON dep.id = e.to_node AND dep.resolved = 0
         WHERE e.from_node = n.id AND e.type = 'depends_on'
-      )`
+      ))`
     );
   }
   if (filter?.properties) {
@@ -637,7 +659,7 @@ function handleNext(input, agent, claimTtlMinutes = 60) {
   }
   let query = `
     SELECT n.* FROM nodes n
-    WHERE n.project = ? AND n.resolved = 0
+    WHERE n.project = ? AND n.resolved = 0 AND n.blocked = 0
     ${scopeFilter}
     AND NOT EXISTS (
       SELECT 1 FROM nodes child WHERE child.parent = n.id AND child.resolved = 0
@@ -716,7 +738,23 @@ function handleNext(input, agent, claimTtlMinutes = 60) {
       resolved_deps
     };
   });
-  return { nodes: results };
+  const claimRows = db.prepare(
+    `SELECT id, summary, json_extract(properties, '$._claimed_at') as claimed_at
+       FROM nodes
+       WHERE project = ? AND resolved = 0
+       AND json_extract(properties, '$._claimed_by') = ?
+       AND json_extract(properties, '$._claimed_at') > ?
+       ORDER BY json_extract(properties, '$._claimed_at') DESC`
+  ).all(project, agent, claimCutoff);
+  const result = { nodes: results };
+  if (claimRows.length > 0) {
+    result.your_claims = claimRows.map((r) => ({
+      id: r.id,
+      summary: r.summary,
+      claimed_at: r.claimed_at
+    }));
+  }
+  return result;
 }
 
 // src/tools/restructure.ts
@@ -755,8 +793,12 @@ function handleMove(op, agent) {
   const db = getDb();
   const node = getNodeOrThrow(op.node_id);
   const newParent = getNodeOrThrow(op.new_parent);
+  if (node.project !== newParent.project) {
+    throw new EngineError("cross_project", `Cannot move node across projects: "${node.project}" \u2192 "${newParent.project}"`);
+  }
   if (wouldCreateParentCycle(op.node_id, op.new_parent)) {
-    throw new Error(
+    throw new EngineError(
+      "cycle_detected",
       `Move would create cycle: ${op.node_id} cannot be moved under ${op.new_parent}`
     );
   }
@@ -777,6 +819,9 @@ function handleMerge(op, agent) {
   const db = getDb();
   const source = getNodeOrThrow(op.source);
   const target = getNodeOrThrow(op.target);
+  if (source.project !== target.project) {
+    throw new EngineError("cross_project", `Cannot merge nodes across projects: "${source.project}" \u2192 "${target.project}"`);
+  }
   const movedChildren = db.prepare("SELECT id FROM nodes WHERE parent = ?").all(op.source);
   db.prepare("UPDATE nodes SET parent = ?, updated_at = ? WHERE parent = ?").run(
     op.target,
@@ -821,9 +866,7 @@ function handleMerge(op, agent) {
   logEvent(op.target, agent, "merged", [
     { field: "merged_from", before: null, after: op.source }
   ]);
-  logEvent(op.source, agent, "merged_into", [
-    { field: "merged_into", before: null, after: op.target }
-  ]);
+  db.prepare("DELETE FROM events WHERE node_id = ?").run(op.source);
   db.prepare("DELETE FROM edges WHERE from_node = ? OR to_node = ?").run(
     op.source,
     op.source
@@ -854,6 +897,20 @@ function handleDrop(op, agent) {
     result: `dropped ${allIds.length} node(s): ${op.reason}`
   };
 }
+function handleDelete(op, agent) {
+  const db = getDb();
+  getNodeOrThrow(op.node_id);
+  const descendants = getAllDescendants(op.node_id);
+  const allIds = [op.node_id, ...descendants];
+  const placeholders = allIds.map(() => "?").join(",");
+  db.prepare(`DELETE FROM events WHERE node_id IN (${placeholders})`).run(...allIds);
+  db.prepare(`DELETE FROM edges WHERE from_node IN (${placeholders}) OR to_node IN (${placeholders})`).run(...allIds, ...allIds);
+  db.prepare(`DELETE FROM nodes WHERE id IN (${placeholders})`).run(...allIds);
+  return {
+    node_id: op.node_id,
+    result: `deleted ${allIds.length} node(s)`
+  };
+}
 function handleRestructure(input, agent) {
   const operations = requireArray(input?.operations, "operations");
   for (let i = 0; i < operations.length; i++) {
@@ -868,8 +925,10 @@ function handleRestructure(input, agent) {
     } else if (op.op === "drop") {
       requireString(op.node_id, `operations[${i}].node_id`);
       requireString(op.reason, `operations[${i}].reason`);
+    } else if (op.op === "delete") {
+      requireString(op.node_id, `operations[${i}].node_id`);
     } else {
-      throw new Error(`Unknown operation: ${op.op}`);
+      throw new EngineError("unknown_op", `Unknown operation: ${op.op}`);
     }
   }
   const db = getDb();
@@ -892,6 +951,10 @@ function handleRestructure(input, agent) {
           detail = handleDrop(op, agent);
           project = getNode(op.node_id)?.project ?? project;
           break;
+        case "delete":
+          project = getNode(op.node_id)?.project ?? project;
+          detail = handleDelete(op, agent);
+          break;
         default:
           throw new Error(`Unknown operation: ${op.op}`);
       }
@@ -1082,15 +1145,25 @@ function buildTree(node, currentDepth, maxDepth, stats) {
     resolved: node.resolved,
     properties: node.properties
   };
-  if (children.length === 0) return treeNode;
+  let subtotal = 1;
+  let subresolved = node.resolved ? 1 : 0;
+  if (children.length === 0) return { treeNode, subtotal, subresolved };
   if (currentDepth < maxDepth) {
-    treeNode.children = children.map(
-      (child) => buildTree(child, currentDepth + 1, maxDepth, stats)
-    );
+    treeNode.children = [];
+    for (const child of children) {
+      const result = buildTree(child, currentDepth + 1, maxDepth, stats);
+      treeNode.children.push(result.treeNode);
+      subtotal += result.subtotal;
+      subresolved += result.subresolved;
+    }
   } else {
     treeNode.child_count = children.length;
+    const progress = getSubtreeProgress(node.id);
+    subtotal = progress.total;
+    subresolved = progress.resolved;
   }
-  return treeNode;
+  treeNode.progress = { resolved: subresolved, total: subtotal };
+  return { treeNode, subtotal, subresolved };
 }
 function handleTree(input) {
   const project = requireString(input?.project, "project");
@@ -1100,10 +1173,10 @@ function handleTree(input) {
     throw new EngineError("project_not_found", `Project not found: ${project}`);
   }
   const stats = { total: 0, resolved: 0 };
-  const tree = buildTree(root, 0, depth, stats);
+  const { treeNode } = buildTree(root, 0, depth, stats);
   return {
     project,
-    tree,
+    tree: treeNode,
     stats: {
       total: stats.total,
       resolved: stats.resolved,
@@ -1231,7 +1304,7 @@ function checkScope(_tier, scope) {
 
 // src/server.ts
 import { createHash } from "crypto";
-import { mkdirSync, readFileSync } from "fs";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { homedir } from "os";
 import { join, resolve, dirname } from "path";
 import { fileURLToPath } from "url";
@@ -1266,6 +1339,27 @@ async function checkForUpdate() {
   } catch {
   }
 }
+function checkAndUpdateAgentFile() {
+  try {
+    const projectRoot = resolve(".");
+    const agentPath = join(projectRoot, ".claude", "agents", "graph.md");
+    const latest = handleAgentConfig(PKG_VERSION).agent_file;
+    if (existsSync(agentPath)) {
+      const current = readFileSync(agentPath, "utf-8");
+      if (current === latest) return null;
+      const match = current.match(/^---[\s\S]*?version:\s*(\S+)[\s\S]*?---/);
+      const oldVersion = match?.[1] ?? "unknown";
+      writeFileSync(agentPath, latest, "utf-8");
+      return `[graph] Updated .claude/agents/graph.md (${oldVersion} \u2192 ${PKG_VERSION})`;
+    } else {
+      mkdirSync(dirname(agentPath), { recursive: true });
+      writeFileSync(agentPath, latest, "utf-8");
+      return `[graph] Created .claude/agents/graph.md`;
+    }
+  } catch {
+    return null;
+  }
+}
 var TOOLS = [
   {
     name: "graph_open",
@@ -1280,6 +1374,10 @@ var TOOLS = [
         goal: {
           type: "string",
           description: "Project goal/description. Used on creation only."
+        },
+        skip_discovery: {
+          type: "boolean",
+          description: "Skip discovery phase \u2014 create project ready for immediate planning. Default false."
         }
       }
     }
@@ -1381,9 +1479,12 @@ var TOOLS = [
             type: "object",
             properties: {
               node_id: { type: "string" },
+              expected_rev: { type: "number", description: "Optimistic concurrency: reject if node's current rev doesn't match. Prevents silent overwrites by concurrent agents." },
               resolved: { type: "boolean" },
               resolved_reason: { type: "string", description: "Shorthand: auto-creates a note evidence entry. Use instead of add_evidence for simple cases." },
               discovery: { type: "string", description: "Discovery phase status: 'pending' or 'done'. Set to 'done' after completing discovery interview." },
+              blocked: { type: "boolean", description: "Manually block/unblock a node. Blocked nodes are skipped by graph_next. Use for external blockers (e.g., waiting on domain purchase, another team)." },
+              blocked_reason: { type: "string", description: "Why the node is blocked. Cleared automatically when unblocking." },
               state: { description: "Agent-defined state, any type" },
               summary: { type: "string" },
               properties: {
@@ -1487,7 +1588,7 @@ var TOOLS = [
   },
   {
     name: "graph_restructure",
-    description: "Modify graph structure: move (reparent), merge (combine two nodes), drop (resolve node + subtree with reason). Atomic. Reports newly_actionable nodes.",
+    description: "Modify graph structure: move (reparent), merge (combine two nodes), drop (resolve node + subtree with reason), delete (permanently remove node + subtree). Atomic. Reports newly_actionable nodes.",
     inputSchema: {
       type: "object",
       properties: {
@@ -1498,7 +1599,7 @@ var TOOLS = [
             properties: {
               op: {
                 type: "string",
-                enum: ["move", "merge", "drop"]
+                enum: ["move", "merge", "drop", "delete"]
               },
               node_id: { type: "string", description: "For move and drop" },
               new_parent: { type: "string", description: "For move" },
@@ -1623,7 +1724,9 @@ async function startServer() {
     { name: "graph", version: PKG_VERSION },
     { capabilities: { tools: {}, resources: {} } }
   );
-  checkForUpdate();
+  if (process.env.GRAPH_UPDATE_CHECK === "1") {
+    checkForUpdate();
+  }
   server.setRequestHandler(ListToolsRequestSchema, async () => ({
     tools: TOOLS
   }));
@@ -1635,7 +1738,7 @@ async function startServer() {
         case "graph_open": {
           const openArgs = args;
           if (openArgs?.project) {
-            const { getProjectRoot: getProjectRoot2 } = await import("./nodes-4OJBNDHG.js");
+            const { getProjectRoot: getProjectRoot2 } = await import("./nodes-YNM6KEK2.js");
             if (!getProjectRoot2(openArgs.project)) {
               checkProjectLimit(tier);
             }
@@ -1646,7 +1749,7 @@ async function startServer() {
         case "graph_plan": {
           const planArgs = args;
           if (planArgs?.nodes?.length > 0) {
-            const { getNode: getNode2 } = await import("./nodes-4OJBNDHG.js");
+            const { getNode: getNode2 } = await import("./nodes-YNM6KEK2.js");
             const firstParent = planArgs.nodes[0]?.parent_ref;
             if (firstParent && typeof firstParent === "string" && !planArgs.nodes.some((n) => n.ref === firstParent)) {
               const parentNode = getNode2(firstParent);
@@ -1694,7 +1797,7 @@ async function startServer() {
           result = handleTree(args);
           break;
         case "graph_agent_config":
-          result = handleAgentConfig();
+          result = handleAgentConfig(PKG_VERSION);
           break;
         case "graph_knowledge_write":
           checkKnowledgeTier(tier);
@@ -1724,7 +1827,11 @@ async function startServer() {
         { type: "text", text: JSON.stringify(result, null, 2) }
       ];
       if (versionBanner) {
-        content.push({ type: "text", text: updateWarning ? `${versionBanner} \u2014 ${updateWarning}` : versionBanner });
+        const agentNote = checkAndUpdateAgentFile();
+        const bannerParts = [versionBanner];
+        if (agentNote) bannerParts.push(agentNote);
+        if (updateWarning) bannerParts.push(updateWarning);
+        content.push({ type: "text", text: bannerParts.join("\n") });
         versionBanner = null;
         updateWarning = null;
       }
@@ -1767,7 +1874,7 @@ async function startServer() {
   }));
   server.setRequestHandler(ListResourcesRequestSchema, async () => {
     try {
-      const { listProjects: listProjects2 } = await import("./nodes-4OJBNDHG.js");
+      const { listProjects: listProjects2 } = await import("./nodes-YNM6KEK2.js");
       const projects = listProjects2();
       const resources = projects.flatMap((p) => [
         {
@@ -1838,4 +1945,4 @@ async function startServer() {
 export {
   startServer
 };
-//# sourceMappingURL=server-VKTFTBXC.js.map
+//# sourceMappingURL=server-X36DXLEG.js.map