@neat.is/core 0.4.11 → 0.4.12

package/dist/cli.js

@@ -17,6 +17,7 @@ import {
   attachGraphToEventBus,
   buildApi,
   computeDivergences,
+  detectPackageManager,
   discoverServices,
   emitNeatEvent,
   ensureCompatLoaded,
@@ -37,11 +38,12 @@ import {
   removeProject,
   resetGraph,
   retireEdgesByFile,
+  runPackageManagerInstall,
   saveGraphToDisk,
   setStatus,
   startPersistLoop,
   startStalenessLoop
-} from "./chunk-OJHI33LD.js";
+} from "./chunk-WDG4QEFO.js";
 import {
   startOtelGrpcReceiver
 } from "./chunk-3QCRUEQD.js";
@@ -54,8 +56,8 @@ import {
 } from "./chunk-HVF4S7J3.js";
 
 // src/cli.ts
-import path9 from "path";
-import { promises as fs8, readFileSync } from "fs";
+import path8 from "path";
+import { promises as fs7, readFileSync } from "fs";
 import { fileURLToPath } from "url";
 
 // src/gitignore.ts
@@ -696,6 +698,7 @@ ${contents}EOF
 // src/installers/javascript.ts
 import { promises as fs4 } from "fs";
 import path4 from "path";
+import semver from "semver";
 
 // src/installers/templates.ts
 var OTEL_INIT_HEADER = "// Generated by `neat init --apply` (ADR-069). OpenTelemetry auto-instrumentation hook.";
