@neat.is/core 0.4.5 → 0.4.6

package/dist/cli.js

@@ -52,8 +52,8 @@ import {
 } from "./chunk-HVF4S7J3.js";
 
 // src/cli.ts
-import path8 from "path";
-import { promises as fs7, readFileSync } from "fs";
+import path9 from "path";
+import { promises as fs8, readFileSync } from "fs";
 import { fileURLToPath } from "url";
 
 // src/gitignore.ts
@@ -877,13 +877,20 @@ var SDK_PACKAGES = [
   { name: "@opentelemetry/sdk-node", version: "^0.57.0" },
   { name: "@opentelemetry/auto-instrumentations-node", version: "^0.55.0" }
 ];
+function getMajor(versionRange) {
+  if (!versionRange) return 0;
+  const match = versionRange.match(/(\d+)/);
+  return match ? parseInt(match[1], 10) : 0;
+}
 function detectNonBundledInstrumentations(pkg) {
   const deps = allDeps(pkg);
   const out = [];
   if ("@prisma/client" in deps) {
+    const prismaMajor = getMajor(deps["@prisma/client"]);
+    const prismaInstrVersion = prismaMajor >= 6 ? "^6.0.0" : "^5.0.0";
     out.push({
       pkg: "@prisma/instrumentation",
-      version: "^5.0.0",
+      version: prismaInstrVersion,
       registration: "instrumentations.push(new (require('@prisma/instrumentation').PrismaInstrumentation)())"
     });
   }
@@ -2209,19 +2216,99 @@ function renderPatch(sections) {
 }
 
 // src/orchestrator.ts
-import { promises as fs6 } from "fs";
+import { promises as fs7 } from "fs";
 import http from "http";
 import net from "net";
+import path7 from "path";
+import { spawn as spawn3 } from "child_process";
+import readline from "readline";
+
+// src/installers/package-manager.ts
+import { promises as fs6 } from "fs";
 import path6 from "path";
 import { spawn as spawn2 } from "child_process";
-import readline from "readline";
+var LOCKFILE_PRIORITY = [
+  { lockfile: "bun.lockb", pm: "bun", args: ["install", "--no-summary"] },
+  { lockfile: "pnpm-lock.yaml", pm: "pnpm", args: ["install", "--no-summary"] },
+  { lockfile: "yarn.lock", pm: "yarn", args: ["install", "--silent"] },
+  {
+    lockfile: "package-lock.json",
+    pm: "npm",
+    args: ["install", "--no-audit", "--no-fund", "--prefer-offline"]
+  }
+];
+var NPM_FALLBACK_ARGS = ["install", "--no-audit", "--no-fund", "--prefer-offline"];
+async function exists3(p) {
+  try {
+    await fs6.access(p);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function detectPackageManager(serviceDir) {
+  let dir = path6.resolve(serviceDir);
+  const stops = /* @__PURE__ */ new Set();
+  for (let i = 0; i < 64; i++) {
+    if (stops.has(dir)) break;
+    stops.add(dir);
+    for (const candidate of LOCKFILE_PRIORITY) {
+      const lockPath = path6.join(dir, candidate.lockfile);
+      if (await exists3(lockPath)) {
+        return { pm: candidate.pm, cwd: dir, args: [...candidate.args] };
+      }
+    }
+    const parent = path6.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return { pm: "npm", cwd: path6.resolve(serviceDir), args: [...NPM_FALLBACK_ARGS] };
+}
+async function runPackageManagerInstall(cmd) {
+  return new Promise((resolve) => {
+    const child = spawn2(cmd.pm, cmd.args, {
+      cwd: cmd.cwd,
+      // Inherit PATH + HOME so the user's installed managers resolve.
+      env: process.env,
+      // `false` keeps the parent in control of cleanup if the orchestrator
+      // exits before install finishes. Cross-platform-safe.
+      shell: false,
+      stdio: ["ignore", "ignore", "pipe"]
+    });
+    let stderr = "";
+    child.stderr?.on("data", (chunk) => {
+      stderr += chunk.toString("utf8");
+    });
+    child.on("error", (err) => {
+      resolve({
+        pm: cmd.pm,
+        cwd: cmd.cwd,
+        args: cmd.args,
+        exitCode: 127,
+        stderr: stderr + `
+${err.message}`
+      });
+    });
+    child.on("close", (code) => {
+      resolve({
+        pm: cmd.pm,
+        cwd: cmd.cwd,
+        args: cmd.args,
+        exitCode: code ?? 1,
+        stderr: stderr.trim()
+      });
+    });
+  });
+}
+
+// src/orchestrator.ts
 async function extractAndPersist(opts) {
   const services = await discoverServices(opts.scanPath);
   const languages = [...new Set(services.map((s) => s.node.language))].sort();
   const graphKey = opts.projectExplicit ? opts.project : DEFAULT_PROJECT;
   resetGraph(graphKey);
   const graph = getGraph(graphKey);
-  const projectPaths = pathsForProject(graphKey, path6.join(opts.scanPath, "neat-out"));
+  const projectPaths = pathsForProject(graphKey, path7.join(opts.scanPath, "neat-out"));
   const extraction = await extractFromDirectory(graph, opts.scanPath, {
     errorsPath: projectPaths.errorsPath
   });
@@ -2239,12 +2326,15 @@ async function extractAndPersist(opts) {
     errorsPath: projectPaths.errorsPath
   };
 }
-async function applyInstallersOver(services, project) {
+async function applyInstallersOver(services, project, options = {}) {
+  const resolveManager = options.resolveManager ?? detectPackageManager;
+  const runInstall = options.runInstall ?? runPackageManagerInstall;
   let instrumented = 0;
   let already = 0;
   let libOnly = 0;
   let browserBundle = 0;
   let reactNative = 0;
+  const installPlans = /* @__PURE__ */ new Map();
   for (const svc of services) {
     const installer = await pickInstaller(svc.dir);
     if (!installer) continue;
@@ -2254,8 +2344,14 @@ async function applyInstallersOver(services, project) {
       continue;
     }
     const outcome = await installer.apply(plan3);
-    if (outcome.outcome === "instrumented") instrumented++;
-    else if (outcome.outcome === "already-instrumented") already++;
+    if (outcome.outcome === "instrumented") {
+      instrumented++;
+      if (plan3.dependencyEdits.length > 0) {
+        const cmd = await resolveManager(svc.dir);
+        const key = `${cmd.pm}:${cmd.cwd}`;
+        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") {
       browserBundle++;
@@ -2265,7 +2361,30 @@ async function applyInstallersOver(services, project) {
       console.log(`skipping ${svc.dir}: React Native target; browser-OTel support lands in a future release.`);
     }
   }
-  return { instrumented, alreadyInstrumented: already, libOnly, browserBundle, reactNative };
+  const packageManagerInstalls = [];
+  for (const cmd of installPlans.values()) {
+    console.log(`running \`${cmd.pm} ${cmd.args.join(" ")}\` in ${cmd.cwd}`);
+    const result = await runInstall(cmd);
+    packageManagerInstalls.push(result);
+    if (result.exitCode !== 0) {
+      console.error(
+        `neat: ${cmd.pm} install failed in ${cmd.cwd} (exit ${result.exitCode}); run it manually to surface the error.`
+      );
+      if (result.stderr.length > 0) {
+        for (const line of result.stderr.split(/\r?\n/).slice(0, 20)) {
+          console.error(`  ${line}`);
+        }
+      }
+    }
+  }
+  return {
+    instrumented,
+    alreadyInstrumented: already,
+    libOnly,
+    browserBundle,
+    reactNative,
+    packageManagerInstalls
+  };
 }
 async function promptYesNo(question) {
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
@@ -2401,10 +2520,10 @@ function formatPortCollisionMessage(port) {
   ];
 }
 function spawnDaemonDetached() {
-  const here = path6.dirname(new URL(import.meta.url).pathname);
+  const here = path7.dirname(new URL(import.meta.url).pathname);
   const candidates = [
-    path6.join(here, "neatd.cjs"),
-    path6.join(here, "neatd.js")
+    path7.join(here, "neatd.cjs"),
+    path7.join(here, "neatd.js")
   ];
   let entry2 = null;
   const fsSync = __require("fs");
@@ -2424,7 +2543,7 @@ function spawnDaemonDetached() {
   if (!hasToken && (!env.HOST || env.HOST.length === 0)) {
     env.HOST = "127.0.0.1";
   }
-  const child = spawn2(process.execPath, [entry2, "start"], {
+  const child = spawn3(process.execPath, [entry2, "start"], {
     detached: true,
     // stderr inherits the orchestrator's fd so the daemon's
     // `BindAuthorityError` message lands in front of the operator instead
@@ -2441,7 +2560,7 @@ function openBrowser(url) {
   const cmd = platform === "darwin" ? "open" : platform === "win32" ? "cmd" : "xdg-open";
   const args = platform === "win32" ? ["/c", "start", "", url] : [url];
   try {
-    const child = spawn2(cmd, args, { detached: true, stdio: "ignore" });
+    const child = spawn3(cmd, args, { detached: true, stdio: "ignore" });
     child.on("error", () => {
     });
     child.unref();
@@ -2462,7 +2581,7 @@ async function runOrchestrator(opts) {
       browser: "skipped"
     }
   };
-  const stat = await fs6.stat(opts.scanPath).catch(() => null);
+  const stat = await fs7.stat(opts.scanPath).catch(() => null);
   if (!stat || !stat.isDirectory()) {
     console.error(`neat: ${opts.scanPath} is not a directory`);
     result.exitCode = 2;
@@ -2530,6 +2649,10 @@ async function runOrchestrator(opts) {
     console.log(
       `instrumented ${tally.instrumented}, already ${tally.alreadyInstrumented}, lib-only ${tally.libOnly}`
     );
+    const failedInstalls = tally.packageManagerInstalls.filter((i) => i.exitCode !== 0);
+    if (failedInstalls.length > 0) {
+      result.exitCode = 1;
+    }
   }
   const restPort = Number(process.env.PORT ?? 8080);
   const timeoutMs = opts.daemonReadyTimeoutMs ?? DEFAULT_DAEMON_READY_TIMEOUT_MS;
@@ -2600,7 +2723,7 @@ function printSummary(result, graph, dashboardUrl) {
 }
 
 // src/cli-verbs.ts
-import path7 from "path";
+import path8 from "path";
 
 // src/cli-client.ts
 import { Provenance as Provenance2 } from "@neat.is/types";
@@ -2624,10 +2747,10 @@ function createHttpClient(baseUrl, bearerToken) {
   const root = baseUrl.replace(/\/$/, "");
   const authHeader = bearerToken && bearerToken.length > 0 ? { authorization: `Bearer ${bearerToken}` } : {};
   return {
-    async get(path9) {
+    async get(path10) {
       let res;
       try {
-        res = await fetch(`${root}${path9}`, {
+        res = await fetch(`${root}${path10}`, {
           headers: { ...authHeader }
         });
       } catch (err) {
@@ -2639,16 +2762,16 @@ function createHttpClient(baseUrl, bearerToken) {
         const body = await res.text().catch(() => "");
         throw new HttpError(
           res.status,
-          `${res.status} ${res.statusText} on GET ${path9}: ${body}`,
+          `${res.status} ${res.statusText} on GET ${path10}: ${body}`,
           body
         );
       }
       return await res.json();
     },
-    async post(path9, body) {
+    async post(path10, body) {
       let res;
       try {
-        res = await fetch(`${root}${path9}`, {
+        res = await fetch(`${root}${path10}`, {
           method: "POST",
           headers: { "content-type": "application/json", ...authHeader },
           body: JSON.stringify(body)
@@ -2662,7 +2785,7 @@ function createHttpClient(baseUrl, bearerToken) {
         const text = await res.text().catch(() => "");
         throw new HttpError(
           res.status,
-          `${res.status} ${res.statusText} on POST ${path9}: ${text}`,
+          `${res.status} ${res.statusText} on POST ${path10}: ${text}`,
           text
         );
       }
@@ -2676,12 +2799,12 @@ function projectPath(project, suffix) {
 }
 async function runRootCause(client, input) {
   const qs = input.errorId ? `?errorId=${encodeURIComponent(input.errorId)}` : "";
-  const path9 = projectPath(
+  const path10 = projectPath(
     input.project,
     `/graph/root-cause/${encodeURIComponent(input.errorNode)}${qs}`
   );
   try {
-    const result = await client.get(path9);
+    const result = await client.get(path10);
     const arrowPath = result.traversalPath.join(" \u2190 ");
     const provenances = result.edgeProvenances.length ? result.edgeProvenances.join(", ") : "(direct, no edges traversed)";
     const summary = `Root cause for ${input.errorNode} is ${result.rootCauseNode}. ` + result.rootCauseReason + (result.fixRecommendation ? ` Recommended fix: ${result.fixRecommendation}.` : "");
@@ -2707,12 +2830,12 @@ async function runRootCause(client, input) {
 }
 async function runBlastRadius(client, input) {
   const qs = input.depth !== void 0 ? `?depth=${input.depth}` : "";
-  const path9 = projectPath(
+  const path10 = projectPath(
     input.project,
     `/graph/blast-radius/${encodeURIComponent(input.nodeId)}${qs}`
   );
   try {
-    const result = await client.get(path9);
+    const result = await client.get(path10);
     if (result.totalAffected === 0) {
       return {
         summary: `${result.origin} has no downstream dependencies. Nothing else would break if it failed.`
@@ -2746,12 +2869,12 @@ function formatBlastEntry(n) {
 }
 async function runDependencies(client, input) {
   const depth = input.depth ?? 3;
-  const path9 = projectPath(
+  const path10 = projectPath(
     input.project,
     `/graph/dependencies/${encodeURIComponent(input.nodeId)}?depth=${depth}`
   );
   try {
-    const result = await client.get(path9);
+    const result = await client.get(path10);
     if (result.total === 0) {
       return {
         summary: depth === 1 ? `${input.nodeId} has no direct dependencies in the graph.` : `${input.nodeId} has no dependencies (BFS to depth ${depth}).`
@@ -2832,9 +2955,9 @@ function formatDuration(ms) {
   return `${Math.round(h / 24)}d`;
 }
 async function runIncidents(client, input) {
-  const path9 = input.nodeId ? projectPath(input.project, `/incidents/${encodeURIComponent(input.nodeId)}`) : projectPath(input.project, "/incidents");
+  const path10 = input.nodeId ? projectPath(input.project, `/incidents/${encodeURIComponent(input.nodeId)}`) : projectPath(input.project, "/incidents");
   try {
-    const body = await client.get(path9);
+    const body = await client.get(path10);
     const events = body.events;
     if (events.length === 0) {
       return {
@@ -3124,7 +3247,7 @@ async function resolveProjectEntry(opts) {
   const cwd = opts.cwd ?? process.cwd();
   const resolvedCwd = await normalizeProjectPath(cwd);
   for (const entry2 of entries) {
-    if (resolvedCwd === entry2.path || resolvedCwd.startsWith(`${entry2.path}${path7.sep}`)) {
+    if (resolvedCwd === entry2.path || resolvedCwd.startsWith(`${entry2.path}${path8.sep}`)) {
       return entry2;
     }
   }
@@ -3484,10 +3607,10 @@ function assignFlag(out, field, value) {
   out[field] = value;
 }
 function readPackageVersion() {
-  const here = typeof __dirname !== "undefined" ? __dirname : path8.dirname(fileURLToPath(import.meta.url));
+  const here = typeof __dirname !== "undefined" ? __dirname : path9.dirname(fileURLToPath(import.meta.url));
   const candidates = [
-    path8.resolve(here, "../package.json"),
-    path8.resolve(here, "../../package.json")
+    path9.resolve(here, "../package.json"),
+    path9.resolve(here, "../../package.json")
   ];
   for (const candidate of candidates) {
     try {
@@ -3555,7 +3678,7 @@ async function buildPatchSections(services, project) {
 }
 async function runInit(opts) {
   const written = [];
-  const stat = await fs7.stat(opts.scanPath).catch(() => null);
+  const stat = await fs8.stat(opts.scanPath).catch(() => null);
   if (!stat || !stat.isDirectory()) {
     console.error(`neat init: ${opts.scanPath} is not a directory`);
     return { exitCode: 2, writtenFiles: written };
@@ -3564,13 +3687,13 @@ async function runInit(opts) {
   printDiscoveryReport(opts, services);
   const sections = opts.noInstall ? [] : await buildPatchSections(services, opts.project);
   const patch = renderPatch(sections);
-  const patchPath = path8.join(opts.scanPath, "neat.patch");
+  const patchPath = path9.join(opts.scanPath, "neat.patch");
   if (opts.dryRun) {
-    await fs7.writeFile(patchPath, patch, "utf8");
+    await fs8.writeFile(patchPath, patch, "utf8");
     written.push(patchPath);
     console.log(`dry-run: patch written to ${patchPath}`);
-    const gitignorePath = path8.join(opts.scanPath, ".gitignore");
-    const gitignoreExists = await fs7.stat(gitignorePath).then(() => true).catch(() => false);
+    const gitignorePath = path9.join(opts.scanPath, ".gitignore");
+    const gitignoreExists = await fs8.stat(gitignorePath).then(() => true).catch(() => false);
     const verb = gitignoreExists ? "append" : "create";
     console.log(`dry-run: would ${verb} ${gitignorePath} (add neat-out/)`);
     console.log("rerun without --dry-run to register and snapshot.");
@@ -3581,9 +3704,9 @@ async function runInit(opts) {
   const graph = getGraph(graphKey);
   const projectPaths = pathsForProject(
     graphKey,
-    path8.join(opts.scanPath, "neat-out")
+    path9.join(opts.scanPath, "neat-out")
   );
-  const errorsPath = path8.join(path8.dirname(opts.outPath), path8.basename(projectPaths.errorsPath));
+  const errorsPath = path9.join(path9.dirname(opts.outPath), path9.basename(projectPaths.errorsPath));
   const result = await extractFromDirectory(graph, opts.scanPath, { errorsPath });
   await saveGraphToDisk(graph, opts.outPath);
   written.push(opts.outPath);
@@ -3662,7 +3785,7 @@ async function runInit(opts) {
         console.log("Run `npm install` (or your language equivalent) to refresh lockfiles.");
       }
     } else {
-      await fs7.writeFile(patchPath, patch, "utf8");
+      await fs8.writeFile(patchPath, patch, "utf8");
       written.push(patchPath);
     }
   }
@@ -3702,9 +3825,9 @@ var CLAUDE_SKILL_CONFIG = {
 };
 function claudeConfigPath() {
   const override = process.env.NEAT_CLAUDE_CONFIG;
-  if (override && override.length > 0) return path8.resolve(override);
+  if (override && override.length > 0) return path9.resolve(override);
   const home = process.env.HOME ?? process.env.USERPROFILE ?? "";
-  return path8.join(home, ".claude.json");
+  return path9.join(home, ".claude.json");
 }
 async function runSkill(opts) {
   const snippet = JSON.stringify(CLAUDE_SKILL_CONFIG, null, 2) + "\n";
@@ -3716,7 +3839,7 @@ async function runSkill(opts) {
     const target = claudeConfigPath();
     let existing = {};
     try {
-      existing = JSON.parse(await fs7.readFile(target, "utf8"));
+      existing = JSON.parse(await fs8.readFile(target, "utf8"));
     } catch (err) {
       if (err.code !== "ENOENT") {
         console.error(`neat skill: failed to read ${target} \u2014 ${err.message}`);
@@ -3728,8 +3851,8 @@ async function runSkill(opts) {
       ...existing,
       mcpServers: { ...mcp, neat: CLAUDE_SKILL_CONFIG.mcpServers.neat }
     };
-    await fs7.mkdir(path8.dirname(target), { recursive: true });
-    await fs7.writeFile(target, JSON.stringify(merged, null, 2) + "\n", "utf8");
+    await fs8.mkdir(path9.dirname(target), { recursive: true });
+    await fs8.writeFile(target, JSON.stringify(merged, null, 2) + "\n", "utf8");
     console.log(`neat skill: wrote mcpServers.neat to ${target}`);
     console.log("restart Claude Code to pick up the new MCP server.");
     return { exitCode: 0 };
@@ -3767,12 +3890,12 @@ async function main() {
       console.error("neat init: --apply and --dry-run are mutually exclusive");
       process.exit(2);
     }
-    const scanPath = path8.resolve(target);
+    const scanPath = path9.resolve(target);
     const projectExplicit = parsed.project !== null;
-    const projectName = projectExplicit ? project : path8.basename(scanPath);
+    const projectName = projectExplicit ? project : path9.basename(scanPath);
     const projectKey = projectExplicit ? project : DEFAULT_PROJECT;
-    const fallback = pathsForProject(projectKey, path8.join(scanPath, "neat-out")).snapshotPath;
-    const outPath = path8.resolve(process.env.NEAT_OUT_PATH ?? fallback);
+    const fallback = pathsForProject(projectKey, path9.join(scanPath, "neat-out")).snapshotPath;
+    const outPath = path9.resolve(process.env.NEAT_OUT_PATH ?? fallback);
     const result = await runInit({
       scanPath,
       outPath,
@@ -3793,21 +3916,21 @@ async function main() {
       usage();
       process.exit(2);
     }
-    const scanPath = path8.resolve(target);
-    const stat = await fs7.stat(scanPath).catch(() => null);
+    const scanPath = path9.resolve(target);
+    const stat = await fs8.stat(scanPath).catch(() => null);
     if (!stat || !stat.isDirectory()) {
       console.error(`neat watch: ${scanPath} is not a directory`);
       process.exit(2);
     }
-    const projectPaths = pathsForProject(project, path8.join(scanPath, "neat-out"));
-    const outPath = path8.resolve(process.env.NEAT_OUT_PATH ?? projectPaths.snapshotPath);
-    const errorsPath = path8.resolve(
-      process.env.NEAT_ERRORS_PATH ?? path8.join(path8.dirname(outPath), path8.basename(projectPaths.errorsPath))
+    const projectPaths = pathsForProject(project, path9.join(scanPath, "neat-out"));
+    const outPath = path9.resolve(process.env.NEAT_OUT_PATH ?? projectPaths.snapshotPath);
+    const errorsPath = path9.resolve(
+      process.env.NEAT_ERRORS_PATH ?? path9.join(path9.dirname(outPath), path9.basename(projectPaths.errorsPath))
     );
-    const staleEventsPath = path8.resolve(
-      process.env.NEAT_STALE_EVENTS_PATH ?? path8.join(path8.dirname(outPath), path8.basename(projectPaths.staleEventsPath))
+    const staleEventsPath = path9.resolve(
+      process.env.NEAT_STALE_EVENTS_PATH ?? path9.join(path9.dirname(outPath), path9.basename(projectPaths.staleEventsPath))
     );
-    const embeddingsCachePath = process.env.NEAT_EMBEDDINGS_CACHE_PATH ? path8.resolve(process.env.NEAT_EMBEDDINGS_CACHE_PATH) : void 0;
+    const embeddingsCachePath = process.env.NEAT_EMBEDDINGS_CACHE_PATH ? path9.resolve(process.env.NEAT_EMBEDDINGS_CACHE_PATH) : void 0;
     const handle = await startWatch(getGraph(project), {
       scanPath,
       outPath,
@@ -3953,11 +4076,11 @@ async function main() {
   process.exit(1);
 }
 async function tryOrchestrator(cmd, parsed) {
-  const scanPath = path8.resolve(cmd);
-  const stat = await fs7.stat(scanPath).catch(() => null);
+  const scanPath = path9.resolve(cmd);
+  const stat = await fs8.stat(scanPath).catch(() => null);
   if (!stat || !stat.isDirectory()) return null;
   const projectExplicit = parsed.project !== null;
-  const projectName = projectExplicit ? parsed.project : path8.basename(scanPath);
+  const projectName = projectExplicit ? parsed.project : path9.basename(scanPath);
   const result = await runOrchestrator({
     scanPath,
     project: projectName,