@neat.is/core 0.4.0 → 0.4.3

package/dist/cli.d.cts

@@ -40,6 +40,7 @@ interface ParsedArgs {
 }
 declare function parseArgs(rest: string[]): ParsedArgs;
 
+declare function readPackageVersion(): string;
 declare function runInit(opts: InitOptions): Promise<InitResult>;
 declare const CLAUDE_SKILL_CONFIG: {
     mcpServers: {
@@ -63,4 +64,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, runInit, runQueryVerb, runSkill };
+export { CLAUDE_SKILL_CONFIG, type InitOptions, type InitResult, QUERY_VERBS, type SkillOptions, parseArgs, readPackageVersion, runInit, runQueryVerb, runSkill };

package/dist/cli.d.ts

@@ -40,6 +40,7 @@ interface ParsedArgs {
 }
 declare function parseArgs(rest: string[]): ParsedArgs;
 
+declare function readPackageVersion(): string;
 declare function runInit(opts: InitOptions): Promise<InitResult>;
 declare const CLAUDE_SKILL_CONFIG: {
     mcpServers: {
@@ -63,4 +64,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, runInit, runQueryVerb, runSkill };
+export { CLAUDE_SKILL_CONFIG, type InitOptions, type InitResult, QUERY_VERBS, type SkillOptions, parseArgs, readPackageVersion, runInit, runQueryVerb, runSkill };

package/dist/cli.js

@@ -41,18 +41,20 @@ import {
   setStatus,
   startPersistLoop,
   startStalenessLoop
-} from "./chunk-UPW4CMOH.js";
+} from "./chunk-NTQHMXWE.js";
 import {
   startOtelGrpcReceiver
-} from "./chunk-IXIFJKMM.js";
+} from "./chunk-D5PIJFBE.js";
 import {
+  __dirname,
   __require,
   buildOtelReceiver
-} from "./chunk-4V23KYOP.js";
+} from "./chunk-KYRIQIPG.js";
 
 // src/cli.ts
 import path8 from "path";
-import { promises as fs7 } from "fs";
+import { promises as fs7, readFileSync } from "fs";
+import { fileURLToPath } from "url";
 
 // src/gitignore.ts
 import { promises as fs } from "fs";