@@ -1255,6 +1258,13 @@ async function detectRuntimeKind(pkgRoot, pkg) {
   if (await exists(path4.join(pkgRoot, "vite.config.js")) || await exists(path4.join(pkgRoot, "vite.config.ts")) || await exists(path4.join(pkgRoot, "vite.config.mjs")) || "vite" in deps) {
     return "browser-bundle";
   }
+  if (await exists(path4.join(pkgRoot, "wrangler.toml"))) return "cloudflare-workers";
+  if (await exists(path4.join(pkgRoot, "bun.lockb"))) return "bun";
+  if (await exists(path4.join(pkgRoot, "deno.json")) || await exists(path4.join(pkgRoot, "deno.lock"))) {
+    return "deno";
+  }
+  const engines = pkg.engines ?? {};
+  if ("electron" in engines) return "electron";
   return "node";
 }
 async function readPackageJson(serviceDir) {
@@ -1294,6 +1304,12 @@ async function detect(serviceDir) {
   const pkg = await readPackageJson(serviceDir);
   return pkg !== null && typeof pkg.name === "string";
 }
+function needsVersionUpgrade(installed, expected) {
+  return !semver.satisfies(
+    semver.minVersion(installed)?.version ?? installed,
+    expected
+  ) && !semver.intersects(installed, expected);
+}
 var NEXT_CONFIG_CANDIDATES = ["next.config.js", "next.config.ts", "next.config.mjs"];
 async function findNextConfig(serviceDir) {
   for (const name of NEXT_CONFIG_CANDIDATES) {
@@ -1520,23 +1536,23 @@ async function planNext(serviceDir, pkg, manifestPath, nextConfigPath, project)
   const existingDeps = { ...pkg.dependencies ?? {}, ...pkg.devDependencies ?? {} };
   const dependencyEdits = [];
   for (const sdk of SDK_PACKAGES) {
-    if (sdk.name in existingDeps) continue;
-    dependencyEdits.push({
-      file: manifestPath,
-      kind: "add",
-      name: sdk.name,
-      version: sdk.version
-    });
+    if (sdk.name in existingDeps) {
+      if (needsVersionUpgrade(existingDeps[sdk.name], sdk.version)) {
+        dependencyEdits.push({ file: manifestPath, kind: "upgrade", name: sdk.name, version: sdk.version, fromVersion: existingDeps[sdk.name] });
+      }
+      continue;
+    }
+    dependencyEdits.push({ file: manifestPath, kind: "add", name: sdk.name, 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
-    });
+    if (inst.pkg in existingDeps) {
+      if (needsVersionUpgrade(existingDeps[inst.pkg], inst.version)) {
+        dependencyEdits.push({ file: manifestPath, kind: "upgrade", name: inst.pkg, version: inst.version, fromVersion: existingDeps[inst.pkg] });
+      }
+      continue;
+    }
+    dependencyEdits.push({ file: manifestPath, kind: "add", name: inst.pkg, version: inst.version });
   }
   const svcName = serviceNodeName(pkg, serviceDir);
   const projectName = projectToken(pkg, serviceDir, project);
@@ -1982,23 +1998,23 @@ async function plan(serviceDir, opts) {
   const existingDeps = { ...pkg.dependencies ?? {}, ...pkg.devDependencies ?? {} };
   const dependencyEdits = [];
   for (const sdk of SDK_PACKAGES) {
-    if (sdk.name in existingDeps) continue;
-    dependencyEdits.push({
-      file: manifestPath,
-      kind: "add",
-      name: sdk.name,
-      version: sdk.version
-    });
+    if (sdk.name in existingDeps) {
+      if (needsVersionUpgrade(existingDeps[sdk.name], sdk.version)) {
+        dependencyEdits.push({ file: manifestPath, kind: "upgrade", name: sdk.name, version: sdk.version, fromVersion: existingDeps[sdk.name] });
+      }
+      continue;
+    }
+    dependencyEdits.push({ file: manifestPath, kind: "add", name: sdk.name, 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
-    });
+    if (inst.pkg in existingDeps) {
+      if (needsVersionUpgrade(existingDeps[inst.pkg], inst.version)) {
+        dependencyEdits.push({ file: manifestPath, kind: "upgrade", name: inst.pkg, version: inst.version, fromVersion: existingDeps[inst.pkg] });
+      }
+      continue;
+    }
+    dependencyEdits.push({ file: manifestPath, kind: "add", name: inst.pkg, version: inst.version });
   }
   const entrypointEdits = [];
   try {
@@ -2101,6 +2117,28 @@ async function apply(installPlan) {
       writtenFiles: []
     };
   }
+  if (installPlan.runtimeKind === "bun") {
+    return { serviceDir, outcome: "bun", reason: "Bun runtime; use BYO-OTel", writtenFiles: [] };
+  }
+  if (installPlan.runtimeKind === "deno") {
+    return { serviceDir, outcome: "deno", reason: "Deno runtime; use BYO-OTel", writtenFiles: [] };
+  }
+  if (installPlan.runtimeKind === "cloudflare-workers") {
+    return {
+      serviceDir,
+      outcome: "cloudflare-workers",
+      reason: "Cloudflare Workers runtime; use BYO-OTel",
+      writtenFiles: []
+    };
+  }
+  if (installPlan.runtimeKind === "electron") {
+    return {
+      serviceDir,
+      outcome: "electron",
+      reason: "Electron; use BYO-OTel",
+      writtenFiles: []
+    };
+  }
   if (installPlan.dependencyEdits.length === 0 && installPlan.entrypointEdits.length === 0 && (installPlan.generatedFiles?.length ?? 0) === 0 && installPlan.nextConfigEdit === void 0) {
     return {
       serviceDir,
@@ -2151,6 +2189,8 @@ async function apply(installPlan) {
           if (!(dep.name in (pkg.dependencies ?? {}))) {
             pkg.dependencies[dep.name] = dep.version;
           }
+        } else if (dep.kind === "upgrade") {
+          pkg.dependencies[dep.name] = dep.version;
         } else {
           delete pkg.dependencies[dep.name];
         }
@@ -2551,99 +2591,19 @@ function renderPatch(sections) {
 }
 
 // src/orchestrator.ts
-import { promises as fs7 } from "fs";
+import { promises as fs6 } 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";
-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
+import readline from "readline";
 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, path7.join(opts.scanPath, "neat-out"));
+  const projectPaths = pathsForProject(graphKey, path6.join(opts.scanPath, "neat-out"));
   const extraction = await extractFromDirectory(graph, opts.scanPath, {
     errorsPath: projectPaths.errorsPath
   });
@@ -2669,6 +2629,10 @@ async function applyInstallersOver(services, project, options = {}) {
   let libOnly = 0;
   let browserBundle = 0;
   let reactNative = 0;
+  let bun = 0;
+  let deno = 0;
+  let cloudflareWorkers = 0;
+  let electron = 0;
   const installPlans = /* @__PURE__ */ new Map();
   for (const svc of services) {
     const installer = await pickInstaller(svc.dir);
@@ -2693,7 +2657,59 @@ async function applyInstallersOver(services, project, options = {}) {
       console.log(`skipping ${svc.dir}: browser bundle; browser-OTel support lands in a future release.`);
     } else if (outcome.outcome === "react-native") {
       reactNative++;
-      console.log(`skipping ${svc.dir}: React Native target; browser-OTel support lands in a future release.`);
+      const svcName = path6.basename(svc.dir);
+      console.log(
+        `neat: ${svc.dir} detected as React Native / Expo
+  The installer doesn't cover this runtime deterministically.
+  Configure your OTel binding to send spans to:
+    http://localhost:4318/projects/${project}/v1/traces
+  Set OTEL_SERVICE_NAME=${svcName}
+  See docs/installer-scope.md \u2192 "Manual setup for out-of-scope runtimes"`
+      );
+    } else if (outcome.outcome === "bun") {
+      bun++;
+      const svcName = path6.basename(svc.dir);
+      console.log(
+        `neat: ${svc.dir} detected as Bun
+  The installer doesn't cover this runtime deterministically.
+  Configure your OTel binding to send spans to:
+    http://localhost:4318/projects/${project}/v1/traces
+  Set OTEL_SERVICE_NAME=${svcName}
+  See docs/installer-scope.md \u2192 "Manual setup for out-of-scope runtimes"`
+      );
+    } else if (outcome.outcome === "deno") {
+      deno++;
+      const svcName = path6.basename(svc.dir);
+      console.log(
+        `neat: ${svc.dir} detected as Deno
+  The installer doesn't cover this runtime deterministically.
+  Configure your OTel binding to send spans to:
+    http://localhost:4318/projects/${project}/v1/traces
+  Set OTEL_SERVICE_NAME=${svcName}
+  See docs/installer-scope.md \u2192 "Manual setup for out-of-scope runtimes"`
+      );
+    } else if (outcome.outcome === "cloudflare-workers") {
+      cloudflareWorkers++;
+      const svcName = path6.basename(svc.dir);
+      console.log(
+        `neat: ${svc.dir} detected as Cloudflare Workers
+  The installer doesn't cover this runtime deterministically.
+  Configure your OTel binding to send spans to:
+    http://localhost:4318/projects/${project}/v1/traces
+  Set OTEL_SERVICE_NAME=${svcName}
+  See docs/installer-scope.md \u2192 "Manual setup for out-of-scope runtimes"`
+      );
+    } else if (outcome.outcome === "electron") {
+      electron++;
+      const svcName = path6.basename(svc.dir);
+      console.log(
+        `neat: ${svc.dir} detected as Electron
+  The installer doesn't cover this runtime deterministically.
+  Configure your OTel binding to send spans to:
+    http://localhost:4318/projects/${project}/v1/traces
+  Set OTEL_SERVICE_NAME=${svcName}
+  See docs/installer-scope.md \u2192 "Manual setup for out-of-scope runtimes"`
+      );
     }
   }
   const packageManagerInstalls = [];
@@ -2718,6 +2734,10 @@ async function applyInstallersOver(services, project, options = {}) {
     libOnly,
     browserBundle,
     reactNative,
+    bun,
+    deno,
+    cloudflareWorkers,
+    electron,
     packageManagerInstalls
   };
 }
@@ -2855,10 +2875,10 @@ function formatPortCollisionMessage(port) {
   ];
 }
 function spawnDaemonDetached() {
-  const here = path7.dirname(new URL(import.meta.url).pathname);
+  const here = path6.dirname(new URL(import.meta.url).pathname);
   const candidates = [
-    path7.join(here, "neatd.cjs"),
-    path7.join(here, "neatd.js")
+    path6.join(here, "neatd.cjs"),
+    path6.join(here, "neatd.js")
   ];
   let entry2 = null;
   const fsSync = __require("fs");
@@ -2878,7 +2898,7 @@ function spawnDaemonDetached() {
   if (!hasToken && (!env.HOST || env.HOST.length === 0)) {
     env.HOST = "127.0.0.1";
   }
-  const child = spawn3(process.execPath, [entry2, "start"], {
+  const child = spawn2(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
@@ -2895,7 +2915,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 = spawn3(cmd, args, { detached: true, stdio: "ignore" });
+    const child = spawn2(cmd, args, { detached: true, stdio: "ignore" });
     child.on("error", () => {
     });
     child.unref();
@@ -2916,7 +2936,7 @@ async function runOrchestrator(opts) {
       browser: "skipped"
     }
   };
-  const stat = await fs7.stat(opts.scanPath).catch(() => null);
+  const stat = await fs6.stat(opts.scanPath).catch(() => null);
   if (!stat || !stat.isDirectory()) {
     console.error(`neat: ${opts.scanPath} is not a directory`);
     result.exitCode = 2;
@@ -3058,7 +3078,7 @@ function printSummary(result, graph, dashboardUrl) {
 }
 
 // src/cli-verbs.ts
-import path8 from "path";
+import path7 from "path";
 
 // src/cli-client.ts
 import { Provenance as Provenance2 } from "@neat.is/types";
@@ -3086,10 +3106,10 @@ function createHttpClient(baseUrl, bearerToken) {
   const root = baseUrl.replace(/\/$/, "");
   const authHeader = bearerToken && bearerToken.length > 0 ? { authorization: `Bearer ${bearerToken}` } : {};
   return {
-    async get(path10) {
+    async get(path9) {
       let res;
       try {
-        res = await fetch(`${root}${path10}`, {
+        res = await fetch(`${root}${path9}`, {
           headers: { ...authHeader }
         });
       } catch (err) {
@@ -3101,16 +3121,16 @@ function createHttpClient(baseUrl, bearerToken) {
         const body = await res.text().catch(() => "");
         throw new HttpError(
           res.status,
-          `${res.status} ${res.statusText} on GET ${path10}: ${body}`,
+          `${res.status} ${res.statusText} on GET ${path9}: ${body}`,
           body
         );
       }
       return await res.json();
     },
-    async post(path10, body) {
+    async post(path9, body) {
       let res;
       try {
-        res = await fetch(`${root}${path10}`, {
+        res = await fetch(`${root}${path9}`, {
           method: "POST",
           headers: { "content-type": "application/json", ...authHeader },
           body: JSON.stringify(body)
@@ -3124,7 +3144,7 @@ function createHttpClient(baseUrl, bearerToken) {
         const text = await res.text().catch(() => "");
         throw new HttpError(
           res.status,
-          `${res.status} ${res.statusText} on POST ${path10}: ${text}`,
+          `${res.status} ${res.statusText} on POST ${path9}: ${text}`,
           text
         );
       }
@@ -3138,12 +3158,12 @@ function projectPath(project, suffix) {
 }
 async function runRootCause(client, input) {
   const qs = input.errorId ? `?errorId=${encodeURIComponent(input.errorId)}` : "";
-  const path10 = projectPath(
+  const path9 = projectPath(
     input.project,
     `/graph/root-cause/${encodeURIComponent(input.errorNode)}${qs}`
   );
   try {
-    const result = await client.get(path10);
+    const result = await client.get(path9);
     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}.` : "");
@@ -3169,12 +3189,12 @@ async function runRootCause(client, input) {
 }
 async function runBlastRadius(client, input) {
   const qs = input.depth !== void 0 ? `?depth=${input.depth}` : "";
-  const path10 = projectPath(
+  const path9 = projectPath(
     input.project,
     `/graph/blast-radius/${encodeURIComponent(input.nodeId)}${qs}`
   );
   try {
-    const result = await client.get(path10);
+    const result = await client.get(path9);
     if (result.totalAffected === 0) {
       return {
         summary: `${result.origin} has no downstream dependencies. Nothing else would break if it failed.`
@@ -3208,12 +3228,12 @@ function formatBlastEntry(n) {
 }
 async function runDependencies(client, input) {
   const depth = input.depth ?? 3;
-  const path10 = projectPath(
+  const path9 = projectPath(
     input.project,
     `/graph/dependencies/${encodeURIComponent(input.nodeId)}?depth=${depth}`
   );
   try {
-    const result = await client.get(path10);
+    const result = await client.get(path9);
     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}).`
@@ -3294,9 +3314,9 @@ function formatDuration(ms) {
   return `${Math.round(h / 24)}d`;
 }
 async function runIncidents(client, input) {
-  const path10 = input.nodeId ? projectPath(input.project, `/incidents/${encodeURIComponent(input.nodeId)}`) : projectPath(input.project, "/incidents");
+  const path9 = input.nodeId ? projectPath(input.project, `/incidents/${encodeURIComponent(input.nodeId)}`) : projectPath(input.project, "/incidents");
   try {
-    const body = await client.get(path10);
+    const body = await client.get(path9);
     const events = body.events;
     if (events.length === 0) {
       return {
@@ -3586,7 +3606,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}${path8.sep}`)) {
+    if (resolvedCwd === entry2.path || resolvedCwd.startsWith(`${entry2.path}${path7.sep}`)) {
       return entry2;
     }
   }
@@ -3946,10 +3966,10 @@ function assignFlag(out, field, value) {
   out[field] = value;
 }
 function readPackageVersion() {
-  const here = typeof __dirname !== "undefined" ? __dirname : path9.dirname(fileURLToPath(import.meta.url));
+  const here = typeof __dirname !== "undefined" ? __dirname : path8.dirname(fileURLToPath(import.meta.url));
   const candidates = [
-    path9.resolve(here, "../package.json"),
-    path9.resolve(here, "../../package.json")
+    path8.resolve(here, "../package.json"),
+    path8.resolve(here, "../../package.json")
   ];
   for (const candidate of candidates) {
     try {
@@ -4017,7 +4037,7 @@ async function buildPatchSections(services, project) {
 }
 async function runInit(opts) {
   const written = [];
-  const stat = await fs8.stat(opts.scanPath).catch(() => null);
+  const stat = await fs7.stat(opts.scanPath).catch(() => null);
   if (!stat || !stat.isDirectory()) {
     console.error(`neat init: ${opts.scanPath} is not a directory`);
     return { exitCode: 2, writtenFiles: written };
@@ -4026,13 +4046,13 @@ async function runInit(opts) {
   printDiscoveryReport(opts, services);
   const sections = opts.noInstall ? [] : await buildPatchSections(services, opts.project);
   const patch = renderPatch(sections);
-  const patchPath = path9.join(opts.scanPath, "neat.patch");
+  const patchPath = path8.join(opts.scanPath, "neat.patch");
   if (opts.dryRun) {
-    await fs8.writeFile(patchPath, patch, "utf8");
+    await fs7.writeFile(patchPath, patch, "utf8");
     written.push(patchPath);
     console.log(`dry-run: patch written to ${patchPath}`);
-    const gitignorePath = path9.join(opts.scanPath, ".gitignore");
-    const gitignoreExists = await fs8.stat(gitignorePath).then(() => true).catch(() => false);
+    const gitignorePath = path8.join(opts.scanPath, ".gitignore");
+    const gitignoreExists = await fs7.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.");
@@ -4043,9 +4063,9 @@ async function runInit(opts) {
   const graph = getGraph(graphKey);
   const projectPaths = pathsForProject(
     graphKey,
-    path9.join(opts.scanPath, "neat-out")
+    path8.join(opts.scanPath, "neat-out")
   );
-  const errorsPath = path9.join(path9.dirname(opts.outPath), path9.basename(projectPaths.errorsPath));
+  const errorsPath = path8.join(path8.dirname(opts.outPath), path8.basename(projectPaths.errorsPath));
   const result = await extractFromDirectory(graph, opts.scanPath, { errorsPath });
   await saveGraphToDisk(graph, opts.outPath);
   written.push(opts.outPath);
@@ -4124,7 +4144,7 @@ async function runInit(opts) {
         console.log("Run `npm install` (or your language equivalent) to refresh lockfiles.");
       }
     } else {
-      await fs8.writeFile(patchPath, patch, "utf8");
+      await fs7.writeFile(patchPath, patch, "utf8");
       written.push(patchPath);
     }
   }
@@ -4164,9 +4184,9 @@ var CLAUDE_SKILL_CONFIG = {
 };
 function claudeConfigPath() {
   const override = process.env.NEAT_CLAUDE_CONFIG;
-  if (override && override.length > 0) return path9.resolve(override);
+  if (override && override.length > 0) return path8.resolve(override);
   const home = process.env.HOME ?? process.env.USERPROFILE ?? "";
-  return path9.join(home, ".claude.json");
+  return path8.join(home, ".claude.json");
 }
 async function runSkill(opts) {
   const snippet = JSON.stringify(CLAUDE_SKILL_CONFIG, null, 2) + "\n";
@@ -4178,7 +4198,7 @@ async function runSkill(opts) {
     const target = claudeConfigPath();
     let existing = {};
     try {
-      existing = JSON.parse(await fs8.readFile(target, "utf8"));
+      existing = JSON.parse(await fs7.readFile(target, "utf8"));
     } catch (err) {
       if (err.code !== "ENOENT") {
         console.error(`neat skill: failed to read ${target} \u2014 ${err.message}`);
@@ -4190,8 +4210,8 @@ async function runSkill(opts) {
       ...existing,
       mcpServers: { ...mcp, neat: CLAUDE_SKILL_CONFIG.mcpServers.neat }
     };
-    await fs8.mkdir(path9.dirname(target), { recursive: true });
-    await fs8.writeFile(target, JSON.stringify(merged, null, 2) + "\n", "utf8");
+    await fs7.mkdir(path8.dirname(target), { recursive: true });
+    await fs7.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 };
@@ -4229,12 +4249,12 @@ async function main() {
       console.error("neat init: --apply and --dry-run are mutually exclusive");
       process.exit(2);
     }
-    const scanPath = path9.resolve(target);
+    const scanPath = path8.resolve(target);
     const projectExplicit = parsed.project !== null;
-    const projectName = projectExplicit ? project : path9.basename(scanPath);
+    const projectName = projectExplicit ? project : path8.basename(scanPath);
     const projectKey = projectExplicit ? project : DEFAULT_PROJECT;
-    const fallback = pathsForProject(projectKey, path9.join(scanPath, "neat-out")).snapshotPath;
-    const outPath = path9.resolve(process.env.NEAT_OUT_PATH ?? fallback);
+    const fallback = pathsForProject(projectKey, path8.join(scanPath, "neat-out")).snapshotPath;
+    const outPath = path8.resolve(process.env.NEAT_OUT_PATH ?? fallback);
     const result = await runInit({
       scanPath,
       outPath,
@@ -4255,21 +4275,21 @@ async function main() {
       usage();
       process.exit(2);
     }
-    const scanPath = path9.resolve(target);
-    const stat = await fs8.stat(scanPath).catch(() => null);
+    const scanPath = path8.resolve(target);
+    const stat = await fs7.stat(scanPath).catch(() => null);
     if (!stat || !stat.isDirectory()) {
       console.error(`neat watch: ${scanPath} is not a directory`);
       process.exit(2);
     }
-    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 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 staleEventsPath = path9.resolve(
-      process.env.NEAT_STALE_EVENTS_PATH ?? path9.join(path9.dirname(outPath), path9.basename(projectPaths.staleEventsPath))
+    const staleEventsPath = path8.resolve(
+      process.env.NEAT_STALE_EVENTS_PATH ?? path8.join(path8.dirname(outPath), path8.basename(projectPaths.staleEventsPath))
     );
-    const embeddingsCachePath = process.env.NEAT_EMBEDDINGS_CACHE_PATH ? path9.resolve(process.env.NEAT_EMBEDDINGS_CACHE_PATH) : void 0;
+    const embeddingsCachePath = process.env.NEAT_EMBEDDINGS_CACHE_PATH ? path8.resolve(process.env.NEAT_EMBEDDINGS_CACHE_PATH) : void 0;
     const handle = await startWatch(getGraph(project), {
       scanPath,
       outPath,
@@ -4415,11 +4435,11 @@ async function main() {
   process.exit(1);
 }
 async function tryOrchestrator(cmd, parsed) {
-  const scanPath = path9.resolve(cmd);
-  const stat = await fs8.stat(scanPath).catch(() => null);
+  const scanPath = path8.resolve(cmd);
+  const stat = await fs7.stat(scanPath).catch(() => null);
   if (!stat || !stat.isDirectory()) return null;
   const projectExplicit = parsed.project !== null;
-  const projectName = projectExplicit ? parsed.project : path9.basename(scanPath);
+  const projectName = projectExplicit ? parsed.project : path8.basename(scanPath);
   const result = await runOrchestrator({
     scanPath,
     project: projectName,