@chatpanel/gateway 0.1.3 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatpanel/gateway",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Local privacy gateway — redacts PII out of OpenAI/Anthropic API traffic before it reaches a model, then restores it in the reply. Point opencode, codex, aider, Claude Code, etc. at it.",
   "type": "module",
   "bin": {

package/src/ner.js

@@ -14,78 +14,83 @@ const NER_DIR = join(dirname(fileURLToPath(import.meta.url)), '..', 'ner');
 
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 
-async function healthy(port, signal) {
+// Probe the ACTUAL /ner contract (POST {text} -> {entities}), not /health: many
+// NER servers (incl. a user's own) expose only /ner. If anything answers here, we
+// can use it as the detector.
+async function nerReachable(port, signal) {
   try {
-    const res = await fetch(`http://127.0.0.1:${port}/health`, { signal });
+    const res = await fetch(`http://127.0.0.1:${port}/ner`, {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ text: 'ping' }),
+      signal,
+    });
     return res.ok;
   } catch {
     return false;
   }
 }
 
-// Launch + supervise the NER server. Returns { stop() } or null if not started.
-// Mutates cfg.redaction once the server answers /health.
+// Launch + supervise the NER server (or adopt one already on the port). Returns
+// { stop() } or null if not started. Mutates cfg.redaction once NER answers.
 export function startNer(cfg) {
   const n = cfg.ner;
   if (!n || !n.autostart) return null;
 
-  // Respect an explicitly-configured detector — don't double-launch.
+  // Respect an explicitly-configured detector — don't touch it.
   const det = cfg.redaction?.detection;
   if (det && det.backend && det.backend !== 'off') {
-    console.log(`[ner] detection already configured (${det.backend}) — not autostarting bundled server`);
+    console.log(`[ner] detection already configured (${det.backend}) — leaving it as-is`);
     return null;
   }
 
   const port = n.port || 9009;
-  let child;
-  try {
-    child = spawn('bash', ['run.sh'], {
-      cwd: NER_DIR,
-      env: { ...process.env, PORT: String(port) },
-      stdio: ['ignore', 'pipe', 'pipe'],
-    });
-  } catch (e) {
-    console.log(`[ner] could not launch bundled NER (${e.message}) — deterministic redaction only`);
-    return null;
-  }
+  let stopped = false;
+  let child = null;
+  const ac = new AbortController();
 
-  let firstRun = true;
-  child.stdout?.on('data', (b) => {
-    const s = b.toString();
-    if (firstRun && /installing dependencies/i.test(s)) {
-      firstRun = false;
-      console.log('[ner] first run: creating venv + installing spaCy (one-time, may take a minute)…');
-    }
-  });
-  child.stderr?.on('data', () => { /* uvicorn logs to stderr; swallow */ });
-  child.on('error', (e) => {
-    console.log(`[ner] failed to start (${e.message}). Is python3 installed? Falling back to deterministic redaction.`);
-  });
-  child.on('exit', (code) => {
-    if (code && code !== 0 && !stopped) {
-      console.log(`[ner] server exited (code ${code}); redaction continues deterministic-only.`);
-    }
-  });
+  const wire = (how) => {
+    cfg.redaction.detection = { backend: 'endpoint', url: `http://127.0.0.1:${port}/ner`, timeoutMs: 1500, maxChars: 8000 };
+    if (n.enableFullTier && cfg.redaction.tier !== 'full') cfg.redaction.tier = 'full';
+    console.log(`[ner] ${how} on http://127.0.0.1:${port}/ner — entity detection active (tier: ${cfg.redaction.tier})`);
+  };
 
-  // Poll for readiness without blocking server start; wire detection when up.
-  // `stopped` MUST be declared before the async poller below references it (else a
-  // temporal-dead-zone ReferenceError crashes startup when autostart is on).
-  const ac = new AbortController();
-  let stopped = false;
   (async () => {
+    // 1) Adopt an existing NER already serving on the port (e.g. the user's own).
+    if (await nerReachable(port, ac.signal)) { wire('using existing NER'); return; }
+
+    // 2) Otherwise launch the bundled spaCy server.
+    try {
+      child = spawn('bash', ['run.sh'], {
+        cwd: NER_DIR,
+        env: { ...process.env, PORT: String(port) },
+        stdio: ['ignore', 'pipe', 'pipe'],
+      });
+    } catch (e) {
+      console.log(`[ner] could not launch bundled NER (${e.message}) — deterministic redaction only`);
+      return;
+    }
+    let firstRun = true;
+    child.stdout?.on('data', (b) => {
+      if (firstRun && /installing dependencies/i.test(b.toString())) {
+        firstRun = false;
+        console.log('[ner] first run: creating venv + installing spaCy (one-time, may take a minute)…');
+      }
+    });
+    child.stderr?.on('data', () => { /* uvicorn logs to stderr; swallow */ });
+    child.on('error', (e) => console.log(`[ner] failed to start (${e.message}). Is python3 installed? Falling back to deterministic redaction.`));
+    child.on('exit', (code) => {
+      if (code && code !== 0 && !stopped) {
+        // The bundled one couldn't bind (often the port is taken by another NER).
+        // If SOMETHING answers /ner there, adopt it instead of giving up.
+        nerReachable(port, ac.signal).then((ok) => { if (ok && !stopped) wire('adopted NER'); else if (!stopped) console.log(`[ner] server exited (code ${code}); deterministic-only.`); });
+      }
+    });
+
+    // 3) Poll for readiness; wire detection when up.
     const deadline = Date.now() + 120_000; // generous: first run installs deps
     while (Date.now() < deadline && !stopped) {
-      if (await healthy(port, ac.signal)) {
-        cfg.redaction.detection = {
-          backend: 'endpoint',
-          url: `http://127.0.0.1:${port}/ner`,
-          timeoutMs: 1500,
-          maxChars: 8000,
-        };
-        if (n.enableFullTier && cfg.redaction.tier !== 'full') cfg.redaction.tier = 'full';
-        console.log(`[ner] ready on http://127.0.0.1:${port}/ner — entity redaction active (tier: ${cfg.redaction.tier})`);
-        return;
-      }
+      if (await nerReachable(port, ac.signal)) { wire('ready'); return; }
       await sleep(1000);
     }
     if (!stopped) console.log('[ner] not ready after 120s — continuing deterministic-only (run ./ner/run.sh manually to debug).');
@@ -95,7 +100,7 @@ export function startNer(cfg) {
     if (stopped) return;
     stopped = true;
     ac.abort();
-    try { child.kill('SIGTERM'); } catch { /* ignore */ }
+    try { child?.kill('SIGTERM'); } catch { /* ignore */ }
   };
   return { stop };
 }

package/src/server.js

@@ -31,7 +31,7 @@ import * as openai from './openai.js';
 import * as responses from './responses.js';
 import * as anthropic from './anthropic.js';
 
-export const VERSION = '0.1.3';
+export const VERSION = '0.1.4';
 
 const KNOWN_AGENTS = new Set(['codex', 'claude', 'opencode', 'pi', 'kiro', 'antigravity']);