@niroai/niro 0.9.0 → 0.10.1

package/src/lib/prompt.js

@@ -18,6 +18,9 @@ function rl() {
  * Also shared by the MCP setup/teardown wizards' own ask() helpers.
  */
 function formatPrompt(question, defaultValue) {
+  // Questions asked from inside a nested step sit at that step's depth. readline writes
+  // straight to stdout, so withIndent's console wrappers never see them.
+  question = " ".repeat(require("./nestedOutput").currentIndent()) + question;
   return defaultValue != null && defaultValue !== ""
     ? `${question} ${color.dim(`(default: ${defaultValue})`)}: `
     : `${question}: `;

package/src/lib/service.js

@@ -68,26 +68,30 @@ function install() {
   // Stop any existing instance so we can re-register cleanly
   spawnSync("pm2", ["delete", PROCESS_NAME], { shell: true, stdio: "pipe" });
 
-  // Start niro-watch under PM2
+  // PM2's own output is captured, not inherited. Inheriting it put ~55 lines into the middle
+  // of setup: a box-drawing process table, the entire generated systemd unit file, and the
+  // user's PATH twice. None of it is ours and none of it is actionable while it is working.
+  // It IS printed on failure, where it is the only diagnostic there is.
   const startResult = spawnSync(
     "pm2",
     ["start", niroBin, "--name", PROCESS_NAME, "--", "watch"],
-    { shell: true, stdio: "inherit" }
+    { shell: true, encoding: "utf8" }
   );
   if (startResult.status !== 0) {
+    console.error(color.dim(`${startResult.stdout || ""}${startResult.stderr || ""}`));
     throw new Error("pm2 start failed");
   }
 
   // Persist the process list so PM2 restores it after a manual `pm2 resurrect`
-  spawnSync("pm2", ["save"], { shell: true, stdio: "inherit" });
+  spawnSync("pm2", ["save"], { shell: true, encoding: "utf8" });
 
   // Wire into OS startup — pm2 startup detects systemd / launchd / etc.
   // It prints the exact privileged command we need to run.
   console.log(
-    `\n  ${color.bold("Setting up auto-start on login")} — PM2 will ask for your password to register`
+    `\n    ${color.bold("Setting up auto-start on login")} — PM2 will ask for your password to register`
   );
   console.log(
-    `  with the system startup manager (${getInitSystem()}). This only needs to happen once.\n`
+    `    with the system startup manager (${getInitSystem()}). This only needs to happen once.\n`
   );
 
   const startupProbe = spawnSync("pm2", ["startup"], {
@@ -97,21 +101,25 @@ function install() {
 
   const setupCmd = extractSetupCommand(startupProbe.stdout + startupProbe.stderr);
   if (setupCmd) {
-    console.log(`  Running: ${color.dim(setupCmd)}\n`);
+    console.log(`    Running: ${color.dim(setupCmd)}\n`);
+    // stdio is split: stdin stays connected so sudo can still prompt for the password, but
+    // PM2's forty lines of generated unit file are captured and only shown if it fails.
     const r = spawnSync(setupCmd, {
       shell: true,
-      stdio: "inherit",
+      stdio: ["inherit", "pipe", "pipe"],
+      encoding: "utf8",
     });
     if (r.status !== 0) {
+      console.error(color.dim(`${r.stdout || ""}${r.stderr || ""}`));
       console.log(
         color.yellow(
-          `  ⚠ Startup hook failed (exit ${r.status}). You can run it manually:\n    ${setupCmd}`
+          `    ⚠ Startup hook failed (exit ${r.status}). You can run it manually:\n    ${setupCmd}`
         )
       );
     }
   } else {
     // PM2 may print nothing if startup is already configured
-    console.log(`  ${color.green("✓")} Startup already configured.`);
+    console.log(`    ${color.green("✓")} Startup already configured.`);
   }
 
   return true;
@@ -127,7 +135,7 @@ function uninstall() {
   spawnSync("pm2", ["save"], { shell: true, stdio: "inherit" });
 
   console.log(
-    `\n  ${color.bold("Removing auto-start hook")} — PM2 may ask for your password.\n`
+    `\n    ${color.bold("Removing auto-start hook")} — PM2 may ask for your password.\n`
   );
   const unstartupResult = spawnSync("pm2", ["unstartup"], {
     shell: true,
@@ -137,7 +145,7 @@ function uninstall() {
     unstartupResult.stdout + unstartupResult.stderr
   );
   if (setupCmd) {
-    console.log(`  Running: ${color.dim(setupCmd)}\n`);
+    console.log(`    Running: ${color.dim(setupCmd)}\n`);
     spawnSync(setupCmd, { shell: true, stdio: "inherit" });
   }
 
@@ -149,7 +157,7 @@ function uninstall() {
  */
 function status() {
   if (!pm2Available()) {
-    console.log(color.yellow("  PM2 is not installed. Run: npm install -g pm2"));
+    console.log(color.yellow("    PM2 is not installed. Run: npm install -g pm2"));
     return;
   }
   spawnSync("pm2", ["show", PROCESS_NAME], { shell: true, stdio: "inherit" });

package/src/lib/spinner.js

@@ -22,6 +22,17 @@ const FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "
 const FRAME_MS = 120;
 const HEARTBEAT_MS = 30_000;
 const ERASE_LINE = "\r\x1b[2K";
+
+/**
+ * Current nesting depth as spaces.
+ *
+ * The spinner writes straight to the stream, so withIndent's console wrappers never see it.
+ * Left alone, the build status and its "Build completed" line print flush left in the middle
+ * of an indented step, which is where they were.
+ */
+function pad() {
+  return " ".repeat(require("./nestedOutput").currentIndent());
+}
 const ANSI_RE = /\x1b\[[0-9;]*m/g;
 
 /**
@@ -40,8 +51,18 @@ function fit(line, width) {
  * Labels can carry backend text (e.g. build log messages); an embedded
  * newline would defeat the single-line overwrite, so flatten whitespace.
  */
+/**
+ * Flatten a label to one line, but KEEP its leading indent.
+ *
+ * The old version trimmed both ends, which silently ate the indent callers use to place the
+ * label in the output tree: "        Waiting for build..." came out flush left, four columns
+ * off from every line around it. Interior whitespace still collapses, because a newline would
+ * defeat the single-line overwrite.
+ */
 function sanitize(label) {
-  return String(label).replace(/\s+/g, " ").trim();
+  const text = String(label);
+  const indent = /^[ \t]*/.exec(text)[0].replace(/\t/g, "  ");
+  return indent + text.replace(/\s+/g, " ").trim();
 }
 
 function start(label, opts = {}) {
@@ -58,9 +79,9 @@ function start(label, opts = {}) {
   let stopped = false;
 
   if (!isTty) {
-    stream.write(`${label}\n`);
+    stream.write(`${pad()}${label}\n`);
     const timer = setInterval(() => {
-      stream.write(`${label} ${color.dim(`(still waiting — ${elapsed()}s)`)}\n`);
+      stream.write(`${pad()}${label} ${color.dim(`(still waiting — ${elapsed()}s)`)}\n`);
     }, heartbeatMs);
     if (timer.unref) timer.unref();
     return {
@@ -68,13 +89,13 @@ function start(label, opts = {}) {
         newLabel = sanitize(newLabel);
         if (stopped || newLabel === label) return;
         label = newLabel;
-        stream.write(`${label}\n`);
+        stream.write(`${pad()}${label}\n`);
       },
       stop(finalLine) {
         clearInterval(timer);
         if (stopped) return;
         stopped = true;
-        if (finalLine) stream.write(finalLine + "\n");
+        if (finalLine) stream.write(pad() + finalLine + "\n");
       },
     };
   }
@@ -83,7 +104,7 @@ function start(label, opts = {}) {
   const render = () => {
     const frame = FRAMES[i = (i + 1) % FRAMES.length];
     const line = `${color.cyan(frame)} ${label} ${color.dim("(" + elapsed() + "s)")}`;
-    stream.write(ERASE_LINE + fit(line, (stream.columns || 80) - 1));
+    stream.write(ERASE_LINE + pad() + fit(line, (stream.columns || 80) - 1 - pad().length));
   };
 
   render();
@@ -101,7 +122,7 @@ function start(label, opts = {}) {
       if (stopped) return;
       stopped = true;
       stream.write(ERASE_LINE);
-      if (finalLine) stream.write(finalLine + "\n");
+      if (finalLine) stream.write(pad() + finalLine + "\n");
     },
   };
 }

package/src/lib/watchDaemon.js

@@ -33,7 +33,7 @@ const color = require("./color");
  */
 async function ensureWatchDaemon({ skipPrompts = false } = {}) {
   if (!service.pm2Available()) {
-    console.log(`\n  ${color.yellow("⚠")} PM2 is not installed. Niro uses PM2 to keep your synced folders`);
+    console.log(`\n    ${color.yellow("⚠")} PM2 is not installed. Niro uses PM2 to keep your synced folders`);
     console.log(`    up to date in the background, including after a reboot.`);
 
     if (skipPrompts || prompt.isNonInteractive()) {
@@ -49,29 +49,29 @@ async function ensureWatchDaemon({ skipPrompts = false } = {}) {
 
     console.log("");
     if (!service.installPm2()) {
-      console.log(`\n  ${color.yellow("⚠")} PM2 install failed (a permission error is the usual cause).`);
+      console.log(`\n    ${color.yellow("⚠")} PM2 install failed (a permission error is the usual cause).`);
       console.log(`    Try manually: ${color.cyan("sudo npm install -g pm2")} then ${color.cyan("niro service install")}`);
       return { ok: false, reason: "pm2_install_failed" };
     }
-    console.log(`  ${color.green("✓")} PM2 installed.`);
+    console.log(`    ${color.green("✓")} PM2 installed.`);
   }
 
-  console.log(`\n  ${color.cyan("●")}  Installing niro-watch daemon (keeps your synced folders up to date, auto-starts on login)...`);
+  console.log(`\n    ${color.cyan("●")}  Installing niro-watch daemon (keeps your synced folders up to date, auto-starts on login)...`);
   try {
     // install() returns false when pm2 turns out not to be runnable after
     // all — e.g. npm installed it into a global bin dir that isn't on PATH
     // (npm exits 0 for that). Treat it as the failure it is; the old code's
     // unchecked call here is how "✓ Done." lied to customers.
     if (!service.install()) {
-      console.log(`       ${color.yellow("⚠")} PM2 was installed but isn't runnable from this shell (its global bin`);
-      console.log(`       directory may not be on your PATH). Open a NEW terminal and run ${color.cyan("niro service install")}.`);
+      console.log(`        ${color.yellow("⚠")} PM2 was installed but isn't runnable from this shell (its global bin`);
+      console.log(`        directory may not be on your PATH). Open a NEW terminal and run ${color.cyan("niro service install")}.`);
       return { ok: false, reason: "daemon_install_failed" };
     }
-    console.log(`       ${color.green("✓")} niro-watch is running and will start automatically on login.`);
+    console.log(`        ${color.green("✓")} niro-watch is running and will start automatically on login.`);
     return { ok: true };
   } catch (err) {
-    console.log(`       ${color.yellow("⚠")} Could not install the watch daemon: ${err.message}`);
-    console.log(`       Run ${color.cyan("niro service install")} to try again, or ${color.cyan("niro watch")} to sync manually.`);
+    console.log(`        ${color.yellow("⚠")} Could not install the watch daemon: ${err.message}`);
+    console.log(`        Run ${color.cyan("niro service install")} to try again, or ${color.cyan("niro watch")} to sync manually.`);
     return { ok: false, reason: "daemon_install_failed" };
   }
 }