@threaded/ai 1.0.11 → 1.0.13

package/dist/index.js

@@ -691,42 +691,52 @@ var callGoogle = async (config, ctx) => {
   for (let i = 0; i < ctx.history.length; i++) {
     const msg2 = ctx.history[i];
     if (msg2.role === "assistant") {
-      const parts = [];
+      const parts2 = [];
       if (msg2.content) {
-        parts.push({ text: msg2.content });
+        parts2.push({ text: msg2.content });
       }
       if (msg2.tool_calls?.length) {
         for (const tc of msg2.tool_calls) {
           toolCallMap.set(tc.id, tc.function.name);
-          parts.push({
+          const part = {
             functionCall: {
               name: tc.function.name,
               args: JSON.parse(tc.function.arguments)
             }
-          });
+          };
+          if (tc.thoughtSignature) {
+            part.thoughtSignature = tc.thoughtSignature;
+          }
+          parts2.push(part);
         }
       }
-      if (parts.length > 0) {
-        contents.push({ role: "model", parts });
+      if (parts2.length > 0) {
+        contents.push({ role: "model", parts: parts2 });
       }
     } else if (msg2.role === "tool") {
-      const functionName = toolCallMap.get(msg2.tool_call_id);
-      if (functionName) {
-        let responseData;
-        try {
-          responseData = JSON.parse(msg2.content);
-        } catch {
-          responseData = { result: msg2.content };
-        }
-        contents.push({
-          role: "user",
-          parts: [{
+      const responseParts = [];
+      while (i < ctx.history.length && ctx.history[i].role === "tool") {
+        const toolMsg = ctx.history[i];
+        const functionName = toolCallMap.get(toolMsg.tool_call_id);
+        if (functionName) {
+          let responseData;
+          try {
+            responseData = JSON.parse(toolMsg.content);
+          } catch {
+            responseData = { result: toolMsg.content };
+          }
+          responseParts.push({
             functionResponse: {
               name: functionName,
               response: responseData
             }
-          }]
-        });
+          });
+        }
+        i++;
+      }
+      i--;
+      if (responseParts.length > 0) {
+        contents.push({ role: "user", parts: responseParts });
       }
     } else if (msg2.role === "user") {
       contents.push({
@@ -770,22 +780,33 @@ var callGoogle = async (config, ctx) => {
   }
   const data = await response.json();
   const candidate = data.candidates[0];
-  const part = candidate.content.parts[0];
+  const parts = candidate.content.parts || [];
   const msg = {
     role: "assistant",
-    content: part.text || ""
+    content: ""
   };
-  if (part.functionCall) {
-    msg.tool_calls = [
-      {
+  const toolCalls = [];
+  for (const part of parts) {
+    if (part.text) {
+      msg.content += part.text;
+    }
+    if (part.functionCall) {
+      const tc = {
         id: Math.random().toString(36).substring(2, 9),
         type: "function",
         function: {
           name: part.functionCall.name,
           arguments: JSON.stringify(part.functionCall.args)
         }
+      };
+      if (part.thoughtSignature) {
+        tc.thoughtSignature = part.thoughtSignature;
       }
-    ];
+      toolCalls.push(tc);
+    }
+  }
+  if (toolCalls.length > 0) {
+    msg.tool_calls = toolCalls;
   }
   return {
     ...ctx,
@@ -816,22 +837,28 @@ var handleGoogleStream = async (response, ctx) => {
           try {
             const parsed = JSON.parse(data);
             const candidate = parsed.candidates?.[0];
-            const part = candidate?.content?.parts?.[0];
-            if (part?.text) {
-              fullContent += part.text;
-              if (ctx.stream) {
-                ctx.stream({ type: "content", content: part.text });
+            const parts = candidate?.content?.parts || [];
+            for (const part of parts) {
+              if (part?.text) {
+                fullContent += part.text;
+                if (ctx.stream) {
+                  ctx.stream({ type: "content", content: part.text });
+                }
               }
-            }
-            if (part?.functionCall) {
-              toolCalls.push({
-                id: Math.random().toString(36).substring(2, 9),
-                type: "function",
-                function: {
-                  name: part.functionCall.name,
-                  arguments: JSON.stringify(part.functionCall.args)
+              if (part?.functionCall) {
+                const tc = {
+                  id: Math.random().toString(36).substring(2, 9),
+                  type: "function",
+                  function: {
+                    name: part.functionCall.name,
+                    arguments: JSON.stringify(part.functionCall.args)
+                  }
+                };
+                if (part.thoughtSignature) {
+                  tc.thoughtSignature = part.thoughtSignature;
                 }
-              });
+                toolCalls.push(tc);
+              }
             }
           } catch (e) {
           }