@opencow-ai/opencow-agent-sdk 0.4.3 → 0.4.4

package/dist/sdk.js

@@ -68866,12 +68866,12 @@ function getOpus46CostTier(fastMode) {
   return COST_TIER_5_25;
 }
 function tokensToUSDCost(modelCosts, usage) {
-  return usage.input_tokens / 1e6 * modelCosts.inputTokens + usage.output_tokens / 1e6 * modelCosts.outputTokens + (usage.cache_read_input_tokens ?? 0) / 1e6 * modelCosts.promptCacheReadTokens + (usage.cache_creation_input_tokens ?? 0) / 1e6 * modelCosts.promptCacheWriteTokens + (usage.server_tool_use?.web_search_requests ?? 0) * modelCosts.webSearchRequests;
+  return (usage?.input_tokens ?? 0) / 1e6 * modelCosts.inputTokens + (usage?.output_tokens ?? 0) / 1e6 * modelCosts.outputTokens + (usage?.cache_read_input_tokens ?? 0) / 1e6 * modelCosts.promptCacheReadTokens + (usage?.cache_creation_input_tokens ?? 0) / 1e6 * modelCosts.promptCacheWriteTokens + (usage?.server_tool_use?.web_search_requests ?? 0) * modelCosts.webSearchRequests;
 }
 function getModelCosts(model, usage) {
   const shortName = getCanonicalName(model);
   if (shortName === firstPartyNameToCanonical(CLAUDE_OPUS_4_6_CONFIG.firstParty)) {
-    const isFastMode = usage.speed === "fast";
+    const isFastMode = usage?.speed === "fast";
     return getOpus46CostTier(isFastMode);
   }
   const costs = MODEL_COSTS[shortName];
@@ -94949,10 +94949,25 @@ function sanitizeTypeField(record3) {
     record3.type = filtered;
   }
 }
