ninja-terminals 2.2.3 → 2.2.5

package/cli.js

@@ -32,7 +32,7 @@ USAGE
 OPTIONS
   --setup                  Configure MCP server + orchestrator prompt (run once)
   --port        <number>   Port to listen on          (default: 3300)
-  --terminals   <number>   Number of terminals to spawn (default: 4)
+  --terminals   <number>   Number of terminals to spawn (default: 2, paid: 4)
   --cwd         <path>     Working directory for terminals (default: current dir)
   --token       <jwt>      Auth token for Pro users / CI (skips browser login)
   --offline                Offline mode for Pro users (skips backend validation)
@@ -89,7 +89,7 @@ if (hasFlag('--setup')) {
     command: 'node',
     args: [path.join(npmRoot, 'mcp-server.js')],
     env: {
-      NINJA_TERMINAL_COUNT: '4',
+      NINJA_TERMINAL_COUNT: '2',  // Free tier default. Set to '4' for paid.
       NINJA_LOG_LEVEL: 'info'
     }
   };
@@ -180,7 +180,7 @@ MCP tools available after restart:
 }
 
 const port      = parseInt(getArg('--port',      '3300'),  10);
-const terminals = parseInt(getArg('--terminals', '4'),     10);
+const terminals = parseInt(getArg('--terminals', '2'),     10);  // Free tier default
 const cwd       = getArg('--cwd', process.cwd());
 const token     = getArg('--token', null);
 const offline   = hasFlag('--offline');

package/mcp-server.js

@@ -694,24 +694,51 @@ mcpServer.setRequestHandler(CallToolRequestSchema, async (request) => {
 
 // ── Start Servers ───────────────────────────────────────────
 
-async function main() {
-  // Start HTTP server for browser UI
-  httpServer.listen(HTTP_PORT, () => {
-    console.error(`Ninja Terminals HTTP server running on http://localhost:${HTTP_PORT}`);
-
-    // Auto-spawn terminals based on tier (NINJA_TERMINAL_COUNT env var)
-    // Free = 2, Paid = 4
-    const terminalCount = parseInt(process.env.NINJA_TERMINAL_COUNT || '2', 10);
-    const labels = ['T1', 'T2', 'T3', 'T4', 'T5', 'T6', 'T7', 'T8'];
-
-    console.error(`Auto-spawning ${terminalCount} terminals...`);
-    for (let i = 0; i < terminalCount; i++) {
-      const label = labels[i] || `T${i + 1}`;
-      spawnTerminal(label, [], process.cwd(), 'pro');
-      console.error(`  Spawned ${label}`);
-    }
-    console.error(`All ${terminalCount} terminals ready`);
+// Check if port is in use
+function isPortInUse(port) {
+  return new Promise((resolve) => {
+    const net = require('net');
+    const server = net.createServer();
+    server.once('error', () => resolve(true));
+    server.once('listening', () => {
+      server.close();
+      resolve(false);
+    });
+    server.listen(port, '127.0.0.1');
   });
+}
+
+// Proxy mode flag - when true, MCP tools should call existing server via HTTP
+let proxyMode = false;
+
+async function main() {
+  // Check if server.js is already running on port 3300
+  const portInUse = await isPortInUse(HTTP_PORT);
+
+  if (portInUse) {
+    // Proxy mode: server.js is already running, just run MCP on stdio
+    proxyMode = true;
+    console.error(`Ninja Terminals server already running on port ${HTTP_PORT}`);
+    console.error('MCP server starting in proxy mode (will use existing server)');
+  } else {
+    // Standalone mode: start our own HTTP server
+    httpServer.listen(HTTP_PORT, () => {
+      console.error(`Ninja Terminals HTTP server running on http://localhost:${HTTP_PORT}`);
+
+      // Auto-spawn terminals based on tier (NINJA_TERMINAL_COUNT env var)
+      // Free = 2, Paid = 4
+      const terminalCount = parseInt(process.env.NINJA_TERMINAL_COUNT || '2', 10);
+      const labels = ['T1', 'T2', 'T3', 'T4', 'T5', 'T6', 'T7', 'T8'];
+
+      console.error(`Auto-spawning ${terminalCount} terminals...`);
+      for (let i = 0; i < terminalCount; i++) {
+        const label = labels[i] || `T${i + 1}`;
+        spawnTerminal(label, [], process.cwd(), 'pro');
+        console.error(`  Spawned ${label}`);
+      }
+      console.error(`All ${terminalCount} terminals ready`);
+    });
+  }
 
   // Start MCP server on stdio
   const transport = new StdioServerTransport();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ninja-terminals",
-  "version": "2.2.3",
+  "version": "2.2.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

@@ -23,7 +23,7 @@ const { runPostSession } = require('./lib/post-session');
 
 // ── Config ──────────────────────────────────────────────────
 const PORT = process.env.PORT || 3300;
-const DEFAULT_TERMINALS = parseInt(process.env.DEFAULT_TERMINALS || '4', 10);
+const DEFAULT_TERMINALS = parseInt(process.env.DEFAULT_TERMINALS || '2', 10);  // Free tier default
 const CLAUDE_CMD = process.env.CLAUDE_CMD || 'claude --dangerously-skip-permissions';
 const SHELL = process.env.SHELL || '/bin/zsh';
 const PROJECT_DIR = __dirname;