@neat.is/core 0.4.4 → 0.4.5

package/dist/cli.js

@@ -41,15 +41,15 @@ import {
   setStatus,
   startPersistLoop,
   startStalenessLoop
-} from "./chunk-G3YGPWJL.js";
+} from "./chunk-RBWL4HRB.js";
 import {
   startOtelGrpcReceiver
-} from "./chunk-YJOA7BBF.js";
+} from "./chunk-3QCRUEQD.js";
 import {
   __dirname,
   __require,
   buildOtelReceiver
-} from "./chunk-ZVNP3ZDH.js";
+} from "./chunk-HVF4S7J3.js";
 
 // src/cli.ts
 import path8 from "path";
@@ -697,22 +697,40 @@ var OTEL_INIT_CJS = `${OTEL_INIT_HEADER}
 process.env.OTEL_SERVICE_NAME ||= '__SERVICE_NAME__'
 process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/projects/__PROJECT__/v1/traces'
 
-require('@opentelemetry/auto-instrumentations-node/register')
+const { NodeSDK } = require('@opentelemetry/sdk-node')
+const { getNodeAutoInstrumentations } = require('@opentelemetry/auto-instrumentations-node')
+
+const instrumentations = [getNodeAutoInstrumentations()]
+__INSTRUMENTATION_BLOCK__
+new NodeSDK({ instrumentations }).start()
 `;
 var OTEL_INIT_ESM = `${OTEL_INIT_HEADER}
 process.env.OTEL_SERVICE_NAME ||= '__SERVICE_NAME__'
 process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/projects/__PROJECT__/v1/traces'
 
-await import('@opentelemetry/auto-instrumentations-node/register')
+import { NodeSDK } from '@opentelemetry/sdk-node'
+import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node'
+
+const instrumentations = [getNodeAutoInstrumentations()]
+__INSTRUMENTATION_BLOCK__
+new NodeSDK({ instrumentations }).start()
 `;
 var OTEL_INIT_TS = `${OTEL_INIT_HEADER}
 process.env.OTEL_SERVICE_NAME ||= '__SERVICE_NAME__'
 process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/projects/__PROJECT__/v1/traces'
 
-await import('@opentelemetry/auto-instrumentations-node/register')
+import { NodeSDK } from '@opentelemetry/sdk-node'
+import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node'
+
+const instrumentations = [getNodeAutoInstrumentations()]
+__INSTRUMENTATION_BLOCK__
+new NodeSDK({ instrumentations }).start()
 `;
