@bman654/clodex 2.14.0 → 2.14.1

package/dist/cli.js

@@ -344,7 +344,7 @@ import { join } from "path";
 // package.json
 var package_default = {
   name: "@bman654/clodex",
-  version: "2.14.0",
+  version: "2.14.1",
   publishConfig: {
     access: "public"
   },
@@ -3432,7 +3432,7 @@ function savedStopsAfter(current, assignments) {
 }
 
 // src/patch-transforms.ts
-var PATCH_TRANSFORMS_VERSION = 12;
+var PATCH_TRANSFORMS_VERSION = 13;
 var NATIVE_EFFORT_LEVELS = ["low", "medium", "high", "xhigh", "max"];
 var BASE_EFFORT_LEVELS = ["low", "medium", "high"];
 function projectNativeEffort(effort) {
@@ -3589,14 +3589,22 @@ function applyClodexPatches(source, config) {
     { required: true, noopIsSkip: true }
   );
   {
-    const missing = ALIASES.filter((a) => !new RegExp("case" + reEsc(q(a)) + ":return").test(js));
+    const RESOLVER_ANCHOR = /(case"best":\{[^{}]*\})/;
+    const RESOLVER_BUDGET = 2e3 + ALIASES.reduce((n, a) => n + 2 * a.length + 17, 0);
+    const RESOLVER_SWITCH = new RegExp(
+      'case"best":\\{[^{}]*\\}[\\s\\S]{0,' + RESOLVER_BUDGET + "}?default:return"
+    );
+    const resolver = js.match(RESOLVER_SWITCH)?.[0] ?? "";
+    const missing = ALIASES.filter(
+      (a) => !new RegExp("case" + reEsc(q(a)) + ":return").test(resolver)
+    );
     const cases = missing.map((a) => "case" + q(a) + ":return " + q(a) + ";").join("");
     if (ALIASES.length === 0) {
       log12("SKIP", "PATCH 6: alias resolver switch", "no aliases configured");
     } else {
       applyOnce(
         "PATCH 6: alias resolver switch",
-        /(case"best":\{[^{}]*\})/,
+        RESOLVER_ANCHOR,
         (m) => m + cases,
         { required: true, noopIsSkip: true }
       );
@@ -11641,6 +11649,7 @@ function routeUnavailableMessage(modelId, reason) {
 }
 
 // src/upstream-forward.ts
+import { randomUUID as randomUUID4 } from "crypto";
 import { Readable, Transform } from "stream";
 import { StringDecoder } from "string_decoder";
 
@@ -11729,18 +11738,50 @@ async function fetchWithOAuthRetry(apiKey, request3, refreshToken) {
   response = await request3(refreshed);
   return { response, apiKey: refreshed, refreshed: true };
 }
+function upstreamHoldsThreads(url) {
+  try {
+    return new URL(url).hostname.toLowerCase() === "api.anthropic.com";
+  } catch {
+    return false;
+  }
+}
+function anchorSafeMessageId(id) {
+  return typeof id === "string" && id.startsWith("msg_") ? "clodex_" + randomUUID4().replace(/-/g, "") : id;
+}
+function isThreadContinuation(body) {
+  const thread = body.thread;
+  return typeof thread === "object" && thread !== null && thread.type === "continue";
+}
+var THREAD_UNSUPPORTED_BODY = JSON.stringify({
+  type: "error",
+  error: {
+    type: "invalid_request_error",
+    message: "thread continuation is not supported on this route; resend the full conversation",
+    details: { error_code: "thread_unsupported_request" }
+  }
+});
 var SSE_LINE_SPLIT = /(\r\n|\r|\n)/;
-function anthropicSseModelRewrite(override) {
+function anthropicSseMessageStartRewrite(rewrite) {
   const decoder = new StringDecoder("utf8");
   let tail = "";
   const rewriteLine = (line) => {
     if (!line.startsWith("data:") || !line.includes('"message_start"')) return line;
     try {
       const parsed = JSON.parse(line.slice(5));
-      if (parsed.type === "message_start" && parsed.message && typeof parsed.message.model === "string") {
-        parsed.message.model = override;
-        return "data: " + JSON.stringify(parsed);
+      if (parsed.type !== "message_start" || !parsed.message) return line;
+      let changed = false;
+      if (rewrite.model !== void 0 && typeof parsed.message.model === "string") {
+        parsed.message.model = rewrite.model;
+        changed = true;
+      }
+      if (rewrite.anchorSafeId) {
+        const id = anchorSafeMessageId(parsed.message.id);
+        if (id !== parsed.message.id) {
+          parsed.message.id = id;
+          changed = true;
+        }
       }
+      if (changed) return "data: " + JSON.stringify(parsed);
     } catch {
     }
     return line;
@@ -11806,8 +11847,11 @@ async function relayAnthropicMessages(res, messagesUrl, body, apiKey, clientWant
       "Connection": "keep-alive"
     });
     const upstream = Readable.fromWeb(upstreamRes.body).on("error", () => res.destroy());
-    if (options.responseModelOverride) {
-      upstream.pipe(anthropicSseModelRewrite(options.responseModelOverride)).on("error", () => res.destroy()).pipe(res);
+    if (options.responseModelOverride || options.anchorSafeMessageIds) {
+      upstream.pipe(anthropicSseMessageStartRewrite({
+        model: options.responseModelOverride,
+        anchorSafeId: options.anchorSafeMessageIds
+      })).on("error", () => res.destroy()).pipe(res);
     } else {
       upstream.pipe(res);
     }
@@ -11827,9 +11871,21 @@ async function relayAnthropicMessages(res, messagesUrl, body, apiKey, clientWant
     res.end(JSON.stringify({ type: "error", error: { type: "api_error", message: "Upstream response was not valid JSON" } }));
     return;
   }
-  if (options.responseModelOverride && parsed && typeof parsed === "object" && !Array.isArray(parsed) && parsed.type === "message" && typeof parsed.model === "string") {
-    parsed.model = options.responseModelOverride;
-    text5 = JSON.stringify(parsed);
+  if (parsed && typeof parsed === "object" && !Array.isArray(parsed) && parsed.type === "message") {
+    const message = parsed;
+    let changed = false;
+    if (options.responseModelOverride && typeof message.model === "string") {
+      message.model = options.responseModelOverride;
+      changed = true;
+    }
+    if (options.anchorSafeMessageIds) {
+      const id = anchorSafeMessageId(message.id);
+      if (id !== message.id) {
+        message.id = id;
+        changed = true;
+      }
+    }
+    if (changed) text5 = JSON.stringify(message);
   }
   res.writeHead(200, {
     "Content-Type": "application/json",
@@ -11839,10 +11895,10 @@ async function relayAnthropicMessages(res, messagesUrl, body, apiKey, clientWant
 }
 
 // src/proxy.ts
-import { randomUUID as randomUUID4 } from "crypto";
+import { randomUUID as randomUUID6 } from "crypto";
 
 // src/sdk-adapter.ts
-import { createHash as createHash7 } from "crypto";
+import { createHash as createHash7, randomUUID as randomUUID5 } from "crypto";
 import { streamText, generateText, tool, jsonSchema } from "ai";
 
 // src/proxy-shared.ts
@@ -12690,8 +12746,11 @@ function forwardAbortSignal(source, target) {
   source.addEventListener("abort", forward, { once: true });
   return () => source.removeEventListener("abort", forward);
 }
+function translatedMessageId() {
+  return "clodex_" + randomUUID5().replace(/-/g, "");
+}
 async function writeAnthropicStream(stream, modelId, write, log12, observer, tools) {
-  const messageId = "msg_" + Date.now();
+  const messageId = translatedMessageId();
   const requiredProps = toolRequiredProps(tools);
   let blockIndex = -1;
   let started = false;
@@ -13049,7 +13108,7 @@ async function generateAnthropicResponse(model, params, modelId, options) {
   reportPromptTokens({ onPromptTokens: options?.onPromptTokens }, usage);
   const requiredProps = toolRequiredProps(params.tools);
   return {
-    id: "msg_" + Date.now(),
+    id: translatedMessageId(),
     type: "message",
     role: "assistant",
     model: modelId,
@@ -13265,7 +13324,7 @@ function configuredAliasLookupNames(alias) {
   }))].map(normalizeRouteLookupId);
 }
 async function startProxyCatalog(routes, defaultAliasId, debug = false, inferenceLogPath, debugLogPath, webSocketDiagnosticsLogPath, modelAliases) {
-  const proxyToken = randomUUID4();
+  const proxyToken = randomUUID6();
   silenceSdkWarnings();
   if (routes.length === 0) {
     throw new Error("Proxy catalog requires at least one route");
@@ -13417,6 +13476,13 @@ async function startProxyCatalog(routes, defaultAliasId, debug = false, inferenc
         }
         return;
       }
+      const holdsThreads = route.modelFormat === "anthropic" && upstreamHoldsThreads(upstreamUrl);
+      if (!holdsThreads && isThreadContinuation(anthropicBody)) {
+        plog(() => `thread continuation refused: route=${route.realModelId} upstream does not hold threads`);
+        res.writeHead(400, { "Content-Type": "application/json" });
+        res.end(THREAD_UNSUPPORTED_BODY);
+        return;
+      }
       if (!apiKey && routeAuthType !== "none" && !usesSdkAdapter) {
         anthropicError(res, 401, "Missing API key");
         return;
@@ -13470,6 +13536,9 @@ async function startProxyCatalog(routes, defaultAliasId, debug = false, inferenc
             // the client would believe it reached a model it never reached, and
             // would key its context window off that phantom id.
             responseModelOverride: resolvedRoute && typeof originalModel === "string" && originalModel !== route.realModelId ? originalModel : void 0,
+            // An upstream that holds no threads must not hand Claude Code an id
+            // it would anchor the next request on.
+            anchorSafeMessageIds: !holdsThreads,
             onUpstreamError: inferenceLogPath ? (statusCode, errorContent) => writeInferenceResponseErrorLog(inferenceLogPath, {
               modelId: originalModel,
               provider: route.providerId ?? route.aliasId.split(":")[1] ?? "unknown",
@@ -13678,7 +13747,7 @@ async function startProxyCatalog(routes, defaultAliasId, debug = false, inferenc
               res,
               upstreamStatus === 500 ? 502 : upstreamStatus,
               clientMessage,
-              contextLengthExceeded ? relayRequestId ?? randomUUID4() : void 0
+              contextLengthExceeded ? relayRequestId ?? randomUUID6() : void 0
             );
           } else {
             const errorType = anthropicErrorType(upstreamStatus, details?.transportCode);
@@ -13686,7 +13755,7 @@ async function startProxyCatalog(routes, defaultAliasId, debug = false, inferenc
 data: ${JSON.stringify({
               type: "error",
               error: { type: errorType, message: clientMessage },
-              ...contextLengthExceeded ? { request_id: relayRequestId ?? randomUUID4() } : {}
+              ...contextLengthExceeded ? { request_id: relayRequestId ?? randomUUID6() } : {}
             })}
 
 `);
@@ -15009,7 +15078,7 @@ function localProvidersToServerModels(localProviders) {
 }
 
 // src/registry/credential-cleanup-journal.ts
-import { randomUUID as randomUUID5 } from "crypto";
+import { randomUUID as randomUUID7 } from "crypto";
 import {
   closeSync as closeSync9,
   existsSync as existsSync5,
@@ -15149,7 +15218,7 @@ function writeJournalUnlocked(journal, path) {
   assertRegistryWriteOwnership(path);
   ensureSecureAppHome();
   mkdirSync6(dirname6(path), { recursive: true, mode: DIR_MODE2 });
-  const tmp = `${path}.${process.pid}.${randomUUID5()}.tmp`;
+  const tmp = `${path}.${process.pid}.${randomUUID7()}.tmp`;
   let fd;
   try {
     fd = openSync9(tmp, "wx", FILE_MODE4);
@@ -18042,7 +18111,7 @@ async function askSaveServerPassword() {
 
 // src/server/router.ts
 import { createServer as createServer2 } from "http";
-import { randomUUID as randomUUID6 } from "crypto";
+import { randomUUID as randomUUID8 } from "crypto";
 
 // src/openai-adapter.ts
 import { tool as tool2, jsonSchema as jsonSchema2, streamText as streamText2, generateText as generateText2 } from "ai";
@@ -18458,7 +18527,7 @@ async function handleAnthropicMessages(req, res, options, modelCache, plog) {
     plog(`model not found: ${body.model}`);
     return;
   }
-  const requestId = randomUUID6();
+  const requestId = randomUUID8();
   const claudeSessionIdHeader = Array.isArray(req.headers["x-claude-code-session-id"]) ? req.headers["x-claude-code-session-id"][0] : req.headers["x-claude-code-session-id"];
   const claudeSessionId = extractClaudeSessionId(body, claudeSessionIdHeader);
   const claudeAgentIds = extractClaudeAgentIds(req.headers);
@@ -19132,7 +19201,7 @@ import * as http2 from "http";
 import * as https from "https";
 import * as net from "net";
 import { PassThrough } from "stream";
-import { randomUUID as randomUUID7 } from "crypto";
+import { randomUUID as randomUUID9 } from "crypto";
 import { URL as URL2 } from "url";
 import { createBrotliDecompress, createGunzip, createInflate } from "zlib";
 
@@ -19990,7 +20059,7 @@ async function startHttpProxy(options) {
     }
     const messagesEndpoint = anthropicMessagesEndpoint(req.url);
     if (req.method === "POST" && messagesEndpoint) {
-      const requestId = randomUUID7();
+      const requestId = randomUUID9();
       let parsed = null;
       let route;
       let adapterBody = rawBody;