@neat.is/core 0.5.3 → 0.6.0

package/dist/cli.js

@@ -1,15 +1,18 @@
 #!/usr/bin/env node
 import {
-  PROVIDER_DISPATCH,
   clearDaemonRecord,
-  getProviderDispatch,
+  deprovisionConnector,
+  getProviderFieldSchema,
+  isPushProvider,
+  knownProviderNames,
   portFromListenAddress,
+  provisionConnector,
   readDaemonRecord,
   resolveHost,
   resolveNeatVersion,
   validateConnectorEntry,
   writeDaemonRecord
-} from "./chunk-X2AMX3QZ.js";
+} from "./chunk-5PVQJLPR.js";
 import {
   buildSearchIndex
 } from "./chunk-BIY46Q6U.js";
@@ -68,10 +71,10 @@ import {
   startPersistLoop,
   startStalenessLoop,
   upsertConnectorEntry
-} from "./chunk-GJHEZC5K.js";
+} from "./chunk-CS4GHQO3.js";
 import {
   startOtelGrpcReceiver
-} from "./chunk-I72HTUOG.js";
+} from "./chunk-MVINCLQM.js";
 import {
   __dirname,
   __require,
@@ -79,7 +82,7 @@ import {
   buildOtelReceiver,
   listenSteppingOtlp,
   readAuthEnv
-} from "./chunk-CFDPIMRP.js";
+} from "./chunk-BZ3AJVAC.js";
 
 // src/cli.ts
 import path10 from "path";
@@ -1182,9 +1185,12 @@ ${OTEL_ENDPOINT_RESOLVER_ESM}
 ${OTEL_OTLP_PROTOCOL_JS}
 ${OTEL_OTLP_HEADERS_JS}
 
-import { NodeSDK } from '@opentelemetry/sdk-node'
-import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node'
-import { trace, context } from '@opentelemetry/api'
+// Keep dependency loading inside the guard. Static ESM imports are evaluated
+// before any try/catch and would crash the host app when an install failed.
+try {
+const { NodeSDK } = await import('@opentelemetry/sdk-node')
+const { getNodeAutoInstrumentations } = await import('@opentelemetry/auto-instrumentations-node')
+const { trace, context } = await import('@opentelemetry/api')
 
 ${CALLSITE_PROCESSOR_JS}
 
@@ -1193,6 +1199,14 @@ __INSTRUMENTATION_BLOCK__
 const sdk = new NodeSDK({ instrumentations })
 sdk.start()
 ${neatWireCaptureSource(false)}
+} catch (__neatOtelErr) {
+  const __neatMsg = String((__neatOtelErr && __neatOtelErr.message) || __neatOtelErr)
+  if (/Cannot find (?:module|package)|MODULE_NOT_FOUND|ERR_MODULE_NOT_FOUND/.test(__neatMsg)) {
+    console.warn('[neat] OpenTelemetry is not active: its packages are not installed, so this app is running without OBSERVED tracing. Run your package manager install and restart to enable it.')
+  } else {
+    console.warn('[neat] OpenTelemetry failed to start; the app is running without OBSERVED tracing: ' + __neatMsg)
+  }
+}
 `;
 var OTEL_INIT_TS = `${OTEL_INIT_HEADER}
 ${OTEL_INIT_STAMP}
@@ -1207,9 +1221,12 @@ ${OTEL_ENDPOINT_RESOLVER_ESM}
 ${OTEL_OTLP_PROTOCOL_JS}
 ${OTEL_OTLP_HEADERS_JS}
 