-function renderNodeOtelInit(template, serviceName, projectName) {
-  return template.replace(/__SERVICE_NAME__/g, serviceName).replace(/__PROJECT__/g, projectName);
+function renderNodeOtelInit(template, serviceName, projectName, registrations = []) {
+  const block = registrations.length === 0 ? "" : `
+${registrations.join("\n")}
+`;
+  return template.replace(/__SERVICE_NAME__/g, serviceName).replace(/__PROJECT__/g, projectName).replace(/__INSTRUMENTATION_BLOCK__\n?/g, block);
 }
 function renderEnvNeat(serviceName, projectName) {
   return [
@@ -744,7 +762,9 @@ process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/projec
 import { NodeSDK } from '@opentelemetry/sdk-node'
 import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node'
 
-new NodeSDK({ instrumentations: [getNodeAutoInstrumentations()] }).start()
+const instrumentations = [getNodeAutoInstrumentations()]
+__INSTRUMENTATION_BLOCK__
+new NodeSDK({ instrumentations }).start()
 `;
 var NEXT_INSTRUMENTATION_NODE_JS = `${NEXT_INSTRUMENTATION_HEADER}
 process.env.OTEL_SERVICE_NAME ||= '__SERVICE_NAME__'
@@ -753,10 +773,15 @@ process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||= 'http://localhost:4318/projec
 const { NodeSDK } = require('@opentelemetry/sdk-node')
 const { getNodeAutoInstrumentations } = require('@opentelemetry/auto-instrumentations-node')
 
-new NodeSDK({ instrumentations: [getNodeAutoInstrumentations()] }).start()
+const instrumentations = [getNodeAutoInstrumentations()]
+__INSTRUMENTATION_BLOCK__
+new NodeSDK({ instrumentations }).start()
 `;
-function renderNextInstrumentationNode(template, serviceName, projectName) {
-  return template.replace(/__SERVICE_NAME__/g, serviceName).replace(/__PROJECT__/g, projectName);
+function renderNextInstrumentationNode(template, serviceName, projectName, registrations = []) {
+  const block = registrations.length === 0 ? "" : `
+${registrations.join("\n")}
+`;
+  return template.replace(/__SERVICE_NAME__/g, serviceName).replace(/__PROJECT__/g, projectName).replace(/__INSTRUMENTATION_BLOCK__\n?/g, block);
 }
 var FRAMEWORK_OTEL_INIT_HEADER = "// Generated by `neat init --apply` (ADR-074). OpenTelemetry SDK hook.";
 var FRAMEWORK_OTEL_INIT_TS_BODY = `${FRAMEWORK_OTEL_INIT_HEADER}
@@ -852,6 +877,18 @@ var SDK_PACKAGES = [
   { name: "@opentelemetry/sdk-node", version: "^0.57.0" },
   { name: "@opentelemetry/auto-instrumentations-node", version: "^0.55.0" }
 ];
+function detectNonBundledInstrumentations(pkg) {
+  const deps = allDeps(pkg);
+  const out = [];
+  if ("@prisma/client" in deps) {
+    out.push({
+      pkg: "@prisma/instrumentation",
+      version: "^5.0.0",
+      registration: "instrumentations.push(new (require('@prisma/instrumentation').PrismaInstrumentation)())"
+    });
+  }
+  return out;
+}
 var OTEL_ENV = {
   // ADR-069 §4 — endpoint moves into the per-package .env.neat (written
   // by the apply phase). The envEdits surface stays for the dry-run
@@ -1142,8 +1179,19 @@ async function planNext(serviceDir, pkg, manifestPath, nextConfigPath, project)
       version: sdk.version
     });
   }
+  const nonBundled = detectNonBundledInstrumentations(pkg);
+  for (const inst of nonBundled) {
+    if (inst.pkg in existingDeps) continue;
+    dependencyEdits.push({
+      file: manifestPath,
+      kind: "add",
+      name: inst.pkg,
+      version: inst.version
+    });
+  }
   const svcName = serviceNodeName(pkg, serviceDir);
   const projectName = projectToken(pkg, serviceDir, project);
+  const registrations = nonBundled.map((i) => i.registration);
   const generatedFiles = [];
   if (!await exists(instrumentationFile)) {
     generatedFiles.push({
@@ -1158,7 +1206,8 @@ async function planNext(serviceDir, pkg, manifestPath, nextConfigPath, project)
       contents: renderNextInstrumentationNode(
         useTs ? NEXT_INSTRUMENTATION_NODE_TS : NEXT_INSTRUMENTATION_NODE_JS,
         svcName,
-        projectName
+        projectName,
+        registrations
       ),
       skipIfExists: true
     });
@@ -1508,55 +1557,73 @@ async function planAstro(serviceDir, pkg, manifestPath, project) {
     framework: "astro"
   };
 }
-async function plan(serviceDir, opts) {
-  const pkg = await readPackageJson(serviceDir);
-  const manifestPath = path4.join(serviceDir, "package.json");
-  const project = opts?.project;
-  const empty = {
-    language: "javascript",
-    serviceDir,
-    dependencyEdits: [],
-    entrypointEdits: [],
-    envEdits: [],
-    generatedFiles: []
-  };
-  if (!pkg) return empty;
+async function findFrameworkDispatch(serviceDir, pkg, manifestPath, project) {
   if (hasNextDependency(pkg)) {
     const nextConfig = await findNextConfig(serviceDir);
     if (nextConfig) {
-      return planNext(serviceDir, pkg, manifestPath, nextConfig, project);
+      return () => planNext(serviceDir, pkg, manifestPath, nextConfig, project);
     }
   }
   if (hasRemixDependency(pkg)) {
     const remixEntry = await findRemixEntry(serviceDir);
     if (remixEntry) {
-      return planRemix(serviceDir, pkg, manifestPath, remixEntry, project);
+      return () => planRemix(serviceDir, pkg, manifestPath, remixEntry, project);
     }
   }
   if (hasSvelteKitDependency(pkg)) {
     const hooks = await findSvelteKitHooks(serviceDir);
     const config = await findSvelteKitConfig(serviceDir);
     if (hooks || config) {
-      return planSvelteKit(serviceDir, pkg, manifestPath, hooks, project);
+      return () => planSvelteKit(serviceDir, pkg, manifestPath, hooks, project);
     }
   }
   if (hasNuxtDependency(pkg)) {
     const nuxtConfig = await findNuxtConfig(serviceDir);
     if (nuxtConfig) {
-      return planNuxt(serviceDir, pkg, manifestPath, project);
+      return () => planNuxt(serviceDir, pkg, manifestPath, project);
     }
   }
   if (hasAstroDependency(pkg)) {
     const astroConfig = await findAstroConfig(serviceDir);
     if (astroConfig) {
-      return planAstro(serviceDir, pkg, manifestPath, project);
+      return () => planAstro(serviceDir, pkg, manifestPath, project);
+    }
+  }
+  return null;
+}
+async function plan(serviceDir, opts) {
+  const pkg = await readPackageJson(serviceDir);
+  const manifestPath = path4.join(serviceDir, "package.json");
+  const project = opts?.project;
+  const empty = {
+    language: "javascript",
+    serviceDir,
+    dependencyEdits: [],
+    entrypointEdits: [],
+    envEdits: [],
+    generatedFiles: []
+  };
+  if (!pkg) return empty;
+  const frameworkDispatch = await findFrameworkDispatch(
+    serviceDir,
+    pkg,
+    manifestPath,
+    project
+  );
+  let entryFile = null;
+  if (!frameworkDispatch) {
+    entryFile = await resolveEntry(serviceDir, pkg);
+    if (!entryFile) {
+      return { ...empty, libOnly: true };
     }
   }
+  if (frameworkDispatch) {
+    return frameworkDispatch();
+  }
   const runtimeKind = await detectRuntimeKind(serviceDir, pkg);
   if (runtimeKind !== "node") {
     return { ...empty, runtimeKind };
   }
-  const entryFile = await resolveEntry(serviceDir, pkg);
   if (!entryFile) {
     return { ...empty, libOnly: true };
   }
@@ -1574,6 +1641,16 @@ async function plan(serviceDir, opts) {
       version: sdk.version
     });
   }
+  const nonBundled = detectNonBundledInstrumentations(pkg);
+  for (const inst of nonBundled) {
+    if (inst.pkg in existingDeps) continue;
+    dependencyEdits.push({
+      file: manifestPath,
+      kind: "add",
+      name: inst.pkg,
+      version: inst.version
+    });
+  }
   const entrypointEdits = [];
   try {
     const raw = await fs4.readFile(entryFile, "utf8");
@@ -1592,11 +1669,17 @@ async function plan(serviceDir, opts) {
   }
   const svcName = serviceNodeName(pkg, serviceDir);
   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),
+      contents: renderNodeOtelInit(
+        otelInitContents(flavor),
+        svcName,
+        projectName,
+        registrations
+      ),
       skipIfExists: true
     });
   }
