llm-relay 0.34.0 → 0.36.1

package/README.md

@@ -11,6 +11,7 @@ weaker (often free) models.
 ```bash
 npm install -g llm-relay
 llm-relay onboard          # collect free provider keys (NIM, Groq, Gemini, OpenRouter, ...)
+llm-relay onboard --import keys.env  # import dotenv or a FreeLLMAPI export JSON
 llm-relay setup claude-desktop   # or: llm-relay setup claude-cli
 llm-relay                  # start the proxy — leave it running
 ```

package/config.example.json

@@ -77,7 +77,8 @@
     "offload": {
       "claude": { "enabled": false, "scope": "subagents" },
       "codex": { "enabled": false, "scope": "subagents" }
-    }
+    },
+    "sticky": false
   },
   "mode": "repair",
   "repair": {
@@ -89,6 +90,8 @@
       "Edit",
       "MultiEdit",
       "NotebookEdit",
+      "shell_command",
+      "apply_patch",
       "rm",
       "delete",
       "delete_file",

package/dist/anthropic.d.ts

@@ -59,8 +59,8 @@ export interface AssistantMessage {
 }
 export declare function isToolUseBlock(b: ContentBlock): b is ToolUseBlock;
 /**
- * Extract the tools[] map (name → input_schema) from a parsed request body.
- * Value is `null` for a tool that is DECLARED but has no JSON `input_schema` —
+ * Extract the tools[] map (name → JSON schema) from a parsed Anthropic, Chat, or
+ * Responses request body. Value is `null` for a tool that is DECLARED but has no schema —
  * notably Anthropic's built-in/typed tools (`bash`, `text_editor`, `computer`,
  * `web_search`), which carry a `type` but no schema. Such tools are "known but
  * unvalidatable": a tool_use naming them must NOT be flagged unknown_tool, but

package/dist/anthropic.js

@@ -8,8 +8,8 @@ export function isToolUseBlock(b) {
     return b.type === "tool_use";
 }
 /**
- * Extract the tools[] map (name → input_schema) from a parsed request body.
- * Value is `null` for a tool that is DECLARED but has no JSON `input_schema` —
+ * Extract the tools[] map (name → JSON schema) from a parsed Anthropic, Chat, or
+ * Responses request body. Value is `null` for a tool that is DECLARED but has no schema —
  * notably Anthropic's built-in/typed tools (`bash`, `text_editor`, `computer`,
  * `web_search`), which carry a `type` but no schema. Such tools are "known but
  * unvalidatable": a tool_use naming them must NOT be flagged unknown_tool, but
@@ -21,12 +21,29 @@ export function toolSchemaMap(requestBody) {
         requestBody !== null &&
         Array.isArray(requestBody.tools)) {
         for (const t of requestBody.tools) {
-            if (typeof t === "object" && t !== null && typeof t.name === "string") {
-                const rawSchema = t.input_schema;
+            if (typeof t !== "object" || t === null || Array.isArray(t))
+                continue;
+            const tool = t;
+            // Anthropic Messages and OpenAI Responses both put the function name on the tool itself;
+            // their schema fields differ. Anthropic built-ins deliberately remain declared/null.
+            if (typeof tool.name === "string") {
+                const rawSchema = tool.input_schema ?? tool.parameters;
                 const schema = typeof rawSchema === "object" && rawSchema !== null
                     ? rawSchema
                     : null;
-                map.set(t.name, schema);
+                map.set(tool.name, schema);
+                continue;
+            }
+            // Chat Completions wraps declarations in `{ type, function: { name, parameters } }`.
+            // Reading only Anthropic's shape made every direct Chat tool request look tool-free.
+            if (tool.type === "function" && typeof tool.function === "object" && tool.function !== null) {
+                const fn = tool.function;
+                if (typeof fn.name !== "string")
+                    continue;
+                const schema = typeof fn.parameters === "object" && fn.parameters !== null
+                    ? fn.parameters
+                    : null;
+                map.set(fn.name, schema);
             }
         }
     }

package/dist/anthropic.js.map

@@ -1 +1 @@
-{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../src/anthropic.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAkEH,MAAM,UAAU,cAAc,CAAC,CAAe;IAC5C,OAAO,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC;AAC/B,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,aAAa,CAAC,WAAoB;IAChD,MAAM,GAAG,GAAG,IAAI,GAAG,EAA6B,CAAC;IACjD,IACE,OAAO,WAAW,KAAK,QAAQ;QAC/B,WAAW,KAAK,IAAI;QACpB,KAAK,CAAC,OAAO,CAAE,WAAmC,CAAC,KAAK,CAAC,EACzD,CAAC;QACD,KAAK,MAAM,CAAC,IAAK,WAAoC,CAAC,KAAK,EAAE,CAAC;YAC5D,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,IAAI,OAAQ,CAAU,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAChF,MAAM,SAAS,GAAI,CAAgC,CAAC,YAAY,CAAC;gBACjE,MAAM,MAAM,GACV,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,IAAI;oBACjD,CAAC,CAAE,SAAwB;oBAC3B,CAAC,CAAC,IAAI,CAAC;gBACX,GAAG,CAAC,GAAG,CAAE,CAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACpC,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../src/anthropic.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAkEH,MAAM,UAAU,cAAc,CAAC,CAAe;IAC5C,OAAO,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC;AAC/B,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,aAAa,CAAC,WAAoB;IAChD,MAAM,GAAG,GAAG,IAAI,GAAG,EAA6B,CAAC;IACjD,IACE,OAAO,WAAW,KAAK,QAAQ;QAC/B,WAAW,KAAK,IAAI;QACpB,KAAK,CAAC,OAAO,CAAE,WAAmC,CAAC,KAAK,CAAC,EACzD,CAAC;QACD,KAAK,MAAM,CAAC,IAAK,WAAoC,CAAC,KAAK,EAAE,CAAC;YAC5D,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;gBAAE,SAAS;YACtE,MAAM,IAAI,GAAG,CAA4B,CAAC;YAE1C,yFAAyF;YACzF,qFAAqF;YACrF,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAClC,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,UAAU,CAAC;gBACvD,MAAM,MAAM,GACV,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,IAAI;oBACjD,CAAC,CAAE,SAAwB;oBAC3B,CAAC,CAAC,IAAI,CAAC;gBACX,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBAC3B,SAAS;YACX,CAAC;YAED,qFAAqF;YACrF,qFAAqF;YACrF,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,IAAI,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;gBAC5F,MAAM,EAAE,GAAG,IAAI,CAAC,QAAmC,CAAC;gBACpD,IAAI,OAAO,EAAE,CAAC,IAAI,KAAK,QAAQ;oBAAE,SAAS;gBAC1C,MAAM,MAAM,GACV,OAAO,EAAE,CAAC,UAAU,KAAK,QAAQ,IAAI,EAAE,CAAC,UAAU,KAAK,IAAI;oBACzD,CAAC,CAAE,EAAE,CAAC,UAAyB;oBAC/B,CAAC,CAAC,IAAI,CAAC;gBACX,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}

package/dist/authEnv.d.ts

@@ -12,6 +12,13 @@
  * key-shaped. A heuristic match could ship one provider's credential to another
  * provider's endpoint, which is a credential leak, not a convenience.
  */
+/**
+ * The curated aliases only, without the provider-name-derived candidates used by
+ * `candidateEnvNames()`. Importers need this narrower surface: accepting a credential from a
+ * file is allowed only when its NAME is explicitly listed, never because its value happens to
+ * look like a key or because an arbitrary provider slug can be turned into a plausible env name.
+ */
+export declare function curatedEnvNames(providerName: string): string[];
 /**
  * Every env-var name that may carry this provider's credential, most-preferred first:
  * the declared name, then curated aliases, then names derived from the provider name.

package/dist/authEnv.js

@@ -31,6 +31,15 @@ const PROVIDER_ENV_ALIASES = {
     openai: ["OPENAI_API_KEY"],
     anthropic: ["ANTHROPIC_API_KEY", "ANTHROPIC_AUTH_TOKEN"],
 };
+/**
+ * The curated aliases only, without the provider-name-derived candidates used by
+ * `candidateEnvNames()`. Importers need this narrower surface: accepting a credential from a
+ * file is allowed only when its NAME is explicitly listed, never because its value happens to
+ * look like a key or because an arbitrary provider slug can be turned into a plausible env name.
+ */
+export function curatedEnvNames(providerName) {
+    return [...(PROVIDER_ENV_ALIASES[providerName.toLowerCase()] ?? [])];
+}
 /** `my-provider.2` → `MY_PROVIDER_2`, so a custom provider gets sane derived candidates. */
 function slug(providerName) {
     return providerName.toUpperCase().replace(/[^A-Z0-9]+/g, "_").replace(/^_+|_+$/g, "");

package/dist/authEnv.js.map

@@ -1 +1 @@
-{"version":3,"file":"authEnv.js","sourceRoot":"","sources":["../src/authEnv.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"authEnv.js","sourceRoot":"","sources":["../src/authEnv.ts"],"names":[],"mappings":"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"}

package/dist/backend.d.ts

@@ -1,4 +1,5 @@
 import { type ResolvedTarget } from "./config.js";
+import { type RecoveredOpenAiChatProcessor } from "./openai-dialect.js";
 /**
  * A tool-call envelope was present in the response text but could not be parsed — truncated, or a
  * dialect variant we do not model. Distinct from a mapper defect: the relay's translation is fine,
@@ -83,6 +84,8 @@ export declare const DEGRADED_HEADER = "x-llm-relay-degraded";
  * `openrouter/anthropic/claude-sonnet-5 (paid, published-price)`.
  */
 export declare const PAID_HEADER = "x-llm-relay-paid";
+/** This response contains a tool call reconstructed from a recognized text dialect envelope. */
+export declare const TOOL_DIALECT_HEADER = "x-llm-relay-tool-dialect";
 /**
  * The provider's `Retry-After` in milliseconds, or null.
  *
@@ -93,6 +96,8 @@ export declare const PAID_HEADER = "x-llm-relay-paid";
  * garbage as 0 would silently disable the backoff this exists to honour.
  */
 export declare function parseRetryAfterMs(value: string | null | undefined, now?: number): number | null;
+/** Raw model id stated by the upstream response, before any relay translation. */
+export declare function upstreamReportedModel(response: Response): string | undefined;
 /**
  * Fetch the resolved provider target and return an ANTHROPIC-shaped `Response`,
  * regardless of the backend's native wire format. For kind="anthropic" this is a
@@ -170,4 +175,5 @@ export declare function fetchOpenAiFront(target: ResolvedTarget, args: {
     signal: AbortSignal;
     protocol?: OpenAiFrontProtocol;
     anthropicHeaders?: Record<string, string>;
+    processRecoveredChat?: RecoveredOpenAiChatProcessor;
 }, fetchFn?: typeof fetch): Promise<Response>;

package/dist/backend.js

@@ -4,6 +4,9 @@ import { DocumentError, transcodeDocuments } from "./documents.js";
 import { recoverToolCalls } from "./tool-dialects.js";
 import { recoverDialectInStream } from "./dialect-stream.js";
 import { toolSchemaMap } from "./anthropic.js";
+import { stripOpeningThinkTag, stripThinkTagsInStream } from "./think-tags.js";
+import { STREAM_PREFLIGHT_LIMIT } from "./stream-commit.js";
+import { inspectDialectInOpenAiChat, recoverDialectInOpenAiChatStream, } from "./openai-dialect.js";
 /**
  * A tool-call envelope was present in the response text but could not be parsed — truncated, or a
  * dialect variant we do not model. Distinct from a mapper defect: the relay's translation is fine,
@@ -93,6 +96,8 @@ export const DEGRADED_HEADER = "x-llm-relay-degraded";
  * `openrouter/anthropic/claude-sonnet-5 (paid, published-price)`.
  */
 export const PAID_HEADER = "x-llm-relay-paid";
+/** This response contains a tool call reconstructed from a recognized text dialect envelope. */
+export const TOOL_DIALECT_HEADER = "x-llm-relay-tool-dialect";
 /**
  * The provider's `Retry-After` in milliseconds, or null.
  *
@@ -119,7 +124,17 @@ export function parseRetryAfterMs(value, now = Date.now()) {
     const delta = at - now;
     return delta > 0 ? delta : null;
 }
-const STREAM_PREFLIGHT_LIMIT = 64 * 1024;
+// Response provenance is private process state, not a wire header: callers can
+// read it for logging without accidentally forwarding it to the client.
+const upstreamResponseMetadata = new WeakMap();
+/** Raw model id stated by the upstream response, before any relay translation. */
+export function upstreamReportedModel(response) {
+    return upstreamResponseMetadata.get(response)?.reportedModel;
+}
+function attachUpstreamMetadata(response, metadata) {
+    upstreamResponseMetadata.set(response, metadata);
+    return response;
+}
 function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -132,10 +147,19 @@ function isRecord(value) {
 function invalidEnvelopeReason(value, protocol, streamed) {
     if (!isRecord(value))
         return "expected a JSON object";
-    // An error delivered inside a 2xx SSE stream is still a real protocol envelope. Leave it to
-    // the stream adapter to forward rather than reclassifying it as malformed transport data.
-    if (streamed && isRecord(value.error))
-        return null;
+    // An error envelope seen here under `streamed` is the FIRST event of a 2xx stream — preflight
+    // inspects nothing later, so this cannot fire mid-stream. Pre-commit, an in-band error frame
+    // is a dead turn, not a response: failing it makes the candidate loop walk on to a member
+    // that answers, where forwarding it spent the whole pool on one member's error inside a 200
+    // (adoption review §1.1). An error frame arriving AFTER a valid first event still streams
+    // through untouched — post-commit, honesty beats replay. The reason carries a bounded excerpt
+    // of the upstream's own message, same maxim as serving the last candidate's real error.
+    if (streamed && isRecord(value.error)) {
+        const message = typeof value.error.message === "string" ? value.error.message.slice(0, 200) : "";
+        return message
+            ? `stream opened with an in-band error event: ${message}`
+            : "stream opened with an in-band error event";
+    }
     if (protocol === "openai-chat") {
         if (!Array.isArray(value.choices))
             return "missing choices array";
@@ -201,16 +225,43 @@ function invalidEnvelopeReason(value, protocol, streamed) {
             return "missing or unknown Anthropic event type";
     }
 }
+function captureReportedModel(metadata, value, protocol, streamed) {
+    if (metadata.reportedModel !== undefined || !isRecord(value))
+        return;
+    const envelope = protocol === "anthropic-messages" && streamed && value.type === "message_start"
+        ? value.message
+        : value;
+    if (isRecord(envelope) && typeof envelope.model === "string") {
+        metadata.reportedModel = envelope.model;
+    }
+}
 /** Inspect the first data event before handing a provider stream to llm-bridge. */
 async function preflightResponseStream(body, protocol) {
     const reader = body.getReader();
     const chunks = [];
     const decoder = new TextDecoder();
+    const metadata = {};
     let buffered = "";
     let byteLength = 0;
+    const captureCompleteEvents = (final = false) => {
+        let boundary;
+        const separator = /\r?\n\r?\n/g;
+        while ((boundary = separator.exec(buffered)) !== null) {
+            const event = buffered.slice(0, boundary.index);
+            buffered = buffered.slice(boundary.index + boundary[0].length);
+            separator.lastIndex = 0;
+            captureEventModel(event);
+        }
+        if (final && buffered.trim())
+            captureEventModel(buffered);
+    };
     const replay = () => {
         let prefixIndex = 0;
-        return { ok: true, body: new ReadableStream({
+        // The first valid event can be a ping. Keep observing the untouched raw
+        // stream while the consumer drains it so a later message_start/chunk can
+        // still supply the upstream's model before terminal logging.
+        captureCompleteEvents();
+        return { ok: true, metadata, body: new ReadableStream({
                 async pull(controller) {
                     if (prefixIndex < chunks.length) {
                         controller.enqueue(chunks[prefixIndex++]);
@@ -218,10 +269,16 @@ async function preflightResponseStream(body, protocol) {
                     }
                     try {
                         const more = await reader.read();
-                        if (more.done)
+                        if (more.done) {
+                            buffered += decoder.decode();
+                            captureCompleteEvents(true);
                             controller.close();
-                        else
+                        }
+                        else {
+                            buffered += decoder.decode(more.value, { stream: true });
+                            captureCompleteEvents();
                             controller.enqueue(more.value);
+                        }
                     }
                     catch (error) {
                         controller.error(error);
@@ -254,8 +311,25 @@ async function preflightResponseStream(body, protocol) {
         catch {
             return "data event is not valid JSON";
         }
+        captureReportedModel(metadata, parsed, protocol, true);
         return invalidEnvelopeReason(parsed, protocol, true);
     };
+    const captureEventModel = (event) => {
+        const data = event
+            .split(/\r?\n/)
+            .filter((line) => line.startsWith("data:"))
+            .map((line) => line.slice(5).trimStart())
+            .join("\n")
+            .trim();
+        if (!data || data === "[DONE]")
+            return;
+        try {
+            captureReportedModel(metadata, JSON.parse(data), protocol, true);
+        }
+        catch {
+            // Preflight owns envelope validity; this observer owns provenance only.
+        }
+    };
     while (byteLength <= STREAM_PREFLIGHT_LIMIT) {
         const next = await reader.read().catch(() => null);
         if (next === null)
@@ -267,7 +341,9 @@ async function preflightResponseStream(body, protocol) {
             // completion. Preserve the old adapter behaviour for that genuine envelope.
             if (finalReason === undefined && buffered.trim()) {
                 try {
-                    finalReason = invalidEnvelopeReason(JSON.parse(buffered), protocol, false);
+                    const parsed = JSON.parse(buffered);
+                    captureReportedModel(metadata, parsed, protocol, false);
+                    finalReason = invalidEnvelopeReason(parsed, protocol, false);
                 }
                 catch {
                     // The SSE-specific reason below remains more useful.
@@ -330,7 +406,7 @@ export async function fetchBackend(target, args, fetchFn = fetch) {
                     ...retryAfterHeader(res.headers),
                 }, "invalid_upstream_envelope");
             }
-            return new Response(preflight.body, { status: res.status, headers: res.headers });
+            return attachUpstreamMetadata(new Response(preflight.body, { status: res.status, headers: res.headers }), preflight.metadata);
         }
         let body;
         try {
@@ -347,7 +423,9 @@ export async function fetchBackend(target, args, fetchFn = fetch) {
                 ...retryAfterHeader(res.headers),
             }, "invalid_upstream_envelope");
         }
-        return res;
+        const metadata = {};
+        captureReportedModel(metadata, body, "anthropic-messages", false);
+        return attachUpstreamMetadata(res, metadata);
     }
     // kind === "openai"
     // llm-bridge stringifies any block type it doesn't know, which would put a document's
@@ -421,12 +499,16 @@ export async function fetchBackend(target, args, fetchFn = fetch) {
         }
         try {
             const anthStream = handleUniversalStreamRequest(preflight.body, "openai", "anthropic");
+            // Strip a complete message-opening think block BEFORE dialect scanning. Otherwise the
+            // preamble can hide a tool envelope from recovery. Native Anthropic streams never enter
+            // this branch, and direct OpenAI Chat passthrough is handled on the other front.
+            const strippedStream = stripThinkTagsInStream(anthStream);
             // Recover a tool call this host returned as raw dialect TEXT. Gated on the request actually
             // declaring tools: with none declared there is no call to recover, and wrapping the stream
             // would add holdback latency for nothing.
             const schemas = toolSchemaMap(args.reqJson);
-            const body = schemas.size > 0 ? recoverDialectInStream(anthStream, schemas) : anthStream;
-            return new Response(body, { status: res.status, headers: { "content-type": "text/event-stream" } });
+            const body = schemas.size > 0 ? recoverDialectInStream(strippedStream, schemas) : strippedStream;
+            return attachUpstreamMetadata(new Response(body, { status: res.status, headers: { "content-type": "text/event-stream" } }), preflight.metadata);
         }
         catch (e) {
             return anthropicError(502, `llm-relay: response translation failed: ${e.message}`, "local", {}, "relay_mapper_defect");
@@ -467,13 +549,16 @@ export async function fetchBackend(target, args, fetchFn = fetch) {
     // whose tool call the RELAY reconstructed is not the same as one that arrived correct, and an
     // unflagged reconstruction is indistinguishable from a host that worked.
     const recoveredDialect = recoveredDialectOf(anthropicJson);
-    return new Response(JSON.stringify(anthropicJson), {
+    const response = new Response(JSON.stringify(anthropicJson), {
         status: 200,
         headers: {
             "content-type": "application/json",
-            ...(recoveredDialect ? { "x-llm-relay-tool-dialect": recoveredDialect } : {}),
+            ...(recoveredDialect ? { [TOOL_DIALECT_HEADER]: recoveredDialect } : {}),
         },
     });
+    const metadata = {};
+    captureReportedModel(metadata, upstreamJson, "openai-chat", false);
+    return attachUpstreamMetadata(response, metadata);
 }
 /** Did this translated message carry a tool call the relay reconstructed from text? */
 function recoveredDialectOf(message) {
@@ -495,11 +580,14 @@ export function openAiResponseToAnthropic(j, model, schemas) {
     const msg = choice.message ?? {};
     const content = [];
     let toolCalls = msg.tool_calls ?? [];
+    // This mapper is the translated OpenAI→Anthropic seam. Strip first so an opening think block
+    // cannot conceal a following dialect envelope from the recovery pass below.
+    const messageText = typeof msg.content === "string" ? stripOpeningThinkTag(msg.content) : null;
     // Recover ONLY when the host parsed nothing. A host that populated `tool_calls` has already
     // spoken; second-guessing it here would be inference, not translation.
     let recovered = [];
-    if (toolCalls.length === 0 && typeof msg.content === "string" && msg.content.length > 0) {
-        const out = recoverToolCalls(msg.content, schemas ?? new Map());
+    if (toolCalls.length === 0 && messageText !== null && messageText.length > 0) {
+        const out = recoverToolCalls(messageText, schemas ?? new Map());
         if (out.status === "parsed") {
             recovered = out.calls;
             if (out.text.length > 0)
@@ -513,11 +601,11 @@ export function openAiResponseToAnthropic(j, model, schemas) {
             throw new DialectUnparseableError(out.dialect);
         }
         else {
-            content.push({ type: "text", text: msg.content });
+            content.push({ type: "text", text: messageText });
         }
     }
-    else if (typeof msg.content === "string" && msg.content.length > 0) {
-        content.push({ type: "text", text: msg.content });
+    else if (messageText !== null && messageText.length > 0) {
+        content.push({ type: "text", text: messageText });
     }
     if (recovered.length > 0) {
         toolCalls = recovered.map((c, i) => ({
@@ -773,6 +861,7 @@ export async function fetchOpenAiFront(target, args, fetchFn = fetch) {
     // Preserve the existing direct path for the protocol/backend pair that already speaks the
     // same wire format. It keeps provider-specific OpenAI fields byte-for-byte intact.
     if (target.kind === "openai" && protocol === "chat") {
+        const schemas = toolSchemaMap(base);
         const body = { ...base, model: target.model, stream: args.wantsStream };
         const res = await fetchFn(target.base + "/chat/completions", {
             method: "POST",
@@ -791,7 +880,18 @@ export async function fetchOpenAiFront(target, args, fetchFn = fetch) {
             if (!preflight.ok) {
                 return openaiError(502, `llm-relay: invalid OpenAI upstream envelope: ${preflight.reason}`, "upstream", "invalid_upstream_envelope", retryAfterHeader(res.headers));
             }
-            return new Response(preflight.body, { status: res.status, headers: res.headers });
+            let response = null;
+            let recovered = false;
+            const responseBody = schemas.size > 0
+                ? recoverDialectInOpenAiChatStream(preflight.body, schemas, () => {
+                    recovered = true;
+                    response?.headers.set(TOOL_DIALECT_HEADER, "recovered");
+                }, args.processRecoveredChat)
+                : preflight.body;
+            response = new Response(responseBody, { status: res.status, headers: res.headers });
+            if (recovered)
+                response.headers.set(TOOL_DIALECT_HEADER, "recovered");
+            return attachUpstreamMetadata(response, preflight.metadata);
         }
         let responseBody;
         try {
@@ -804,7 +904,28 @@ export async function fetchOpenAiFront(target, args, fetchFn = fetch) {
         if (invalidReason) {
             return openaiError(502, `llm-relay: invalid OpenAI upstream envelope: ${invalidReason}`, "upstream", "invalid_upstream_envelope", retryAfterHeader(res.headers));
         }
-        return res;
+        let recovery;
+        try {
+            recovery = await inspectDialectInOpenAiChat(responseBody, schemas, args.processRecoveredChat);
+        }
+        catch (error) {
+            return openaiError(502, `llm-relay: ${error instanceof Error ? error.message : String(error)}`, "upstream", "tool_call_recovery_failed");
+        }
+        if (recovery.status === "detected") {
+            return openaiError(502, `llm-relay: backend returned an unparseable ${recovery.dialect} tool-call envelope as text`, "upstream", "tool_dialect_unparseable");
+        }
+        const metadata = {};
+        const finalBody = recovery.status === "parsed" ? recovery.body : responseBody;
+        captureReportedModel(metadata, finalBody, "openai-chat", false);
+        if (recovery.status === "parsed") {
+            const headers = new Headers(res.headers);
+            headers.set(TOOL_DIALECT_HEADER, "recovered");
+            return attachUpstreamMetadata(new Response(JSON.stringify(finalBody), {
+                status: res.status,
+                headers,
+            }), metadata);
+        }
+        return attachUpstreamMetadata(res, metadata);
     }
     let anthropicBody;
     try {
@@ -827,6 +948,7 @@ export async function fetchOpenAiFront(target, args, fetchFn = fetch) {
         wantsStream: args.wantsStream,
         signal: args.signal,
     }, fetchFn);
+    const metadata = upstreamResponseMetadata.get(backendRes);
     if (!backendRes.ok) {
         const raw = await backendRes.text().catch(() => "");
         const origin = errorOrigin(backendRes) ?? "upstream";
@@ -853,7 +975,8 @@ export async function fetchOpenAiFront(target, args, fetchFn = fetch) {
         const targetProtocol = protocol === "responses" ? "openai-responses" : "openai";
         try {
             const output = handleUniversalStreamRequest(preflight.body, "anthropic", targetProtocol);
-            return new Response(output, { status: backendRes.status, headers: { "content-type": "text/event-stream" } });
+            const response = new Response(output, { status: backendRes.status, headers: { "content-type": "text/event-stream" } });
+            return metadata ? attachUpstreamMetadata(response, metadata) : response;
         }
         catch (e) {
             return openaiError(502, `llm-relay: response translation failed: ${e.message}`, "local", "relay_mapper_defect");
@@ -875,10 +998,11 @@ export async function fetchOpenAiFront(target, args, fetchFn = fetch) {
             : `llm-relay: invalid Anthropic upstream envelope: ${invalidReason}`, generated ? "local" : "upstream", generated ? "relay_mapper_defect" : "invalid_upstream_envelope", retryAfterHeader(backendRes.headers));
     }
     try {
-        return new Response(JSON.stringify(anthropicMessageToOpenAi(body, protocol, target.model ?? String(base.model ?? ""))), {
+        const response = new Response(JSON.stringify(anthropicMessageToOpenAi(body, protocol, target.model ?? String(base.model ?? ""))), {
             status: backendRes.status,
             headers: { "content-type": "application/json" },
         });
+        return metadata ? attachUpstreamMetadata(response, metadata) : response;
     }
     catch (e) {
         return openaiError(502, `llm-relay: response translation failed: ${e.message}`, "local", "relay_mapper_defect");