ninja-terminals 2.4.6 → 2.4.7

package/lib/runtime-session.js

@@ -5,7 +5,7 @@ const http = require('http');
 const net = require('net');
 const os = require('os');
 const path = require('path');
-const { spawn } = require('child_process');
+const { spawn, execSync } = require('child_process');
 
 const SESSION_DIR = path.join(os.homedir(), '.ninja');
 const SESSION_FILE = path.join(SESSION_DIR, 'session.json');
@@ -54,6 +54,36 @@ async function findAvailablePort(preferredPort, host = '127.0.0.1', maxAttempts
   throw new Error(`No available port found from ${start} to ${Math.min(start + maxAttempts - 1, 65535)}`);
 }
 
+// Terminate a previous Ninja runtime recorded in the session file so a new
+// launch REPLACES it instead of orphaning it (which caused servers to pile up
+// and the port to climb 3300 -> 3301 -> 3302 on each relaunch). Verifies the
+// PID is actually a Ninja process before killing (guards against PID reuse).
+// Returns true if it killed something. selfPid is skipped (don't kill caller).
+async function killStaleRuntime(session, selfPid = process.pid) {
+  const pid = session && session.pid;
+  if (!pid || pid === selfPid) return false;
+
+  // Is the process even alive?
+  try { process.kill(pid, 0); } catch { return false; }
+
+  // Verify it's a Ninja server (avoid killing an unrelated reused PID).
+  if (process.platform !== 'win32') {
+    try {
+      const cmd = execSync(`ps -p ${pid} -o command=`, { encoding: 'utf8' }).trim();
+      if (!/server\.js|cli\.js|ninja/i.test(cmd)) return false;
+    } catch { return false; }
+  }
+
+  try {
+    process.kill(pid, 'SIGTERM');
+    // Give it a moment to release its port so the new server can reclaim it.
+    await new Promise((resolve) => setTimeout(resolve, 800));
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 function writeRuntimeSession(session) {
   ensureSessionDir();
   const payload = {
@@ -327,6 +357,7 @@ module.exports = {
   VISUAL_LEDGER_FILE,
   VALID_VISUAL_STAGES,
   findAvailablePort,
+  killStaleRuntime,
   writeRuntimeSession,
   updateRuntimeSession,
   readRuntimeSession,

package/ninja-ensure.js

@@ -11,6 +11,7 @@ const {
   readRuntimeSession,
   healthCheckSession,
   writeRuntimeSession,
+  killStaleRuntime,
   requestJson,
 } = require('./lib/runtime-session');
 const {
@@ -311,8 +312,10 @@ async function main() {
       session = existingSession;
       action = 'reuse';
     } else if (health.ok) {
-      log('Healthy session found, but it does not match the requested launch config');
-      log('Will start a fresh runtime for this explicit request');
+      log('Healthy session found, but it does not match the requested launch config (or --fresh)');
+      log('Replacing it to avoid orphaned servers and a climbing port...');
+      const killed = await killStaleRuntime(existingSession);
+      if (killed) log(`Terminated previous runtime (pid ${existingSession.pid})`);
     }
   }
 

package/package.json

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

@@ -26,6 +26,8 @@ const { runPostSession } = require('./lib/post-session');
 const {
   SESSION_FILE,
   findAvailablePort,
+  killStaleRuntime,
+  readRuntimeSession,
   writeRuntimeSession,
   updateRuntimeSession,
   clearRuntimeSession,
@@ -1305,6 +1307,12 @@ app.post('/api/auth/register', async (req, res) => {
 // ── Start ───────────────────────────────────────────────────
 
 async function startServer() {
+  // Replace any previous Ninja runtime instead of orphaning it (prevents a
+  // pile-up of dead servers and a port that climbs on each relaunch).
+  const previous = readRuntimeSession();
+  const replaced = await killStaleRuntime(previous);
+  if (replaced) console.log(`[runtime] replaced previous Ninja runtime (pid ${previous.pid})`);
+
   const selectedPort = await findAvailablePort(PREFERRED_PORT);
   if (selectedPort !== PREFERRED_PORT) {
     console.log(`[port] ${PREFERRED_PORT} is unavailable; using ${selectedPort}`);