-function makeSchemaNullable(schema) {
+function makeSchemaNullable(schema, style = "union") {
   if ("enum" in schema || "const" in schema)
     return schema;
+  if (schema.nullable === true)
+    return schema;
   const raw = schema.type;
+  if (style === "nullable") {
+    if (typeof raw === "string") {
+      if (raw === "null")
+        return schema;
+      return { ...schema, nullable: true };
+    }
+    if (Array.isArray(raw)) {
+      if (raw.includes("null"))
+        return schema;
+      return { ...schema, nullable: true };
+    }
+    return schema;
+  }
   if (typeof raw === "string") {
     if (raw === "null")
       return schema;
@@ -94965,6 +94980,52 @@ function makeSchemaNullable(schema) {
   }
   return schema;
 }
+function splitTypeArrayToAnyOf(schema) {
+  if (!Array.isArray(schema.type) || schema.type.length < 2)
+    return schema;
+  const types2 = schema.type;
+  const hasNull = types2.includes("null");
+  const nonNullTypes = types2.filter((t) => t !== "null");
+  if (hasNull && nonNullTypes.length === 1) {
+    const { type: _type, ...rest } = schema;
+    return { ...rest, type: nonNullTypes[0], nullable: true };
+  }
+  const ARRAY_KEYS = new Set(["items"]);
+  const OBJECT_KEYS = new Set(["properties", "required", "additionalProperties"]);
+  const TYPE_SPECIFIC_KEYS = new Set([...ARRAY_KEYS, ...OBJECT_KEYS]);
+  const base2 = {};
+  const structural = {};
+  for (const [key, value] of Object.entries(schema)) {
+    if (key === "type")
+      continue;
+    if (TYPE_SPECIFIC_KEYS.has(key)) {
+      structural[key] = value;
+    } else {
+      base2[key] = value;
+    }
+  }
+  const variants = nonNullTypes.map((t) => {
+    const variant = { type: t };
+    if (t === "array") {
+      for (const k of ARRAY_KEYS) {
+        if (k in structural)
+          variant[k] = structural[k];
+      }
+    } else if (t === "object") {
+      for (const k of OBJECT_KEYS) {
+        if (k in structural)
+          variant[k] = structural[k];
+      }
+    }
+    return variant;
+  });
+  if (hasNull)
+    base2.nullable = true;
+  if (variants.length === 1) {
+    return { ...base2, ...variants[0] };
+  }
+  return { ...base2, anyOf: variants };
+}
 function sanitizeSchemaForOpenAICompat(schema) {
   const stripped = stripSchemaKeywords(schema, OPENAI_INCOMPATIBLE_SCHEMA_KEYWORDS);
   if (!isSchemaRecord(stripped)) {
@@ -95864,6 +95925,51 @@ var init_providerProfile = __esm(() => {
   ];
 });
 
+// src/providers/openai/capabilities.ts
+function supportsReasoningEffort(model) {
+  return /^(o\d|gpt-5|gpt-4\.5)/i.test(model);
+}
+function isGeminiLikeModel(model) {
+  const normalized = (model ?? "").trim().toLowerCase();
+  return normalized.startsWith("gemini-") || normalized.includes("/gemini-");
+}
+function isGeminiTarget(model) {
+  if (isEnvTruthy(getQueryEnvVar("CLAUDE_CODE_USE_GEMINI")))
+    return true;
+  return isGeminiLikeModel(model);
+}
+function supportsParallelToolCalls(model) {
+  return !isGeminiTarget(model);
+}
+function getOpenAICompatMaxOutputTokens(model) {
+  const max = getOpenAIMaxOutputTokens(model);
+  if (max === undefined)
+    return null;
+  return { default: max, upperLimit: max };
+}
+function getOpenAICompatContextWindow(model) {
+  return getOpenAIContextWindow(model) ?? null;
+}
+function openAICompatSupports(feature, model) {
+  if (feature === "reasoning-effort")
+    return supportsReasoningEffort(model);
+  if (feature === "parallel-tool-calls")
+    return supportsParallelToolCalls(model);
+  return FEATURES_OPENAI_COMPAT.includes(feature);
+}
+var FEATURES_OPENAI_COMPAT;
+var init_capabilities2 = __esm(() => {
+  init_openaiContextWindows();
+  init_envUtils();
+  init_state2();
+  FEATURES_OPENAI_COMPAT = Object.freeze([
+    "streaming",
+    "tool-use",
+    "image-input",
+    "system-message-top-level"
+  ]);
+});
+
 // src/providers/openai/shim.ts
 var exports_shim = {};
 __export(exports_shim, {
@@ -96033,15 +96139,18 @@ function convertMessages(messages, system) {
           }
         }
         if (otherContent.length > 0) {
-          result.push({
-            role: "user",
-            content: convertContentBlocks(otherContent)
-          });
+          const converted = convertContentBlocks(otherContent);
+          if (converted !== "") {
+            result.push({
+              role: "user",
+              content: converted
+            });
+          }
         }
       } else {
         result.push({
           role: "user",
-          content: convertContentBlocks(content)
+          content: convertContentBlocks(content) || "."
         });
       }
     } else if (role === "assistant") {
@@ -96053,7 +96162,8 @@ function convertMessages(messages, system) {
           role: "assistant",
           content: (() => {
             const c5 = convertContentBlocks(textContent);
-            return typeof c5 === "string" ? c5 : Array.isArray(c5) ? c5.map((p) => p.text ?? "").join("") : "";
+            const text = typeof c5 === "string" ? c5 : Array.isArray(c5) ? c5.map((p) => p.text ?? "").join("") : "";
+            return text || null;
           })()
         };
         if (thinkingBlocks.length > 0) {
@@ -96076,26 +96186,28 @@ function convertMessages(messages, system) {
         }
         result.push(assistantMsg);
       } else {
+        const c5 = convertContentBlocks(content);
+        const text = typeof c5 === "string" ? c5 : Array.isArray(c5) ? c5.map((p) => p.text ?? "").join("") : "";
         result.push({
           role: "assistant",
-          content: (() => {
-            const c5 = convertContentBlocks(content);
-            return typeof c5 === "string" ? c5 : Array.isArray(c5) ? c5.map((p) => p.text ?? "").join("") : "";
-          })()
+          content: text || null
         });
       }
     }
   }
   return result;
 }
