@niroai/niro 0.9.0 → 0.10.1

package/src/mcp/teardown.js

@@ -207,7 +207,7 @@ function deleteFileIfPresent(absPath, label) {
   try {
     if (!fs.existsSync(absPath)) return false;
     fs.rmSync(absPath, { force: true });
-    console.log(`  Removed ${label}: ${absPath}`);
+    console.log(`    Removed ${label}: ${absPath}`);
     // Clean up a now-empty generated skill dir (…/skills/niro-skill/).
     try {
       const parent = path.dirname(absPath);
@@ -217,7 +217,7 @@ function deleteFileIfPresent(absPath, label) {
     }
     return true;
   } catch (e) {
-    console.warn(`  Could not remove ${label} (${absPath}): ${e.message}`);
+    console.warn(`    Could not remove ${label} (${absPath}): ${e.message}`);
     return false;
   }
 }
@@ -228,17 +228,17 @@ function stripMarkerFromFile(absPath, label) {
   try {
     content = fs.readFileSync(absPath, "utf-8");
   } catch (e) {
-    console.warn(`  Could not read ${absPath}: ${e.message}`);
+    console.warn(`    Could not read ${absPath}: ${e.message}`);
     return false;
   }
   const { content: next, removed } = removeMarkerSection(content, NIRO_MD_MARKER);
   if (!removed) return false;
   try {
     fs.writeFileSync(absPath, next);
-    console.log(`  Removed niro section from ${label}: ${absPath}`);
+    console.log(`    Removed niro section from ${label}: ${absPath}`);
     return true;
   } catch (e) {
-    console.warn(`  Could not write ${absPath}: ${e.message}`);
+    console.warn(`    Could not write ${absPath}: ${e.message}`);
     return false;
   }
 }
@@ -249,44 +249,44 @@ function stripNiroHooksFromSettings(absPath) {
   try {
     settings = JSON.parse(fs.readFileSync(absPath, "utf-8"));
   } catch (e) {
-    console.warn(`  Could not parse ${absPath}: ${e.message} — leaving it untouched.`);
+    console.warn(`    Could not parse ${absPath}: ${e.message}. Leaving it untouched.`);
     return false;
   }
   const { removed } = filterNiroHooks(settings);
   if (!removed) return false;
   try {
     fs.writeFileSync(absPath, JSON.stringify(settings, null, 2) + "\n");
-    console.log(`  Removed ${removed} niro hook(s) from ${absPath}`);
+    console.log(`    Removed ${removed} niro hook(s) from ${absPath}`);
     return true;
   } catch (e) {
-    console.warn(`  Could not write ${absPath}: ${e.message}`);
+    console.warn(`    Could not write ${absPath}: ${e.message}`);
     return false;
   }
 }
 
 function removeNiroFromJsonConfig(absPath, label, topLevelKey = "mcpServers") {
   if (!fs.existsSync(absPath)) {
-    console.log(`  ${label} MCP config not found — skipping (${absPath}).`);
+    console.log(`    ${label} MCP config not found. Skipping (${absPath}).`);
     return false;
   }
   let config;
   try {
     config = JSON.parse(fs.readFileSync(absPath, "utf-8"));
   } catch (e) {
-    console.warn(`  Could not parse ${absPath}: ${e.message} — leaving it untouched.`);
+    console.warn(`    Could not parse ${absPath}: ${e.message}. Leaving it untouched.`);
     return false;
   }
   const { removed } = removeMcpServerEntry(config, topLevelKey);
   if (!removed) {
-    console.log(`  No niro MCP entry in ${label} config — skipping.`);
+    console.log(`    No niro MCP entry in ${label} config. Skipping.`);
     return false;
   }
   try {
     fs.writeFileSync(absPath, JSON.stringify(config, null, 2) + "\n");
-    console.log(`  Removed niro MCP entry from ${label}: ${absPath}`);
+    console.log(`    Removed niro MCP entry from ${label}: ${absPath}`);
     return true;
   } catch (e) {
-    console.warn(`  Could not write ${absPath}: ${e.message}`);
+    console.warn(`    Could not write ${absPath}: ${e.message}`);
     return false;
   }
 }
@@ -297,17 +297,17 @@ function removeCursorPermissions(absPath) {
   try {
     data = JSON.parse(fs.readFileSync(absPath, "utf-8"));
   } catch (e) {
-    console.warn(`  Could not parse ${absPath}: ${e.message} — leaving it untouched.`);
+    console.warn(`    Could not parse ${absPath}: ${e.message}. Leaving it untouched.`);
     return false;
   }
   const { removed } = removeNiroFromCursorAllowlist(data);
   if (!removed) return false;
   try {
     fs.writeFileSync(absPath, JSON.stringify(data, null, 2) + "\n");
-    console.log(`  Removed "niro:*" from Cursor permissions: ${absPath}`);
+    console.log(`    Removed "niro:*" from Cursor permissions: ${absPath}`);
     return true;
   } catch (e) {
-    console.warn(`  Could not write ${absPath}: ${e.message}`);
+    console.warn(`    Could not write ${absPath}: ${e.message}`);
     return false;
   }
 }
@@ -322,7 +322,7 @@ function runMcpRemove(cmd, args) {
     execSync([cmd, ...args].join(" "), { stdio: "inherit" });
     return true;
   } catch {
-    console.log(`  (${cmd} unavailable or niro already unregistered — skipping.)`);
+    console.log(`    (${cmd} unavailable or niro already unregistered. Skipping.)`);
     return false;
   }
 }
