@niroai/niro 0.9.0 → 0.10.0

package/src/commands/edit.js

@@ -218,7 +218,7 @@ async function setEnv(projectId, pairs, opts) {
     console.log(JSON.stringify({ project_id: projectId, git_id: gitId, changed_keys: changedKeys }));
   } else {
     console.log(`${color.green("✓")} Updated env var(s) on repo ${color.dim(gitId)}: ${changedKeys.map((k) => color.bold(k)).join(", ")}`);
-    console.log(color.dim("  (values are not shown)"));
+    console.log(color.dim("    (values are not shown)"));
   }
 }
 
@@ -291,12 +291,12 @@ async function listEnv(projectId, opts) {
     const appears = s.appears_in > 1
       ? color.yellow(` (appears in ${s.appears_in} files)`)
       : (s.appears_in === 1 ? color.dim(" (1 file)") : "");
-    console.log(`  - ${color.bold(s.key)}${set}${src}${appears}`);
+    console.log(`    - ${color.bold(s.key)}${set}${src}${appears}`);
     if (s.appears_in > 1) {
       for (const c of s.candidates) {
         const shown = c.value == null ? color.dim("(empty)") : c.value;
         const marker = c.is_current ? color.green("  [current]") : "";
-        console.log(`      ${color.dim("•")} ${c.source_file}: ${shown}${marker}`);
+        console.log(`        ${color.dim("•")} ${c.source_file}: ${shown}${marker}`);
       }
     }
   }
