crosscheck-mcp 0.2.27 → 0.2.28

package/dist/node-stdio.js

@@ -934,8 +934,8 @@ var init_better_sqlite3 = __esm({
 
 // src/entrypoints/node-stdio.ts
 init_esm_shims();
-import { existsSync as existsSync14, mkdirSync as mkdirSync10 } from "fs";
-import path15 from "path";
+import { existsSync as existsSync14, mkdirSync as mkdirSync11 } from "fs";
+import path16 from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 
@@ -952,10 +952,10 @@ var StderrEmitter = class {
   }
 };
 var FileEmitter = class {
-  constructor(path16) {
-    this.path = path16;
+  constructor(path17) {
+    this.path = path17;
     try {
-      mkdirSync(dirname(path16), { recursive: true });
+      mkdirSync(dirname(path17), { recursive: true });
     } catch {
     }
   }
@@ -988,13 +988,13 @@ var NullEmitter = class {
 function buildDefaultEmitter(env) {
   const mode = (env["CROSSCHECK_EVENTS"] ?? "stderr").toLowerCase();
   if (mode === "off") return new NullEmitter();
-  const path16 = env["CROSSCHECK_EVENTS_PATH"];
+  const path17 = env["CROSSCHECK_EVENTS_PATH"];
   if (mode === "file") {
-    return path16 ? new FileEmitter(path16) : new NullEmitter();
+    return path17 ? new FileEmitter(path17) : new NullEmitter();
   }
   if (mode === "both") {
     const ems = [new StderrEmitter()];
-    if (path16) ems.push(new FileEmitter(path16));
+    if (path17) ems.push(new FileEmitter(path17));
     return new TeeEmitter(ems);
   }
   return new StderrEmitter();
@@ -1043,10 +1043,10 @@ function envelopeBytes(v) {
 // src/core/pricing.ts
 init_esm_shims();
 import { readFileSync } from "fs";
-function loadPricing(path16) {
+function loadPricing(path17) {
   let raw;
   try {
-    raw = readFileSync(path16, "utf8");
+    raw = readFileSync(path17, "utf8");
   } catch {
     return {};
   }
@@ -1063,20 +1063,30 @@ function modelPricing(pricing, provider, model) {
   const block = pricing[provider];
   if (!block || typeof block !== "object" || Array.isArray(block)) return null;
   const table = block;
+  if (model.startsWith("_")) return null;
   let entry = table[model];
-  if (!entry || typeof entry !== "object" || Array.isArray(entry)) {
-    const best = Object.keys(table).filter((k) => model.startsWith(k)).sort((a, b) => b.length - a.length)[0];
-    entry = best !== void 0 ? table[best] : void 0;
+  let match = "exact";
+  if (!isRates(entry)) {
+    const best = Object.keys(table).filter((k) => !k.startsWith("_")).filter((k) => model.startsWith(k) && DATE_STAMP.test(model.slice(k.length))).sort((a, b) => b.length - a.length)[0];
+    if (best !== void 0) {
+      entry = table[best];
+      match = "stamp";
+    }
   }
-  if (!entry || typeof entry !== "object" || Array.isArray(entry)) return null;
+  if (!isRates(entry)) return null;
   const e = entry;
   return {
     prompt_per_1k: numberOrZero(e["prompt_per_1k"]),
     completion_per_1k: numberOrZero(e["completion_per_1k"]),
     cached_per_1k: numberOrZero(e["cached_per_1k"]),
-    ...e["estimated"] === true ? { estimated: true } : {}
+    ...e["estimated"] === true ? { estimated: true } : {},
+    match
   };
 }
+var DATE_STAMP = /^-\d{8}$/;
+function isRates(v) {
+  return Boolean(v) && typeof v === "object" && !Array.isArray(v);
+}
 function numberOrZero(v) {
   if (typeof v === "number" && Number.isFinite(v)) return v;
   if (typeof v === "string") {
@@ -1216,8 +1226,20 @@ var PROVIDER_CAPS = {
   gemini: {
     family: "gemini",
     system_role: "separate",
-    supports_temperature: true,
-    reasoning_prefixes: ["gemini-3.1-pro", "gemini-3.5-flash", "gemini-2.5-pro"]
+    // No sampling, on any Gemini model. Ignored since 3.6 Flash and rejected
+    // by upcoming models (Google, 2026-10). "model" means "omit for reasoning
+    // models", and every Gemini model is reasoning-class (below) — so this
+    // resolves to never, through the same rule the other providers use. The
+    // adapter also never sends it; this keeps the record honest for anything
+    // else that reads it.
+    supports_temperature: "model",
+    // EVERY Gemini model is reasoning-class. The old list named three
+    // families and missed gemini-3.8-flash — the DEFAULT — so the default
+    // model got the small non-reasoning budgets (768 tokens for an audit)
+    // while spending up to ~480 tokens of each call thinking. Google's docs
+    // say thinking cannot be switched off on current models, so a list of
+    // which ones think is a list that can only ever be incomplete.
+    reasoning_prefixes: ["gemini-"]
   },
   // Qwen's "Max" tier (qwen-v3.8, qwen-v3.7) is a standard instruct/chat
   // model, not a visible-reasoning model like QwQ — normal temperature and
@@ -1342,6 +1364,74 @@ function httpFailureToProviderError(provider, status, bodyText, retryAfterS, mod
   );
 }
 
+// src/providers/network-errors.ts
+init_esm_shims();
+function codeOf(e) {
+  if (!e || typeof e !== "object") return null;
+  const c = e.code;
+  return typeof c === "string" && c.length > 0 ? c : null;
+}
+function rootCause(e, depth = 0) {
+  if (depth > 5 || !e || typeof e !== "object") return e;
+  const o = e;
+  if (Array.isArray(o.errors) && o.errors.length > 0) {
+    const coded = o.errors.find((x) => codeOf(x) !== null);
+    return rootCause(coded ?? o.errors[0], depth + 1);
+  }
+  if (o.cause !== void 0 && o.cause !== null) return rootCause(o.cause, depth + 1);
+  return e;
+}
+var BY_CODE = {
+  ENOTFOUND: { cause: "dns", detail: "the provider's hostname did not resolve \u2014 DNS, or a typo'd base URL", transient: false, kind: "network" },
+  EAI_AGAIN: { cause: "dns", detail: "DNS lookup failed temporarily \u2014 resolver or network is flapping", transient: true, kind: "network" },
+  ECONNREFUSED: { cause: "refused", detail: "the connection was refused \u2014 nothing is listening, or a proxy blocked it", transient: false, kind: "network" },
+  ECONNRESET: { cause: "reset", detail: "the peer closed the connection mid-request \u2014 flaky path, or an upstream error behind a proxy", transient: true, kind: "network" },
+  EPIPE: { cause: "reset", detail: "the connection closed while we were still writing", transient: true, kind: "network" },
+  ETIMEDOUT: { cause: "connect_timeout", detail: "the connection timed out before it was established", transient: true, kind: "timeout" },
+  EHOSTUNREACH: { cause: "unreachable", detail: "no route to the provider \u2014 VPN, or offline", transient: true, kind: "network" },
+  ENETUNREACH: { cause: "unreachable", detail: "the network is unreachable \u2014 offline, or a routing change", transient: true, kind: "network" },
+  ENETDOWN: { cause: "unreachable", detail: "the local network is down", transient: true, kind: "network" },
+  EPROTO: { cause: "tls", detail: "the TLS handshake failed \u2014 an intercepting proxy, or a protocol mismatch", transient: false, kind: "network" },
+  ERR_TLS_CERT_ALTNAME_INVALID: { cause: "tls", detail: "the certificate did not match the hostname \u2014 traffic is being intercepted", transient: false, kind: "network" },
+  CERT_HAS_EXPIRED: { cause: "tls", detail: "the server certificate has expired, or this machine's clock is wrong", transient: false, kind: "network" },
+  UNABLE_TO_VERIFY_LEAF_SIGNATURE: { cause: "tls", detail: "the certificate chain could not be verified \u2014 a corporate proxy's root is probably not trusted here", transient: false, kind: "network" },
+  UND_ERR_CONNECT_TIMEOUT: { cause: "connect_timeout", detail: "could not open a connection within the timeout \u2014 firewall, or the host is down", transient: true, kind: "timeout" },
+  UND_ERR_HEADERS_TIMEOUT: { cause: "read_timeout", detail: "connected, but the provider sent no response headers in time \u2014 it is overloaded or thinking too long", transient: true, kind: "timeout" },
+  UND_ERR_BODY_TIMEOUT: { cause: "read_timeout", detail: "the response body stalled mid-stream", transient: true, kind: "timeout" },
+  UND_ERR_SOCKET: { cause: "reset", detail: "the socket closed unexpectedly", transient: true, kind: "network" },
+  UND_ERR_ABORTED: { cause: "aborted", detail: "the request was cancelled", transient: false, kind: "network" },
+  ABORT_ERR: { cause: "aborted", detail: "the request was cancelled", transient: false, kind: "network" }
+};
+function diagnoseNetworkError(e) {
+  const root = rootCause(e);
+  const code = codeOf(root) ?? codeOf(e);
+  if (code && BY_CODE[code]) return { ...BY_CODE[code], code };
+  const name = root && typeof root === "object" ? root.name : void 0;
+  if (name === "AbortError" || name === "TimeoutError") {
+    return {
+      cause: name === "TimeoutError" ? "read_timeout" : "aborted",
+      code: code ?? String(name),
+      detail: name === "TimeoutError" ? "the request exceeded its timeout" : "the request was cancelled",
+      transient: name === "TimeoutError",
+      kind: name === "TimeoutError" ? "timeout" : "network"
+    };
+  }
+  return {
+    cause: "unknown",
+    code,
+    detail: code ? `the connection failed with ${code}` : "the connection failed and the underlying error carried no code",
+    transient: true,
+    kind: "network"
+  };
+}
+function looksLikeNetworkFailure(d) {
+  return d.code !== null || d.cause !== "unknown";
+}
+function networkErrorMessage(provider, d) {
+  const code = d.code ? ` [${d.code}]` : "";
+  return `${provider}: ${d.detail}${code}`;
+}
+
 // src/providers/retry.ts
 init_esm_shims();
 var override = null;
@@ -1673,7 +1763,11 @@ async function sendAnthropic(args) {
       try {
         respLike = await doFetch(url, init);
       } catch (e) {
-        throw new ProviderError("network", `anthropic: fetch failed: ${e.message}`);
+        const d = diagnoseNetworkError(e);
+        if (!looksLikeNetworkFailure(d)) throw e;
+        throw new ProviderError(d.kind, networkErrorMessage("anthropic", d), {
+          transient: d.transient
+        });
       }
       const status = respLike.status;
       if (status >= 200 && status < 300) {
@@ -1747,6 +1841,11 @@ function jsonSchemaToGeminiSchema(schema) {
   }
   return out;
 }
+var GEMINI_THINKING_HEADROOM_TOKENS = 16384;
+function thinkingHeadroom() {
+  const raw = Number(process.env["CROSSCHECK_GEMINI_THINKING_HEADROOM_TOKENS"]);
+  return Number.isFinite(raw) && raw >= 0 ? Math.trunc(raw) : GEMINI_THINKING_HEADROOM_TOKENS;
+}
 function buildGeminiRequest(opts) {
   const contents = [];
   let systemText = null;
@@ -1765,8 +1864,9 @@ function buildGeminiRequest(opts) {
   const body = {
     contents,
     generationConfig: {
-      maxOutputTokens: opts.maxTokens,
-      temperature: opts.temperature
+      // Answer budget + thinking headroom. No temperature / topP / topK /
+      // thinkingBudget, on any model — see the header note.
+      maxOutputTokens: opts.maxTokens + thinkingHeadroom()
     }
   };
   if (systemText !== null && systemText !== "") {
@@ -1776,8 +1876,8 @@ function buildGeminiRequest(opts) {
     body.generationConfig.responseMimeType = "application/json";
     body.generationConfig.responseSchema = jsonSchemaToGeminiSchema(opts.jsonSchema);
   }
-  const url = `${GEMINI_API_URL_BASE}/${encodeURIComponent(opts.model)}:generateContent?key=${encodeURIComponent(opts.apiKey)}`;
-  return { url, headers: {}, body };
+  const url = `${GEMINI_API_URL_BASE}/${encodeURIComponent(opts.model)}:generateContent`;
+  return { url, headers: { "x-goog-api-key": opts.apiKey }, body };
 }
 function parseGeminiResponse(opts) {
   const r = opts.resp ?? {};
@@ -1807,16 +1907,19 @@ function parseGeminiResponse(opts) {
   }
   try {
     const first = cands[0];
-    const content = first["content"];
-    const parts = content["parts"];
+    const finishReason = typeof first["finishReason"] === "string" ? first["finishReason"] : void 0;
+    const content = first["content"] ?? {};
+    const parts = Array.isArray(content["parts"]) ? content["parts"] : [];
     let text = "";
     for (const p of parts) {
       if (p && typeof p === "object") {
-        const t = p["text"];
+        const part = p;
+        if (part["thought"] === true) continue;
+        const t = part["text"];
         if (typeof t === "string") text += t;
       }
     }
-    return { text, usage };
+    return { text, usage, ...finishReason ? { finishReason } : {} };
   } catch (e) {
     throw new ProviderError(
       "parse",
@@ -1845,7 +1948,8 @@ async function sendGemini(args) {
     apiKey: args.apiKey,
     messages: args.messages,
     maxTokens: args.maxTokens,
-    temperature: args.temperature,
+    // args.temperature is deliberately NOT forwarded: Gemini ignores it and
+    // upcoming models reject it. See the header note.
     ...args.jsonSchema ? { jsonSchema: args.jsonSchema } : {}
   });
   const doFetch = args.fetchImpl ?? globalThis.fetch;
@@ -1860,7 +1964,11 @@ async function sendGemini(args) {
     try {
       respLike = await doFetch(url, init);
     } catch (e) {
-      throw new ProviderError("network", `gemini: fetch failed: ${e.message}`);
+      const d = diagnoseNetworkError(e);
+      if (!looksLikeNetworkFailure(d)) throw e;
+      throw new ProviderError(d.kind, networkErrorMessage("gemini", d), {
+        transient: d.transient
+      });
     }
     const status = respLike.status;
     if (status >= 200 && status < 300) {
@@ -1870,11 +1978,18 @@ async function sendGemini(args) {
       } catch (e) {
         throw new ProviderError("parse", `gemini: response body not JSON: ${e.message}`);
       }
-      const { text, usage } = parseGeminiResponse({
+      const { text, usage, finishReason } = parseGeminiResponse({
         resp: parsed,
         model: args.model,
         purpose: args.purpose ?? "worker"
       });
+      if (text.trim() === "" && finishReason === "MAX_TOKENS") {
+        throw new ProviderError(
+          "parse",
+          `gemini: the answer was cut off before any visible text \u2014 thinking used the whole output budget (${usage.completion_tokens} tokens). Raise CROSSCHECK_GEMINI_THINKING_HEADROOM_TOKENS or the purpose's budget.`,
+          { transient: false }
+        );
+      }
       return { text, attempts: 1, usage: applyPricing2(usage, args.pricing) };
     }
     const bodyText = await respLike.text().catch(() => "");
@@ -2042,7 +2157,11 @@ async function sendOpenAICompatible(args) {
     try {
       respLike = await doFetch(url, init);
     } catch (e) {
-      throw new ProviderError("network", `${args.provider}: fetch failed: ${e.message}`);
+      const d = diagnoseNetworkError(e);
+      if (!looksLikeNetworkFailure(d)) throw e;
+      throw new ProviderError(d.kind, networkErrorMessage(args.provider, d), {
+        transient: d.transient
+      });
     }
     const status = respLike.status;
     if (status >= 200 && status < 300) {
@@ -2230,50 +2349,6 @@ import {
   ListToolsRequestSchema
 } from "@modelcontextprotocol/sdk/types.js";
 
-// src/bridge/index.ts
-init_esm_shims();
-
-// src/bridge/proxy-tools.ts
-init_esm_shims();
-function buildPythonProxies(bridge) {
-  const proxies = /* @__PURE__ */ new Map();
-  for (const name of bridge.toolNames) {
-    proxies.set(name, makeProxy(bridge, name));
-  }
-  return proxies;
-}
-function makeProxy(bridge, name) {
-  return {
-    name,
-    description: `(forwarded to Python crosscheck-agent) ${name}`,
-    // We don't carry the per-tool input schema across the bridge in
-    // route-all mode — the TS server is a transparent forwarder, so
-    // arg validation happens on the Python side. inputSchema is left
-    // permissive; the Python validator throws structured errors that
-    // tunnel back through `callTool()`.
-    inputSchema: {
-      type: "object",
-      additionalProperties: true,
-      description: `Forwarded to Python \u2014 see Python tool '${name}' for full schema.`
-    },
-    handler: async (args) => {
-      const r = await bridge.callTool(name, args);
-      if (!r.content.length) {
-        return {};
-      }
-      const first = r.content[0];
-      if (first.type === "text" && first.text) {
-        try {
-          return JSON.parse(first.text);
-        } catch {
-          return { text: first.text };
-        }
-      }
-      return { content: r.content };
-    }
-  };
-}
-
 // src/instructions.ts
 init_esm_shims();
 var ROUTABLE_TOOLS = [
@@ -2360,7 +2435,7 @@ import { z } from "zod";
 // src/server-meta.ts
 init_esm_shims();
 var SERVER_NAME = "crosscheck-agent";
-var SERVER_VERSION = true ? "0.2.27" : "0.0.0-dev";
+var SERVER_VERSION = true ? "0.2.28" : "0.0.0-dev";
 
 // src/tools/audit.ts
 init_esm_shims();
@@ -2427,27 +2502,27 @@ function extractJson(text) {
 
 // src/core/json-schema.ts
 init_esm_shims();
-function validateSchema(value, schema, path16 = "") {
+function validateSchema(value, schema, path17 = "") {
   const errs = [];
   if ("anyOf" in schema) {
     const subs = schema["anyOf"].map(
-      (s) => validateSchema(value, s, path16)
+      (s) => validateSchema(value, s, path17)
     );
     if (!subs.some((e) => e.length === 0)) {
-      errs.push(`${path16 || "<root>"}: did not match anyOf`);
+      errs.push(`${path17 || "<root>"}: did not match anyOf`);
     }
     return errs;
   }
   if ("oneOf" in schema) {
-    const passed = schema["oneOf"].filter((s) => validateSchema(value, s, path16).length === 0).length;
+    const passed = schema["oneOf"].filter((s) => validateSchema(value, s, path17).length === 0).length;
     if (passed !== 1) {
-      errs.push(`${path16 || "<root>"}: matched ${passed} of oneOf, expected 1`);
+      errs.push(`${path17 || "<root>"}: matched ${passed} of oneOf, expected 1`);
     }
     return errs;
   }
   if ("const" in schema && !deepEqual(value, schema["const"])) {
     errs.push(
-      `${path16 || "<root>"}: expected const ${pyRepr(schema["const"])}, got ${pyRepr(value)}`
+      `${path17 || "<root>"}: expected const ${pyRepr(schema["const"])}, got ${pyRepr(value)}`
     );
     return errs;
   }
@@ -2457,7 +2532,7 @@ function validateSchema(value, schema, path16 = "") {
     const ok = types.some((tt) => matchesType(value, String(tt)));
     if (!ok) {
       errs.push(
-        `${path16 || "<root>"}: expected type ${pyReprType(t)}, got ${pyTypeName(value)}`
+        `${path17 || "<root>"}: expected type ${pyReprType(t)}, got ${pyTypeName(value)}`
       );
       return errs;
     }
@@ -2466,29 +2541,29 @@ function validateSchema(value, schema, path16 = "") {
     if ("enum" in schema) {
       const en = schema["enum"];
       if (!en.some((x) => deepEqual(x, value))) {
-        errs.push(`${path16 || "<root>"}: value ${pyRepr(value)} not in enum`);
+        errs.push(`${path17 || "<root>"}: value ${pyRepr(value)} not in enum`);
       }
     }
     if ("minLength" in schema && value.length < schema["minLength"]) {
-      errs.push(`${path16 || "<root>"}: shorter than minLength ${schema["minLength"]}`);
+      errs.push(`${path17 || "<root>"}: shorter than minLength ${schema["minLength"]}`);
     }
   }
   if (typeof value === "number" && !Number.isNaN(value)) {
     if ("minimum" in schema && value < schema["minimum"]) {
-      errs.push(`${path16 || "<root>"}: ${value} < minimum ${schema["minimum"]}`);
+      errs.push(`${path17 || "<root>"}: ${value} < minimum ${schema["minimum"]}`);
     }
     if ("maximum" in schema && value > schema["maximum"]) {
-      errs.push(`${path16 || "<root>"}: ${value} > maximum ${schema["maximum"]}`);
+      errs.push(`${path17 || "<root>"}: ${value} > maximum ${schema["maximum"]}`);
     }
   }
   if (Array.isArray(value)) {
     if ("minItems" in schema && value.length < schema["minItems"]) {
-      errs.push(`${path16 || "<root>"}: fewer items than minItems ${schema["minItems"]}`);
+      errs.push(`${path17 || "<root>"}: fewer items than minItems ${schema["minItems"]}`);
     }
     const itemSchema = schema["items"];
     if (isObj(itemSchema)) {
       for (let i = 0; i < value.length; i++) {
-        errs.push(...validateSchema(value[i], itemSchema, `${path16}[${i}]`));
+        errs.push(...validateSchema(value[i], itemSchema, `${path17}[${i}]`));
       }
     }
   }
@@ -2497,19 +2572,19 @@ function validateSchema(value, schema, path16 = "") {
     const required = schema["required"] ?? [];
     for (const r of required) {
       if (!(r in value)) {
-        errs.push(`${path16 || "<root>"}: missing required key ${pyRepr(r)}`);
+        errs.push(`${path17 || "<root>"}: missing required key ${pyRepr(r)}`);
       }
     }
     if (schema["additionalProperties"] === false) {
       for (const k of Object.keys(value)) {
         if (!(k in props)) {
-          errs.push(`${path16 || "<root>"}: unknown key ${pyRepr(k)}`);
+          errs.push(`${path17 || "<root>"}: unknown key ${pyRepr(k)}`);
         }
       }
     }
     for (const [k, v] of Object.entries(value)) {
       const ps = props[k];
-      if (ps) errs.push(...validateSchema(v, ps, path16 ? `${path16}.${k}` : k));
+      if (ps) errs.push(...validateSchema(v, ps, path17 ? `${path17}.${k}` : k));
     }
   }
   return errs;
@@ -2591,6 +2666,34 @@ function pyReprType(t) {
 
 // src/core/usage.ts
 init_esm_shims();
+
+// src/core/session.ts
+init_esm_shims();
+import { randomUUID } from "crypto";
+var processSessionId = null;
+var startedAt = null;
+function engineSessionId() {
+  if (processSessionId === null) {
+    processSessionId = randomUUID();
+    startedAt = Date.now();
+  }
+  return processSessionId;
+}
+function resolveSessionId(callerSupplied) {
+  const trimmed = typeof callerSupplied === "string" ? callerSupplied.trim() : "";
+  return trimmed.length > 0 ? trimmed : engineSessionId();
+}
+function localSessionRecordingEnabled(env = globalThis.process?.env ?? {}) {
+  const v = (env["CROSSCHECK_RECORD_SESSIONS"] ?? "").trim().toLowerCase();
+  return !["0", "false", "off", "no"].includes(v);
+}
+function recordingSessionId(callerSupplied) {
+  if (localSessionRecordingEnabled()) return resolveSessionId(callerSupplied);
+  const trimmed = typeof callerSupplied === "string" ? callerSupplied.trim() : "";
+  return trimmed.length > 0 ? trimmed : null;
+}
+
+// src/core/usage.ts
 function emptyUsage(provider, model, purpose = "worker") {
   return {
     provider,
@@ -2695,11 +2798,11 @@ function withCommas(n) {
 function renderRunSummary(opts) {
   const endedAt = opts.endedAtS ?? Math.trunc(Date.now() / 1e3);
   let scope = "call";
-  let startedAt = null;
+  let startedAt2 = null;
   let rows = [];
   if (opts.sessionScope && opts.sessionScope.rows.length > 0) {
     scope = "session";
-    startedAt = opts.sessionScope.startedAt;
+    startedAt2 = opts.sessionScope.startedAt;
     rows = opts.sessionScope.rows.map((r) => ({ ...r }));
   } else {
     const byPurpose = /* @__PURE__ */ new Map();
@@ -2730,6 +2833,7 @@ function renderRunSummary(opts) {
       row.cpu_ms += a.cpu_ms ?? 0;
       if (a.cache_hit) row.cache_hits += 1;
       if (a.error) row.errors += 1;
+      if (a.usage?.estimated) row.estimated = true;
     }
     rows = Array.from(byPurpose.values());
   }
@@ -2742,16 +2846,18 @@ function renderRunSummary(opts) {
     wall_ms: rows.reduce((s, r) => s + r.wall_ms, 0),
     cpu_ms: rows.reduce((s, r) => s + r.cpu_ms, 0),
     cache_hits: rows.reduce((s, r) => s + r.cache_hits, 0),
-    errors: rows.reduce((s, r) => s + r.errors, 0)
+    errors: rows.reduce((s, r) => s + r.errors, 0),
+    ...rows.some((r) => r.estimated) ? { estimated: true } : {}
   };
   const titleLeft = scope === "session" ? `session: ${opts.sessionId ?? ""}` : `call: ${opts.toolName}`;
-  const header = `${titleLeft}   (${totals.calls} calls, ${withCommas(totals.total_tokens)} tokens, $${totals.cost_usd.toFixed(4)}, ${(totals.wall_ms / 1e3).toFixed(1)}s wall, ${(totals.cpu_ms / 1e3).toFixed(3)}s cpu)`;
+  const costText = totals.estimated ? `$${totals.cost_usd.toFixed(4)}+ (some calls unpriced)` : `$${totals.cost_usd.toFixed(4)}`;
+  const header = `${titleLeft}   (${totals.calls} calls, ${withCommas(totals.total_tokens)} tokens, ${costText}, ${(totals.wall_ms / 1e3).toFixed(1)}s wall, ${(totals.cpu_ms / 1e3).toFixed(3)}s cpu)`;
   const bodyLines = [];
   for (let i = 0; i < rows.length; i++) {
     const r = rows[i];
     const glyph = i === rows.length - 1 ? "`-" : "|-";
     bodyLines.push(
-      `${glyph} purpose: ${r.purpose}  (calls=${r.calls} tokens=${withCommas(r.total_tokens)} cost=$${r.cost_usd.toFixed(4)} wall=${(r.wall_ms / 1e3).toFixed(1)}s cpu=${(r.cpu_ms / 1e3).toFixed(3)}s)`
+      `${glyph} purpose: ${r.purpose}  (calls=${r.calls} tokens=${withCommas(r.total_tokens)} cost=$${r.cost_usd.toFixed(4)}${r.estimated ? "+" : ""} wall=${(r.wall_ms / 1e3).toFixed(1)}s cpu=${(r.cpu_ms / 1e3).toFixed(3)}s)`
     );
   }
   const callByModel = rollupSpendByModel(
@@ -2799,7 +2905,7 @@ function renderRunSummary(opts) {
     tool: opts.toolName,
     scope,
     currency: "USD",
-    started_at: startedAt,
+    started_at: startedAt2,
     ended_at: endedAt,
     rows,
     totals,
@@ -2924,14 +3030,15 @@ async function attachUsageBlock(result, answers, opts) {
   delete result["_suppress_run_summary"];
 }
 async function appendUsageLog(storage, sessionId, toolName, answers, nowS) {
-  if (!sessionId || answers.length === 0) return;
+  const sid = recordingSessionId(sessionId);
+  if (!sid || answers.length === 0) return;
   const now = nowS ?? Math.trunc(Date.now() / 1e3);
   const rows = [];
   for (const a of answers) {
     const u = a.usage;
     if (!u || typeof u.provider !== "string" || u.provider === "") continue;
     rows.push({
-      session_id: sessionId,
+      session_id: sid,
       ts: now,
       tool: toolName,
       purpose: u.purpose ?? "worker",
@@ -2954,13 +3061,14 @@ async function appendUsageLog(storage, sessionId, toolName, answers, nowS) {
   }
 }
 async function recordSessionCall(storage, sessionId, answers, wallMs, cpuMs, nowS) {
-  if (!sessionId) return;
+  const sid = recordingSessionId(sessionId);
+  if (!sid) return;
   const now = nowS ?? Math.trunc(Date.now() / 1e3);
   try {
-    let existing = await storage.getSession(sessionId);
+    let existing = await storage.getSession(sid);
     if (!existing) {
       await storage.upsertSession({
-        session_id: sessionId,
+        session_id: sid,
         started_at: now,
         last_at: now,
         calls: 0,
@@ -2973,7 +3081,7 @@ async function recordSessionCall(storage, sessionId, answers, wallMs, cpuMs, now
         total_cost_usd: 0,
         total_cpu_ms: 0
       });
-      existing = await storage.getSession(sessionId);
+      existing = await storage.getSession(sid);
     }
     if (!existing) return;
     let promptDelta = 0;
@@ -2993,7 +3101,7 @@ async function recordSessionCall(storage, sessionId, answers, wallMs, cpuMs, now
       }
       if (a.cache_hit) cacheHitDelta += 1;
     }
-    await storage.accumulateSessionTotals(sessionId, {
+    await storage.accumulateSessionTotals(sid, {
       calls: answers.length,
       wall_ms: wallMs,
       cache_hits: cacheHitDelta,
@@ -5962,10 +6070,6 @@ If you need supporting evidence, you may emit ONE \`<tool_call>...</tool_call>\`
 }
 
 // src/tools/confer.ts
-var DEFERRED_OPTS = [
-  // empty — every confer opt runs natively except worker_tools, which
-  // is gated below (non-empty list → defer).
-];
 async function runConfer(args, opts) {
   const callStartedWall = performance3.now();
   const callStartedCpu = process.cpuUsage();
@@ -5981,16 +6085,11 @@ async function runConfer(args, opts) {
       rejectedWorkerTools.push(t);
     }
   }
-  const workerToolsNeedsBridge = acceptedWorkerTools.length > 0 && !opts.innerCallers;
-  const needsBridge = DEFERRED_OPTS.some((k) => Boolean(args[k])) || workerToolsNeedsBridge;
-  if (needsBridge) {
-    if (opts.bridge && opts.bridge.toolNames.has("confer")) {
-      return await deferConfer(args, opts.bridge);
-    }
+  if (acceptedWorkerTools.length > 0 && !opts.innerCallers) {
     return errorEnvelope2(
       "CONFER_OPT_NOT_NATIVE",
       "worker_tools requested but innerCallers are not wired",
-      "Native confer covers untrusted_input + early_stop + extract_claims + inject_session_memory + auto_panel. worker_tools needs innerCallers wired by the host (or CROSSCHECK_BRIDGE_PYTHON=1 as a backstop)."
+      "Native confer covers untrusted_input + early_stop + extract_claims + inject_session_memory + auto_panel. worker_tools needs innerCallers wired by the host."
     );
   }
   const question = typeof args["question"] === "string" ? args["question"] : String(args["question"] ?? "");
@@ -6341,21 +6440,6 @@ function unknownProviderError(unknownNames, available) {
     available_now: Object.keys(available).sort()
   };
 }
-async function deferConfer(args, bridge) {
-  const r = await bridge.callTool("confer", args);
-  const text = r.content[0]?.text;
-  if (typeof text === "string") {
-    try {
-      return JSON.parse(text);
-    } catch {
-    }
-  }
-  return errorEnvelope2(
-    "CONFER_BRIDGE_BAD_ENVELOPE",
-    "bridge returned an unparseable envelope for confer",
-    "Check that the Python child is healthy."
-  );
-}
 function errorEnvelope2(code, message, hint) {
   return {
     tool: "confer",
@@ -6731,7 +6815,7 @@ function errorEnvelope3(code, message, hint) {
     transient: false
   };
 }
-async function runVerify(args, bridge, fetchConfig) {
+async function runVerify(args, fetchConfig) {
   const checks = args["checks"];
   if (!Array.isArray(checks) || checks.length === 0) {
     return {
@@ -6743,7 +6827,6 @@ async function runVerify(args, bridge, fetchConfig) {
       )
     };
   }
-  void bridge;
   const allowShell = Boolean(args["allow_shell"] ?? false);
   const wallStart = performance4.now();
   const cpuStart = process.cpuUsage();
@@ -7045,7 +7128,6 @@ async function runBench(args, opts) {
       const innerOpts = {
         providers: opts.providers,
         allowlist: opts.allowlist ?? null,
-        ...opts.bridge ? { bridge: opts.bridge } : {},
         ...opts.moderator ? { moderator: opts.moderator } : {}
       };
       let inner;
@@ -7696,11 +7778,11 @@ function getNodeCache(cfg2, repoRoot, key, nowMs) {
     return null;
   }
 }
-function atomicWriteJson(path16, payload) {
-  mkdirSync4(dirname2(path16), { recursive: true });
-  const tmp = `${path16}.${process.pid}.${Date.now()}.tmp`;
+function atomicWriteJson(path17, payload) {
+  mkdirSync4(dirname2(path17), { recursive: true });
+  const tmp = `${path17}.${process.pid}.${Date.now()}.tmp`;
   writeFileSync3(tmp, JSON.stringify(payload), "utf8");
-  renameSync(tmp, path16);
+  renameSync(tmp, path17);
 }
 function putNodeCache(cfg2, repoRoot, key, value) {
   if (!cfg2 || cfg2.enabled === false) return;
@@ -7758,7 +7840,6 @@ var EST_TOKENS = {
   med: [1500, 800],
   high: [2500, 1500]
 };
-var DEFERRED_OPTS2 = [];
 var REACTIVE_SIGNAL_RE = /<signals>\s*(\{[\s\S]*?\})\s*<\/signals>/g;
 function parseReactiveSignals(output) {
   if (typeof output !== "string" || !output.includes("<signals>")) return [];
@@ -7798,17 +7879,6 @@ async function runOrchestrate(args, opts) {
     );
     if (breakerEnv) return breakerEnv;
   }
-  const needsBridge = DEFERRED_OPTS2.some((k) => Boolean(args[k]));
-  if (needsBridge) {
-    if (opts.bridge && opts.bridge.toolNames.has("orchestrate")) {
-      return await deferOrchestrate(args, opts.bridge);
-    }
-    return errorEnvelope5(
-      "ORCHESTRATE_OPT_NOT_NATIVE",
-      "this orchestrate opt-in requires the Python bridge in v1",
-      "v1 native covers the plain DAG flow + cheap_mode. reactive (mid-flight DAG updates) still defers. Set CROSSCHECK_BRIDGE_PYTHON=1 to enable."
-    );
-  }
   const goal = typeof args["goal"] === "string" ? args["goal"] : null;
   const dagIn = isObj5(args["dag"]) ? args["dag"] : null;
   if (goal === null === (dagIn === null)) {
@@ -8750,21 +8820,6 @@ function resolveProviders3(names, available, allowlist) {
   }
   return out;
 }
-async function deferOrchestrate(args, bridge) {
-  const r = await bridge.callTool("orchestrate", args);
-  const text = r.content[0]?.text;
-  if (typeof text === "string") {
-    try {
-      return JSON.parse(text);
-    } catch {
-    }
-  }
-  return errorEnvelope5(
-    "ORCHESTRATE_BRIDGE_BAD_ENVELOPE",
-    "bridge returned an unparseable envelope for orchestrate",
-    "Check that the Python child is healthy."
-  );
-}
 function errorEnvelope5(code, message, hint, kind = "client") {
   return {
     tool: "orchestrate",
@@ -9129,7 +9184,6 @@ ${documentsPayload}`;
   }, {
     providers: opts.providers,
     allowlist: opts.allowlist ?? null,
-    ...opts.bridge ? { bridge: opts.bridge } : {},
     ctx
   });
   const scopeAnswer = Array.isArray(scope["answers"]) ? scope["answers"].filter((a) => typeof a["response"] === "string" && a["response"]).map((a) => `[${a["provider"]}]
@@ -9152,7 +9206,6 @@ ${scopeAnswer || "(none)"}
     providers: opts.providers,
     allowlist: opts.allowlist ?? null,
     moderator,
-    ...opts.bridge ? { bridge: opts.bridge } : {},
     ctx
   });
   let attempts = 1;
@@ -9187,7 +9240,6 @@ ${scopeAnswer || "(none)"}
     }, {
       providers: opts.providers,
       allowlist: opts.allowlist ?? null,
-      ...opts.bridge ? { bridge: opts.bridge } : {},
       ctx
     });
   }
@@ -9210,7 +9262,6 @@ ${scopeAnswer || "(none)"}
     }, {
       providers: opts.providers,
       allowlist: opts.allowlist ?? null,
-      ...opts.bridge ? { bridge: opts.bridge } : {},
       ctx
     });
     let overallF = toNumberOrNull(auditEnvelope["overall_score"]);
@@ -9235,7 +9286,6 @@ ${documentsPayload}`
           providers: opts.providers,
           allowlist: opts.allowlist ?? null,
           moderator,
-          ...opts.bridge ? { bridge: opts.bridge } : {},
           ctx
         }
       );
@@ -9255,7 +9305,6 @@ ${documentsPayload}`
         }, {
           providers: opts.providers,
           allowlist: opts.allowlist ?? null,
-          ...opts.bridge ? { bridge: opts.bridge } : {},
           ctx
         });
         overallF = toNumberOrNull(auditEnvelope["overall_score"]);
@@ -9494,11 +9543,6 @@ function errorEnvelope6(toolName, code, message, hint) {
 // src/tools/coordinate.ts
 init_esm_shims();
 import { performance as performance8 } from "perf_hooks";
-var DEFERRED_OPTS3 = [
-  // empty — every coordinate opt runs natively when its deps
-  // (storage / innerCallers) are wired. Without them the
-  // worker_tools gate still triggers a bridge defer.
-];
 var COORDINATE_DEFAULT_TEMP = 0.4;
 var ROLE_TURN_SCHEMA = {
   type: "object",
@@ -9553,23 +9597,18 @@ async function runCoordinate(args, opts) {
       rejectedWorkerTools.push(t);
     }
   }
-  const workerToolsNeedsBridge = acceptedWorkerTools.length > 0 && !opts.innerCallers;
-  const needsBridge = DEFERRED_OPTS3.some((k) => Boolean(args[k])) || workerToolsNeedsBridge;
-  if (needsBridge) {
+  if (acceptedWorkerTools.length > 0 && !opts.innerCallers) {
     if (superRequested) {
       return errorEnvelope7(
         "COORDINATE_SUPER_NOT_NATIVE",
-        "super mode requested but worker_tools needs the Python bridge",
-        "worker_tools without innerCallers wired defers to the Python bridge, which doesn't support super mode. Drop worker_tools, or wire innerCallers, to use super."
+        "super mode requested with worker_tools, but innerCallers are not wired",
+        "worker_tools needs innerCallers wired by the host. Drop worker_tools, or wire innerCallers, to use super."
       );
     }
-    if (opts.bridge && opts.bridge.toolNames.has("coordinate")) {
-      return await deferCoordinate(args, opts.bridge);
-    }
     return errorEnvelope7(
       "COORDINATE_OPT_NOT_NATIVE",
       "worker_tools requested but innerCallers are not wired",
-      "Native coordinate covers the three-role flow + untrusted_input + inject_session_memory. worker_tools needs innerCallers wired by the host (or CROSSCHECK_BRIDGE_PYTHON=1 as a backstop)."
+      "Native coordinate covers the three-role flow + untrusted_input + inject_session_memory. worker_tools needs innerCallers wired by the host."
     );
   }
   const untrusted = Boolean(args["untrusted_input"]);
@@ -9969,21 +10008,6 @@ function unknownProviderError3(unknownNames, available) {
     available_now: Object.keys(available).sort()
   };
 }
-async function deferCoordinate(args, bridge) {
-  const r = await bridge.callTool("coordinate", args);
-  const text = r.content[0]?.text;
-  if (typeof text === "string") {
-    try {
-      return JSON.parse(text);
-    } catch {
-    }
-  }
-  return errorEnvelope7(
-    "COORDINATE_BRIDGE_BAD_ENVELOPE",
-    "bridge returned an unparseable envelope for coordinate",
-    "Check that the Python child is healthy."
-  );
-}
 function errorEnvelope7(code, message, hint) {
   return {
     tool: "coordinate",
@@ -10316,10 +10340,6 @@ function buildModeratorTranscript(transcript) {
 
 // src/tools/debate.ts
 import { performance as performance10 } from "perf_hooks";
-var DEFERRED_OPTS4 = [
-  // empty — every debate opt runs natively when its deps
-  // (storage / innerCallers) are wired.
-];
 async function runDebate(args, opts) {
   const callStartedWall = performance10.now();
   const callStartedCpu = process.cpuUsage();
@@ -10337,23 +10357,18 @@ async function runDebate(args, opts) {
       rejectedWorkerTools.push(t);
     }
   }
-  const workerToolsNeedsBridge = acceptedWorkerTools.length > 0 && !opts.innerCallers;
-  const needsBridge = DEFERRED_OPTS4.some((k) => Boolean(args[k])) || workerToolsNeedsBridge;
-  if (needsBridge) {
+  if (acceptedWorkerTools.length > 0 && !opts.innerCallers) {
     if (superRequested) {
       return errorEnvelope9(
         "DEBATE_SUPER_NOT_NATIVE",
-        "super mode requested but worker_tools needs the Python bridge",
-        "worker_tools without innerCallers wired defers to the Python bridge, which doesn't support super mode. Drop worker_tools, or wire innerCallers, to use super."
+        "super mode requested with worker_tools, but innerCallers are not wired",
+        "worker_tools needs innerCallers wired by the host. Drop worker_tools, or wire innerCallers, to use super."
       );
     }
-    if (opts.bridge && opts.bridge.toolNames.has("debate")) {
-      return await deferDebate(args, opts.bridge);
-    }
     return errorEnvelope9(
       "DEBATE_OPT_NOT_NATIVE",
       "worker_tools requested but innerCallers are not wired",
-      "Native debate covers N-round + plain/structured moderator synthesis + inject_session_memory + auto_panel + extract_claims + early_stop. worker_tools needs innerCallers wired by the host (or CROSSCHECK_BRIDGE_PYTHON=1 as a backstop)."
+      "Native debate covers N-round + plain/structured moderator synthesis + inject_session_memory + auto_panel + extract_claims + early_stop. worker_tools needs innerCallers wired by the host."
     );
   }
   const topic = typeof args["topic"] === "string" ? args["topic"] : String(args["topic"] ?? "");
@@ -10790,21 +10805,6 @@ function unknownProviderError5(unknownNames, available) {
     available_now: Object.keys(available).sort()
   };
 }
-async function deferDebate(args, bridge) {
-  const r = await bridge.callTool("debate", args);
-  const text = r.content[0]?.text;
-  if (typeof text === "string") {
-    try {
-      return JSON.parse(text);
-    } catch {
-    }
-  }
-  return errorEnvelope9(
-    "DEBATE_BRIDGE_BAD_ENVELOPE",
-    "bridge returned an unparseable envelope for debate",
-    "Check that the Python child is healthy."
-  );
-}
 function errorEnvelope9(code, message, hint) {
   return {
     tool: "debate",
@@ -10825,9 +10825,6 @@ var DEFAULT_DELEGATION_LIMITS = {
 };
 async function runDelegate(args, opts) {
   if (!opts.storage) {
-    if (opts.bridge && opts.bridge.toolNames.has("delegate")) {
-      return await deferDelegate(args, opts.bridge);
-    }
     return errorEnvelope10(
       "DELEGATE_STORAGE_UNAVAILABLE",
       "delegate needs the local database (for quota tracking), which isn't available",
@@ -10899,7 +10896,6 @@ async function runDelegate(args, opts) {
   const innerOpts = {
     providers: opts.providers,
     allowlist: opts.allowlist ?? null,
-    ...opts.bridge ? { bridge: opts.bridge } : {},
     ...opts.moderator ? { moderator: opts.moderator } : {}
   };
   let result;
@@ -10938,21 +10934,6 @@ async function record(storage, sessionId, requester, toolCall, via, accepted, no
     created_at: nowEpochSeconds
   });
 }
-async function deferDelegate(args, bridge) {
-  const r = await bridge.callTool("delegate", args);
-  const text = r.content[0]?.text;
-  if (typeof text === "string") {
-    try {
-      return JSON.parse(text);
-    } catch {
-    }
-  }
-  return errorEnvelope10(
-    "DELEGATE_BRIDGE_BAD_ENVELOPE",
-    "bridge returned an unparseable envelope for delegate",
-    "Check that the Python child is healthy."
-  );
-}
 function errorEnvelope10(code, message, hint) {
   return {
     tool: "delegate",
@@ -10996,9 +10977,6 @@ async function runExplain(args, opts) {
     );
   }
   if (!opts.storage) {
-    if (opts.bridge && opts.bridge.toolNames.has("explain")) {
-      return await deferExplain(args, opts.bridge);
-    }
     return errorEnvelope11(
       "EXPLAIN_STORAGE_UNAVAILABLE",
       "explain needs the local transcript/stats database, which isn't available",
@@ -11280,21 +11258,6 @@ function pyRepr5(v) {
   }
   return String(v);
 }
-async function deferExplain(args, bridge) {
-  const r = await bridge.callTool("explain", args);
-  const text = r.content[0]?.text;
-  if (typeof text === "string") {
-    try {
-      return JSON.parse(text);
-    } catch {
-    }
-  }
-  return errorEnvelope11(
-    "EXPLAIN_BRIDGE_BAD_ENVELOPE",
-    "bridge returned an unparseable envelope for explain",
-    "Check that the Python child is healthy."
-  );
-}
 function errorEnvelope11(code, message, hint, kind = "client", extra = {}) {
   return {
     tool: "explain",
@@ -11852,9 +11815,6 @@ async function runRecall(args, opts) {
   if (k < 1) k = 1;
   if (k > 50) k = 50;
   if (!opts.storage) {
-    if (opts.bridge && opts.bridge.toolNames.has("recall")) {
-      return await deferRecall(args, opts.bridge);
-    }
     return errorEnvelope12(
       "RECALL_STORAGE_UNAVAILABLE",
       "recall needs the local database, which isn't available",
@@ -11907,21 +11867,6 @@ async function runRecall(args, opts) {
     applied_filters: applied
   };
 }
-async function deferRecall(args, bridge) {
-  const r = await bridge.callTool("recall", args);
-  const text = r.content[0]?.text;
-  if (typeof text === "string") {
-    try {
-      return JSON.parse(text);
-    } catch {
-    }
-  }
-  return errorEnvelope12(
-    "RECALL_BRIDGE_BAD_ENVELOPE",
-    "bridge returned an unparseable envelope for recall",
-    "Check that the Python child is healthy."
-  );
-}
 function errorEnvelope12(code, message, hint) {
   return {
     tool: "recall",
@@ -11945,9 +11890,6 @@ async function runRecommendPanel(args, opts) {
     );
   }
   if (!opts.storage) {
-    if (opts.bridge && opts.bridge.toolNames.has("recommend_panel")) {
-      return await deferRecommendPanel(args, opts.bridge);
-    }
     return errorEnvelope13(
       "RECOMMEND_PANEL_STORAGE_UNAVAILABLE",
       "recommend_panel needs the local stats database, which isn't available",
@@ -12010,21 +11952,6 @@ async function runRecommendPanel(args, opts) {
     meta: result.meta
   };
 }
-async function deferRecommendPanel(args, bridge) {
-  const r = await bridge.callTool("recommend_panel", args);
-  const text = r.content[0]?.text;
-  if (typeof text === "string") {
-    try {
-      return JSON.parse(text);
-    } catch {
-    }
-  }
-  return errorEnvelope13(
-    "RECOMMEND_PANEL_BRIDGE_BAD_ENVELOPE",
-    "bridge returned an unparseable envelope for recommend_panel",
-    "Check that the Python child is healthy."
-  );
-}
 function errorEnvelope13(code, message, hint) {
   return {
     tool: "recommend_panel",
@@ -12055,9 +11982,6 @@ init_esm_shims();
 import { readFileSync as readFileSync10, existsSync as existsSync8 } from "fs";
 async function runScoreboard(args, opts) {
   if (!opts.storage) {
-    if (opts.bridge && opts.bridge.toolNames.has("scoreboard")) {
-      return await deferScoreboard(args, opts.bridge);
-    }
     return errorEnvelope14(
       "SCOREBOARD_STORAGE_UNAVAILABLE",
       "scoreboard needs the local stats database, which isn't available",
@@ -12180,21 +12104,6 @@ function clampInt3(raw, min, max, fallback) {
   if (!Number.isFinite(n)) return fallback;
   return Math.min(max, Math.max(min, Math.trunc(n)));
 }
-async function deferScoreboard(args, bridge) {
-  const r = await bridge.callTool("scoreboard", args);
-  const text = r.content[0]?.text;
-  if (typeof text === "string") {
-    try {
-      return JSON.parse(text);
-    } catch {
-    }
-  }
-  return errorEnvelope14(
-    "SCOREBOARD_BRIDGE_BAD_ENVELOPE",
-    "bridge returned an unparseable envelope for scoreboard",
-    "Check that the Python child is healthy."
-  );
-}
 function errorEnvelope14(code, message, hint) {
   return {
     tool: "scoreboard",
@@ -12232,9 +12141,6 @@ async function runSessionMemory(args, opts) {
     );
   }
   if (!opts.storage) {
-    if (opts.bridge && opts.bridge.toolNames.has("session_memory")) {
-      return await deferSessionMemory(args, opts.bridge);
-    }
     return errorEnvelope15(
       "SESSION_MEMORY_STORAGE_UNAVAILABLE",
       "session_memory needs the local database, which isn't available",
@@ -12339,21 +12245,6 @@ function clampInt4(raw, min, max, fallback) {
   if (!Number.isFinite(n)) return fallback;
   return Math.min(max, Math.max(min, Math.trunc(n)));
 }
-async function deferSessionMemory(args, bridge) {
-  const r = await bridge.callTool("session_memory", args);
-  const text = r.content[0]?.text;
-  if (typeof text === "string") {
-    try {
-      return JSON.parse(text);
-    } catch {
-    }
-  }
-  return errorEnvelope15(
-    "SESSION_MEMORY_BRIDGE_BAD_ENVELOPE",
-    "bridge returned an unparseable envelope for session_memory",
-    "Check that the Python child is healthy."
-  );
-}
 function errorEnvelope15(code, message, hint) {
   return {
     tool: "session_memory",
@@ -12977,7 +12868,7 @@ var CHECK_INTERVAL_SECONDS = 3 * 24 * 60 * 60;
 var DEFAULT_PACKAGE = "crosscheck-cli";
 var FETCH_TIMEOUT_MS = 3e3;
 function engineVersion() {
-  return true ? "0.2.27" : "0.0.0-dev";
+  return true ? "0.2.28" : "0.0.0-dev";
 }
 function defaultUpdateCachePath() {
   const base = process.env["CROSSCHECK_DATA_DIR"] || path10.join(os.homedir() || os.tmpdir(), ".crosscheck");
@@ -13751,12 +13642,11 @@ function helpTool() {
     }
   });
 }
-function registerCoreTools(opts = {}) {
-  const o = opts && typeof opts === "object" && "toolNames" in opts ? { bridge: opts } : opts;
+function registerCoreTools(o = {}) {
   const tools = /* @__PURE__ */ new Map();
   const list = [
     pingTool(),
-    verifyTool(o.bridge, o.fetchConfig),
+    verifyTool(o.fetchConfig),
     pickTool(
       o.providers ?? {},
       o.providerAllowlist ?? null,
@@ -13768,7 +13658,6 @@ function registerCoreTools(opts = {}) {
     auditTool(
       o.providers ?? {},
       o.providerAllowlist ?? null,
-      o.bridge,
       o.transcriptsDir,
       o.pricing,
       o.storage,
@@ -13778,7 +13667,6 @@ function registerCoreTools(opts = {}) {
     conferTool(
       o.providers ?? {},
       o.providerAllowlist ?? null,
-      o.bridge,
       o.moderatorDefault ?? "anthropic",
       o.pricing,
       o.storage,
@@ -13791,7 +13679,6 @@ function registerCoreTools(opts = {}) {
     debateTool(
       o.providers ?? {},
       o.providerAllowlist ?? null,
-      o.bridge,
       buildInnerCallers(o),
       o.storage,
       o.pricing,
@@ -13803,7 +13690,6 @@ function registerCoreTools(opts = {}) {
     coordinateTool(
       o.providers ?? {},
       o.providerAllowlist ?? null,
-      o.bridge,
       buildInnerCallers(o),
       o.storage,
       o.circuitBreakers,
@@ -13814,7 +13700,6 @@ function registerCoreTools(opts = {}) {
     triangulateTool(
       o.providers ?? {},
       o.providerAllowlist ?? null,
-      o.bridge,
       o.storage,
       o.circuitBreakers,
       o.transcriptsDir,
@@ -13823,7 +13708,6 @@ function registerCoreTools(opts = {}) {
     planTool(
       o.providers ?? {},
       o.providerAllowlist ?? null,
-      o.bridge,
       o.storage,
       o.circuitBreakers,
       o.transcriptsDir,
@@ -13832,7 +13716,6 @@ function registerCoreTools(opts = {}) {
     critiqueTool(
       o.providers ?? {},
       o.providerAllowlist ?? null,
-      o.bridge,
       o.storage,
       o.circuitBreakers,
       o.transcriptsDir,
@@ -13841,7 +13724,6 @@ function registerCoreTools(opts = {}) {
     reviewTool(
       o.providers ?? {},
       o.providerAllowlist ?? null,
-      o.bridge,
       o.storage,
       o.circuitBreakers,
       o.transcriptsDir,
@@ -13849,25 +13731,23 @@ function registerCoreTools(opts = {}) {
     ),
     listProvidersTool(o.providers ?? {}, o.activeProviders ?? null, o.moderatorDefault ?? "anthropic"),
     modelsTool(o.providers ?? {}, o.activeProviders ?? null),
-    recallTool(o.storage, o.bridge),
-    sessionMemoryTool(o.storage, o.bridge),
-    scoreboardTool(o.storage, o.bridge, o.eventsPath),
-    explainTool(o.storage, o.bridge, o.transcriptsDir),
+    recallTool(o.storage),
+    sessionMemoryTool(o.storage),
+    scoreboardTool(o.storage, o.eventsPath),
+    explainTool(o.storage, o.transcriptsDir),
     delegateTool(
       o.providers ?? {},
       o.providerAllowlist ?? null,
       o.storage,
-      o.bridge,
       o.moderatorDefault ?? "anthropic"
     ),
     fetchTool(o.storage, o.fetchConfig, o.repoRoot),
-    recommendPanelTool(o.providers ?? {}, o.storage, o.bridge),
+    recommendPanelTool(o.providers ?? {}, o.storage),
     updateCrosscheckTool(o.repoRoot ?? null),
     benchTool(
       o.providers ?? {},
       o.providerAllowlist ?? null,
       o.storage,
-      o.bridge,
       o.moderatorDefault ?? "anthropic",
       o.benchGoldensDir,
       o.circuitBreakers,
@@ -13878,7 +13758,6 @@ function registerCoreTools(opts = {}) {
     solveTool(
       o.providers ?? {},
       o.providerAllowlist ?? null,
-      o.bridge,
       o.storage,
       o.circuitBreakers,
       o.transcriptsDir,
@@ -13887,7 +13766,6 @@ function registerCoreTools(opts = {}) {
     orchestrateTool(
       o.providers ?? {},
       o.providerAllowlist ?? null,
-      o.bridge,
       o.moderatorDefault ?? "anthropic",
       o.storage,
       o.pricing,
@@ -13934,7 +13812,6 @@ function createTool(o, toolName, cheapDefault) {
       providers: o.providers ?? {},
       allowlist: o.providerAllowlist ?? null,
       ...o.storage ? { storage: o.storage } : {},
-      ...o.bridge ? { bridge: o.bridge } : {},
       ...o.moderatorDefault ? { moderator: o.moderatorDefault } : {},
       ...o.fetchConfig ? { fetchConfig: o.fetchConfig } : {},
       ...o.repoRoot ? { repoRoot: o.repoRoot } : {},
@@ -13943,7 +13820,7 @@ function createTool(o, toolName, cheapDefault) {
     })
   };
 }
-function orchestrateTool(providers, allowlist, bridge, moderator, storage, pricing, breakers, transcriptsDir, repoRoot, nodeCache) {
+function orchestrateTool(providers, allowlist, moderator, storage, pricing, breakers, transcriptsDir, repoRoot, nodeCache) {
   return {
     name: "orchestrate",
     description: "Plan and execute a DAG of LLM subtasks. Either supply a `goal` (planner will draft the DAG) OR a hand-authored `dag`. Workers run topologically; recombine produces a single `final`. Covers the sequential flow, cheap_mode (per-node tier picking), and reactive (mid-flight DAG updates) \u2014 all native.",
@@ -13968,7 +13845,6 @@ function orchestrateTool(providers, allowlist, bridge, moderator, storage, prici
       providers,
       allowlist,
       moderator,
-      ...bridge ? { bridge } : {},
       ...storage ? { storage } : {},
       ...pricing ? { pricing } : {},
       ...breakers ? { breakers } : {},
@@ -13978,7 +13854,7 @@ function orchestrateTool(providers, allowlist, bridge, moderator, storage, prici
     })
   };
 }
-function solveTool(providers, allowlist, bridge, storage, breakers, transcriptsDir, repoRoot) {
+function solveTool(providers, allowlist, storage, breakers, transcriptsDir, repoRoot) {
   return {
     name: "solve",
     description: "Iterative LLM solver. Generates a proposal, verifies it against the supplied verifier, and retries with feedback up to max_attempts. Verifier kinds: regex_response and shell (run in a native sandbox with wall-clock + optional memory/CPU limits). With target_path, returns a unified-diff patch.",
@@ -14000,7 +13876,6 @@ function solveTool(providers, allowlist, bridge, storage, breakers, transcriptsD
     handler: (args) => runSolve(args, {
       providers,
       allowlist,
-      ...bridge ? { bridge } : {},
       ...storage ? { storage } : {},
       ...breakers ? { breakers } : {},
       ...transcriptsDir ? { transcriptsDir } : {},
@@ -14039,7 +13914,7 @@ function configPinTool(repoRoot, config2, rejectDriftEnv) {
     }
   };
 }
-function benchTool(providers, allowlist, storage, bridge, moderator, defaultGoldensDir, breakers, transcriptsDir, repoRoot) {
+function benchTool(providers, allowlist, storage, moderator, defaultGoldensDir, breakers, transcriptsDir, repoRoot) {
   return {
     name: "bench",
     description: "Run benchmark goldens against each provider's confer/review output. Each golden: {name, tool_call: confer|review, args, verifiers[]}. Returns per-provider pass/fail/error + a ranking sorted by score. Records ballots into provider_stats when storage is wired (used by triangulate's win-rate weights).",
@@ -14058,7 +13933,6 @@ function benchTool(providers, allowlist, storage, bridge, moderator, defaultGold
       allowlist,
       moderator,
       ...storage ? { storage } : {},
-      ...bridge ? { bridge } : {},
       ...defaultGoldensDir ? { defaultGoldensDir } : {},
       ...breakers ? { breakers } : {},
       ...transcriptsDir ? { transcriptsDir } : {},
@@ -14085,7 +13959,7 @@ function updateCrosscheckTool(repoRoot) {
     }
   };
 }
-function recommendPanelTool(providers, storage, bridge) {
+function recommendPanelTool(providers, storage) {
   return {
     name: "recommend_panel",
     description: "Recommend a minimal effective panel for a given purpose, based on historical usage_log + provider_stats. Cold-start falls back to the configured panel ordered by win-rate.",
@@ -14103,8 +13977,7 @@ function recommendPanelTool(providers, storage, bridge) {
     },
     handler: (args) => runRecommendPanel(args, {
       providers,
-      ...storage ? { storage } : {},
-      ...bridge ? { bridge } : {}
+      ...storage ? { storage } : {}
     })
   };
 }
@@ -14129,7 +14002,7 @@ function fetchTool(storage, fetchConfig, repoRoot) {
     })
   };
 }
-function delegateTool(providers, allowlist, storage, bridge, moderator) {
+function delegateTool(providers, allowlist, storage, moderator) {
   return {
     name: "delegate",
     description: "Run a delegable tool (confer | review) restricted to a single named provider, with explicit quota check. Records every attempt (accepted or refused) to the delegations table; quota in the response reflects counts AFTER the current call.",
@@ -14149,12 +14022,11 @@ function delegateTool(providers, allowlist, storage, bridge, moderator) {
       providers,
       allowlist,
       moderator,
-      ...storage ? { storage } : {},
-      ...bridge ? { bridge } : {}
+      ...storage ? { storage } : {}
     })
   };
 }
-function explainTool(storage, bridge, transcriptsDir) {
+function explainTool(storage, transcriptsDir) {
   return {
     name: "explain",
     description: "Replay a session as a navigable tree with cost/latency annotations. Reads usage_log + optionally walks the transcripts directory for per-tool summaries.",
@@ -14172,12 +14044,11 @@ function explainTool(storage, bridge, transcriptsDir) {
     },
     handler: (args) => runExplain(args, {
       ...storage ? { storage } : {},
-      ...bridge ? { bridge } : {},
       ...transcriptsDir ? { transcriptsDir } : {}
     })
   };
 }
-function scoreboardTool(storage, bridge, eventsPath) {
+function scoreboardTool(storage, eventsPath) {
   return {
     name: "scoreboard",
     description: "Aggregate provider ballot stats + delegation counts + table totals. Supports top_k (rank limit) and recent_limit (tail of events.jsonl when configured). Reads the engine's local stats database (auto-created at <data dir>/db.sqlite).",
@@ -14191,12 +14062,11 @@ function scoreboardTool(storage, bridge, eventsPath) {
     },
     handler: (args) => runScoreboard(args, {
       ...storage ? { storage } : {},
-      ...bridge ? { bridge } : {},
       ...eventsPath ? { eventsPath } : {}
     })
   };
 }
-function sessionMemoryTool(storage, bridge) {
+function sessionMemoryTool(storage) {
   return {
     name: "session_memory",
     description: "CRUD over the per-session working memory ledger. Actions: list, add, mark_stale, clear. Uses the engine's local database (auto-created at <data dir>/db.sqlite).",
@@ -14219,15 +14089,14 @@ function sessionMemoryTool(storage, bridge) {
       required: ["action", "session_id"]
     },
     handler: (args) => runSessionMemory(args, {
-      ...storage ? { storage } : {},
-      ...bridge ? { bridge } : {}
+      ...storage ? { storage } : {}
     })
   };
 }
-function recallTool(storage, bridge) {
+function recallTool(storage) {
   return {
     name: "recall",
-    description: "Full-text search across persisted transcripts via SQLite FTS5. Returns rows ordered by relevance with a windowed snippet. Requires a wired Storage adapter; falls back to the Python bridge when not available.",
+    description: "Full-text search across persisted transcripts via SQLite FTS5. Returns rows ordered by relevance with a windowed snippet. Requires a wired Storage adapter.",
     inputSchema: {
       type: "object",
       additionalProperties: true,
@@ -14241,8 +14110,7 @@ function recallTool(storage, bridge) {
       required: ["query"]
     },
     handler: (args) => runRecall(args, {
-      ...storage ? { storage } : {},
-      ...bridge ? { bridge } : {}
+      ...storage ? { storage } : {}
     })
   };
 }
@@ -14278,7 +14146,7 @@ function modelsTool(providers, activeProviders) {
     handler: async (args) => runModels(args, { providers, activeProviders })
   };
 }
-function reviewTool(providers, allowlist, bridge, storage, breakers, transcriptsDir, repoRoot) {
+function reviewTool(providers, allowlist, storage, breakers, transcriptsDir, repoRoot) {
   return {
     name: "review",
     description: "Have an LLM panel peer-review a code or proposal snippet. Returns the confer envelope (one answer per provider).",
@@ -14297,7 +14165,6 @@ function reviewTool(providers, allowlist, bridge, storage, breakers, transcripts
     handler: (args) => runReview(args, {
       providers,
       allowlist,
-      ...bridge ? { bridge } : {},
       ...storage ? { storage } : {},
       ...breakers ? { breakers } : {},
       ...transcriptsDir ? { transcriptsDir } : {},
@@ -14305,7 +14172,7 @@ function reviewTool(providers, allowlist, bridge, storage, breakers, transcripts
     })
   };
 }
-function critiqueTool(providers, allowlist, bridge, storage, breakers, transcriptsDir, repoRoot) {
+function critiqueTool(providers, allowlist, storage, breakers, transcriptsDir, repoRoot) {
   return {
     name: "critique",
     description: "Have each LLM panelist list the top weaknesses of a proposed answer or approach (severity-rated). Returns per-provider weakness lists + a merged list ordered by severity.",
@@ -14325,7 +14192,6 @@ function critiqueTool(providers, allowlist, bridge, storage, breakers, transcrip
     handler: (args) => runCritique(args, {
       providers,
       allowlist,
-      ...bridge ? { bridge } : {},
       ...storage ? { storage } : {},
       ...breakers ? { breakers } : {},
       ...transcriptsDir ? { transcriptsDir } : {},
@@ -14333,7 +14199,7 @@ function critiqueTool(providers, allowlist, bridge, storage, breakers, transcrip
     })
   };
 }
-function planTool(providers, allowlist, bridge, storage, breakers, transcriptsDir, repoRoot) {
+function planTool(providers, allowlist, storage, breakers, transcriptsDir, repoRoot) {
   return {
     name: "plan",
     description: 'Have an LLM panel debate a step-by-step plan for the stated goal under the given constraints. Returns the debate envelope with a moderator-synthesised plan. Defaults to `mode: "fast"` (2 rounds + early_stop) \u2014 set `mode: "thorough"` for 5 rounds without early_stop. Explicit `max_rounds` / `early_stop` / `early_stop_threshold` always override the mode preset. Use `structured: true` for schema-validated synthesis.',
@@ -14360,7 +14226,6 @@ function planTool(providers, allowlist, bridge, storage, breakers, transcriptsDi
     handler: (args) => runPlan(args, {
       providers,
       allowlist,
-      ...bridge ? { bridge } : {},
       ...storage ? { storage } : {},
       ...breakers ? { breakers } : {},
       ...transcriptsDir ? { transcriptsDir } : {},
@@ -14368,7 +14233,7 @@ function planTool(providers, allowlist, bridge, storage, breakers, transcriptsDi
     })
   };
 }
-function triangulateTool(providers, allowlist, bridge, storage, breakers, transcriptsDir, repoRoot) {
+function triangulateTool(providers, allowlist, storage, breakers, transcriptsDir, repoRoot) {
   return {
     name: "triangulate",
     description: "Run a coordinate flow and reshape the output as a consensus + minority report with per-provider weights. v1 uses 1.0 weights (matches a fresh provider_stats DB); future versions thread real win-rate weights when the DB layer ports.",
@@ -14389,7 +14254,6 @@ function triangulateTool(providers, allowlist, bridge, storage, breakers, transc
     handler: (args) => runTriangulate(args, {
       providers,
       allowlist,
-      ...bridge ? { bridge } : {},
       ...storage ? { storage } : {},
       ...breakers ? { breakers } : {},
       ...transcriptsDir ? { transcriptsDir } : {},
@@ -14397,7 +14261,7 @@ function triangulateTool(providers, allowlist, bridge, storage, breakers, transc
     })
   };
 }
-function coordinateTool(providers, allowlist, bridge, innerCallers, storage, breakers, transcriptsDir, repoRoot, workerToolsCfg) {
+function coordinateTool(providers, allowlist, innerCallers, storage, breakers, transcriptsDir, repoRoot, workerToolsCfg) {
   return {
     name: "coordinate",
     description: "Run a three-role coordination flow (proposer \u2192 critics \u2192 synthesizer) with structured output at every step. Native opts: untrusted_input (canary + neutralize), worker_tools (bounded ReAct on proposer + critic roles; synth never sees inner tools), inject_session_memory (storage-backed working-memory block prepended to the topic).",
@@ -14422,7 +14286,6 @@ function coordinateTool(providers, allowlist, bridge, innerCallers, storage, bre
     handler: (args) => runCoordinate(args, {
       providers,
       allowlist,
-      ...bridge ? { bridge } : {},
       innerCallers,
       ...storage ? { storage } : {},
       ...breakers ? { breakers } : {},
@@ -14432,7 +14295,7 @@ function coordinateTool(providers, allowlist, bridge, innerCallers, storage, bre
     })
   };
 }
-function debateTool(providers, allowlist, bridge, innerCallers, storage, pricing, breakers, transcriptsDir, repoRoot, workerToolsCfg) {
+function debateTool(providers, allowlist, innerCallers, storage, pricing, breakers, transcriptsDir, repoRoot, workerToolsCfg) {
   return {
     name: "debate",
     description: "Run a multi-round debate between LLM providers and synthesise the result via a moderator. Native opts: inject_session_memory, auto_panel, worker_tools, structured synthesis (schema-validated), extract_claims (final-round distillation), early_stop (post-round agreement check).",
@@ -14462,7 +14325,6 @@ function debateTool(providers, allowlist, bridge, innerCallers, storage, pricing
     handler: (args) => runDebate(args, {
       providers,
       allowlist,
-      ...bridge ? { bridge } : {},
       innerCallers,
       ...storage ? { storage } : {},
       ...pricing ? { pricing } : {},
@@ -14482,10 +14344,10 @@ function buildInnerCallers(o) {
       ...o.repoRoot ? { repoRoot: o.repoRoot } : {}
     });
   }
-  out.verify = (args) => runVerify(args, o.bridge, o.fetchConfig);
+  out.verify = (args) => runVerify(args, o.fetchConfig);
   return out;
 }
-function conferTool(providers, allowlist, bridge, moderator, pricing, storage, innerCallers, breakers, transcriptsDir, repoRoot, workerToolsCfg) {
+function conferTool(providers, allowlist, moderator, pricing, storage, innerCallers, breakers, transcriptsDir, repoRoot, workerToolsCfg) {
   return {
     name: "confer",
     description: "Ask a panel of LLM providers the same question; return one answer per provider. Native opts: untrusted_input (canary + neutralization), early_stop (cheap-tier agreement check after first 2 panelists when N>=3), extract_claims (cheap-tier extractor with per-provider support maps), inject_session_memory (storage-backed working-memory block prepended to the first user message), auto_panel (router-driven top-N panel pick), worker_tools (bounded ReAct loop per panelist when innerCallers are wired by the host).",
@@ -14512,7 +14374,6 @@ function conferTool(providers, allowlist, bridge, moderator, pricing, storage, i
     handler: (args) => runConfer(args, {
       providers,
       allowlist,
-      ...bridge ? { bridge } : {},
       moderator,
       ...pricing ? { pricing } : {},
       ...storage ? { storage } : {},
@@ -14524,7 +14385,7 @@ function conferTool(providers, allowlist, bridge, moderator, pricing, storage, i
     })
   };
 }
-function auditTool(providers, allowlist, bridge, transcriptsDir, pricing, storage, breakers, repoRoot) {
+function auditTool(providers, allowlist, transcriptsDir, pricing, storage, breakers, repoRoot) {
   return {
     name: "audit",
     description: "Score a piece of output against an audit rubric. Single-judge by default; coalesce-mode (multi-judge consensus) and panel-exhausted self-audit run natively. cheap_mode picks the cheapest 'med'-tier model as auditor when a pricing.json is wired. session_id-only inputs load the latest transcript automatically when a transcripts directory is wired.",
@@ -14550,7 +14411,6 @@ function auditTool(providers, allowlist, bridge, transcriptsDir, pricing, storag
     handler: (args) => runAudit(args, {
       providers,
       allowlist,
-      ...bridge ? { bridge } : {},
       ...transcriptsDir ? { transcriptsDir } : {},
       ...pricing ? { pricing } : {},
       ...storage ? { storage } : {},
@@ -14614,7 +14474,7 @@ function pickTool(providers, allowlist, storage, breakers, transcriptsDir, repoR
     })
   };
 }
-function verifyTool(bridge, fetchConfig) {
+function verifyTool(fetchConfig) {
   return {
     name: "verify",
     description: "Run a list of deterministic property checks against caller-supplied data. No LLM calls; everything is local. Returns per-check {passed, reason} plus all_passed / summary / timing fields. Supports the text kinds (contains, not_contains, regex_match, contains_any, contains_all, min_length), shell (sandboxed subprocess with timeout + Unix pgid isolation), and url_head (HEAD request gated by fetch.url_allowlist). All kinds run natively.",
@@ -14632,7 +14492,7 @@ function verifyTool(bridge, fetchConfig) {
       },
       required: ["checks"]
     },
-    handler: (args) => runVerify(args, bridge, fetchConfig)
+    handler: (args) => runVerify(args, fetchConfig)
   };
 }
 function pingTool() {
@@ -14964,10 +14824,12 @@ function canonicalEventBody(e) {
     e.status,
     e.errorClass ?? ""
   ].join("|");
-  if (e.runId === void 0 && e.purpose === void 0 && e.fingerprint === void 0) {
-    return base;
-  }
-  return [base, e.runId ?? "", e.purpose ?? "", e.fingerprint ?? ""].join("|");
+  const hasV2 = e.runId !== void 0 || e.purpose !== void 0 || e.fingerprint !== void 0;
+  const hasV3 = e.sessionId !== void 0;
+  if (!hasV2 && !hasV3) return base;
+  const parts = [base, e.runId ?? "", e.purpose ?? "", e.fingerprint ?? ""];
+  if (hasV3) parts.push(e.sessionId ?? "");
+  return parts.join("|");
 }
 function normalizePurpose(v) {
   if (typeof v !== "string") return void 0;
@@ -15085,7 +14947,7 @@ function scheduleFlush() {
   }, FLUSH_INTERVAL_MS);
   if (typeof flushTimer.unref === "function") flushTimer.unref();
 }
-function enqueue(cfg2, input, runId, fingerprint) {
+function enqueue(cfg2, input, runId, fingerprint, sessionId) {
   const base = {
     eventId: crypto4.randomUUID(),
     seatId: cfg2.seatId,
@@ -15104,6 +14966,7 @@ function enqueue(cfg2, input, runId, fingerprint) {
     // omitting keeps the JSON honest about what we actually know.
     ...input.errorClass === void 0 ? {} : { errorClass: input.errorClass },
     runId,
+    sessionId,
     // Omit entirely (not "") when unknown, so the canonical body stays
     // consistent with what the server reconstructs from the JSON.
     ...input.purpose === void 0 ? {} : { purpose: input.purpose },
@@ -15118,15 +14981,23 @@ function enqueue(cfg2, input, runId, fingerprint) {
   if (queue.length >= FLUSH_BATCH_AT) void flush();
   else scheduleFlush();
 }
+function sessionIdFromEnvelope(out) {
+  if (!out || typeof out !== "object") return null;
+  const rs = out["run_summary"];
+  if (!rs || typeof rs !== "object") return null;
+  const v = rs["session_id"];
+  return typeof v === "string" && v.trim().length > 0 ? v : null;
+}
 function recordUsage(out, toolName) {
   try {
     const cfg2 = getConfig2();
     if (!cfg2) return;
     if (toolName === "update_crosscheck") return;
     const runId = crypto4.randomUUID();
+    const sessionId = resolveSessionId(sessionIdFromEnvelope(out));
     const fingerprint = currentFingerprint();
     for (const ev of usageEventsFromEnvelope(out, toolName)) {
-      enqueue(cfg2, ev, runId, fingerprint);
+      enqueue(cfg2, ev, runId, fingerprint, sessionId);
     }
   } catch {
   }
@@ -15233,7 +15104,7 @@ function createServer(opts = {}) {
       throw new Error(`unknown tool: ${name}`);
     }
     const args = req.params.arguments ?? {};
-    const startedAt = (/* @__PURE__ */ new Date()).toISOString();
+    const startedAt2 = (/* @__PURE__ */ new Date()).toISOString();
     const startedHr = process.hrtime.bigint();
     const id = nextEventId();
     syncSegment(opts.repoRoot);
@@ -15247,7 +15118,7 @@ function createServer(opts = {}) {
         event: "tool_invoke",
         id,
         tool: name,
-        started_at: startedAt,
+        started_at: startedAt2,
         duration_ms: 0,
         status: "ok",
         args_keys: topLevelKeys(args),
@@ -15281,7 +15152,7 @@ function createServer(opts = {}) {
         event: "tool_invoke",
         id,
         tool: name,
-        started_at: startedAt,
+        started_at: startedAt2,
         duration_ms: durationMs,
         status: "ok",
         args_keys: topLevelKeys(args),
@@ -15303,7 +15174,7 @@ function createServer(opts = {}) {
         event: "tool_invoke",
         id,
         tool: name,
-        started_at: startedAt,
+        started_at: startedAt2,
         duration_ms: durationMs,
         status: "error",
         args_keys: topLevelKeys(args),
@@ -15334,7 +15205,6 @@ async function connectAndServe(transport, opts = {}) {
 }
 function buildToolRegistry(opts) {
   const registerOpts = {};
-  if (opts.bridge) registerOpts.bridge = opts.bridge;
   if (opts.providers) registerOpts.providers = opts.providers;
   if (opts.providerAllowlist !== void 0)
     registerOpts.providerAllowlist = opts.providerAllowlist;
@@ -15351,13 +15221,7 @@ function buildToolRegistry(opts) {
   if (opts.moderatorDefault) registerOpts.moderatorDefault = opts.moderatorDefault;
   if (opts.benchGoldensDir) registerOpts.benchGoldensDir = opts.benchGoldensDir;
   if (opts.eventsPath) registerOpts.eventsPath = opts.eventsPath;
-  const tools = registerCoreTools(registerOpts);
-  if (!opts.bridge) return tools;
-  const proxies = buildPythonProxies(opts.bridge);
-  for (const [name, proxy] of proxies) {
-    if (!tools.has(name)) tools.set(name, proxy);
-  }
-  return tools;
+  return registerCoreTools(registerOpts);
 }
 
 // src/core/config-file.ts
@@ -15532,14 +15396,39 @@ function loadConfigFile(opts) {
   return mapConfig(obj, file);
 }
 
+// src/core/process-registry.ts
+init_esm_shims();
+import { mkdirSync as mkdirSync10, readdirSync as readdirSync5, readFileSync as readFileSync16, rmSync, writeFileSync as writeFileSync9 } from "fs";
+import os2 from "os";
+import path15 from "path";
+function registryDir(env = process.env) {
+  const base = env["CROSSCHECK_DATA_DIR"] || path15.join(env["HOME"] ?? env["USERPROFILE"] ?? os2.homedir(), ".crosscheck");
+  return path15.join(base, "procs");
+}
+function registerProcess(rec, env = process.env) {
+  try {
+    const dir = registryDir(env);
+    mkdirSync10(dir, { recursive: true, mode: 448 });
+    writeFileSync9(path15.join(dir, `${rec.pid}.json`), JSON.stringify(rec), { mode: 384 });
+  } catch {
+  }
+}
+function unregisterProcess(pid = process.pid, env = process.env) {
+  try {
+    rmSync(path15.join(registryDir(env), `${pid}.json`), { force: true });
+  } catch {
+  }
+}
+
 // src/entrypoints/node-stdio.ts
+var HERE = typeof __dirname !== "undefined" ? __dirname : path16.dirname(fileURLToPath3(import.meta.url));
 var SHUTDOWN_TIMEOUT_MS = 2e3;
 async function main() {
   enforceLicenseOrExit();
-  const cfgDataDir = process.env["CROSSCHECK_DATA_DIR"] || path15.join(process.env["HOME"] ?? process.env["USERPROFILE"] ?? "", ".crosscheck");
+  const cfgDataDir = process.env["CROSSCHECK_DATA_DIR"] || path16.join(process.env["HOME"] ?? process.env["USERPROFILE"] ?? "", ".crosscheck");
   const configFile = loadConfigFile({
     startDir: process.cwd(),
-    repoRoot: findGitRoot(__dirname),
+    repoRoot: findGitRoot(HERE),
     dataDir: cfgDataDir
   });
   if (configFile) {
@@ -15553,15 +15442,17 @@ async function main() {
 `);
   }
   setEventEmitter(buildDefaultEmitter(process.env));
-  if (process.env["CROSSCHECK_BRIDGE_PYTHON"] === "1") {
-    process.stderr.write(
-      "crosscheck-agent: CROSSCHECK_BRIDGE_PYTHON is deprecated and ignored \u2014 the engine is native-only.\n"
-    );
-  }
   installShutdownHandlers();
+  registerProcess({
+    pid: process.pid,
+    version: SERVER_VERSION,
+    startedAt: Date.now(),
+    ppid: process.ppid,
+    sessionId: engineSessionId()
+  });
   const bundledPricing = (() => {
     try {
-      return path15.join(path15.dirname(fileURLToPath3(import.meta.url)), "pricing.json");
+      return path16.join(path16.dirname(fileURLToPath3(import.meta.url)), "pricing.json");
     } catch {
       return void 0;
     }
@@ -15588,10 +15479,10 @@ async function main() {
   }
   let storage;
   if (process.env["CROSSCHECK_DB_DISABLED"] !== "1") {
-    const dbPath = process.env["CROSSCHECK_DB_PATH"] ?? resolveRepoFile(".crosscheck/db.sqlite") ?? path15.join(cfgDataDir, "db.sqlite");
+    const dbPath = process.env["CROSSCHECK_DB_PATH"] ?? resolveRepoFile(".crosscheck/db.sqlite") ?? path16.join(cfgDataDir, "db.sqlite");
     if (dbPath) {
       try {
-        mkdirSync10(path15.dirname(dbPath), { recursive: true });
+        mkdirSync11(path16.dirname(dbPath), { recursive: true });
         const { openBetterSqliteStorage: openBetterSqliteStorage2 } = await Promise.resolve().then(() => (init_better_sqlite3(), better_sqlite3_exports));
         storage = openBetterSqliteStorage2({ path: dbPath });
         await storage.migrate();
@@ -15609,7 +15500,7 @@ async function main() {
     }
   }
   const transcriptsDir = configFile?.logTranscripts === false ? void 0 : process.env["CROSSCHECK_TRANSCRIPTS_DIR"] ?? configFile?.transcriptsDir ?? resolveRepoFile(".crosscheck/transcripts");
-  const repoRoot = process.env["CROSSCHECK_REPO_ROOT"] ?? findGitRoot(__dirname);
+  const repoRoot = process.env["CROSSCHECK_REPO_ROOT"] ?? findGitRoot(HERE);
   const transport = new StdioServerTransport();
   const serverOpts = { providers };
   if (storage) serverOpts.storage = storage;
@@ -15639,6 +15530,7 @@ function installShutdownHandlers() {
       new Promise((resolve2) => setTimeout(resolve2, SHUTDOWN_TIMEOUT_MS))
     ]).catch(() => {
     });
+    unregisterProcess();
     process.stderr.write(`crosscheck-agent: shutdown (${reason})
 `);
     process.exit(0);
@@ -15657,11 +15549,11 @@ function installShutdownHandlers() {
   });
 }
 function resolveRepoFile(rel) {
-  let dir = __dirname;
+  let dir = HERE;
   for (let i = 0; i < 8; i++) {
-    const candidate = path15.join(dir, rel);
+    const candidate = path16.join(dir, rel);
     if (existsSync14(candidate)) return candidate;
-    const parent = path15.dirname(dir);
+    const parent = path16.dirname(dir);
     if (parent === dir) break;
     dir = parent;
   }
@@ -15670,8 +15562,8 @@ function resolveRepoFile(rel) {
 function findGitRoot(startDir) {
   let dir = startDir;
   for (let i = 0; i < 12; i++) {
-    if (existsSync14(path15.join(dir, ".git"))) return dir;
-    const parent = path15.dirname(dir);
+    if (existsSync14(path16.join(dir, ".git"))) return dir;
+    const parent = path16.dirname(dir);
     if (parent === dir) break;
     dir = parent;
   }
@@ -15681,7 +15573,7 @@ var isMainEntry = (() => {
   try {
     const argv1 = process.argv[1];
     if (!argv1) return false;
-    return /(?:\/|\\)node-stdio\.(?:js|cjs|mjs)$/.test(argv1);
+    return /(?:\/|\\)node-stdio\.(?:js|cjs|mjs|ts)$/.test(argv1);
   } catch {
     return false;
   }