@bman654/clodex 2.1.6 → 2.1.8

package/dist/cli.js

@@ -217,7 +217,7 @@ import { join } from "path";
 // package.json
 var package_default = {
   name: "@bman654/clodex",
-  version: "2.1.6",
+  version: "2.1.8",
   publishConfig: {
     access: "public"
   },
@@ -4406,6 +4406,10 @@ function normalizeToolCallJson(value) {
     } catch {
     }
   }
+  if (record.type === "reasoning") {
+    if (Array.isArray(record.content) && record.content.length === 0) delete out.content;
+    if (typeof record.encrypted_content === "string" && record.encrypted_content) delete out.summary;
+  }
   return out;
 }
 function arraysEqual(left, right) {
@@ -4421,7 +4425,66 @@ function conversationItemKind(value) {
 function conversationItemHash(value) {
   return createHash3("sha256").update(canonicalJson(normalizeToolCallJson(value))).digest("hex").slice(0, 16);
 }
-function continuationMismatchDetails(entry, payload) {
+function reasoningNormalizationGap(expected, actual) {
+  if (conversationItemKind(expected) !== "reasoning" || conversationItemKind(actual) !== "reasoning") return void 0;
+  const left = expected;
+  const right = actual;
+  const blob = left.encrypted_content;
+  if (typeof blob !== "string" || !blob || blob !== right.encrypted_content) return void 0;
+  const normalizedLeft = normalizeToolCallJson(left);
+  const normalizedRight = normalizeToolCallJson(right);
+  const fields = [.../* @__PURE__ */ new Set([...Object.keys(normalizedLeft), ...Object.keys(normalizedRight)])].sort().filter((key) => canonicalJson(normalizedLeft[key]) !== canonicalJson(normalizedRight[key]));
+  return fields.length ? fields : void 0;
+}
+function reasoningGapShape(expected, actual, full, storedTail, index) {
+  const describe = (value) => {
+    const record = value ?? {};
+    return {
+      keys: Object.keys(record).sort(),
+      summaryParts: Array.isArray(record.summary) ? record.summary.length : 0,
+      contentItems: Array.isArray(record.content) ? record.content.length : 0
+    };
+  };
+  const blob = expected.encrypted_content;
+  const runFrom = (items, start) => {
+    let count = 0;
+    for (let at = start; at < items.length; at += 1) {
+      const item = items[at];
+      if (conversationItemKind(item) !== "reasoning" || item?.encrypted_content !== blob) break;
+      count += 1;
+    }
+    return count;
+  };
+  const storedStart = storedTail.findIndex((item) => item?.encrypted_content === blob);
+  return {
+    expected: describe(expected),
+    actual: describe(actual),
+    clientReasoningRun: runFrom(full, index),
+    storedReasoningRun: storedStart < 0 ? 0 : runFrom(storedTail, storedStart)
+  };
+}
+var warnedReasoningGaps = /* @__PURE__ */ new Set();
+var MAX_REASONING_GAP_WARNINGS = 3;
+function warnReasoningNormalizationGap(fields, log12) {
+  const signature = fields.join(",");
+  const message = `clodex: warning: a reasoning item with identical encrypted_content failed the continuation match on field(s): ${signature}. Prompt caching is degraded for this turn \u2014 this is a clodex normalization gap, please report it at https://github.com/bman654/clodex/issues`;
+  try {
+    log12?.(`reasoning normalization gap: ${signature}`);
+  } catch {
+  }
+  if (warnedReasoningGaps.has(signature)) return;
+  if (warnedReasoningGaps.size >= MAX_REASONING_GAP_WARNINGS) return;
+  warnedReasoningGaps.add(signature);
+  try {
+    process.stderr.write(`${message}
+`);
+    if (warnedReasoningGaps.size === MAX_REASONING_GAP_WARNINGS) {
+      process.stderr.write("clodex: warning: further reasoning-normalization warnings suppressed.\n");
+    }
+  } catch {
+  }
+}
+function continuationMismatchDetails(entry, payload, log12, warnOnGap = false) {
   const full = inputArray(payload);
   const prefix = [...entry.requestInput ?? [], ...entry.expectedAssistant ?? []];
   const comparable = Math.min(full.length, prefix.length);
@@ -4434,6 +4497,8 @@ function continuationMismatchDetails(entry, payload) {
   }
   const expected = mismatch < prefix.length ? prefix[mismatch] : void 0;
   const actual = mismatch < full.length ? full[mismatch] : void 0;
+  const reasoningGap = reasoningNormalizationGap(expected, actual);
+  if (reasoningGap && warnOnGap) warnReasoningNormalizationGap(reasoningGap, log12);
   return {
     fullItems: full.length,
     expectedPrefixItems: prefix.length,
@@ -4441,11 +4506,21 @@ function continuationMismatchDetails(entry, payload) {
     expectedKind: expected === void 0 ? "none" : conversationItemKind(expected),
     actualKind: actual === void 0 ? "none" : conversationItemKind(actual),
     ...expected !== void 0 ? { expectedHash: conversationItemHash(expected) } : {},
-    ...actual !== void 0 ? { actualHash: conversationItemHash(actual) } : {}
+    ...actual !== void 0 ? { actualHash: conversationItemHash(actual) } : {},
+    ...reasoningGap ? {
+      reasoningNormalizationGap: reasoningGap,
+      reasoningGapShape: reasoningGapShape(
+        expected,
+        actual,
+        full,
+        entry.expectedAssistant ?? [],
+        mismatch
+      )
+    } : {}
   };
 }
-function continuationMismatchSummary(entry, payload) {
-  const details = continuationMismatchDetails(entry, payload);
+function continuationMismatchSummary(entry, payload, log12) {
+  const details = continuationMismatchDetails(entry, payload, log12, true);
   return `full_items=${details.fullItems} expected_prefix_items=${details.expectedPrefixItems} first_mismatch=${details.firstMismatch} expected=${details.expectedKind} actual=${details.actualKind}`;
 }
 function continuationMatch(entry, payload) {
@@ -5188,6 +5263,19 @@ function createConnection(WebSocket, wsUrl, headers, persistent, key, options, d
   });
   return entry;
 }
+function envConnectionCap(name, log12) {
+  const raw = process.env[name];
+  if (raw === void 0 || raw.trim() === "") return void 0;
+  const value = Number(raw.trim());
+  if (!Number.isInteger(value) || value < 1 || value > 1024) {
+    try {
+      log12?.(`ws: ignoring ${name}=${raw} (expected an integer between 1 and 1024)`);
+    } catch {
+    }
+    return void 0;
+  }
+  return value;
+}
 function createResponsesWebSocketFetch(wsUrl, log12, options = {}) {
   const debug = (message) => {
     try {
@@ -5199,8 +5287,8 @@ function createResponsesWebSocketFetch(wsUrl, log12, options = {}) {
     hardTtlMs: options.hardTtlMs ?? RESPONSES_WS_HARD_TTL_MS,
     idleTtlMs: options.idleTtlMs ?? RESPONSES_WS_IDLE_TTL_MS,
     nurseryIdleTtlMs: options.nurseryIdleTtlMs ?? Math.min(RESPONSES_WS_NURSERY_IDLE_TTL_MS, options.idleTtlMs ?? RESPONSES_WS_IDLE_TTL_MS),
-    maxConnections: options.maxConnections ?? RESPONSES_WS_MAX_CONNECTIONS,
-    maxNurseryConnections: options.maxNurseryConnections ?? RESPONSES_WS_MAX_NURSERY_CONNECTIONS,
+    maxConnections: options.maxConnections ?? envConnectionCap("CLODEX_WS_MAX_CONNECTIONS", log12) ?? RESPONSES_WS_MAX_CONNECTIONS,
+    maxNurseryConnections: options.maxNurseryConnections ?? envConnectionCap("CLODEX_WS_MAX_NURSERY_CONNECTIONS", log12) ?? RESPONSES_WS_MAX_NURSERY_CONNECTIONS,
     now: options.now ?? Date.now
   };
   return async (_input, init) => {
@@ -5272,7 +5360,7 @@ function createResponsesWebSocketFetch(wsUrl, log12, options = {}) {
       debug("parallel request using an isolated socket");
     } else if (diagnosticEntry) {
       debug(
-        `history mismatch starting an additional chain; retained ${candidates.length} existing head(s) (${continuationMismatchSummary(diagnosticEntry, payload)})`
+        `history mismatch starting an additional chain; retained ${candidates.length} existing head(s) (${continuationMismatchSummary(diagnosticEntry, payload, debug)})`
       );
       decision = "history_mismatch_new_head";
     } else if (partitionKey) {
@@ -5332,7 +5420,7 @@ function createResponsesWebSocketFetch(wsUrl, log12, options = {}) {
         ttlPausedMs: entry.ttlPausedMs,
         idleMs: Math.max(0, now - entry.lastUsedAt),
         promptChanges: changedPromptFields(entry.promptFieldHashes, promptFieldHashes),
-        mismatch: continuationMismatchDetails(entry, payload)
+        mismatch: continuationMismatchDetails(entry, payload, debug)
       })),
       evictions
     }, diagnosticCorrelation);