@omnicross/core 0.1.4 → 0.1.6

package/dist/chunk-SYQF7OIR.js

@@ -0,0 +1,52 @@
+// src/pipeline/upstreamTrace.ts
+import { appendFile, mkdir } from "fs/promises";
+import { dirname } from "path";
+var tracePath = null;
+var SECRET_HEADER_NAMES = /* @__PURE__ */ new Set([
+  "authorization",
+  "api-key",
+  "x-api-key",
+  "x-goog-api-key"
+]);
+function setUpstreamTracePath(path) {
+  tracePath = typeof path === "string" && path.trim() ? path.trim() : null;
+}
+function getUpstreamTracePath() {
+  return tracePath;
+}
+function redactHeaders(headers) {
+  const out = {};
+  if (!headers) return out;
+  let entries;
+  if (Array.isArray(headers)) {
+    entries = headers;
+  } else if (typeof headers.entries === "function") {
+    entries = Array.from(headers.entries());
+  } else {
+    entries = Object.entries(headers);
+  }
+  for (const [key, value] of entries) {
+    out[key] = SECRET_HEADER_NAMES.has(key.toLowerCase()) ? "***REDACTED***" : String(value);
+  }
+  return out;
+}
+async function writeUpstreamTrace(record) {
+  const path = tracePath;
+  if (!path) return;
+  try {
+    await mkdir(dirname(path), { recursive: true });
+    await appendFile(path, JSON.stringify(record) + "\n", "utf8");
+  } catch {
+  }
+}
+function __resetUpstreamTraceForTests() {
+  tracePath = null;
+}
+
+export {
+  setUpstreamTracePath,
+  getUpstreamTracePath,
+  redactHeaders,
+  writeUpstreamTrace,
+  __resetUpstreamTraceForTests
+};

package/dist/{chunk-S4WBV25P.js → chunk-TOVPMMHM.js}

