@neat.is/core 0.7.7 → 0.7.9

package/dist/cli.cjs

@@ -504,13 +504,18 @@ function loadProtobufResponseEncoder() {
   );
   return exportTraceServiceResponseType;
 }
-function encodeProtobufResponseBody() {
-  if (cachedProtobufResponseBody) return cachedProtobufResponseBody;
+function encodeProtobufResponseBody(rejected, message) {
   const Type = loadProtobufResponseEncoder();
-  const msg = Type.create({});
-  const encoded = Type.encode(msg).finish();
-  cachedProtobufResponseBody = Buffer.from(encoded);
-  return cachedProtobufResponseBody;
+  if (!rejected) {
+    if (cachedProtobufResponseBody) return cachedProtobufResponseBody;
+    const msg2 = Type.create({});
+    cachedProtobufResponseBody = Buffer.from(Type.encode(msg2).finish());
+    return cachedProtobufResponseBody;
+  }
+  const msg = Type.fromObject({
+    partial_success: { rejected_spans: rejected, error_message: message ?? "" }
+  });
+  return Buffer.from(Type.encode(msg).finish());
 }
 async function decodeProtobufBody(buf) {
   const Type = loadProtobufDecoder();
@@ -625,6 +630,13 @@ async function buildOtelReceiver(opts) {
     }
     return reply.code(200).header("content-type", "application/json").send({ partialSuccess: {} });
   }
+  function sendOtlpPartial(reply, flavor, rejected, message) {
+    if (flavor === "protobuf") {
+      const buf = encodeProtobufResponseBody(rejected, message);
+      return reply.code(200).header("content-type", "application/x-protobuf").send(buf);
+    }
+    return reply.code(200).header("content-type", "application/json").send({ partialSuccess: { rejectedSpans: rejected, errorMessage: message } });
+  }
   app.addContentTypeParser(
     "application/x-protobuf",
     { parseAs: "buffer", bodyLimit: opts.bodyLimit ?? 16 * 1024 * 1024 },
@@ -652,6 +664,10 @@ async function buildOtelReceiver(opts) {
       }
     }
     enqueue(spans);
+    if (opts.classifyBareRoutability) {
+      const { rejected, message } = opts.classifyBareRoutability(spans);
+      if (rejected > 0) return sendOtlpPartial(reply, result.flavor, rejected, message);
+    }
     return sendOtlpSuccess(reply, result.flavor);
   });
   app.post("/projects/:project/v1/traces", async (req, reply) => {
@@ -3065,6 +3081,7 @@ var ROUTER_METHODS = /* @__PURE__ */ new Set([
   "all"
 ]);
 var NEXT_APP_METHODS = /* @__PURE__ */ new Set(["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS"]);
+var NET_HTTP_METHODS = /* @__PURE__ */ new Set(["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS"]);
 var JS_ROUTE_EXTENSIONS = /* @__PURE__ */ new Set([".js", ".jsx", ".mjs", ".cjs", ".ts", ".tsx"]);
 function goRouterRoutesFromSource(source, parser, framework) {
   const tree = parseSource2(parser, source);
@@ -3118,6 +3135,101 @@ function echoRoutesFromSource(source, parser) {
 function fiberRoutesFromSource(source, parser) {
   return goRouterRoutesFromSource(source, parser, "fiber");
 }
+function chiRoutesFromSource(source, parser) {
+  const tree = parseSource2(parser, source);
+  const out = [];
+  chiWalk(tree.rootNode, "", out);
+  return out;
+}
+function stripChiRegex(path82) {
+  return path82.replace(/\{([^{}:]+):[^{}]*\}/g, "{$1}");
+}
+function chiWalk(node, prefix, out) {
+  for (let i = 0; i < node.namedChildCount; i++) {
+    const child = node.namedChild(i);
+    if (child) chiHandle(child, prefix, out);
+  }
+}
+function chiHandle(node, prefix, out) {
+  if (node.type === "call_expression") {
+    const fn = node.childForFieldName("function");
+    if (fn?.type === "selector_expression") {
+      const field = fn.childForFieldName("field")?.text;
+      const args = node.childForFieldName("arguments");
+      if (field === "Route") {
+        const leaf = goStringLiteral(args?.namedChild(0));
+        const closure = args?.namedChild(1);
+        if (leaf !== null && closure?.type === "func_literal") {
+          const body = closure.childForFieldName("body");
+          if (body) chiWalk(body, prefix + leaf, out);
+        }
+        return;
+      }
+      if (field === "Group") {
+        const closure = args?.namedChild(0);
+        if (closure?.type === "func_literal") {
+          const body = closure.childForFieldName("body");
+          if (body) chiWalk(body, prefix, out);
+        }
+        return;
+      }
+      if (field === "Mount") {
+        return;
+      }
+      if (field && ROUTER_METHODS.has(field.toLowerCase())) {
+        const leaf = goStringLiteral(args?.namedChild(0));
+        if (leaf !== null) {
+          out.push({
+            method: field.toUpperCase(),
+            pathTemplate: canonicalizeTemplate(stripChiRegex(prefix + leaf)),
+            line: node.startPosition.row + 1,
+            framework: "chi"
+          });
+        }
+        return;
+      }
+    }
+  }
+  chiWalk(node, prefix, out);
+}
+function netHttpRoutesFromSource(source, parser) {
+  const tree = parseSource2(parser, source);
+  if (!goImportsNetHttp(tree.rootNode)) return [];
+  const out = [];
+  walk(tree.rootNode, (node) => {
+    if (node.type !== "call_expression") return;
+    const fn = node.childForFieldName("function");
+    if (fn?.type !== "selector_expression") return;
+    const field = fn.childForFieldName("field")?.text;
+    if (field !== "HandleFunc" && field !== "Handle") return;
+    const leaf = goStringLiteral(node.childForFieldName("arguments")?.namedChild(0));
+    if (leaf === null) return;
+    const sp = leaf.indexOf(" ");
+    if (sp < 0) return;
+    const method = leaf.slice(0, sp);
+    const rest = leaf.slice(sp + 1);
+    if (!NET_HTTP_METHODS.has(method)) return;
+    if (!rest.startsWith("/")) return;
+    out.push({
+      method,
+      pathTemplate: canonicalizeTemplate(rest),
+      line: node.startPosition.row + 1,
+      framework: "net/http"
+    });
+  });
+  return out;
+}
+function goImportsNetHttp(root) {
+  let found = false;
+  walk(root, (node) => {
+    if (found || node.type !== "import_spec") return;
+    for (let i = 0; i < node.namedChildCount; i++) {
+      const child = node.namedChild(i);
+      if (goStringLiteral(child) === "net/http") found = true;
+    }
+  });
+  return found;
+}
 var FASTAPI_METHODS = /* @__PURE__ */ new Set(["get", "post", "put", "patch", "delete", "options", "head", "trace"]);
 var NESTJS_METHODS = /* @__PURE__ */ new Map([
   ["Get", "GET"],
@@ -4383,9 +4495,11 @@ async function addRoutes(graph, services) {
     const hasGin = deps["github.com/gin-gonic/gin"] !== void 0;
     const hasEcho = deps["github.com/labstack/echo/v4"] !== void 0 || deps["github.com/labstack/echo"] !== void 0;
     const hasFiber = deps["github.com/gofiber/fiber/v2"] !== void 0 || deps["github.com/gofiber/fiber/v3"] !== void 0;
+    const hasChi = deps["github.com/go-chi/chi/v5"] !== void 0 || deps["github.com/go-chi/chi"] !== void 0;
+    const isGoService = service.node.language === "go";
     const hasRails = deps["rails"] !== void 0;
     const hasLaravel = deps["laravel/framework"] !== void 0;
-    if (!hasExpress && !hasFastify && !hasHono && !hasNext && !hasNestjs && !hasFastapi && !hasFlask && !hasDjango && !hasGin && !hasEcho && !hasFiber && !hasRails && !hasLaravel)
+    if (!hasExpress && !hasFastify && !hasHono && !hasNext && !hasNestjs && !hasFastapi && !hasFlask && !hasDjango && !hasGin && !hasEcho && !hasFiber && !hasChi && !isGoService && !hasRails && !hasLaravel)
       continue;
     const files = await loadSourceFiles(service.dir);
     const mountPrefixes = hasExpress ? await expressMountPrefixes(files, service.dir, await loadTsPathConfig(service.dir)) : /* @__PURE__ */ new Map();
@@ -4412,7 +4526,9 @@ async function addRoutes(graph, services) {
           if (hasGin) routes = ginRoutesFromSource(file.content, goParser);
           else if (hasEcho) routes = echoRoutesFromSource(file.content, goParser);
           else if (hasFiber) routes = fiberRoutesFromSource(file.content, goParser);
+          else if (hasChi) routes = chiRoutesFromSource(file.content, goParser);
           else routes = [];
+          routes = routes.concat(netHttpRoutesFromSource(file.content, goParser));
         } else if (isPy) {
           routes = hasFastapi || hasFlask ? pythonRoutesFromSource(file.content, pyParser, hasFastapi ? "fastapi" : "flask") : [];
           if (hasDjango) routes = routes.concat(djangoRoutesFromSource(file.content, pyParser));
@@ -4785,10 +4901,15 @@ function resolveDistToSrc(absFilepath, line) {
   }
   if (!entry2) return null;
   try {
-    const pos = entry2.consumer.originalPositionFor({
-      line: line !== void 0 && Number.isFinite(line) ? line : 1,
-      column: 0
-    });
+    const queryLine = line !== void 0 && Number.isFinite(line) ? line : 1;
+    let pos = entry2.consumer.originalPositionFor({ line: queryLine, column: 0 });
+    if (!pos || !pos.source) {
+      pos = entry2.consumer.originalPositionFor({
+        line: queryLine,
+        column: 0,
+        bias: sourceMapJs.SourceMapConsumer.LEAST_UPPER_BOUND
+      });
+    }
     if (!pos || !pos.source) return null;
     const root = entry2.consumer.sourceRoot ?? "";
     const resolved = import_node_path9.default.resolve(entry2.dir, root, pos.source);
@@ -4797,6 +4918,9 @@ function resolveDistToSrc(absFilepath, line) {
     return null;
   }
 }
+function hasAdjacentSourceMap(absFilepath) {
+  return sourceMapCache.get(absFilepath) != null;
+}
 function callSiteFromSpan(span, serviceNode, scanPath) {
   const filepath = codeFilepathOf(span.attributes);
   if (filepath === void 0) return null;
@@ -4812,7 +4936,7 @@ function callSiteFromSpan(span, serviceNode, scanPath) {
   }
   const relPath = relPathForRuntimeFile(effectivePath, serviceNode, scanPath);
   if (!relPath) return null;
-  if (!resolved && abs.endsWith(".js") && relPath.startsWith("dist/") && serviceNode?.name) {
+  if (!resolved && abs.endsWith(".js") && relPath.startsWith("dist/") && !hasAdjacentSourceMap(abs) && serviceNode?.name) {
     warnNoSourceMaps(serviceNode.name);
   }
   const fn = codeFunctionOf(span.attributes);
@@ -5088,7 +5212,7 @@ function resolveServiceId(graph, host, env) {
 function frontierIdFor(host) {
   return (0, import_types8.frontierId)(host);
 }
-function ensureServiceNode(graph, serviceName, env) {
+function resolveFusedServiceId(graph, serviceName, env) {
   const id = (0, import_types8.serviceId)(serviceName, env);
   if (graph.hasNode(id)) return id;
   const wanted = serviceName.toLowerCase();
@@ -5098,17 +5222,21 @@ function ensureServiceNode(graph, serviceName, env) {
     if (svc.discoveredVia === "otel") return false;
     return typeof svc.name === "string" && svc.name.toLowerCase() === wanted;
   });
-  if (extractedId) return extractedId;
+  return extractedId ?? id;
+}
+function ensureServiceNode(graph, serviceName, env) {
+  const resolved = resolveFusedServiceId(graph, serviceName, env);
+  if (graph.hasNode(resolved)) return resolved;
   const node = {
-    id,
+    id: resolved,
     type: import_types8.NodeType.ServiceNode,
     name: serviceName,
     language: "unknown",
     discoveredVia: "otel",
     ...env !== "unknown" ? { env } : {}
   };
-  graph.addNode(id, node);
-  return id;
+  graph.addNode(resolved, node);
+  return resolved;
 }
 function ensureInfraNode(graph, kind, name, provider) {
   const id = (0, import_types8.infraId)(kind, name);
@@ -5302,7 +5430,7 @@ async function appendErrorEvent(ctx, ev) {
   await import_node_fs8.promises.appendFile(ctx.errorsPath, JSON.stringify(ev) + "\n", "utf8");
 }
 function incidentAffectedNode(span, graph, scanPath) {
-  const sid = (0, import_types8.serviceId)(span.service, span.env);
+  const sid = graph ? resolveFusedServiceId(graph, span.service, span.env) : (0, import_types8.serviceId)(span.service, span.env);
   const serviceNode = graph && graph.hasNode(sid) ? graph.getNodeAttributes(sid) : void 0;
   const callSite = callSiteFromSpan(span, serviceNode, scanPath);
   if (callSite) {
@@ -6026,6 +6154,7 @@ function goFramework(deps) {
   if (deps["github.com/gin-gonic/gin"]) return "gin";
   if (deps["github.com/labstack/echo/v4"] || deps["github.com/labstack/echo"]) return "echo";
   if (deps["github.com/gofiber/fiber/v2"] || deps["github.com/gofiber/fiber/v3"]) return "fiber";
+  if (deps["github.com/go-chi/chi/v5"] || deps["github.com/go-chi/chi"]) return "chi";
   return void 0;
 }
 async function discoverGoService(scanPath, dir) {
@@ -6703,7 +6832,7 @@ function disambiguate(defs) {
 }
 async function addSymbols(graph, services) {
   const parsers = /* @__PURE__ */ new Map();
-  const parserForExt4 = (ext) => {
+  const parserForExt5 = (ext) => {
     const grammar = GRAMMAR_BY_EXT[ext];
     if (!grammar) return null;
     let parser = parsers.get(ext);
@@ -6719,7 +6848,7 @@ async function addSymbols(graph, services) {
   for (const service of services) {
     const files = await loadSourceFiles(service.dir);
     for (const file of files) {
-      const parser = parserForExt4(import_node_path18.default.extname(file.path));
+      const parser = parserForExt5(import_node_path18.default.extname(file.path));
       if (!parser) continue;
       const relPath = toPosix(import_node_path18.default.relative(service.dir, file.path));
       let defs;
@@ -6871,7 +7000,7 @@ function stringInner(node) {
 }
 async function addSymbolEdges(graph, services) {
   const parsers = /* @__PURE__ */ new Map();
-  const parserForExt4 = (ext) => {
+  const parserForExt5 = (ext) => {
     const grammar = GRAMMAR_BY_EXT[ext];
     if (!grammar) return null;
     let parser = parsers.get(ext);
@@ -6888,7 +7017,7 @@ async function addSymbolEdges(graph, services) {
     const tsPaths = await loadTsPathConfig(service.dir);
     const files = await loadSourceFiles(service.dir);
     for (const file of files) {
-      const parser = parserForExt4(import_node_path19.default.extname(file.path));
+      const parser = parserForExt5(import_node_path19.default.extname(file.path));
       if (!parser) continue;
       const relPath = toPosix(import_node_path19.default.relative(service.dir, file.path));
       const fileDir = import_node_path19.default.dirname(file.path);
@@ -7150,7 +7279,7 @@ function firstReferenceLines(root, wanted) {
 }
 async function addServerActions(graph, services) {
   const parsers = /* @__PURE__ */ new Map();
-  const parserForExt4 = (ext) => {
+  const parserForExt5 = (ext) => {
     const grammar = GRAMMAR_BY_EXT[ext];
     if (!grammar) return null;
     let parser = parsers.get(ext);
@@ -7173,7 +7302,7 @@ async function addServerActions(graph, services) {
     const files = await loadSourceFiles(service.dir);
     for (const file of files) {
       if (isTestPath(file.path)) continue;
-      const parser = parserForExt4(import_node_path20.default.extname(file.path));
+      const parser = parserForExt5(import_node_path20.default.extname(file.path));
       if (!parser) continue;
       const relPath = toPosix(import_node_path20.default.relative(service.dir, file.path));
       let root;
@@ -7236,7 +7365,7 @@ async function addServerActions(graph, services) {
     }
     for (const file of files) {
       if (isTestPath(file.path)) continue;
-      const parser = parserForExt4(import_node_path20.default.extname(file.path));
+      const parser = parserForExt5(import_node_path20.default.extname(file.path));
       if (!parser) continue;
       const relPath = toPosix(import_node_path20.default.relative(service.dir, file.path));
       const fileDir = import_node_path20.default.dirname(file.path);
@@ -8200,6 +8329,7 @@ init_cjs_shims();
 var import_node_path31 = __toESM(require("path"), 1);
 var import_tree_sitter6 = __toESM(require("tree-sitter"), 1);
 var import_tree_sitter_javascript4 = __toESM(require("tree-sitter-javascript"), 1);
+var import_tree_sitter_typescript2 = __toESM(require("tree-sitter-typescript"), 1);
 var import_tree_sitter_python3 = __toESM(require("tree-sitter-python"), 1);
 var import_types20 = require("@neat.is/types");
 var STRING_LITERAL_NODE_TYPES = /* @__PURE__ */ new Set(["string_fragment", "string_content"]);
@@ -8250,19 +8380,27 @@ function callsFromSource(source, parser, knownHosts) {
   }
   return out;
 }
-function makeJsParser3() {
-  const p = new import_tree_sitter6.default();
-  p.setLanguage(import_tree_sitter_javascript4.default);
-  return p;
-}
-function makePyParser3() {
-  const p = new import_tree_sitter6.default();
-  p.setLanguage(import_tree_sitter_python3.default);
-  return p;
+var GRAMMAR_BY_EXT2 = {
+  ".ts": import_tree_sitter_typescript2.default.typescript,
+  ".tsx": import_tree_sitter_typescript2.default.tsx,
+  ".js": import_tree_sitter_javascript4.default,
+  ".jsx": import_tree_sitter_javascript4.default,
+  ".mjs": import_tree_sitter_javascript4.default,
+  ".cjs": import_tree_sitter_javascript4.default,
+  ".py": import_tree_sitter_python3.default
+};
+function parserForExt(ext, cache) {
+  const grammar = GRAMMAR_BY_EXT2[ext] ?? import_tree_sitter_javascript4.default;
+  let parser = cache.get(grammar);
+  if (!parser) {
+    parser = new import_tree_sitter6.default();
+    parser.setLanguage(grammar);
+    cache.set(grammar, parser);
+  }
+  return parser;
 }
 async function addHttpCallEdges(graph, services) {
-  const jsParser = makeJsParser3();
-  const pyParser = makePyParser3();
+  const parserCache = /* @__PURE__ */ new Map();
   const { knownHosts, hostToNodeId } = buildServiceHostIndex(services);
   let nodesAdded = 0;
   let edgesAdded = 0;
@@ -8271,7 +8409,7 @@ async function addHttpCallEdges(graph, services) {
     const seen = /* @__PURE__ */ new Set();
     for (const file of files) {
       if (isTestPath(file.path)) continue;
-      const parser = import_node_path31.default.extname(file.path) === ".py" ? pyParser : jsParser;
+      const parser = parserForExt(import_node_path31.default.extname(file.path), parserCache);
       let sites;
       try {
         sites = callsFromSource(file.content, parser, knownHosts);
@@ -8344,7 +8482,7 @@ function parseSource5(parser, source) {
     (index) => index >= source.length ? "" : source.slice(index, index + PARSE_CHUNK5)
   );
 }
-function makeJsParser4() {
+function makeJsParser3() {
   const p = new import_tree_sitter7.default();
   p.setLanguage(import_tree_sitter_javascript5.default);
   return p;
@@ -8522,7 +8660,7 @@ function findRoute(entries, method, normalizedPath) {
   );
 }
 async function addRouteCallEdges(graph, services) {
-  const jsParser = makeJsParser4();
+  const jsParser = makeJsParser3();
   const { knownHosts, hostToNodeId } = buildServiceHostIndex(services);
   const routeIndex = buildRouteIndex(graph);
   if (routeIndex.size === 0) return { nodesAdded: 0, edgesAdded: 0 };
@@ -8914,7 +9052,7 @@ var import_tree_sitter_javascript6 = __toESM(require("tree-sitter-javascript"),
 var import_types27 = require("@neat.is/types");
 var FIRESTORE_CLIENT_IMPORT_RE = /(?:from\s+['"`]|require\(\s*['"`])firebase\/firestore['"`]/;
 var FIRESTORE_ADMIN_IMPORT_RE = /(?:from\s+['"`]|require\(\s*['"`])firebase-admin(?:\/firestore)?['"`]/;
-function parserForExt(ext) {
+function parserForExt2(ext) {
   const p = new import_tree_sitter8.default();
   p.setLanguage(GRAMMAR_BY_EXT[ext] ?? import_tree_sitter_javascript6.default);
   return p;
@@ -9079,7 +9217,7 @@ function firestoreEndpointsFromFile(file, serviceDir) {
   const hasAdmin = FIRESTORE_ADMIN_IMPORT_RE.test(file.content);
   if (!hasClient && !hasAdmin) return [];
   const fileSdk = hasClient && !hasAdmin ? "client" : hasAdmin && !hasClient ? "admin" : null;
-  const tree = parseSource3(parserForExt(import_node_path38.default.extname(file.path)), file.content);
+  const tree = parseSource3(parserForExt2(import_node_path38.default.extname(file.path)), file.content);
   const clientVars = firestoreClientVars(tree.rootNode);
   const collLine = /* @__PURE__ */ new Map();
   const writes = /* @__PURE__ */ new Map();
@@ -9496,7 +9634,7 @@ var import_tree_sitter_python4 = __toESM(require("tree-sitter-python"), 1);
 var import_types29 = require("@neat.is/types");
 var SQLALCHEMY_IMPORT_RE = /(?:from|import)\s+(?:flask_sqlalchemy|sqlalchemy)\b/;
 var PARSE_CHUNK6 = 16384;
-function makePyParser4() {
+function makePyParser3() {
   const p = new import_tree_sitter9.default();
   p.setLanguage(import_tree_sitter_python4.default);
   return p;
@@ -9603,7 +9741,7 @@ function foreignKeyParentTable(call) {
 }
 function sqlalchemyForeignKeys(file, serviceDir) {
   if (!SQLALCHEMY_IMPORT_RE.test(file.content)) return [];
-  const tree = parseSource6(makePyParser4(), file.content);
+  const tree = parseSource6(makePyParser3(), file.content);
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   walk3(tree.rootNode, (node) => {
@@ -9640,7 +9778,7 @@ function sqlalchemyForeignKeys(file, serviceDir) {
 }
 function sqlalchemyEndpointsFromFile(file, serviceDir) {
   if (!SQLALCHEMY_IMPORT_RE.test(file.content)) return [];
-  const tree = parseSource6(makePyParser4(), file.content);
+  const tree = parseSource6(makePyParser3(), file.content);
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   const push = (name, line, columns) => {
@@ -9692,7 +9830,7 @@ function sqlalchemyEndpointsFromFile(file, serviceDir) {
 function buildSqlalchemyModelRegistry(files) {
   const table = /* @__PURE__ */ new Map();
   const ambiguous = /* @__PURE__ */ new Set();
-  const parser = makePyParser4();
+  const parser = makePyParser3();
   for (const file of files) {
     if (!SQLALCHEMY_IMPORT_RE.test(file.content)) continue;
     const tree = parseSource6(parser, file.content);
@@ -9741,7 +9879,7 @@ function importsModelName(content, name) {
 function pythonOrmCrossFileEndpoints(files, serviceDir) {
   const registry = buildSqlalchemyModelRegistry(files);
   if (registry.size === 0) return [];
-  const parser = makePyParser4();
+  const parser = makePyParser3();
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   for (const file of files) {
@@ -9779,7 +9917,7 @@ var import_tree_sitter_python5 = __toESM(require("tree-sitter-python"), 1);
 var import_types30 = require("@neat.is/types");
 var DJANGO_IMPORT_RE = /(?:from|import)\s+django\b/;
 var PARSE_CHUNK7 = 16384;
-function makePyParser5() {
+function makePyParser4() {
   const p = new import_tree_sitter10.default();
   p.setLanguage(import_tree_sitter_python5.default);
   return p;
@@ -9840,7 +9978,7 @@ function readMeta(body) {
 }
 function djangoOrmEndpointsFromFile(file, serviceDir) {
   if (!DJANGO_IMPORT_RE.test(file.content)) return [];
-  const tree = parseSource7(makePyParser5(), file.content);
+  const tree = parseSource7(makePyParser4(), file.content);
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   const defaultAppLabel = import_node_path41.default.basename(import_node_path41.default.dirname(file.path));
@@ -9875,7 +10013,7 @@ var import_tree_sitter_javascript7 = __toESM(require("tree-sitter-javascript"),
 var import_types31 = require("@neat.is/types");
 var DRIZZLE_IMPORT_RE = /drizzle-orm/;
 var TABLE_BUILDERS = /* @__PURE__ */ new Set(["pgTable", "mysqlTable", "sqliteTable"]);
-function parserForExt2(ext) {
+function parserForExt3(ext) {
   const p = new import_tree_sitter11.default();
   p.setLanguage(GRAMMAR_BY_EXT[ext] ?? import_tree_sitter_javascript7.default);
   return p;
@@ -9947,7 +10085,7 @@ function columnsFromObject(obj) {
 }
 function drizzleEndpointsFromFile(file, serviceDir) {
   if (!DRIZZLE_IMPORT_RE.test(file.content)) return [];
-  const tree = parseSource3(parserForExt2(import_node_path42.default.extname(file.path)), file.content);
+  const tree = parseSource3(parserForExt3(import_node_path42.default.extname(file.path)), file.content);
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   const walk9 = (node) => {
@@ -10036,7 +10174,7 @@ function referencesTargetVar(call) {
 }
 function drizzleForeignKeys(file, serviceDir) {
   if (!DRIZZLE_IMPORT_RE.test(file.content)) return [];
-  const tree = parseSource3(parserForExt2(import_node_path42.default.extname(file.path)), file.content);
+  const tree = parseSource3(parserForExt3(import_node_path42.default.extname(file.path)), file.content);
   const { tables, varToTable } = collectDrizzleTables(tree.rootNode);
   const out = [];
   const seen = /* @__PURE__ */ new Set();
@@ -12743,7 +12881,7 @@ var import_tree_sitter_javascript8 = __toESM(require("tree-sitter-javascript"),
 var import_types47 = require("@neat.is/types");
 var ZOD_IMPORT_RE = /\bzod\b/;
 var ZOD_OBJECTS = /* @__PURE__ */ new Set(["z", "zod"]);
-function parserForExt3(ext) {
+function parserForExt4(ext) {
   const p = new import_tree_sitter16.default();
   p.setLanguage(GRAMMAR_BY_EXT[ext] ?? import_tree_sitter_javascript8.default);
   return p;
@@ -12832,7 +12970,7 @@ function topLevelSchemas(root) {
 }
 function zodShapesFromFile(file, serviceDir) {
   if (!ZOD_IMPORT_RE.test(file.content)) return [];
-  const tree = parseSource3(parserForExt3(import_node_path58.default.extname(file.path)), file.content);
+  const tree = parseSource3(parserForExt4(import_node_path58.default.extname(file.path)), file.content);
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   for (const { name, call } of topLevelSchemas(tree.rootNode)) {
@@ -19174,12 +19312,46 @@ var SubstringIndex = class {
     this.graph = graph;
   }
 };
+var DEFAULT_SEARCH_INIT_TIMEOUT_MS = 3e4;
+function searchInitTimeoutMs() {
+  const env = process.env.NEAT_SEARCH_INIT_TIMEOUT_MS;
+  if (env !== void 0 && env.length > 0) {
+    const n = Number.parseInt(env, 10);
+    if (Number.isFinite(n) && n >= 0) return n;
+  }
+  return DEFAULT_SEARCH_INIT_TIMEOUT_MS;
+}
+async function resolveEmbedderBounded(factory, timeoutMs) {
+  if (timeoutMs <= 0) return factory();
+  let timer;
+  const TIMED_OUT = /* @__PURE__ */ Symbol("embedder-init-timeout");
+  const timeout = new Promise((resolve) => {
+    timer = setTimeout(() => resolve(TIMED_OUT), timeoutMs);
+    timer.unref?.();
+  });
+  try {
+    const result = await Promise.race([factory(), timeout]);
+    if (result === TIMED_OUT) {
+      console.warn(
+        `semantic_search: embedder init exceeded ${timeoutMs}ms; falling back to substring search. Set NEAT_SEARCH_INIT_TIMEOUT_MS to raise the bound (or 0 to wait indefinitely).`
+      );
+      return null;
+    }
+    return result;
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+}
 async function buildSearchIndex(graph, options = {}) {
   let embedder = null;
   if (options.embedder) {
     embedder = options.embedder;
   } else if (options.forceProvider !== "substring") {
-    embedder = await pickEmbedder();
+    const factory = options.embedderFactory ?? pickEmbedder;
+    embedder = await resolveEmbedderBounded(
+      factory,
+      options.initTimeoutMs ?? searchInitTimeoutMs()
+    );
     if (options.forceProvider === "ollama" && embedder?.provider !== "ollama") {
       embedder = null;
     }
@@ -19802,7 +19974,8 @@ var OTEL_ENDPOINT_RESOLVER_CJS = `;(function () {
       try {
         const __rec = JSON.parse(__neatFs.readFileSync(__neatPath.join(__neatDir, 'neat-out', 'daemon.json'), 'utf8'))
         if (__rec && __rec.ports && typeof __rec.ports.otlp === 'number') {
-          process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT = 'http://localhost:' + __rec.ports.otlp + '/v1/traces'
+          const __neatProj = (typeof __rec.project === 'string' && __rec.project) || '__PROJECT__'
+          process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT = 'http://localhost:' + __rec.ports.otlp + '/projects/' + __neatProj + '/v1/traces'
           break
         }
       } catch (_e) {}
@@ -19811,7 +19984,7 @@ var OTEL_ENDPOINT_RESOLVER_CJS = `;(function () {
       __neatDir = __parent
     }
   } catch (_e) {}
-  process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/v1/traces'
+  process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/projects/__PROJECT__/v1/traces'
 })()`;
 var OTEL_ESM_NODE_IMPORTS = "import { readFileSync as __neatReadFileSync } from 'node:fs'\nimport { join as __neatJoin, dirname as __neatDirname } from 'node:path'";
 var OTEL_ENDPOINT_RESOLVER_ESM = `;(function () {
@@ -19822,7 +19995,8 @@ var OTEL_ENDPOINT_RESOLVER_ESM = `;(function () {
       try {
         const __rec = JSON.parse(__neatReadFileSync(__neatJoin(__neatDir, 'neat-out', 'daemon.json'), 'utf8'))
         if (__rec && __rec.ports && typeof __rec.ports.otlp === 'number') {
-          process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT = 'http://localhost:' + __rec.ports.otlp + '/v1/traces'
+          const __neatProj = (typeof __rec.project === 'string' && __rec.project) || '__PROJECT__'
+          process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT = 'http://localhost:' + __rec.ports.otlp + '/projects/' + __neatProj + '/v1/traces'
           break
         }
       } catch (_e) {}
@@ -19831,7 +20005,7 @@ var OTEL_ENDPOINT_RESOLVER_ESM = `;(function () {
       __neatDir = __parent
     }
   } catch (_e) {}
-  process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/v1/traces'
+  process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/projects/__PROJECT__/v1/traces'
 })()`;
 function neatCaptureSource(ts) {
   const spanT = ts ? ": any" : "";
@@ -20233,14 +20407,15 @@ ${registrations.join("\n")}
 `;
   return template.replace(/__SERVICE_NAME__/g, serviceName).replace(/__PROJECT__/g, projectName).replace(/__INSTRUMENTATION_BLOCK__\n?/g, block);
 }
-function renderEnvNeat(serviceName, _projectName) {
+function renderEnvNeat(serviceName, projectName) {
   return [
     "# Generated by `neat init --apply` (ADR-069).",
     `OTEL_SERVICE_NAME=${serviceName}`,
     "# Advisory only \u2014 the generated otel-init resolves the live endpoint from",
-    "# <project>/neat-out/daemon.json (ports.otlp) at boot (ADR-096). This is the",
-    "# canonical default the daemon takes when its first-choice OTLP port is free.",
-    "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4318/v1/traces",
+    "# <project>/neat-out/daemon.json (ports.otlp + project) at boot (ADR-096).",
+    "# This is the canonical default the daemon takes when its first-choice OTLP",
+    "# port is free; the project scope routes the span without service.name guessing (#879).",
+    `OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4318/projects/${projectName}/v1/traces`,
     "OTEL_EXPORTER_OTLP_PROTOCOL=http/json",
     "# Set NEAT_OTEL_TOKEN to the daemon's OTLP secret to authenticate exported spans (#410).",
     "# NEAT_OTEL_TOKEN=",
@@ -20306,7 +20481,7 @@ var NEXT_INSTRUMENTATION_EDGE_TS = `${NEXT_INSTRUMENTATION_EDGE_HEADER}
 import { registerOTel } from '@vercel/otel'
 
 process.env.OTEL_SERVICE_NAME ||= '__SERVICE_NAME__'
-process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/v1/traces'
+process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/projects/__PROJECT__/v1/traces'
 ${OTEL_OTLP_PROTOCOL_JS}
 ${OTEL_OTLP_HEADERS_JS}