@@ -2128,6 +2211,7 @@ function renderPatch(sections) {
 // src/orchestrator.ts
 import { promises as fs6 } from "fs";
 import http from "http";
+import net from "net";
 import path6 from "path";
 import { spawn as spawn2 } from "child_process";
 import readline from "readline";
@@ -2294,6 +2378,28 @@ async function waitForDaemonReady(restPort, timeoutMs) {
     stillBootstrapping: projects.filter((p) => p.status === "bootstrapping").map((p) => p.name)
   };
 }
+var NEAT_PORTS = [8080, 4318, 6328];
+async function isPortFree(port) {
+  return new Promise((resolve) => {
+    const server = net.createServer();
+    server.once("error", () => resolve(false));
+    server.once("listening", () => server.close(() => resolve(true)));
+    server.listen(port, "127.0.0.1");
+  });
+}
+async function probePortsFree() {
+  for (const port of NEAT_PORTS) {
+    if (!await isPortFree(port)) return { free: false, held: port };
+  }
+  return { free: true };
+}
+function formatPortCollisionMessage(port) {
+  return [
+    `neat: port ${port} is in use; the NEAT daemon needs it.`,
+    `      run \`neatd stop\` to release the previous daemon, or`,
+    `      \`lsof -i :${port}\` to find the holding process.`
+  ];
+}
 function spawnDaemonDetached() {
   const here = path6.dirname(new URL(import.meta.url).pathname);
   const candidates = [
@@ -2430,6 +2536,14 @@ async function runOrchestrator(opts) {
   if (await checkDaemonHealth(restPort)) {
     result.steps.daemon = "already-running";
   } else {
+    const probe = await probePortsFree();
+    if (!probe.free) {
+      for (const line of formatPortCollisionMessage(probe.held)) {
+        console.error(line);
+      }
+      result.exitCode = 3;
+      return result;
+    }
     try {
       spawnDaemonDetached();
     } catch (err) {
@@ -3235,7 +3349,8 @@ function usage() {
   console.log("  0  success");
   console.log("  1  server error (4xx/5xx body printed to stderr)");
   console.log("  2  misuse (missing args, bad flags) \u2014 handled before any network call");
-  console.log("  3  daemon not reachable (connection refused / timeout)");
+  console.log("  3  environmental \u2014 daemon unreachable, or one of ports 8080 / 4318 / 6328");
+  console.log("     is held by another process when `neat <path>` tries to spawn the daemon");
   console.log("");
   console.log("environment:");
   console.log("  NEAT_API_URL    base URL for the core REST API (default http://localhost:8080)");