@bman654/clodex 2.1.7 → 2.1.9

package/dist/cli.js

@@ -217,7 +217,7 @@ import { join } from "path";
 // package.json
 var package_default = {
   name: "@bman654/clodex",
-  version: "2.1.7",
+  version: "2.1.9",
   publishConfig: {
     access: "public"
   },
@@ -4406,8 +4406,9 @@ function normalizeToolCallJson(value) {
     } catch {
     }
   }
-  if (record.type === "reasoning" && Array.isArray(record.content) && record.content.length === 0) {
-    delete out.content;
+  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;
 }
@@ -4430,9 +4431,38 @@ function reasoningNormalizationGap(expected, actual) {
   const right = actual;
   const blob = left.encrypted_content;
   if (typeof blob !== "string" || !blob || blob !== right.encrypted_content) return void 0;
-  const fields = [.../* @__PURE__ */ new Set([...Object.keys(left), ...Object.keys(right)])].sort().filter((key) => canonicalJson(normalizeToolCallJson(left[key])) !== canonicalJson(normalizeToolCallJson(right[key])));
+  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) {
@@ -4454,7 +4484,7 @@ function warnReasoningNormalizationGap(fields, log12) {
   } catch {
   }
 }
-function continuationMismatchDetails(entry, payload, log12) {
+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);
@@ -4468,7 +4498,7 @@ function continuationMismatchDetails(entry, payload, log12) {
   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) warnReasoningNormalizationGap(reasoningGap, log12);
+  if (reasoningGap && warnOnGap) warnReasoningNormalizationGap(reasoningGap, log12);
   return {
     fullItems: full.length,
     expectedPrefixItems: prefix.length,
@@ -4477,27 +4507,44 @@ function continuationMismatchDetails(entry, payload, log12) {
     actualKind: actual === void 0 ? "none" : conversationItemKind(actual),
     ...expected !== void 0 ? { expectedHash: conversationItemHash(expected) } : {},
     ...actual !== void 0 ? { actualHash: conversationItemHash(actual) } : {},
-    ...reasoningGap ? { reasoningNormalizationGap: reasoningGap } : {}
+    ...reasoningGap ? {
+      reasoningNormalizationGap: reasoningGap,
+      reasoningGapShape: reasoningGapShape(
+        expected,
+        actual,
+        full,
+        entry.expectedAssistant ?? [],
+        mismatch
+      )
+    } : {}
   };
 }
 function continuationMismatchSummary(entry, payload, log12) {
-  const details = continuationMismatchDetails(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) {
+function canonicalItemStrings(items) {
+  return items.map((item) => canonicalJson(normalizeToolCallJson([item])));
+}
+function isStrictPrefix(head, client) {
+  if (client.length <= head.length) return false;
+  for (let index = 0; index < head.length; index += 1) {
+    if (head[index] !== client[index]) return false;
+  }
+  return true;
+}
+function continuationMatch(entry, payload, clientItems) {
   if (!entry.responseId || !entry.requestInput || !entry.expectedAssistant) return void 0;
   const full = inputArray(payload);
-  const exactPrefix = [...entry.requestInput, ...entry.expectedAssistant];
-  if (full.length > exactPrefix.length && arraysEqual(full.slice(0, exactPrefix.length), exactPrefix)) {
-    return { delta: full.slice(exactPrefix.length), mode: "exact" };
+  entry.canonicalPrefix ??= canonicalItemStrings([...entry.requestInput, ...entry.expectedAssistant]);
+  if (isStrictPrefix(entry.canonicalPrefix, clientItems)) {
+    return { delta: full.slice(entry.canonicalPrefix.length), mode: "exact" };
   }
   const echoedAssistant = entry.expectedAssistant.filter((item) => conversationItemKind(item) !== "reasoning");
   if (echoedAssistant.length === entry.expectedAssistant.length) return void 0;
-  const echoablePrefix = [...entry.requestInput, ...echoedAssistant];
-  if (full.length <= echoablePrefix.length || !arraysEqual(full.slice(0, echoablePrefix.length), echoablePrefix)) {
-    return void 0;
-  }
-  return { delta: full.slice(echoablePrefix.length), mode: "omitted_reasoning" };
+  entry.canonicalEchoablePrefix ??= canonicalItemStrings([...entry.requestInput, ...echoedAssistant]);
+  if (!isStrictPrefix(entry.canonicalEchoablePrefix, clientItems)) return void 0;
+  return { delta: full.slice(entry.canonicalEchoablePrefix.length), mode: "omitted_reasoning" };
 }
 function eventType(event) {
   return event && typeof event === "object" && typeof event.type === "string" ? event.type : void 0;
@@ -5117,6 +5164,8 @@ function handleSocketMessage(entry, data) {
       entry.responseId = ctx.responseId;
       entry.requestInput = inputArray(ctx.originalPayload);
       entry.expectedAssistant = expectedAssistantItems(ctx);
+      entry.canonicalPrefix = void 0;
+      entry.canonicalEchoablePrefix = void 0;
       entry.promptFieldHashes = ctx.promptFieldHashes;
       entry.instructionsSnapshot = ctx.instructionsSnapshot;
       entry.lastUsedAt = now;
@@ -5224,6 +5273,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 {
@@ -5235,8 +5297,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) => {
@@ -5266,7 +5328,8 @@ function createResponsesWebSocketFetch(wsUrl, log12, options = {}) {
     const evictions = cleanupExpiredConnections(now);
     const candidates = partitionKey ? connectionEntries(partitionKey) : [];
     const idleCandidates = candidates.filter((entry) => !entry.inFlight);
-    const matches = idleCandidates.map((entry) => ({ entry, match: continuationMatch(entry, payload) })).filter((candidate) => candidate.match !== void 0).sort((left, right) => left.match.delta.length - right.match.delta.length || (left.match.mode === right.match.mode ? 0 : left.match.mode === "exact" ? -1 : 1));
+    const clientItems = idleCandidates.length ? canonicalItemStrings(inputArray(payload)) : [];
+    const matches = idleCandidates.map((entry) => ({ entry, match: continuationMatch(entry, payload, clientItems) })).filter((candidate) => candidate.match !== void 0).sort((left, right) => left.match.delta.length - right.match.delta.length || (left.match.mode === right.match.mode ? 0 : left.match.mode === "exact" ? -1 : 1));
     let selected = matches[0]?.entry;
     const selectedMatch = matches[0]?.match;
     const selectedDelta = selectedMatch?.delta;