@neat.is/core 0.4.18 → 0.4.19

package/dist/index.d.cts

@@ -63,7 +63,11 @@ declare function compatPairs(): readonly CompatPair[];
 
 declare function saveGraphToDisk(graph: NeatGraph, outPath: string): Promise<void>;
 declare function loadGraphFromDisk(graph: NeatGraph, outPath: string): Promise<void>;
-declare function startPersistLoop(graph: NeatGraph, outPath: string, intervalMs?: number): () => void;
+interface PersistLoopOptions {
+    intervalMs?: number;
+    exitOnSignal?: boolean;
+}
+declare function startPersistLoop(graph: NeatGraph, outPath: string, opts?: PersistLoopOptions): () => void;
 
 interface ScoredNode {
     node: GraphNode;
@@ -125,6 +129,10 @@ interface BuildApiOptions {
             elapsedMs: number;
         }>;
     };
+    singleProject?: {
+        name: string;
+        path: string;
+    };
 }
 declare function buildApi(opts: BuildApiOptions): Promise<FastifyInstance>;
 

package/dist/index.d.ts

@@ -63,7 +63,11 @@ declare function compatPairs(): readonly CompatPair[];
 
 declare function saveGraphToDisk(graph: NeatGraph, outPath: string): Promise<void>;
 declare function loadGraphFromDisk(graph: NeatGraph, outPath: string): Promise<void>;
-declare function startPersistLoop(graph: NeatGraph, outPath: string, intervalMs?: number): () => void;
+interface PersistLoopOptions {
+    intervalMs?: number;
+    exitOnSignal?: boolean;
+}
+declare function startPersistLoop(graph: NeatGraph, outPath: string, opts?: PersistLoopOptions): () => void;
 
 interface ScoredNode {
     node: GraphNode;
@@ -125,6 +129,10 @@ interface BuildApiOptions {
             elapsedMs: number;
         }>;
     };
+    singleProject?: {
+        name: string;
+        path: string;
+    };
 }
 declare function buildApi(opts: BuildApiOptions): Promise<FastifyInstance>;
 

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   routeSpanToProject,
   startDaemon
-} from "./chunk-GXWBMJDJ.js";
+} from "./chunk-ZV7GHZ2D.js";
 import {
   ProjectNameCollisionError,
   addProject,
@@ -37,7 +37,7 @@ import {
   thresholdForEdgeType,
   touchLastSeen,
   writeAtomically
-} from "./chunk-T3X6XJPU.js";
+} from "./chunk-Q5EDVWKZ.js";
 import {
   startOtelGrpcReceiver
 } from "./chunk-MTXF77TN.js";

package/dist/neatd.cjs

@@ -5211,7 +5211,9 @@ async function loadGraphFromDisk(graph, outPath) {
   graph.clear();
   graph.import(payload.graph);
 }