@@ -321,6 +321,7 @@ function handleStreamResponse(response, providerName, logger) {
   let pendingContent = "";
   let contentIndex = 0;
   let toolCallIndex = -1;
+  let textBuffered = false;
   const stream = new ReadableStream({
     async start(controller) {
       const reader = response.body.getReader();
@@ -338,6 +339,7 @@ function handleStreamResponse(response, providerName, logger) {
           }
           const candidate = chunk.candidates[0];
           const parts = candidate.content?.parts || [];
+          textBuffered = false;
           parts.filter((part) => part.text && part.thought === true).forEach((part) => {
             hasThinkingContent = true;
             const thinkingChunk = createChunk({
@@ -415,7 +417,7 @@ function handleStreamResponse(response, providerName, logger) {
           if (hasThinkingContent && textContent && !signatureSent) {
             if (chunk.modelVersion?.includes("3")) {
               pendingContent += textContent;
-              return;
+              textBuffered = true;
             } else {
               const signatureChunk = createChunk({
                 responseId: chunk.responseId,
@@ -433,7 +435,7 @@ function handleStreamResponse(response, providerName, logger) {
               signatureSent = true;
             }
           }
-          if (textContent) {
+          if (textContent && !textBuffered) {
             if (!pendingContent) contentIndex++;
             const contentChunk = createChunk({
               responseId: chunk.responseId,
@@ -790,6 +792,9 @@ function buildRequestBody(request) {
     }
   });
   const generationConfig = {};
+  if (request.max_tokens !== void 0) {
+    generationConfig.maxOutputTokens = request.max_tokens;
+  }
   if (request.reasoning?.effort && request.reasoning.effort !== "none") {
     generationConfig.thinkingConfig = {
       includeThoughts: true
@@ -841,7 +846,8 @@ function transformRequestOut(request) {
   const contents = request.contents;
   const tools = request.tools;
   const model = request.model;
-  const maxTokens = request.max_tokens;
+  const generationConfig = request.generationConfig;
+  const maxTokens = generationConfig?.maxOutputTokens ?? request.max_tokens;
   const temperature = request.temperature;
   const stream = request.stream;
   const toolChoice = request.tool_choice;
@@ -854,35 +860,116 @@ function transformRequestOut(request) {
     tool_choice: toolChoice
   };
   if (Array.isArray(contents)) {
+    const toolCallIdsByName = /* @__PURE__ */ new Map();
     for (const content of contents) {
       if (typeof content === "string") {
-        unifiedRequest.messages.push({
-          role: "user",
-          content
-        });
-      } else if ("text" in content && typeof content.text === "string") {
+        unifiedRequest.messages.push({ role: "user", content });
+        continue;
+      }
+      if (content && typeof content === "object" && "text" in content && typeof content.text === "string" && !("parts" in content)) {
         unifiedRequest.messages.push({
           role: "user",
           content: content.text || null
         });
-      } else if ("role" in content && content.role === "user") {
-        const geminiContent = content;
-        unifiedRequest.messages.push({
-          role: "user",
-          content: geminiContent.parts?.map((part) => ({
-            type: "text",
-            text: part.text || ""
-          })) || []
-        });
-      } else if (content.role === "model") {
+        continue;
+      }
+      if (!content || typeof content !== "object" || !("role" in content)) {
+        continue;
+      }
+      const geminiContent = content;
+      const isModel = geminiContent.role === "model";
+      const role = isModel ? "assistant" : "user";
+      const parts = geminiContent.parts ?? [];
+      const functionResponses = [];
+      const functionCalls = [];
+      const textParts = [];
+      const contentParts = [];
+      let thinkingText = "";
+      let signature;
+      for (const part of parts) {
+        if ("thoughtSignature" in part) {
+          signature = part.thoughtSignature;
+        }
+        if ("functionResponse" in part) {
+          functionResponses.push(part);
+        } else if ("functionCall" in part) {
+          functionCalls.push(part);
+        } else if ("inlineData" in part || "file_data" in part) {
+          const inline = part.inlineData;
+          const fileData = part.file_data;
+          if (inline?.data) {
+            const mime = inline.mime_type || "image/png";
+            contentParts.push({
+              type: "image_url",
+              image_url: { url: `data:${mime};base64,${inline.data}` },
+              media_type: mime
+            });
+          } else if (fileData?.file_uri) {
+            contentParts.push({
+              type: "image_url",
+              image_url: { url: fileData.file_uri },
+              media_type: fileData.mime_type
+            });
+          }
+        } else if ("text" in part) {
+          if (part.thought === true) {
+            thinkingText += part.text ?? "";
+          } else {
+            textParts.push(part);
+          }
+        }
+      }
+      for (const fr of functionResponses) {
+        const fnName = fr.functionResponse.name ?? "";
+        const queue = toolCallIdsByName.get(fnName);
+        const id = queue && queue.length > 0 ? queue.shift() : `tool_${Math.random().toString(36).substring(2, 15)}`;
+        const response = fr.functionResponse.response;
+        const result = response?.result;
+        const toolContent = typeof result === "string" ? result : result !== void 0 ? JSON.stringify(result) : response !== void 0 ? JSON.stringify(response) : "";
         unifiedRequest.messages.push({
-          role: "assistant",
-          content: content.parts?.map((part) => ({
-            type: "text",
-            text: part.text || ""
-          })) || []
+          role: "tool",
+          tool_call_id: id,
+          content: toolContent
         });
       }
+      const toolCalls = functionCalls.map((p) => {
+        const id = p.functionCall.id || `tool_${Math.random().toString(36).substring(2, 15)}`;
+        if (p.functionCall.name) {
+          const arr = toolCallIdsByName.get(p.functionCall.name) ?? [];
+          arr.push(id);
+          toolCallIdsByName.set(p.functionCall.name, arr);
+        }
+        return {
+          id,
+          type: "function",
+          function: {
+            name: p.functionCall.name,
+            arguments: JSON.stringify(p.functionCall.args ?? {})
+          }
+        };
+      });
+      const onlyToolResults = functionResponses.length > 0 && textParts.length === 0 && functionCalls.length === 0 && contentParts.length === 0 && !thinkingText && !signature;
+      if (onlyToolResults) continue;
+      let messageContent;
+      if (contentParts.length > 0) {
+        messageContent = [
+          ...textParts.map((p) => ({ type: "text", text: p.text })),
+          ...contentParts
+        ];
+      } else {
+        messageContent = textParts.map((p) => p.text).join("\n") || null;
+      }
+      const message = {
+        role,
+        content: messageContent
+      };
+      if (toolCalls.length > 0) {
+        message.tool_calls = toolCalls;
+      }
+      if (signature || thinkingText) {
+        message.thinking = { content: thinkingText || "", signature };
+      }
+      unifiedRequest.messages.push(message);
     }
   }
   if (Array.isArray(tools)) {
@@ -895,7 +982,7 @@ function transformRequestOut(request) {
             function: {
               name: funcDecl.name,
               description: funcDecl.description ?? "",
-              parameters: funcDecl.parameters ?? {}
+              parameters: funcDecl.parameters ?? funcDecl.parametersJsonSchema ?? {}
             }
           });
         }