@bman654/clodex 2.2.0 → 2.2.2

package/dist/cli.js

@@ -218,7 +218,7 @@ import { join } from "path";
 // package.json
 var package_default = {
   name: "@bman654/clodex",
-  version: "2.2.0",
+  version: "2.2.2",
   publishConfig: {
     access: "public"
   },
@@ -4237,6 +4237,17 @@ function sanitizeMessage(message) {
   return line;
 }
 
+// src/tool-input-sanitize.ts
+function sanitizeToolInput(input, requiredProps) {
+  const out = /* @__PURE__ */ Object.create(null);
+  for (const [k, v] of Object.entries(input)) {
+    if (v === null) continue;
+    if (Array.isArray(v) && v.length === 0 && !requiredProps?.has(k)) continue;
+    out[k] = v;
+  }
+  return out;
+}
+
 // src/oauth/responses-websocket.ts
 var RESPONSES_LITE_HEADER = "x-openai-internal-codex-responses-lite";
 var TERMINAL_EVENT_TYPES = /* @__PURE__ */ new Set(["response.completed", "response.failed", "response.incomplete"]);
@@ -4520,9 +4531,27 @@ function continuationMismatchDetails(entry, payload, log12, warnOnGap = false) {
     } : {}
   };
 }
-function continuationMismatchSummary(entry, payload, log12) {
+function continuationMismatchSummary(entry, payload, log12, mismatchDump = false) {
   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}`;
+  let summary = `full_items=${details.fullItems} expected_prefix_items=${details.expectedPrefixItems} first_mismatch=${details.firstMismatch} expected=${details.expectedKind} actual=${details.actualKind}`;
+  if (details.expectedHash || details.actualHash) {
+    summary += ` expected_hash=${details.expectedHash ?? "none"} actual_hash=${details.actualHash ?? "none"}`;
+    if (mismatchDump && log12) {
+      const full = inputArray(payload);
+      const prefix = [...entry.requestInput ?? [], ...entry.expectedAssistant ?? []];
+      const index = details.firstMismatch;
+      log12(`mismatch dump expected[${index}]: ${mismatchDumpLine(prefix, index)}`);
+      log12(`mismatch dump actual[${index}]: ${mismatchDumpLine(full, index)}`);
+    }
+  }
+  return summary;
+}
+function mismatchDumpLine(items, index) {
+  if (index >= items.length) return "(absent)";
+  const line = canonicalJson(normalizeToolCallJson(items[index]));
+  const max = 2e3;
+  const marker = " [truncated]";
+  return line.length <= max ? line : line.slice(0, max - marker.length) + marker;
 }
 function canonicalItemStrings(items) {
   return items.map((item) => canonicalJson(normalizeToolCallJson([item])));
@@ -4831,8 +4860,42 @@ function withoutEphemeralFields(item) {
   }
   return out;
 }
+function requiredToolProps(payload) {
+  const map = /* @__PURE__ */ new Map();
+  const add = (tool3) => {
+    if (!tool3 || typeof tool3 !== "object") return;
+    const record = tool3;
+    if (record.type === "namespace" && Array.isArray(record.tools)) {
+      for (const nested of record.tools) add(nested);
+      return;
+    }
+    if (record.type !== "function" || typeof record.name !== "string") return;
+    const parameters = record.parameters;
+    const required = parameters && typeof parameters === "object" && Array.isArray(parameters.required) ? parameters.required : [];
+    map.set(record.name, new Set(required.filter((p13) => typeof p13 === "string")));
+  };
+  if (Array.isArray(payload.tools)) for (const tool3 of payload.tools) add(tool3);
+  return map;
+}
+function sanitizedCallArguments(item, requiredProps) {
+  if (typeof item.arguments !== "string") return item;
+  const raw = item.arguments.trim();
+  let parsed;
+  try {
+    parsed = raw === "" ? {} : JSON.parse(raw);
+  } catch {
+    return item;
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return item;
+  const required = requiredProps.get(typeof item.name === "string" ? item.name : "");
+  return {
+    ...item,
+    arguments: JSON.stringify(sanitizeToolInput(parsed, required))
+  };
+}
 function expectedAssistantItems(ctx) {
   const output = [];
+  const requiredProps = requiredToolProps(ctx.originalPayload);
   for (const [, accumulator] of [...ctx.outputByIndex.entries()].sort(([left], [right]) => left - right)) {
     const done = accumulator.done ?? {};
     const type = accumulator.type ?? (typeof done.type === "string" ? done.type : void 0);
@@ -4847,7 +4910,11 @@ function expectedAssistantItems(ctx) {
       output.push({ ...withoutEphemeralFields(done), type: "reasoning", summary });
       continue;
     }
-    if (type === "function_call" || type === "custom_tool_call") {
+    if (type === "function_call") {
+      output.push({ ...sanitizedCallArguments(withoutEphemeralFields(done), requiredProps), type });
+      continue;
+    }
+    if (type === "custom_tool_call") {
       output.push({ ...withoutEphemeralFields(done), type });
     }
   }
@@ -5294,6 +5361,7 @@ function createResponsesWebSocketFetch(wsUrl, log12, options = {}) {
     } catch {
     }
   };
+  const mismatchDump = process.env.CLODEX_MISMATCH_DUMP === "1";
   const resolvedOptions = {
     hardTtlMs: options.hardTtlMs ?? RESPONSES_WS_HARD_TTL_MS,
     idleTtlMs: options.idleTtlMs ?? RESPONSES_WS_IDLE_TTL_MS,
@@ -5372,7 +5440,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, debug)})`
+        `history mismatch starting an additional chain; retained ${candidates.length} existing head(s) (${continuationMismatchSummary(diagnosticEntry, payload, debug, mismatchDump)})`
       );
       decision = "history_mismatch_new_head";
     } else if (partitionKey) {
@@ -10035,15 +10103,6 @@ function translateMessages(messages, npm, openAiPromptCacheBreakpoints = false)
   }
   return out;
 }
