@chatpanel/gateway 0.2.1 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatpanel/gateway",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "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/router.js

@@ -41,17 +41,44 @@ export function resolveDestination(model, cfg, kind) {
   );
 }
 
-// Aggregate every destination's models for GET /v1/models.
+// Aggregate every destination's models for GET /v1/models. Agents expose their
+// own name as the model; APIs expose ONLY real model ids (never the destination
+// id — that's a provider name, not a model).
 export function aggregateModels(cfg) {
   const data = [];
   const seen = new Set();
+  const add = (id, owner) => { if (id && !seen.has(id)) { seen.add(id); data.push({ id, object: 'model', owned_by: owner }); } };
   for (const d of listDestinations(cfg)) {
-    const models = (Array.isArray(d.models) && d.models.length) ? d.models : [d.id];
-    for (const m of models) {
-      if (!m || seen.has(m)) continue;
-      seen.add(m);
-      data.push({ id: m, object: 'model', owned_by: d.type === 'agent' ? 'chatpanel-bridge' : (d.id || 'api') });
-    }
+    if (d.type === 'agent') for (const m of (d.models?.length ? d.models : [d.id])) add(m, 'chatpanel-bridge');
+    else for (const m of (d.models || [])) add(m, d.id);
   }
   return { object: 'list', data };
 }
+
+// Async variant: also PROXIES each API destination's own /v1/models to discover
+// real model ids (using its saved key). Fail-open per destination.
+export async function aggregateModelsAsync(cfg, { timeoutMs = 4000 } = {}) {
+  const base = aggregateModels(cfg);
+  const seen = new Set(base.data.map((m) => m.id));
+  const dests = listDestinations(cfg).filter((d) => d.type === 'api' && d.baseUrl);
+  await Promise.all(dests.map(async (d) => {
+    const ctrl = new AbortController();
+    const t = setTimeout(() => ctrl.abort(), timeoutMs);
+    try {
+      const headers = { 'content-type': 'application/json' };
+      if (d.apiKey) {
+        if (d.protocol === 'anthropic') { headers['x-api-key'] = d.apiKey; headers['anthropic-version'] = '2023-06-01'; }
+        else headers.authorization = `Bearer ${d.apiKey}`;
+      }
+      const res = await fetch(`${d.baseUrl.replace(/\/$/, '')}/models`, { headers, signal: ctrl.signal });
+      if (!res.ok) return;
+      const j = await res.json();
+      const list = Array.isArray(j?.data) ? j.data : (Array.isArray(j?.models) ? j.models : []);
+      for (const m of list) {
+        const id = typeof m === 'string' ? m : m?.id;
+        if (id && !seen.has(id)) { seen.add(id); base.data.push({ id, object: 'model', owned_by: d.id }); }
+      }
+    } catch { /* fail-open */ } finally { clearTimeout(t); }
+  }));
+  return base;
+}

package/src/server.js

@@ -27,12 +27,12 @@ import { shaperFor } from './shape.js';
 import { startNer } from './ner.js';
 import { resolvePro, meter, usage } from './freegate.js';
 import { publicConfig, applyConfigPatch, persistConfig, configPath } from './configstore.js';
-import { resolveDestination, aggregateModels } from './router.js';
+import { resolveDestination, aggregateModelsAsync } from './router.js';
 import * as openai from './openai.js';
 import * as responses from './responses.js';
 import * as anthropic from './anthropic.js';
 
-export const VERSION = '0.2.1';
+export const VERSION = '0.2.3';
 
 const KNOWN_AGENTS = new Set(['codex', 'claude', 'opencode', 'pi', 'kiro', 'antigravity']);
 