-function normalizeSchemaForOpenAI(schema, strict = true, topLevel = true) {
-  const record3 = sanitizeSchemaForOpenAICompat(schema);
+function normalizeSchemaForOpenAI(schema, strict = true, topLevel = true, geminiTarget = false) {
+  let record3 = sanitizeSchemaForOpenAICompat(schema);
+  if (geminiTarget) {
+    record3 = splitTypeArrayToAnyOf(record3);
+  }
   if (record3.type === "object" && record3.properties) {
     const properties = record3.properties;
     const existingRequired = Array.isArray(record3.required) ? record3.required : [];
     const normalizedProps = {};
     for (const [key, value] of Object.entries(properties)) {
-      normalizedProps[key] = normalizeSchemaForOpenAI(value, strict, false);
+      normalizedProps[key] = normalizeSchemaForOpenAI(value, strict, false, geminiTarget);
     }
     record3.properties = normalizedProps;
     if (strict) {
@@ -96103,9 +96215,10 @@ function normalizeSchemaForOpenAI(schema, strict = true, topLevel = true) {
       record3.required = Array.from(new Set([...existingRequired, ...allKeys]));
       record3.additionalProperties = false;
       if (topLevel) {
+        const style = geminiTarget ? "nullable" : "union";
         for (const key of allKeys) {
           if (!existingRequired.includes(key)) {
-            normalizedProps[key] = makeSchemaNullable(normalizedProps[key]);
+            normalizedProps[key] = makeSchemaNullable(normalizedProps[key], style);
           }
         }
       }
@@ -96115,20 +96228,21 @@ function normalizeSchemaForOpenAI(schema, strict = true, topLevel = true) {
   }
   if ("items" in record3) {
     if (Array.isArray(record3.items)) {
-      record3.items = record3.items.map((item) => normalizeSchemaForOpenAI(item, strict, false));
+      record3.items = record3.items.map((item) => normalizeSchemaForOpenAI(item, strict, false, geminiTarget));
     } else {
-      record3.items = normalizeSchemaForOpenAI(record3.items, strict, false);
+      record3.items = normalizeSchemaForOpenAI(record3.items, strict, false, geminiTarget);
     }
   }
   for (const key of ["anyOf", "oneOf", "allOf"]) {
     if (key in record3 && Array.isArray(record3[key])) {
-      record3[key] = record3[key].map((item) => normalizeSchemaForOpenAI(item, strict, false));
+      record3[key] = record3[key].map((item) => normalizeSchemaForOpenAI(item, strict, false, geminiTarget));
     }
   }
   return record3;
 }
-function convertTools(tools) {
+function convertTools(tools, model = "") {
   const isGemini = isEnvTruthy(getQueryEnvVar("CLAUDE_CODE_USE_GEMINI"));
+  const geminiTarget = isGeminiTarget(model);
   return tools.filter((t) => t.name !== "ToolSearchTool").map((t) => {
     const schema = { ...t.input_schema ?? { type: "object", properties: {} } };
     if (t.name === "Agent" && schema.properties) {
@@ -96146,7 +96260,7 @@ function convertTools(tools) {
       function: {
         name: t.name,
         description: t.description ?? "",
-        parameters: normalizeSchemaForOpenAI(schema, !isGemini)
+        parameters: normalizeSchemaForOpenAI(schema, !isGemini, true, geminiTarget)
       }
     };
   });
@@ -96167,8 +96281,63 @@ function convertChunkUsage(usage) {
 function toOpenAIChatReasoningEffort(effort) {
   return effort === "xhigh" ? "high" : effort;
 }
+function getOpenAIChatProviderCapabilities(model) {
+  return {
+    supportsParallelToolCalls: openAICompatSupports("parallel-tool-calls", model)
+  };
+}
+function collectAdjacentToolMessages(messages, startIndex) {
+  const toolMessages = [];
+  for (let i2 = startIndex;i2 < messages.length && messages[i2]?.role === "tool"; i2++) {
+    toolMessages.push(messages[i2]);
+  }
+  return toolMessages;
+}
+function indexToolMessagesById(toolMessages) {
+  const byId = new Map;
+  for (const toolMessage of toolMessages) {
+    if (typeof toolMessage.tool_call_id === "string") {
+      byId.set(toolMessage.tool_call_id, toolMessage);
+    }
+  }
+  return byId;
+}
+function splitParallelToolCallTurn(assistantMessage, toolCalls, toolMessagesById) {
+  const serialized = [];
+  toolCalls.forEach((toolCall, index) => {
+    serialized.push({
+      ...assistantMessage,
+      tool_calls: [toolCall],
+      content: index === 0 ? assistantMessage.content : null
+    });
+    const toolResponse = toolMessagesById.get(toolCall.id);
+    if (toolResponse)
+      serialized.push(toolResponse);
+  });
+  return serialized;
+}
+function serializeParallelToolCalls(messages, capabilities) {
+  if (capabilities.supportsParallelToolCalls)
+    return messages;
+  const result = [];
+  for (let i2 = 0;i2 < messages.length; i2++) {
+    const message = messages[i2];
+    const toolCalls = message.tool_calls;
+    const isParallelToolTurn = message.role === "assistant" && (toolCalls?.length ?? 0) > 1;
+    if (!isParallelToolTurn || !toolCalls) {
+      result.push(message);
+      continue;
+    }
+    const toolMessages = collectAdjacentToolMessages(messages, i2 + 1);
+    const toolMessagesById = indexToolMessagesById(toolMessages);
+    result.push(...splitParallelToolCallTurn(message, toolCalls, toolMessagesById));
+    i2 += toolMessages.length;
+  }
+  return result;
+}
 function buildOpenAIRequestBody(params, ctx) {
-  const openaiMessages = convertMessages(params.messages, params.system);
+  const capabilities = getOpenAIChatProviderCapabilities(ctx.resolvedModel);
+  const openaiMessages = serializeParallelToolCalls(convertMessages(params.messages, params.system), capabilities);
   const body = {
     model: ctx.resolvedModel,
     messages: openaiMessages,
@@ -96196,9 +96365,12 @@ function buildOpenAIRequestBody(params, ctx) {
     body.reasoning_effort = toOpenAIChatReasoningEffort(ctx.reasoning.effort);
   }
   if (params.tools && params.tools.length > 0) {
-    const converted = convertTools(params.tools);
+    const converted = convertTools(params.tools, ctx.resolvedModel);
     if (converted.length > 0) {
       body.tools = converted;
+      if (!capabilities.supportsParallelToolCalls) {
+        body.parallel_tool_calls = false;
+      }
       if (params.tool_choice) {
         const tc = params.tool_choice;
         if (tc.type === "auto") {
@@ -96294,7 +96466,13 @@ async function* openaiStreamToAnthropic(response, model) {
               })}`);
             }
           }
-          if (delta.reasoning_content != null) {
+          let reasoningText = delta.reasoning_content ?? delta.reasoning;
+          if (reasoningText == null && Array.isArray(delta.reasoning_details)) {
+            const parts = delta.reasoning_details.map((d) => d.content ?? d.summary ?? "").filter(Boolean);
+            if (parts.length > 0)
+              reasoningText = parts.join("");
+          }
+          if (reasoningText != null) {
             if (reasoningBlockIndex === null) {
               reasoningBlockIndex = contentBlockIndex;
               contentBlockIndex++;
@@ -96316,7 +96494,7 @@ async function* openaiStreamToAnthropic(response, model) {
               index: reasoningBlockIndex,
               delta: {
                 type: "thinking_delta",
-                thinking: delta.reasoning_content
+                thinking: reasoningText
               }
             };
             continue;
@@ -96679,6 +96857,22 @@ class OpenAIShimMessages {
 function convertOpenAIResponseToAnthropic(data, model) {
   const choice = data.choices?.[0];
   const content = [];
+  const msg = choice?.message;
+  let reasoningText = msg?.reasoning_content ?? msg?.reasoning;
+  if (reasoningText == null && Array.isArray(msg?.reasoning_details)) {
+    const parts = msg.reasoning_details.map((d) => d.content ?? d.summary ?? "").filter(Boolean);
+    if (parts.length > 0)
+      reasoningText = parts.join(`
+`);
+  }
+  if (typeof reasoningText === "string" && reasoningText) {
+    content.push({
+      type: "thinking",
+      thinking: reasoningText,
+      signature: "",
+      extra_content: { provenance: "openai-chat" }
+    });
+  }
   const rawContent = choice?.message?.content;
   if (typeof rawContent === "string" && rawContent) {
     content.push({ type: "text", text: rawContent });
@@ -96782,6 +96976,7 @@ var init_shim2 = __esm(() => {
   init_config2();
   init_schemaSanitizer();
   init_providerProfile();
+  init_capabilities2();
   OpenAIShimStream = class OpenAIShimStream {
     generator;
     controller = new AbortController;
@@ -97054,36 +97249,6 @@ var init_anthropic = __esm(() => {
   init_errors6();
 });
 
-// src/providers/openai/capabilities.ts
-function supportsReasoningEffort(model) {
-  return /^(o\d|gpt-5|gpt-4\.5)/i.test(model);
-}
-function getOpenAICompatMaxOutputTokens(model) {
-  const max = getOpenAIMaxOutputTokens(model);
-  if (max === undefined)
-    return null;
-  return { default: max, upperLimit: max };
-}
-function getOpenAICompatContextWindow(model) {
-  return getOpenAIContextWindow(model) ?? null;
-}
-function openAICompatSupports(feature, model) {
-  if (feature === "reasoning-effort")
-    return supportsReasoningEffort(model);
-  return FEATURES_OPENAI_COMPAT.includes(feature);
-}
-var FEATURES_OPENAI_COMPAT;
-var init_capabilities2 = __esm(() => {
-  init_openaiContextWindows();
-  FEATURES_OPENAI_COMPAT = Object.freeze([
-    "streaming",
-    "tool-use",
-    "image-input",
-    "parallel-tool-calls",
-    "system-message-top-level"
-  ]);
-});
-
 // src/providers/openai/errors.ts
 function readErrorMessage(body) {
   if (!body || typeof body !== "object")
@@ -106603,7 +106768,7 @@ function isValidAdvisorModel(model) {
   return m.includes("opus-4-6") || m.includes("sonnet-4-6") || process.env.USER_TYPE === "ant";
 }
 function getAdvisorUsage(usage) {
-  const iterations = usage.iterations;
+  const iterations = usage?.iterations;
   if (!iterations) {
     return [];
   }
@@ -106644,11 +106809,11 @@ function addToTotalModelUsage(cost, usage, model) {
     contextWindow: 0,
     maxOutputTokens: 0
   };
-  modelUsage.inputTokens += usage.input_tokens;
-  modelUsage.outputTokens += usage.output_tokens;
-  modelUsage.cacheReadInputTokens += usage.cache_read_input_tokens ?? 0;
-  modelUsage.cacheCreationInputTokens += usage.cache_creation_input_tokens ?? 0;
-  modelUsage.webSearchRequests += usage.server_tool_use?.web_search_requests ?? 0;
+  modelUsage.inputTokens += usage?.input_tokens ?? 0;
+  modelUsage.outputTokens += usage?.output_tokens ?? 0;
+  modelUsage.cacheReadInputTokens += usage?.cache_read_input_tokens ?? 0;
+  modelUsage.cacheCreationInputTokens += usage?.cache_creation_input_tokens ?? 0;
+  modelUsage.webSearchRequests += usage?.server_tool_use?.web_search_requests ?? 0;
   modelUsage.costUSD += cost;
   modelUsage.contextWindow = getContextWindowForModel(model, getSdkBetas());
   modelUsage.maxOutputTokens = getModelMaxOutputTokens(model).default;
@@ -106657,15 +106822,18 @@ function addToTotalModelUsage(cost, usage, model) {
 function addToTotalSessionCost(cost, usage, model) {
   const modelUsage = addToTotalModelUsage(cost, usage, model);
   addToTotalCostState(cost, modelUsage, model);
-  const attrs = isFastModeEnabled() && usage.speed === "fast" ? { model, speed: "fast" } : { model };
+  const attrs = isFastModeEnabled() && usage?.speed === "fast" ? { model, speed: "fast" } : { model };
   getCostCounter()?.add(cost, attrs);
-  getTokenCounter()?.add(usage.input_tokens, { ...attrs, type: "input" });
-  getTokenCounter()?.add(usage.output_tokens, { ...attrs, type: "output" });
-  getTokenCounter()?.add(usage.cache_read_input_tokens ?? 0, {
+  getTokenCounter()?.add(usage?.input_tokens ?? 0, { ...attrs, type: "input" });
+  getTokenCounter()?.add(usage?.output_tokens ?? 0, {
+    ...attrs,
+    type: "output"
+  });
+  getTokenCounter()?.add(usage?.cache_read_input_tokens ?? 0, {
     ...attrs,
     type: "cacheRead"
   });
-  getTokenCounter()?.add(usage.cache_creation_input_tokens ?? 0, {
+  getTokenCounter()?.add(usage?.cache_creation_input_tokens ?? 0, {
     ...attrs,
     type: "cacheCreation"
   });
@@ -106944,10 +107112,10 @@ function getCLISyspromptPrefix(options) {
   return DEFAULT_PREFIX;
 }
 function isAttributionHeaderEnabled() {
-  if (isEnvDefinedFalsy(resolveEnvVar("ATTRIBUTION_HEADER"))) {
-    return false;
+  if (isEnvTruthy(resolveEnvVar("ATTRIBUTION_HEADER"))) {
+    return true;
   }
-  return getFeatureValue_CACHED_MAY_BE_STALE("tengu_attribution_header", true);
+  return getFeatureValue_CACHED_MAY_BE_STALE("tengu_attribution_header", false);
 }
 function getAttributionHeader(fingerprint) {
   if (!isAttributionHeaderEnabled()) {
@@ -106958,7 +107126,7 @@ function getAttributionHeader(fingerprint) {
   const cch = "";
   const workload = getWorkload();
   const workloadPair = workload ? ` cc_workload=${workload};` : "";
-  const header = `x-anthropic-billing-header: cc_version=${version2}; cc_entrypoint=${entrypoint};${cch}${workloadPair}`;
+  const header = `x-opencow-billing-header: cc_version=${version2}; cc_entrypoint=${entrypoint};${cch}${workloadPair}`;
   logForDebugging(`attribution header ${header}`);
   return header;
 }
@@ -282088,7 +282256,7 @@ function getAnthropicEnvMetadata() {
 function getBuildAgeMinutes() {
   if (false)
     ;
-  const buildTime = new Date("2026-05-25T12:12:24.294Z").getTime();
+  const buildTime = new Date("2026-06-03T08:42:39.310Z").getTime();
   if (isNaN(buildTime))
     return;
   return Math.floor((Date.now() - buildTime) / 60000);
@@ -292368,7 +292536,7 @@ function splitSysPromptPrefix(systemPrompt, options2) {
         continue;
       if (prompt === SYSTEM_PROMPT_DYNAMIC_BOUNDARY)
         continue;
-      if (prompt.startsWith("x-anthropic-billing-header")) {
+      if (prompt.startsWith("x-opencow-billing-header")) {
         attributionHeader2 = prompt;
       } else if (CLI_SYSPROMPT_PREFIXES.has(prompt)) {
         systemPromptPrefix2 = prompt;
@@ -292402,7 +292570,7 @@ function splitSysPromptPrefix(systemPrompt, options2) {
         const block2 = systemPrompt[i3];
         if (!block2 || block2 === SYSTEM_PROMPT_DYNAMIC_BOUNDARY)
           continue;
-        if (block2.startsWith("x-anthropic-billing-header")) {
+        if (block2.startsWith("x-opencow-billing-header")) {
           attributionHeader2 = block2;
         } else if (CLI_SYSPROMPT_PREFIXES.has(block2)) {
           systemPromptPrefix2 = block2;
@@ -292445,7 +292613,7 @@ function splitSysPromptPrefix(systemPrompt, options2) {
   for (const block2 of systemPrompt) {
     if (!block2)
       continue;
-    if (block2.startsWith("x-anthropic-billing-header")) {
+    if (block2.startsWith("x-opencow-billing-header")) {
       attributionHeader = block2;
     } else if (CLI_SYSPROMPT_PREFIXES.has(block2)) {
       systemPromptPrefix = block2;
@@ -335268,4 +335436,4 @@ export {
   AbortError2 as AbortError
 };
 
-//# debugId=532222AFD20CE11464756E2164756E21
+//# debugId=552EC502D1E35EC064756E2164756E21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencow-ai/opencow-agent-sdk",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "Claude Code opened to any LLM — OpenAI, Gemini, DeepSeek, Ollama, and 200+ models",
   "type": "module",
   "main": "./dist/sdk.js",