-import { NodeSDK } from '@opentelemetry/sdk-node'
-import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node'
-import { trace, context } from '@opentelemetry/api'
+// Top-level await preserves the static import's ordering: the host entry does
+// not run until instrumentation has started (or safely degraded).
+try {
+const { NodeSDK } = await import('@opentelemetry/sdk-node')
+const { getNodeAutoInstrumentations } = await import('@opentelemetry/auto-instrumentations-node')
+const { trace, context } = await import('@opentelemetry/api')
 
 ${CALLSITE_PROCESSOR_TS}
 
@@ -1218,6 +1235,14 @@ __INSTRUMENTATION_BLOCK__
 const sdk = new NodeSDK({ instrumentations })
 sdk.start()
 ${neatWireCaptureSource(true)}
+} catch (__neatOtelErr) {
+  const __neatMsg = String((__neatOtelErr && __neatOtelErr.message) || __neatOtelErr)
+  if (/Cannot find (?:module|package)|MODULE_NOT_FOUND|ERR_MODULE_NOT_FOUND/.test(__neatMsg)) {
+    console.warn('[neat] OpenTelemetry is not active: its packages are not installed, so this app is running without OBSERVED tracing. Run your package manager install and restart to enable it.')
+  } else {
+    console.warn('[neat] OpenTelemetry failed to start; the app is running without OBSERVED tracing: ' + __neatMsg)
+  }
+}
 `;
 function renderNodeOtelInit(template, serviceName, projectName, registrations = []) {
   const block = registrations.length === 0 ? "" : `
@@ -3513,9 +3538,26 @@ function printSummary(result, graph, dashboardUrl, daemonLog) {
   } else {
     console.log("running locally \u2014 open the dashboard, no token needed");
   }
