@neat.is/core 0.10.2 → 0.10.3-dev.20260930

package/dist/cli.cjs

@@ -19403,14 +19403,12 @@ async function readLockPid(lockPath) {
 async function classifyLockHolder(lockPath, probe = defaultLockHolderProbe) {
   const lockPid = await readLockPid(lockPath);
   const daemonPid = await probe.daemonPidFromFile();
-  if (daemonPid !== void 0 && daemonPid !== process.pid && probe.isPidAlive(daemonPid) && // The lock already names the daemon, or the daemon answers on its port.
-  // Either confirms a live daemon is in the picture (the second guards
-  // against a stale pidfile whose PID got reused).
-  (daemonPid === lockPid || await probe.daemonResponds())) {
-    return { kind: "daemon", pid: daemonPid };
-  }
   if (lockPid !== void 0 && lockPid !== process.pid && probe.isPidAlive(lockPid)) {
-    return { kind: "command", pid: lockPid };
+    return { kind: lockPid === daemonPid ? "daemon" : "command", pid: lockPid };
+  }
+  if (daemonPid !== void 0 && daemonPid !== process.pid && probe.isPidAlive(daemonPid) && // Guards against a stale pidfile whose PID got reused.
+  await probe.daemonResponds()) {
+    return { kind: "daemon", pid: daemonPid };
   }
   return { kind: "stale" };
 }
@@ -29364,9 +29362,15 @@ async function snapshotProjectStatus(restPort, project, body) {
   }
   return [{ name: project, status: await probeProjectHealth(restPort, project) }];
 }
-async function waitForDaemonReady(restPort, project, timeoutMs) {
-  const deadline = Date.now() + timeoutMs;
-  let lastBootstrapping = [];
+var STILL_WAITING_INTERVAL_MS = 1e4;
+function daemonProgressLine(project, event) {
+  if (event.kind === "starting") return `starting the daemon for ${project}\u2026`;
+  return `still waiting for ${project}'s daemon (${Math.round(event.elapsedMs / 1e3)}s)`;
+}
+async function waitForDaemonReady(restPort, project, timeoutMs, onProgress, reminderIntervalMs = STILL_WAITING_INTERVAL_MS) {
+  const startedAt = Date.now();
+  const deadline = startedAt + timeoutMs;
+  let nextReminderAt = startedAt + reminderIntervalMs;
   while (Date.now() < deadline) {
     const body = await fetchDaemonHealth(restPort);
     if (body !== null) {
@@ -29376,15 +29380,10 @@ async function waitForDaemonReady(restPort, project, timeoutMs) {
       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;
-      }
+    }
+    if (Date.now() >= nextReminderAt) {
+      onProgress?.({ kind: "waiting", elapsedMs: Date.now() - startedAt });
+      nextReminderAt += reminderIntervalMs;
     }
     await new Promise((r) => setTimeout(r, PROBE_INTERVAL_MS));
   }
@@ -29596,7 +29595,8 @@ async function ensureProjectDaemon(opts) {
       projectPath: opts.projectPath,
       ports: allocated
     });
-    const ready = await waitForDaemonReady(allocated.rest, opts.project, timeoutMs);
+    opts.onProgress?.({ kind: "starting" });
+    const ready = await waitForDaemonReady(allocated.rest, opts.project, timeoutMs, opts.onProgress);
     if (!ready.ready) {
       return {
         status: "timed-out",
@@ -29742,7 +29742,8 @@ async function runOrchestrator(opts) {
   const outcome = await ensureProjectDaemon({
     project: currentProjectName,
     projectPath: opts.scanPath,
-    timeoutMs
+    timeoutMs,
+    onProgress: (event) => console.log(`neat: ${daemonProgressLine(currentProjectName, event)}`)
   });
   const allocated = "ports" in outcome ? outcome.ports : null;
   switch (outcome.status) {
@@ -31811,7 +31812,13 @@ async function runUpCommand(argv, deps) {
     err("neat up: that daemon doesn't run on this machine, so it isn't yours to start.");
     return 2;
   }
-  const outcome = await ensure({ project: entry2.name, projectPath: entry2.path });
+  const project = entry2.name;
+  const outcome = await ensure({
+    project,
+    projectPath: entry2.path,
+    // `--json` prints one object and nothing else, so progress stays quiet there.
+    ...args.json ? {} : { onProgress: (event) => out(`neat up: ${daemonProgressLine(project, event)}`) }
+  });
   const log = daemonLogPath(entry2.path);
   if (args.json) {
     const ports = "ports" in outcome ? outcome.ports : void 0;