@gullabs/google 0.11.0 → 0.12.0

package/dist/index.cjs

@@ -85,6 +85,31 @@ function normalizeGroundingCitations(groundingMetadata) {
   return citations;
 }
 
+// src/tool-call-id.ts
+function reserveProviderToolCallIds(ids) {
+  const reserved = /* @__PURE__ */ new Set();
+  for (const id of ids) {
+    if (typeof id === "string" && id.length > 0) reserved.add(id);
+  }
+  return reserved;
+}
+function nextFallbackToolCallId(toolName, counters, reserved, counterKey = toolName) {
+  let n = counters.get(counterKey) ?? 0;
+  let id;
+  do {
+    n += 1;
+    id = `call_${toolName}_${n}`;
+  } while (reserved.has(id));
+  counters.set(counterKey, n);
+  return id;
+}
+function resolveToolCallId(providerId, toolName, counters, reserved, counterKey) {
+  if (typeof providerId === "string" && providerId.length > 0) {
+    return providerId;
+  }
+  return nextFallbackToolCallId(toolName, counters, reserved, counterKey ?? toolName);
+}
+
 // src/flex-fallback.ts
 var CAPACITY_PATTERNS = [
   /capacity/i,
@@ -468,6 +493,7 @@ function mapPart(p) {
     case "tool-call":
       return {
         functionCall: {
+          id: p.toolCallId,
           name: p.toolName,
           args: p.args
         }
@@ -475,6 +501,7 @@ function mapPart(p) {
     case "tool-result":
       return {
         functionResponse: {
+          id: p.toolCallId,
           name: p.toolName,
           response: p.isError === true ? { error: p.result } : p.result
         }
@@ -768,11 +795,21 @@ function geminiAdapter(opts) {
       const textParts = [];
       const thoughtParts = [];
       const toolCalls = [];
+      const nameCounts = /* @__PURE__ */ new Map();
+      const reservedIds = reserveProviderToolCallIds(
+        parts.map((part) => part.functionCall?.id)
+      );
       for (const part of parts) {
         if (part.functionCall !== void 0 && typeof part.functionCall.name === "string") {
+          const toolName = part.functionCall.name;
           toolCalls.push({
-            toolCallId: part.functionCall.name,
-            toolName: part.functionCall.name,
+            toolCallId: resolveToolCallId(
+              part.functionCall.id,
+              toolName,
+              nameCounts,
+              reservedIds
+            ),
+            toolName,
             args: part.functionCall.args ?? {}
           });
         }
@@ -3352,7 +3389,7 @@ function convertMediaResolution(mediaResolution, location) {
   }
   return mapMediaResolutionLevel(mediaResolution.level, location);
 }
-function convertPart(part, location) {
+function convertPart(part, location, nameCounts, reservedIds) {
   const keys = definedKeys(part);
   const baseKeys = keys.filter(
     (key) => key === "text" || key === "inlineData" || key === "fileData"
@@ -3365,7 +3402,7 @@ function convertPart(part, location) {
       }
       return {
         kind: "tool-call",
-        toolCallId: fc.name,
+        toolCallId: resolveToolCallId(fc.id, fc.name, nameCounts, reservedIds),
         toolName: fc.name,
         args: fc.args ?? {}
       };
@@ -3377,7 +3414,13 @@ function convertPart(part, location) {
       }
       return {
         kind: "tool-result",
-        toolCallId: fr.name,
+        toolCallId: resolveToolCallId(
+          fr.id,
+          fr.name,
+          nameCounts,
+          reservedIds,
+          `result:${fr.name}`
+        ),
         toolName: fr.name,
         result: fr.response ?? null
       };
@@ -3492,6 +3535,15 @@ function convertSystemInstruction(systemInstruction) {
 }
 function geminiContentToMessages(input) {
   const system = input.systemInstruction !== void 0 ? convertSystemInstruction(input.systemInstruction) : void 0;
+  const nameCounts = /* @__PURE__ */ new Map();
+  const reservedIds = reserveProviderToolCallIds(
+    input.contents.flatMap(
+      (content) => (content.parts ?? []).flatMap((part) => {
+        const p = part;
+        return [p.functionCall?.id, p.functionResponse?.id];
+      })
+    )
+  );
   const messages = input.contents.map((content, contentIndex) => {
     const location = `contents[${contentIndex}]`;
     const envelopeExtraKeys = definedKeys(content).filter(
@@ -3504,7 +3556,7 @@ function geminiContentToMessages(input) {
     }
     const role = convertRole(content.role, location);
     const parts = (content.parts ?? []).map(
-      (part, partIndex) => convertPart(part, `${location}.parts[${partIndex}]`)
+      (part, partIndex) => convertPart(part, `${location}.parts[${partIndex}]`, nameCounts, reservedIds)
     );
     return { role, parts };
   });