ninja-terminals 2.3.9 → 2.4.1

package/ninja-ensure.js

@@ -13,6 +13,10 @@ const {
   writeRuntimeSession,
   requestJson,
 } = require('./lib/runtime-session');
+const {
+  readNinjaRequest,
+  inferNinjaLaunchConfig,
+} = require('./lib/ninja-request');
 
 const LOG_FILE = path.join(SESSION_DIR, 'ninja-server.log');
 const PROJECT_ROOT = __dirname;
@@ -20,16 +24,21 @@ const PROJECT_ROOT = __dirname;
 const PROBE_PORTS = [3300, 3301, 3302, 3303, 3304, 3305, 3306, 3307, 3308, 3309, 3310];
 const AUTH_WAIT_MS = 15000;
 const AUTH_POLL_MS = 500;
+const MAX_SESSION_AGE_MS = parseInt(process.env.NINJA_MAX_SESSION_AGE_MS || '3600000', 10);
 
 const USAGE = `
 ninja-ensure — Start, discover, or recover a dispatch-ready Ninja Terminal runtime
 
 Usage:
-  ninja-ensure                Start/discover/recover, open browser, wait for auth
-  ninja-ensure --no-open      Start/discover/recover, don't open browser
-  ninja-ensure --allow-no-auth  Allow success without authToken (dispatch will fail)
-  ninja-ensure --dry-run      Report what would happen, no action
-  ninja-ensure --help         Show this help
+  ninja-ensure                     Start or reuse a matching runtime, open browser, wait for auth
+  ninja-ensure --no-open           Start or reuse a matching runtime, don't open browser
+  ninja-ensure --mode <mode>       Override fleet mode for this explicit launch
+  ninja-ensure --terminals <n>     Override terminal count for this explicit launch
+  ninja-ensure --fresh             Ignore any existing runtime/session and start fresh
+  ninja-ensure --recover-orphan    Probe for and recover an orphaned runtime if no session matches
+  ninja-ensure --allow-no-auth     Allow success without authToken (dispatch will fail)
+  ninja-ensure --dry-run           Report what would happen, no action
+  ninja-ensure --help              Show this help
 
 Dispatch-ready means:
   - Ninja Terminal server is running and healthy
@@ -48,6 +57,14 @@ function log(msg) {
   console.log(msg);
 }
 
+function getArgValue(args, flag) {
+  const index = args.indexOf(flag);
+  if (index < 0 || index + 1 >= args.length) return null;
+  const value = args[index + 1];
+  if (!value || value.startsWith('--')) return null;
+  return value;
+}
+
 function chromeHasUrl(url) {
   if (process.platform !== 'darwin') return false;
   try {
@@ -95,6 +112,40 @@ function openBrowser(url) {
   }
 }
 
+function normalizePathForCompare(value) {
+  if (!value) return null;
+  return path.resolve(String(value));
+}
+
+function getSessionAgeMs(session) {
+  if (!session) return null;
+  const rawTs = session.updatedAt || session.createdAt;
+  if (!rawTs) return null;
+  const ts = Date.parse(rawTs);
+  if (!Number.isFinite(ts)) return null;
+  return Date.now() - ts;
+}
+
+function sessionMatchesLaunchConfig(session, requestedCwd, launchConfig) {
+  if (!session || !session.launchConfig) return false;
+
+  const sessionMode = session.launchConfig.mode || 'claude';
+  const sessionCount = parseInt(session.launchConfig.terminalCount || session.terminals || 0, 10);
+  const sessionCwd = normalizePathForCompare(session.cwd);
+  const requestedPath = normalizePathForCompare(requestedCwd);
+
+  if (sessionMode !== launchConfig.mode) return false;
+  if (sessionCount !== launchConfig.terminalCount) return false;
+  if (!sessionCwd || !requestedPath || sessionCwd !== requestedPath) return false;
+
+  if (Number.isFinite(MAX_SESSION_AGE_MS) && MAX_SESSION_AGE_MS > 0) {
+    const ageMs = getSessionAgeMs(session);
+    if (ageMs == null || ageMs > MAX_SESSION_AGE_MS) return false;
+  }
+
+  return true;
+}
+
 function getTokenFromSources(session) {
   if (process.env.NINJA_AUTH_TOKEN) return process.env.NINJA_AUTH_TOKEN;
   if (session?.authToken) return session.authToken;
@@ -161,16 +212,17 @@ async function probeForOrphanedServer() {
   return found || null;
 }
 
-function recoverSessionFile(port, host = 'localhost') {
+function recoverSessionFile(port, host = 'localhost', cwd = process.cwd(), launchConfig = null) {
   const url = `http://${host}:${port}`;
   const session = writeRuntimeSession({
     port,
     url,
-    cwd: process.cwd(),
-    terminals: 4,
+    cwd,
+    terminals: launchConfig?.terminalCount || 4,
     command: 'ninja-ensure',
     recovered: true,
     recoveredAt: new Date().toISOString(),
+    launchConfig: launchConfig || inferNinjaLaunchConfig('open ninja terminals'),
     pid: null, // Don't claim a pid we don't own
   });
   return session;