@@ -583,14 +583,14 @@ function maskPair(pair) {
 
 function printUsage() {
   console.error("niro edit — change an existing project. At least one action is required:");
-  console.error("  --add-repo <gitId>        map a registered repo to the project");
-  console.error("  --remove-repo <gitId>     unmap a repo (non-destructive)");
-  console.error("  --set-env KEY=VALUE       set an env var (repeatable; value never printed)");
-  console.error("  --set-env-from KEY=FILE   adopt the value FILE carries for KEY (repeatable; value never printed)");
-  console.error("  --active-files <files>    property files to keep active for env-var defaults; the rest are ignored (default: all)");
-  console.error("  --list-env               list env var keys + per-file candidates (secret values masked)");
-  console.error("  --rescan-env             rescan the repo for env vars");
-  console.error("  --alias <newAlias>       rename the project");
+  console.error("    --add-repo <gitId>        map a registered repo to the project");
+  console.error("    --remove-repo <gitId>     unmap a repo (non-destructive)");
+  console.error("    --set-env KEY=VALUE       set an env var (repeatable; value never printed)");
+  console.error("    --set-env-from KEY=FILE   adopt the value FILE carries for KEY (repeatable; value never printed)");
+  console.error("    --active-files <files>    property files to keep active for env-var defaults; the rest are ignored (default: all)");
+  console.error("    --list-env               list env var keys + per-file candidates (secret values masked)");
+  console.error("    --rescan-env             rescan the repo for env vars");
+  console.error("    --alias <newAlias>       rename the project");
   console.error("Target project: --project <alias|id>, or a .niro-project pin in this folder.");
   console.error("Env actions target --repo <gitId> (auto-selected when the project has one repo).");
 }

package/src/commands/info.js

@@ -218,7 +218,7 @@ function printHuman(p) {
     if (proj.status) bits.push(`status: ${proj.status}`);
     if (proj.doc_gen_status) bits.push(`docs: ${proj.doc_gen_status}`);
     if (proj.updated_at) bits.push(`updated: ${proj.updated_at}`);
-    console.log(`  - ${name}${bits.length ? "  — " + color.dim(bits.join(", ")) : ""}`);
+    console.log(`    - ${name}${bits.length ? "  — " + color.dim(bits.join(", ")) : ""}`);
     for (const f of proj.folders || []) {
       // Marked so the folder you are STANDING IN is obvious at a glance; the whole point is telling
       // "this worktree is the one Niro reflects" from "this one is not".
@@ -233,7 +233,7 @@ function printHuman(p) {
         temp = color.dim(` via temporary project ${f.temp_project_id}`)
           + (f.reflected === null ? color.dim(" (could not confirm)") : "");
       }
-      console.log(color.dim(`      syncing from ${f.path}`) +
+      console.log(color.dim(`        syncing from ${f.path}`) +
         (f.branch ? color.dim(` on branch ${f.branch}`) : "") + temp + here);
     }
   }

package/src/commands/init.js

@@ -41,6 +41,12 @@ const color = require("../lib/color");
 const watchDaemon = require("../lib/watchDaemon");
 const { login } = require("./login");
 const { watchStatus } = require("./build");
+const { currentIndent } = require("../lib/nestedOutput");
+
+/** Depth as spaces, for the \r-written lines that bypass withIndent's console wrappers. */
+function nestPad() {
+  return " ".repeat(currentIndent());
+}
 const { fetchPreview, buildCandidates } = require("./edit");
 const { resolveProjectId } = require("./_resolveProject");
 const { projectsToRows } = require("./projects");
@@ -52,6 +58,13 @@ const warn = (s) => color.yellow(s);
 const fail = (s) => color.red(s);
 
 async function init(pathArg, opts = {}) {
+  // Set by `niro start`, which frames its own steps around this one. Two things then change,
+  // both presentation only: the internal 1/3..3/3 markers are dropped (they collided with the
+  // wizard's own 4/5 and read as a second, conflicting count), and the closing banner is left
+  // to the wizard, which was otherwise telling the user to run `niro mcp install` immediately
+  // before doing it for them.
+  const nested = !!opts.nested;
+  const substep = (n) => (nested ? step("●") : step(n));
   const targetDir = resolveTargetDir(pathArg);
   // Validate flag values up-front so a bad --auto-build/--confirm-build/--quiet-period
   // fails BEFORE any server-side mutation (otherwise a typo leaves an orphan project).
@@ -143,10 +156,10 @@ async function init(pathArg, opts = {}) {
   // inconclusive — make the user (or an agent, via --force) confirm rather than proceed.
   if (gitInfo.originUrl && (resolveFailed || ctx.state === "error")) {
     console.log(warn(
-      `\n  ⚠ Couldn't verify whether this repo is already registered` +
+      `\n    ⚠ Couldn't verify whether this repo is already registered` +
       `${ctx.error ? ` (${ctx.error})` : ""}.`
     ));
-    if (!(await requireProceed("  Proceed without the duplicate check?", opts))) {
+    if (!(await requireProceed("    Proceed without the duplicate check?", opts))) {
       process.exitCode = 1;
       return;
     }
@@ -181,7 +194,7 @@ async function init(pathArg, opts = {}) {
         branch: defaultBranch || null,
         tracked: true, // locally-tracked for detection only; no gitId => daemon never syncs it
       }, currentApiUrl);
-      console.log(color.dim("  Niro is now tracking this folder locally (no sandbox) so cross-repo answers can include it."));
+      console.log(color.dim("    Niro is now tracking this folder locally (no sandbox) so cross-repo answers can include it."));
     }
 
     if (onIndexedBranch.length) {
@@ -192,12 +205,12 @@ async function init(pathArg, opts = {}) {
       if (!opts.addTo) {
         if (prompt.isNonInteractive()) {
           console.log(color.dim(
-            "  Already indexed — nothing to do. Pass --add-to <project> to also map it elsewhere, or run 'niro build' to re-index."
+            "    Already indexed — nothing to do. Pass --add-to <project> to also map it elsewhere, or run 'niro build' to re-index."
           ));
           return;
         }
-        if (!(await prompt.confirm("  Add it to a DIFFERENT project too?", false))) {
-          console.log(color.dim("  Nothing to do — use 'niro build' to re-index or 'niro edit' to manage it."));
+        if (!(await prompt.confirm("    Add it to a DIFFERENT project too?", false))) {
+          console.log(color.dim("    Nothing to do — use 'niro build' to re-index or 'niro edit' to manage it."));
           return;
         }
       }
@@ -209,17 +222,17 @@ async function init(pathArg, opts = {}) {
         .join(", ");
       const yourBranch = defaultBranch ? `\`${defaultBranch}\`` : "your current branch";
       console.log(`\n${color.green("✓")} This repo is part of: ${where}.`);
-      console.log(`  But ${yourBranch} isn't indexed by Niro — answers would reflect the indexed branch, not your local work.`);
-      console.log(`  ${color.cyan("Run `niro sandbox` here")} to index your branch privately ` +
+      console.log(`    But ${yourBranch} isn't indexed by Niro — answers would reflect the indexed branch, not your local work.`);
+      console.log(`    ${color.cyan("Run `niro sandbox` here")} to index your branch privately ` +
         color.dim("(original project unchanged; `niro discard` to undo)."));
       if (!opts.addTo) {
         if (prompt.isNonInteractive()) {
           console.log(color.dim(
-            "  Pass --add-to <project> to map this repo into a DIFFERENT project, or run 'niro sandbox' for your branch."
+            "    Pass --add-to <project> to map this repo into a DIFFERENT project, or run 'niro sandbox' for your branch."
           ));
           return;
         }
-        if (!(await prompt.confirm("  Add this repo to a DIFFERENT project instead?", false))) {
+        if (!(await prompt.confirm("    Add this repo to a DIFFERENT project instead?", false))) {
           return;
         }
       }
@@ -232,29 +245,29 @@ async function init(pathArg, opts = {}) {
   // catches children indexed via the web UI / as separate repos.
   const childScan = await scanIndexedChildren(targetDir, opts);
   if (childScan.indexed.length) {
-    console.error(fail(`\n  This folder contains ${childScan.indexed.length} repo(s) already indexed in Niro:`));
+    console.error(fail(`\n    This folder contains ${childScan.indexed.length} repo(s) already indexed in Niro:`));
     for (const c of childScan.indexed) {
       const where = c.projects.map((p) => `"${p.alias || p.project_id}"`).join(", ");
-      console.error(`      ${c.name} -> ${where}`);
+      console.error(`        ${c.name} -> ${where}`);
     }
-    console.error("  A parent of already-indexed repos can't be onboarded — it would upload that content again.");
-    console.error("  Onboard each repo from its own folder instead.");
+    console.error("    A parent of already-indexed repos can't be onboarded — it would upload that content again.");
+    console.error("    Onboard each repo from its own folder instead.");
     // Hard refuse: there's no legitimate reason to upload a parent over indexed repos.
     // --force stays as a deliberate escape hatch for scripts/agents that really mean it.
     if (!opts.force) {
       process.exitCode = 1;
       return;
     }
-    console.log(warn("  --force set — onboarding the parent anyway."));
+    console.log(warn("    --force set — onboarding the parent anyway."));
   }
   if (childScan.unverified.length) {
     console.log(warn(
-      `  ⚠ Couldn't check ${childScan.unverified.length} nested repo(s) ` +
+      `    ⚠ Couldn't check ${childScan.unverified.length} nested repo(s) ` +
       `(${childScan.unverified.map((c) => c.name).join(", ")}) — they may also be indexed.`
     ));
   }
   if (childScan.truncated) {
-    console.log(color.dim(`  (Stopped after the first ${CHILD_SCAN_MAX} nested repos; deeper ones weren't checked.)`));
+    console.log(color.dim(`    (Stopped after the first ${CHILD_SCAN_MAX} nested repos; deeper ones weren't checked.)`));
   }
   const indexedChildPaths = new Set(childScan.indexed.map((c) => path.resolve(c.path)));
 
@@ -307,17 +320,17 @@ async function init(pathArg, opts = {}) {
   const crossRemote = ctxProjects.find((p) => p.source_type === "REMOTE_GIT");
   if (crossUpload) {
     console.log(warn(
-      `\n  ⚠ This repo is already registered in project "${crossUpload.project_id}"; ` +
+      `\n    ⚠ This repo is already registered in project "${crossUpload.project_id}"; ` +
       `reusing that repo, attaching to "${projectId}" without re-uploading.`
     ));
     reuseGitId = crossUpload.git_id;
     skipUpload = true;
   } else if (crossRemote) {
     console.log(warn(
-      `\n  ⚠ This repo is already a REMOTE repo in project "${crossRemote.project_id}"; ` +
+      `\n    ⚠ This repo is already a REMOTE repo in project "${crossRemote.project_id}"; ` +
       `proceeding uploads a SEPARATE local copy.`
     ));
-    if (!(await requireProceed("  Proceed and upload a separate local copy?", opts))) {
+    if (!(await requireProceed("    Proceed and upload a separate local copy?", opts))) {
       process.exitCode = 1;
       return;
     }
@@ -334,10 +347,10 @@ async function init(pathArg, opts = {}) {
       return;
     }
     console.log(warn(
-      `\n  ⚠ This folder overlaps "${o.path}"` +
+      `\n    ⚠ This folder overlaps "${o.path}"` +
       `${o.projectId ? ` (in project "${o.projectId}")` : ""}.`
     ));
-    if (!(await requireProceed("  Proceed despite the folder overlap?", opts))) {
+    if (!(await requireProceed("    Proceed despite the folder overlap?", opts))) {
       process.exitCode = 1;
       return;
     }
@@ -357,27 +370,27 @@ async function init(pathArg, opts = {}) {
     // reuseGitId came straight from resolveContext (the current backend), so it
     // is known-good — no existence check needed.
     gitId = reuseGitId;
-    console.log(`\n  ${step("●")}  Reusing already-registered repo (gitId ${color.dim(gitId)}); skipping re-upload.`);
+    console.log(`\n    ${step("●")}  Reusing already-registered repo (gitId ${color.dim(gitId)}); skipping re-upload.`);
   } else if (existing && existing.gitId) {
     if (ctxProjects.some((p) => p.git_id === existing.gitId)) {
       // Already mapped to >=1 project on THIS backend -> fully onboarded, and the
       // server just vouched for it via resolveContext. Reuse, skip the upload.
       gitId = existing.gitId;
       skipUpload = true;
-      console.log(`\n  ${step("●")}  Reusing already-registered repo (gitId ${color.dim(gitId)}); skipping re-upload.`);
+      console.log(`\n    ${step("●")}  Reusing already-registered repo (gitId ${color.dim(gitId)}); skipping re-upload.`);
     } else if (await agentApi.repoExists(existing.gitId)) {
       // Registered but not yet in any project (partial onboarding interrupted
       // before the project POST). The repo still exists on this backend -> finish
       // it by uploading.
       gitId = existing.gitId;
-      console.log(`\n  ${step("●")}  Reusing already-registered repo (gitId ${color.dim(gitId)}).`);
+      console.log(`\n    ${step("●")}  Reusing already-registered repo (gitId ${color.dim(gitId)}).`);
     } else {
       // Self-heal: the cached gitId does NOT exist on the current backend — the
       // backend was switched (cached gitId belongs to another stack) or the repo
       // was deleted. Drop the stale entry and register fresh instead of crashing
       // on the first call with a dead gitId.
       console.log(warn(
-        `\n  ⚠ Cached repo (gitId ${existing.gitId}) is not on this backend — ` +
+        `\n    ⚠ Cached repo (gitId ${existing.gitId}) is not on this backend — ` +
         `re-registering it here.`
       ));
       watchState.remove(targetDir);
@@ -407,7 +420,7 @@ async function init(pathArg, opts = {}) {
       fileHashes: {},
       lastSyncedAt: null,
     }, currentApiUrl);
-    console.log(`\n  ${step("●")}  Registered repo for upload (gitId ${color.dim(gitId)}).`);
+    console.log(`\n    ${step("●")}  Registered repo for upload (gitId ${color.dim(gitId)}).`);
   }
 
   // UPLOAD STEP — skipped entirely when reusing a repo that is ALREADY mapped to a
@@ -419,7 +432,7 @@ async function init(pathArg, opts = {}) {
 
     // Build the manifest, surface oversize files (the 256 KiB server cap skips
     // them), then ask the server which files to include.
-    process.stdout.write(`\n  Scanning ${color.cyan(targetDir)}...`);
+    process.stdout.write(`\n${nestPad()}        Scanning ${color.cyan(targetDir)}...`);
     const manifest = folderSync.buildManifest(targetDir);
     process.stdout.write(` ${manifest.length} files found.\n`);
     const filterResult = await agentApi.filterManifest(gitId, manifest);
@@ -430,7 +443,7 @@ async function init(pathArg, opts = {}) {
     const excludedCount = filterResult.excluded_count || filterResult.excludedCount || 0;
     const includePatterns = filterResult.include_patterns || filterResult.includePatterns || [];
     const excludePatterns = filterResult.exclude_patterns || filterResult.excludePatterns || [];
-    console.log(`       ${ok("Will sync:")} ${includedCount} files   ${warn("Excluded:")} ${excludedCount} files`);
+    console.log(`        ${ok("Will sync:")} ${includedCount} files   ${warn("Excluded:")} ${excludedCount} files`);
 
     // Push include/exclude patterns to the server so the build pipeline respects
     // them. module_path "" (root) — there is no build-file-detected module yet.
@@ -442,18 +455,18 @@ async function init(pathArg, opts = {}) {
           excluded: excludePatterns,
         });
       } catch (err) {
-        console.log(warn(`       ⚠ Could not save patterns to server: ${err.message}`));
+        console.log(warn(`        ⚠ Could not save patterns to server: ${err.message}`));
       }
     }
     watchState.update(targetDir, { includePatterns, excludePatterns });
 
-    console.log(`\n  ${step("1/3")}  Uploading ${includedPaths.length} files (branch ${color.cyan(defaultBranch || "detached HEAD")})...`);
+    console.log(`\n    ${substep("1/3")}  Uploading ${includedPaths.length} files (branch ${color.cyan(defaultBranch || "detached HEAD")})...`);
     // Reuse the sizes the manifest already computed so the aggregate guard does not re-stat every file.
     const sizes = {};
     for (const m of manifest) sizes[m.path] = m.size_bytes;
     await folderSync.doInitialSync(gitId, targetDir, includedPaths, { sizes });
   } else {
-    console.log(`  ${step("1/3")}  ${ok("Skipping upload — the server already has this repo's files.")}`);
+    console.log(`    ${substep("1/3")}  ${ok("Skipping upload — the server already has this repo's files.")}`);
   }
 
   let project;
@@ -462,13 +475,13 @@ async function init(pathArg, opts = {}) {
     // same git-mappings endpoint `niro edit --add-repo` uses. Do NOT create a
     // project. The discovered env vars come back via the preview fetch below,
     // not from this response (POST git-mappings returns the updated project).
-    console.log(`  ${step("2/3")}  Adding repo to existing project "${color.bold(projectId)}" and scanning for environment variables...`);
+    console.log(`    ${substep("2/3")}  Adding repo to existing project "${color.bold(projectId)}" and scanning for environment variables...`);
     project = await api.post(
       `/api/projects/${encodeURIComponent(projectId)}/git-mappings`,
       { [gitId]: {} }
     );
   } else {
-    console.log(`  ${step("2/3")}  Creating project "${color.bold(projectId)}" and scanning for environment variables...`);
+    console.log(`    ${substep("2/3")}  Creating project "${color.bold(projectId)}" and scanning for environment variables...`);
     // Send the chosen name as `alias` (account-scoped, duplicates across
     // accounts allowed by design) — never as `project_id`. Letting the server
     // assign the opaque project_id avoids colliding with an unrelated
@@ -488,13 +501,13 @@ async function init(pathArg, opts = {}) {
   // tools / `niro build` defaults) follow the most recent one.
   if (existing && existing.projectId && existing.projectId !== projectId) {
     console.log(warn(
-      `       ⚠ This folder was pinned to "${existing.projectId}"; it stays mapped there, ` +
+      `        ⚠ This folder was pinned to "${existing.projectId}"; it stays mapped there, ` +
       `but is now also attached to "${projectId}" and re-pinned to it.`
     ));
   }
   const { path: pinPath } = niroProjectFile.write(repoRoot, projectId, { overwrite: true });
   watchState.update(targetDir, { projectId });
-  console.log(`       ${ok("✓")} Pinned project to ${color.dim(pinPath)}`);
+  console.log(`        ${ok("✓")} Pinned project to ${color.dim(pinPath)}`);
 
   let envVars = extractEnvVars(project, gitId);
   // EXISTING mode attaches via POST /git-mappings, whose response may not carry the
@@ -518,9 +531,9 @@ async function init(pathArg, opts = {}) {
   }
   let filledVars = envVars;
   if (envVars.length === 0) {
-    console.log("       No env vars detected in this repo — skipping.");
+    console.log("        No env vars detected in this repo — skipping.");
   } else if (opts.defaults) {
-    console.log(`       Found ${envVars.length} env var(s); leaving all at defaults (--defaults).`);
+    console.log(`        Found ${envVars.length} env var(s); leaving all at defaults (--defaults).`);
   } else if (prompt.isNonInteractive()) {
     console.error(fail(
       `Found ${envVars.length} env var(s) that need values and no terminal is available to prompt.\n` +
@@ -529,7 +542,7 @@ async function init(pathArg, opts = {}) {
     process.exitCode = 1;
     return;
   } else {
-    console.log(`       Found ${envVars.length} env var(s). When a var appears in several files, pick which file's value to use.`);
+    console.log(`        Found ${envVars.length} env var(s). When a var appears in several files, pick which file's value to use.`);
     // Show, per var, the candidate value each committed file carries (source-file
     // parity with the web UI). Reuse the preview fetched above when available; if a
     // fresh fetch fails, fall back to a plain prompt rather than blocking onboarding.
@@ -542,7 +555,7 @@ async function init(pathArg, opts = {}) {
         activePropertiesFiles = preview.activePropertiesFiles;
       } catch (err) {
         varsByFile = {};
-        console.log(warn(`       ⚠ Could not load env-var source files (${err.message}) — prompting without candidates.`));
+        console.log(warn(`        ⚠ Could not load env-var source files (${err.message}) — prompting without candidates.`));
       }
     }
 
@@ -569,9 +582,9 @@ async function init(pathArg, opts = {}) {
   }
 
   if (opts.defaults) {
-    console.log("       Skipping indexing-scope review (--defaults).");
+    console.log("        Skipping indexing-scope review (--defaults).");
   } else if (prompt.isNonInteractive()) {
-    console.log("       Skipping indexing-scope review (no terminal to prompt; using detected defaults).");
+    console.log("        Skipping indexing-scope review (no terminal to prompt; using detected defaults).");
   } else {
     await reviewIndexingScope(gitId);
   }
@@ -582,7 +595,7 @@ async function init(pathArg, opts = {}) {
     const quietPeriodSeconds = parseQuietPeriod(opts.quietPeriod, 30);
     await saveAutoBuild(projectId, autoBuildFlag, quietPeriodSeconds);
   } else if (opts.defaults) {
-    console.log("       Leaving auto-build disabled (--defaults).");
+    console.log("        Leaving auto-build disabled (--defaults).");
   } else if (prompt.isNonInteractive()) {
     console.error(fail(
       "Auto-build setting is required and no terminal is available to prompt.\n" +
@@ -609,12 +622,12 @@ async function init(pathArg, opts = {}) {
     process.exitCode = 1;
     return;
   } else {
-    shouldBuild = await prompt.confirm("  Trigger a full index build now?", true);
+    shouldBuild = await prompt.confirm("    Trigger a full index build now?", true);
   }
   if (!shouldBuild) {
-    console.log(`       ${warn("⚠")} Skipping build. Run ${color.cyan("niro build")} when you're ready.`);
+    console.log(`        ${warn("⚠")} Skipping build. Run ${color.cyan("niro build")} when you're ready.`);
   } else {
-    console.log(`  ${step("3/3")}  Triggering full index build...`);
+    console.log(`    ${substep("3/3")}  Triggering full index build...`);
     await api.post(
       `/api/graph/${encodeURIComponent(projectId)}/build`,
       {},
@@ -622,7 +635,7 @@ async function init(pathArg, opts = {}) {
     );
 
     if (opts.watch === false) {
-      console.log(`       Build triggered. Run ${color.cyan("niro status")} to check progress.`);
+      console.log(`        Build triggered. Run ${color.cyan("niro status")} to check progress.`);
     } else {
       await watchStatus(projectId);
     }
@@ -634,12 +647,20 @@ async function init(pathArg, opts = {}) {
   // The closing banner must not read as an all-clear when auto-sync is dead —
   // customers were only discovering the missing daemon after a reboot.
   if (daemon.ok) {
-    console.log(`\n${ok("✓ Done.")} Niro MCP tools launched from this repo will now use this project automatically.`);
+    if (nested) {
+      console.log(`\n        ${ok("✓")} Indexed. Niro MCP tools launched from this repo will use this project.`);
+    } else {
+      console.log(`\n${ok("✓ Done.")} Niro MCP tools launched from this repo will now use this project automatically.`);
+    }
   } else {
     console.log(`\n${warn("✓ Done, with 1 warning:")} auto-sync is OFF — this folder will not stay in sync (see above for the fix).`);
     console.log(`Niro MCP tools launched from this repo will still use this project automatically.`);
   }
-  console.log(`Next: ${color.cyan("niro status")}, or ${color.cyan("niro mcp install")} to configure Claude Code / Cursor / Windsurf.`);
+  // The wizard prints its own closing screen, and step 5 IS the mcp install this line points
+  // at, so saying it here contradicts what happens two seconds later.
+  if (!nested) {
+    console.log(`Next: ${color.cyan("niro status")}, or ${color.cyan("niro mcp install")} to configure Claude Code / Cursor / Windsurf.`);
+  }
 }
 
 /**
@@ -654,7 +675,7 @@ async function init(pathArg, opts = {}) {
 async function requireProceed(msg, opts = {}) {
   if (opts.force) return true;
   if (prompt.isNonInteractive()) {
-    console.error(fail("  Pass --force to proceed past this warning."));
+    console.error(fail("    Pass --force to proceed past this warning."));
     return false;
   }
   return await prompt.confirm(msg, false);
@@ -797,7 +818,7 @@ async function fetchExistingProjects(opts) {
     const data = await api.get("/api/projects", { apiUrl: opts.apiUrl });
     return projectsToRows(data);
   } catch (err) {
-    console.log(warn(`  ⚠ Could not load your existing projects (${err.message}) — creating a new project.`));
+    console.log(warn(`    ⚠ Could not load your existing projects (${err.message}) — creating a new project.`));
     return [];
   }
 }
@@ -807,13 +828,13 @@ async function fetchExistingProjects(opts) {
  * "NEW", an existing project_id, or null when the answer is invalid.
  */
 async function chooseTarget(rows) {
-  console.log(`\n  ${color.bold("New project, or add to an existing one?")}`);
-  console.log(`    [n] create a new project`);
+  console.log(`\n    ${color.bold("New project, or add to an existing one?")}`);
+  console.log(`        [n] create a new project`);
   rows.forEach((r, i) => {
     const label = r.alias ? `${r.alias} (${color.dim(r.project_id)})` : color.dim(r.project_id);
-    console.log(`    [${i + 1}] ${label}`);
+    console.log(`        [${i + 1}] ${label}`);
   });
-  const answer = (await prompt.ask(`  Choose 'n' for new, or 1-${rows.length} to add to an existing project`, "n")).trim();
+  const answer = (await prompt.ask(`    Choose 'n' for new, or 1-${rows.length} to add to an existing project`, "n")).trim();
   if (!answer || answer.toLowerCase() === "n") return "NEW";
   const idx = Number.parseInt(answer, 10) - 1;
   if (Number.isInteger(idx) && idx >= 0 && idx < rows.length) {
@@ -882,13 +903,13 @@ async function resolveAvailableProjectName({ defaultName, opts }) {
 
   let candidate = defaultName;
   while (true) {
-    const answer = await prompt.ask("Project name", candidate);
+    const answer = await prompt.ask("    Project name", candidate);
     if (!answer) {
-      console.error(fail("Project name is required."));
+      console.error(fail("    Project name is required."));
       return null;
     }
     if (!(await aliasTaken(answer, opts))) return answer;
-    console.log(`  ${warn("⚠")} "${color.bold(answer)}" already exists on this account — pick another.`);
+    console.log(`    ${warn("⚠")} "${color.bold(answer)}" already exists on this account — pick another.`);
     candidate = answer;
   }
 }
@@ -913,18 +934,18 @@ async function reviewIndexingScope(gitId) {
   try {
     details = await api.get(`/api/git/${encodeURIComponent(gitId)}`);
   } catch (err) {
-    console.log(`       Could not fetch project resolutions (${err.message}) — skipping scope review.`);
+    console.log(`        Could not fetch project resolutions (${err.message}) — skipping scope review.`);
     return;
   }
   const resolutions = (details && (details.project_resolutions || details.projectResolutions)) || {};
   const modulePaths = Object.keys(resolutions);
   if (modulePaths.length === 0) {
-    console.log("       No module resolutions detected — skipping scope review.");
+    console.log("        No module resolutions detected — skipping scope review.");
     return;
   }
 
-  console.log(`\n  ${color.bold("Review indexing scope")} (${modulePaths.length} module(s) detected).`);
-  console.log(color.dim(`       Glob patterns use ** for recursive match. Press Enter to keep the detected set.`));
+  console.log(`\n    ${color.bold("Review indexing scope")} (${modulePaths.length} module(s) detected).`);
+  console.log(color.dim(`        Glob patterns use ** for recursive match. Press Enter to keep the detected set.`));
 
   for (const modulePath of modulePaths) {
     const resolution = resolutions[modulePath] || {};
@@ -933,12 +954,12 @@ async function reviewIndexingScope(gitId) {
     const pkg = resolution.package_name || resolution.packageName;
     const label = pkg ? `${modulePath} (${color.dim(pkg)})` : modulePath;
 
-    console.log(`\n       ${color.bold("[" + label + "]")}`);
-    console.log(`         ${color.green("Included")}: ${formatList(includeDirs)}`);
-    console.log(`         ${color.yellow("Excluded")}: ${formatList(excluded)}`);
+    console.log(`\n        ${color.bold("[" + label + "]")}`);
+    console.log(`            ${color.green("Included")}: ${formatList(includeDirs)}`);
+    console.log(`            ${color.yellow("Excluded")}: ${formatList(excluded)}`);
 
-    const addedIncludes = await promptGlobList("         Add inclusion patterns", GLOB_INCLUDE_EXAMPLES);
-    const addedExcludes = await promptGlobList("         Add exclusion patterns", GLOB_EXCLUDE_EXAMPLES);
+    const addedIncludes = await promptGlobList("        Add inclusion patterns", GLOB_INCLUDE_EXAMPLES);
+    const addedExcludes = await promptGlobList("        Add exclusion patterns", GLOB_EXCLUDE_EXAMPLES);
 
     if (addedIncludes.length === 0 && addedExcludes.length === 0) continue;
 
@@ -951,9 +972,9 @@ async function reviewIndexingScope(gitId) {
         include_dirs: nextIncludes,
         excluded: nextExcluded,
       });
-      console.log(`         ${ok("✓")} Updated.`);
+      console.log(`            ${ok("✓")} Updated.`);
     } catch (err) {
-      console.log(`         ${fail("✗")} Failed to update scope: ${err.message}`);
+      console.log(`            ${fail("✗")} Failed to update scope: ${err.message}`);
     }
   }
 }
@@ -968,10 +989,10 @@ async function promptGlobList(label, exampleHint) {
 }
 
 async function promptAutoBuild(projectId) {
-  const enabled = await prompt.confirm("  Enable auto-build when files change?", false);
+  const enabled = await prompt.confirm("    Enable auto-build when files change?", false);
   let quietPeriodSeconds = 30;
   if (enabled) {
-    const raw = await prompt.ask("  Quiet period in seconds before rebuild", "30");
+    const raw = await prompt.ask("    Quiet period in seconds before rebuild", "30");
     const parsed = Number.parseInt(raw, 10);
     if (Number.isFinite(parsed) && parsed >= 0) quietPeriodSeconds = parsed;
   }
@@ -985,9 +1006,9 @@ async function saveAutoBuild(projectId, enabled, quietPeriodSeconds) {
       quiet_period_seconds: quietPeriodSeconds,
     });
     const statusLabel = enabled ? ok(`ON (quiet ${quietPeriodSeconds}s)`) : color.dim("off");
-    console.log(`       Auto-build: ${statusLabel}.`);
+    console.log(`        Auto-build: ${statusLabel}.`);
   } catch (err) {
-    console.log(`       ${fail("✗")} Failed to save auto-build setting: ${err.message}`);
+    console.log(`        ${fail("✗")} Failed to save auto-build setting: ${err.message}`);
   }
 }
 
@@ -1066,13 +1087,13 @@ async function promptActivePropertyFiles(varsByFile, currentActive) {
     : null; // null => all active
   const isActive = (f) => activeSet == null || activeSet.has(f);
 
-  console.log(`\n    ${color.bold("Property files Niro found")} (their values become env-var defaults):`);
+  console.log(`\n        ${color.bold("Property files Niro found")} (their values become env-var defaults):`);
   files.forEach((f, i) => {
     const state = isActive(f) ? ok("[active]") : warn("[ignored]");
-    console.log(`      [${i + 1}] ${f} ${state}`);
+    console.log(`        [${i + 1}] ${f} ${state}`);
   });
   const answer = (await prompt.ask(
-    "      Enter to use ALL, or list numbers to IGNORE (e.g. 2,3)",
+    "        Enter to use ALL, or list numbers to IGNORE (e.g. 2,3)",
     ""
   )).trim();
 
@@ -1089,18 +1110,18 @@ async function promptActivePropertyFiles(varsByFile, currentActive) {
   );
   const active = files.filter((_f, i) => !ignoreIdx.has(i));
   if (active.length === files.length) {
-    console.log(color.dim("      No valid numbers recognised — keeping all property files active."));
+    console.log(color.dim("        No valid numbers recognised — keeping all property files active."));
     return files.slice();
   }
   if (active.length === 0) {
     // Ignoring every file isn't a durable state (an empty active set reads back as
     // "all active"). Keep all; the user can still leave values blank and set them
     // later with `niro edit --set-env`.
-    console.log(warn("      Can't ignore every property file — keeping all active."));
+    console.log(warn("        Can't ignore every property file — keeping all active."));
     return files.slice();
   }
   const ignored = files.filter((_f, i) => ignoreIdx.has(i));
-  console.log(`      ${warn("Ignoring")}: ${ignored.join(", ")}`);
+  console.log(`        ${warn("Ignoring")}: ${ignored.join(", ")}`);
   return active;
 }
 
@@ -1132,24 +1153,24 @@ async function promptEnvVars(envVars, varsByFile = {}, activeFiles = null) {
     const candidates = buildCandidates(varsByFile, key, v, activeFiles);
 
     if (candidates.length > 1) {
-      console.log(`\n    ${color.bold(key)}${currentSource ? color.dim(` (current: ${currentSource})`) : ""}`);
+      console.log(`\n        ${color.bold(key)}${currentSource ? color.dim(` (current: ${currentSource})`) : ""}`);
       candidates.forEach((c, i) => {
         // Mask when the key looks secret OR the value embeds credentials.
         const hide = secret || looksSecretValue(c.value);
         const shown = c.value == null ? "(empty)" : (hide ? "****" : c.value);
         const marker = (c.is_current || c.is_default) ? color.green("  [current default]") : "";
-        console.log(`      [${i + 1}] ${shown}   ${color.dim("from " + c.source_file)}${marker}`);
+        console.log(`        [${i + 1}] ${shown}   ${color.dim("from " + c.source_file)}${marker}`);
       });
-      console.log(`      [c] enter a custom value`);
-      const choice = (await prompt.ask(`      Choose 1-${candidates.length}, c, or Enter to keep current`, "")).trim();
+      console.log(`        [c] enter a custom value`);
+      const choice = (await prompt.ask(`        Choose 1-${candidates.length}, c, or Enter to keep current`, "")).trim();
       if (!choice) {
         out.push({ ...v });
         continue;
       }
       if (choice.toLowerCase() === "c") {
         const answer = secret
-          ? await prompt.askHidden(`      Value for ${key}`)
-          : await prompt.ask(`      Value for ${key}`, "");
+          ? await prompt.askHidden(`        Value for ${key}`)
+          : await prompt.ask(`        Value for ${key}`, "");
         out.push({ ...v, user_value: answer || null });
         continue;
       }
@@ -1170,10 +1191,10 @@ async function promptEnvVars(envVars, varsByFile = {}, activeFiles = null) {
     let hint = currentSource ? ` (from ${currentSource})` : "";
     if (!currentValue) hint += " (no default — please enter a value)";
     if (secret) {
-      const answer = await prompt.askHidden(`    ${key}${hint} (hidden, Enter to keep current)`);
+      const answer = await prompt.askHidden(`        ${key}${hint} (hidden, Enter to keep current)`);
       out.push({ ...v, user_value: answer || (v.user_value || null) });
     } else {
-      const answer = await prompt.ask(`    ${key}${hint}`, currentValue);
+      const answer = await prompt.ask(`        ${key}${hint}`, currentValue);
       out.push({ ...v, user_value: answer || null });
     }
   }