-function sanitizeToolInput(input, requiredProps) {
-  const out = {};
-  for (const [k, v] of Object.entries(input)) {
-    if (v === null) continue;
-    if (Array.isArray(v) && v.length === 0 && !requiredProps?.has(k)) continue;
-    out[k] = v;
-  }
-  return out;
-}
 function toolRequiredProps(tools) {
   const map = /* @__PURE__ */ new Map();
   for (const [name, t] of Object.entries(tools ?? {})) {
@@ -14251,7 +14310,7 @@ function captureBuiltInPatchProofs(source, config, results) {
   };
   addPattern(
     "PATCH 1: Agent tool model enum",
-    /\.enum\(\["sonnet","opus","haiku"(?:,"[^"]+")*\]\)\.optional\(\)\.describe\(/
+    /(?:\.enum|model:[A-Za-z_$][\w$]*)\(\["sonnet","opus","haiku"(?:,"[^"]+")*\]\)\.optional\(\)\.describe\(/
   );
   addPattern(
     "PATCH 3: known-alias validator list",
@@ -14464,7 +14523,7 @@ function collectPristineFacts(args) {
 }
 
 // src/patch-transforms.ts
-var PATCH_TRANSFORMS_VERSION = 2;
+var PATCH_TRANSFORMS_VERSION = 3;
 var NATIVE_EFFORT_LEVELS = ["low", "medium", "high", "xhigh", "max"];
 var BASE_EFFORT_LEVELS = ["low", "medium", "high"];
 function projectNativeEffort(effort) {
@@ -14610,8 +14669,8 @@ function applyClodexPatches(source, config) {
   }
   applyOnce(
     "PATCH 1: Agent tool model enum",
-    /\.enum\((\["sonnet","opus","haiku"(?:,"[^"]+")*\])\)\.optional\(\)\.describe\(/,
-    (_m, arr) => ".enum(" + extendAliasArray(arr) + ").optional().describe(",
+    /((?:\.enum|model:[A-Za-z_$][\w$]*)\()(\["sonnet","opus","haiku"(?:,"[^"]+")*\])\)(\.optional\(\)\.describe\()/,
+    (_m, open2, arr, tail) => open2 + extendAliasArray(arr) + ")" + tail,
     { required: true, noopIsSkip: true }
   );
   applyOnce(