-function startPersistLoop(graph, outPath, intervalMs = 6e4) {
+function startPersistLoop(graph, outPath, opts = {}) {
+  const intervalMs = opts.intervalMs ?? 6e4;
+  const exitOnSignal = opts.exitOnSignal ?? true;
   let stopped = false;
   const tick = async () => {
     if (stopped) return;
@@ -5224,7 +5226,7 @@ function startPersistLoop(graph, outPath, intervalMs = 6e4) {
   const interval = setInterval(() => {
     void tick();
   }, intervalMs);
-  const onSignal = (signal) => {
+  const onSignal = exitOnSignal ? (signal) => {
     void (async () => {
       try {
         await saveGraphToDisk(graph, outPath);
@@ -5234,14 +5236,18 @@ function startPersistLoop(graph, outPath, intervalMs = 6e4) {
         process.exit(0);
       }
     })();
-  };
-  process.on("SIGTERM", onSignal);
-  process.on("SIGINT", onSignal);
+  } : null;
+  if (onSignal) {
+    process.on("SIGTERM", onSignal);
+    process.on("SIGINT", onSignal);
+  }
   return () => {
     stopped = true;
     clearInterval(interval);
-    process.off("SIGTERM", onSignal);
-    process.off("SIGINT", onSignal);
+    if (onSignal) {
+      process.off("SIGTERM", onSignal);
+      process.off("SIGINT", onSignal);
+    }
   };
 }
 
@@ -6234,12 +6240,16 @@ function serializeGraph(graph) {
   });
   return { nodes, edges };
 }
-function projectFromReq(req2) {
+function projectFromReq(req2, singleProject) {
   const params = req2.params;
-  return params.project ?? DEFAULT_PROJECT;
+  const named = params.project;
+  if (singleProject) {
+    return named === void 0 || named === DEFAULT_PROJECT ? singleProject : named;
+  }
+  return named ?? DEFAULT_PROJECT;
 }
-function resolveProject(registry, req2, reply, bootstrap) {
-  const name = projectFromReq(req2);
+function resolveProject(registry, req2, reply, bootstrap, singleProject) {
+  const name = projectFromReq(req2, singleProject);
   const ctx = registry.get(name);
   if (!ctx) {
     const phase = bootstrap?.status(name);
@@ -6280,13 +6290,13 @@ function buildLegacyRegistry(opts) {
 function registerRoutes(scope, ctx) {
   const { registry, startedAt, errorsPathFor, staleEventsPathFor } = ctx;
   scope.get("/events", (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     handleSse(req2, reply, { project: proj.name });
   });
   if (ctx.scope === "project") {
     scope.get("/health", async (req2, reply) => {
-      const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+      const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
       if (!proj) return;
       const uptimeMs = Date.now() - startedAt;
       return {
@@ -6304,14 +6314,14 @@ function registerRoutes(scope, ctx) {
     });
   }
   scope.get("/graph", async (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     return serializeGraph(proj.graph);
   });
   scope.get(
     "/graph/node/:id",
     async (req2, reply) => {
-      const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+      const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
       if (!proj) return;
       const { id } = req2.params;
       if (!proj.graph.hasNode(id)) {
@@ -6323,7 +6333,7 @@ function registerRoutes(scope, ctx) {
   scope.get(
     "/graph/edges/:id",
     async (req2, reply) => {
-      const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+      const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
       if (!proj) return;
       const { id } = req2.params;
       if (!proj.graph.hasNode(id)) {
@@ -6335,7 +6345,7 @@ function registerRoutes(scope, ctx) {
     }
   );
   scope.get("/graph/dependencies/:nodeId", async (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     const { nodeId } = req2.params;
     if (!proj.graph.hasNode(nodeId)) {
@@ -6350,7 +6360,7 @@ function registerRoutes(scope, ctx) {
     return getTransitiveDependencies(proj.graph, nodeId, depth);
   });
   scope.get("/graph/divergences", async (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     let typeFilter;
     if (req2.query.type) {
@@ -6385,7 +6395,7 @@ function registerRoutes(scope, ctx) {
     });
   });
   scope.get("/incidents", async (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     const epath = errorsPathFor(proj);
     if (!epath) return { count: 0, total: 0, events: [] };
@@ -6397,7 +6407,7 @@ function registerRoutes(scope, ctx) {
     return { count: sliced.length, total, events: sliced };
   });
   scope.get("/stale-events", async (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     const spath = staleEventsPathFor(proj);
     if (!spath) return { count: 0, total: 0, events: [] };
@@ -6412,7 +6422,7 @@ function registerRoutes(scope, ctx) {
   scope.get(
     "/incidents/:nodeId",
     async (req2, reply) => {
-      const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+      const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
       if (!proj) return;
       const { nodeId } = req2.params;
       if (!proj.graph.hasNode(nodeId)) {
@@ -6428,7 +6438,7 @@ function registerRoutes(scope, ctx) {
     }
   );
   scope.get("/graph/root-cause/:nodeId", async (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     const { nodeId } = req2.params;
     if (!proj.graph.hasNode(nodeId)) {
@@ -6448,7 +6458,7 @@ function registerRoutes(scope, ctx) {
     return result;
   });
   scope.get("/graph/blast-radius/:nodeId", async (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     const { nodeId } = req2.params;
     if (!proj.graph.hasNode(nodeId)) {
@@ -6461,7 +6471,7 @@ function registerRoutes(scope, ctx) {
     return getBlastRadius(proj.graph, nodeId, depth);
   });
   scope.get("/search", async (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     const raw = (req2.query.q ?? "").trim();
     if (!raw) return reply.code(400).send({ error: "query parameter `q` is required" });
@@ -6492,7 +6502,7 @@ function registerRoutes(scope, ctx) {
   scope.get(
     "/graph/diff",
     async (req2, reply) => {
-      const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+      const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
       if (!proj) return;
       const against = req2.query.against;
       if (!against) {
@@ -6507,7 +6517,7 @@ function registerRoutes(scope, ctx) {
     }
   );
   scope.post("/snapshot", async (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     const body = req2.body;
     if (!body || typeof body !== "object" || !body.snapshot) {
@@ -6536,7 +6546,7 @@ function registerRoutes(scope, ctx) {
     }
   });
   scope.post("/graph/scan", async (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     if (!proj.scanPath) {
       return reply.code(409).send({ error: "scan path not configured for this project", project: proj.name });
@@ -6552,7 +6562,7 @@ function registerRoutes(scope, ctx) {
     };
   });
   scope.get("/policies", async (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     const policyPath = ctx.policyFilePathFor(proj);
     if (!policyPath) {
@@ -6569,7 +6579,7 @@ function registerRoutes(scope, ctx) {
     }
   });
   scope.get("/policies/violations", async (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     const log = new PolicyViolationsLog(proj.paths.policyViolationsPath);
     let violations = await log.readAll();
@@ -6589,7 +6599,7 @@ function registerRoutes(scope, ctx) {
     return { violations };
   });
   scope.post("/policies/check", async (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     const parsed = import_types25.PoliciesCheckBodySchema.safeParse(req2.body ?? {});
     if (!parsed.success) {
@@ -6625,7 +6635,7 @@ function registerRoutes(scope, ctx) {
     };
   });
   scope.get("/extend/list-uninstrumented", async (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     if (!proj.scanPath) {
       return reply.code(409).send({ error: "scan path not configured for this project", project: proj.name });
@@ -6638,7 +6648,7 @@ function registerRoutes(scope, ctx) {
     }
   });
   scope.get("/extend/lookup", async (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     const { library, version } = req2.query;
     if (!library) {
@@ -6651,7 +6661,7 @@ function registerRoutes(scope, ctx) {
     return result;
   });
   scope.get("/extend/describe", async (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     if (!proj.scanPath) {
       return reply.code(409).send({ error: "scan path not configured for this project", project: proj.name });
@@ -6664,7 +6674,7 @@ function registerRoutes(scope, ctx) {
     }
   });
   scope.post("/extend/apply", async (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     if (!proj.scanPath) {
       return reply.code(409).send({ error: "scan path not configured for this project", project: proj.name });
@@ -6684,7 +6694,7 @@ function registerRoutes(scope, ctx) {
     }
   });
   scope.post("/extend/dry-run", async (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     if (!proj.scanPath) {
       return reply.code(409).send({ error: "scan path not configured for this project", project: proj.name });
@@ -6704,7 +6714,7 @@ function registerRoutes(scope, ctx) {
     }
   });
   scope.post("/extend/rollback", async (req2, reply) => {
-    const proj = resolveProject(registry, req2, reply, ctx.bootstrap);
+    const proj = resolveProject(registry, req2, reply, ctx.bootstrap, ctx.singleProject);
     if (!proj) return;
     if (!proj.scanPath) {
       return reply.code(409).send({ error: "scan path not configured for this project", project: proj.name });
@@ -6767,7 +6777,8 @@ async function buildApi(opts) {
     errorsPathFor,
     staleEventsPathFor,
     policyFilePathFor,
-    bootstrap: opts.bootstrap
+    bootstrap: opts.bootstrap,
+    singleProject: opts.singleProject?.name
   };
   app.get("/health", async () => {
     const uptimeMs = Date.now() - startedAt;
@@ -6790,10 +6801,29 @@ async function buildApi(opts) {
     return {
       ok: true,
       uptimeMs,
+      // ADR-096 §7 — a per-project daemon carries its project at the top level
+      // so a spawn can confirm a daemon found on a reused port is serving THIS
+      // project before reusing it. The legacy multi-project daemon omits it and
+      // is matched against the `projects` array instead.
+      ...opts.singleProject ? { project: opts.singleProject.name } : {},
       projects
     };
   });
   app.get("/projects", async (_req, reply) => {
+    if (opts.singleProject) {
+      const phase = opts.bootstrap?.status(opts.singleProject.name);
+      const entry2 = {
+        name: opts.singleProject.name,
+        path: opts.singleProject.path,
+        registeredAt: new Date(startedAt).toISOString(),
+        languages: [],
+        // The daemon is serving this project, so it's active unless its
+        // bootstrap broke. ('bootstrapping' still reads as active — the project
+        // is the one to land on; its graph route answers 503 until ready.)
+        status: phase === "broken" ? "broken" : "active"
+      };
+      return [entry2];
+    }
     try {
       return await listProjects();
     } catch (err) {
@@ -6987,7 +7017,7 @@ async function bootstrapProject(entry2) {
   const detachEvents = attachGraphToEventBus(graph, { project: entry2.name });
   try {
     await extractFromDirectory(graph, entry2.path);
-    const stopPersist = startPersistLoop(graph, outPath);
+    const stopPersist = startPersistLoop(graph, outPath, { exitOnSignal: false });
     await touchLastSeen(entry2.name).catch(() => {
     });
     return {
@@ -7243,22 +7273,14 @@ async function startDaemon(opts = {}) {
               elapsedMs: now - (bootstrapStartedAt.get(name) ?? now)
             }));
           }
-        }
+        },
+        // ADR-096 §4/§5/§7 — hand the daemon's identity to buildApi so the REST
+        // surface reflects "the daemon is the project": `GET /projects` reports
+        // only this project (the dashboard pins to it), and the daemon-wide
+        // `/health` carries it at the top level for the spawn-reuse identity
+        // check. Absent for the legacy multi-project daemon.
+        singleProject: singleProject && singleProjectPath ? { name: singleProject, path: singleProjectPath } : void 0
       });
-      if (singleProject) {
-        restApp.addHook("onSend", async (req2, _reply, payload) => {
-          if (req2.url.split("?")[0] !== "/health") return payload;
-          if (typeof payload !== "string") return payload;
-          try {
-            const body = JSON.parse(payload);
-            if (typeof body !== "object" || body === null) return payload;
-            body.project = singleProject;
-            return JSON.stringify(body);
-          } catch {
-            return payload;
-          }
-        });
-      }
       restAddress = await restApp.listen({ port: restPort, host });
       console.log(`neatd: REST listening on ${restAddress}`);
     } catch (err) {
@@ -7510,6 +7532,12 @@ async function startDaemon(opts = {}) {
     });
     if (restApp) await restApp.close().catch(() => {
     });
+    for (const slot of slots.values()) {
+      if (slot.status === "active" && slot.outPath) {
+        await saveGraphToDisk(slot.graph, slot.outPath).catch(() => {
+        });
+      }
+    }
     for (const slot of slots.values()) {
       teardownSlot(slot);
     }
@@ -7667,7 +7695,10 @@ async function spawnWebUI(restPort, opts = {}) {
     })();
     return starting;
   }
+  const liveSockets = /* @__PURE__ */ new Set();
   const front = import_node_net.default.createServer((socket) => {
+    liveSockets.add(socket);
+    socket.on("close", () => liveSockets.delete(socket));
     socket.on("error", () => socket.destroy());
     ensureStarted().then(() => {
       if (stopped) {
@@ -7693,7 +7724,11 @@ async function spawnWebUI(restPort, opts = {}) {
   async function stop() {
     if (stopped) return;
     stopped = true;
-    await new Promise((resolve) => front.close(() => resolve()));
+    await new Promise((resolve) => {
+      front.close(() => resolve());
+      for (const socket of liveSockets) socket.destroy();
+      liveSockets.clear();
+    });
     if (!child || !child.pid) return;
     try {
       child.kill("SIGTERM");