@bman654/clodex 2.2.1 → 2.3.0

package/README.md

@@ -275,6 +275,15 @@ clodex --version    # version
 - Proxied routes forward configured provider headers for API-key and OAuth authentication. Anonymous routes preserve non-credential headers while removing authorization, API-key, cookie, token, secret, and credential-bearing header names before dispatch.
 - `CLODEX_CLAUDE_PATH` overrides Claude Code binary discovery.
 - **Outbound proxy:** when `HTTP_PROXY`/`HTTPS_PROXY` (and optionally `NO_PROXY`) are set in clodex's environment, all clodex-originated network calls honor them — OAuth sign-in and token refresh, model-list and models.dev refreshes, upstream OpenAI API calls, and the ChatGPT/Codex OAuth WebSocket transport (tunneled via HTTP CONNECT).
+- **Upstream retries:** set `CLODEX_UPSTREAM_MAX_RETRIES` to an integer from
+  `0` through `5` to override the SDK's default of two retries for retryable
+  provider failures. `0` disables retries. The SDK honors valid
+  `retry-after`/`retry-after-ms` headers and otherwise uses exponential
+  backoff. Larger integers clamp to `5` with a one-time warning because a sixth
+  retry cannot complete before the translated streaming paths' 120-second
+  no-data timeout. Unset, empty, or malformed values preserve the default. A
+  stream that fails after output begins cannot be replayed safely and still
+  terminates the request.
 
 ## Known limitations
 

package/dist/cli.js

@@ -218,7 +218,7 @@ import { join } from "path";
 // package.json
 var package_default = {
   name: "@bman654/clodex",
-  version: "2.2.1",
+  version: "2.3.0",
   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"]);
@@ -4485,6 +4496,61 @@ function warnReasoningNormalizationGap(fields, log12) {
   } catch {
   }
 }
+function toolArgumentNormalizationGap(expected, actual, requiredProps) {
+  if (conversationItemKind(expected) !== "function_call") return void 0;
+  if (conversationItemKind(actual) !== "function_call") return void 0;
+  const left = expected;
+  const right = actual;
+  const callId = left.call_id;
+  if (typeof callId !== "string" || !callId || callId !== right.call_id) return void 0;
+  if (typeof left.name !== "string" || left.name !== right.name) return void 0;
+  if (canonicalJson(normalizeToolCallJson(left)) === canonicalJson(normalizeToolCallJson(right))) {
+    return void 0;
+  }
+  const required = requiredProps().get(left.name);
+  const stripped = (item) => {
+    if (typeof item.arguments !== "string") return void 0;
+    const raw = item.arguments.trim();
+    try {
+      const parsed = raw === "" ? {} : JSON.parse(raw);
+      if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return void 0;
+      return canonicalJson({
+        ...normalizeToolCallJson(item),
+        arguments: canonicalJson(sanitizeToolInput(parsed, required))
+      });
+    } catch {
+      return void 0;
+    }
+  };
+  const leftStripped = stripped(left);
+  const rightStripped = stripped(right);
+  return {
+    tool: left.name,
+    equalAfterStrip: leftStripped !== void 0 && leftStripped === rightStripped
+  };
+}
+var warnedToolArgumentGaps = /* @__PURE__ */ new Set();
+var MAX_TOOL_ARGUMENT_GAP_WARNINGS = 3;
+function warnToolArgumentNormalizationGap(gap, log12) {
+  const tool3 = typeof gap.tool === "string" ? gap.tool : "unknown";
+  const signature = `${tool3}:filler`;
+  const message = `clodex: warning: tool call "${tool3}" failed the continuation match, but both sides are identical once clodex's filler-strip rule is applied, so the head should have matched. Prompt caching is degraded for this turn \u2014 please report it, with the adapter debug log from --trace if you can, at https://github.com/bman654/clodex/issues`;
+  try {
+    log12?.(`tool argument normalization gap: ${signature}`);
+  } catch {
+  }
+  if (warnedToolArgumentGaps.has(signature)) return;
+  if (warnedToolArgumentGaps.size >= MAX_TOOL_ARGUMENT_GAP_WARNINGS) return;
+  warnedToolArgumentGaps.add(signature);
+  try {
+    process.stderr.write(`${message}
+`);
+    if (warnedToolArgumentGaps.size === MAX_TOOL_ARGUMENT_GAP_WARNINGS) {
+      process.stderr.write("clodex: warning: further tool-argument normalization warnings suppressed.\n");
+    }
+  } catch {
+  }
+}
 function continuationMismatchDetails(entry, payload, log12, warnOnGap = false) {
   const full = inputArray(payload);
   const prefix = [...entry.requestInput ?? [], ...entry.expectedAssistant ?? []];
@@ -4500,6 +4566,34 @@ function continuationMismatchDetails(entry, payload, log12, warnOnGap = false) {
   const actual = mismatch < full.length ? full[mismatch] : void 0;
   const reasoningGap = reasoningNormalizationGap(expected, actual);
   if (reasoningGap && warnOnGap) warnReasoningNormalizationGap(reasoningGap, log12);
+  let gapExpected = expected;
+  if (conversationItemKind(expected) === "reasoning" && conversationItemKind(actual) === "function_call") {
+    for (let index = mismatch; index < prefix.length; index += 1) {
+      if (conversationItemKind(prefix[index]) !== "reasoning") {
+        gapExpected = prefix[index];
+        break;
+      }
+    }
+  }
+  let toolArgumentGap;
+  try {
+    toolArgumentGap = toolArgumentNormalizationGap(
+      gapExpected,
+      actual,
+      // The head's own schema when it has one; the current turn's tools are only a
+      // fallback for a head that predates the snapshot (see headRequiredToolProps).
+      () => entry.headRequiredToolProps ?? requiredToolProps(payload)
+    );
+  } catch {
+  }
+  if (toolArgumentGap?.equalAfterStrip === true) {
+    if (warnOnGap) warnToolArgumentNormalizationGap(toolArgumentGap, log12);
+  } else if (toolArgumentGap && warnOnGap) {
+    try {
+      log12?.(`tool argument mismatch beyond the strip rule: ${String(toolArgumentGap.tool)}`);
+    } catch {
+    }
+  }
   return {
     fullItems: full.length,
     expectedPrefixItems: prefix.length,
@@ -4517,12 +4611,31 @@ function continuationMismatchDetails(entry, payload, log12, warnOnGap = false) {
         entry.expectedAssistant ?? [],
         mismatch
       )
-    } : {}
+    } : {},
+    ...toolArgumentGap ? { toolArgumentNormalizationGap: toolArgumentGap } : {}
   };
 }