@@ -189,14 +241,18 @@ async function waitForSession(timeoutMs = 20000, pollMs = 300) {
   return null;
 }
 
-async function startServer() {
+async function startServer({ cwd = process.cwd(), launchConfig = null } = {}) {
   fs.mkdirSync(SESSION_DIR, { recursive: true });
   const logStream = fs.openSync(LOG_FILE, 'a');
+  const effectiveLaunchConfig = launchConfig || inferNinjaLaunchConfig('open ninja terminals');
 
   const child = spawn('node', ['server.js'], {
     cwd: PROJECT_ROOT,
     env: {
       ...process.env,
+      DEFAULT_CWD: cwd,
+      NINJA_MODE: effectiveLaunchConfig.mode,
+      DEFAULT_TERMINALS: String(effectiveLaunchConfig.terminalCount || 4),
       NINJA_OPEN_BROWSER: 'false',
     },
     detached: true,
@@ -228,6 +284,21 @@ async function main() {
   const noOpen = args.includes('--no-open');
   const dryRun = args.includes('--dry-run');
   const allowNoAuth = args.includes('--allow-no-auth');
+  const fresh = args.includes('--fresh');
+  const recoverOrphan = args.includes('--recover-orphan');
+  const requestedMode = getArgValue(args, '--mode');
+  const requestedTerminalsRaw = getArgValue(args, '--terminals');
+  const requestedTerminals = requestedTerminalsRaw ? parseInt(requestedTerminalsRaw, 10) : null;
+  const request = readNinjaRequest();
+  const inferredLaunchConfig = request?.launchConfig || inferNinjaLaunchConfig(request?.promptPreview || '');
+  const launchConfig = {
+    mode: requestedMode || inferredLaunchConfig.mode,
+    terminalCount: Number.isInteger(requestedTerminals) && requestedTerminals > 0
+      ? requestedTerminals
+      : inferredLaunchConfig.terminalCount,
+  };
+  const requestedCwd = request?.cwd || process.cwd();
+  log(`Requested launch: mode=${launchConfig.mode}, terminals=${launchConfig.terminalCount}, cwd=${requestedCwd}${fresh ? ' (fresh)' : ''}${recoverOrphan ? ' (recover-orphan)' : ''}`);
 
   // Step 1: Check existing session file
   const existingSession = readRuntimeSession();
@@ -236,20 +307,23 @@ async function main() {
 
   if (existingSession?.port) {
     const health = await healthCheckSession(existingSession);
-    if (health.ok) {
+    if (health.ok && !fresh && sessionMatchesLaunchConfig(existingSession, requestedCwd, launchConfig)) {
       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');
     }
   }
 
-  // Step 2: If no healthy session, probe for orphaned server
-  if (!session) {
-    log('No healthy session file. Probing for orphaned Ninja server...');
+  // Step 2: If no reusable session, optionally probe for orphaned server
+  if (!session && recoverOrphan && !fresh) {
+    log('No reusable session file. Probing for orphaned Ninja server...');
     const orphaned = await probeForOrphanedServer();
     if (orphaned) {
       action = 'recover';
       if (!dryRun) {
-        session = recoverSessionFile(orphaned.port, orphaned.host);
+        session = recoverSessionFile(orphaned.port, orphaned.host, requestedCwd, launchConfig);
         log(`Recovered orphaned runtime: http://${orphaned.host}:${orphaned.port}`);
       } else {
         session = { port: orphaned.port, host: orphaned.host, url: `http://${orphaned.host}:${orphaned.port}` };
@@ -257,6 +331,8 @@ async function main() {
     } else {
       action = 'start';
     }
+  } else if (!session) {
+    action = 'start';
   }
 
   // Dry run reporting
@@ -270,7 +346,7 @@ async function main() {
       log(`[dry-run] Would repair session file: ${SESSION_FILE}`);
       log(`[dry-run] authToken will be missing (browser sync required)`);
     } else {
-      log(`[dry-run] No runtime found on probed ports`);
+      log(`[dry-run] No reusable runtime found`);
       log(`[dry-run] Would start new server from ${PROJECT_ROOT}`);
     }
     log(`[dry-run] Would open browser: ${!noOpen}`);
@@ -279,7 +355,7 @@ async function main() {
 
   // Step 3: Start new server if needed
   if (action === 'start') {
-    session = await startServer();
+    session = await startServer({ cwd: requestedCwd, launchConfig });
     log(`Server ready on ${session.url}`);
   } else if (action === 'reuse') {
     log(`Runtime already active: ${session.url}`);

package/package.json

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

package/public/app.js

@@ -3,313 +3,20 @@
 const WS_BASE = `ws://${location.host}`;
 const API_BASE = '';
 const AUTH_API = '/api';
-const TOKEN_KEY = 'ninja_token';
-
-// Session readiness gate — resolves when session is validated (or validation is skipped)
-let sessionReadyResolve;
-const sessionReady = new Promise(resolve => { sessionReadyResolve = resolve; });
-
-// ── Auth Module ──────────────────────────────────────────────
-
 const auth = {
   token: null,
-  user: null,
-  tier: null,
-  terminalsMax: 2,
-  validating: false,
-
-  init() {
-    const stored = localStorage.getItem(TOKEN_KEY);
-    if (!stored) return false;
-
-    try {
-      // Decode JWT payload (base64url)
-      const parts = stored.split('.');
-      if (parts.length !== 3) {
-        localStorage.removeItem(TOKEN_KEY);
-        return false;
-      }
-
-      const payload = JSON.parse(atob(parts[1].replace(/-/g, '+').replace(/_/g, '/')));
-
-      // Check expiration
-      if (payload.exp && payload.exp * 1000 < Date.now()) {
-        localStorage.removeItem(TOKEN_KEY);
-        return false;
-      }
-
-      this.token = stored;
-      this.user = payload.sub || payload.email || payload.username || null;
-      return true;
-    } catch {
-      localStorage.removeItem(TOKEN_KEY);
-      return false;
-    }
-  },
-
-  async tryBootstrap() {
-    try {
-      const res = await fetch(`${API_BASE}/api/auth/bootstrap`);
-      if (!res.ok) return false;
-
-      const data = await res.json();
-      if (!data.token) return false;
-
-      // Validate token format
-      const parts = data.token.split('.');
-      if (parts.length !== 3) return false;
-
-      const payload = JSON.parse(atob(parts[1].replace(/-/g, '+').replace(/_/g, '/')));
-      if (payload.exp && payload.exp * 1000 < Date.now()) return false;
-
-      // Save to localStorage and use
-      localStorage.setItem(TOKEN_KEY, data.token);
-      this.token = data.token;
-      this.user = payload.sub || payload.email || payload.username || null;
-      return true;
-    } catch {
-      return false;
-    }
-  },
-
-  async login(usernameOrEmail, password) {
-    const res = await fetch(`${AUTH_API}/auth/login`, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ username: usernameOrEmail, password }),
-    });
-
-    if (!res.ok) {
-      const err = await res.json().catch(() => ({}));
-      throw new Error(err.message || 'Login failed');
-    }
-
-    const data = await res.json();
-    this.token = data.token || data.accessToken;
-    localStorage.setItem(TOKEN_KEY, this.token);
-
-    await this.validateTier();
-    return data;
-  },
-
-  async register(username, email, password) {
-    const res = await fetch(`${AUTH_API}/auth/register`, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ username, email, password }),
-    });
-
-    if (!res.ok) {
-      const err = await res.json().catch(() => ({}));
-      throw new Error(err.message || 'Registration failed');
-    }
-
-    const data = await res.json();
-    this.token = data.token || data.accessToken;
-    localStorage.setItem(TOKEN_KEY, this.token);
-
-    await this.validateTier();
-    return data;
+  getAuthHeader() {
+    return {};
   },
-
-  async activateLicense(key) {
-    const res = await fetch(`${AUTH_API}/ninja/activate-license`, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ licenseKey: key }),
-    });
-
-    if (!res.ok) {
-      const err = await res.json().catch(() => ({}));
-      throw new Error(err.message || 'Invalid license key');
-    }
-
-    const data = await res.json();
-    this.token = data.token || data.accessToken;
-    localStorage.setItem(TOKEN_KEY, this.token);
-
-    await this.validateTier();
-    return data;
+  logout() {},
+  init() {
+    return true;
   },
-
   async validateTier() {
-    this.validating = true;
-    try {
-      const res = await fetch(`${API_BASE}/api/session`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-          ...this.getAuthHeader(),
-        },
-        body: JSON.stringify({ token: this.token }),
-      });
-
-      if (!res.ok) {
-        // 401 = token truly invalid/expired, need re-login
-        if (res.status === 401) {
-          console.warn('Session validation failed: token invalid');
-          this.token = null;
-          localStorage.removeItem(TOKEN_KEY);
-          return { needsLogin: true };
-        }
-        // Other errors (500, network) — proceed with defaults
-        console.warn('Session validation failed, using defaults');
-        return { needsLogin: false };
-      }
-
-      const data = await res.json();
-      this.tier = data.tier || 'free';
-      this.terminalsMax = data.terminalsMax || 2;
-      if (data.user) this.user = data.user;
-      return { needsLogin: false };
-    } finally {
-      this.validating = false;
-    }
-  },
-
-  async logout() {
-    try {
-      await fetch(`${API_BASE}/api/session`, {
-        method: 'DELETE',
-        headers: this.getAuthHeader(),
-      });
-    } catch {
-      // Ignore errors on logout
-    }
-
-    this.token = null;
-    this.user = null;
-    this.tier = null;
-    localStorage.removeItem(TOKEN_KEY);
-
-    showAuthOverlay();
-  },
-
-  getAuthHeader() {
-    return this.token ? { 'Authorization': `Bearer ${this.token}` } : {};
+    return { needsLogin: false };
   },
 };
 
-// ── Auth UI ──────────────────────────────────────────────────
-
-function showAuthOverlay() {
-  // Auth disabled - app is free, never show auth overlay
-  return;
-}
-
-function hideAuthOverlay() {
-  const overlay = document.getElementById('auth-overlay');
-  overlay.classList.add('hidden');
-}
-
-function setupAuthForms() {
-  const loginForm = document.getElementById('login-form');
-  const registerForm = document.getElementById('register-form');
-  const licenseForm = document.getElementById('license-form');
-  const loginError = document.getElementById('login-error');
-  const registerError = document.getElementById('register-error');
-  const logoutBtn = document.getElementById('logout-btn');
-  const showRegisterLink = document.getElementById('show-register');
-  const authToggleText = document.getElementById('auth-toggle-text');
-
-  // Toggle between login and register
-  let showingRegister = false;
-
-  function toggleAuthMode() {
-    showingRegister = !showingRegister;
-    if (showingRegister) {
-      loginForm.classList.add('hidden');
-      registerForm.classList.remove('hidden');
-      authToggleText.innerHTML = 'Already have an account? <a href="#" id="show-register">Sign in</a>';
-      document.getElementById('register-username').focus();
-    } else {
-      registerForm.classList.add('hidden');
-      loginForm.classList.remove('hidden');
-      authToggleText.innerHTML = 'Don\'t have an account? <a href="#" id="show-register">Sign up</a>';
-      document.getElementById('login-email').focus();
-    }
-    // Re-attach click handler to new link
-    document.getElementById('show-register').addEventListener('click', (e) => {
-      e.preventDefault();
-      toggleAuthMode();
-    });
-    loginError.textContent = '';
-    registerError.textContent = '';
-  }
-
-  showRegisterLink.addEventListener('click', (e) => {
-    e.preventDefault();
-    toggleAuthMode();
-  });
-
-  // Login form
-  loginForm.addEventListener('submit', async (e) => {
-    e.preventDefault();
-    loginError.textContent = '';
-
-    const email = document.getElementById('login-email').value.trim();
-    const password = document.getElementById('login-password').value;
-
-    try {
-      await auth.login(email, password);
-      hideAuthOverlay();
-      startApp();
-      sessionReadyResolve();
-    } catch (err) {
-      loginError.textContent = err.message;
-    }
-  });
-
-  // Register form
-  registerForm.addEventListener('submit', async (e) => {
-    e.preventDefault();
-    registerError.textContent = '';
-
-    const username = document.getElementById('register-username').value.trim();
-    const email = document.getElementById('register-email').value.trim();
-    const password = document.getElementById('register-password').value;
-
-    if (password.length < 8) {
-      registerError.textContent = 'Password must be at least 8 characters';
-      return;
-    }
-
-    try {
-      await auth.register(username, email, password);
-      hideAuthOverlay();
-      startApp();
-      sessionReadyResolve();
-    } catch (err) {
-      registerError.textContent = err.message;
-    }
-  });
-
-  // License form
-  licenseForm.addEventListener('submit', async (e) => {
-    e.preventDefault();
-    loginError.textContent = '';
-
-    const key = document.getElementById('license-key').value.trim();
-    if (!key) {
-      loginError.textContent = 'Please enter a license key';
-      return;
-    }
-
-    try {
-      await auth.activateLicense(key);
-      hideAuthOverlay();
-      startApp();
-      sessionReadyResolve();
-    } catch (err) {
-      loginError.textContent = err.message;
-    }
-  });
-
-  logoutBtn.addEventListener('click', () => {
-    auth.logout();
-  });
-}
-
 // ── State ────────────────────────────────────────────────────
 
 const state = {
@@ -376,6 +83,24 @@ const TASK_STATUS_LABELS = {
   unknown: 'UNKNOWN',
 };
 
+const AGENT_TYPE_LABELS = {
+  claude: 'Claude',
+  codex: 'Codex',
+  opencode: 'OpenCode',
+  shell: 'Shell',
+  mixed: 'Mixed',
+  duo: 'Duo',
+};
+
+const AGENT_TYPE_CLASSES = {
+  claude: 'agent-claude',
+  codex: 'agent-codex',
+  opencode: 'agent-opencode',
+  shell: 'agent-shell',
+  mixed: 'agent-mixed',
+  duo: 'agent-duo',
+};
+
 // ── Utilities ────────────────────────────────────────────────
 
 function timestamp() {
@@ -393,6 +118,10 @@ function getTerminalFeedClass(id) {
   return `feed-t${idx + 1}`;
 }
 
+function getAgentTypeClass(agentType) {
+  return AGENT_TYPE_CLASSES[agentType] || 'agent-claude';
+}
+
 // ── Activity Feed ────────────────────────────────────────────
 
 function addFeedEntry(message, terminalId) {
@@ -423,12 +152,13 @@ function escapeHtml(str) {
 // ── Terminal Creation ────────────────────────────────────────
 
 function createTerminalUI(termData) {
-  const { id, label, status, elapsed, progress, taskName } = termData;
+  const { id, label, status, elapsed, progress, taskName, agentType } = termData;
 
   // Pane
   const pane = document.createElement('div');
   pane.className = 'terminal-pane';
   pane.id = `pane-${id}`;
+  pane.classList.add(getAgentTypeClass(agentType));
 
   // Header
   const header = document.createElement('div');
@@ -660,6 +390,7 @@ function createTerminalUI(termData) {
   const termState = {
     id,
     label: label || `Terminal ${id.slice(0, 6)}`,
+    agentType: agentType || 'claude',
     status: status || 'idle',
     progress: progress || 0,
     elapsed: elapsed || '',
@@ -964,6 +695,11 @@ function updateTerminalState(id, newStatus, extra) {
       if (t.labelEl) t.labelEl.textContent = extra.label;
     }
     if (extra.taskName !== undefined) t.taskName = extra.taskName;
+    if (extra.agentType !== undefined) {
+      t.agentType = extra.agentType;
+      t.paneEl.classList.remove('agent-claude', 'agent-codex', 'agent-opencode', 'agent-shell', 'agent-mixed', 'agent-duo');
+      t.paneEl.classList.add(getAgentTypeClass(extra.agentType));
+    }
   }
 
   // Update state icon
@@ -1248,7 +984,6 @@ window.addEventListener('resize', () => {
 // ── Start App (after auth) ───────────────────────────────────
 
 async function startApp() {
-  // Request desktop notification permission
   requestNotificationPermission();
 
   // Setup sidebar
@@ -1294,23 +1029,37 @@ async function startApp() {
 
 function setupAddTerminal() {
   const btn = document.getElementById('add-terminal-btn');
+  const preset = document.getElementById('agent-preset-select');
   if (!btn) return;
 
   // Store last used directory
   let lastCwd = localStorage.getItem('ninja-last-cwd') || '/Users/davidmini/Desktop/Projects';
+  let lastAgentType = localStorage.getItem('ninja-last-agent-type') || 'claude';
+
+  if (preset) {
+    const validPresets = new Set(['claude', 'codex', 'opencode', 'shell', 'mixed', 'duo']);
+    if (!validPresets.has(lastAgentType)) lastAgentType = 'claude';
+    preset.value = lastAgentType;
+    preset.addEventListener('change', () => {
+      lastAgentType = preset.value;
+      localStorage.setItem('ninja-last-agent-type', lastAgentType);
+    });
+  }
 
   btn.addEventListener('click', async () => {
     try {
-      const cwd = prompt('Working directory:', lastCwd);
-      if (!cwd) return;
+      const agentType = preset?.value || lastAgentType || 'claude';
+      const cwd = lastCwd;
 
       lastCwd = cwd;
+      lastAgentType = agentType;
       localStorage.setItem('ninja-last-cwd', cwd);
+      localStorage.setItem('ninja-last-agent-type', agentType);
 
       const res = await fetch(`${API_BASE}/api/terminals`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json', ...auth.getAuthHeader() },
-        body: JSON.stringify({ cwd }),
+        body: JSON.stringify({ cwd, agentType }),
       });
 
       if (!res.ok) {
@@ -1321,7 +1070,7 @@ function setupAddTerminal() {
 
       const terminal = await res.json();
       createTerminalUI(terminal);
-      addFeedEntry(`Terminal added: T${terminal.id}`);
+      addFeedEntry(`Terminal added: T${terminal.id} (${AGENT_TYPE_LABELS[terminal.agentType] || terminal.agentType || 'claude'})`);
     } catch (err) {
       console.error('Failed to add terminal:', err);
       alert('Failed to add terminal');
@@ -1401,10 +1150,8 @@ function setupLearnings() {
 // ── Initialize ───────────────────────────────────────────────
 
 async function init() {
-  // Auth disabled — app is free, start immediately
-  hideAuthOverlay();
+  auth.init();
   startApp();
-  sessionReadyResolve();
 }
 
 init();