@@ -272,6 +274,14 @@ var IGNORED_WATCH_GLOBS = [
   "**/.turbo/**",
   "**/.next/**",
   "**/neat-out/**",
+  // Python venv shapes (issue #344). chokidar opens one watch handle per
+  // descended dir; a CPython venv carries 20k+ files and trivially blows
+  // through the macOS kqueue cap before extraction even runs.
+  "**/.venv/**",
+  "**/venv/**",
+  "**/__pypackages__/**",
+  "**/.tox/**",
+  "**/site-packages/**",
   "**/.DS_Store"
 ];
 var IGNORED_WATCH_PATHS = [
@@ -282,6 +292,11 @@ var IGNORED_WATCH_PATHS = [
   /(?:^|[\\/])\.turbo[\\/]/,
   /(?:^|[\\/])\.next[\\/]/,
   /(?:^|[\\/])neat-out[\\/]/,
+  /(?:^|[\\/])\.venv[\\/]/,
+  /(?:^|[\\/])venv[\\/]/,
+  /(?:^|[\\/])__pypackages__[\\/]/,
+  /(?:^|[\\/])\.tox[\\/]/,
+  /(?:^|[\\/])site-packages[\\/]/,
   /[\\/]?\.DS_Store$/
 ];
 function shouldIgnore(absPath) {
@@ -713,10 +728,10 @@ dotenv.config({ path: path.join(here, '.env.neat') })
 
 await import('@opentelemetry/auto-instrumentations-node/register')
 `;
-function renderEnvNeat(serviceName) {
+function renderEnvNeat(projectName) {
   return [
     "# Generated by `neat init --apply` (ADR-069).",
-    `OTEL_SERVICE_NAME=${serviceName}`,
+    `OTEL_SERVICE_NAME=${projectName}`,
     "OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4318",
     ""
   ].join("\n");
@@ -737,41 +752,26 @@ export async function register() {
 }
 `;
 var NEXT_INSTRUMENTATION_NODE_TS = `${NEXT_INSTRUMENTATION_HEADER}
-// Loads .env.neat (OTEL_SERVICE_NAME, OTEL_EXPORTER_OTLP_ENDPOINT) before
-// the OTel SDK starts so the exporter target and service name are in scope.
-import { fileURLToPath } from 'node:url'
-import path from 'node:path'
-import dotenv from 'dotenv'
+process.env.OTEL_SERVICE_NAME ||= '__PROJECT_NAME__'
+process.env.OTEL_EXPORTER_OTLP_ENDPOINT ||= 'http://localhost:4318'
+
 import { NodeSDK } from '@opentelemetry/sdk-node'
 import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node'
 
-const here = path.dirname(fileURLToPath(import.meta.url))
-dotenv.config({ path: path.join(here, '.env.neat') })
-
-const sdk = new NodeSDK({
-  serviceName: process.env.OTEL_SERVICE_NAME,
-  instrumentations: [getNodeAutoInstrumentations()],
-})
-sdk.start()
+new NodeSDK({ instrumentations: [getNodeAutoInstrumentations()] }).start()
 `;
 var NEXT_INSTRUMENTATION_NODE_JS = `${NEXT_INSTRUMENTATION_HEADER}
-// Loads .env.neat (OTEL_SERVICE_NAME, OTEL_EXPORTER_OTLP_ENDPOINT) before
-// the OTel SDK starts so the exporter target and service name are in scope.
-import { fileURLToPath } from 'node:url'
-import path from 'node:path'
-import dotenv from 'dotenv'
-import { NodeSDK } from '@opentelemetry/sdk-node'
-import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node'
+process.env.OTEL_SERVICE_NAME ||= '__PROJECT_NAME__'
+process.env.OTEL_EXPORTER_OTLP_ENDPOINT ||= 'http://localhost:4318'
 
-const here = path.dirname(fileURLToPath(import.meta.url))
-dotenv.config({ path: path.join(here, '.env.neat') })
+const { NodeSDK } = require('@opentelemetry/sdk-node')
+const { getNodeAutoInstrumentations } = require('@opentelemetry/auto-instrumentations-node')
 
-const sdk = new NodeSDK({
-  serviceName: process.env.OTEL_SERVICE_NAME,
-  instrumentations: [getNodeAutoInstrumentations()],
-})
-sdk.start()
+new NodeSDK({ instrumentations: [getNodeAutoInstrumentations()] }).start()
 `;
+function renderNextInstrumentationNode(template, projectName) {
+  return template.replace(/__PROJECT_NAME__/g, projectName);
+}
 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}
 // Loads .env.neat (OTEL_SERVICE_NAME, OTEL_EXPORTER_OTLP_ENDPOINT) before
@@ -886,6 +886,10 @@ var OTEL_ENV = {
   key: "OTEL_EXPORTER_OTLP_ENDPOINT",
   value: "http://localhost:4318"
 };
+function envServiceName(pkg, serviceDir, project) {
+  if (project && project.length > 0) return project;
+  return pkg.name ?? path4.basename(serviceDir);
+}
 async function readPackageJson(serviceDir) {
   try {
     const raw = await fs4.readFile(path4.join(serviceDir, "package.json"), "utf8");
@@ -1110,17 +1114,29 @@ function lineIsOtelInjection(line) {
   if (trimmed.length === 0) return false;
   return /(?:require\(|import\s+)['"]\.\/otel-init[^'"]*['"]/.test(trimmed);
 }
-async function planNext(serviceDir, pkg, manifestPath, nextConfigPath) {
+async function detectsSrcLayout(serviceDir) {
+  const [hasSrcApp, hasSrcPages, hasRootApp, hasRootPages] = await Promise.all([
+    exists(path4.join(serviceDir, "src", "app")),
+    exists(path4.join(serviceDir, "src", "pages")),
+    exists(path4.join(serviceDir, "app")),
+    exists(path4.join(serviceDir, "pages"))
+  ]);
+  return (hasSrcApp || hasSrcPages) && !hasRootApp && !hasRootPages;
+}
+async function planNext(serviceDir, pkg, manifestPath, nextConfigPath, project) {
   const useTs = await isTypeScriptProject(serviceDir);
-  const instrumentationFile = path4.join(serviceDir, useTs ? "instrumentation.ts" : "instrumentation.js");
+  const srcLayout = await detectsSrcLayout(serviceDir);
+  const baseDir = srcLayout ? path4.join(serviceDir, "src") : serviceDir;
+  const instrumentationFile = path4.join(baseDir, useTs ? "instrumentation.ts" : "instrumentation.js");
   const instrumentationNodeFile = path4.join(
-    serviceDir,
+    baseDir,
     useTs ? "instrumentation.node.ts" : "instrumentation.node.js"
   );
-  const envNeatFile = path4.join(serviceDir, ".env.neat");
+  const envNeatFile = path4.join(baseDir, ".env.neat");
   const existingDeps = { ...pkg.dependencies ?? {}, ...pkg.devDependencies ?? {} };
   const dependencyEdits = [];
   for (const sdk of SDK_PACKAGES) {
+    if (sdk.name === "dotenv") continue;
     if (sdk.name in existingDeps) continue;
     dependencyEdits.push({
       file: manifestPath,
@@ -1129,6 +1145,7 @@ async function planNext(serviceDir, pkg, manifestPath, nextConfigPath) {
       version: sdk.version
     });
   }
+  const projectName = envServiceName(pkg, serviceDir, project);
   const generatedFiles = [];
   if (!await exists(instrumentationFile)) {
     generatedFiles.push({
@@ -1140,14 +1157,17 @@ async function planNext(serviceDir, pkg, manifestPath, nextConfigPath) {
   if (!await exists(instrumentationNodeFile)) {
     generatedFiles.push({
       file: instrumentationNodeFile,
-      contents: useTs ? NEXT_INSTRUMENTATION_NODE_TS : NEXT_INSTRUMENTATION_NODE_JS,
+      contents: renderNextInstrumentationNode(
+        useTs ? NEXT_INSTRUMENTATION_NODE_TS : NEXT_INSTRUMENTATION_NODE_JS,
+        projectName
+      ),
       skipIfExists: true
     });
   }
   if (!await exists(envNeatFile)) {
     generatedFiles.push({
       file: envNeatFile,
-      contents: renderEnvNeat(pkg.name ?? path4.basename(serviceDir)),
+      contents: renderEnvNeat(projectName),
       skipIfExists: true
     });
   }
@@ -1203,12 +1223,12 @@ function buildDependencyEdits(pkg, manifestPath) {
   }
   return edits;
 }
-async function queueEnvNeat(serviceDir, pkg, generatedFiles) {
+async function queueEnvNeat(serviceDir, pkg, project, generatedFiles) {
   const envNeatFile = path4.join(serviceDir, ".env.neat");
   if (!await exists(envNeatFile)) {
     generatedFiles.push({
       file: envNeatFile,
-      contents: renderEnvNeat(pkg.name ?? path4.basename(serviceDir)),
+      contents: renderEnvNeat(envServiceName(pkg, serviceDir, project)),
       skipIfExists: true
     });
   }
@@ -1227,7 +1247,7 @@ function fileImportsOtelHook(raw, specifiers) {
   }
   return false;
 }
-async function planRemix(serviceDir, pkg, manifestPath, entryFile) {
+async function planRemix(serviceDir, pkg, manifestPath, entryFile, project) {
   const useTs = await isTypeScriptProject(serviceDir);
   const otelServerFile = path4.join(
     serviceDir,
@@ -1242,7 +1262,7 @@ async function planRemix(serviceDir, pkg, manifestPath, entryFile) {
       skipIfExists: true
     });
   }
-  await queueEnvNeat(serviceDir, pkg, generatedFiles);
+  await queueEnvNeat(serviceDir, pkg, project, generatedFiles);
   const entrypointEdits = [];
   try {
     const raw = await fs4.readFile(entryFile, "utf8");
@@ -1279,7 +1299,7 @@ async function planRemix(serviceDir, pkg, manifestPath, entryFile) {
     framework: "remix"
   };
 }
-async function planSvelteKit(serviceDir, pkg, manifestPath, hooksFile) {
+async function planSvelteKit(serviceDir, pkg, manifestPath, hooksFile, project) {
   const useTs = await isTypeScriptProject(serviceDir);
   const otelInitFile = path4.join(
     serviceDir,
@@ -1296,7 +1316,7 @@ async function planSvelteKit(serviceDir, pkg, manifestPath, hooksFile) {
       skipIfExists: true
     });
   }
-  await queueEnvNeat(serviceDir, pkg, generatedFiles);
+  await queueEnvNeat(serviceDir, pkg, project, generatedFiles);
   if (hooksFile === null) {
     generatedFiles.push({
       file: resolvedHooksFile,
@@ -1340,7 +1360,7 @@ async function planSvelteKit(serviceDir, pkg, manifestPath, hooksFile) {
     framework: "sveltekit"
   };
 }
-async function planNuxt(serviceDir, pkg, manifestPath) {
+async function planNuxt(serviceDir, pkg, manifestPath, project) {
   const useTs = await isTypeScriptProject(serviceDir);
   const otelPluginFile = path4.join(
     serviceDir,
@@ -1366,7 +1386,7 @@ async function planNuxt(serviceDir, pkg, manifestPath) {
       skipIfExists: true
     });
   }
-  await queueEnvNeat(serviceDir, pkg, generatedFiles);
+  await queueEnvNeat(serviceDir, pkg, project, generatedFiles);
   const empty = dependencyEdits.length === 0 && generatedFiles.length === 0;
   if (empty) {
     return {
@@ -1397,7 +1417,7 @@ async function findAstroMiddleware(serviceDir) {
   }
   return null;
 }
-async function planAstro(serviceDir, pkg, manifestPath) {
+async function planAstro(serviceDir, pkg, manifestPath, project) {
   const useTs = await isTypeScriptProject(serviceDir);
   const otelInitFile = path4.join(
     serviceDir,
@@ -1415,7 +1435,7 @@ async function planAstro(serviceDir, pkg, manifestPath) {
       skipIfExists: true
     });
   }
-  await queueEnvNeat(serviceDir, pkg, generatedFiles);
+  await queueEnvNeat(serviceDir, pkg, project, generatedFiles);
   if (existingMiddleware === null) {
     generatedFiles.push({
       file: middlewareFile,
@@ -1459,9 +1479,10 @@ async function planAstro(serviceDir, pkg, manifestPath) {
     framework: "astro"
   };
 }
-async function plan(serviceDir) {
+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,
@@ -1474,32 +1495,32 @@ async function plan(serviceDir) {
   if (hasNextDependency(pkg)) {
     const nextConfig = await findNextConfig(serviceDir);
     if (nextConfig) {
-      return planNext(serviceDir, pkg, manifestPath, nextConfig);
+      return planNext(serviceDir, pkg, manifestPath, nextConfig, project);
     }
   }
   if (hasRemixDependency(pkg)) {
     const remixEntry = await findRemixEntry(serviceDir);
     if (remixEntry) {
-      return planRemix(serviceDir, pkg, manifestPath, remixEntry);
+      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);
+      return planSvelteKit(serviceDir, pkg, manifestPath, hooks, project);
     }
   }
   if (hasNuxtDependency(pkg)) {
     const nuxtConfig = await findNuxtConfig(serviceDir);
     if (nuxtConfig) {
-      return planNuxt(serviceDir, pkg, manifestPath);
+      return planNuxt(serviceDir, pkg, manifestPath, project);
     }
   }
   if (hasAstroDependency(pkg)) {
     const astroConfig = await findAstroConfig(serviceDir);
     if (astroConfig) {
-      return planAstro(serviceDir, pkg, manifestPath);
+      return planAstro(serviceDir, pkg, manifestPath, project);
     }
   }
   const entryFile = await resolveEntry(serviceDir, pkg);
@@ -1547,7 +1568,7 @@ async function plan(serviceDir) {
   if (!await exists(envNeatFile)) {
     generatedFiles.push({
       file: envNeatFile,
-      contents: renderEnvNeat(pkg.name ?? path4.basename(serviceDir)),
+      contents: renderEnvNeat(envServiceName(pkg, serviceDir, project)),
       skipIfExists: true
     });
   }
@@ -1572,9 +1593,13 @@ function isAllowedWritePath(serviceDir, target) {
   if (base === "package.json") return true;
   if (base === ".env.neat") return true;
   if (/^otel-init\.(?:js|cjs|mjs|ts)$/.test(base)) return true;
-  if (/^instrumentation(?:\.node)?\.(?:js|cjs|mjs|ts)$/.test(base)) return true;
-  if (/^next\.config\.(?:js|mjs|ts)$/.test(base)) return true;
   const relPosix = rel.split(path4.sep).join("/");
+  if (/^instrumentation(?:\.node)?\.(?:js|cjs|mjs|ts)$/.test(base)) {
+    if (relPosix === base) return true;
+    if (relPosix === `src/${base}`) return true;
+    return false;
+  }
+  if (/^next\.config\.(?:js|mjs|ts)$/.test(base)) return true;
   if (relPosix === "app/otel.server.ts" || relPosix === "app/otel.server.js") return true;
   if (/^app\/entry\.server\.(?:tsx?|jsx?)$/.test(relPosix)) return true;
   if (relPosix === "src/otel-init.ts" || relPosix === "src/otel-init.js") return true;
@@ -2079,14 +2104,14 @@ async function extractAndPersist(opts) {
     errorsPath: projectPaths.errorsPath
   };
 }
-async function applyInstallersOver(services) {
+async function applyInstallersOver(services, project) {
   let instrumented = 0;
   let already = 0;
   let libOnly = 0;
   for (const svc of services) {
     const installer = await pickInstaller(svc.dir);
     if (!installer) continue;
-    const plan3 = await installer.plan(svc.dir);
+    const plan3 = await installer.plan(svc.dir, { project });
     if (isEmptyPlan(plan3) && !plan3.libOnly) {
       already++;
       continue;
@@ -2108,28 +2133,106 @@ async function promptYesNo(question) {
     });
   });
 }
-var DEFAULT_DAEMON_READY_TIMEOUT_MS = 15e3;
-async function checkDaemonHealth(restPort) {
+var DEFAULT_DAEMON_READY_TIMEOUT_MS = 6e4;
+var PROBE_INTERVAL_MS = 500;
+async function fetchDaemonHealth(restPort) {
   return new Promise((resolve) => {
     const req = http.get(`http://127.0.0.1:${restPort}/health`, (res) => {
       const ok = res.statusCode !== void 0 && res.statusCode >= 200 && res.statusCode < 300;
-      res.resume();
-      resolve(ok);
+      if (!ok) {
+        res.resume();
+        resolve(null);
+        return;
+      }
+      let body = "";
+      res.setEncoding("utf8");
+      res.on("data", (chunk) => {
+        body += chunk;
+      });
+      res.on("end", () => {
+        try {
+          resolve(JSON.parse(body));
+        } catch {
+          resolve({ ok: true });
+        }
+      });
     });
-    req.on("error", () => resolve(false));
+    req.on("error", () => resolve(null));
     req.setTimeout(1e3, () => {
       req.destroy();
-      resolve(false);
+      resolve(null);
     });
   });
 }
+async function checkDaemonHealth(restPort) {
+  const body = await fetchDaemonHealth(restPort);
+  return body !== null;
+}
+async function probeProjectHealth(restPort, name) {
+  return new Promise((resolve) => {
+    const req = http.get(
+      `http://127.0.0.1:${restPort}/projects/${encodeURIComponent(name)}/health`,
+      (res) => {
+        const code = res.statusCode ?? 0;
+        res.resume();
+        if (code >= 200 && code < 300) resolve("active");
+        else resolve("bootstrapping");
+      }
+    );
+    req.on("error", () => resolve("bootstrapping"));
+    req.setTimeout(1e3, () => {
+      req.destroy();
+      resolve("bootstrapping");
+    });
+  });
+}
+async function snapshotProjectStatus(restPort, body) {
+  if (body.projects && body.projects.length > 0) {
+    return body.projects.map((p) => ({
+      name: p.name,
+      status: p.status ?? "active"
+    }));
+  }
+  const entries = await listProjects().catch(() => []);
+  if (entries.length === 0) return [];
+  return Promise.all(
+    entries.map(async (entry2) => ({
+      name: entry2.name,
+      status: await probeProjectHealth(restPort, entry2.name)
+    }))
+  );
+}
 async function waitForDaemonReady(restPort, timeoutMs) {
   const deadline = Date.now() + timeoutMs;
+  let lastBootstrapping = [];
   while (Date.now() < deadline) {
-    if (await checkDaemonHealth(restPort)) return true;
-    await new Promise((r) => setTimeout(r, 300));
+    const body = await fetchDaemonHealth(restPort);
+    if (body !== null) {
+      const projects2 = await snapshotProjectStatus(restPort, body);
+      const bootstrapping = projects2.filter((p) => p.status === "bootstrapping").map((p) => p.name);
+      const broken = projects2.filter((p) => p.status === "broken").map((p) => p.name);
+      if (bootstrapping.length === 0) {
+        return { ready: true, brokenProjects: broken, stillBootstrapping: [] };
+      }
+      const key = bootstrapping.slice().sort().join(",");
+      const prevKey = lastBootstrapping.slice().sort().join(",");
+      if (key !== prevKey) {
+        const plural = bootstrapping.length === 1 ? "" : "s";
+        console.log(
+          `neat: waiting on ${bootstrapping.length} project${plural}: ${bootstrapping.join(", ")}`
+        );
+        lastBootstrapping = bootstrapping;
+      }
+    }
+    await new Promise((r) => setTimeout(r, PROBE_INTERVAL_MS));
   }
-  return false;
+  const final = await fetchDaemonHealth(restPort);
+  const projects = final ? await snapshotProjectStatus(restPort, final) : [];
+  return {
+    ready: false,
+    brokenProjects: projects.filter((p) => p.status === "broken").map((p) => p.name),
+    stillBootstrapping: projects.filter((p) => p.status === "bootstrapping").map((p) => p.name)
+  };
 }
 function spawnDaemonDetached() {
   const here = path6.dirname(new URL(import.meta.url).pathname);
@@ -2150,12 +2253,21 @@ function spawnDaemonDetached() {
   if (!entry2) {
     throw new Error(`orchestrator: cannot locate neatd entry in ${here}`);
   }
+  const env = { ...process.env };
+  const hasToken = typeof env.NEAT_AUTH_TOKEN === "string" && env.NEAT_AUTH_TOKEN.length > 0;
+  if (!hasToken && (!env.HOST || env.HOST.length === 0)) {
+    env.HOST = "127.0.0.1";
+  }
   const child = spawn2(process.execPath, [entry2, "start"], {
     detached: true,
-    stdio: "ignore",
-    env: process.env
+    // stderr inherits the orchestrator's fd so the daemon's
+    // `BindAuthorityError` message lands in front of the operator instead
+    // of being swallowed (issue #341).
+    stdio: ["ignore", "ignore", "inherit"],
+    env
   });
   child.unref();
+  return child;
 }
 function openBrowser(url) {
   if (!process.stdout.isTTY) return "failed";
@@ -2231,7 +2343,7 @@ async function runOrchestrator(opts) {
     result.steps.apply.skipped = true;
     console.log("skipped instrumentation (--no-instrument)");
   } else {
-    const tally = await applyInstallersOver(services);
+    const tally = await applyInstallersOver(services, opts.project);
     result.steps.apply = { ...tally, skipped: false };
     console.log(
       `instrumented ${tally.instrumented}, already ${tally.alreadyInstrumented}, lib-only ${tally.libOnly}`
@@ -2250,12 +2362,25 @@ async function runOrchestrator(opts) {
       return result;
     }
     const ready = await waitForDaemonReady(restPort, timeoutMs);
-    result.steps.daemon = ready ? "spawned" : "timed-out";
-    if (!ready) {
+    result.steps.daemon = ready.ready ? "spawned" : "timed-out";
+    if (!ready.ready) {
       console.error(`neat: daemon did not become ready within ${timeoutMs}ms`);
+      if (ready.stillBootstrapping.length > 0) {
+        console.error(
+          `neat: still bootstrapping: ${ready.stillBootstrapping.join(", ")}`
+        );
+      }
+      if (ready.brokenProjects.length > 0) {
+        console.error(`neat: broken projects: ${ready.brokenProjects.join(", ")}`);
+      }
       result.exitCode = 1;
       return result;
     }
+    if (ready.brokenProjects.length > 0) {
+      console.warn(
+        `neat: ${ready.brokenProjects.length} project(s) reported broken: ${ready.brokenProjects.join(", ")}`
+      );
+    }
   }
   const dashboardUrl = opts.dashboardUrl ?? "http://localhost:6328";
   if (opts.noOpen || !process.stdout.isTTY) {
@@ -2884,7 +3009,7 @@ async function runSync(opts) {
     snapshotPath = target;
   }
   const skipApply = opts.dryRun || opts.noInstrument;
-  const applyTally = skipApply ? { instrumented: 0, alreadyInstrumented: 0, libOnly: 0 } : await applyInstallersOver(persisted.services);
+  const applyTally = skipApply ? { instrumented: 0, alreadyInstrumented: 0, libOnly: 0 } : await applyInstallersOver(persisted.services, entry2.name);
   const warnings = [];
   let daemonState = "skipped";
   let exitCode = 0;
@@ -2980,6 +3105,8 @@ function usage() {
   console.log("  uninstall <name>");
   console.log("                 Remove a project from the registry. Does not touch");
   console.log("                 neat-out/, policy.json, or any user file.");
+  console.log("  version        Print the installed @neat.is/core version and exit.");
+  console.log("                 Aliases: --version, -v.");
   console.log("  skill          Install or print the Claude Code MCP drop-in.");
   console.log("                 Flags:");
   console.log("                   --print-config   print the JSON snippet to stdout");
@@ -3106,7 +3233,7 @@ function parseArgs(rest) {
       out.yes = true;
       continue;
     }
-    if (arg === "--verbose" || arg === "-v") {
+    if (arg === "--verbose") {
       out.verbose = true;
       continue;
     }
@@ -3165,6 +3292,28 @@ function assignFlag(out, field, value) {
   ;
   out[field] = value;
 }
+function readPackageVersion() {
+  const here = typeof __dirname !== "undefined" ? __dirname : path8.dirname(fileURLToPath(import.meta.url));
+  const candidates = [
+    path8.resolve(here, "../package.json"),
+    path8.resolve(here, "../../package.json")
+  ];
+  for (const candidate of candidates) {
+    try {
+      const raw = readFileSync(candidate, "utf8");
+      const parsed = JSON.parse(raw);
+      if (parsed.name === "@neat.is/core" && typeof parsed.version === "string") {
+        return parsed.version;
+      }
+    } catch {
+    }
+  }
+  return "unknown";
+}
+function printVersion() {
+  process.stdout.write(`${readPackageVersion()}
+`);
+}
 function printBanner() {
   console.log("\u2588\u2588\u2588\u2557   \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557");
   console.log("\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u255A\u2550\u2550\u2588\u2588\u2554\u2550\u2550\u255D");
@@ -3174,7 +3323,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.2.5  \xB7  BSL 1.1");
+  console.log("  neat.is  \xB7  v0.4.0  \xB7  Apache 2.0");
   console.log("");
 }
 function printDiscoveryReport(opts, services) {
@@ -3202,12 +3351,12 @@ function printDiscoveryReport(opts, services) {
   }
   console.log("");
 }
-async function buildPatchSections(services) {
+async function buildPatchSections(services, project) {
   const sections = [];
   for (const svc of services) {
     const installer = await pickInstaller(svc.dir);
     if (!installer) continue;
-    const plan3 = await installer.plan(svc.dir);
+    const plan3 = await installer.plan(svc.dir, { project });
     if (isEmptyPlan(plan3) && !plan3.libOnly) continue;
     sections.push({ installer: installer.name, plan: plan3 });
   }
@@ -3222,7 +3371,7 @@ async function runInit(opts) {
   }
   const services = await discoverServices(opts.scanPath);
   printDiscoveryReport(opts, services);
-  const sections = opts.noInstall ? [] : await buildPatchSections(services);
+  const sections = opts.noInstall ? [] : await buildPatchSections(services, opts.project);
   const patch = renderPatch(sections);
   const patchPath = path8.join(opts.scanPath, "neat.patch");
   if (opts.dryRun) {
@@ -3380,6 +3529,10 @@ async function main() {
     usage();
     process.exit(0);
   }
+  if (cmd === "--version" || cmd === "-v" || cmd === "version") {
+    printVersion();
+    process.exit(0);
+  }
   const parsed = parseArgs(rest);
   const { positional, apply: apply3, dryRun, noInstall } = parsed;
   const project = parsed.project ?? DEFAULT_PROJECT;
@@ -3775,7 +3928,7 @@ async function runQueryVerb(cmd, parsed) {
   }
 }
 var entry = process.argv[1] ?? "";
-if (/[\\/]cli\.(?:cjs|js)$/.test(entry) || entry.endsWith("/cli") || entry.endsWith("/neat")) {
+if (/[\\/]cli\.(?:cjs|js)$/.test(entry) || entry.endsWith("/cli") || entry.endsWith("/neat") || entry.endsWith("/neat.is")) {
   main().catch((err) => {
     console.error(err);
     process.exit(1);
@@ -3785,6 +3938,7 @@ export {
   CLAUDE_SKILL_CONFIG,
   QUERY_VERBS,
   parseArgs,
+  readPackageVersion,
   runInit,
   runQueryVerb,
   runSkill