ninja-terminals 2.4.0 → 2.4.2

package/server.js

@@ -35,11 +35,14 @@ const {
 } = require('./lib/runtime-session');
 
 // ── Config ──────────────────────────────────────────────────
-const PREFERRED_PORT = parseInt(process.env.PORT || '3300', 10);
+const PREFERRED_PORT = parseInt(process.env.PORT || process.env.HTTP_PORT || '3300', 10);
 const BIND_HOST = process.env.NINJA_BIND_HOST || '127.0.0.1';
 const DEFAULT_TERMINALS = parseInt(process.env.DEFAULT_TERMINALS || '4', 10);
-const CLAUDE_CMD = process.env.CLAUDE_CMD || 'claude --dangerously-skip-permissions';
-const SHELL = process.env.SHELL || '/bin/zsh';
+const CLAUDE_CMD = process.env.CLAUDE_CMD || process.env.CLAUDE_CHROME_CMD || 'claude --chrome --model claude-opus-4-5-20251101';
+// Windows has no $SHELL / /bin/zsh — default to PowerShell (handles drive
+// changes via `cd` and emits clean ANSI for status detection).
+const IS_WIN = process.platform === 'win32';
+const SHELL = IS_WIN ? (process.env.NINJA_SHELL || 'powershell.exe') : (process.env.SHELL || '/bin/zsh');
 const PROJECT_DIR = __dirname;
 const DEFAULT_CWD = process.env.DEFAULT_CWD || null;  // Set to target project path to avoid cross-project prompts
 const INJECT_GUIDANCE = process.env.INJECT_GUIDANCE !== 'false';  // Default true, set INJECT_GUIDANCE=false to disable
@@ -47,12 +50,17 @@ const INJECT_GUIDANCE = process.env.INJECT_GUIDANCE !== 'false';  // Default tru
 // Fleet modes — preset terminal configurations
 const FLEET_MODES = {
   claude: ['claude', 'claude', 'claude', 'claude'],
+  codex: ['codex', 'codex', 'codex', 'codex'],
+  opencode: ['opencode', 'opencode', 'opencode', 'opencode'],
   teams: ['claude', 'opencode', 'codex', 'shell'],
   mixed: ['claude', 'claude', 'opencode', 'shell'],
   shell: ['shell', 'shell', 'shell', 'shell'],
   duo: ['claude', 'opencode'],
 };
 const FLEET_MODE = process.env.NINJA_MODE || 'claude';
+// Resolve the claude binary from PATH by default so it works on any machine.
+// Override with CLAUDE_CMD (full command) or CLAUDE_BIN (binary path) if needed.
+const CLAUDE_BIN = process.env.CLAUDE_BIN || 'claude';
 
 const sleep = ms => new Promise(r => setTimeout(r, ms));
 
