@niroai/niro 0.9.0 → 0.10.1

package/src/mcp/setup.js

@@ -163,16 +163,16 @@ function writeManagedSkill(absPath, content, label) {
   if (!fs.existsSync(absPath)) {
     fs.mkdirSync(path.dirname(absPath), { recursive: true });
     fs.writeFileSync(absPath, content);
-    console.log(`  ${label} added: ${absPath}`);
+    console.log(`    ${label} added: ${absPath}`);
     return "added";
   }
   const existing = fs.readFileSync(absPath, "utf-8");
   if (existing === content) {
-    console.log(`  ${label} already up to date — skipping (${absPath}).`);
+    console.log(`    ${label} already up to date. Skipping (${absPath}).`);
     return "unchanged";
   }
   fs.writeFileSync(absPath, content);
-  console.log(`  ${label} updated: ${absPath}`);
+  console.log(`    ${label} updated: ${absPath}`);
   return "updated";
 }
 
@@ -355,7 +355,7 @@ function ensureCursorPermissionsForNiro() {
       if (!data || typeof data !== "object") data = {};
     }
   } catch (e) {
-    console.warn(`  Could not read ${permPath}: ${e.message}`);
+    console.warn(`    Could not read ${permPath}: ${e.message}`);
     console.warn('  Fix the file manually or merge: { "mcpAllowlist": ["niro:*"] }\n');
     return;
   }
@@ -366,21 +366,21 @@ function ensureCursorPermissionsForNiro() {
     data = { ...data, mcpAllowlist: ["niro:*"] };
   } else if (hasKey && Array.isArray(data.mcpAllowlist)) {
     if (allowlistAlreadyCoversAllNiroTools(data.mcpAllowlist)) {
-      console.log("  Cursor MCP allowlist already includes Niro (`niro:*` or broader).\n");
+      console.log("    Cursor MCP allowlist already includes Niro (`niro:*` or broader).\n");
       return;
     }
     data.mcpAllowlist = [...data.mcpAllowlist, "niro:*"];
   } else if (hasKey && !Array.isArray(data.mcpAllowlist)) {
-    console.warn("  ~/.cursor/permissions.json has invalid mcpAllowlist — not modifying it.");
+    console.warn("    ~/.cursor/permissions.json has invalid mcpAllowlist, so it is not being modified.");
     console.warn('  Add this string after fixing JSON: \"niro:*\"\n');
     return;
   } else if (Object.keys(data).length > 0) {
     console.log("");
-    console.log("  ~/.cursor/permissions.json exists but has no \"mcpAllowlist\" entry.");
+    console.log("    ~/.cursor/permissions.json exists but has no \"mcpAllowlist\" entry.");
     console.log(
-      '  Cursor replaces the Settings MCP allowlist when you add \"mcpAllowlist\" — skipped auto-merge to avoid dropping other MCP tools.',
+      '  Cursor replaces the Settings MCP allowlist when you add \"mcpAllowlist\", so the auto-merge was skipped to avoid dropping other MCP tools.',
     );
-    console.log("  Merge manually (include other MCP servers if you need them), e.g.:");
+    console.log("    Merge manually (include other MCP servers if you need them), e.g.:");
     console.log('      \"mcpAllowlist\": [\"niro:*\", \"github:*\"]\n');
     return;
   } else {
@@ -388,19 +388,19 @@ function ensureCursorPermissionsForNiro() {
   }
 
   if (!data.mcpAllowlist || !allowlistAlreadyCoversAllNiroTools(data.mcpAllowlist)) {
-    console.warn("  [niro-setup] Unexpected state writing permissions.json; skipping.\n");
+    console.warn("    [niro-setup] Unexpected state writing permissions.json; skipping.\n");
     return;
   }
 
   try {
     fs.mkdirSync(path.dirname(permPath), { recursive: true });
     fs.writeFileSync(permPath, JSON.stringify(data, null, 2) + "\n");
-    console.log(`  Cursor MCP permissions updated: ${permPath}`);
+    console.log(`    Cursor MCP permissions updated: ${permPath}`);
     console.log('    • Added pattern \"niro:*\" so Agent can run all Niro tools without approval prompts.');
-    console.log("    • Enable Cursor Agent Auto-run / sandbox auto-run — \"Ask every time\" ignores allowlists.");
-    console.log("    • Reference: https://cursor.com/docs/reference/permissions\n");
+    console.log("        • Enable Cursor Agent Auto-run / sandbox auto-run: \"Ask every time\" ignores allowlists.");
+    console.log("        • Reference: https://cursor.com/docs/reference/permissions\n");
   } catch (e) {
-    console.warn(`  Could not write ${permPath}: ${e.message}\n`);
+    console.warn(`    Could not write ${permPath}: ${e.message}\n`);
   }
 }
 
