@neat.is/core 0.4.10 → 0.4.12

package/dist/index.cjs

@@ -57,9 +57,9 @@ function mountBearerAuth(app, opts) {
   const suffixes = [...DEFAULT_UNAUTH_SUFFIXES, ...opts.extraUnauthenticatedSuffixes ?? []];
   const publicRead = opts.publicRead === true;
   app.addHook("preHandler", (req, reply, done) => {
-    const path38 = (req.url.split("?")[0] ?? "").replace(/\/+$/, "");
+    const path40 = (req.url.split("?")[0] ?? "").replace(/\/+$/, "");
     for (const suffix of suffixes) {
-      if (path38 === suffix || path38.endsWith(suffix)) {
+      if (path40 === suffix || path40.endsWith(suffix)) {
         done();
         return;
       }
@@ -185,8 +185,8 @@ function reshapeGrpcRequest(req) {
   };
 }
 function resolveProtoRoot() {
-  const here = import_node_path34.default.dirname((0, import_node_url.fileURLToPath)(importMetaUrl));
-  return import_node_path34.default.resolve(here, "..", "proto");
+  const here = import_node_path36.default.dirname((0, import_node_url.fileURLToPath)(importMetaUrl));
+  return import_node_path36.default.resolve(here, "..", "proto");
 }
 function loadTraceService() {
   const protoRoot = resolveProtoRoot();
@@ -254,13 +254,13 @@ async function startOtelGrpcReceiver(opts) {
     })
   };
 }
-var import_node_url, import_node_path34, import_node_crypto2, grpc, protoLoader;
+var import_node_url, import_node_path36, import_node_crypto2, grpc, protoLoader;
 var init_otel_grpc = __esm({
   "src/otel-grpc.ts"() {
     "use strict";
     init_cjs_shims();
     import_node_url = require("url");
-    import_node_path34 = __toESM(require("path"), 1);
+    import_node_path36 = __toESM(require("path"), 1);
     import_node_crypto2 = require("crypto");
     grpc = __toESM(require("@grpc/grpc-js"), 1);
     protoLoader = __toESM(require("@grpc/proto-loader"), 1);
@@ -370,10 +370,10 @@ function parseOtlpRequest(body) {
   return out;
 }
 function loadProtoRoot() {
-  const here = import_node_path35.default.dirname((0, import_node_url2.fileURLToPath)(importMetaUrl));
-  const protoRoot = import_node_path35.default.resolve(here, "..", "proto");
+  const here = import_node_path37.default.dirname((0, import_node_url2.fileURLToPath)(importMetaUrl));
+  const protoRoot = import_node_path37.default.resolve(here, "..", "proto");
   const root = new import_protobufjs.default.Root();
-  root.resolvePath = (_origin, target) => import_node_path35.default.resolve(protoRoot, target);
+  root.resolvePath = (_origin, target) => import_node_path37.default.resolve(protoRoot, target);
   root.loadSync(
     "opentelemetry/proto/collector/trace/v1/trace_service.proto",
     { keepCase: true }
@@ -574,12 +574,12 @@ function logSpanHandler(span) {
     `otel: ${span.service} ${span.name} parent=${parent} status=${status2}${db}`
   );
 }
-var import_node_path35, import_node_url2, import_fastify2, import_protobufjs, ENV_ATTR_CANONICAL, ENV_ATTR_COMPAT, ENV_FALLBACK, exportTraceServiceRequestType, exportTraceServiceResponseType, cachedProtobufResponseBody;
+var import_node_path37, import_node_url2, import_fastify2, import_protobufjs, ENV_ATTR_CANONICAL, ENV_ATTR_COMPAT, ENV_FALLBACK, exportTraceServiceRequestType, exportTraceServiceResponseType, cachedProtobufResponseBody;
 var init_otel = __esm({
   "src/otel.ts"() {
     "use strict";
     init_cjs_shims();
-    import_node_path35 = __toESM(require("path"), 1);
+    import_node_path37 = __toESM(require("path"), 1);
     import_node_url2 = require("url");
     import_fastify2 = __toESM(require("fastify"), 1);
     import_protobufjs = __toESM(require("protobufjs"), 1);
@@ -675,6 +675,7 @@ init_cjs_shims();
 init_cjs_shims();
 var import_node_fs3 = require("fs");
 var import_node_path3 = __toESM(require("path"), 1);
+var sourceMapJs = __toESM(require("source-map-js"), 1);
 
 // src/policy.ts
 init_cjs_shims();
@@ -1116,19 +1117,19 @@ function confidenceFromMix(edges, now = Date.now()) {
 function longestIncomingWalk(graph, start, maxDepth) {
   let best = { path: [start], edges: [] };
   const visited = /* @__PURE__ */ new Set([start]);
-  function step(node, path38, edges) {
-    if (path38.length > best.path.length) {
-      best = { path: [...path38], edges: [...edges] };
+  function step(node, path40, edges) {
+    if (path40.length > best.path.length) {
+      best = { path: [...path40], edges: [...edges] };
     }
-    if (path38.length - 1 >= maxDepth) return;
+    if (path40.length - 1 >= maxDepth) return;
     const incoming = bestEdgeBySource(graph, graph.inboundEdges(node));
     for (const [srcId, edge] of incoming) {
       if (visited.has(srcId)) continue;
       visited.add(srcId);
-      path38.push(srcId);
+      path40.push(srcId);
       edges.push(edge);
-      step(srcId, path38, edges);
-      path38.pop();
+      step(srcId, path40, edges);
+      path40.pop();
       edges.pop();
       visited.delete(srcId);
     }
@@ -1679,6 +1680,14 @@ function warnUnidentifiedSpan(project) {
     `[neatd] span lacked service.name; routed to 'unidentified' in project ${project}; check your OTel SDK config.`
   );
 }
+var noSourceMapWarnedServices = /* @__PURE__ */ new Set();
+function warnNoSourceMaps(serviceName) {
+  if (noSourceMapWarnedServices.has(serviceName)) return;
+  noSourceMapWarnedServices.add(serviceName);
+  console.warn(
+    `[neat] ${serviceName}: no .map files found under dist/; observed file edges will land on dist paths, not src. Set sourceMap: true in tsconfig to enable file-level reconciliation.`
+  );
+}
 function pickAttr(span, ...keys) {
   for (const k of keys) {
     const v = span.attributes[k];
@@ -1721,8 +1730,13 @@ function languageForExt(relPath) {
       return void 0;
   }
 }
-function relPathForRuntimeFile(filepath, serviceNode) {
+function relPathForRuntimeFile(filepath, serviceNode, scanPath) {
   let p = toPosix(filepath).replace(/^file:\/\//, "");
+  if (scanPath && scanPath.length > 0) {
+    const absRoot = toPosix(import_node_path3.default.resolve(scanPath, serviceNode?.repoPath ?? ""));
+    const anchor = absRoot.endsWith("/") ? absRoot : `${absRoot}/`;
+    if (p.startsWith(anchor)) return p.slice(anchor.length);
+  }
   const root = serviceNode?.repoPath;
   if (root && root !== "." && root.length > 0) {
     const rootPosix = toPosix(root);
@@ -1739,16 +1753,65 @@ function relPathForRuntimeFile(filepath, serviceNode) {
   p = p.replace(/^[A-Za-z]:/, "").replace(/^\/+/, "");
   return p.length > 0 ? p : null;
 }
-function callSiteFromSpan(span, serviceNode) {
+var sourceMapCache = /* @__PURE__ */ new Map();
+function resolveDistToSrc(absFilepath, line) {
+  if (!absFilepath.endsWith(".js")) return null;
+  let entry = sourceMapCache.get(absFilepath);
+  if (entry === void 0) {
+    entry = null;
+    const mapPath = `${absFilepath}.map`;
+    try {
+      if ((0, import_node_fs3.existsSync)(mapPath)) {
+        const raw = JSON.parse((0, import_node_fs3.readFileSync)(mapPath, "utf8"));
+        const consumer = new sourceMapJs.SourceMapConsumer(raw);
+        entry = { consumer, dir: import_node_path3.default.dirname(mapPath) };
+      }
+    } catch {
+      entry = null;
+    }
+    sourceMapCache.set(absFilepath, entry);
+  }
+  if (!entry) return null;
+  try {
+    const pos = entry.consumer.originalPositionFor({
+      line: line !== void 0 && Number.isFinite(line) ? line : 1,
+      column: 0
+    });
+    if (!pos || !pos.source) return null;
+    const root = entry.consumer.sourceRoot ?? "";
+    const resolved = import_node_path3.default.resolve(entry.dir, root, pos.source);
+    return { filepath: resolved, ...pos.line ? { line: pos.line } : {} };
+  } catch {
+    return null;
+  }
+}
+function callSiteFromSpan(span, serviceNode, scanPath) {
   const filepath = span.attributes[CODE_FILEPATH_ATTR];
   if (typeof filepath !== "string" || filepath.length === 0) return null;
-  const relPath = relPathForRuntimeFile(filepath, serviceNode);
-  if (!relPath) return null;
   const linenoRaw = span.attributes[CODE_LINENO_ATTR];
-  const line = typeof linenoRaw === "number" && Number.isFinite(linenoRaw) ? linenoRaw : void 0;
+  let line = typeof linenoRaw === "number" && Number.isFinite(linenoRaw) ? linenoRaw : void 0;
+  const abs = toPosix(filepath).replace(/^file:\/\//, "");
+  const resolved = resolveDistToSrc(abs, line);
+  let effectivePath = filepath;
+  let originalRelPath;
+  if (resolved) {
+    originalRelPath = relPathForRuntimeFile(filepath, serviceNode, scanPath) ?? void 0;
+    effectivePath = resolved.filepath;
+    if (resolved.line !== void 0) line = resolved.line;
+  }
+  const relPath = relPathForRuntimeFile(effectivePath, serviceNode, scanPath);
+  if (!relPath) return null;
+  if (!resolved && abs.endsWith(".js") && relPath.startsWith("dist/") && serviceNode?.name) {
+    warnNoSourceMaps(serviceNode.name);
+  }
   const fnRaw = span.attributes[CODE_FUNCTION_ATTR];
   const fn = typeof fnRaw === "string" && fnRaw.length > 0 ? fnRaw : void 0;
-  return { relPath, ...line !== void 0 ? { line } : {}, ...fn ? { fn } : {} };
+  return {
+    relPath,
+    ...line !== void 0 ? { line } : {},
+    ...fn ? { fn } : {},
+    ...originalRelPath && originalRelPath !== relPath ? { originalRelPath } : {}
+  };
 }
 function ensureObservedFileNode(graph, serviceName, serviceNodeId, callSite) {
   const fileNodeId = (0, import_types3.fileId)(serviceName, callSite.relPath);
@@ -1760,6 +1823,7 @@ function ensureObservedFileNode(graph, serviceName, serviceNodeId, callSite) {
       service: serviceName,
       path: callSite.relPath,
       ...language ? { language } : {},
+      ...callSite.originalRelPath ? { originalPath: callSite.originalRelPath } : {},
       discoveredVia: "otel"
     };
     graph.addNode(fileNodeId, node);
@@ -1785,6 +1849,12 @@ function makeInferredEdgeId(type, source, target) {
 }
 var INFERRED_CONFIDENCE = 0.6;
 var STITCH_MAX_DEPTH = 2;
+var WIRE_SPAN_KIND_CLIENT = 3;
+var WIRE_SPAN_KIND_PRODUCER = 4;
+function spanMintsObservedEdge(kind) {
+  if (kind === void 0 || kind === 0) return true;
+  return kind === WIRE_SPAN_KIND_CLIENT || kind === WIRE_SPAN_KIND_PRODUCER;
+}
 var PARENT_SPAN_CACHE_SIZE = 1e4;
 var PARENT_SPAN_CACHE_TTL_MS = 5 * 60 * 1e3;
 var parentSpanCache = /* @__PURE__ */ new Map();
@@ -1891,7 +1961,7 @@ function ensureFrontierNode(graph, host, ts) {
   graph.addNode(id, node);
   return id;
 }
-function upsertObservedEdge(graph, type, source, target, ts, isError = false) {
+function upsertObservedEdge(graph, type, source, target, ts, isError = false, evidence) {
   if (!graph.hasNode(source) || !graph.hasNode(target)) return null;
   const id = makeObservedEdgeId(type, source, target);
   if (graph.hasEdge(id)) {
@@ -1928,7 +1998,10 @@ function upsertObservedEdge(graph, type, source, target, ts, isError = false) {
     confidence: (0, import_types3.confidenceForObservedSignal)(signal),
     lastObserved: ts,
     callCount: 1,
-    signal
+    signal,
+    // Call-site evidence from span code.* semconv (file-awareness.md §4 + §6).
+    // Only set when code.filepath was present on the span — never fabricated.
+    ...evidence ? { evidence } : {}
   };
   graph.addEdgeWithKey(id, source, target, edge);
   return { edge, created: true };
@@ -2020,12 +2093,14 @@ async function handleSpan(ctx, span) {
   const isError = span.statusCode === 2;
   cacheSpanService(span, nowMs);
   const sourceServiceNode = ctx.graph.getNodeAttributes(sourceId);
-  const callSite = callSiteFromSpan(span, sourceServiceNode);
+  const callSite = callSiteFromSpan(span, sourceServiceNode, ctx.scanPath);
   const observedSource = () => callSite ? ensureObservedFileNode(ctx.graph, span.service, sourceId, callSite) : sourceId;
+  const callSiteEvidence = callSite ? { file: callSite.relPath, ...callSite.line !== void 0 ? { line: callSite.line } : {} } : void 0;
   let affectedNode = sourceId;
+  const mintsFromCallerSide = spanMintsObservedEdge(span.kind);
   if (span.dbSystem) {
     const host = pickAddress(span);
-    if (host) {
+    if (mintsFromCallerSide && host) {
       ensureDatabaseNode(ctx.graph, host, span.dbSystem);
       const targetId = (0, import_types3.databaseId)(host);
       const result = upsertObservedEdge(
@@ -2034,14 +2109,15 @@ async function handleSpan(ctx, span) {
         observedSource(),
         targetId,
         ts,
-        isError
+        isError,
+        callSiteEvidence
       );
       if (result) affectedNode = targetId;
     }
   } else {
     const host = pickAddress(span);
     let resolvedViaAddress = false;
-    if (host && host !== span.service) {
+    if (mintsFromCallerSide && host && host !== span.service) {
       const targetId = resolveServiceId(ctx.graph, host, env);
       if (targetId && targetId !== sourceId) {
         upsertObservedEdge(
@@ -2050,7 +2126,8 @@ async function handleSpan(ctx, span) {
           observedSource(),
           targetId,
           ts,
-          isError
+          isError,
+          callSiteEvidence
         );
         affectedNode = targetId;
         resolvedViaAddress = true;
@@ -2062,7 +2139,8 @@ async function handleSpan(ctx, span) {
           observedSource(),
           frontierNodeId,
           ts,
-          isError
+          isError,
+          callSiteEvidence
         );
         affectedNode = frontierNodeId;
         resolvedViaAddress = true;
@@ -3013,14 +3091,111 @@ async function addServiceAliases(graph, scanPath, services) {
 
 // src/extract/databases/index.ts
 init_cjs_shims();
-var import_node_path17 = __toESM(require("path"), 1);
+var import_node_path18 = __toESM(require("path"), 1);
+var import_types8 = require("@neat.is/types");
+
+// src/extract/calls/shared.ts
+init_cjs_shims();
+var import_node_fs10 = require("fs");
+var import_node_path10 = __toESM(require("path"), 1);
 var import_types7 = require("@neat.is/types");
+async function walkSourceFiles(dir) {
+  const out = [];
+  async function walk(current) {
+    const entries = await import_node_fs10.promises.readdir(current, { withFileTypes: true }).catch(() => []);
+    for (const entry of entries) {
+      const full = import_node_path10.default.join(current, entry.name);
+      if (entry.isDirectory()) {
+        if (IGNORED_DIRS.has(entry.name)) continue;
+        if (await isPythonVenvDir(full)) continue;
+        await walk(full);
+      } else if (entry.isFile() && SERVICE_FILE_EXTENSIONS.has(import_node_path10.default.extname(entry.name))) {
+        out.push(full);
+      }
+    }
+  }
+  await walk(dir);
+  return out;
+}
+async function loadSourceFiles(dir) {
+  const paths = await walkSourceFiles(dir);
+  const out = [];
+  for (const p of paths) {
+    try {
+      const content = await import_node_fs10.promises.readFile(p, "utf8");
+      out.push({ path: p, content });
+    } catch {
+    }
+  }
+  return out;
+}
+function lineOf(text, needle) {
+  const idx = text.indexOf(needle);
+  if (idx < 0) return 1;
+  return text.slice(0, idx).split("\n").length;
+}
+function snippet(text, line) {
+  const lines = text.split("\n");
+  return (lines[line - 1] ?? "").trim();
+}
+function toPosix2(p) {
+  return p.split("\\").join("/");
+}
+function languageForPath(relPath) {
+  switch (import_node_path10.default.extname(relPath).toLowerCase()) {
+    case ".py":
+      return "python";
+    case ".ts":
+    case ".tsx":
+      return "typescript";
+    case ".js":
+    case ".jsx":
+    case ".mjs":
+    case ".cjs":
+      return "javascript";
+    default:
+      return void 0;
+  }
+}
+function ensureFileNode(graph, serviceName, serviceNodeId, relPath) {
+  let nodesAdded = 0;
+  let edgesAdded = 0;
+  const fileNodeId = (0, import_types7.fileId)(serviceName, relPath);
+  if (!graph.hasNode(fileNodeId)) {
+    const language = languageForPath(relPath);
+    const node = {
+      id: fileNodeId,
+      type: import_types7.NodeType.FileNode,
+      service: serviceName,
+      path: relPath,
+      ...language ? { language } : {},
+      discoveredVia: "static"
+    };
+    graph.addNode(fileNodeId, node);
+    nodesAdded++;
+  }
+  const containsId = (0, import_types7.extractedEdgeId)(serviceNodeId, fileNodeId, import_types7.EdgeType.CONTAINS);
+  if (!graph.hasEdge(containsId)) {
+    const edge = {
+      id: containsId,
+      source: serviceNodeId,
+      target: fileNodeId,
+      type: import_types7.EdgeType.CONTAINS,
+      provenance: import_types7.Provenance.EXTRACTED,
+      confidence: (0, import_types7.confidenceForExtracted)("structural"),
+      evidence: { file: relPath }
+    };
+    graph.addEdgeWithKey(containsId, serviceNodeId, fileNodeId, edge);
+    edgesAdded++;
+  }
+  return { fileNodeId, nodesAdded, edgesAdded };
+}
 
 // src/extract/databases/db-config-yaml.ts
 init_cjs_shims();
-var import_node_path10 = __toESM(require("path"), 1);
+var import_node_path11 = __toESM(require("path"), 1);
 async function parse(serviceDir) {
-  const yamlPath = import_node_path10.default.join(serviceDir, "db-config.yaml");
+  const yamlPath = import_node_path11.default.join(serviceDir, "db-config.yaml");
   if (!await exists(yamlPath)) return [];
   const raw = await readYaml(yamlPath);
   return [
@@ -3038,13 +3213,13 @@ var dbConfigYamlParser = { name: "db-config.yaml", parse };
 
 // src/extract/databases/dotenv.ts
 init_cjs_shims();
-var import_node_fs11 = require("fs");
-var import_node_path12 = __toESM(require("path"), 1);
+var import_node_fs12 = require("fs");
+var import_node_path13 = __toESM(require("path"), 1);
 
 // src/extract/databases/shared.ts
 init_cjs_shims();
-var import_node_fs10 = require("fs");
-var import_node_path11 = __toESM(require("path"), 1);
+var import_node_fs11 = require("fs");
+var import_node_path12 = __toESM(require("path"), 1);
 function schemeToEngine(scheme) {
   const s = scheme.toLowerCase().split("+")[0];
   switch (s) {
@@ -3083,14 +3258,14 @@ function parseConnectionString(url) {
 }
 async function readIfExists(filePath) {
   try {
-    return await import_node_fs10.promises.readFile(filePath, "utf8");
+    return await import_node_fs11.promises.readFile(filePath, "utf8");
   } catch {
     return null;
   }
 }
 async function findFirst(serviceDir, candidates) {
   for (const rel of candidates) {
-    const abs = import_node_path11.default.join(serviceDir, rel);
+    const abs = import_node_path12.default.join(serviceDir, rel);
     const content = await readIfExists(abs);
     if (content !== null) return abs;
   }
@@ -3141,15 +3316,15 @@ function parseDotenvLine(line) {
   return { key, value };
 }
 async function parse2(serviceDir) {
-  const entries = await import_node_fs11.promises.readdir(serviceDir, { withFileTypes: true }).catch(() => []);
+  const entries = await import_node_fs12.promises.readdir(serviceDir, { withFileTypes: true }).catch(() => []);
   const configs = [];
   const seen = /* @__PURE__ */ new Set();
   for (const entry of entries) {
     if (!entry.isFile()) continue;
     const match = isConfigFile(entry.name);
     if (!match.match || match.fileType !== "env") continue;
-    const filePath = import_node_path12.default.join(serviceDir, entry.name);
-    const content = await import_node_fs11.promises.readFile(filePath, "utf8");
+    const filePath = import_node_path13.default.join(serviceDir, entry.name);
+    const content = await import_node_fs12.promises.readFile(filePath, "utf8");
     for (const line of content.split("\n")) {
       const parsed = parseDotenvLine(line);
       if (!parsed) continue;
@@ -3168,9 +3343,9 @@ var dotenvParser = { name: ".env", parse: parse2 };
 
 // src/extract/databases/prisma.ts
 init_cjs_shims();
-var import_node_path13 = __toESM(require("path"), 1);
+var import_node_path14 = __toESM(require("path"), 1);
 async function parse3(serviceDir) {
-  const schemaPath = import_node_path13.default.join(serviceDir, "prisma", "schema.prisma");
+  const schemaPath = import_node_path14.default.join(serviceDir, "prisma", "schema.prisma");
   const content = await readIfExists(schemaPath);
   if (!content) return [];
   const block = content.match(/datasource\s+\w+\s*\{([^}]*)\}/s);
@@ -3302,10 +3477,10 @@ var knexParser = { name: "knex", parse: parse5 };
 
 // src/extract/databases/ormconfig.ts
 init_cjs_shims();
-var import_node_path14 = __toESM(require("path"), 1);
+var import_node_path15 = __toESM(require("path"), 1);
 async function parse6(serviceDir) {
   for (const candidate of ["ormconfig.json", "ormconfig.yaml", "ormconfig.yml"]) {
-    const abs = import_node_path14.default.join(serviceDir, candidate);
+    const abs = import_node_path15.default.join(serviceDir, candidate);
     if (!await exists(abs)) continue;
     const raw = candidate.endsWith(".json") ? await readJson(abs) : await readYaml(abs);
     const entries = Array.isArray(raw) ? raw : [raw];
@@ -3365,9 +3540,9 @@ var typeormParser = { name: "typeorm", parse: parse7 };
 
 // src/extract/databases/sequelize.ts
 init_cjs_shims();
-var import_node_path15 = __toESM(require("path"), 1);
+var import_node_path16 = __toESM(require("path"), 1);
 async function parse8(serviceDir) {
-  const configPath = import_node_path15.default.join(serviceDir, "config", "config.json");
+  const configPath = import_node_path16.default.join(serviceDir, "config", "config.json");
   if (!await exists(configPath)) return [];
   const raw = await readJson(configPath);
   const out = [];
@@ -3394,7 +3569,7 @@ var sequelizeParser = { name: "sequelize", parse: parse8 };
 
 // src/extract/databases/docker-compose.ts
 init_cjs_shims();
-var import_node_path16 = __toESM(require("path"), 1);
+var import_node_path17 = __toESM(require("path"), 1);
 function portFromService(svc) {
   for (const raw of svc.ports ?? []) {
     const str = String(raw);
@@ -3421,7 +3596,7 @@ function databaseFromEnv(svc) {
 }
 async function parse9(serviceDir) {
   for (const name of ["docker-compose.yml", "docker-compose.yaml"]) {
-    const abs = import_node_path16.default.join(serviceDir, name);
+    const abs = import_node_path17.default.join(serviceDir, name);
     if (!await exists(abs)) continue;
     const raw = await readYaml(abs);
     if (!raw?.services) return [];
@@ -3462,8 +3637,8 @@ function compatibleDriversFor(engine) {
 }
 function toDatabaseNode(config) {
   return {
-    id: (0, import_types7.databaseId)(config.host),
-    type: import_types7.NodeType.DatabaseNode,
+    id: (0, import_types8.databaseId)(config.host),
+    type: import_types8.NodeType.DatabaseNode,
     name: config.database || config.host,
     engine: config.engine,
     engineVersion: config.engineVersion,
@@ -3593,19 +3768,24 @@ async function addDatabasesAndCompat(graph, services, scanPath) {
           discoveredVia: mergedDiscoveredVia
         });
       }
+      const relConfigFile = toPosix2(import_node_path18.default.relative(service.dir, config.sourceFile));
+      const { fileNodeId, nodesAdded: fn, edgesAdded: fe } = ensureFileNode(
+        graph,
+        service.pkg.name,
+        service.node.id,
+        relConfigFile
+      );
+      nodesAdded += fn;
+      edgesAdded += fe;
+      const evidenceFile = toPosix2(import_node_path18.default.relative(scanPath, config.sourceFile));
       const edge = {
-        id: (0, import_types4.extractedEdgeId)(service.node.id, dbNode.id, import_types7.EdgeType.CONNECTS_TO),
-        source: service.node.id,
+        id: (0, import_types4.extractedEdgeId)(fileNodeId, dbNode.id, import_types8.EdgeType.CONNECTS_TO),
+        source: fileNodeId,
         target: dbNode.id,
-        type: import_types7.EdgeType.CONNECTS_TO,
-        provenance: import_types7.Provenance.EXTRACTED,
-        confidence: (0, import_types7.confidenceForExtracted)("structural"),
-        // ADR-032 / #140 — every EXTRACTED edge carries evidence.file.
-        // Ghost-edge cleanup keys retirement on this; the conditional
-        // sourceFile spread that used to live here was a v0.1.x leftover.
-        evidence: {
-          file: import_node_path17.default.relative(scanPath, config.sourceFile).split(import_node_path17.default.sep).join("/")
-        }
+        type: import_types8.EdgeType.CONNECTS_TO,
+        provenance: import_types8.Provenance.EXTRACTED,
+        confidence: (0, import_types8.confidenceForExtracted)("structural"),
+        evidence: { file: evidenceFile }
       };
       if (!graph.hasEdge(edge.id)) {
         graph.addEdgeWithKey(edge.id, edge.source, edge.target, edge);
@@ -3631,15 +3811,15 @@ async function addDatabasesAndCompat(graph, services, scanPath) {
 
 // src/extract/configs.ts
 init_cjs_shims();
-var import_node_fs12 = require("fs");
-var import_node_path18 = __toESM(require("path"), 1);
-var import_types8 = require("@neat.is/types");
+var import_node_fs13 = require("fs");
+var import_node_path19 = __toESM(require("path"), 1);
+var import_types9 = require("@neat.is/types");
 async function walkConfigFiles(dir) {
   const out = [];
   async function walk(current) {
-    const entries = await import_node_fs12.promises.readdir(current, { withFileTypes: true });
+    const entries = await import_node_fs13.promises.readdir(current, { withFileTypes: true });
     for (const entry of entries) {
-      const full = import_node_path18.default.join(current, entry.name);
+      const full = import_node_path19.default.join(current, entry.name);
       if (entry.isDirectory()) {
         if (IGNORED_DIRS.has(entry.name)) continue;
         if (await isPythonVenvDir(full)) continue;
@@ -3658,26 +3838,35 @@ async function addConfigNodes(graph, services, scanPath) {
   for (const service of services) {
     const configFiles = await walkConfigFiles(service.dir);
     for (const file of configFiles) {
-      const relPath = import_node_path18.default.relative(scanPath, file);
+      const relPath = import_node_path19.default.relative(scanPath, file);
       const node = {
-        id: (0, import_types8.configId)(relPath),
-        type: import_types8.NodeType.ConfigNode,
-        name: import_node_path18.default.basename(file),
+        id: (0, import_types9.configId)(relPath),
+        type: import_types9.NodeType.ConfigNode,
+        name: import_node_path19.default.basename(file),
         path: relPath,
-        fileType: isConfigFile(import_node_path18.default.basename(file)).fileType
+        fileType: isConfigFile(import_node_path19.default.basename(file)).fileType
       };
       if (!graph.hasNode(node.id)) {
         graph.addNode(node.id, node);
         nodesAdded++;
       }
+      const relToService = toPosix2(import_node_path19.default.relative(service.dir, file));
+      const { fileNodeId, nodesAdded: fn, edgesAdded: fe } = ensureFileNode(
+        graph,
+        service.pkg.name,
+        service.node.id,
+        relToService
+      );
+      nodesAdded += fn;
+      edgesAdded += fe;
       const edge = {
-        id: (0, import_types4.extractedEdgeId)(service.node.id, node.id, import_types8.EdgeType.CONFIGURED_BY),
-        source: service.node.id,
+        id: (0, import_types4.extractedEdgeId)(fileNodeId, node.id, import_types9.EdgeType.CONFIGURED_BY),
+        source: fileNodeId,
         target: node.id,
-        type: import_types8.EdgeType.CONFIGURED_BY,
-        provenance: import_types8.Provenance.EXTRACTED,
-        confidence: (0, import_types8.confidenceForExtracted)("structural"),
-        evidence: { file: relPath.split(import_node_path18.default.sep).join("/") }
+        type: import_types9.EdgeType.CONFIGURED_BY,
+        provenance: import_types9.Provenance.EXTRACTED,
+        confidence: (0, import_types9.confidenceForExtracted)("structural"),
+        evidence: { file: relPath.split(import_node_path19.default.sep).join("/") }
       };
       if (!graph.hasEdge(edge.id)) {
         graph.addEdgeWithKey(edge.id, edge.source, edge.target, edge);
@@ -3699,105 +3888,6 @@ var import_tree_sitter = __toESM(require("tree-sitter"), 1);
 var import_tree_sitter_javascript = __toESM(require("tree-sitter-javascript"), 1);
 var import_tree_sitter_python = __toESM(require("tree-sitter-python"), 1);
 var import_types10 = require("@neat.is/types");
-
-// src/extract/calls/shared.ts
-init_cjs_shims();
-var import_node_fs13 = require("fs");
-var import_node_path19 = __toESM(require("path"), 1);
-var import_types9 = require("@neat.is/types");
-async function walkSourceFiles(dir) {
-  const out = [];
-  async function walk(current) {
-    const entries = await import_node_fs13.promises.readdir(current, { withFileTypes: true }).catch(() => []);
-    for (const entry of entries) {
-      const full = import_node_path19.default.join(current, entry.name);
-      if (entry.isDirectory()) {
-        if (IGNORED_DIRS.has(entry.name)) continue;
-        if (await isPythonVenvDir(full)) continue;
-        await walk(full);
-      } else if (entry.isFile() && SERVICE_FILE_EXTENSIONS.has(import_node_path19.default.extname(entry.name))) {
-        out.push(full);
-      }
-    }
-  }
-  await walk(dir);
-  return out;
-}
-async function loadSourceFiles(dir) {
-  const paths = await walkSourceFiles(dir);
-  const out = [];
-  for (const p of paths) {
-    try {
-      const content = await import_node_fs13.promises.readFile(p, "utf8");
-      out.push({ path: p, content });
-    } catch {
-    }
-  }
-  return out;
-}
-function lineOf(text, needle) {
-  const idx = text.indexOf(needle);
-  if (idx < 0) return 1;
-  return text.slice(0, idx).split("\n").length;
-}
-function snippet(text, line) {
-  const lines = text.split("\n");
-  return (lines[line - 1] ?? "").trim();
-}
-function toPosix2(p) {
-  return p.split("\\").join("/");
-}
-function languageForPath(relPath) {
-  switch (import_node_path19.default.extname(relPath).toLowerCase()) {
-    case ".py":
-      return "python";
-    case ".ts":
-    case ".tsx":
-      return "typescript";
-    case ".js":
-    case ".jsx":
-    case ".mjs":
-    case ".cjs":
-      return "javascript";
-    default:
-      return void 0;
-  }
-}
-function ensureFileNode(graph, serviceName, serviceNodeId, relPath) {
-  let nodesAdded = 0;
-  let edgesAdded = 0;
-  const fileNodeId = (0, import_types9.fileId)(serviceName, relPath);
-  if (!graph.hasNode(fileNodeId)) {
-    const language = languageForPath(relPath);
-    const node = {
-      id: fileNodeId,
-      type: import_types9.NodeType.FileNode,
-      service: serviceName,
-      path: relPath,
-      ...language ? { language } : {},
-      discoveredVia: "static"
-    };
-    graph.addNode(fileNodeId, node);
-    nodesAdded++;
-  }
-  const containsId = (0, import_types9.extractedEdgeId)(serviceNodeId, fileNodeId, import_types9.EdgeType.CONTAINS);
-  if (!graph.hasEdge(containsId)) {
-    const edge = {
-      id: containsId,
-      source: serviceNodeId,
-      target: fileNodeId,
-      type: import_types9.EdgeType.CONTAINS,
-      provenance: import_types9.Provenance.EXTRACTED,
-      confidence: (0, import_types9.confidenceForExtracted)("structural"),
-      evidence: { file: relPath }
-    };
-    graph.addEdgeWithKey(containsId, serviceNodeId, fileNodeId, edge);
-    edgesAdded++;
-  }
-  return { fileNodeId, nodesAdded, edgesAdded };
-}
-
-// src/extract/calls/http.ts
 var STRING_LITERAL_NODE_TYPES = /* @__PURE__ */ new Set(["string_fragment", "string_content"]);
 var JSX_EXTERNAL_LINK_TAGS = /* @__PURE__ */ new Set(["a", "Link", "NavLink", "ExternalLink", "Anchor"]);
 function isInsideJsxExternalLink(node) {
@@ -3825,8 +3915,14 @@ function collectStringLiterals(node, out) {
     if (child) collectStringLiterals(child, out);
   }
 }
+var PARSE_CHUNK = 16384;
+function parseSource(parser, source) {
+  return parser.parse(
+    (index) => index >= source.length ? "" : source.slice(index, index + PARSE_CHUNK)
+  );
+}
 function callsFromSource(source, parser, knownHosts) {
-  const tree = parser.parse(source);
+  const tree = parseSource(parser, source);
   const literals = [];
   collectStringLiterals(tree.rootNode, literals);
   const out = [];
@@ -4075,6 +4171,7 @@ var AWS_SDK_IMPORT_RE = /(?:from\s+['"`]|require\(\s*['"`])@aws-sdk\/client-([a-
 var GRPC_IMPORT_RE = /(?:from\s+['"`]|require\(\s*['"`])@grpc\/grpc-js['"`]|_grpc_pb['"`]/;
 function isLikelyAddress(value) {
   if (!value) return false;
+  if (/\s/.test(value) || value.startsWith("{")) return false;
   return /:\d{2,5}$/.test(value) || value.includes(".");
 }
 function normaliseForMatch(s) {
@@ -4386,17 +4483,26 @@ async function addDockerfileRuntimes(graph, services, scanPath) {
       graph.addNode(node.id, node);
       nodesAdded++;
     }
-    const edgeId = (0, import_types4.extractedEdgeId)(service.node.id, node.id, import_types18.EdgeType.RUNS_ON);
+    const relDockerfile = toPosix2(import_node_path26.default.relative(service.dir, dockerfilePath));
+    const { fileNodeId, nodesAdded: fn, edgesAdded: fe } = ensureFileNode(
+      graph,
+      service.pkg.name,
+      service.node.id,
+      relDockerfile
+    );
+    nodesAdded += fn;
+    edgesAdded += fe;
+    const edgeId = (0, import_types4.extractedEdgeId)(fileNodeId, node.id, import_types18.EdgeType.RUNS_ON);
     if (!graph.hasEdge(edgeId)) {
       const edge = {
         id: edgeId,
-        source: service.node.id,
+        source: fileNodeId,
         target: node.id,
         type: import_types18.EdgeType.RUNS_ON,
         provenance: import_types18.Provenance.EXTRACTED,
         confidence: (0, import_types18.confidenceForExtracted)("structural"),
         evidence: {
-          file: import_node_path26.default.relative(scanPath, dockerfilePath).split(import_node_path26.default.sep).join("/")
+          file: toPosix2(import_node_path26.default.relative(scanPath, dockerfilePath))
         }
       };
       graph.addEdgeWithKey(edgeId, edge.source, edge.target, edge);
@@ -4735,6 +4841,321 @@ var import_fastify = __toESM(require("fastify"), 1);
 var import_cors = __toESM(require("@fastify/cors"), 1);
 var import_types23 = require("@neat.is/types");
 
+// src/extend/index.ts
+init_cjs_shims();
+var import_node_fs20 = require("fs");
+var import_node_path33 = __toESM(require("path"), 1);
+var import_node_os2 = __toESM(require("os"), 1);
+var import_instrumentation_registry = require("@neat.is/instrumentation-registry");
+
+// src/installers/package-manager.ts
+init_cjs_shims();
+var import_node_fs19 = require("fs");
+var import_node_path32 = __toESM(require("path"), 1);
+var import_node_child_process = require("child_process");
+var LOCKFILE_PRIORITY = [
+  { lockfile: "bun.lockb", pm: "bun", args: ["install", "--no-summary"] },
+  { lockfile: "pnpm-lock.yaml", pm: "pnpm", args: ["install", "--no-summary"] },
+  { lockfile: "yarn.lock", pm: "yarn", args: ["install", "--silent"] },
+  {
+    lockfile: "package-lock.json",
+    pm: "npm",
+    args: ["install", "--no-audit", "--no-fund", "--prefer-offline"]
+  }
+];
+var NPM_FALLBACK_ARGS = ["install", "--no-audit", "--no-fund", "--prefer-offline"];
+async function exists2(p) {
+  try {
+    await import_node_fs19.promises.access(p);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function detectPackageManager(serviceDir) {
+  let dir = import_node_path32.default.resolve(serviceDir);
+  const stops = /* @__PURE__ */ new Set();
+  for (let i = 0; i < 64; i++) {
+    if (stops.has(dir)) break;
+    stops.add(dir);
+    for (const candidate of LOCKFILE_PRIORITY) {
+      const lockPath = import_node_path32.default.join(dir, candidate.lockfile);
+      if (await exists2(lockPath)) {
+        return { pm: candidate.pm, cwd: dir, args: [...candidate.args] };
+      }
+    }
+    const parent = import_node_path32.default.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return { pm: "npm", cwd: import_node_path32.default.resolve(serviceDir), args: [...NPM_FALLBACK_ARGS] };
+}
+async function runPackageManagerInstall(cmd) {
+  return new Promise((resolve) => {
+    const child = (0, import_node_child_process.spawn)(cmd.pm, cmd.args, {
+      cwd: cmd.cwd,
+      // Inherit PATH + HOME so the user's installed managers resolve.
+      env: process.env,
+      // `false` keeps the parent in control of cleanup if the orchestrator
+      // exits before install finishes. Cross-platform-safe.
+      shell: false,
+      stdio: ["ignore", "ignore", "pipe"]
+    });
+    let stderr = "";
+    child.stderr?.on("data", (chunk) => {
+      stderr += chunk.toString("utf8");
+    });
+    child.on("error", (err) => {
+      resolve({
+        pm: cmd.pm,
+        cwd: cmd.cwd,
+        args: cmd.args,
+        exitCode: 127,
+        stderr: stderr + `
+${err.message}`
+      });
+    });
+    child.on("close", (code) => {
+      resolve({
+        pm: cmd.pm,
+        cwd: cmd.cwd,
+        args: cmd.args,
+        exitCode: code ?? 1,
+        stderr: stderr.trim()
+      });
+    });
+  });
+}
+
+// src/extend/index.ts
+async function fileExists(p) {
+  try {
+    await import_node_fs20.promises.access(p);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function readPackageJson(scanPath) {
+  const pkgPath = import_node_path33.default.join(scanPath, "package.json");
+  const raw = await import_node_fs20.promises.readFile(pkgPath, "utf8");
+  return JSON.parse(raw);
+}
+async function findHookFiles(scanPath) {
+  const entries = await import_node_fs20.promises.readdir(scanPath);
+  return entries.filter(
+    (e) => (e.startsWith("instrumentation") || e.startsWith("otel-init")) && /\.(ts|js)$/.test(e)
+  ).sort();
+}
+function extendLogPath() {
+  return process.env.NEAT_EXTEND_LOG ?? import_node_path33.default.join(import_node_os2.default.homedir(), ".neat", "extend-log.ndjson");
+}
+async function appendExtendLog(entry) {
+  const logPath = extendLogPath();
+  await import_node_fs20.promises.mkdir(import_node_path33.default.dirname(logPath), { recursive: true });
+  await import_node_fs20.promises.appendFile(logPath, JSON.stringify(entry) + "\n", "utf8");
+}
+function splicedContent(fileContent, snippet2) {
+  if (fileContent.includes("__INSTRUMENTATION_BLOCK__")) {
+    return fileContent.replace("__INSTRUMENTATION_BLOCK__", `${snippet2}
+__INSTRUMENTATION_BLOCK__`);
+  }
+  const lines = fileContent.split("\n");
+  let lastPushIdx = -1;
+  for (let i = 0; i < lines.length; i++) {
+    if (lines[i].includes("instrumentations.push(")) lastPushIdx = i;
+  }
+  if (lastPushIdx >= 0) {
+    lines.splice(lastPushIdx + 1, 0, snippet2);
+    return lines.join("\n");
+  }
+  for (let i = 0; i < lines.length; i++) {
+    if (lines[i].includes("new NodeSDK(")) {
+      lines.splice(i, 0, snippet2);
+      return lines.join("\n");
+    }
+  }
+  return null;
+}
+async function listUninstrumented(ctx) {
+  const pkg = await readPackageJson(ctx.scanPath);
+  const allDeps = { ...pkg.dependencies ?? {}, ...pkg.devDependencies ?? {} };
+  const results = [];
+  for (const [library, installedVersion] of Object.entries(allDeps)) {
+    const entry = (0, import_instrumentation_registry.resolve)(library, installedVersion);
+    if (!entry) continue;
+    if (entry.coverage === "bundled" || entry.coverage === "http-only") continue;
+    results.push({
+      library,
+      coverage: entry.coverage,
+      installedVersion,
+      instrumentation_package: entry.instrumentation_package,
+      package_version: entry.package_version,
+      registration: entry.registration,
+      notes: entry.notes
+    });
+  }
+  return results;
+}
+function lookupInstrumentation(library, installedVersion) {
+  const entry = (0, import_instrumentation_registry.resolve)(library, installedVersion);
+  if (!entry) return null;
+  return {
+    library: entry.library,
+    coverage: entry.coverage,
+    instrumentation_package: entry.instrumentation_package,
+    package_version: entry.package_version,
+    registration: entry.registration,
+    notes: entry.notes
+  };
+}
+async function describeProjectInstrumentation(ctx) {
+  const hookFiles = await findHookFiles(ctx.scanPath);
+  const envNeat = await fileExists(import_node_path33.default.join(ctx.scanPath, ".env.neat"));
+  const registryInstrPackages = new Set(
+    (0, import_instrumentation_registry.list)().map((e) => e.instrumentation_package).filter((p) => !!p)
+  );
+  const pkg = await readPackageJson(ctx.scanPath);
+  const allDeps = { ...pkg.dependencies ?? {}, ...pkg.devDependencies ?? {} };
+  const installedDeps = {};
+  for (const [key, version] of Object.entries(allDeps)) {
+    if (key.startsWith("@opentelemetry/") || registryInstrPackages.has(key)) {
+      installedDeps[key] = version;
+    }
+  }
+  return { hookFiles, envNeat, installedDeps };
+}
+async function applyExtension(ctx, args, options) {
+  const hookFiles = await findHookFiles(ctx.scanPath);
+  if (hookFiles.length === 0) {
+    throw new Error(
+      `No instrumentation hook files found in ${ctx.scanPath}. Run \`neat init\` first.`
+    );
+  }
+  for (const file of hookFiles) {
+    const content = await import_node_fs20.promises.readFile(import_node_path33.default.join(ctx.scanPath, file), "utf8");
+    if (content.includes(args.registration_snippet)) {
+      return { library: args.library, filesTouched: [], depsAdded: [], installOutput: "", alreadyApplied: true };
+    }
+  }
+  const primaryFile = hookFiles[0];
+  const primaryPath = import_node_path33.default.join(ctx.scanPath, primaryFile);
+  const filesTouched = [];
+  const depsAdded = [];
+  const pkgPath = import_node_path33.default.join(ctx.scanPath, "package.json");
+  const pkg = await readPackageJson(ctx.scanPath);
+  if (!(pkg.dependencies ?? {})[args.instrumentation_package]) {
+    pkg.dependencies = { ...pkg.dependencies ?? {}, [args.instrumentation_package]: args.version };
+    await import_node_fs20.promises.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf8");
+    filesTouched.push("package.json");
+    depsAdded.push(`${args.instrumentation_package}@${args.version}`);
+  }
+  const hookContent = await import_node_fs20.promises.readFile(primaryPath, "utf8");
+  const patched = splicedContent(hookContent, args.registration_snippet);
+  if (!patched) {
+    throw new Error(
+      `Could not find instrumentation insertion point in ${primaryFile}. Expected __INSTRUMENTATION_BLOCK__, instrumentations.push(, or new NodeSDK(.`
+    );
+  }
+  await import_node_fs20.promises.writeFile(primaryPath, patched, "utf8");
+  filesTouched.push(primaryFile);
+  const cmd = await detectPackageManager(ctx.scanPath);
+  const installer = options?.runInstall ?? runPackageManagerInstall;
+  const install = await installer(cmd);
+  const installOutput = install.exitCode === 0 ? `${cmd.pm} install succeeded` : install.stderr || `${cmd.pm} install failed (exit ${install.exitCode})`;
+  await appendExtendLog({
+    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    project: ctx.project,
+    library: args.library,
+    instrumentation_package: args.instrumentation_package,
+    version: args.version,
+    registration_snippet: args.registration_snippet,
+    filesTouched,
+    depsAdded,
+    installOutput
+  });
+  return { library: args.library, filesTouched, depsAdded, installOutput, alreadyApplied: false };
+}
+async function dryRunExtension(ctx, args) {
+  const hookFiles = await findHookFiles(ctx.scanPath);
+  if (hookFiles.length === 0) {
+    return {
+      library: args.library,
+      filesTouched: [],
+      depsToAdd: [],
+      packageJsonPatch: {},
+      templatePatch: "No hook files found. Run 'neat init' first."
+    };
+  }
+  for (const file of hookFiles) {
+    const content = await import_node_fs20.promises.readFile(import_node_path33.default.join(ctx.scanPath, file), "utf8");
+    if (content.includes(args.registration_snippet)) {
+      return {
+        library: args.library,
+        filesTouched: [],
+        depsToAdd: [],
+        packageJsonPatch: {},
+        templatePatch: "Already applied \u2014 no changes would be made."
+      };
+    }
+  }
+  const primaryFile = hookFiles[0];
+  const filesTouched = [];
+  const depsToAdd = [];
+  let packageJsonPatch = {};
+  let templatePatch = "";
+  const pkg = await readPackageJson(ctx.scanPath);
+  if (!(pkg.dependencies ?? {})[args.instrumentation_package]) {
+    packageJsonPatch = { dependencies: { [args.instrumentation_package]: args.version } };
+    depsToAdd.push(`${args.instrumentation_package}@${args.version}`);
+    filesTouched.push("package.json");
+  }
+  const hookContent = await import_node_fs20.promises.readFile(import_node_path33.default.join(ctx.scanPath, primaryFile), "utf8");
+  const patched = splicedContent(hookContent, args.registration_snippet);
+  if (patched) {
+    filesTouched.push(primaryFile);
+    templatePatch = `+ ${args.registration_snippet}`;
+  } else {
+    templatePatch = "Could not find insertion point in hook file.";
+  }
+  return { library: args.library, filesTouched, depsToAdd, packageJsonPatch, templatePatch };
+}
+async function rollbackExtension(ctx, args) {
+  const logPath = extendLogPath();
+  if (!await fileExists(logPath)) {
+    return { undone: false, message: "no apply found for library" };
+  }
+  const raw = await import_node_fs20.promises.readFile(logPath, "utf8");
+  const entries = raw.trim().split("\n").filter(Boolean).map((line) => JSON.parse(line));
+  const match = [...entries].reverse().find((e) => e.project === ctx.project && e.library === args.library);
+  if (!match) {
+    return { undone: false, message: "no apply found for library" };
+  }
+  const pkgPath = import_node_path33.default.join(ctx.scanPath, "package.json");
+  if (await fileExists(pkgPath)) {
+    const pkg = await readPackageJson(ctx.scanPath);
+    if (pkg.dependencies?.[match.instrumentation_package]) {
+      const { [match.instrumentation_package]: _removed, ...rest } = pkg.dependencies;
+      pkg.dependencies = rest;
+      await import_node_fs20.promises.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf8");
+    }
+  }
+  const hookFiles = await findHookFiles(ctx.scanPath);
+  for (const file of hookFiles) {
+    const filePath = import_node_path33.default.join(ctx.scanPath, file);
+    const content = await import_node_fs20.promises.readFile(filePath, "utf8");
+    if (content.includes(match.registration_snippet)) {
+      const filtered = content.split("\n").filter((line) => !line.includes(match.registration_snippet)).join("\n");
+      await import_node_fs20.promises.writeFile(filePath, filtered, "utf8");
+      break;
+    }
+  }
+  return {
+    undone: true,
+    message: `rolled back ${match.library} (${match.instrumentation_package})`
+  };
+}
+
 // src/divergences.ts
 init_cjs_shims();
 var import_types21 = require("@neat.is/types");
@@ -4975,7 +5396,7 @@ function computeDivergences(graph, opts = {}) {
 
 // src/diff.ts
 init_cjs_shims();
-var import_node_fs19 = require("fs");
+var import_node_fs21 = require("fs");
 async function loadSnapshotForDiff(target) {
   if (/^https?:\/\//i.test(target)) {
     const res = await fetch(target);
@@ -4984,7 +5405,7 @@ async function loadSnapshotForDiff(target) {
     }
     return await res.json();
   }
-  const raw = await import_node_fs19.promises.readFile(target, "utf8");
+  const raw = await import_node_fs21.promises.readFile(target, "utf8");
   return JSON.parse(raw);
 }
 function indexEntries(entries) {
@@ -5052,23 +5473,23 @@ function canonicalJson(value) {
 
 // src/projects.ts
 init_cjs_shims();
-var import_node_path32 = __toESM(require("path"), 1);
+var import_node_path34 = __toESM(require("path"), 1);
 function pathsForProject(project, baseDir) {
   if (project === DEFAULT_PROJECT) {
     return {
-      snapshotPath: import_node_path32.default.join(baseDir, "graph.json"),
-      errorsPath: import_node_path32.default.join(baseDir, "errors.ndjson"),
-      staleEventsPath: import_node_path32.default.join(baseDir, "stale-events.ndjson"),
-      embeddingsCachePath: import_node_path32.default.join(baseDir, "embeddings.json"),
-      policyViolationsPath: import_node_path32.default.join(baseDir, "policy-violations.ndjson")
+      snapshotPath: import_node_path34.default.join(baseDir, "graph.json"),
+      errorsPath: import_node_path34.default.join(baseDir, "errors.ndjson"),
+      staleEventsPath: import_node_path34.default.join(baseDir, "stale-events.ndjson"),
+      embeddingsCachePath: import_node_path34.default.join(baseDir, "embeddings.json"),
+      policyViolationsPath: import_node_path34.default.join(baseDir, "policy-violations.ndjson")
     };
   }
   return {
-    snapshotPath: import_node_path32.default.join(baseDir, `${project}.json`),
-    errorsPath: import_node_path32.default.join(baseDir, `errors.${project}.ndjson`),
-    staleEventsPath: import_node_path32.default.join(baseDir, `stale-events.${project}.ndjson`),
-    embeddingsCachePath: import_node_path32.default.join(baseDir, `embeddings.${project}.json`),
-    policyViolationsPath: import_node_path32.default.join(baseDir, `policy-violations.${project}.ndjson`)
+    snapshotPath: import_node_path34.default.join(baseDir, `${project}.json`),
+    errorsPath: import_node_path34.default.join(baseDir, `errors.${project}.ndjson`),
+    staleEventsPath: import_node_path34.default.join(baseDir, `stale-events.${project}.ndjson`),
+    embeddingsCachePath: import_node_path34.default.join(baseDir, `embeddings.${project}.json`),
+    policyViolationsPath: import_node_path34.default.join(baseDir, `policy-violations.${project}.ndjson`)
   };
 }
 var Projects = class {
@@ -5104,65 +5525,135 @@ var Projects = class {
 
 // src/registry.ts
 init_cjs_shims();
-var import_node_fs20 = require("fs");
-var import_node_os2 = __toESM(require("os"), 1);
-var import_node_path33 = __toESM(require("path"), 1);
+var import_node_fs22 = require("fs");
+var import_node_os3 = __toESM(require("os"), 1);
+var import_node_path35 = __toESM(require("path"), 1);
 var import_types22 = require("@neat.is/types");
 var LOCK_TIMEOUT_MS = 5e3;
 var LOCK_RETRY_MS = 50;
 function neatHome() {
   const override = process.env.NEAT_HOME;
-  if (override && override.length > 0) return import_node_path33.default.resolve(override);
-  return import_node_path33.default.join(import_node_os2.default.homedir(), ".neat");
+  if (override && override.length > 0) return import_node_path35.default.resolve(override);
+  return import_node_path35.default.join(import_node_os3.default.homedir(), ".neat");
 }
 function registryPath() {
-  return import_node_path33.default.join(neatHome(), "projects.json");
+  return import_node_path35.default.join(neatHome(), "projects.json");
 }
 function registryLockPath() {
-  return import_node_path33.default.join(neatHome(), "projects.json.lock");
+  return import_node_path35.default.join(neatHome(), "projects.json.lock");
+}
+function daemonPidPath() {
+  return import_node_path35.default.join(neatHome(), "neatd.pid");
+}
+function isPidAliveDefault(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (err) {
+    return err.code === "EPERM";
+  }
+}
+async function readPidFile(file) {
+  try {
+    const raw = await import_node_fs22.promises.readFile(file, "utf8");
+    const pid = Number.parseInt(raw.trim(), 10);
+    return Number.isInteger(pid) && pid > 0 ? pid : void 0;
+  } catch {
+    return void 0;
+  }
+}
+var defaultLockHolderProbe = {
+  isPidAlive: isPidAliveDefault,
+  daemonPidFromFile: () => readPidFile(daemonPidPath()),
+  async daemonResponds() {
+    const base = process.env.NEAT_API_URL ?? "http://localhost:8080";
+    try {
+      await fetch(`${base}/health`, { signal: AbortSignal.timeout(750) });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+};
+async function readLockPid(lockPath) {
+  return readPidFile(lockPath);
+}
+async function classifyLockHolder(lockPath, probe = defaultLockHolderProbe) {
+  const lockPid = await readLockPid(lockPath);
+  const daemonPid = await probe.daemonPidFromFile();
+  if (daemonPid !== void 0 && daemonPid !== process.pid && probe.isPidAlive(daemonPid) && // The lock already names the daemon, or the daemon answers on its port.
+  // Either confirms a live daemon is in the picture (the second guards
+  // against a stale pidfile whose PID got reused).
+  (daemonPid === lockPid || await probe.daemonResponds())) {
+    return { kind: "daemon", pid: daemonPid };
+  }
+  if (lockPid !== void 0 && lockPid !== process.pid && probe.isPidAlive(lockPid)) {
+    return { kind: "command", pid: lockPid };
+  }
+  return { kind: "stale" };
+}
+function lockHolderMessage(holder, lockPath, timeoutMs) {
+  switch (holder.kind) {
+    case "daemon":
+      return `The neat daemon (pid ${holder.pid}) is holding the registry lock. Register this project through the daemon, or stop neatd and re-run \`neat init\`.`;
+    case "command":
+      return `Another neat command (pid ${holder.pid}) is holding the registry lock. Wait for it to finish, or check \`ps\` if you're not sure what's running.`;
+    case "stale":
+      return `neat registry: timed out after ${timeoutMs}ms waiting for ${lockPath}. Another neat process is holding the lock; if no such process exists, remove the file by hand.`;
+  }
 }
 async function normalizeProjectPath(input) {
-  const resolved = import_node_path33.default.resolve(input);
+  const resolved = import_node_path35.default.resolve(input);
   try {
-    return await import_node_fs20.promises.realpath(resolved);
+    return await import_node_fs22.promises.realpath(resolved);
   } catch {
     return resolved;
   }
 }
 async function writeAtomically(target, contents) {
-  await import_node_fs20.promises.mkdir(import_node_path33.default.dirname(target), { recursive: true });
+  await import_node_fs22.promises.mkdir(import_node_path35.default.dirname(target), { recursive: true });
   const tmp = `${target}.${process.pid}.${Date.now()}.${Math.random().toString(36).slice(2, 8)}.tmp`;
-  const fd = await import_node_fs20.promises.open(tmp, "w");
+  const fd = await import_node_fs22.promises.open(tmp, "w");
   try {
     await fd.writeFile(contents, "utf8");
     await fd.sync();
   } finally {
     await fd.close();
   }
-  await import_node_fs20.promises.rename(tmp, target);
+  await import_node_fs22.promises.rename(tmp, target);
 }
-async function acquireLock(lockPath, timeoutMs = LOCK_TIMEOUT_MS) {
+async function acquireLock(lockPath, timeoutMs = LOCK_TIMEOUT_MS, probe = defaultLockHolderProbe) {
   const deadline = Date.now() + timeoutMs;
-  await import_node_fs20.promises.mkdir(import_node_path33.default.dirname(lockPath), { recursive: true });
+  await import_node_fs22.promises.mkdir(import_node_path35.default.dirname(lockPath), { recursive: true });
+  let probedHolder = false;
   while (true) {
     try {
-      const fd = await import_node_fs20.promises.open(lockPath, "wx");
-      await fd.close();
+      const fd = await import_node_fs22.promises.open(lockPath, "wx");
+      try {
+        await fd.writeFile(`${process.pid}
+`, "utf8");
+      } finally {
+        await fd.close();
+      }
       return;
     } catch (err) {
       const code = err.code;
       if (code !== "EEXIST") throw err;
+      if (!probedHolder) {
+        probedHolder = true;
+        const holder = await classifyLockHolder(lockPath, probe);
+        if (holder.kind === "daemon") throw new Error(lockHolderMessage(holder, lockPath, timeoutMs));
+      }
       if (Date.now() >= deadline) {
-        throw new Error(
-          `neat registry: timed out after ${timeoutMs}ms waiting for ${lockPath}. Another neat process is holding the lock; if no such process exists, remove the file by hand.`
-        );
+        const holder = await classifyLockHolder(lockPath, probe);
+        throw new Error(lockHolderMessage(holder, lockPath, timeoutMs));
       }
       await new Promise((r) => setTimeout(r, LOCK_RETRY_MS));
     }
   }
 }
 async function releaseLock(lockPath) {
-  await import_node_fs20.promises.unlink(lockPath).catch(() => {
+  await import_node_fs22.promises.unlink(lockPath).catch(() => {
   });
 }
 async function withLock(fn) {
@@ -5178,7 +5669,7 @@ async function readRegistry() {
   const file = registryPath();
   let raw;
   try {
-    raw = await import_node_fs20.promises.readFile(file, "utf8");
+    raw = await import_node_fs22.promises.readFile(file, "utf8");
   } catch (err) {
     if (err.code === "ENOENT") {
       return { version: 1, projects: [] };
@@ -5728,6 +6219,105 @@ function registerRoutes(scope, ctx) {
       violations
     };
   });
+  scope.get("/extend/list-uninstrumented", async (req, reply) => {
+    const proj = resolveProject(registry, req, reply, ctx.bootstrap);
+    if (!proj) return;
+    if (!proj.scanPath) {
+      return reply.code(409).send({ error: "scan path not configured for this project", project: proj.name });
+    }
+    try {
+      const results = await listUninstrumented({ project: proj.name, scanPath: proj.scanPath });
+      return { libraries: results };
+    } catch (err) {
+      return reply.code(500).send({ error: err.message });
+    }
+  });
+  scope.get("/extend/lookup", async (req, reply) => {
+    const proj = resolveProject(registry, req, reply, ctx.bootstrap);
+    if (!proj) return;
+    const { library, version } = req.query;
+    if (!library) {
+      return reply.code(400).send({ error: "query parameter `library` is required" });
+    }
+    const result = lookupInstrumentation(library, version);
+    if (!result) {
+      return reply.code(404).send({ error: "library not found in registry", library });
+    }
+    return result;
+  });
+  scope.get("/extend/describe", async (req, reply) => {
+    const proj = resolveProject(registry, req, reply, ctx.bootstrap);
+    if (!proj) return;
+    if (!proj.scanPath) {
+      return reply.code(409).send({ error: "scan path not configured for this project", project: proj.name });
+    }
+    try {
+      const state = await describeProjectInstrumentation({ project: proj.name, scanPath: proj.scanPath });
+      return state;
+    } catch (err) {
+      return reply.code(500).send({ error: err.message });
+    }
+  });
+  scope.post("/extend/apply", async (req, reply) => {
+    const proj = resolveProject(registry, req, reply, ctx.bootstrap);
+    if (!proj) return;
+    if (!proj.scanPath) {
+      return reply.code(409).send({ error: "scan path not configured for this project", project: proj.name });
+    }
+    const { library, instrumentation_package, version, registration_snippet } = req.body ?? {};
+    if (!library || !instrumentation_package || !version || !registration_snippet) {
+      return reply.code(400).send({ error: "body must include library, instrumentation_package, version, registration_snippet" });
+    }
+    try {
+      const result = await applyExtension(
+        { project: proj.name, scanPath: proj.scanPath },
+        { library, instrumentation_package, version, registration_snippet }
+      );
+      return result;
+    } catch (err) {
+      return reply.code(500).send({ error: err.message });
+    }
+  });
+  scope.post("/extend/dry-run", async (req, reply) => {
+    const proj = resolveProject(registry, req, reply, ctx.bootstrap);
+    if (!proj) return;
+    if (!proj.scanPath) {
+      return reply.code(409).send({ error: "scan path not configured for this project", project: proj.name });
+    }
+    const { library, instrumentation_package, version, registration_snippet } = req.body ?? {};
+    if (!library || !instrumentation_package || !version || !registration_snippet) {
+      return reply.code(400).send({ error: "body must include library, instrumentation_package, version, registration_snippet" });
+    }
+    try {
+      const result = await dryRunExtension(
+        { project: proj.name, scanPath: proj.scanPath },
+        { library, instrumentation_package, version, registration_snippet }
+      );
+      return result;
+    } catch (err) {
+      return reply.code(500).send({ error: err.message });
+    }
+  });
+  scope.post("/extend/rollback", async (req, reply) => {
+    const proj = resolveProject(registry, req, reply, ctx.bootstrap);
+    if (!proj) return;
+    if (!proj.scanPath) {
+      return reply.code(409).send({ error: "scan path not configured for this project", project: proj.name });
+    }
+    const { library } = req.body ?? {};
+    if (!library) {
+      return reply.code(400).send({ error: "body must include library" });
+    }
+    try {
+      const result = await rollbackExtension(
+        { project: proj.name, scanPath: proj.scanPath },
+        { library }
+      );
+      return result;
+    } catch (err) {
+      return reply.code(500).send({ error: err.message });
+    }
+  });
 }
 async function buildApi(opts) {
   const app = (0, import_fastify.default)({ logger: false });
@@ -5838,15 +6428,15 @@ init_otel_grpc();
 
 // src/daemon.ts
 init_cjs_shims();
-var import_node_fs22 = require("fs");
-var import_node_path37 = __toESM(require("path"), 1);
+var import_node_fs24 = require("fs");
+var import_node_path39 = __toESM(require("path"), 1);
 init_otel();
 init_auth();
 
 // src/unrouted.ts
 init_cjs_shims();
-var import_node_fs21 = require("fs");
-var import_node_path36 = __toESM(require("path"), 1);
+var import_node_fs23 = require("fs");
+var import_node_path38 = __toESM(require("path"), 1);
 function buildUnroutedSpanRecord(serviceName, traceId, now = /* @__PURE__ */ new Date()) {
   return {
     timestamp: now.toISOString(),
@@ -5856,21 +6446,21 @@ function buildUnroutedSpanRecord(serviceName, traceId, now = /* @__PURE__ */ new
   };
 }
 async function appendUnroutedSpan(neatHome2, record) {
-  const target = import_node_path36.default.join(neatHome2, "errors.ndjson");
-  await import_node_fs21.promises.mkdir(neatHome2, { recursive: true });
-  await import_node_fs21.promises.appendFile(target, JSON.stringify(record) + "\n", "utf8");
+  const target = import_node_path38.default.join(neatHome2, "errors.ndjson");
+  await import_node_fs23.promises.mkdir(neatHome2, { recursive: true });
+  await import_node_fs23.promises.appendFile(target, JSON.stringify(record) + "\n", "utf8");
 }
 function unroutedErrorsPath(neatHome2) {
-  return import_node_path36.default.join(neatHome2, "errors.ndjson");
+  return import_node_path38.default.join(neatHome2, "errors.ndjson");
 }
 
 // src/daemon.ts
 function neatHomeFor(opts) {
-  if (opts.neatHome && opts.neatHome.length > 0) return import_node_path37.default.resolve(opts.neatHome);
+  if (opts.neatHome && opts.neatHome.length > 0) return import_node_path39.default.resolve(opts.neatHome);
   const env = process.env.NEAT_HOME;
-  if (env && env.length > 0) return import_node_path37.default.resolve(env);
+  if (env && env.length > 0) return import_node_path39.default.resolve(env);
   const home = process.env.HOME ?? process.env.USERPROFILE ?? "";
-  return import_node_path37.default.join(home, ".neat");
+  return import_node_path39.default.join(home, ".neat");
 }
 function routeSpanToProject(serviceName, projects) {
   if (!serviceName) return DEFAULT_PROJECT;
@@ -5905,9 +6495,9 @@ function isTokenContained(needle, haystack) {
   return tokens.includes(needle);
 }
 async function bootstrapProject(entry) {
-  const paths = pathsForProject(entry.name, import_node_path37.default.join(entry.path, "neat-out"));
+  const paths = pathsForProject(entry.name, import_node_path39.default.join(entry.path, "neat-out"));
   try {
-    const stat = await import_node_fs22.promises.stat(entry.path);
+    const stat = await import_node_fs24.promises.stat(entry.path);
     if (!stat.isDirectory()) {
       throw new Error(`registered path ${entry.path} is not a directory`);
     }
@@ -5973,13 +6563,13 @@ async function startDaemon(opts = {}) {
   const home = neatHomeFor(opts);
   const regPath = registryPath();
   try {
-    await import_node_fs22.promises.access(regPath);
+    await import_node_fs24.promises.access(regPath);
   } catch {
     throw new Error(
       `neatd: registry not found at ${regPath}. Run \`neat init <path>\` to register a project before starting the daemon.`
     );
   }
-  const pidPath = import_node_path37.default.join(home, "neatd.pid");
+  const pidPath = import_node_path39.default.join(home, "neatd.pid");
   await writeAtomically(pidPath, `${process.pid}
 `);
   const slots = /* @__PURE__ */ new Map();
@@ -6137,7 +6727,7 @@ async function startDaemon(opts = {}) {
       }
       if (restApp) await restApp.close().catch(() => {
       });
-      await import_node_fs22.promises.unlink(pidPath).catch(() => {
+      await import_node_fs24.promises.unlink(pidPath).catch(() => {
       });
       throw new Error(
         `neatd: failed to bind REST on port ${restPort} \u2014 ${err.message}`
@@ -6193,6 +6783,7 @@ async function startDaemon(opts = {}) {
             {
               graph: slot.graph,
               errorsPath: slot.paths.errorsPath,
+              scanPath: slot.entry.path,
               project: slot.entry.name,
               // Receiver already wrote the error event synchronously below.
               writeErrorEventInline: false
@@ -6216,6 +6807,7 @@ async function startDaemon(opts = {}) {
             {
               graph: slot.graph,
               errorsPath: slot.paths.errorsPath,
+              scanPath: slot.entry.path,
               project: slot.entry.name,
               writeErrorEventInline: false
             },
@@ -6241,7 +6833,7 @@ async function startDaemon(opts = {}) {
       });
       if (otlpApp) await otlpApp.close().catch(() => {
       });
-      await import_node_fs22.promises.unlink(pidPath).catch(() => {
+      await import_node_fs24.promises.unlink(pidPath).catch(() => {
       });
       throw new Error(
         `neatd: failed to bind OTLP on port ${otlpPort} \u2014 ${err.message}`
@@ -6287,9 +6879,9 @@ async function startDaemon(opts = {}) {
   let registryWatcher = null;
   let reloadTimer = null;
   try {
-    const regDir = import_node_path37.default.dirname(regPath);
-    const regBase = import_node_path37.default.basename(regPath);
-    registryWatcher = (0, import_node_fs22.watch)(regDir, (_eventType, filename) => {
+    const regDir = import_node_path39.default.dirname(regPath);
+    const regBase = import_node_path39.default.basename(regPath);
+    registryWatcher = (0, import_node_fs24.watch)(regDir, (_eventType, filename) => {
       if (filename !== null && filename !== regBase) return;
       if (reloadTimer) clearTimeout(reloadTimer);
       reloadTimer = setTimeout(() => {
@@ -6332,7 +6924,7 @@ async function startDaemon(opts = {}) {
       } catch {
       }
     }
-    await import_node_fs22.promises.unlink(pidPath).catch(() => {
+    await import_node_fs24.promises.unlink(pidPath).catch(() => {
     });
   };
   return {