+  const failedInstalls = (result.steps.apply.packageManagerInstalls ?? []).filter(
+    (i) => i.exitCode !== 0
+  );
   if (daemonLog !== null) {
     console.log("");
     console.log(`daemon running in the background (logs: ${daemonLog})`);
+  }
+  if (failedInstalls.length > 0) {
+    if (daemonLog === null) console.log("");
+    console.log(
+      "instrumentation is wired into your manifests, but it is NOT yet active:"
+    );
+    console.log(
+      "the dependency install did not complete, so the OTel SDK never landed and"
+    );
+    console.log("OBSERVED edges will stay empty until you finish the install. Fix it:");
+    for (const i of failedInstalls) {
+      console.log(`      run \`${i.pm} install\` in ${i.cwd}`);
+    }
+  } else if (daemonLog !== null) {
     console.log(
       "next: run your app or your test suite \u2014 OBSERVED edges fill in as it executes,"
     );
@@ -3566,6 +3608,8 @@ function parseConnectorArgs(args) {
     positional: [],
     skipValidate: false,
     plaintext: false,
+    help: false,
+    json: false,
     fields: {}
   };
   const positional = [];
@@ -3579,6 +3623,14 @@ function parseConnectorArgs(args) {
       out.plaintext = true;
       continue;
     }
+    if (arg === "--help" || arg === "-h") {
+      out.help = true;
+      continue;
+    }
+    if (arg === "--json") {
+      out.json = true;
+      continue;
+    }
     if (arg.startsWith("--")) {
       let flag = arg;
       let value;
@@ -3655,19 +3707,20 @@ function plaintextFields(ref) {
 async function connectorAdd(args, deps) {
   let provider = args.positional[0];
   if (!provider && deps.interactive) {
-    provider = (await deps.prompt(`Provider (${Object.keys(PROVIDER_DISPATCH).sort().join(", ")}):`)).trim();
+    provider = (await deps.prompt(`Provider (${knownProviderNames().join(", ")}):`)).trim();
   }
   if (!provider) {
     deps.err("neat connector add: a provider is required (e.g. `neat connector add supabase`)");
     return 2;
   }
-  const dispatch = getProviderDispatch(provider);
+  const dispatch = getProviderFieldSchema(provider);
   if (!dispatch) {
     deps.err(
-      `neat connector add: unknown provider "${provider}". known providers: ${Object.keys(PROVIDER_DISPATCH).sort().join(", ")}`
+      `neat connector add: unknown provider "${provider}". known providers: ${knownProviderNames().join(", ")}`
     );
     return 2;
   }
+  const push = isPushProvider(provider);
   let project = args.project;
   if (project === void 0 && deps.interactive) {
     const answer = (await deps.prompt("Project (blank = the project the daemon is bootstrapping):")).trim();
@@ -3706,7 +3759,7 @@ async function connectorAdd(args, deps) {
     credential,
     ...Object.keys(options).length > 0 ? { options } : {}
   };
-  if (!args.skipValidate) {
+  if (!push && !args.skipValidate) {
     const outcome = await validateConnectorEntry(entry2, deps.env, deps.fetchImpl);
     const code = reportPreWriteValidation(outcome, deps);
     if (code !== 0) return code;
@@ -3717,14 +3770,32 @@ async function connectorAdd(args, deps) {
       `neat connector add: storing a literal secret at rest for ${plaintext.join(", ")} \u2014 prefer an env-var reference like \`$PROVIDER_TOKEN\` (pass --plaintext to silence this).`
     );
   }
+  if (push) {
+    if (args.skipValidate) {
+      deps.out("note: --skip-validate has no effect for a push provider \u2014 provisioning the drain is the add.");
+    }
+    const outcome = await provisionConnector(entry2, deps.env, deps.fetchImpl);
+    if (outcome.status !== "ok") {
+      deps.err(
+        `neat connector add: could not provision the ${provider} connector \u2014 ${outcome.reason}. Nothing was written.`
+      );
+      return 1;
+    }
+    if (outcome.options) entry2.options = { ...entry2.options ?? {}, ...outcome.options };
+    if (outcome.note) deps.out(`note: ${outcome.note}`);
+  }
   const { replaced } = await upsertConnectorEntry(entry2, deps.home);
   const verb = replaced ? "updated" : "added";
   const where = project ? `project "${project}"` : "the bootstrapping project";
   deps.out(`${verb} connector "${id}" (${provider}) for ${where}.`);
-  if (args.skipValidate) {
-    deps.out("skipped validation (--skip-validate) \u2014 the credential is checked at the next daemon poll.");
+  if (push) {
+    deps.out("The drain is live \u2014 traces arrive at the daemon's OTLP receiver. No poll or restart needed.");
+  } else {
+    if (args.skipValidate) {
+      deps.out("skipped validation (--skip-validate) \u2014 the credential is checked at the next daemon poll.");
+    }
+    deps.out("Restart the project's daemon (or start it) to begin polling this connector.");
   }
-  deps.out("Restart the project's daemon (or start it) to begin polling this connector.");
   return 0;
 }
 function reportPreWriteValidation(outcome, deps) {
@@ -3750,10 +3821,26 @@ function reportPreWriteValidation(outcome, deps) {
       return 2;
   }
 }
-async function connectorList(deps, filterProject) {
+async function connectorList(deps, filterProject, json = false) {
   const config = await readConnectorsConfig(deps.home);
   let entries = config.connectors;
   if (filterProject) entries = entries.filter((e) => e.project === filterProject);
+  if (json) {
+    const rows = entries.map((e) => ({
+      id: e.id,
+      provider: e.provider,
+      project: e.project ?? null,
+      kind: isPushProvider(e.provider) ? "push" : "pull",
+      credential: describeCredential(e.credential, deps.env).map((c) => ({
+        ...c.field ? { field: c.field } : {},
+        ref: c.display,
+        ...c.status ? { status: c.status } : { kind: c.kind }
+      })),
+      ...e.options ? { options: e.options } : {}
+    }));
+    deps.out(JSON.stringify(rows, null, 2));
+    return 0;
+  }
   if (entries.length === 0) {
     deps.out(
       filterProject ? `no connectors configured for project "${filterProject}".` : "no connectors configured. run `neat connector add <provider>` to add one."
@@ -3776,6 +3863,22 @@ async function connectorRemove(deps, id) {
     deps.err("neat connector remove: missing <id>. run `neat connector list` to see configured ids.");
     return 2;
   }
+  const config = await readConnectorsConfig(deps.home);
+  const entry2 = config.connectors.find((c) => c.id === id);
+  if (!entry2) {
+    deps.err(`neat connector remove: no connector with id "${id}". run \`neat connector list\` to see configured ids.`);
+    return 1;
+  }
+  if (isPushProvider(entry2.provider)) {
+    const outcome = await deprovisionConnector(entry2, deps.env, deps.fetchImpl);
+    if (outcome.status !== "ok") {
+      deps.err(
+        `neat connector remove: could not delete the ${entry2.provider} drain \u2014 ${outcome.reason}. The entry was kept so you can retry (or delete the drain in the Vercel dashboard, then re-run).`
+      );
+      return 1;
+    }
+    if (outcome.note) deps.out(`note: ${outcome.note}`);
+  }
   const removed = await removeConnectorEntry(id, deps.home);
   if (!removed) {
     deps.err(`neat connector remove: no connector with id "${id}". run \`neat connector list\` to see configured ids.`);
@@ -3816,13 +3919,20 @@ async function connectorTest(deps, id) {
 }
 function printConnectorUsage(write) {
   write("usage: neat connector <add|list|remove|test> [args]");
+  write(`  providers:        ${knownProviderNames().join(", ")}`);
+  write("                    pull (polled): supabase, railway, firebase, cloudflare");
+  write("                    push (drains): vercel \u2014 provisions a Vercel trace Drain that forwards");
+  write("                                   traces to the daemon's OTLP receiver; no app instrumentation");
   write("  add <provider>    add a connector; validates the credential first (--skip-validate to skip)");
   write("                    flags: --project <name>  --credential/--token <$VAR|value>  --id <id>");
   write("                           --<option> <value> (provider-specific)  --plaintext  --skip-validate");
+  write("                    vercel: neat connector add vercel --token $VERCEL_TOKEN \\");
+  write("                              --otel-token $NEAT_OTEL_TOKEN --team-id <teamId> \\");
+  write("                              --endpoint https://<public-host>/v1/traces [--project-ids <id,id>]");
   write("  list              list configured connectors (credentials shown redacted)");
   write("                    flags: --project <name>");
-  write("  remove <id>       remove a connector by id");
-  write("  test <id>         re-run the credential validation for an existing connector");
+  write("  remove <id>       remove a connector by id (a push provider also has its drain deleted)");
+  write("  test <id>         re-run validation for an existing connector (a push provider re-tests its drain)");
 }
 async function runConnectorCommand(rawArgs, deps = {}) {
   const resolved = resolveDeps(deps);
@@ -3832,11 +3942,15 @@ async function runConnectorCommand(rawArgs, deps = {}) {
     return 2;
   }
   const a = parsed.value;
+  if (a.help) {
+    printConnectorUsage(resolved.out);
+    return 0;
+  }
   switch (a.subcommand) {
     case "add":
       return connectorAdd(a, resolved);
     case "list":
-      return connectorList(resolved, a.project);
+      return connectorList(resolved, a.project, a.json);
     case "remove":
       return connectorRemove(resolved, a.positional[0]);
     case "test":
@@ -4787,8 +4901,9 @@ function usage2() {
   console.log("                   --dry-run          run extraction in-memory; do not write");
   console.log("                   --no-instrument    skip the SDK install apply step");
   console.log("                   --json             emit the delta summary as JSON");
-  console.log("  connector      Configure pull-based OBSERVED connectors (supabase, railway,");
-  console.log("                 firebase, cloudflare). Subcommands:");
+  console.log("  connector      Configure OBSERVED connectors \u2014 pull (supabase, railway,");
+  console.log("                 firebase, cloudflare) and push (vercel, via a trace Drain).");
+  console.log("                 Subcommands:");
   console.log("                   add <provider>   add a connector; validates the credential");
   console.log("                                    against the provider first (--skip-validate to skip)");
   console.log("                                    flags: --project <name>, --credential/--token <$VAR|value>,");