@@ -67,16 +67,24 @@ function setCors(res, origin) {
 
 const STARTED_AT = Date.now();
 
+// In-memory ring of recent request SUMMARIES for the extension's monitoring view.
+// Counts only — never any prompt/response text or values.
+const recentRequests = [];
+function recordRequest(entry) {
+  recentRequests.push(entry);
+  if (recentRequests.length > 50) recentRequests.shift();
+}
+
 // Classify a request: which protocol kind + adapter, whether it's a redactable
 // chat endpoint, and (api backend) which upstream base URL.
 function route(pathname, headers, cfg) {
   if (anthropic.matches(pathname) || 'anthropic-version' in headers) {
-    return { kind: 'anthropic', adapter: anthropic, redactable: anthropic.matches(pathname), base: cfg.upstreams.anthropic.baseUrl };
+    return { kind: 'anthropic', adapter: anthropic, redactable: anthropic.matches(pathname), base: cfg.upstreams?.anthropic?.baseUrl };
   }
   if (responses.matches(pathname)) {
-    return { kind: 'responses', adapter: responses, redactable: true, base: cfg.upstreams.openai.baseUrl };
+    return { kind: 'responses', adapter: responses, redactable: true, base: cfg.upstreams?.openai?.baseUrl };
   }
-  return { kind: 'openai', adapter: openai, redactable: openai.matches(pathname), base: cfg.upstreams.openai.baseUrl };
+  return { kind: 'openai', adapter: openai, redactable: openai.matches(pathname), base: cfg.upstreams?.openai?.baseUrl };
 }
 
 function pickAgent(model, cfg) {
@@ -237,6 +245,9 @@ export function createGateway(cfg = loadConfig()) {
         uptimeSeconds: Math.floor((Date.now() - STARTED_AT) / 1000),
       });
     }
+    if (pathname === '/logs' && req.method === 'GET') {
+      return sendJson(res, 200, { entries: [...recentRequests].reverse() }); // newest first; counts only
+    }
     if (pathname === '/config' && req.method === 'GET') {
       const proUnlocked = await resolvePro(cfg.pro?.entitlementToken);
       return sendJson(res, 200, publicConfig(cfg, { proUnlocked }));
@@ -253,7 +264,7 @@ export function createGateway(cfg = loadConfig()) {
 
     // Model discovery — aggregate every destination's models.
     if (req.method === 'GET' && /\/models$/.test(pathname)) {
-      return sendJson(res, 200, aggregateModels(cfg));
+      return sendJson(res, 200, await aggregateModelsAsync(cfg));
     }
 
     const r = route(pathname, req.headers, cfg);
@@ -270,6 +281,7 @@ export function createGateway(cfg = loadConfig()) {
     let vault = null;
     let body = null;
     let outBody = raw;
+    let redactedCount = 0;
     if (r.redactable && req.method === 'POST' && raw.length) {
       try { body = JSON.parse(raw.toString('utf8')); } catch { body = null; }
       if (body) {
@@ -287,6 +299,7 @@ export function createGateway(cfg = loadConfig()) {
         req.on('close', () => ac.abort());
         const { vault: v, count } = await redactSegments(segs, cfg.redaction, { signal: ac.signal, isPro });
         vault = v;
+        redactedCount = count;
         outBody = Buffer.from(JSON.stringify(body), 'utf8');
       }
     }
@@ -294,8 +307,9 @@ export function createGateway(cfg = loadConfig()) {
     // Route by the requested model → a destination (agent via the bridge, or an
     // API we forward to). Falls back to the legacy backend when none configured.
     const dest = resolveDestination(body?.model, cfg, r.kind);
-    if (cfg.logRequests) {
-      console.log(`[gateway] ${req.method} ${pathname} · model=${body?.model || '-'} → ${dest ? `${dest.id}(${dest.type})` : 'none'}`);
+    if (cfg.logRequests && r.redactable) {
+      recordRequest({ t: Date.now(), model: body?.model || null, dest: dest ? dest.id : null, type: dest ? dest.type : null, redacted: redactedCount });
+      console.log(`[gateway] ${req.method} ${pathname} · model=${body?.model || '-'} → ${dest ? `${dest.id}(${dest.type})` : 'none'} · redacted ${redactedCount}`);
     }
     if (dest && dest.type === 'api') {
       if (!dest.baseUrl) return sendJson(res, 502, { error: `destination "${dest.id}" has no baseUrl` });