@@ -534,21 +534,52 @@ function hasShellMetacharacters(value) {
 
 function printHeader() {
   console.log("");
-  console.log("  Niro MCP Server Setup");
-  console.log("  ---------------------");
+  console.log("    Niro MCP Server Setup");
+  console.log("    ---------------------");
   console.log("");
 }
 
-function printClients() {
-  console.log("  Supported clients:");
-  Object.entries(CLIENTS).forEach(([id, client]) => {
-    console.log(`    ${id.padEnd(18)} ${client.name} (${client.description})`);
+/** How many clients to name before summarising the rest. */
+const CLIENTS_SHOWN = 5;
+
+/**
+ * Run a client's own CLI and print its output at our indent level.
+ *
+ * These tools print at column 0, so inheriting their stdout put unindented lines in the
+ * middle of an indented block and destroyed the only cue for what belongs to what. On
+ * failure the output is printed as-is: a broken command is not the moment to be tidy.
+ */
+function runClientCommand(command) {
+  const out = execSync(command, { stdio: ["inherit", "pipe", "pipe"], encoding: "utf8" });
+  String(out || "")
+    .split("\n")
+    .filter((l) => l.trim())
+    .forEach((l) => console.log(`    ${l.trim()}`));
+}
+
+/**
+ * The first few by name, then a count.
+ *
+ * All fourteen used to print, with each one's config-file path in brackets: sixteen lines for
+ * a question nearly everyone answers with the default. The full list is one flag away, and
+ * anyone hunting for a client they cannot see is exactly the person who will use it.
+ */
+function printClients({ all = false } = {}) {
+  const entries = Object.entries(CLIENTS);
+  const shown = all ? entries : entries.slice(0, CLIENTS_SHOWN);
+  console.log(all ? "    All supported clients:" : "    Clients:");
+  shown.forEach(([id, client]) => {
+    console.log(`        ${id.padEnd(18)} ${client.name}${all ? ` (${client.description})` : ""}`);
   });
+  const rest = entries.length - shown.length;
+  if (rest > 0) {
+    console.log(`        ...and ${rest} more. See them all with: niro mcp install --list`);
+  }
   console.log("");
 }
 
 async function setupClaudeCode(apiKey, mcpServerUrl) {
-  console.log("\n  Configuring Claude Code...\n");
+  console.log("\n    Configuring Claude Code...\n");
 
   const cmd = [
     "claude", "mcp", "add",
@@ -563,12 +594,12 @@ async function setupClaudeCode(apiKey, mcpServerUrl) {
   cmd.push("--", "niro", "mcp", "serve");
 
   try {
-    execSync(cmd.join(" "), { stdio: "inherit" });
-    console.log("  MCP server registered globally in Claude Code.\n");
+    runClientCommand(cmd.join(" "));
+    console.log("    MCP server registered globally in Claude Code.\n");
   } catch (err) {
-    console.error("  Failed to register MCP server. Is Claude Code installed?");
-    console.error("  Install: https://claude.ai/code\n");
-    console.error(`  Manual command:\n    ${cmd.join(" ")}\n`);
+    console.error("    Failed to register MCP server. Is Claude Code installed?");
+    console.error("    Install: https://claude.ai/code\n");
+    console.error(`    Manual command:\n    ${cmd.join(" ")}\n`);
     return false;
   }
 
@@ -608,7 +639,7 @@ function addClaudeCodePostCompactHook() {
   const alreadyPresent = settings.hooks.PostCompact.some(isNiroPostCompactHook);
 
   if (alreadyPresent) {
-    console.log("  PostCompact hook already configured — skipping.\n");
+    console.log("    PostCompact hook already configured. Skipping.\n");
     return;
   }
 
@@ -621,11 +652,10 @@ function addClaudeCodePostCompactHook() {
   try {
     fs.mkdirSync(path.dirname(settingsPath), { recursive: true });
     fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
-    console.log("  PostCompact hook added to ~/.claude/settings.json\n");
-    console.log("  → Claude will be reminded about Niro tools after context compaction.\n");
+    console.log("    PostCompact hook added to ~/.claude/settings.json\n");
   } catch (err) {
-    console.warn(`  Could not write ~/.claude/settings.json: ${err.message}`);
-    console.warn("  Add manually to the PostCompact array in ~/.claude/settings.json:\n");
+    console.warn(`    Could not write ~/.claude/settings.json: ${err.message}`);
+    console.warn("    Add manually to the PostCompact array in ~/.claude/settings.json:\n");
     console.warn(JSON.stringify(exampleEntry, null, 2) + "\n");
   }
 }
@@ -649,18 +679,17 @@ function addClaudeCodeMemory() {
 
   const { content, action } = upsertNiroMarkerSection(existing, section);
   if (action === "unchanged") {
-    console.log("  CLAUDE.md entry already up to date — skipping.\n");
+    console.log("    CLAUDE.md entry already up to date. Skipping.\n");
     return;
   }
 
   try {
     fs.mkdirSync(path.dirname(claudeMdPath), { recursive: true });
     fs.writeFileSync(claudeMdPath, content);
-    console.log(`  Niro reminder ${action === "refreshed" ? "refreshed in" : "added to"} ~/.claude/CLAUDE.md\n`);
-    console.log("  → Claude will see Niro tool guidance in every session.\n");
+    console.log(`    Niro reminder ${action === "refreshed" ? "refreshed in" : "added to"} ~/.claude/CLAUDE.md\n`);
   } catch (err) {
-    console.warn(`  Could not write ~/.claude/CLAUDE.md: ${err.message}`);
-    console.warn("  Add manually to ~/.claude/CLAUDE.md:\n");
+    console.warn(`    Could not write ~/.claude/CLAUDE.md: ${err.message}`);
+    console.warn("    Add manually to ~/.claude/CLAUDE.md:\n");
     console.warn(section + "\n");
   }
 }
@@ -718,7 +747,7 @@ function addClaudeCodeUserPromptHook() {
     (h) => Array.isArray(h.hooks) && h.hooks.some((i) => i && i.command === hookCommand),
   );
   if (alreadyCurrent) {
-    console.log("  UserPromptSubmit hook already up to date — skipping.\n");
+    console.log("    UserPromptSubmit hook already up to date. Skipping.\n");
     return;
   }
 
@@ -732,11 +761,9 @@ function addClaudeCodeUserPromptHook() {
   try {
     fs.mkdirSync(path.dirname(settingsPath), { recursive: true });
     fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
-    console.log(`  UserPromptSubmit hook ${hadStale ? "upgraded" : "added"} in ~/.claude/settings.json`);
-    console.log("  → Claude is reminded about Niro before each prompt, but only in repos");
-    console.log("    that have a .niro-project marker (no nagging in un-indexed folders).\n");
+    console.log(`    UserPromptSubmit hook ${hadStale ? "upgraded" : "added"} in ~/.claude/settings.json`);
   } catch (err) {
-    console.warn(`  Could not write ~/.claude/settings.json: ${err.message}`);
+    console.warn(`    Could not write ~/.claude/settings.json: ${err.message}`);
     console.warn('  Add manually to the UserPromptSubmit array in ~/.claude/settings.json:\n');
     console.warn(JSON.stringify({ hooks: [{ type: "command", command: hookCommand }] }, null, 2) + "\n");
   }
@@ -815,10 +842,10 @@ function removeStaleNiroStopHook() {
 
   try {
     fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
-    console.log("  Removed the old Stop hook — the end-of-task line now comes from Niro directly,");
-    console.log("  without the \"Stop says:\" prefix Claude Code adds to hook output.\n");
+    console.log("    Removed the old Stop hook. The end-of-task line now comes from Niro directly,");
+    console.log("    without the \"Stop says:\" prefix Claude Code adds to hook output.\n");
   } catch (err) {
-    console.warn(`  Could not update ~/.claude/settings.json: ${err.message}`);
+    console.warn(`    Could not update ~/.claude/settings.json: ${err.message}`);
   }
 }
 
@@ -844,7 +871,7 @@ function addClaudeCodePreToolUseHook() {
     (h) => Array.isArray(h.hooks) && h.hooks.some((i) => i && i.command === NIRO_PRETOOL_COMMAND),
   );
   if (alreadyCurrent) {
-    console.log("  PreToolUse temporary project hook already up to date — skipping.\n");
+    console.log("    PreToolUse temporary project hook already up to date. Skipping.\n");
     return;
   }
 
@@ -855,12 +882,10 @@ function addClaudeCodePreToolUseHook() {
   try {
     fs.mkdirSync(path.dirname(settingsPath), { recursive: true });
     fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
-    console.log(`  PreToolUse temporary project hook ${hadStale ? "upgraded" : "added"} in ~/.claude/settings.json`);
-    console.log("  → Before editing a Niro-indexed repo, Claude is reminded once/session to run the");
-    console.log("    should_create_temp_project check (non-blocking; silent in un-indexed repos).\n");
+    console.log(`    PreToolUse temporary project hook ${hadStale ? "upgraded" : "added"} in ~/.claude/settings.json`);
   } catch (err) {
-    console.warn(`  Could not write ~/.claude/settings.json: ${err.message}`);
-    console.warn("  Add manually to the PreToolUse array in ~/.claude/settings.json:\n");
+    console.warn(`    Could not write ~/.claude/settings.json: ${err.message}`);
+    console.warn("    Add manually to the PreToolUse array in ~/.claude/settings.json:\n");
     console.warn(JSON.stringify(entry, null, 2) + "\n");
   }
 }
@@ -945,7 +970,7 @@ function addClaudeCodeExploreHook() {
     (h) => Array.isArray(h.hooks) && h.hooks.some((i) => i && i.command === NIRO_EXPLORE_COMMAND),
   );
   if (alreadyCurrent) {
-    console.log("  PreToolUse explore-first hook already up to date — skipping.\n");
+    console.log("    PreToolUse explore-first hook already up to date. Skipping.\n");
     return;
   }
 
@@ -956,12 +981,10 @@ function addClaudeCodeExploreHook() {
   try {
     fs.mkdirSync(path.dirname(settingsPath), { recursive: true });
     fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
-    console.log(`  PreToolUse explore-first hook ${hadStale ? "upgraded" : "added"} in ~/.claude/settings.json`);
-    console.log("  → On every native Grep/Glob/Read in a niro-indexed repo, Claude is reminded to prefer");
-    console.log("    niro tools — even mid-task and late in a long session, not just for discovery questions.\n");
+    console.log(`    PreToolUse explore-first hook ${hadStale ? "upgraded" : "added"} in ~/.claude/settings.json`);
   } catch (err) {
-    console.warn(`  Could not write ~/.claude/settings.json: ${err.message}`);
-    console.warn("  Add manually to the PreToolUse array in ~/.claude/settings.json:\n");
+    console.warn(`    Could not write ~/.claude/settings.json: ${err.message}`);
+    console.warn("    Add manually to the PreToolUse array in ~/.claude/settings.json:\n");
     console.warn(JSON.stringify(entry, null, 2) + "\n");
   }
 }
@@ -1348,11 +1371,10 @@ function addClaudeCodeSkill() {
   try {
     const result = writeManagedSkill(skillPath, NIRO_SKILL, "niro skill");
     if (result === "added" || result === "updated") {
-      console.log("  → Claude loads the full Niro tool-routing playbook on demand.");
     }
     console.log("");
   } catch (err) {
-    console.warn(`  Could not write ~/.claude/skills/niro-skill/SKILL.md: ${err.message}\n`);
+    console.warn(`    Could not write ~/.claude/skills/niro-skill/SKILL.md: ${err.message}\n`);
   }
 }
 
@@ -1366,11 +1388,10 @@ function addClaudeCodeCliSkill() {
   try {
     const result = writeManagedSkill(skillPath, NIRO_CLI_SKILL, "niro-cli skill");
     if (result === "added" || result === "updated") {
-      console.log("  → Claude can drive the niro CLI from chat (status / onboard / edit / rebuild / remove).");
     }
     console.log("");
   } catch (err) {
-    console.warn(`  Could not write ~/.claude/skills/niro-cli/SKILL.md: ${err.message}\n`);
+    console.warn(`    Could not write ~/.claude/skills/niro-cli/SKILL.md: ${err.message}\n`);
   }
 }
 
@@ -1432,16 +1453,16 @@ via MCP tools.
 function ensureCursorRule() {
   const rulePath = path.join(process.cwd(), ".cursor", "rules", "niro.mdc");
   if (fs.existsSync(rulePath)) {
-    console.log("  Cursor rule already present — skipping (.cursor/rules/niro.mdc).\n");
+    console.log("    Cursor rule already present. Skipping (.cursor/rules/niro.mdc).\n");
     return;
   }
   try {
     fs.mkdirSync(path.dirname(rulePath), { recursive: true });
     fs.writeFileSync(rulePath, NIRO_CURSOR_RULE);
-    console.log(`  Cursor rule added: ${rulePath}`);
-    console.log("    • Project-scoped. For other repos, copy it or re-run setup there.\n");
+    console.log(`    Cursor rule added: ${rulePath}`);
+    console.log("        • Project-scoped. For other repos, copy it or re-run setup there.\n");
   } catch (err) {
-    console.warn(`  Could not write .cursor/rules/niro.mdc: ${err.message}\n`);
+    console.warn(`    Could not write .cursor/rules/niro.mdc: ${err.message}\n`);
   }
 }
 
@@ -1450,7 +1471,7 @@ function ensureCursorRule() {
  * the [mcp_servers.niro] table into ~/.codex/config.toml. Mirrors setupClaudeCode.
  */
 async function setupCodex(apiKey, mcpServerUrl) {
-  console.log("\n  Configuring Codex...\n");
+  console.log("\n    Configuring Codex...\n");
 
   const cmd = [
     "codex", "mcp", "add",
@@ -1463,11 +1484,11 @@ async function setupCodex(apiKey, mcpServerUrl) {
 
   try {
     execSync(cmd.join(" "), { stdio: "inherit" });
-    console.log("  MCP server registered in Codex (~/.codex/config.toml).\n");
+    console.log("    MCP server registered in Codex (~/.codex/config.toml).\n");
   } catch (err) {
-    console.error("  Failed to register MCP server. Is the Codex CLI installed?");
-    console.error("  Install: https://developers.openai.com/codex\n");
-    console.error(`  Manual command:\n    ${cmd.join(" ")}\n`);
+    console.error("    Failed to register MCP server. Is the Codex CLI installed?");
+    console.error("    Install: https://developers.openai.com/codex\n");
+    console.error(`    Manual command:\n    ${cmd.join(" ")}\n`);
     return false;
   }
 
@@ -1574,19 +1595,19 @@ function clearCodexPerToolApprovals(cfgPath) {
   // Refuse to write anything that lost the niro server itself. Cheap, and the failure it guards
   // against is the one that matters.
   if (!rewritten.includes("[mcp_servers.niro]")) {
-    console.warn("  Skipped clearing Codex tool approvals — the edit would have dropped [mcp_servers.niro].\n");
+    console.warn("    Skipped clearing Codex tool approvals: the edit would have dropped [mcp_servers.niro].\n");
     return 0;
   }
 
   try {
     writeCodexConfigVerified(cfgPath, rewritten);
   } catch (err) {
-    console.warn(`  Could not clear Codex per-tool approvals: ${err.message}\n`);
+    console.warn(`    Could not clear Codex per-tool approvals: ${err.message}\n`);
     return 0;
   }
 
-  console.log(`  Cleared ${matches.length} per-tool approval override${matches.length === 1 ? "" : "s"} for niro.`);
-  console.log("  → those beat default_tools_approval_mode and made every call prompt.\n");
+  console.log(`    Cleared ${matches.length} per-tool approval override${matches.length === 1 ? "" : "s"} for niro.`);
+  console.log("    → those beat default_tools_approval_mode and made every call prompt.\n");
   return matches.length;
 }
 
@@ -1612,12 +1633,12 @@ function codexConfigPath() {
 function hardenCodexServerConfig() {
   const cfgPath = codexConfigPath();
   if (!cfgPath) {
-    console.warn("  Could not resolve ~/.codex/config.toml — skipping approval-mode hardening.\n");
+    console.warn("    Could not resolve ~/.codex/config.toml. Skipping approval-mode hardening.\n");
     return;
   }
 
-  console.log("  Tip: for a hard dependency, add `required = true` under [mcp_servers.niro]");
-  console.log("       (Codex then fails startup if niro is unreachable — off by default).\n");
+  console.log("    Tip: for a hard dependency, add `required = true` under [mcp_servers.niro]");
+  console.log("        (Codex then fails startup if niro is unreachable; off by default).\n");
 
   // Clear per-tool overrides FIRST. Codex writes a [mcp_servers.niro.tools.<name>] table with
   // approval_mode = "approve" whenever the developer answers a prompt with "approve once" rather
@@ -1633,7 +1654,7 @@ function hardenCodexServerConfig() {
 
   const located = locateCodexNiroTable(cfgPath);
   if (!located) {
-    console.warn("  [mcp_servers.niro] not found in config.toml — skipping approval-mode hardening.\n");
+    console.warn("    [mcp_servers.niro] not found in config.toml. Skipping approval-mode hardening.\n");
     return;
   }
   const { toml, bodyStart, bodyEnd, body } = located;
@@ -1641,7 +1662,7 @@ function hardenCodexServerConfig() {
   const existing = body.match(/^[ \t]*default_tools_approval_mode[ \t]*=[ \t]*"([^"]*)"/m);
 
   if (existing && existing[1] !== "auto") {
-    console.log(`  Codex approval mode already set to "${existing[1]}" — leaving your choice alone.\n`);
+    console.log(`    Codex approval mode already set to "${existing[1]}", so your choice is left alone.\n`);
     return;
   }
 
@@ -1669,7 +1690,7 @@ function hardenCodexServerConfig() {
     message.forEach((line) => console.log(line));
     console.log("");
   } catch (err) {
-    console.warn(`  Could not update the Codex approval mode: ${err.message}\n`);
+    console.warn(`    Could not update the Codex approval mode: ${err.message}\n`);
   }
 }
 
@@ -1718,18 +1739,18 @@ function addCodexMemory() {
 
   const { content, action } = upsertNiroMarkerSection(existing, section);
   if (action === "unchanged") {
-    console.log("  AGENTS.md entry already up to date — skipping.\n");
+    console.log("    AGENTS.md entry already up to date. Skipping.\n");
     return;
   }
 
   try {
     fs.mkdirSync(path.dirname(agentsPath), { recursive: true });
     fs.writeFileSync(agentsPath, content);
-    console.log(`  Niro reminder ${action === "refreshed" ? "refreshed in" : "added to"} ~/.codex/AGENTS.md`);
-    console.log("  → Codex will see Niro tool guidance across sessions.\n");
+    console.log(`    Niro reminder ${action === "refreshed" ? "refreshed in" : "added to"} ~/.codex/AGENTS.md`);
+    console.log("    → Codex will see Niro tool guidance across sessions.\n");
   } catch (err) {
-    console.warn(`  Could not write ~/.codex/AGENTS.md: ${err.message}`);
-    console.warn("  Add manually to ~/.codex/AGENTS.md:\n");
+    console.warn(`    Could not write ~/.codex/AGENTS.md: ${err.message}`);
+    console.warn("    Add manually to ~/.codex/AGENTS.md:\n");
     console.warn(section + "\n");
   }
 }
@@ -1745,11 +1766,11 @@ function addAgentsSkill() {
   try {
     const result = writeManagedSkill(skillPath, NIRO_SKILL, "Shared niro-skill");
     if (result === "added" || result === "updated") {
-      console.log("    • Read by Codex and Windsurf (cross-agent skills location).");
+      console.log("        • Read by Codex and Windsurf (cross-agent skills location).");
     }
     console.log("");
   } catch (err) {
-    console.warn(`  Could not write ~/.agents/skills/niro-skill/SKILL.md: ${err.message}\n`);
+    console.warn(`    Could not write ~/.agents/skills/niro-skill/SKILL.md: ${err.message}\n`);
   }
 }
 
@@ -1763,11 +1784,11 @@ function addAgentsCliSkill() {
   try {
     const result = writeManagedSkill(skillPath, NIRO_CLI_SKILL, "Shared niro-cli skill");
     if (result === "added" || result === "updated") {
-      console.log("    • Read by Codex and Windsurf (cross-agent skills location).");
+      console.log("        • Read by Codex and Windsurf (cross-agent skills location).");
     }
     console.log("");
   } catch (err) {
-    console.warn(`  Could not write ~/.agents/skills/niro-cli/SKILL.md: ${err.message}\n`);
+    console.warn(`    Could not write ~/.agents/skills/niro-cli/SKILL.md: ${err.message}\n`);
   }
 }
 
@@ -1788,16 +1809,16 @@ function addWindsurfGlobalRule() {
   }
   const { content, action } = upsertNiroMarkerSection(existing, section);
   if (action === "unchanged") {
-    console.log("  Windsurf global rule already up to date — skipping.\n");
+    console.log("    Windsurf global rule already up to date. Skipping.\n");
     return;
   }
   try {
     fs.mkdirSync(path.dirname(rulePath), { recursive: true });
     fs.writeFileSync(rulePath, content);
-    console.log(`  Niro reminder ${action === "refreshed" ? "refreshed in" : "added to"} ~/.codeium/windsurf/memories/global_rules.md`);
-    console.log("  → Windsurf stays aware of Niro across sessions.\n");
+    console.log(`    Niro reminder ${action === "refreshed" ? "refreshed in" : "added to"} ~/.codeium/windsurf/memories/global_rules.md`);
+    console.log("    → Windsurf stays aware of Niro across sessions.\n");
   } catch (err) {
-    console.warn(`  Could not write Windsurf global_rules.md: ${err.message}\n`);
+    console.warn(`    Could not write Windsurf global_rules.md: ${err.message}\n`);
   }
 }
 
@@ -1816,15 +1837,15 @@ function appendMarkerSectionToFile(absPath, label, section = NIRO_GENERIC_MD_SEC
   }
   const { content, action } = upsertNiroMarkerSection(existing, section);
   if (action === "unchanged") {
-    console.log(`  ${label} entry already up to date — skipping.\n`);
+    console.log(`    ${label} entry already up to date. Skipping.\n`);
     return;
   }
   try {
     fs.mkdirSync(path.dirname(absPath), { recursive: true });
     fs.writeFileSync(absPath, content);
-    console.log(`  Niro reminder ${action === "refreshed" ? "refreshed in" : "added to"} ${absPath}\n`);
+    console.log(`    Niro reminder ${action === "refreshed" ? "refreshed in" : "added to"} ${absPath}\n`);
   } catch (err) {
-    console.warn(`  Could not write ${absPath}: ${err.message}\n`);
+    console.warn(`    Could not write ${absPath}: ${err.message}\n`);
   }
 }
 
@@ -1876,12 +1897,12 @@ function addClineRule() {
   try {
     const result = writeManagedSkill(rulePath, NIRO_CLINE_RULE, "Cline rule");
     if (result === "added" || result === "updated") {
-      console.log("    • Global — applies across all your repos in Cline.");
+      console.log("        • Global: applies across all your repos in Cline.");
     }
     console.log("");
   } catch (err) {
-    console.warn(`  Could not write Cline rule: ${err.message}`);
-    console.warn(`  If Cline uses ~/Cline/Rules instead of ~/Documents/Cline/Rules on your system, copy it there.\n`);
+    console.warn(`    Could not write Cline rule: ${err.message}`);
+    console.warn(`    If Cline uses ~/Cline/Rules instead of ~/Documents/Cline/Rules on your system, copy it there.\n`);
   }
 }
 
@@ -1915,11 +1936,11 @@ function addKiroSteering() {
   try {
     const result = writeManagedSkill(rulePath, NIRO_KIRO_STEERING, "Kiro steering file");
     if (result === "added" || result === "updated") {
-      console.log("    • Global — applies across all your repos in Kiro.");
+      console.log("        • Global: applies across all your repos in Kiro.");
     }
     console.log("");
   } catch (err) {
-    console.warn(`  Could not write Kiro steering file: ${err.message}\n`);
+    console.warn(`    Could not write Kiro steering file: ${err.message}\n`);
   }
 }
 
@@ -1928,7 +1949,7 @@ function addKiroSteering() {
  * `-s user` makes it a global (not project) registration, matching every other client here.
  */
 async function setupGeminiCli(apiKey, mcpServerUrl) {
-  console.log("\n  Configuring Gemini CLI...\n");
+  console.log("\n    Configuring Gemini CLI...\n");
 
   const cmd = ["gemini", "mcp", "add", "-s", "user"];
   if (apiKey) cmd.push("-e", `NIRO_API_KEY=${apiKey}`);
@@ -1937,16 +1958,16 @@ async function setupGeminiCli(apiKey, mcpServerUrl) {
 
   try {
     execSync(cmd.join(" "), { stdio: "inherit" });
-    console.log("  MCP server registered in Gemini CLI (~/.gemini/settings.json).\n");
+    console.log("    MCP server registered in Gemini CLI (~/.gemini/settings.json).\n");
   } catch (err) {
-    console.error("  Failed to register MCP server. Is the Gemini CLI installed?");
-    console.error("  Install: https://github.com/google-gemini/gemini-cli\n");
-    console.error(`  Manual command:\n    ${cmd.join(" ")}\n`);
+    console.error("    Failed to register MCP server. Is the Gemini CLI installed?");
+    console.error("    Install: https://github.com/google-gemini/gemini-cli\n");
+    console.error(`    Manual command:\n    ${cmd.join(" ")}\n`);
     return false;
   }
 
   addGeminiMemory();
-  console.log("  Run `/mcp reload` inside Gemini CLI so the server + memory reload.\n");
+  console.log("    Run `/mcp reload` inside Gemini CLI so the server + memory reload.\n");
   return true;
 }
 
@@ -1954,7 +1975,7 @@ async function setupGeminiCli(apiKey, mcpServerUrl) {
  * Registers the niro MCP entry with the GitHub Copilot CLI (writes ~/.copilot/mcp-config.json).
  */
 async function setupCopilotCli(apiKey, mcpServerUrl) {
-  console.log("\n  Configuring GitHub Copilot CLI...\n");
+  console.log("\n    Configuring GitHub Copilot CLI...\n");
 
   const cmd = ["copilot", "mcp", "add", "niro"];
   if (apiKey) cmd.push("--env", `NIRO_API_KEY=${apiKey}`);
@@ -1963,15 +1984,15 @@ async function setupCopilotCli(apiKey, mcpServerUrl) {
 
   try {
     execSync(cmd.join(" "), { stdio: "inherit" });
-    console.log("  MCP server registered in Copilot CLI (~/.copilot/mcp-config.json).\n");
+    console.log("    MCP server registered in Copilot CLI (~/.copilot/mcp-config.json).\n");
   } catch (err) {
-    console.error("  Failed to register MCP server. Is the Copilot CLI installed (npm i -g @github/copilot)?\n");
-    console.error(`  Manual command:\n    ${cmd.join(" ")}\n`);
+    console.error("    Failed to register MCP server. Is the Copilot CLI installed (npm i -g @github/copilot)?\n");
+    console.error(`    Manual command:\n    ${cmd.join(" ")}\n`);
     return false;
   }
 
   addCopilotCliMemory();
-  console.log("  Run `/mcp` inside the Copilot CLI to verify — servers are available immediately.\n");
+  console.log("    Run `/mcp` inside the Copilot CLI to verify. Servers are available immediately.\n");
   return true;
 }
 
@@ -1982,7 +2003,7 @@ async function setupCopilotCli(apiKey, mcpServerUrl) {
  * ("niro mcp serve"), not user input, so static quoting is safe.
  */
 async function setupFactory(apiKey, mcpServerUrl) {
-  console.log("\n  Configuring Factory (droid)...\n");
+  console.log("\n    Configuring Factory (droid)...\n");
 
   const cmd = ["droid", "mcp", "add", "niro", '"niro mcp serve"'];
   if (apiKey) cmd.push("--env", `NIRO_API_KEY=${apiKey}`);
@@ -1990,16 +2011,16 @@ async function setupFactory(apiKey, mcpServerUrl) {
 
   try {
     execSync(cmd.join(" "), { stdio: "inherit" });
-    console.log("  MCP server registered in Factory (~/.factory/mcp.json).\n");
+    console.log("    MCP server registered in Factory (~/.factory/mcp.json).\n");
   } catch (err) {
-    console.error("  Failed to register MCP server. Is the droid CLI installed?");
-    console.error("  Install: https://docs.factory.ai\n");
-    console.error(`  Manual command:\n    ${cmd.join(" ")}\n`);
+    console.error("    Failed to register MCP server. Is the droid CLI installed?");
+    console.error("    Install: https://docs.factory.ai\n");
+    console.error(`    Manual command:\n    ${cmd.join(" ")}\n`);
     return false;
   }
 
   addFactoryMemory();
-  console.log("  droid reloads automatically when ~/.factory/mcp.json changes.\n");
+  console.log("    droid reloads automatically when ~/.factory/mcp.json changes.\n");
   return true;
 }
 
@@ -2040,9 +2061,9 @@ function gooseConfigPath() {
 }
 
 async function setupGoose(apiKey, mcpServerUrl) {
-  console.log("\n  Configuring Goose...\n");
+  console.log("\n    Configuring Goose...\n");
   const configPath = gooseConfigPath();
-  console.log(`  Config: ${configPath}\n`);
+  console.log(`    Config: ${configPath}\n`);
 
   const niroBlock = buildGooseNiroBlock(apiKey, mcpServerUrl);
   let existing = "";
@@ -2051,7 +2072,7 @@ async function setupGoose(apiKey, mcpServerUrl) {
     existedBefore = fs.existsSync(configPath);
     if (existedBefore) existing = fs.readFileSync(configPath, "utf-8");
   } catch (err) {
-    console.warn(`  Could not read ${configPath}: ${err.message}\n`);
+    console.warn(`    Could not read ${configPath}: ${err.message}\n`);
   }
 
   // Matches exactly the "  niro:" line install writes (2-space indent, nothing trailing) —
@@ -2059,7 +2080,7 @@ async function setupGoose(apiKey, mcpServerUrl) {
   // match an unrelated key named "niro" anywhere in the file and wrongly report "already
   // installed" without ever writing the real entry.
   if (/^ {2}niro:\s*$/m.test(existing)) {
-    console.log("  A `niro` extension entry already exists in config.yaml — skipping (edit it by hand if it needs updating).\n");
+    console.log("    A `niro` extension entry already exists in config.yaml. Skipping (edit it by hand if it needs updating).\n");
     return true;
   }
 
@@ -2086,22 +2107,22 @@ async function setupGoose(apiKey, mcpServerUrl) {
   // else: hasOtherExtensionsForm — next stays null, falls through to the manual-paste path.
 
   if (next === null) {
-    console.log("  Your config.yaml has an `extensions:` key in a form this installer doesn't");
-    console.log("  auto-edit (to avoid risking a duplicate key). Add this block under it by hand:\n");
+    console.log("    Your config.yaml has an `extensions:` key in a form this installer doesn't");
+    console.log("    auto-edit (to avoid risking a duplicate key). Add this block under it by hand:\n");
     console.log(niroBlock);
-    console.log(`\n  (full file: ${configPath})\n`);
+    console.log(`\n    (full file: ${configPath})\n`);
     return false;
   }
 
   try {
     fs.mkdirSync(path.dirname(configPath), { recursive: true });
     fs.writeFileSync(configPath, next);
-    console.log(`  MCP server added to Goose config: ${configPath}\n`);
-    console.log("  Restart Goose (or start a new session) so the extension loads.\n");
+    console.log(`    MCP server added to Goose config: ${configPath}\n`);
+    console.log("    Restart Goose (or start a new session) so the extension loads.\n");
     return true;
   } catch (err) {
-    console.error(`  Failed to write config: ${err.message}`);
-    console.error("  Add this manually under a top-level `extensions:` key in config.yaml:\n");
+    console.error(`    Failed to write config: ${err.message}`);
+    console.error("    Add this manually under a top-level `extensions:` key in config.yaml:\n");
     console.log(`extensions:\n${niroBlock}`);
     return false;
   }
@@ -2119,13 +2140,13 @@ async function setupJsonConfig(clientId, apiKey, mcpServerUrl) {
   const client = CLIENTS[clientId];
   const configPathFn = client.configPath;
   if (!configPathFn) {
-    console.error(`  No config path known for ${client.name}.`);
+    console.error(`    No config path known for ${client.name}.`);
     return false;
   }
 
   const configPath = configPathFn();
-  console.log(`\n  Configuring ${client.name}...`);
-  console.log(`  Config: ${configPath}\n`);
+  console.log(`\n    Configuring ${client.name}...`);
+  console.log(`    Config: ${configPath}\n`);
 
   // Read existing config or start fresh
   let config = {};
@@ -2160,37 +2181,37 @@ async function setupJsonConfig(clientId, apiKey, mcpServerUrl) {
   try {
     fs.mkdirSync(path.dirname(configPath), { recursive: true });
     fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
-    console.log(`  MCP server added to ${client.name} config.\n`);
+    console.log(`    MCP server added to ${client.name} config.\n`);
     if (clientId === "cursor") {
       ensureCursorPermissionsForNiro();
       ensureCursorRule();
-      console.log("  Quit and reopen Cursor (full restart) so MCP + permissions reload.\n");
+      console.log("    Quit and reopen Cursor (full restart) so MCP + permissions reload.\n");
     }
     if (clientId === "windsurf") {
       addAgentsSkill();
       addAgentsCliSkill();
       addWindsurfGlobalRule();
-      console.log("  Restart Windsurf so MCP + rules reload.\n");
+      console.log("    Restart Windsurf so MCP + rules reload.\n");
     }
     if (clientId === "opencode") {
       addOpenCodeMemory();
-      console.log("  Restart OpenCode so the MCP server reloads.\n");
+      console.log("    Restart OpenCode so the MCP server reloads.\n");
     }
     if (clientId === "cline") {
       addClineRule();
-      console.log("  Reopen Cline's MCP Servers panel (or restart VS Code) to reload.\n");
+      console.log("    Reopen Cline's MCP Servers panel (or restart VS Code) to reload.\n");
     }
     if (clientId === "kiro") {
       addKiroSteering();
-      console.log("  Kiro reconnects MCP servers automatically on config save.\n");
+      console.log("    Kiro reconnects MCP servers automatically on config save.\n");
     }
     if (clientId === "antigravity") {
-      console.log("  Reload via Agent Settings → Customizations → Installed MCP Servers → Refresh.\n");
+      console.log("    Reload via Agent Settings → Customizations → Installed MCP Servers → Refresh.\n");
     }
     return true;
   } catch (err) {
-    console.error(`  Failed to write config: ${err.message}`);
-    console.error(`  Manually add to ${configPath}:\n`);
+    console.error(`    Failed to write config: ${err.message}`);
+    console.error(`    Manually add to ${configPath}:\n`);
     console.log(JSON.stringify({ [topLevelKey]: { niro: config[topLevelKey].niro } }, null, 2));
     return false;
   }
@@ -2219,7 +2240,7 @@ async function main() {
     else if (args[i] === "--url" && args[i + 1]) urlArg = args[++i];
   }
   if (urlArg && !/^https?:\/\//i.test(urlArg)) {
-    console.error(`\n  Invalid --url: "${urlArg}" — it must start with http:// or https://\n`);
+    console.error(`\n    Invalid --url: "${urlArg}". It must start with http:// or https://\n`);
     process.exit(1);
   }
 
@@ -2234,13 +2255,13 @@ async function main() {
   // ~/.niro/credentials.json). Only prompt for an API key when there is no cli-token.
   let apiKey = null;
   if (hasCliToken()) {
-    console.log("\n  Using your `niro login` session — no API key needed.");
-    console.log("  The MCP server will authenticate with your CLI token from ~/.niro/credentials.json.\n");
+    console.log("\n    Using your `niro login` session, so no API key needed.");
+    console.log("    The MCP server will authenticate with your CLI token from ~/.niro/credentials.json.\n");
   } else {
-    apiKey = await ask(rl, "  Niro API key (from console.niroai.dev > Settings)", resolveApiKey());
+    apiKey = await ask(rl, "    Niro API key (from console.niroai.dev > Settings)", resolveApiKey());
     if (!apiKey) {
-      console.error("\n  No credential found. Run `niro login` first (recommended), or paste an API key");
-      console.error("  from console.niroai.dev > Settings > Account.\n");
+      console.error("\n    No credential found. Run `niro login` first (recommended), or paste an API key");
+      console.error("    from console.niroai.dev > Settings > Account.\n");
       rl.close();
       process.exit(1);
     }
@@ -2249,9 +2270,9 @@ async function main() {
   // The MCP server URL is resolved, not prompted — see resolveMcpServerUrl.
   // Printing the URL + its source keeps a wrong pick visible and correctable.
   const { url: mcpServerUrl, source: urlSource, explicit } = resolveMcpServerUrl(urlArg);
-  console.log(`  MCP server URL: ${mcpServerUrl}  (${urlSource})`);
+  console.log(`    MCP server URL: ${mcpServerUrl}  (${urlSource})`);
   if (!urlArg) {
-    console.log("  Different backend? Re-run with: niro mcp install --url <url>\n");
+    console.log("    Different backend? Re-run with: niro mcp install --url <url>\n");
   } else {
     console.log("");
   }
@@ -2263,20 +2284,29 @@ async function main() {
     try {
       config.save({ mcpServerUrl });
     } catch (err) {
-      console.warn(`\n  Could not write ${config.FILE}: ${err.message}\n`);
+      console.warn(`\n    Could not write ${config.FILE}: ${err.message}\n`);
     }
   }
 
+  // `--list` is a lookup, not an install: print every client and stop. rl is closed first,
+  // or the process hangs on an open readline that nothing will ever answer.
+  if (process.argv.includes("--list")) {
+    console.log("");
+    printClients({ all: true });
+    rl.close();
+    return;
+  }
+
   // Select client
   let selectedClient = clientArg;
   if (!selectedClient) {
     console.log("");
     printClients();
-    selectedClient = await ask(rl, "  Which client to configure?", "claude-code");
+    selectedClient = await ask(rl, "    Which client to configure?", "claude-code");
   }
 
   if (!CLIENTS[selectedClient]) {
-    console.error(`\n  Unknown client: ${selectedClient}`);
+    console.error(`\n    Unknown client: ${selectedClient}`);
     printClients();
     rl.close();
     process.exit(1);
@@ -2292,13 +2322,13 @@ async function main() {
   // only applies to some (e.g. a query-string URL with "&" is fine for Cursor/VS Code/etc.).
   if (CLI_SETUP[selectedClient]) {
     if (hasShellMetacharacters(mcpServerUrl)) {
-      console.error(`\n  Refusing to use MCP server URL "${mcpServerUrl}" — it contains spaces or`);
-      console.error("  characters not allowed in a URL. Check --url / NIRO_MCP_SERVER_URL.\n");
+      console.error(`\n    Refusing to use MCP server URL "${mcpServerUrl}": it contains spaces or`);
+      console.error("    characters not allowed in a URL. Check --url / NIRO_MCP_SERVER_URL.\n");
       process.exit(1);
     }
     if (apiKey && hasShellMetacharacters(apiKey)) {
-      console.error("\n  Refusing to use that API key — it contains spaces or characters that aren't");
-      console.error("  valid in an API key. Copy it again from console.niroai.dev > Settings > Account.\n");
+      console.error("\n    Refusing to use that API key: it contains spaces or characters that aren't");
+      console.error("    valid in an API key. Copy it again from console.niroai.dev > Settings > Account.\n");
       process.exit(1);
     }
   }
@@ -2314,12 +2344,15 @@ async function main() {
   }
 
   if (success) {
-    console.log("  Setup complete! Restart your AI assistant to start using Niro.\n");
+    // One line about what all of that was for, instead of a paragraph under each item.
+    console.log("    Those hooks and skills are what remind your assistant to use Niro, and let");
+    console.log("    you drive the CLI from chat. `niro mcp uninstall` removes all of them.");
+    console.log("    Setup complete! Restart your AI assistant to start using Niro.\n");
     if (selectedClient !== "claude-code") {
-      console.log("  Tip: drop a `.niro-project` file at the repo root (single line");
-      console.log("  with the project_id) to pin that tree to a Niro project.");
-      console.log("  Without it, Niro runs in multi-project mode and discovers");
-      console.log("  projects via the list_projects tool.\n");
+      console.log("    Tip: drop a `.niro-project` file at the repo root (single line");
+      console.log("    with the project_id) to pin that tree to a Niro project.");
+      console.log("    Without it, Niro runs in multi-project mode and discovers");
+      console.log("    projects via the list_projects tool.\n");
     }
   }
 }
@@ -2335,6 +2368,11 @@ if (require.main === module) {
 }
 
 module.exports = {
+  // Exported so `niro ab` resolves the ai-assistant base URL through the SAME precedence the
+  // MCP installer uses (--url > NIRO_MCP_SERVER_URL > saved config > cloud default). A second
+  // resolver would drift the first time that order changed, and the two would then disagree
+  // about which backend a machine is pointed at.
+  resolveMcpServerUrl,
   writeManagedSkill,
   addClaudeCodeSkill,
   addClaudeCodeCliSkill,