@@ -152,7 +160,7 @@ function getTerminalRules(terminalId) {
 // ── Terminal Spawning ───────────────────────────────────────
 
 const AGENT_COMMANDS = {
-  claude: process.env.CLAUDE_CMD || 'claude --dangerously-skip-permissions',
+  claude: process.env.CLAUDE_CMD || `${CLAUDE_BIN} --dangerously-skip-permissions`,
   opencode: 'opencode',
   codex: 'codex',
   shell: null, // No command — just shell
@@ -189,7 +197,7 @@ function spawnTerminal(label, scope = [], cwd = null, tier = 'pro', agentType =
     }
   }
 
-  const ptyProcess = pty.spawn(SHELL, ['-l'], {
+  const ptyProcess = pty.spawn(SHELL, IS_WIN ? [] : ['-l'], {
     name: 'xterm-256color',
     cols,
     rows,
@@ -197,8 +205,16 @@ function spawnTerminal(label, scope = [], cwd = null, tier = 'pro', agentType =
     env: {
       ...cleanEnv,
       TERM: 'xterm-256color',
+      COLORTERM: 'truecolor',
+      FORCE_COLOR: '1',
+      CLICOLOR_FORCE: '1',
       HOME: require('os').homedir(),
-      PATH: `${require('os').homedir()}/.local/bin:/opt/homebrew/bin:${process.env.PATH || ''}`,
+      // On Windows, keep the native PATH untouched (mac/linux bin dirs would
+      // corrupt it via the ';' delimiter). On POSIX, prepend the usual bins.
+      PATH: IS_WIN
+        ? (process.env.PATH || '')
+        : [`${require('os').homedir()}/.local/bin`, '/opt/homebrew/bin', process.env.PATH || '']
+            .filter(Boolean).join(path.delimiter),
       SHELL_SESSIONS_DISABLE: '1',
       NINJA_TERMINAL_ID: String(id),
     },
@@ -206,11 +222,13 @@ function spawnTerminal(label, scope = [], cwd = null, tier = 'pro', agentType =
 
   // After shell starts, cd to work dir and launch agent (if not shell)
   const agentCmd = AGENT_COMMANDS[agentType] || null;
+  // Two separate writes (cd, then command) instead of `&&` — works across
+  // bash/zsh/PowerShell/cmd, which disagree on chaining (`&&` is unsupported
+  // in Windows PowerShell 5).
   setTimeout(() => {
+    ptyProcess.write(`cd "${workDir}"\r`);
     if (agentCmd) {
-      ptyProcess.write(`cd "${workDir}" && ${agentCmd}\r`);
-    } else {
-      ptyProcess.write(`cd "${workDir}"\r`);
+      setTimeout(() => ptyProcess.write(`${agentCmd}\r`), 250);
     }
   }, 500);
 
@@ -1292,13 +1310,16 @@ async function startServer() {
   server.listen(selectedPort, BIND_HOST, () => {
     const url = `http://localhost:${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;
     const session = writeRuntimeSession({
       port: selectedPort,
       host: BIND_HOST,
       url,
       cwd: DEFAULT_CWD || process.cwd(),
-      terminals: DEFAULT_TERMINALS,
+      terminals: terminalCount,
       command: 'ninja-terminals',
+      launchConfig: { mode: FLEET_MODE, terminalCount },
     });
 
     console.log(`Ninja Terminals v2 running on ${url}`);
@@ -1314,8 +1335,6 @@ async function startServer() {
     startSessionHeartbeat(sessionCache, handleSessionInvalidation, 5 * 60 * 1000);
 
     // Auto-spawn terminals based on fleet mode
-    const fleetConfig = FLEET_MODES[FLEET_MODE] || FLEET_MODES.claude;
-    const terminalCount = DEFAULT_TERMINALS > 0 ? Math.min(DEFAULT_TERMINALS, fleetConfig.length) : fleetConfig.length;
     const agentLabels = { claude: 'Claude', opencode: 'OpenCode', codex: 'Codex', shell: 'Shell' };
 
     console.log(`Auto-spawning ${terminalCount} terminals (mode: ${FLEET_MODE})...`);

package/hooks/ninja-common.js

@@ -1,46 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
-
-const NINJA_DIR = path.join(os.homedir(), '.ninja');
-const REQUEST_FILE = path.join(NINJA_DIR, 'ninja-request.json');
-
-const NINJA_PATTERNS = [
-  /ninja\s*terminal/i,
-  /use\s+ninja/i,
-  /build\s+with\s+ninja/i,
-  /orchestrat/i,
-  /\bPRD\b.*\bbuild\b/i,
-  /\bbuild\b.*\bPRD\b/i,
-];
-
-function isNinjaRequest(prompt) {
-  if (!prompt) return false;
-  return NINJA_PATTERNS.some(pattern => pattern.test(prompt));
-}
-
-function writeNinjaRequest(cwd, promptPreview) {
-  try {
-    fs.mkdirSync(NINJA_DIR, { recursive: true, mode: 0o700 });
-    const data = {
-      timestamp: new Date().toISOString(),
-      cwd: cwd || process.cwd(),
-      promptPreview: (promptPreview || '').slice(0, 200),
-    };
-    fs.writeFileSync(REQUEST_FILE, JSON.stringify(data, null, 2) + '\n', { mode: 0o600 });
-    return data;
-  } catch (err) {
-    console.error(`Warning: Could not write ninja request: ${err.message}`);
-    return null;
-  }
-}
-
-module.exports = {
-  NINJA_DIR,
-  REQUEST_FILE,
-  isNinjaRequest,
-  writeNinjaRequest,
-};

package/hooks/ninja-prompt-submit.js

@@ -1,33 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-const { isNinjaRequest, writeNinjaRequest } = require('./ninja-common');
-
-function main() {
-  let input = '';
-  process.stdin.setEncoding('utf8');
-  process.stdin.on('data', chunk => { input += chunk; });
-  process.stdin.on('end', () => {
-    try {
-      const event = JSON.parse(input);
-      const prompt = event.prompt || '';
-      const cwd = event.cwd || process.cwd();
-
-      if (isNinjaRequest(prompt)) {
-        writeNinjaRequest(cwd, prompt);
-        const output = {
-          result: 'continue',
-          message: `NINJA REQUEST DETECTED. Follow ORCHESTRATOR-PROMPT.md workflow.`,
-        };
-        console.log(JSON.stringify(output));
-      } else {
-        console.log(JSON.stringify({ result: 'continue' }));
-      }
-    } catch (err) {
-      console.error(`Warning: ninja-prompt-submit hook error: ${err.message}`);
-      console.log(JSON.stringify({ result: 'continue' }));
-    }
-  });
-}
-
-main();

package/hooks/ninja-startup.js

@@ -1,95 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-const http = require('http');
-const { execSync } = require('child_process');
-
-const PORT = parseInt(process.env.HTTP_PORT || '3300', 10);
-const MAX_WAIT_MS = 10000;
-const POLL_INTERVAL_MS = 500;
-
-function log(msg) {
-  process.stderr.write(`[ninja-startup] ${msg}\n`);
-}
-
-function healthCheck(port) {
-  return new Promise((resolve) => {
-    const req = http.get(`http://localhost:${port}/health`, (res) => {
-      let data = '';
-      res.on('data', chunk => data += chunk);
-      res.on('end', () => {
-        try {
-          const json = JSON.parse(data);
-          resolve(json.status === 'ok');
-        } catch {
-          resolve(false);
-        }
-      });
-    });
-    req.on('error', () => resolve(false));
-    req.setTimeout(2000, () => {
-      req.destroy();
-      resolve(false);
-    });
-  });
-}
-
-async function waitForHealth(port, maxWait = MAX_WAIT_MS) {
-  const start = Date.now();
-  while (Date.now() - start < maxWait) {
-    if (await healthCheck(port)) return true;
-    await new Promise(r => setTimeout(r, POLL_INTERVAL_MS));
-  }
-  return false;
-}
-
-function openInBrowser(url) {
-  try {
-    if (process.platform === 'darwin') {
-      execSync(`open "${url}"`, { stdio: 'ignore' });
-    } else if (process.platform === 'linux') {
-      execSync(`xdg-open "${url}"`, { stdio: 'ignore' });
-    } else if (process.platform === 'win32') {
-      execSync(`start "" "${url}"`, { stdio: 'ignore', shell: true });
-    }
-  } catch {
-    log(`Could not auto-open ${url}`);
-  }
-}
-
-async function main() {
-  // MCP server should already be running (started by Claude Code via mcpServers config)
-  // Just wait for it to be healthy
-  log(`Checking Ninja Terminal server on port ${PORT}...`);
-
-  const healthy = await waitForHealth(PORT);
-
-  if (!healthy) {
-    // Server not running - tell user to check MCP config
-    console.log(JSON.stringify({
-      status: 'error',
-      message: `Ninja Terminal server not responding on port ${PORT}. Check MCP config or run: npx ninja-terminals`,
-    }));
-    process.exit(0); // Don't fail the hook, just report
-  }
-
-  const mainUrl = `http://localhost:${PORT}/`;
-  const logViewerUrl = `http://localhost:${PORT}/log-viewer.html`;
-
-  log('Opening Ninja UI in browser...');
-  openInBrowser(mainUrl);
-
-  await new Promise(r => setTimeout(r, 300));
-  openInBrowser(logViewerUrl);
-
-  console.log(JSON.stringify({
-    status: 'ready',
-    port: PORT,
-    urls: { main: mainUrl, logViewer: logViewerUrl },
-  }));
-}
-
-main().catch(err => {
-  log(`Error: ${err.message}`);
-  process.exit(0); // Don't fail session start
-});