@neat.is/core 0.4.20-dev.20260620 → 0.4.20-dev.20260622

package/dist/cli.cjs

@@ -1958,13 +1958,14 @@ var parentSpanCache = /* @__PURE__ */ new Map();
 function parentSpanKey(traceId, spanId) {
   return `${traceId}:${spanId}`;
 }
-function cacheSpanService(span, now) {
+function cacheSpanService(span, now, callSite) {
   if (!span.traceId || !span.spanId) return;
   const key = parentSpanKey(span.traceId, span.spanId);
   parentSpanCache.delete(key);
   parentSpanCache.set(key, {
     service: span.service,
     env: span.env ?? "unknown",
+    ...callSite ? { callSite } : {},
     expiresAt: now + PARENT_SPAN_CACHE_TTL_MS
   });
   while (parentSpanCache.size > PARENT_SPAN_CACHE_SIZE) {
@@ -1980,7 +1981,11 @@ function lookupParentSpan(traceId, parentSpanId, now) {
     parentSpanCache.delete(parentSpanKey(traceId, parentSpanId));
     return null;
   }
-  return { service: entry2.service, env: entry2.env };
+  return {
+    service: entry2.service,
+    env: entry2.env,
+    ...entry2.callSite ? { callSite: entry2.callSite } : {}
+  };
 }
 function resolveServiceId(graph, host, env) {
   const envTagged = (0, import_types3.serviceId)(host, env);
@@ -2253,9 +2258,9 @@ async function handleSpan(ctx, span) {
   }
   const sourceId = ensureServiceNode(ctx.graph, span.service, env);
   const isError = span.statusCode === 2;
-  cacheSpanService(span, nowMs);
   const sourceServiceNode = ctx.graph.getNodeAttributes(sourceId);
   const callSite = callSiteFromSpan(span, sourceServiceNode, ctx.scanPath);
+  cacheSpanService(span, nowMs, callSite);
   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;
@@ -2312,13 +2317,19 @@ async function handleSpan(ctx, span) {
       const parent = lookupParentSpan(span.traceId, span.parentSpanId, nowMs);
       if (parent && parent.service !== span.service) {
         const parentId = ensureServiceNode(ctx.graph, parent.service, parent.env);
+        const fallbackSource = parent.callSite ? ensureObservedFileNode(ctx.graph, parent.service, parentId, parent.callSite) : parentId;
+        const fallbackEvidence = parent.callSite ? {
+          file: parent.callSite.relPath,
+          ...parent.callSite.line !== void 0 ? { line: parent.callSite.line } : {}
+        } : void 0;
         upsertObservedEdge(
           ctx.graph,
           import_types3.EdgeType.CALLS,
-          parentId,
+          fallbackSource,
           sourceId,
           ts,
-          isError
+          isError,
+          fallbackEvidence
         );
       }
     }
@@ -2920,6 +2931,9 @@ function workspaceGlobs(pkg) {
   if (Array.isArray(ws.packages)) return ws.packages.length > 0 ? ws.packages : null;
   return null;
 }
+async function hasPythonManifest(dir) {
+  return await exists(import_node_path9.default.join(dir, "pyproject.toml")) || await exists(import_node_path9.default.join(dir, "requirements.txt")) || await exists(import_node_path9.default.join(dir, "setup.py"));
+}
 async function loadGitignore(scanPath) {
   const gitignorePath = import_node_path9.default.join(scanPath, ".gitignore");
   if (!await exists(gitignorePath)) return null;
@@ -2986,6 +3000,13 @@ function detectJsFramework(pkg) {
   if (deps["astro"] !== void 0) return "astro";
   return void 0;
 }
+async function detectJsServiceLanguage(dir, pkg) {
+  const deps = { ...pkg.dependencies ?? {}, ...pkg.devDependencies ?? {} };
+  if (deps["typescript"] !== void 0) return "typescript";
+  const entries = await import_node_fs9.promises.readdir(dir).catch(() => []);
+  if (entries.some((name) => /^tsconfig(\..+)?\.json$/.test(name))) return "typescript";
+  return "javascript";
+}
 async function discoverNodeService(scanPath, dir) {
   const pkgPath = import_node_path9.default.join(dir, "package.json");
   if (!await exists(pkgPath)) return null;
@@ -2998,11 +3019,12 @@ async function discoverNodeService(scanPath, dir) {
   }
   if (!pkg.name) return null;
   const framework = detectJsFramework(pkg);
+  const language = await detectJsServiceLanguage(dir, pkg);
   const node = {
     id: (0, import_types5.serviceId)(pkg.name),
     type: import_types5.NodeType.ServiceNode,
     name: pkg.name,
-    language: "javascript",
+    language,
     version: pkg.version,
     dependencies: pkg.dependencies ?? {},
     repoPath: import_node_path9.default.relative(scanPath, dir),
@@ -3045,7 +3067,11 @@ async function discoverServices(scanPath) {
   if (wsGlobs) {
     candidateDirs.push(...await expandWorkspaceGlobs(scanPath, wsGlobs));
   } else {
-    if (rootPkg && rootPkg.name) candidateDirs.push(scanPath);
+    if (rootPkg && rootPkg.name) {
+      candidateDirs.push(scanPath);
+    } else if (await hasPythonManifest(scanPath)) {
+      candidateDirs.push(scanPath);
+    }
     const ig = await loadGitignore(scanPath);
     await walkDirs(
       scanPath,
@@ -3054,7 +3080,7 @@ async function discoverServices(scanPath) {
       async (dir) => {
         if (await exists(import_node_path9.default.join(dir, "package.json"))) {
           candidateDirs.push(dir);
-        } else if (await exists(import_node_path9.default.join(dir, "pyproject.toml")) || await exists(import_node_path9.default.join(dir, "requirements.txt")) || await exists(import_node_path9.default.join(dir, "setup.py"))) {
+        } else if (await hasPythonManifest(dir)) {
           candidateDirs.push(dir);
         }
       }
@@ -8686,6 +8712,7 @@ export const onRequest = defineMiddleware(async (context, next) => {
 `;
 
 // src/installers/javascript.ts
+var import_instrumentation_registry2 = require("@neat.is/instrumentation-registry");
 var SDK_PACKAGES = [
   { name: "@opentelemetry/api", version: "^1.9.0" },
   { name: "@opentelemetry/sdk-node", version: "^0.57.0" },
@@ -8810,6 +8837,34 @@ function hasNextDependency(pkg) {
 function allDeps(pkg) {
   return { ...pkg.dependencies ?? {}, ...pkg.devDependencies ?? {} };
 }
+var WEB_FRAMEWORK_DEPS = [
+  "express",
+  "fastify",
+  "koa",
+  "@hapi/hapi",
+  "hapi",
+  "restify",
+  "connect",
+  "@nestjs/core",
+  "next",
+  "hono",
+  "elysia",
+  "polka",
+  "micro"
+];
+function looksLikeWebApp(pkg) {
+  const deps = allDeps(pkg);
+  return WEB_FRAMEWORK_DEPS.some((name) => name in deps);
+}
+function uninstrumentedLibraries(pkg) {
+  const deps = allDeps(pkg);
+  const out = [];
+  for (const [name, version] of Object.entries(deps)) {
+    const entry2 = (0, import_instrumentation_registry2.resolve)(name, version);
+    if (entry2 && entry2.coverage === "gap") out.push(name);
+  }
+  return out;
+}
 var REMIX_ENTRY_CANDIDATES = [
   "app/entry.server.ts",
   "app/entry.server.tsx",
@@ -8889,6 +8944,9 @@ var SRC_INDEX_CANDIDATES = INDEX_EXTENSIONS.map((ext) => `src/index${ext}`);
 var SRC_NAMED_CANDIDATES = ["server", "main", "app"].flatMap(
   (name) => INDEX_EXTENSIONS.map((ext) => `src/${name}${ext}`)
 );
+var ROOT_NAMED_CANDIDATES = ["server", "app", "main"].flatMap(
+  (name) => INDEX_EXTENSIONS.map((ext) => `${name}${ext}`)
+);
 var SCRIPT_LAUNCHERS = /* @__PURE__ */ new Set([
   "node",
   "ts-node",
@@ -8963,6 +9021,10 @@ async function resolveEntry(serviceDir, pkg) {
     const candidate = import_node_path46.default.join(serviceDir, rel);
     if (await exists3(candidate)) return candidate;
   }
+  for (const rel of ROOT_NAMED_CANDIDATES) {
+    const candidate = import_node_path46.default.join(serviceDir, rel);
+    if (await exists3(candidate)) return candidate;
+  }
   for (const name of INDEX_CANDIDATES) {
     const candidate = import_node_path46.default.join(serviceDir, name);
     if (await exists3(candidate)) return candidate;
@@ -10172,8 +10234,17 @@ async function applyInstallersOver(services, project, options = {}) {
         if (!installPlans.has(key)) installPlans.set(key, cmd);
       }
     } else if (outcome.outcome === "already-instrumented") already++;
-    else if (outcome.outcome === "lib-only") libOnly++;
-    else if (outcome.outcome === "browser-bundle") {
+    else if (outcome.outcome === "lib-only") {
+      libOnly++;
+      if (svc.pkg && looksLikeWebApp(svc.pkg)) {
+        const svcName = import_node_path50.default.basename(svc.dir);
+        console.warn(
+          `neat: runtime layer won't engage for ${svcName}: no entry point found.
+  ${svc.dir} depends on a web framework but neat couldn't resolve an entry to instrument.
+  Add a "start" script to package.json, or point neat at the entry file directly.`
+        );
+      }
+    } else if (outcome.outcome === "browser-bundle") {
       browserBundle++;
       console.log(`skipping ${svc.dir}: browser bundle; browser-OTel support lands in a future release.`);
     } else if (outcome.outcome === "react-native") {
@@ -10232,6 +10303,19 @@ async function applyInstallersOver(services, project, options = {}) {
   See docs/installer-scope.md \u2192 "Manual setup for out-of-scope runtimes"`
       );
     }
+    if (svc.pkg && (outcome.outcome === "instrumented" || outcome.outcome === "already-instrumented")) {
+      const gaps = uninstrumentedLibraries(svc.pkg);
+      if (gaps.length > 0) {
+        const svcName = import_node_path50.default.basename(svc.dir);
+        const list = gaps.join(", ");
+        const verb = gaps.length === 1 ? "this library" : "these libraries";
+        console.warn(
+          `neat: calls to ${list} won't be observed by default in ${svcName}.
+  ${verb} aren't in the default instrumentation set, so they produce no OBSERVED edges.
+  Run \`neat list-uninstrumented\` to review them, then \`neat extend\` to capture them.`
+        );
+      }
+    }
   }
   const packageManagerInstalls = [];
   for (const cmd of installPlans.values()) {
@@ -11256,7 +11340,10 @@ async function checkDaemonHealth(baseUrl) {
 }
 function snapshotForGraph(persisted) {
   return {
-    schemaVersion: 3,
+    // Stamp the live schema version the daemon validates against on the
+    // receiving `/snapshot` merge. Tracking the constant keeps the push
+    // aligned with the current snapshot shape across schema migrations.
+    schemaVersion: SCHEMA_VERSION,
     exportedAt: (/* @__PURE__ */ new Date()).toISOString(),
     graph: persisted.graph.export()
   };