ninja-terminals 2.3.2 → 2.3.3

package/cli.js

@@ -54,6 +54,10 @@ if (hasFlag('--version') || hasFlag('-v')) {
 
 // ── Setup command ───────────────────────────────────────────
 if (hasFlag('--setup')) {
+  runSetup().then(() => process.exit(0)).catch(e => { console.error(e); process.exit(1); });
+}
+
+async function runSetup() {
   const fs = require('fs');
   const path = require('path');
   const os = require('os');
@@ -100,8 +104,13 @@ if (hasFlag('--setup')) {
     }
   };
 
-  // Get npm root for copying orchestrator prompt
-  const npmRoot = path.dirname(require.resolve('ninja-terminals/package.json'));
+  // Get npm root for copying orchestrator prompt (works in dev and installed mode)
+  let npmRoot;
+  try {
+    npmRoot = path.dirname(require.resolve('ninja-terminals/package.json'));
+  } catch {
+    npmRoot = __dirname; // Dev mode fallback
+  }
 
   fs.writeFileSync(settingsPath, JSON.stringify(mcpConfig, null, 2) + '\n');
   console.log(`✅ Added ninja-terminals to ${settingsPath}`);
@@ -166,28 +175,108 @@ if (hasFlag('--setup')) {
 
   console.log(`
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+✅ MCP configured!
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+`);
+
+  // Now prompt for login
+  const readline = require('readline');
+  const https = require('https');
+  const { execSync } = require('child_process');
+  const { writeAuthToken } = require('./lib/runtime-session');
+
+  const BACKEND_URL = process.env.NINJA_BACKEND_URL || 'https://emtchat-backend.onrender.com';
+
+  function prompt(question) {
+    return new Promise((resolve) => {
+      const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+      rl.question(question, (answer) => { rl.close(); resolve(answer); });
+    });
+  }
+
+  function promptPassword(question) {
+    return new Promise((resolve) => {
+      try { execSync('stty -echo', { stdio: 'pipe' }); } catch {}
+      const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+      process.stdout.write(question);
+      rl.question('', (answer) => {
+        try { execSync('stty echo', { stdio: 'pipe' }); } catch {}
+        console.log();
+        rl.close();
+        resolve(answer);
+      });
+    });
+  }
+
+  function postJson(url, body) {
+    return new Promise((resolve, reject) => {
+      const parsed = new URL(url);
+      const payload = JSON.stringify(body);
+      const req = https.request({
+        hostname: parsed.hostname,
+        port: parsed.port || 443,
+        path: parsed.pathname,
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json', 'Content-Length': Buffer.byteLength(payload) },
+      }, (res) => {
+        let data = '';
+        res.on('data', chunk => { data += chunk; });
+        res.on('end', () => {
+          try { resolve({ status: res.statusCode, body: JSON.parse(data) }); }
+          catch { resolve({ status: res.statusCode, body: data }); }
+        });
+      });
+      req.on('error', reject);
+      req.write(payload);
+      req.end();
+    });
+  }
+
+  async function doLogin() {
+    console.log('Login to your Ninja Terminals account:\n');
+    const username = await prompt('Username or email: ');
+    const password = await promptPassword('Password: ');
+
+    if (!username || !password) {
+      console.log('\n⚠️  Skipped login. Run `npx ninja-login` later to authenticate.');
+      return false;
+    }
+
+    console.log('Authenticating...');
+    try {
+      const res = await postJson(`${BACKEND_URL}/api/auth/login`, { username, password });
+      if (res.status === 200 && res.body.token) {
+        writeAuthToken(res.body.token);
+        console.log(`\n✅ Logged in as ${username}`);
+        console.log(`   Token saved to ~/.ninja/token`);
+        return true;
+      } else {
+        console.log(`\n❌ Login failed: ${res.body.message || res.body.error || 'Unknown error'}`);
+        console.log('   Run `npx ninja-login` to try again.');
+        return false;
+      }
+    } catch (err) {
+      console.log(`\n❌ Connection failed: ${err.message}`);
+      console.log('   Run `npx ninja-login` to try again.');
+      return false;
+    }
+  }
+
+  await doLogin();
+
+  console.log(`
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 ✨ Setup complete!
 
-MCPs configured:
-  • ninja-terminals - orchestrates parallel Claude Code instances
-  • playwright - browser automation (screenshots, clicks, reading)
-  • fetch - API calls to /api/terminals
-
-Next steps:
-1. Restart Claude Code to load MCP servers
-2. Run: npx ninja-terminals
-3. Or use MCP tools directly in Claude Code
-
-MCP tools available after restart:
-  mcp__ninja-terminals__spawn_terminal
-  mcp__ninja-terminals__send_input
-  mcp__ninja-terminals__list_terminals
-  ... and 9 more
+Next: Restart Claude Code, then tell Claude:
+      "use ninja terminals"
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 `);
-  process.exit(0);
 }
 
+// If setup mode was requested, we're done (setup function calls process.exit)
+if (!hasFlag('--setup')) {
+
 const port      = parseInt(getArg('--port',      '3300'),  10);
 const terminals = parseInt(getArg('--terminals', '2'),     10);  // Free tier default
 const cwd       = getArg('--cwd', process.cwd());
@@ -267,3 +356,5 @@ setTimeout(() => {
 // ── Start the server ─────────────────────────────────────────
 
 require('./server.js');
+
+} // end if (!hasFlag('--setup'))

package/package.json

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