@neat.is/core 0.4.6 → 0.4.8

package/dist/cli.d.cts

@@ -41,6 +41,7 @@ interface ParsedArgs {
 declare function parseArgs(rest: string[]): ParsedArgs;
 
 declare function readPackageVersion(): string;
+declare function printBanner(): void;
 declare function runInit(opts: InitOptions): Promise<InitResult>;
 declare const CLAUDE_SKILL_CONFIG: {
     mcpServers: {
@@ -64,4 +65,4 @@ declare function runSkill(opts: SkillOptions): Promise<{
 declare const QUERY_VERBS: Set<string>;
 declare function runQueryVerb(cmd: string, parsed: ParsedArgs): Promise<number>;
 
-export { CLAUDE_SKILL_CONFIG, type InitOptions, type InitResult, QUERY_VERBS, type SkillOptions, parseArgs, readPackageVersion, runInit, runQueryVerb, runSkill };
+export { CLAUDE_SKILL_CONFIG, type InitOptions, type InitResult, QUERY_VERBS, type SkillOptions, parseArgs, printBanner, readPackageVersion, runInit, runQueryVerb, runSkill };

package/dist/cli.d.ts

@@ -41,6 +41,7 @@ interface ParsedArgs {
 declare function parseArgs(rest: string[]): ParsedArgs;
 
 declare function readPackageVersion(): string;
+declare function printBanner(): void;
 declare function runInit(opts: InitOptions): Promise<InitResult>;
 declare const CLAUDE_SKILL_CONFIG: {
     mcpServers: {
@@ -64,4 +65,4 @@ declare function runSkill(opts: SkillOptions): Promise<{
 declare const QUERY_VERBS: Set<string>;
 declare function runQueryVerb(cmd: string, parsed: ParsedArgs): Promise<number>;
 
-export { CLAUDE_SKILL_CONFIG, type InitOptions, type InitResult, QUERY_VERBS, type SkillOptions, parseArgs, readPackageVersion, runInit, runQueryVerb, runSkill };
+export { CLAUDE_SKILL_CONFIG, type InitOptions, type InitResult, QUERY_VERBS, type SkillOptions, parseArgs, printBanner, readPackageVersion, runInit, runQueryVerb, runSkill };

package/dist/cli.js

@@ -41,14 +41,16 @@ import {
   setStatus,
   startPersistLoop,
   startStalenessLoop
-} from "./chunk-RBWL4HRB.js";
+} from "./chunk-J5CEKCTR.js";
 import {
   startOtelGrpcReceiver
 } from "./chunk-3QCRUEQD.js";
 import {
   __dirname,
   __require,
-  buildOtelReceiver
+  assertBindAuthority,
+  buildOtelReceiver,
+  readAuthEnv
 } from "./chunk-HVF4S7J3.js";
 
 // src/cli.ts
@@ -383,7 +385,9 @@ async function startWatch(graph, opts) {
     project: projectName,
     onPolicyTrigger
   });
-  const host = opts.host ?? "0.0.0.0";
+  const auth = readAuthEnv();
+  const host = opts.host ?? (auth.authToken ? "0.0.0.0" : "127.0.0.1");
+  assertBindAuthority(host, auth.authToken);
   const port = opts.port ?? 8080;
   const otelPort = opts.otelPort ?? 4318;
   const cachePath = opts.embeddingsCachePath ?? path2.join(path2.dirname(opts.outPath), "embeddings.json");
@@ -693,38 +697,123 @@ import path4 from "path";
 
 // src/installers/templates.ts
 var OTEL_INIT_HEADER = "// Generated by `neat init --apply` (ADR-069). OpenTelemetry auto-instrumentation hook.";
+var OTEL_INIT_STAMP = "// neat-template-version: 3 \u2014 file-first call-site capture (ADR-089) + OTLP bearer auth (#410).";
+var OTEL_OTLP_HEADERS_JS = "if (process.env.NEAT_OTEL_TOKEN) process.env.OTEL_EXPORTER_OTLP_HEADERS ||= 'Authorization=Bearer ' + process.env.NEAT_OTEL_TOKEN";
+function neatCallsiteProcessorSource(ts) {
+  const stackT = ts ? ": string" : "";
+  const spanT = ts ? ": any" : "";
+  const strOpt = ts ? ": string | undefined" : "";
+  return `function __neatPickUserFrame(stack${stackT}) {
+  const lines = String(stack || '').split('\\n')
+  for (let i = 0; i < lines.length; i++) {
+    const raw = lines[i].trim()
+    if (raw.indexOf('at ') !== 0) continue
+    if (raw.indexOf('node_modules') !== -1) continue
+    if (raw.indexOf('@opentelemetry') !== -1) continue
+    if (raw.indexOf('node:') !== -1) continue
+    if (raw.indexOf('NeatCallSiteSpanProcessor') !== -1) continue
+    const bodyText = raw.slice(3)
+    const loc = bodyText.match(/:(\\d+):(\\d+)\\)?$/)
+    if (!loc) continue
+    const paren = bodyText.lastIndexOf('(')
+    let filepath${strOpt}
+    let fn${strOpt}
+    if (paren !== -1) {
+      fn = bodyText.slice(0, paren).trim()
+      if (fn.indexOf('async ') === 0) fn = fn.slice(6)
+      if (fn.indexOf('new ') === 0) fn = fn.slice(4)
+      filepath = bodyText.slice(paren + 1, bodyText.length - loc[0].length)
+    } else {
+      filepath = bodyText.slice(0, bodyText.length - loc[0].length)
+    }
+    if (filepath.indexOf('file://') === 0) filepath = filepath.slice(7)
+    if (!filepath) continue
+    return { filepath: filepath, lineno: Number(loc[1]), function: fn || undefined }
+  }
+  return null
+}
+
+class NeatCallSiteSpanProcessor {
+  onStart(span${spanT}) {
+    if (!span || (span.kind !== 2 && span.kind !== 3)) return
+    const frame = __neatPickUserFrame(new Error().stack)
+    if (!frame) return
+    span.setAttribute('code.filepath', frame.filepath)
+    if (typeof frame.lineno === 'number') span.setAttribute('code.lineno', frame.lineno)
+    if (frame.function) span.setAttribute('code.function', frame.function)
+  }
+  onEnd() {}
+  forceFlush() { return Promise.resolve() }
+  shutdown() { return Promise.resolve() }
+}`;
+}
+var CALLSITE_PROCESSOR_JS = neatCallsiteProcessorSource(false);
+var CALLSITE_PROCESSOR_TS = neatCallsiteProcessorSource(true);
+function neatRegisterCallsiteSource(ts) {
+  const providerT = ts ? ": any" : "";
+  return `try {
+  const provider${providerT} = trace.getTracerProvider()
+  const delegate = provider && typeof provider.getDelegate === 'function' ? provider.getDelegate() : provider
+  if (delegate && typeof delegate.addSpanProcessor === 'function') {
+    delegate.addSpanProcessor(new NeatCallSiteSpanProcessor())
+  }
+} catch {
+  // capture is best-effort; span export is unaffected
+}`;
+}
 var OTEL_INIT_CJS = `${OTEL_INIT_HEADER}
+${OTEL_INIT_STAMP}
 process.env.OTEL_SERVICE_NAME ||= '__SERVICE_NAME__'
 process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/projects/__PROJECT__/v1/traces'
+${OTEL_OTLP_HEADERS_JS}
 
 const { NodeSDK } = require('@opentelemetry/sdk-node')
 const { getNodeAutoInstrumentations } = require('@opentelemetry/auto-instrumentations-node')
+const { trace } = require('@opentelemetry/api')
+
+${CALLSITE_PROCESSOR_JS}
 
 const instrumentations = [getNodeAutoInstrumentations()]
 __INSTRUMENTATION_BLOCK__
-new NodeSDK({ instrumentations }).start()
+const sdk = new NodeSDK({ instrumentations })
+sdk.start()
+${neatRegisterCallsiteSource(false)}
 `;
 var OTEL_INIT_ESM = `${OTEL_INIT_HEADER}
+${OTEL_INIT_STAMP}
 process.env.OTEL_SERVICE_NAME ||= '__SERVICE_NAME__'
 process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/projects/__PROJECT__/v1/traces'
+${OTEL_OTLP_HEADERS_JS}
 
 import { NodeSDK } from '@opentelemetry/sdk-node'
 import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node'
+import { trace } from '@opentelemetry/api'
+
+${CALLSITE_PROCESSOR_JS}
 
 const instrumentations = [getNodeAutoInstrumentations()]
 __INSTRUMENTATION_BLOCK__
-new NodeSDK({ instrumentations }).start()
+const sdk = new NodeSDK({ instrumentations })
+sdk.start()
+${neatRegisterCallsiteSource(false)}
 `;
 var OTEL_INIT_TS = `${OTEL_INIT_HEADER}
+${OTEL_INIT_STAMP}
 process.env.OTEL_SERVICE_NAME ||= '__SERVICE_NAME__'
 process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/projects/__PROJECT__/v1/traces'
+${OTEL_OTLP_HEADERS_JS}
 
 import { NodeSDK } from '@opentelemetry/sdk-node'
 import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node'
+import { trace } from '@opentelemetry/api'
+
+${CALLSITE_PROCESSOR_TS}
 
 const instrumentations = [getNodeAutoInstrumentations()]
 __INSTRUMENTATION_BLOCK__
-new NodeSDK({ instrumentations }).start()
+const sdk = new NodeSDK({ instrumentations })
+sdk.start()
+${neatRegisterCallsiteSource(true)}
 `;
 function renderNodeOtelInit(template, serviceName, projectName, registrations = []) {
   const block = registrations.length === 0 ? "" : `
@@ -737,6 +826,8 @@ function renderEnvNeat(serviceName, projectName) {
     "# Generated by `neat init --apply` (ADR-069).",
     `OTEL_SERVICE_NAME=${serviceName}`,
     `OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4318/projects/${projectName}/v1/traces`,
+    "# Set NEAT_OTEL_TOKEN to the daemon's OTLP secret to authenticate exported spans (#410).",
+    "# NEAT_OTEL_TOKEN=",
     ""
   ].join("\n");
 }
@@ -758,6 +849,7 @@ export async function register() {
 var NEXT_INSTRUMENTATION_NODE_TS = `${NEXT_INSTRUMENTATION_HEADER}
 process.env.OTEL_SERVICE_NAME ||= '__SERVICE_NAME__'
 process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/projects/__PROJECT__/v1/traces'
+${OTEL_OTLP_HEADERS_JS}
 
 import { NodeSDK } from '@opentelemetry/sdk-node'
 import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node'
@@ -769,6 +861,7 @@ new NodeSDK({ instrumentations }).start()
 var NEXT_INSTRUMENTATION_NODE_JS = `${NEXT_INSTRUMENTATION_HEADER}
 process.env.OTEL_SERVICE_NAME ||= '__SERVICE_NAME__'
 process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/projects/__PROJECT__/v1/traces'
+${OTEL_OTLP_HEADERS_JS}
 
 const { NodeSDK } = require('@opentelemetry/sdk-node')
 const { getNodeAutoInstrumentations } = require('@opentelemetry/auto-instrumentations-node')
@@ -787,6 +880,7 @@ var FRAMEWORK_OTEL_INIT_HEADER = "// Generated by `neat init --apply` (ADR-074).
 var FRAMEWORK_OTEL_INIT_TS_BODY = `${FRAMEWORK_OTEL_INIT_HEADER}
 process.env.OTEL_SERVICE_NAME ||= '__SERVICE_NAME__'
 process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/projects/__PROJECT__/v1/traces'
+${OTEL_OTLP_HEADERS_JS}
 
 import { NodeSDK } from '@opentelemetry/sdk-node'
 import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node'
@@ -800,6 +894,7 @@ sdk.start()
 var FRAMEWORK_OTEL_INIT_JS_BODY = `${FRAMEWORK_OTEL_INIT_HEADER}
 process.env.OTEL_SERVICE_NAME ||= '__SERVICE_NAME__'
 process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/projects/__PROJECT__/v1/traces'
+${OTEL_OTLP_HEADERS_JS}
 
 const { NodeSDK } = require('@opentelemetry/sdk-node')
 const { getNodeAutoInstrumentations } = require('@opentelemetry/auto-instrumentations-node')
@@ -948,6 +1043,23 @@ async function exists(p) {
     return false;
   }
 }
+async function readFileMaybe(p) {
+  try {
+    return await fs4.readFile(p, "utf8");
+  } catch {
+    return null;
+  }
+}
+async function planOtelInitGeneration(file, contents) {
+  const existing = await readFileMaybe(file);
+  if (existing === null) {
+    return { file, contents, skipIfExists: true };
+  }
+  if (existing.includes(OTEL_INIT_HEADER) && !existing.includes(OTEL_INIT_STAMP)) {
+    return { file, contents, skipIfExists: false };
+  }
+  return null;
+}
 async function detect(serviceDir) {
   const pkg = await readPackageJson(serviceDir);
   return pkg !== null && typeof pkg.name === "string";
@@ -1678,18 +1790,11 @@ async function plan(serviceDir, opts) {
   const projectName = projectToken(pkg, serviceDir, project);
   const registrations = nonBundled.map((i) => i.registration);
   const generatedFiles = [];
-  if (!await exists(otelInitFile)) {
-    generatedFiles.push({
-      file: otelInitFile,
-      contents: renderNodeOtelInit(
-        otelInitContents(flavor),
-        svcName,
-        projectName,
-        registrations
-      ),
-      skipIfExists: true
-    });
-  }
+  const otelInitGen = await planOtelInitGeneration(
+    otelInitFile,
+    renderNodeOtelInit(otelInitContents(flavor), svcName, projectName, registrations)
+  );
+  if (otelInitGen) generatedFiles.push(otelInitGen);
   if (!await exists(envNeatFile)) {
     generatedFiles.push({
       file: envNeatFile,
@@ -3637,7 +3742,7 @@ function printBanner() {
   console.log("\u255A\u2550\u255D  \u255A\u2550\u2550\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u255D   \u255A\u2550\u255D   ");
   console.log("");
   console.log("  Network Expressive Architecting Tool");
-  console.log("  neat.is  \xB7  v0.4.0  \xB7  Apache 2.0");
+  console.log(`  neat.is  \xB7  v${readPackageVersion()}  \xB7  Apache 2.0`);
   console.log("");
 }
 function printDiscoveryReport(opts, services) {
@@ -4281,6 +4386,7 @@ export {
   CLAUDE_SKILL_CONFIG,
   QUERY_VERBS,
   parseArgs,
+  printBanner,
   readPackageVersion,
   runInit,
   runQueryVerb,