@bman654/clodex 2.1.8 → 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.8",
+  version: "2.1.9",
   publishConfig: {
     access: "public"
   },
@@ -4523,20 +4523,28 @@ 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) {
+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;
@@ -5156,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;
@@ -5318,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;