@@ -358,7 +358,7 @@ function isClientConfigured(clientId) {
 function removeSharedAgentsSkills(forClientId) {
   const other = forClientId === "codex" ? "windsurf" : "codex";
   if (isClientConfigured(other)) {
-    console.log(`  Keeping shared ~/.agents/skills — still used by ${other} (use --all to remove everything).`);
+    console.log(`    Keeping shared ~/.agents/skills, still used by ${other} (use --all to remove everything).`);
     return;
   }
   forceRemoveAgentsSkills();
@@ -379,7 +379,7 @@ function forceRemoveAgentsSkills() {
 // ─── per-client uninstallers (mirror setup.js's per-client installers) ────────
 
 function uninstallClaudeCode() {
-  console.log("\n  Removing Niro from Claude Code...\n");
+  console.log("\n    Removing Niro from Claude Code...\n");
   const home = userHome();
   runMcpRemove("claude", ["mcp", "remove", "niro", "--scope", "user"]);
   stripNiroHooksFromSettings(path.join(home, ".claude", "settings.json"));
@@ -397,7 +397,7 @@ function uninstallClaudeCode() {
 }
 
 function uninstallCodex(opts = {}) {
-  console.log("\n  Removing Niro from Codex...\n");
+  console.log("\n    Removing Niro from Codex...\n");
   const home = userHome();
   // codex mcp remove drops the whole [mcp_servers.niro] table, incl. the approval-mode line.
   runMcpRemove("codex", ["mcp", "remove", "niro"]);
@@ -407,12 +407,12 @@ function uninstallCodex(opts = {}) {
 }
 
 function uninstallClaudeDesktop() {
-  console.log("\n  Removing Niro from Claude Desktop...\n");
+  console.log("\n    Removing Niro from Claude Desktop...\n");
   removeNiroFromJsonConfig(CLIENTS["claude-desktop"].configPath(), "Claude Desktop");
 }
 
 function uninstallCursor() {
-  console.log("\n  Removing Niro from Cursor...\n");
+  console.log("\n    Removing Niro from Cursor...\n");
   const home = userHome();
   removeNiroFromJsonConfig(CLIENTS.cursor.configPath(), "Cursor");
   removeCursorPermissions(path.join(home, ".cursor", "permissions.json"));
@@ -421,7 +421,7 @@ function uninstallCursor() {
 }
 
 function uninstallWindsurf(opts = {}) {
-  console.log("\n  Removing Niro from Windsurf...\n");
+  console.log("\n    Removing Niro from Windsurf...\n");
   const home = userHome();
   removeNiroFromJsonConfig(CLIENTS.windsurf.configPath(), "Windsurf");
   stripMarkerFromFile(path.join(home, ".codeium", "windsurf", "memories", "global_rules.md"), "Windsurf global rules");
@@ -430,41 +430,41 @@ function uninstallWindsurf(opts = {}) {
 }
 
 function uninstallVsCode() {
-  console.log("\n  Removing Niro from VS Code...\n");
+  console.log("\n    Removing Niro from VS Code...\n");
   removeNiroFromJsonConfig(CLIENTS.vscode.configPath(), "VS Code", "servers");
 }
 
 function uninstallGeminiCli() {
-  console.log("\n  Removing Niro from Gemini CLI...\n");
+  console.log("\n    Removing Niro from Gemini CLI...\n");
   runMcpRemove("gemini", ["mcp", "remove", "-s", "user", "niro"]);
   stripMarkerFromFile(path.join(userHome(), ".gemini", "GEMINI.md"), "Gemini CLI memory");
 }
 
 function uninstallCopilotCli() {
-  console.log("\n  Removing Niro from GitHub Copilot CLI...\n");
+  console.log("\n    Removing Niro from GitHub Copilot CLI...\n");
   runMcpRemove("copilot", ["mcp", "remove", "niro"]);
   stripMarkerFromFile(path.join(userHome(), ".copilot", "copilot-instructions.md"), "Copilot CLI instructions");
 }
 
 function uninstallFactory() {
-  console.log("\n  Removing Niro from Factory (droid)...\n");
+  console.log("\n    Removing Niro from Factory (droid)...\n");
   runMcpRemove("droid", ["mcp", "remove", "niro"]);
   stripMarkerFromFile(path.join(userHome(), ".factory", "AGENTS.md"), "Factory AGENTS.md");
 }
 
 function uninstallGoose() {
-  console.log("\n  Removing Niro from Goose...\n");
+  console.log("\n    Removing Niro from Goose...\n");
   const { gooseConfigPath } = require("./setup");
   const configPath = gooseConfigPath();
   if (!fs.existsSync(configPath)) {
-    console.log(`  Goose config not found — skipping (${configPath}).`);
+    console.log(`    Goose config not found. Skipping (${configPath}).`);
     return;
   }
   let content;
   try {
     content = fs.readFileSync(configPath, "utf-8");
   } catch (e) {
-    console.warn(`  Could not read ${configPath}: ${e.message} — leaving it untouched.`);
+    console.warn(`    Could not read ${configPath}: ${e.message}. Leaving it untouched.`);
     return;
   }
   // Mirrors the bounded block install wrote: the "  niro:" entry and everything indented
@@ -473,7 +473,7 @@ function uninstallGoose() {
   const lines = content.split(/\r?\n/);
   const start = lines.findIndex((l) => /^ {2}niro:\s*$/.test(l));
   if (start === -1) {
-    console.log("  No `niro` extension entry in Goose config — skipping.");
+    console.log("    No `niro` extension entry in Goose config. Skipping.");
     return;
   }
   let end = start + 1;
@@ -481,26 +481,26 @@ function uninstallGoose() {
   lines.splice(start, end - start);
   try {
     fs.writeFileSync(configPath, lines.join(eol));
-    console.log(`  Removed niro extension from Goose config: ${configPath}`);
+    console.log(`    Removed niro extension from Goose config: ${configPath}`);
   } catch (e) {
-    console.warn(`  Could not write ${configPath}: ${e.message}`);
+    console.warn(`    Could not write ${configPath}: ${e.message}`);
   }
 }
 
 function uninstallOpenCode() {
-  console.log("\n  Removing Niro from OpenCode...\n");
+  console.log("\n    Removing Niro from OpenCode...\n");
   removeNiroFromJsonConfig(CLIENTS.opencode.configPath(), "OpenCode", "mcp");
   stripMarkerFromFile(path.join(userHome(), ".config", "opencode", "AGENTS.md"), "OpenCode AGENTS.md");
 }
 
 function uninstallCline() {
-  console.log("\n  Removing Niro from Cline...\n");
+  console.log("\n    Removing Niro from Cline...\n");
   removeNiroFromJsonConfig(CLIENTS.cline.configPath(), "Cline");
   deleteFileIfPresent(path.join(userHome(), "Documents", "Cline", "Rules", "niro.md"), "Cline rule");
 }
 
 function uninstallKiro() {
-  console.log("\n  Removing Niro from Kiro...\n");
+  console.log("\n    Removing Niro from Kiro...\n");
   removeNiroFromJsonConfig(CLIENTS.kiro.configPath(), "Kiro");
   deleteFileIfPresent(path.join(userHome(), ".kiro", "steering", "niro.md"), "Kiro steering file");
 }
@@ -514,7 +514,7 @@ function uninstallKiro() {
  * either file is always found.
  */
 function uninstallAntigravity() {
-  console.log("\n  Removing Niro from Antigravity...\n");
+  console.log("\n    Removing Niro from Antigravity...\n");
   const home = userHome();
   const legacy = path.join(home, ".gemini", "antigravity", "mcp_config.json");
   const unified = path.join(home, ".gemini", "config", "mcp_config.json");
@@ -557,9 +557,9 @@ function removeGlobalMcpServerUrl() {
     if (!Object.prototype.hasOwnProperty.call(current, "mcpServerUrl")) return;
     delete current.mcpServerUrl;
     fs.writeFileSync(cfg.FILE, JSON.stringify(current, null, 2) + "\n");
-    console.log(`  Removed mcpServerUrl from ${cfg.FILE}`);
+    console.log(`    Removed mcpServerUrl from ${cfg.FILE}`);
   } catch (e) {
-    console.warn(`  Could not update ~/.niro/config.json: ${e.message}`);
+    console.warn(`    Could not update ~/.niro/config.json: ${e.message}`);
   }
 }
 
@@ -567,13 +567,13 @@ function removeGlobalMcpServerUrl() {
 
 function printHeader() {
   console.log("");
-  console.log("  Niro MCP Server Uninstall");
-  console.log("  -------------------------");
+  console.log("    Niro MCP Server Uninstall");
+  console.log("    -------------------------");
   console.log("");
 }
 
 function printClients() {
-  console.log("  Clients:");
+  console.log("    Clients:");
   Object.keys(UNINSTALLERS).forEach((id) => {
     const c = CLIENTS[id];
     console.log(`    ${id.padEnd(18)} ${c ? c.name : id}`);
@@ -607,9 +607,9 @@ function runUninstall(targets, isFull) {
     removeGlobalMcpServerUrl();
   }
 
-  console.log("\n  Uninstall complete. Restart your AI assistant for the change to take effect.\n");
-  console.log("  Your `niro login` session is kept — run `niro logout` to clear it.");
-  console.log("  The `niro` command itself is still installed. To remove it too:");
+  console.log("\n    Uninstall complete. Restart your AI assistant for the change to take effect.\n");
+  console.log("    Your `niro login` session is kept. Run `niro logout` to clear it.");
+  console.log("    The `niro` command itself is still installed. To remove it too:");
   console.log("    npm rm -g niro-mcp-and-cli\n");
 }
 
@@ -633,25 +633,25 @@ async function main() {
     targets = allIds;
   } else if (clientArg) {
     if (!UNINSTALLERS[clientArg]) {
-      console.error(`  Unknown client: ${clientArg}\n`);
+      console.error(`    Unknown client: ${clientArg}\n`);
       printClients();
       process.exit(1);
     }
     targets = [clientArg];
   } else if (!process.stdin.isTTY) {
     // Non-interactive with no target: refuse rather than guess.
-    console.error("  No client specified. Pass --client <id> or --all.\n");
+    console.error("    No client specified. Pass --client <id> or --all.\n");
     printClients();
     process.exit(1);
   } else {
     printClients();
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    const choice = await ask(rl, "  Remove Niro from which client?", "claude-code");
+    const choice = await ask(rl, "    Remove Niro from which client?", "claude-code");
     rl.close();
     if (choice === "all") targets = allIds;
     else if (UNINSTALLERS[choice]) targets = [choice];
     else {
-      console.error(`\n  Unknown client: ${choice}\n`);
+      console.error(`\n    Unknown client: ${choice}\n`);
       process.exit(1);
     }
   }
@@ -659,13 +659,13 @@ async function main() {
   const isFull = targets.length === allIds.length;
 
   if (!assumeYes && process.stdin.isTTY) {
-    console.log(`\n  This removes Niro MCP config from: ${targets.join(", ")}`);
-    console.log("  (Your `niro login` session in ~/.niro/credentials.json is left intact.)\n");
+    console.log(`\n    This removes Niro MCP config from: ${targets.join(", ")}`);
+    console.log("    (Your `niro login` session in ~/.niro/credentials.json is left intact.)\n");
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    const ans = await ask(rl, "  Proceed?", "yes");
+    const ans = await ask(rl, "    Proceed?", "yes");
     rl.close();
     if (!/^y/i.test(ans)) {
-      console.log("\n  Aborted. Nothing was changed.\n");
+      console.log("\n    Aborted. Nothing was changed.\n");
       return;
     }
   }