@neat.is/core 0.6.1 → 0.6.2-dev.20260723

package/dist/cli.js

@@ -12,7 +12,7 @@ import {
   resolveNeatVersion,
   validateConnectorEntry,
   writeDaemonRecord
-} from "./chunk-3YUNROLT.js";
+} from "./chunk-64JJOXES.js";
 import {
   buildSearchIndex
 } from "./chunk-BIY46Q6U.js";
@@ -71,10 +71,10 @@ import {
   startPersistLoop,
   startStalenessLoop,
   upsertConnectorEntry
-} from "./chunk-7C6ZULNU.js";
+} from "./chunk-ZZ3VUCWL.js";
 import {
   startOtelGrpcReceiver
-} from "./chunk-MVINCLQM.js";
+} from "./chunk-OY7FGJAX.js";
 import {
   __dirname,
   __require,
@@ -82,7 +82,7 @@ import {
   buildOtelReceiver,
   listenSteppingOtlp,
   readAuthEnv
-} from "./chunk-BZ3AJVAC.js";
+} from "./chunk-2MAGU6RB.js";
 
 // src/cli.ts
 import path10 from "path";
@@ -2609,6 +2609,132 @@ var OTEL_ENV2 = {
   key: "OTEL_EXPORTER_OTLP_ENDPOINT",
   value: "http://localhost:4318"
 };
