@omnicross/daemon 0.1.6 → 0.1.7

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/bootstrap.ts
-import { accessSync, constants as fsConstants, existsSync as existsSync17 } from "fs";
+import { accessSync, constants as fsConstants, existsSync as existsSync19 } from "fs";
 import { DEFAULT_AUDIT_CONFIG } from "@omnicross/contracts/audit-types";
 import { DEFAULT_BILLING_CONFIG } from "@omnicross/contracts/billing-types";
 import { getGeminiCodeAssistProjectResolver } from "@omnicross/core/auth/GeminiCodeAssistProjectResolver";
@@ -114,7 +114,7 @@ async function runCodexLoopback(sessionId, codeVerifier, state, signal, deps) {
     const code = await deps.codexAwaitLoopback(state, void 0, signal);
     const result = await codexOAuth.exchangeCodeForTokens(
       { authorizationCode: code, codeVerifier, state },
-      deps.oauthExchangeFetch
+      deps.oauthExchangeFetch("codex")
     );
     const expiresAt = new Date(Date.now() + result.expiresIn * 1e3).toISOString();
     const block = {
@@ -634,6 +634,17 @@ function handleAuditQuery(req, res, reader) {
   res.writeHead(200, { "Content-Type": "application/json" });
   res.end(JSON.stringify({ records }));
 }
+async function handleAuditStatsQuery(req, res, reader) {
+  const url = new URL(req.url ?? "/", "http://localhost");
+  const query2 = {};
+  const from = intParam(url.searchParams.get("from"));
+  if (from !== void 0) query2.from = from;
+  const to = intParam(url.searchParams.get("to"));
+  if (to !== void 0) query2.to = to;
+  const stats = reader ? await reader(query2) : { requestCount: 0, errorCount: 0, complete: true };
+  res.writeHead(200, { "Content-Type": "application/json" });
+  res.end(JSON.stringify(stats));
+}
 
 // src/admin/billingStatusApi.ts
 function handleBillingStatus(res, reader) {
@@ -2145,7 +2156,13 @@ function listMappablePresets() {
       name: preset.name,
       apiFormat: resolved.format,
       baseUrl: preset.api_base_url,
-      models: Array.isArray(preset.models) ? preset.models : []
+      models: Array.isArray(preset.models) ? preset.models : [],
+      nameKey: preset.nameKey,
+      icon: preset.icon,
+      description: preset.description,
+      features: preset.features,
+      website: preset.website,
+      modelsEndpoint: preset.modelsEndpoint
     });
   }
   return { mappable, excluded };
@@ -2536,7 +2553,7 @@ async function handleOAuthComplete(providerId, body, deps) {
   const rawCode = typeof body["code"] === "string" ? body["code"] : "";
   if (!sessionId) return err2(400, "oauth complete requires { sessionId }");
   if (!rawCode) return err2(400, "oauth complete requires { code }");
-  const session = deps.oauthSessions.take(sessionId);
+  const session = deps.oauthSessions.peek(sessionId);
   if (!session) return err2(410, "oauth session is unknown, expired, or already used");
   if (session.providerId !== providerId) {
     return err2(400, `oauth session does not match provider '${providerId}'`);
@@ -2550,13 +2567,15 @@ async function handleOAuthComplete(providerId, body, deps) {
     }
     code = splitCode;
   }
+  const exchangeFetch = deps.oauthExchangeFetch(providerId);
   let block;
   try {
-    block = providerId === "claude" ? await exchangeClaude(code, session.codeVerifier, session.state, deps.oauthExchangeFetch) : await exchangeGemini(code, session.codeVerifier, deps.oauthExchangeFetch);
+    block = providerId === "claude" ? await exchangeClaude(code, session.codeVerifier, session.state, exchangeFetch) : await exchangeGemini(code, session.codeVerifier, exchangeFetch);
   } catch (exchangeError) {
     const reason = exchangeError instanceof Error ? exchangeError.message : "token exchange failed";
     return err2(502, `oauth token exchange failed for '${providerId}': ${reason}`);
   }
+  deps.oauthSessions.consume(sessionId);
   const label = typeof body["label"] === "string" && body["label"].trim() ? body["label"].trim() : void 0;
   await deps.subscriptionAccountAppender.appendProviderAccount(providerId, block, label);
   const status = await statusEntryFor(deps.subscriptionAccounts, providerId);
@@ -2806,8 +2825,8 @@ function validateAuditSegment(patch) {
     }
   }
   const maxBodyBytes = audit["maxBodyBytes"];
-  if (maxBodyBytes !== void 0 && (typeof maxBodyBytes !== "number" || !Number.isFinite(maxBodyBytes) || maxBodyBytes < 0)) {
-    errors.push("audit.maxBodyBytes must be a non-negative number");
+  if (maxBodyBytes !== void 0 && (typeof maxBodyBytes !== "number" || !Number.isFinite(maxBodyBytes) || maxBodyBytes < -1)) {
+    errors.push("audit.maxBodyBytes must be -1 or a non-negative number");
   }
   const retentionDays = audit["retentionDays"];
   if (retentionDays !== void 0 && (typeof retentionDays !== "number" || !Number.isFinite(retentionDays) || retentionDays < 0)) {
@@ -3252,18 +3271,16 @@ function preserveWebhookSecrets(incoming, current) {
 }
 
 // src/audit/auditRuntime.ts
-import { join as join4 } from "path";
 import { setAuditCaptureConfig, setAuditSink } from "@omnicross/core/pipeline/auditSink";
 import { setUpstreamTracePath } from "@omnicross/core/pipeline/upstreamTrace";
 var writer = null;
 var sweeper = null;
-var auditDir = "";
-function setAuditRuntime(w, s, dir) {
+function setAuditRuntime(w, s) {
   writer = w;
   sweeper = s;
-  auditDir = dir;
 }
 function applyAuditConfig(config) {
+  setUpstreamTracePath(null);
   const enabled = config?.enabled === true && writer !== null;
   if (enabled && config) {
     setAuditCaptureConfig(config);
@@ -3273,11 +3290,9 @@ function applyAuditConfig(config) {
       sweeper.configure(config);
       sweeper.start();
     }
-    setUpstreamTracePath(config.captureBodies ? join4(auditDir, "upstream-trace.jsonl") : null);
   } else {
     setAuditCaptureConfig(null);
     setAuditSink(null);
-    setUpstreamTracePath(null);
     if (sweeper) {
       if (config) sweeper.configure(config);
       sweeper.dispose();
@@ -3291,7 +3306,6 @@ function resetAuditRuntimeForTests() {
   if (sweeper) sweeper.dispose();
   writer = null;
   sweeper = null;
-  auditDir = "";
 }
 
 // src/billing/billingRuntime.ts
@@ -4136,6 +4150,11 @@ async function handleAccountAllowanceApi(req, res, method, rest, service) {
 }
 
 // src/admin/adminApi.ts
+import {
+  ACCOUNT_ROUTE_ACTIVITY_LIMIT,
+  getSharedAccountRouteActivity
+} from "@omnicross/core/pipeline/AccountRouteActivity";
+import { getSharedOverloadCounter } from "@omnicross/core/pipeline/ServerOverloadCounter";
 function readBody(req) {
   return new Promise((resolve2, reject) => {
     const chunks = [];
@@ -4172,6 +4191,9 @@ function toKeyInfo(row) {
     id: row.id,
     name: row.name,
     keyPrefix: row.keyPrefix,
+    // True only when a reversible `keySecret` envelope was persisted at creation
+    // — gates the UI "view key" eye. Legacy hash-only rows read as absent.
+    revealable: Boolean(row.keySecret),
     enabled: row.enabled,
     createdAt: row.createdAt,
     lastUsedAt: row.lastUsedAt,
@@ -4827,7 +4849,13 @@ function handlePresets(res, method) {
     name: p.name,
     apiFormat: p.apiFormat,
     baseUrl: p.baseUrl,
-    models: p.models
+    models: p.models,
+    nameKey: p.nameKey,
+    icon: p.icon,
+    description: p.description,
+    features: p.features,
+    website: p.website,
+    modelsEndpoint: p.modelsEndpoint
   }));
   return writeJson3(res, 200, { presets, excluded });
 }
@@ -4861,12 +4889,27 @@ async function handleKeys(req, res, method, rest, deps) {
       plaintextOnce: created.plaintextOnce
     });
   }
+  if (method === "GET" && rest.length === 2 && rest[1] === "reveal") {
+    const revealed = await deps.keyDb.outboundApiKeysReveal(rest[0]);
+    if (revealed !== null) return writeJson3(res, 200, { key: revealed });
+    const exists = (await deps.keyDb.outboundApiKeysList()).some((r) => r.id === rest[0]);
+    if (!exists) return writeJsonError(res, 404, `key '${rest[0]}' not found`);
+    return writeJsonError(
+      res,
+      409,
+      `key '${rest[0]}' is not revealable (created before revealable key storage)`
+    );
+  }
   const id = rest[0];
   const action = rest[1];
   if (method === "POST" && id && action === "revoke") {
     const ok = await deps.keyDb.outboundApiKeysRevoke(id);
     return writeJson3(res, ok ? 200 : 404, { ok });
   }
+  if (method === "DELETE" && id && !action) {
+    const ok = await deps.keyDb.outboundApiKeysDelete(id);
+    return writeJson3(res, ok ? 200 : 404, { ok });
+  }
   if (method === "POST" && id && action === "enabled") {
     const body = await readJsonBody3(req);
     const enabled = body["enabled"] === true;
@@ -5043,6 +5086,40 @@ async function handleServer(req, res, method, deps) {
   return writeJsonError(res, 405, `method ${method} not allowed on server`);
 }
 async function handleAccounts(req, res, method, rest, deps) {
+  if (rest[0] === "route-activity" && rest.length === 1) {
+    if (method !== "GET") {
+      return writeJsonError(res, 405, `method ${method} not allowed on account route activity`);
+    }
+    const query2 = requestQuery(req);
+    const parsedLimit = Number(query2.get("limit") ?? "100");
+    const records = getSharedAccountRouteActivity().list({
+      providerId: query2.get("providerId") ?? void 0,
+      accountId: query2.get("accountId") ?? void 0,
+      sessionKey: query2.get("sessionKey") ?? void 0,
+      limit: Number.isFinite(parsedLimit) ? parsedLimit : 100
+    });
+    return writeJson3(res, 200, {
+      available: true,
+      records,
+      capacity: ACCOUNT_ROUTE_ACTIVITY_LIMIT,
+      collectedAt: Date.now()
+    });
+  }
+  if (rest[0] === "overload-counters" && rest.length === 1) {
+    if (method !== "GET") {
+      return writeJsonError(res, 405, `method ${method} not allowed on overload counters`);
+    }
+    const query2 = requestQuery(req);
+    const entries = getSharedOverloadCounter().list({
+      providerId: query2.get("providerId") ?? void 0,
+      accountId: query2.get("accountId") ?? void 0
+    });
+    return writeJson3(res, 200, {
+      available: true,
+      entries,
+      collectedAt: Date.now()
+    });
+  }
   if (rest[0] === "allowances") {
     return handleAccountAllowanceApi(
       req,
@@ -5189,8 +5266,13 @@ async function handleAccounts(req, res, method, rest, deps) {
       if (!(listed[providerId] ?? []).some((account) => account.id === accountId)) {
         return writeJsonError(res, 404, `account '${accountId}' not found`);
       }
-      const result = await deps.accountProbeService.probeAccount(providerId, accountId);
-      return writeJson3(res, 200, { ok: result.ok, marked: result.marked });
+      const result = await deps.accountProbeService.testAccountConnection(providerId, accountId);
+      return writeJson3(res, 200, {
+        ok: result.ok,
+        marked: result.marked,
+        tier: result.tier,
+        model: result.model
+      });
     }
     if (method === "POST" && rest[2] === "label") {
       const accountId = rest[1];
@@ -5561,7 +5643,7 @@ async function handleUiStatic(req, res, urlPath, uiDist) {
 }
 
 // src/admin/version.ts
-var DAEMON_VERSION = true ? "0.1.6" : "0.0.0-dev";
+var DAEMON_VERSION = true ? "0.1.7" : "0.0.0-dev";
 
 // src/admin/AdminServer.ts
 var LOOPBACK_ADDR = "127.0.0.1";
@@ -5669,6 +5751,10 @@ var AdminServer = class {
       handleAuditQuery(req, res, this.deps.auditReader);
       return;
     }
+    if (path2 === "/admin/api/audit/stats" && (req.method === "GET" || req.method === "HEAD")) {
+      await handleAuditStatsQuery(req, res, this.deps.auditStatsReader);
+      return;
+    }
     if (path2 === "/admin/api/billing-status" && (req.method === "GET" || req.method === "HEAD")) {
       handleBillingStatus(res, this.deps.billingStatusReader);
       return;
@@ -5785,20 +5871,36 @@ var OAuthSessionStore = class {
     return sessionId;
   }
   /**
-   * SINGLE-USE consume: return + delete the session for `sessionId`, or `null`
-   * when it is unknown, already used, or past its TTL (in which case it is
-   * dropped). A `null` return means the completer must reject (no exchange, no
-   * write).
+   * NON-DESTRUCTIVE lookup: return the session for `sessionId`, or `null` when
+   * it is unknown, already consumed, or past its TTL (an expired entry is
+   * dropped here). A `null` return means the completer must reject (no
+   * exchange, no write).
+   *
+   * Deliberately NOT a consume: the completer peeks, runs the token exchange,
+   * and only {@link consume}s once a token has actually been minted. Consuming
+   * up-front burned the session on EVERY failed exchange (a mistyped/expired
+   * pasted code, a proxy hiccup), so the user's natural retry hit
+   * "session is unknown, expired, or already used" and the login became
+   * unrecoverable without restarting the whole flow.
    */
-  take(sessionId) {
+  peek(sessionId) {
     this.sweep();
     const session = this.sessions.get(sessionId);
     if (!session) return null;
-    this.sessions.delete(sessionId);
-    if (Date.now() - session.createdAt > this.ttlMs) return null;
+    if (Date.now() - session.createdAt > this.ttlMs) {
+      this.sessions.delete(sessionId);
+      return null;
+    }
     return session;
   }
-  /** Drop every session past its TTL. Called on each put/take. */
+  /**
+   * SINGLE-USE burn: drop the session so the same `sessionId` can never be
+   * completed twice. Called ONLY after a successful token exchange.
+   */
+  consume(sessionId) {
+    this.sessions.delete(sessionId);
+  }
+  /** Drop every session past its TTL. Called on each put/peek. */
   sweep() {
     const now = Date.now();
     for (const [id, session] of this.sessions) {
@@ -5813,6 +5915,10 @@ var LOOPBACK_HOST = "127.0.0.1";
 var LOOPBACK_PORT = 1455;
 var CALLBACK_PATH = "/auth/callback";
 var DEFAULT_TIMEOUT_MS = 5 * 6e4;
+var HTML_HEADERS = {
+  "Content-Type": "text/html",
+  Connection: "close"
+};
 function pageHtml(message) {
   return `<!doctype html><meta charset="utf-8"><title>omnicross login</title><body style="font-family:sans-serif;padding:2rem"><h2>${message}</h2><p>You can close this window and return to the terminal.</p></body>`;
 }
@@ -5823,30 +5929,31 @@ function awaitLoopbackCode(expectedState, timeoutMs = DEFAULT_TIMEOUT_MS, signal
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      server2.close(() => fn());
+      fn();
+      server2.close();
     };
     const server = createServer((req, res) => {
       const url = new URL(req.url ?? "", `http://${LOOPBACK_HOST}:${LOOPBACK_PORT}`);
       if (url.pathname !== CALLBACK_PATH) {
-        res.writeHead(404, { "Content-Type": "text/html" });
+        res.writeHead(404, HTML_HEADERS);
         res.end(pageHtml("Not found"));
         return;
       }
       const code = url.searchParams.get("code");
       const state = url.searchParams.get("state");
       if (!code) {
-        res.writeHead(400, { "Content-Type": "text/html" });
+        res.writeHead(400, HTML_HEADERS);
         res.end(pageHtml("Login failed: missing authorization code."));
         finish(server, () => reject(new Error("login: callback did not include an authorization code")));
         return;
       }
       if (state !== expectedState) {
-        res.writeHead(400, { "Content-Type": "text/html" });
+        res.writeHead(400, HTML_HEADERS);
         res.end(pageHtml("Login failed: state mismatch."));
         finish(server, () => reject(new Error("login: callback state did not match (possible CSRF) \u2014 aborting")));
         return;
       }
-      res.writeHead(200, { "Content-Type": "text/html" });
+      res.writeHead(200, HTML_HEADERS);
       res.end(pageHtml("Login complete."));
       finish(server, () => resolve2(code));
     });
@@ -5943,30 +6050,30 @@ function createPoolKeysLoader(getProviderRow, autoDisabled) {
 }
 
 // src/commands/paths.ts
-import { dirname as dirname5, join as join5 } from "path";
+import { dirname as dirname5, join as join4 } from "path";
 function defaultVouchersPath(configPath) {
-  return join5(dirname5(configPath), "vouchers.json");
+  return join4(dirname5(configPath), "vouchers.json");
 }
 function defaultIntegrationsPath(configPath) {
-  return join5(dirname5(configPath), "integrations.json");
+  return join4(dirname5(configPath), "integrations.json");
 }
 function defaultPricingPath(configPath) {
-  return join5(dirname5(configPath), "pricing.json");
+  return join4(dirname5(configPath), "pricing.json");
 }
 function defaultPricingRefreshStatePath(configPath) {
-  return join5(dirname5(configPath), "pricing-refresh.json");
+  return join4(dirname5(configPath), "pricing-refresh.json");
 }
 function defaultAccountAllowancePath(configPath) {
-  return join5(dirname5(configPath), "allowance-cache.json");
+  return join4(dirname5(configPath), "allowance-cache.json");
 }
 function defaultUsageEventsPath(configPath) {
-  return join5(dirname5(configPath), "usage-events.jsonl");
+  return join4(dirname5(configPath), "usage-events.jsonl");
 }
 function defaultAuditDir(configPath) {
-  return join5(dirname5(configPath), "audit");
+  return join4(dirname5(configPath), "audit");
 }
 function defaultBillingDir(configPath) {
-  return join5(dirname5(configPath), "billing");
+  return join4(dirname5(configPath), "billing");
 }
 
 // src/ports/ConfigFileProviderConfigSource.ts
@@ -6362,8 +6469,12 @@ var JsonlUsageEventStore = class {
       reasoningTokens: 0,
       costUsd: 0,
       costSavedByCacheUsd: 0,
-      eventCount: 0
+      eventCount: 0,
+      cacheEligibleEventCount: 0,
+      coldCacheEventCount: 0,
+      medianCacheHitRate: null
     };
+    const perEventHitRates = [];
     for (const row of this.readRows(range)) {
       totals.inputTokens += row.inputTokens;
       totals.outputTokens += row.outputTokens;
@@ -6373,7 +6484,14 @@ var JsonlUsageEventStore = class {
       totals.costUsd += row.costUsd;
       totals.costSavedByCacheUsd += row.costSavedByCacheUsd;
       totals.eventCount += 1;
+      const promptSideTokens = row.inputTokens + row.cacheReadTokens + row.cacheCreationTokens;
+      if (promptSideTokens > 0) {
+        totals.cacheEligibleEventCount += 1;
+        if (row.cacheReadTokens === 0) totals.coldCacheEventCount += 1;
+        perEventHitRates.push(row.cacheReadTokens / promptSideTokens);
+      }
     }
+    totals.medianCacheHitRate = median(perEventHitRates);
     return totals;
   }
   async getByModel(range) {
@@ -6607,6 +6725,15 @@ var NUMERIC_FIELDS = [
 ];
 var NULLABLE_STRING_FIELDS = ["messageId", "parentMessageId", "sessionId", "apiKeyId"];
 var isStringOrNull = (v) => v === null || typeof v === "string";
+var CACHE_KEY_SOURCES = /* @__PURE__ */ new Set([
+  "client",
+  "session-header",
+  "thread-header",
+  "body-session-id",
+  "body-thread-id",
+  "content-fingerprint",
+  "none"
+]);
 function isUsageEventRecord(parsed) {
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return false;
   const r = parsed;
@@ -6614,6 +6741,10 @@ function isUsageEventRecord(parsed) {
   if (typeof r["providerId"] !== "string") return false;
   if (typeof r["model"] !== "string") return false;
   if (typeof r["engineOrigin"] !== "string") return false;
+  if (r["cacheKeySource"] !== void 0 && (typeof r["cacheKeySource"] !== "string" || !CACHE_KEY_SOURCES.has(r["cacheKeySource"]))) return false;
+  if (r["cacheKeyInjected"] !== void 0 && typeof r["cacheKeyInjected"] !== "boolean") {
+    return false;
+  }
   for (const f of NULLABLE_STRING_FIELDS) {
     if (!isStringOrNull(r[f])) return false;
   }
@@ -6623,14 +6754,30 @@ function isUsageEventRecord(parsed) {
   }
   return true;
 }
+function median(values) {
+  if (values.length === 0) return null;
+  values.sort((a, b) => a - b);
+  const middle = Math.floor(values.length / 2);
+  return values.length % 2 === 1 ? values[middle] : (values[middle - 1] + values[middle]) / 2;
+}
 
 // src/ports/JsonOutboundKeyDb.ts
 import { existsSync as existsSync8, readFileSync as readFileSync8, writeFileSync as writeFileSync6 } from "fs";
 var JsonOutboundKeyDb = class {
-  constructor(keysPath) {
+  /**
+   * @param secretBox OPTIONAL reversible-secret codec. When present, a created
+   * key's plaintext is persisted as a `keySecret` `enc:` envelope (enabling the
+   * operator "view key" affordance via `outboundApiKeysReveal`). When absent the
+   * store stays hash-only (byte-identical to the legacy behavior) and reveal
+   * always returns `null`. Existing 1-arg call sites (tests, lightweight
+   * embedders) keep working.
+   */
+  constructor(keysPath, secretBox3) {
     this.keysPath = keysPath;
+    this.secretBox = secretBox3;
   }
   keysPath;
+  secretBox;
   async outboundApiKeysList() {
     return this.readRows();
   }
@@ -6656,10 +6803,27 @@ var JsonOutboundKeyDb = class {
       allowedEndpoints: input.allowedEndpoints,
       loopbackOnly: input.loopbackOnly
     };
+    if (input.plaintext && this.secretBox) {
+      row.keySecret = this.secretBox.encrypt(input.plaintext);
+    }
     rows.push(row);
     this.writeRows(rows);
     return row;
   }
+  async outboundApiKeysReveal(id) {
+    const rows = this.readRows();
+    const row = rows.find((r) => r.id === id);
+    if (!row || !row.keySecret || !this.secretBox) return null;
+    return this.secretBox.decrypt(row.keySecret);
+  }
+  async outboundApiKeysDelete(id) {
+    const rows = this.readRows();
+    const idx = rows.findIndex((r) => r.id === id);
+    if (idx < 0) return false;
+    rows.splice(idx, 1);
+    this.writeRows(rows);
+    return true;
+  }
   async outboundApiKeysRevoke(id) {
     return this.mutateRow(id, (row) => {
       if (row.revokedAt !== null) return false;
@@ -7163,9 +7327,9 @@ function findDuplicateCredentialIds(accounts) {
 // src/ports/external-cli-credentials.ts
 import { existsSync as existsSync12, readFileSync as readFileSync12 } from "fs";
 import { homedir as homedir3 } from "os";
-import { join as join6 } from "path";
+import { join as join5 } from "path";
 function externalStorePath(provider, home = homedir3()) {
-  return provider === "claude" ? join6(home, ".claude", ".credentials.json") : join6(home, ".codex", "auth.json");
+  return provider === "claude" ? join5(home, ".claude", ".credentials.json") : join5(home, ".codex", "auth.json");
 }
 function decodeJwtExpiryMs(token) {
   try {
@@ -7255,9 +7419,15 @@ var JsonSubscriptionCredentialStore = class {
    * TEST-injected `fetchImpl` is returned verbatim; otherwise the refresh routes
    * through {@link fetchUpstream} with the account's `{ providerId, accountId }`
    * ctx so the per-account/provider proxy applies. `@internal` also a test seam.
+   *
+   * `redactBodies` is REQUIRED here: this round-trip sends the refresh_token and
+   * receives a fresh access/refresh token pair. Carrying a `providerId` opts the
+   * call into the upstream trace (so a failing refresh is diagnosable), and the
+   * trace captures bodies verbatim — without this flag every refresh would write
+   * a plaintext token pair into `upstream-trace.jsonl`.
    */
   buildRefreshFetch(providerId, accountId) {
-    return this.fetchImpl ?? ((url, init) => fetchUpstream3(url, init, { providerId, accountId }));
+    return this.fetchImpl ?? ((url, init) => fetchUpstream3(url, init, { providerId, accountId, redactBodies: true }));
   }
   /**
    * In-flight refresh coalescing. OAuth refresh tokens are
@@ -7817,6 +7987,127 @@ var JsonSubscriptionCredentialStore = class {
 // src/AccountHealthProbeScheduler.ts
 import { fetchUpstream as fetchUpstream4 } from "@omnicross/core/pipeline/upstreamFetch";
 
+// src/probe/CodexGenerationProbe.ts
+import {
+  DEFAULT_CODEX_CLI_HEADERS,
+  codexAcceptHeader
+} from "@omnicross/core/provider-proxy/identity/codexCliHeaders";
+var CODEX_GENERATION_PROBE_MODEL = "gpt-5.6-luna";
+var CODEX_GENERATION_PROBE_URL = "https://chatgpt.com/backend-api/codex/responses";
+var MAX_STREAM_BYTES = 256 * 1024;
+var PROBE_INSTRUCTION = "Return exactly PONG and no other text.";
+function buildCodexGenerationProbeInit(token, signal) {
+  return {
+    method: "POST",
+    signal,
+    headers: {
+      ...DEFAULT_CODEX_CLI_HEADERS,
+      Authorization: `Bearer ${token}`,
+      Accept: codexAcceptHeader(true),
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify({
+      model: CODEX_GENERATION_PROBE_MODEL,
+      input: [
+        {
+          role: "developer",
+          content: [{ type: "input_text", text: PROBE_INSTRUCTION }]
+        },
+        {
+          role: "user",
+          content: [{ type: "input_text", text: "Connection probe." }]
+        }
+      ],
+      // GPT-5.6 otherwise defaults to medium reasoning. A connectivity probe
+      // needs the lowest-cost path and no tool reasoning.
+      reasoning: { effort: "none" },
+      stream: true,
+      store: false
+    })
+  };
+}
+async function readCodexGenerationProbeStream(response) {
+  if (!response.body) return { completed: false, outputChars: 0 };
+  const reader = response.body.getReader();
+  const decoder = new TextDecoder();
+  let buffer = "";
+  let bytes = 0;
+  let outputChars = 0;
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      bytes += value.byteLength;
+      if (bytes > MAX_STREAM_BYTES) {
+        await reader.cancel();
+        return { completed: false, outputChars };
+      }
+      buffer += decoder.decode(value, { stream: true });
+      buffer = buffer.replace(/\r\n/g, "\n");
+      let boundary = buffer.indexOf("\n\n");
+      while (boundary >= 0) {
+        const block = buffer.slice(0, boundary);
+        buffer = buffer.slice(boundary + 2);
+        const event = parseSseBlock(block);
+        if (event) {
+          const type = event["type"];
+          if (type === "response.output_text.delta" && typeof event["delta"] === "string") {
+            outputChars += event["delta"].length;
+          } else if (type === "response.output_text.done" && typeof event["text"] === "string") {
+            outputChars = Math.max(outputChars, event["text"].length);
+          } else if (type === "response.failed" || type === "error") {
+            await reader.cancel();
+            return { completed: false, outputChars };
+          } else if (type === "response.completed") {
+            const completedResponse = asRecord(event["response"]);
+            const status = completedResponse?.["status"];
+            outputChars = Math.max(outputChars, countCompletedOutputChars(completedResponse));
+            await reader.cancel();
+            return {
+              completed: (status === void 0 || status === "completed") && outputChars > 0,
+              outputChars
+            };
+          }
+        }
+        boundary = buffer.indexOf("\n\n");
+      }
+    }
+  } catch {
+    return { completed: false, outputChars };
+  } finally {
+    reader.releaseLock();
+  }
+  return { completed: false, outputChars };
+}
+function parseSseBlock(block) {
+  const data = block.split("\n").filter((line) => line.startsWith("data:")).map((line) => line.slice(5).trimStart()).join("\n");
+  if (!data || data === "[DONE]") return null;
+  try {
+    return JSON.parse(data);
+  } catch {
+    return null;
+  }
+}
+function asRecord(value) {
+  return value !== null && typeof value === "object" ? value : void 0;
+}
+function countCompletedOutputChars(response) {
+  const output = response?.["output"];
+  if (!Array.isArray(output)) return 0;
+  let chars = 0;
+  for (const item of output) {
+    const content = asRecord(item)?.["content"];
+    if (!Array.isArray(content)) continue;
+    for (const part of content) {
+      const record = asRecord(part);
+      if (record?.["type"] === "output_text" && typeof record["text"] === "string") {
+        chars += record["text"].length;
+      }
+    }
+  }
+  return chars;
+}
+
 // src/probe/ProbeStrategy.ts
 var PROVIDER_PROBE_PLANS = {
   claude: {
@@ -7944,17 +8235,17 @@ var AccountHealthProbeScheduler = class {
     }
     if (readThrew) {
       this.record(providerId, accountId, { ts: now, ok: false, status: null, tier: "local" });
-      return { ok: false, marked: false };
+      return { ok: false, marked: false, tier: "local" };
     }
     if (!token) {
       this.health.recordUpstreamOutcome(providerId, accountId, { status: 401, now });
       this.record(providerId, accountId, { ts: now, ok: false, status: 401, tier: "local" });
-      return { ok: false, marked: true };
+      return { ok: false, marked: true, tier: "local" };
     }
     const plan = this.planFor(providerId);
     if (plan.kind === "local") {
       this.record(providerId, accountId, { ts: now, ok: true, tier: "local" });
-      return { ok: true, marked: false };
+      return { ok: true, marked: false, tier: "local" };
     }
     const start = this.now();
     let status = null;
@@ -7979,7 +8270,60 @@ var AccountHealthProbeScheduler = class {
       latencyMs,
       tier: "upstream"
     });
-    return { ok: status !== null && status < 400, marked };
+    return { ok: status !== null && status < 400, marked, tier: "upstream" };
+  }
+  /**
+   * Manual connection test. Codex performs a real, quota-consuming generation;
+   * every other provider keeps its existing cheap probe. Scheduled sweeps never
+   * call this method, so they remain non-billable.
+   */
+  async testAccountConnection(providerId, accountId) {
+    if (providerId !== "codex") return this.probeAccount(providerId, accountId);
+    const now = this.now();
+    let token;
+    try {
+      token = await this.store.getAccessTokenForAccount(providerId, accountId);
+    } catch {
+      this.record(providerId, accountId, { ts: now, ok: false, status: null, tier: "local" });
+      return { ok: false, marked: false, tier: "local", model: CODEX_GENERATION_PROBE_MODEL };
+    }
+    if (!token) {
+      this.health.recordUpstreamOutcome(providerId, accountId, { status: 401, now });
+      this.record(providerId, accountId, { ts: now, ok: false, status: 401, tier: "local" });
+      return { ok: false, marked: true, tier: "local", model: CODEX_GENERATION_PROBE_MODEL };
+    }
+    const startedAt = this.now();
+    let attempt = await this.runCodexGenerationAttempt(accountId, token);
+    if (attempt.status === 401 && this.store.refreshAccountToken) {
+      try {
+        if (await this.store.refreshAccountToken(providerId, accountId)) {
+          const refreshed = await this.store.getAccessTokenForAccount(providerId, accountId);
+          if (refreshed) attempt = await this.runCodexGenerationAttempt(accountId, refreshed);
+        }
+      } catch {
+      }
+    }
+    const latencyMs = this.now() - startedAt;
+    const ok = attempt.status !== null && attempt.status >= 200 && attempt.status < 300 && attempt.completed;
+    let marked = false;
+    if (ok) {
+      this.health.clearTransientMark(providerId, accountId);
+    } else if (attempt.status === 401 || attempt.status === 403) {
+      marked = this.applyOutcome(providerId, accountId, attempt.status, attempt.bodyText, now);
+    }
+    this.record(providerId, accountId, {
+      ts: now,
+      ok,
+      status: attempt.status,
+      latencyMs,
+      tier: "generation"
+    });
+    return {
+      ok,
+      marked,
+      tier: "generation",
+      model: CODEX_GENERATION_PROBE_MODEL
+    };
   }
   /** Per-account rolling history for the authed admin surface (design D5). */
   getAllHistory() {
@@ -8036,6 +8380,24 @@ var AccountHealthProbeScheduler = class {
       return "";
     }
   }
+  async runCodexGenerationAttempt(accountId, token) {
+    try {
+      const timeoutMs = Math.max(this.config.timeoutMs, 15e3);
+      const response = await this.fetchImpl(
+        CODEX_GENERATION_PROBE_URL,
+        buildCodexGenerationProbeInit(token, AbortSignal.timeout(timeoutMs)),
+        { providerId: "codex", accountId, redactBodies: true }
+      );
+      if (response.status < 200 || response.status >= 300) {
+        const bodyText = response.status === 403 ? await this.readBounded(response) : void 0;
+        return { status: response.status, completed: false, bodyText };
+      }
+      const stream = await readCodexGenerationProbeStream(response);
+      return { status: response.status, completed: stream.completed };
+    } catch {
+      return { status: null, completed: false };
+    }
+  }
   key(providerId, accountId) {
     return `${providerId}${KEY_SEP}${accountId}`;
   }
@@ -8131,7 +8493,7 @@ var AccountHealthSweeper = class {
 };
 
 // src/audit/AuditPruneSweeper.ts
-import { existsSync as existsSync14, readdirSync, unlinkSync as unlinkSync3 } from "fs";
+import { existsSync as existsSync15, readdirSync as readdirSync2, unlinkSync as unlinkSync3 } from "fs";
 import { join as join7 } from "path";
 
 // src/audit/auditFiles.ts
@@ -8154,12 +8516,213 @@ function auditFileDateMs(fileName) {
   return d.getTime();
 }
 
+// src/audit/auditStats.ts
+import {
+  createReadStream,
+  existsSync as existsSync14,
+  readFileSync as readFileSync14,
+  readdirSync,
+  statSync as statSync3,
+  writeFileSync as writeFileSync11
+} from "fs";
+import { basename, dirname as dirname7, join as join6 } from "path";
+var SIDECAR_VERSION = 1;
+var META_PREFIX_BYTES = 64 * 1024;
+var READ_CHUNK_BYTES = 4 * 1024 * 1024;
+function auditStatsFileName(auditFile) {
+  return auditFile.replace(/\.jsonl$/, ".stats.json");
+}
+function readPersisted(path2) {
+  if (!existsSync14(path2)) return null;
+  try {
+    const value = JSON.parse(readFileSync14(path2, "utf8"));
+    if (value.version !== SIDECAR_VERSION || !Number.isSafeInteger(value.auditBytes) || (value.auditBytes ?? -1) < 0 || !Number.isSafeInteger(value.requestCount) || (value.requestCount ?? -1) < 0 || !Number.isSafeInteger(value.errorCount) || (value.errorCount ?? -1) < 0 || (value.errorCount ?? 0) > (value.requestCount ?? -1) || typeof value.complete !== "boolean" || value.minTs !== null && !Number.isFinite(value.minTs) || value.maxTs !== null && !Number.isFinite(value.maxTs)) {
+      return null;
+    }
+    return value;
+  } catch {
+    return null;
+  }
+}
+function updateAuditStatsAfterAppend(auditPath, auditBytesBefore, auditBytesAfter, record) {
+  const statsPath = join6(dirname7(auditPath), auditStatsFileName(basename(auditPath)));
+  const previous = auditBytesBefore === 0 ? {
+    version: SIDECAR_VERSION,
+    auditBytes: 0,
+    requestCount: 0,
+    errorCount: 0,
+    complete: true,
+    minTs: null,
+    maxTs: null
+  } : readPersisted(statsPath);
+  if (!previous || !previous.complete || previous.auditBytes !== auditBytesBefore) return;
+  const next = {
+    version: SIDECAR_VERSION,
+    auditBytes: auditBytesAfter,
+    requestCount: previous.requestCount + 1,
+    errorCount: previous.errorCount + (record.status >= 400 || Boolean(record.error) ? 1 : 0),
+    complete: true,
+    minTs: previous.minTs === null ? record.ts : Math.min(previous.minTs, record.ts),
+    maxTs: previous.maxTs === null ? record.ts : Math.max(previous.maxTs, record.ts)
+  };
+  writeFileSync11(statsPath, JSON.stringify(next), "utf8");
+}
+function queryCovers(stats, from, to) {
+  return stats.requestCount === 0 || stats.minTs !== null && stats.maxTs !== null && from <= stats.minTs && to >= stats.maxTs;
+}
+function fileOverlaps(file, from, to) {
+  const start = auditFileDateMs(file);
+  if (start === null) return false;
+  const date = new Date(start);
+  const end = new Date(date.getFullYear(), date.getMonth(), date.getDate() + 1).getTime();
+  return end > from && start <= to;
+}
+function parseMetadataPrefix(prefix, prefixTruncated) {
+  const text = prefix.toString("utf8");
+  const tsMatch = /(?:^|,)"ts":(-?\d+)/.exec(text);
+  const statusMatch = /(?:^|,)"status":(-?\d+)/.exec(text);
+  const errorMatch = /(?:^|,)"error":"((?:\\.|[^"\\])*)"/.exec(text);
+  const bodyStarted = /,(?:"requestBody"|"responseBody"):/.test(text);
+  return {
+    ts: tsMatch ? Number(tsMatch[1]) : void 0,
+    status: statusMatch ? Number(statusMatch[1]) : void 0,
+    hasError: Boolean(errorMatch?.[1]),
+    complete: Boolean(tsMatch && statusMatch && (!prefixTruncated || bodyStarted))
+  };
+}
+async function scanAuditFile(auditPath, startByte, auditBytes, from, to) {
+  let requestCount = 0;
+  let errorCount = 0;
+  let filteredRequestCount = 0;
+  let filteredErrorCount = 0;
+  let minTs = null;
+  let maxTs = null;
+  let complete = true;
+  let prefixParts = [];
+  let prefixBytes = 0;
+  let prefixTruncated = false;
+  const consumeLine = () => {
+    if (prefixBytes === 0 && !prefixTruncated) return;
+    const prefix = Buffer.concat(prefixParts, prefixBytes);
+    const metadata = parseMetadataPrefix(prefix, prefixTruncated);
+    if (!metadata.complete || metadata.ts === void 0 || metadata.status === void 0) {
+      complete = false;
+    } else {
+      requestCount += 1;
+      const isError = metadata.status >= 400 || metadata.hasError;
+      if (isError) errorCount += 1;
+      minTs = minTs === null ? metadata.ts : Math.min(minTs, metadata.ts);
+      maxTs = maxTs === null ? metadata.ts : Math.max(maxTs, metadata.ts);
+      if (metadata.ts >= from && metadata.ts <= to) {
+        filteredRequestCount += 1;
+        if (isError) filteredErrorCount += 1;
+      }
+    }
+    prefixParts = [];
+    prefixBytes = 0;
+    prefixTruncated = false;
+  };
+  if (auditBytes > startByte) {
+    const stream = createReadStream(auditPath, {
+      start: startByte,
+      end: auditBytes - 1,
+      highWaterMark: READ_CHUNK_BYTES
+    });
+    for await (const value of stream) {
+      const chunk = Buffer.isBuffer(value) ? value : Buffer.from(value);
+      let offset = 0;
+      while (offset < chunk.length) {
+        const newline = chunk.indexOf(10, offset);
+        const end = newline === -1 ? chunk.length : newline;
+        if (prefixBytes < META_PREFIX_BYTES) {
+          const retained = Math.min(META_PREFIX_BYTES - prefixBytes, end - offset);
+          if (retained > 0) {
+            prefixParts.push(Buffer.from(chunk.subarray(offset, offset + retained)));
+            prefixBytes += retained;
+          }
+          if (retained < end - offset) prefixTruncated = true;
+        } else if (end > offset) {
+          prefixTruncated = true;
+        }
+        if (newline === -1) break;
+        consumeLine();
+        offset = newline + 1;
+      }
+    }
+  }
+  if (prefixBytes > 0 || prefixTruncated) complete = false;
+  return {
+    all: {
+      version: SIDECAR_VERSION,
+      auditBytes,
+      requestCount,
+      errorCount,
+      complete,
+      minTs,
+      maxTs
+    },
+    filtered: { requestCount: filteredRequestCount, errorCount: filteredErrorCount, complete }
+  };
+}
+function mergePersistedStats(previous, appended) {
+  return {
+    version: SIDECAR_VERSION,
+    auditBytes: appended.auditBytes,
+    requestCount: previous.requestCount + appended.requestCount,
+    errorCount: previous.errorCount + appended.errorCount,
+    complete: previous.complete && appended.complete,
+    minTs: previous.minTs === null ? appended.minTs : appended.minTs === null ? previous.minTs : Math.min(previous.minTs, appended.minTs),
+    maxTs: previous.maxTs === null ? appended.maxTs : appended.maxTs === null ? previous.maxTs : Math.max(previous.maxTs, appended.maxTs)
+  };
+}
+async function readAuditStats(auditDir, query2 = {}) {
+  if (!existsSync14(auditDir)) return { requestCount: 0, errorCount: 0, complete: true };
+  const from = typeof query2.from === "number" ? query2.from : -Infinity;
+  const to = typeof query2.to === "number" ? query2.to : Infinity;
+  let files;
+  try {
+    files = readdirSync(auditDir).filter((file) => AUDIT_FILE_RE.test(file) && fileOverlaps(file, from, to)).sort();
+  } catch {
+    return { requestCount: 0, errorCount: 0, complete: false };
+  }
+  const total = { requestCount: 0, errorCount: 0, complete: true };
+  for (const file of files) {
+    const auditPath = join6(auditDir, file);
+    try {
+      const auditBytes = statSync3(auditPath).size;
+      const statsPath = join6(auditDir, auditStatsFileName(file));
+      const persisted = readPersisted(statsPath);
+      if (persisted && persisted.complete && persisted.auditBytes === auditBytes && queryCovers(persisted, from, to)) {
+        total.requestCount += persisted.requestCount;
+        total.errorCount += persisted.errorCount;
+        continue;
+      }
+      const resumable = persisted && persisted.complete && persisted.auditBytes < auditBytes && queryCovers(persisted, from, to) ? persisted : null;
+      const scanned = await scanAuditFile(
+        auditPath,
+        resumable?.auditBytes ?? 0,
+        auditBytes,
+        from,
+        to
+      );
+      total.requestCount += scanned.filtered.requestCount + (resumable?.requestCount ?? 0);
+      total.errorCount += scanned.filtered.errorCount + (resumable?.errorCount ?? 0);
+      total.complete = total.complete && scanned.filtered.complete;
+      const current = resumable ? mergePersistedStats(resumable, scanned.all) : scanned.all;
+      if (current.complete) writeFileSync11(statsPath, JSON.stringify(current), "utf8");
+    } catch {
+      total.complete = false;
+    }
+  }
+  return total;
+}
+
 // src/audit/AuditPruneSweeper.ts
 var DAY_MS = 24 * 60 * 6e4;
 var SWEEP_INTERVAL_MS2 = 60 * 6e4;
 var AuditPruneSweeper = class {
-  constructor(auditDir2, logger, config, intervalMs = SWEEP_INTERVAL_MS2, now = Date.now) {
-    this.auditDir = auditDir2;
+  constructor(auditDir, logger, config, intervalMs = SWEEP_INTERVAL_MS2, now = Date.now) {
+    this.auditDir = auditDir;
     this.logger = logger;
     this.config = config;
     this.intervalMs = intervalMs;
@@ -8206,17 +8769,19 @@ var AuditPruneSweeper = class {
     if (!this.config.enabled || this.sweeping) return 0;
     this.sweeping = true;
     try {
-      if (!existsSync14(this.auditDir)) return 0;
+      if (!existsSync15(this.auditDir)) return 0;
       const today = new Date(this.now());
       const todayMidnight = new Date(today.getFullYear(), today.getMonth(), today.getDate()).getTime();
       const cutoff = todayMidnight - (this.config.retentionDays - 1) * DAY_MS;
       let removed = 0;
-      for (const file of readdirSync(this.auditDir)) {
+      for (const file of readdirSync2(this.auditDir)) {
         const dateMs = auditFileDateMs(file);
         if (dateMs === null || dateMs >= cutoff) continue;
         try {
           unlinkSync3(join7(this.auditDir, file));
           removed += 1;
+          const statsPath = join7(this.auditDir, auditStatsFileName(file));
+          if (existsSync15(statsPath)) unlinkSync3(statsPath);
         } catch (error) {
           this.logger.warn("[AuditPruneSweeper] failed to unlink expired audit file", {
             file,
@@ -8238,15 +8803,15 @@ var AuditPruneSweeper = class {
 };
 
 // src/audit/auditReader.ts
-import { existsSync as existsSync15, readdirSync as readdirSync2, readFileSync as readFileSync14 } from "fs";
+import { existsSync as existsSync16, readdirSync as readdirSync3, readFileSync as readFileSync15 } from "fs";
 import { join as join8 } from "path";
 var DEFAULT_LIMIT = 200;
 var MAX_LIMIT = 2e3;
-function readAuditRecords(auditDir2, query2 = {}) {
-  if (!existsSync15(auditDir2)) return [];
+function readAuditRecords(auditDir, query2 = {}) {
+  if (!existsSync16(auditDir)) return [];
   let files;
   try {
-    files = readdirSync2(auditDir2).filter((f) => AUDIT_FILE_RE.test(f));
+    files = readdirSync3(auditDir).filter((f) => AUDIT_FILE_RE.test(f));
   } catch {
     return [];
   }
@@ -8257,7 +8822,7 @@ function readAuditRecords(auditDir2, query2 = {}) {
   for (const file of files.sort().reverse()) {
     let raw;
     try {
-      raw = readFileSync14(join8(auditDir2, file), "utf8");
+      raw = readFileSync15(join8(auditDir, file), "utf8");
     } catch {
       continue;
     }
@@ -8286,11 +8851,11 @@ function isAuditRecord(value) {
 }
 
 // src/audit/AuditWriter.ts
-import { appendFileSync as appendFileSync2, mkdirSync as mkdirSync5 } from "fs";
+import { appendFileSync as appendFileSync2, existsSync as existsSync17, mkdirSync as mkdirSync5, statSync as statSync4 } from "fs";
 import { join as join9 } from "path";
 var AuditWriter = class {
-  constructor(auditDir2, logger, defer = (fn) => setTimeout(fn, 0)) {
-    this.auditDir = auditDir2;
+  constructor(auditDir, logger, defer = (fn) => setTimeout(fn, 0)) {
+    this.auditDir = auditDir;
     this.logger = logger;
     this.defer = defer;
   }
@@ -8324,7 +8889,21 @@ var AuditWriter = class {
       this.dirEnsured = true;
     }
     const file = join9(this.auditDir, auditFileName(record.ts));
-    appendFileSync2(file, JSON.stringify(record) + "\n", "utf8");
+    const line = JSON.stringify(record) + "\n";
+    const auditBytesBefore = existsSync17(file) ? statSync4(file).size : 0;
+    appendFileSync2(file, line, "utf8");
+    try {
+      updateAuditStatsAfterAppend(
+        file,
+        auditBytesBefore,
+        auditBytesBefore + Buffer.byteLength(line, "utf8"),
+        record
+      );
+    } catch (error) {
+      this.logger.warn("[AuditWriter] failed to update audit stats", {
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
   }
 };
 
@@ -8468,14 +9047,14 @@ var BillingPublisher = class {
 };
 
 // src/billing/billingReader.ts
-import { existsSync as existsSync16, readdirSync as readdirSync3, readFileSync as readFileSync15 } from "fs";
+import { existsSync as existsSync18, readdirSync as readdirSync4, readFileSync as readFileSync16 } from "fs";
 import { join as join11 } from "path";
 function readBillingLedger(billingDir) {
   const view = { events: [], deliveredIds: /* @__PURE__ */ new Set() };
-  if (!existsSync16(billingDir)) return view;
+  if (!existsSync18(billingDir)) return view;
   let files;
   try {
-    files = readdirSync3(billingDir);
+    files = readdirSync4(billingDir);
   } catch {
     return view;
   }
@@ -8506,7 +9085,7 @@ function readBillingStatus(billingDir) {
 function parseLines(dir, file) {
   let raw;
   try {
-    raw = readFileSync15(join11(dir, file), "utf8");
+    raw = readFileSync16(join11(dir, file), "utf8");
   } catch {
     return [];
   }
@@ -8878,7 +9457,7 @@ function buildDaemon(config, paths) {
     normalizeServerConfig(decryptedConfig.server).allowanceScheduling
   );
   const llmConfig = new ConfigFileProviderConfigSource(decryptedConfig);
-  const keyDb = new JsonOutboundKeyDb(paths.keysPath);
+  const keyDb = new JsonOutboundKeyDb(paths.keysPath, secretBox3);
   const voucherDb = new JsonVoucherDb(defaultVouchersPath(paths.configPath));
   const settingsStore = new JsonApiServerSettingsStore(paths.configPath, secretBox3);
   const integrationStateStore = new IntegrationStateStore(
@@ -8979,7 +9558,7 @@ function buildDaemon(config, paths) {
     // lines through the injected logger (honors level/format/file sink).
     logger
   });
-  const auditDir2 = defaultAuditDir(paths.configPath);
+  const auditDir = defaultAuditDir(paths.configPath);
   const billingDir = defaultBillingDir(paths.configPath);
   const adminServer = new AdminServer({
     configPath: paths.configPath,
@@ -9013,10 +9592,16 @@ function buildDaemon(config, paths) {
     // (NOT widening the least-authority writer — no token-returning read reachable).
     oauthSessions: new OAuthSessionStore(),
     // Real global fetch by default; a test seam (`paths.oauthExchangeFetch`) can
-    // inject a mock so no real token endpoint is hit.
-    // upstream-proxy: default the OAuth token-exchange fetch to the proxy-aware
-    // helper so interactive login honors a configured proxy (global/env layers).
-    oauthExchangeFetch: paths.oauthExchangeFetch ?? ((url, init) => fetchUpstream7(url, init)),
+    // inject a mock so no real token endpoint is hit (one FetchLike for every
+    // provider — the ctx below only matters on the real egress path).
+    //
+    // upstream-proxy: a PER-PROVIDER factory, so the exchange carries the same
+    // `{ providerId }` ctx the CLI login and the token refresh already pass.
+    // Without it the interactive login resolved only the global/env proxy layers
+    // — `server.proxy.byProvider[...]` was silently skipped — and the call was
+    // excluded from the upstream trace, so a failing login left no evidence.
+    // `redactBodies` keeps the code/verifier + minted token out of that trace.
+    oauthExchangeFetch: paths.oauthExchangeFetch ? () => paths.oauthExchangeFetch : (providerId) => (url, init) => fetchUpstream7(url, init, { providerId, redactBodies: true }),
     subscriptionAccountAppender: credentialStore,
     // Codex interactive OAuth (app-parity-2 child 5) — the async loopback flow store
     // + the one-shot 127.0.0.1:1455 listener. Token captured + persisted daemon-side;
@@ -9068,7 +9653,8 @@ function buildDaemon(config, paths) {
     // date-rotated audit store. Bound to the store dir here so the AdminServer
     // carries no path/store coupling. Records hold IP/UA/bodies → admin-only,
     // NEVER unauth, NEVER on `/health`. Routed in `AdminServer` (not `adminApi.ts`).
-    auditReader: (query2) => readAuditRecords(auditDir2, query2),
+    auditReader: (query2) => readAuditRecords(auditDir, query2),
+    auditStatsReader: (query2) => readAuditStats(auditDir, query2),
     // billing-event-stream: the AUTHED `GET /admin/api/billing-status` returns the
     // secret-free total/delivered/pending counts of the durable ledger.
     billingStatusReader: () => readBillingStatus(billingDir)
@@ -9078,9 +9664,9 @@ function buildDaemon(config, paths) {
     fetchImpl: (url, init) => fetchUpstream7(url, init)
   });
   setWebhookRuntime(webhookDispatcher, getSharedAccountHealth3());
-  const auditWriter = new AuditWriter(auditDir2, logger);
-  const auditPruneSweeper = new AuditPruneSweeper(auditDir2, logger, DEFAULT_AUDIT_CONFIG);
-  setAuditRuntime(auditWriter, auditPruneSweeper, auditDir2);
+  const auditWriter = new AuditWriter(auditDir, logger);
+  const auditPruneSweeper = new AuditPruneSweeper(auditDir, logger, DEFAULT_AUDIT_CONFIG);
+  setAuditRuntime(auditWriter, auditPruneSweeper);
   const billingPublisher = new BillingPublisher(billingDir, logger);
   const billingRetrySweeper = new BillingRetrySweeper(
     billingDir,
@@ -9144,7 +9730,7 @@ function resetDaemonSingletonsForTests() {
 }
 function isTokensStoreReadable(tokensPath) {
   try {
-    if (!existsSync17(tokensPath)) return true;
+    if (!existsSync19(tokensPath)) return true;
     accessSync(tokensPath, fsConstants.R_OK);
     return true;
   } catch {