-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 continuationMismatchSummary(entry, payload, log12, mismatchDump = false, precomputedDetails) {
+  const details = precomputedDetails ?? continuationMismatchDetails(entry, payload, log12, true);
+  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])));
@@ -4639,6 +4752,7 @@ function emitContextDiagnostic(entry, ctx, details) {
     retried: ctx.retried,
     frameCount: ctx.frameCount,
     emittedModelData: ctx.emittedModelData,
+    emittedDownstreamData: ctx.emittedDownstreamData,
     responseIdReceived: Boolean(ctx.responseId),
     inFlightMs: entry.inFlightStartedAt === void 0 ? void 0 : Math.max(0, entry.options.now() - entry.inFlightStartedAt),
     ...details
@@ -4831,8 +4945,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 +4995,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 });
     }
   }
@@ -4855,6 +5007,7 @@ function expectedAssistantItems(ctx) {
 }
 function encodeSse(ctx, event) {
   if (ctx.closed) return;
+  ctx.emittedDownstreamData = true;
   ctx.controller.enqueue(ctx.encoder.encode(`data: ${JSON.stringify(event)}
 
 `));
@@ -4906,12 +5059,12 @@ function failContext(entry, ctx, message, diagnosticDetails, statusCode, retryAf
   closeContext(ctx);
 }
 function retryTransportFailure(entry, ctx, diagnosticDetails) {
-  if (ctx.closed || entry.current !== ctx || ctx.retried || ctx.frameCount !== 0 || ctx.emittedModelData) {
+  if (ctx.closed || entry.current !== ctx || ctx.retried || !transportReplaySafe(ctx)) {
     return false;
   }
   ctx.retried = true;
   ctx.transportRetryPending = true;
-  entry.debug("transport failed before any response frame; retrying once with full context");
+  entry.debug("transport failed before downstream output; retrying once with full context");
   emitContextDiagnostic(entry, ctx, {
     event: "ws_transport_retry",
     outcome: "started",
@@ -4945,9 +5098,9 @@ function retryTransportFailure(entry, ctx, diagnosticDetails) {
 function handleTransportFailure(entry, ctx, message, diagnosticDetails) {
   if (retryTransportFailure(entry, ctx, diagnosticDetails)) return;
   if (ctx.closed || entry.current !== ctx) return;
-  if (ctx.retried && ctx.frameCount === 0 && !ctx.emittedModelData) {
+  if (ctx.retried && ctx.transportRetryPending && transportReplaySafe(ctx)) {
     ctx.transportRetryPending = false;
-    entry.debug("transport retry exhausted before any response frame");
+    entry.debug("transport retry exhausted before downstream output");
     emitContextDiagnostic(entry, ctx, {
       event: "ws_transport_retry",
       outcome: "exhausted",
@@ -5051,6 +5204,9 @@ function resetContextForRetry(ctx) {
   ctx.recentUpstreamEventTypes = [];
   ctx.emittedProtocolAnomalies.clear();
 }
+function transportReplaySafe(ctx) {
+  return !ctx.emittedDownstreamData && !ctx.emittedModelData && ctx.outputByIndex.size === 0;
+}
 function handleSocketMessage(entry, data) {
   const ctx = entry.current;
   if (!ctx || ctx.closed) return;
@@ -5165,6 +5321,7 @@ function handleSocketMessage(entry, data) {
       entry.responseId = ctx.responseId;
       entry.requestInput = inputArray(ctx.originalPayload);
       entry.expectedAssistant = expectedAssistantItems(ctx);
+      entry.headRequiredToolProps = requiredToolProps(ctx.originalPayload);
       entry.canonicalPrefix = void 0;
       entry.canonicalEchoablePrefix = void 0;
       entry.promptFieldHashes = ctx.promptFieldHashes;
@@ -5294,6 +5451,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,
@@ -5349,6 +5507,7 @@ function createResponsesWebSocketFetch(wsUrl, log12, options = {}) {
     let persistent = Boolean(partitionKey);
     let promotedConnectionId;
     let decision;
+    let candidateMismatchDetails;
     if (selected && selectedDelta) {
       sendPayload = { ...payload, input: selectedDelta, previous_response_id: selected.responseId };
       continued = true;
@@ -5371,8 +5530,23 @@ function createResponsesWebSocketFetch(wsUrl, log12, options = {}) {
       decision = "parallel_isolated";
       debug("parallel request using an isolated socket");
     } else if (diagnosticEntry) {
+      const diagnosticMismatch = continuationMismatchDetails(diagnosticEntry, payload, debug, true);
+      candidateMismatchDetails = /* @__PURE__ */ new Map([[diagnosticEntry, diagnosticMismatch]]);
+      for (const candidate of candidates) {
+        if (candidate === diagnosticEntry) continue;
+        candidateMismatchDetails.set(
+          candidate,
+          continuationMismatchDetails(candidate, payload, debug, true)
+        );
+      }
       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,
+          diagnosticMismatch
+        )})`
       );
       decision = "history_mismatch_new_head";
     } else if (partitionKey) {
@@ -5432,7 +5606,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, debug)
+        mismatch: candidateMismatchDetails?.get(entry) ?? continuationMismatchDetails(entry, payload, debug)
       })),
       evictions
     }, diagnosticCorrelation);
@@ -5452,6 +5626,7 @@ function createResponsesWebSocketFetch(wsUrl, log12, options = {}) {
           frameCount: 0,
           pendingEvents: [],
           emittedModelData: false,
+          emittedDownstreamData: false,
           transportRetryPending: false,
           outputByIndex: /* @__PURE__ */ new Map(),
           outputIndexByItemId: /* @__PURE__ */ new Map(),
@@ -9814,6 +9989,41 @@ function resolveUpstreamTools(tools, messages) {
   return upstream;
 }
 
+// src/upstream-retry.ts
+var UPSTREAM_MAX_RETRIES_ENV = "CLODEX_UPSTREAM_MAX_RETRIES";
+var MAX_UPSTREAM_MAX_RETRIES = 5;
+var reportedValues = /* @__PURE__ */ new Set();
+function reportOnce(raw, message, warn) {
+  if (reportedValues.has(raw)) return;
+  reportedValues.add(raw);
+  try {
+    warn(message);
+  } catch {
+  }
+}
+function upstreamMaxRetries(env = process.env, warn = (message) => console.error(`clodex: ${message}`)) {
+  const raw = env[UPSTREAM_MAX_RETRIES_ENV]?.trim();
+  if (raw === void 0 || raw === "") return void 0;
+  const value = Number(raw);
+  if (!Number.isInteger(value) || value < 0) {
+    reportOnce(
+      raw,
+      `ignoring ${UPSTREAM_MAX_RETRIES_ENV}=${raw} (expected a non-negative integer)`,
+      warn
+    );
+    return void 0;
+  }
+  if (value > MAX_UPSTREAM_MAX_RETRIES) {
+    reportOnce(
+      raw,
+      `clamping ${UPSTREAM_MAX_RETRIES_ENV}=${raw} to ${MAX_UPSTREAM_MAX_RETRIES} (higher values exceed the 120s streaming idle budget)`,
+      warn
+    );
+    return MAX_UPSTREAM_MAX_RETRIES;
+  }
+  return value;
+}
+
 // src/sdk-adapter.ts
 function sdkTranslationErrorSignature(error) {
   const message = error instanceof Error ? error.message : typeof error === "string" ? error : void 0;
@@ -9884,10 +10094,12 @@ function openAiCacheBreakpoint(block, enabled) {
 function translateTopLevelSystemForOpenAi(system) {
   if (!system) return [];
   if (typeof system === "string") {
-    return system.trim() ? [{ role: "system", content: system }] : [];
+    const stripped = stripClaudeCodeBillingHeader(system);
+    return stripped?.trim() ? [{ role: "system", content: stripped }] : [];
   }
   return system.flatMap((block) => {
-    const text4 = typeof block === "string" ? block : block.text ?? "";
+    const raw = typeof block === "string" ? block : block.text ?? "";
+    const text4 = stripClaudeCodeBillingHeader(raw) ?? "";
     if (!text4.trim()) return [];
     const cacheControl = typeof block === "string" ? void 0 : block.cache_control;
     return [{
@@ -10035,15 +10247,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 ?? {})) {
@@ -10082,7 +10285,7 @@ function isClaudeCodeStructuredOutputCompactRequest(body) {
 function translateRequest(body, npm, options) {
   const messages = body.messages ?? [];
   annotateToolNames(messages);
-  const baseSystem = systemToString(body.system, options?.openAiOAuth === true);
+  const baseSystem = systemToString(body.system, true);
   const systemText = baseSystem?.trim() || (options?.openAiOAuth ? "You are a coding assistant." : void 0);
   const compactRequest = isClaudeCodeStructuredOutputCompactRequest(body);
   let upstreamTools = resolveUpstreamTools(
@@ -10373,6 +10576,7 @@ async function streamAnthropicResponse(model, params, modelId, write, log12, obs
   const result = streamText({
     model,
     ...params,
+    maxRetries: upstreamMaxRetries(),
     abortSignal,
     onError: () => {
     }
@@ -10421,6 +10625,7 @@ async function generateAnthropicResponse(model, params, modelId, options) {
     const r = streamText({
       model,
       ...params,
+      maxRetries: upstreamMaxRetries(),
       abortSignal,
       onError: () => {
       }
@@ -10477,6 +10682,7 @@ async function generateAnthropicResponse(model, params, modelId, options) {
       const r = await generateText({
         model,
         ...params,
+        maxRetries: upstreamMaxRetries(),
         abortSignal: generateAbort.signal
       });
       ({ text: text4, toolCalls, finishReason, usage } = r);
@@ -11431,11 +11637,20 @@ async function collectOpenAiStream(stream) {
 async function generateOpenAiResponse(model, params, responseModelId, options) {
   let result;
   if (options?.forceStream) {
-    const { stream } = streamText2({ model, ...params, onError: () => {
-    } });
+    const { stream } = streamText2({
+      model,
+      ...params,
+      maxRetries: upstreamMaxRetries(),
+      onError: () => {
+      }
+    });
     result = await collectOpenAiStream(stream);
   } else {
-    result = await generateText2({ model, ...params });
+    result = await generateText2({
+      model,
+      ...params,
+      maxRetries: upstreamMaxRetries()
+    });
   }
   const message = { role: "assistant", content: result.text || null };
   if (result.toolCalls?.length) {
@@ -11459,7 +11674,11 @@ async function generateOpenAiResponse(model, params, responseModelId, options) {
   };
 }
 async function streamOpenAiResponse(model, params, responseModelId, onChunk) {
-  const { stream } = streamText2({ model, ...params });
+  const { stream } = streamText2({
+    model,
+    ...params,
+    maxRetries: upstreamMaxRetries()
+  });
   const baseData = {
     id: `chatcmpl-${Date.now()}`,
     object: "chat.completion.chunk",