+var NEAT_OTEL_FILENAME = "neat_otel.py";
+var NEAT_OTEL_STAMP = "neat-otel-init v1";
+var NEAT_IMPORT_LINE = "import neat_otel  # neat: call-site file attribution";
+function neatOtelPy() {
+  return `# ${NEAT_OTEL_STAMP} \u2014 generated by NEAT. Safe to re-generate; do not edit.
+# Call-site file attribution (docs/contracts/file-awareness.md section 4). Stamps
+# code.file.path / code.line.number / code.function.name on spans so NEAT fuses
+# runtime spans onto your source files. Import it once at your entry point.
+import os
+import sys
+
+try:
+    from opentelemetry import trace as _neat_trace
+    from opentelemetry.sdk.trace import SpanProcessor as _NeatSpanProcessor
+    from opentelemetry.trace import SpanKind as _NeatSpanKind
+
+    _NEAT_OTEL = True
+except Exception:
+    _NEAT_OTEL = False
+
+if _NEAT_OTEL:
+    _NEAT_SELF = os.path.abspath(__file__)
+    _NEAT_PREFIXES = tuple(
+        os.path.abspath(p) + os.sep
+        for p in {sys.prefix, sys.base_prefix, sys.exec_prefix, sys.base_exec_prefix}
+    )
+    _NEAT_KINDS = {_NeatSpanKind.CLIENT, _NeatSpanKind.PRODUCER, _NeatSpanKind.SERVER}
+
+    def _neat_is_user_frame(filename):
+        if not filename:
+            return False
+        if filename.startswith("<") and filename.endswith(">"):
+            return False
+        abs_name = os.path.abspath(filename)
+        if abs_name == _NEAT_SELF:
+            return False
+        parts = abs_name.split(os.sep)
+        if "opentelemetry" in parts or "site-packages" in parts:
+            return False
+        for pref in _NEAT_PREFIXES:
+            if abs_name.startswith(pref):
+                return False
+        return True
+
+    class NeatCallSiteSpanProcessor(_NeatSpanProcessor):
+        def on_start(self, span, parent_context=None):
+            try:
+                if span.kind not in _NEAT_KINDS:
+                    return
+                frame = sys._getframe(1)
+                while frame is not None:
+                    if _neat_is_user_frame(frame.f_code.co_filename):
+                        span.set_attribute("code.file.path", os.path.abspath(frame.f_code.co_filename))
+                        span.set_attribute("code.line.number", frame.f_lineno)
+                        span.set_attribute("code.function.name", frame.f_code.co_name)
+                        return
+                    frame = frame.f_back
+            except Exception:
+                pass  # never break the host application
+
+        def on_end(self, span):
+            pass
+
+        def shutdown(self):
+            pass
+
+        def force_flush(self, timeout_millis=30000):
+            return True
+
+    def _neat_register():
+        try:
+            provider = _neat_trace.get_tracer_provider()
+            add = getattr(provider, "add_span_processor", None)
+            if callable(add):
+                add(NeatCallSiteSpanProcessor())
+        except Exception:
+            pass
+
+    if os.environ.get("NEAT_CALLSITE_DISABLED", "") != "1":
+        _neat_register()
+`;
+}
+async function writeFileAtomic(file, contents) {
+  const tmp = `${file}.${process.pid}.${Date.now()}.tmp`;
+  await fs5.writeFile(tmp, contents, "utf8");
+  await fs5.rename(tmp, file);
+}
+async function resolvePyEntrypoint(serviceDir) {
+  const procfile = path6.join(serviceDir, "Procfile");
+  if (await exists2(procfile)) {
+    const raw = await fs5.readFile(procfile, "utf8");
+    for (const line of raw.split(/\r?\n/)) {
+      const m = line.match(/^[a-zA-Z0-9_-]+:\s*(.+)$/);
+      if (!m) continue;
+      const cmd = m[1];
+      const asgi = cmd.match(/\b(?:uvicorn|gunicorn|hypercorn|daphne)\s+([\w.]+):/);
+      if (asgi) {
+        const modPath = asgi[1].replace(/\./g, "/");
+        const asFile = path6.join(serviceDir, `${modPath}.py`);
+        if (await exists2(asFile)) return asFile;
+        const asPkg = path6.join(serviceDir, modPath, "__init__.py");
+        if (await exists2(asPkg)) return asPkg;
+      }
+      const runFile = cmd.match(/\b(?:python3?|fastapi\s+(?:run|dev))\s+([\w./-]+\.py)\b/);
+      if (runFile) {
+        const p = path6.join(serviceDir, runFile[1]);
+        if (await exists2(p)) return p;
+      }
+    }
+  }
+  for (const name of ["main.py", "app.py", "asgi.py", "wsgi.py", "manage.py", "server.py"]) {
+    const p = path6.join(serviceDir, name);
+    if (await exists2(p)) return p;
+  }
+  return null;
+}
+function injectNeatImport(source) {
+  if (/^\s*import\s+neat_otel\b/m.test(source)) return null;
+  const lines = source.split("\n");
+  let insertAt = lines[0]?.startsWith("#!") ? 1 : 0;
+  for (let i = 0; i < Math.min(lines.length, 15); i++) {
+    if (/^\s*from\s+__future__\s+import\b/.test(lines[i] ?? "")) insertAt = i + 1;
+  }
+  lines.splice(insertAt, 0, NEAT_IMPORT_LINE);
+  return lines.join("\n");
+}
 async function exists2(p) {
   try {
     await fs5.stat(p);
@@ -2677,7 +2803,9 @@ async function plan2(serviceDir) {
     }
   }
   const entrypointEdits = await planProcfileEdits(serviceDir);
-  if (dependencyEdits.length === 0 && entrypointEdits.length === 0) {
+  const entryFile = await resolvePyEntrypoint(serviceDir);
+  const generatedFiles = entryFile ? [{ file: path6.join(serviceDir, NEAT_OTEL_FILENAME), contents: neatOtelPy() }] : [];
+  if (dependencyEdits.length === 0 && entrypointEdits.length === 0 && !entryFile) {
     return empty;
   }
   return {
@@ -2685,7 +2813,9 @@ async function plan2(serviceDir) {
     serviceDir,
     dependencyEdits,
     entrypointEdits,
-    envEdits: [OTEL_ENV2]
+    envEdits: [OTEL_ENV2],
+    ...generatedFiles.length > 0 ? { generatedFiles } : {},
+    ...entryFile ? { entryFile } : {}
   };
 }
 async function applyRequirementsTxt(manifest, edits, original) {
@@ -2708,11 +2838,13 @@ async function applyProcfile(procfile, edits, original) {
   await fs5.rename(tmp, procfile);
 }
 async function apply2(installPlan) {
-  const { serviceDir } = installPlan;
+  const { serviceDir, entryFile } = installPlan;
+  const generatedFiles = installPlan.generatedFiles ?? [];
   const touched = /* @__PURE__ */ new Set();
   for (const e of installPlan.dependencyEdits) touched.add(e.file);
   for (const e of installPlan.entrypointEdits) touched.add(e.file);
-  if (touched.size === 0) {
+  if (entryFile) touched.add(entryFile);
+  if (touched.size === 0 && generatedFiles.length === 0) {
     return { serviceDir, outcome: "already-instrumented", writtenFiles: [] };
   }
   const originals = /* @__PURE__ */ new Map();
@@ -2723,7 +2855,18 @@ async function apply2(installPlan) {
     }
   }
   const writtenFiles = [];
+  const createdFiles = [];
   try {
+    for (const gf of generatedFiles) {
+      const already = await exists2(gf.file);
+      if (already) {
+        const cur = await fs5.readFile(gf.file, "utf8").catch(() => null);
+        if (cur === gf.contents) continue;
+      }
+      await writeFileAtomic(gf.file, gf.contents);
+      writtenFiles.push(gf.file);
+      if (!already) createdFiles.push(gf.file);
+    }
     for (const file of touched) {
       const raw = originals.get(file);
       if (raw === void 0) {
@@ -2742,15 +2885,22 @@ async function apply2(installPlan) {
           await applyProcfile(file, edits, raw);
           writtenFiles.push(file);
         }
+      } else if (file === entryFile) {
+        const injected = injectNeatImport(raw);
+        if (injected !== null) {
+          await writeFileAtomic(file, injected);
+          writtenFiles.push(file);
+        }
       }
     }
   } catch (err) {
-    await rollback2(installPlan, originals);
+    await rollback2(installPlan, originals, createdFiles);
     throw err;
   }
-  return { serviceDir, outcome: "instrumented", writtenFiles };
+  const outcome = writtenFiles.length > 0 ? "instrumented" : "already-instrumented";
+  return { serviceDir, outcome, writtenFiles };
 }
-async function rollback2(installPlan, originals) {
+async function rollback2(installPlan, originals, createdFiles = []) {
   const restored = [];
   for (const [file, raw] of originals.entries()) {
     try {
@@ -2759,6 +2909,14 @@ async function rollback2(installPlan, originals) {
     } catch {
     }
   }
+  const removed = [];
+  for (const file of createdFiles) {
+    try {
+      await fs5.rm(file, { force: true });
+      removed.push(file);
+    } catch {
+    }
+  }
   const lines = [
     "# neat-rollback.patch",
     "",
@@ -2766,6 +2924,7 @@ async function rollback2(installPlan, originals) {
     "# Files listed below were restored to their pre-apply contents.",
     "",
     ...restored.map((f) => `restored: ${f}`),
+    ...removed.map((f) => `removed: ${f}`),
     ""
   ];
   const rollbackPath = path6.join(installPlan.serviceDir, "neat-rollback.patch");