ninja-terminals 2.4.3 → 2.4.5

package/cli.js

@@ -92,7 +92,10 @@ if (hasFlag('--setup')) {
   fs.writeFileSync(mcpPath, JSON.stringify(mcpConfig, null, 2) + '\n');
   console.log(`✅ Added ninja-terminals to ${mcpPath}`);
 
-  // 3. Copy orchestrator prompt to CLAUDE.md
+  // 3. Copy orchestrator prompt to CLAUDE.md in the current directory.
+  //    Wrapped in try/catch: running from a protected dir (e.g. an Admin shell
+  //    sitting in C:\Windows\System32) makes this write fail with EPERM. Warn
+  //    and guide instead of crashing — .mcp.json is already configured.
   const claudeMd = path.join(process.cwd(), 'CLAUDE.md');
   const orchestratorPrompt = path.join(npmRoot, 'ORCHESTRATOR-PROMPT.md');
 
@@ -100,19 +103,26 @@ if (hasFlag('--setup')) {
     const prompt = fs.readFileSync(orchestratorPrompt, 'utf-8');
     const marker = '<!-- NINJA TERMINALS ORCHESTRATOR -->';
 
-    let claudeContent = '';
-    if (fs.existsSync(claudeMd)) {
-      claudeContent = fs.readFileSync(claudeMd, 'utf-8');
-      if (claudeContent.includes(marker)) {
-        console.log(`✅ Orchestrator prompt already in CLAUDE.md`);
+    try {
+      let claudeContent = '';
+      if (fs.existsSync(claudeMd)) {
+        claudeContent = fs.readFileSync(claudeMd, 'utf-8');
+        if (claudeContent.includes(marker)) {
+          console.log(`✅ Orchestrator prompt already in CLAUDE.md`);
+        } else {
+          fs.writeFileSync(claudeMd, claudeContent + `\n\n${marker}\n${prompt}`);
+          console.log(`✅ Added orchestrator prompt to ${claudeMd}`);
+        }
       } else {
-        claudeContent += `\n\n${marker}\n${prompt}`;
-        fs.writeFileSync(claudeMd, claudeContent);
-        console.log(`✅ Added orchestrator prompt to CLAUDE.md`);
+        fs.writeFileSync(claudeMd, `${marker}\n${prompt}`);
+        console.log(`✅ Created ${claudeMd}`);
       }
-    } else {
-      fs.writeFileSync(claudeMd, `${marker}\n${prompt}`);
-      console.log(`✅ Created CLAUDE.md with orchestrator prompt`);
+    } catch (e) {
+      console.log(`⚠️  Couldn't write CLAUDE.md in ${process.cwd()} (${e.code || e.message}).`);
+      console.log(`   This usually means you're in a protected folder (e.g. C:\\Windows\\System32).`);
+      console.log(`   Re-run setup from your project folder, e.g.:`);
+      console.log(`     cd <your-project> && npx ninja-terminals --setup`);
+      console.log(`   (.mcp.json is already configured, so MCP tools will still load.)`);
     }
   }
 
@@ -246,9 +256,17 @@ function openBrowser(url) {
 
 // Delay browser open until after the server listen callback fires.
 // server.js calls server.listen() synchronously on require, so we
-// schedule the open after the current tick stack clears.
+// schedule the open after the current tick stack clears. Read the actual
+// selected port from the session file — the server may have rolled to a
+// different port if the preferred one was occupied (on either IP stack).
 setTimeout(() => {
-  openBrowser(`http://localhost:${port}`);
+  let openPort = port;
+  try {
+    const sessionPath = require('path').join(require('os').homedir(), '.ninja', 'session.json');
+    const s = JSON.parse(require('fs').readFileSync(sessionPath, 'utf8'));
+    if (s && s.port) openPort = s.port;
+  } catch { /* fall back to requested port */ }
+  openBrowser(`http://127.0.0.1:${openPort}`);
 }, 1500);
 
 // ── Start the server ─────────────────────────────────────────

package/lib/runtime-session.js

@@ -18,17 +18,29 @@ function ensureSessionDir() {
   fs.mkdirSync(SESSION_DIR, { recursive: true, mode: 0o700 });
 }
 
-function isPortAvailable(port, host = '127.0.0.1') {
+// Probe a single host: 'free' (bindable), 'inuse' (EADDRINUSE), or
+// 'unavailable' (stack absent / other error — don't treat as a collision).
+function probePort(port, host) {
   return new Promise((resolve) => {
     const server = net.createServer();
-    server.once('error', () => resolve(false));
-    server.once('listening', () => {
-      server.close(() => resolve(true));
-    });
+    server.once('error', (err) => resolve(err.code === 'EADDRINUSE' ? 'inuse' : 'unavailable'));
+    server.once('listening', () => server.close(() => resolve('free')));
     server.listen(port, host);
   });
 }
 
+// A port is available only if it's NOT in use on EITHER IP stack. A listener
+// on IPv6 wildcard (e.g. *:3300, common with other local MCP servers) leaves
+// IPv4 127.0.0.1 genuinely free, so an IPv4-only check would miss it and the
+// browser (which resolves localhost -> IPv6 first) would hit the wrong server.
+async function isPortAvailable(port) {
+  const [v4, v6] = await Promise.all([
+    probePort(port, '127.0.0.1'),
+    probePort(port, '::1'),
+  ]);
+  return v4 !== 'inuse' && v6 !== 'inuse';
+}
+
 async function findAvailablePort(preferredPort, host = '127.0.0.1', maxAttempts = 50) {
   const start = Number.parseInt(preferredPort, 10);
   if (!Number.isInteger(start) || start < 1 || start > 65535) {
@@ -36,7 +48,7 @@ async function findAvailablePort(preferredPort, host = '127.0.0.1', maxAttempts
   }
 
   for (let port = start; port < start + maxAttempts && port <= 65535; port++) {
-    if (await isPortAvailable(port, host)) return port;
+    if (await isPortAvailable(port)) return port;
   }
 
   throw new Error(`No available port found from ${start} to ${Math.min(start + maxAttempts - 1, 65535)}`);
@@ -47,7 +59,7 @@ function writeRuntimeSession(session) {
   const payload = {
     version: 1,
     pid: process.pid,
-    host: 'localhost',
+    host: '127.0.0.1',
     createdAt: new Date().toISOString(),
     ...session,
   };
@@ -90,7 +102,7 @@ function readAuthToken() {
   }
 }
 
-function requestJson({ host = 'localhost', port, path: reqPath, token, method = 'GET', body = null, timeoutMs = 3000 }) {
+function requestJson({ host = '127.0.0.1', port, path: reqPath, token, method = 'GET', body = null, timeoutMs = 3000 }) {
   return new Promise((resolve, reject) => {
     const payload = body ? JSON.stringify(body) : null;
     const headers = {};
@@ -134,7 +146,7 @@ async function healthCheckSession(session, timeoutMs = 3000) {
   if (!session || !session.port) return { ok: false, error: 'No runtime session port' };
   try {
     const res = await requestJson({
-      host: session.host || 'localhost',
+      host: session.host || '127.0.0.1',
       port: session.port,
       path: '/health',
       timeoutMs,

package/mcp-server.js

@@ -668,8 +668,8 @@ mcpServer.setRequestHandler(CallToolRequestSchema, async (request) => {
               label: terminal.label,
               status: terminal.status,
               cwd: terminal.cwd,
-              webUrl: `http://localhost:${HTTP_PORT}`,
-              wsUrl: `ws://localhost:${HTTP_PORT}/ws/${terminal.id}`,
+              webUrl: `http://127.0.0.1:${HTTP_PORT}`,
+              wsUrl: `ws://127.0.0.1:${HTTP_PORT}/ws/${terminal.id}`,
             }, null, 2),
           }],
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ninja-terminals",
-  "version": "2.4.3",
+  "version": "2.4.5",
   "description": "MCP server for multi-terminal Claude Code orchestration with DAG task management, parallel execution, and self-improvement",
   "main": "server.js",
   "bin": {

package/server.js

@@ -1311,7 +1311,7 @@ async function startServer() {
   }
 
   server.listen(selectedPort, BIND_HOST, () => {
-    const url = `http://localhost:${selectedPort}`;
+    const url = `http://127.0.0.1:${selectedPort}`;
     console.log(`[bind] Listening on ${BIND_HOST}:${selectedPort}`);
     const fleetConfig = FLEET_MODES[FLEET_MODE] || FLEET_MODES.claude;
     const terminalCount = DEFAULT_TERMINALS > 0 ? Math.min(DEFAULT_TERMINALS, fleetConfig.length) : fleetConfig.length;