npm - @yourgpt/llm-sdk - Versions diffs - 2.5.1-beta.5 → 2.5.1-beta.6 - Mend

@yourgpt/llm-sdk 2.5.1-beta.5 → 2.5.1-beta.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/index.js CHANGED Viewed

@@ -1052,6 +1052,14 @@ var StreamResult = class {
         }
         if (event.requiresAction) {
           collected.requiresAction = true;
+          const resolvedToolIds = new Set(
+            (event.messages ?? []).filter((m) => m.role === "tool" && m.tool_call_id).map((m) => m.tool_call_id)
+          );
+          if (resolvedToolIds.size > 0) {
+            collected.toolCalls = collected.toolCalls.filter(
+              (tc) => !resolvedToolIds.has(tc.id)
+            );
+          }
         }
         if (event.usage) {
           this.capturedUsage = event.usage;
@@ -2353,6 +2361,49 @@ var Runtime = class {
       const clientToolCalls = toolCalls.filter(
         (tc) => !serverToolIds.has(tc.id)
       );
+      const serverToolResultMessages = serverToolResults.map((tr) => {
+        const aiContent = buildToolResultForAI(tr.tool, tr.result, tr.args);
+        const content = typeof aiContent === "string" ? aiContent : JSON.stringify(serializeToolResultContent(aiContent));
+        return {
+          role: "tool",
+          content,
+          tool_call_id: tr.id
+        };
+      });
+      if (serverToolResults.length > 0 && clientToolCalls.length > 0) {
+        if (debug) {
+          console.log(
+            `[Copilot SDK] Mixed turn: ${serverToolResults.length} server + ${clientToolCalls.length} client tool(s). Suspending for client tools.`
+          );
+        }
+        const assistantMessage = {
+          role: "assistant",
+          content: accumulatedText || null,
+          tool_calls: toolCalls.map((tc) => ({
+            id: tc.id,
+            type: "function",
+            function: {
+              name: tc.name,
+              arguments: JSON.stringify(tc.args)
+            },
+            ...tc.extra_content ? { extra_content: tc.extra_content } : {}
+          }))
+        };
+        newMessages.push(assistantMessage);
+        newMessages.push(...serverToolResultMessages);
+        yield {
+          type: "tool_calls",
+          toolCalls: clientToolCalls,
+          assistantMessage
+        };
+        yield {
+          type: "done",
+          requiresAction: true,
+          messages: newMessages,
+          usage: adapterUsage
+        };
+        return;
+      }
       if (serverToolResults.length > 0) {
         if (debug) {
           console.log(
@@ -2375,17 +2426,7 @@ var Runtime = class {
             };
           })
         };
-        const toolResultMessages = serverToolResults.map(
-          (tr) => {
-            const aiContent = buildToolResultForAI(tr.tool, tr.result, tr.args);
-            const content = typeof aiContent === "string" ? aiContent : JSON.stringify(serializeToolResultContent(aiContent));
-            return {
-              role: "tool",
-              content,
-              tool_call_id: tr.id
-            };
-          }
-        );
+        const toolResultMessages = serverToolResultMessages;
         newMessages.push(assistantWithToolCalls);
         newMessages.push(...toolResultMessages);
         const messagesWithResults = [
@@ -2640,6 +2681,48 @@ var Runtime = class {
               }
             }
           }
+          const serverToolResultMessages = serverToolResults.map((tr) => {
+            const aiContent = buildToolResultForAI(
+              tr.tool,
+              tr.result,
+              tr.args
+            );
+            const content = typeof aiContent === "string" ? aiContent : JSON.stringify(serializeToolResultContent(aiContent));
+            return {
+              role: "tool",
+              content,
+              tool_call_id: tr.id
+            };
+          });
+          if (serverToolResults.length > 0 && clientToolCalls.length > 0) {
+            const assistantMessage = {
+              role: "assistant",
+              content: result.content || null,
+              tool_calls: result.toolCalls.map((tc) => ({
+                id: tc.id,
+                type: "function",
+                function: {
+                  name: tc.name,
+                  arguments: JSON.stringify(tc.args)
+                },
+                ...tc.extra_content ? { extra_content: tc.extra_content } : {}
+              }))
+            };
+            newMessages.push(assistantMessage);
+            newMessages.push(...serverToolResultMessages);
+            yield {
+              type: "tool_calls",
+              toolCalls: clientToolCalls,
+              assistantMessage
+            };
+            yield {
+              type: "done",
+              requiresAction: true,
+              messages: newMessages,
+              usage: accumulatedUsage.total_tokens > 0 ? accumulatedUsage : void 0
+            };
+            return;
+          }
           if (serverToolResults.length > 0) {
             const assistantWithToolCalls = {
               role: "assistant",
@@ -2654,19 +2737,7 @@ var Runtime = class {
                 ...tc.extra_content ? { extra_content: tc.extra_content } : {}
               }))
             };
-            const toolResultMessages = serverToolResults.map((tr) => {
-              const aiContent = buildToolResultForAI(
-                tr.tool,
-                tr.result,
-                tr.args
-              );
-              const content = typeof aiContent === "string" ? aiContent : JSON.stringify(serializeToolResultContent(aiContent));
-              return {
-                role: "tool",
-                content,
-                tool_call_id: tr.id
-              };
-            });
+            const toolResultMessages = serverToolResultMessages;
             newMessages.push(assistantWithToolCalls);
             newMessages.push(...toolResultMessages);
             conversationMessages = [
@@ -3005,10 +3076,23 @@ var Runtime = class {
               result: event.result || event.error
             });
             break;
-          case "done":
+          case "done": {
             messages = event.messages || [];
             requiresAction = event.requiresAction || false;
+            if (requiresAction) {
+              const resolvedToolIds = new Set(
+                messages.filter((m) => m.role === "tool" && m.tool_call_id).map((m) => m.tool_call_id)
+              );
+              if (resolvedToolIds.size > 0) {
+                for (let i = toolCalls.length - 1; i >= 0; i--) {
+                  if (resolvedToolIds.has(toolCalls[i].id)) {
+                    toolCalls.splice(i, 1);
+                  }
+                }
+              }
+            }
             break;
+          }
           case "error":
             error = { message: event.message, code: event.code };
             break;

package/dist/index.mjs CHANGED Viewed

@@ -1050,6 +1050,14 @@ var StreamResult = class {
         }
         if (event.requiresAction) {
           collected.requiresAction = true;
+          const resolvedToolIds = new Set(
+            (event.messages ?? []).filter((m) => m.role === "tool" && m.tool_call_id).map((m) => m.tool_call_id)
+          );
+          if (resolvedToolIds.size > 0) {
+            collected.toolCalls = collected.toolCalls.filter(
+              (tc) => !resolvedToolIds.has(tc.id)
+            );
+          }
         }
         if (event.usage) {
           this.capturedUsage = event.usage;
@@ -2351,6 +2359,49 @@ var Runtime = class {
       const clientToolCalls = toolCalls.filter(
         (tc) => !serverToolIds.has(tc.id)
       );
+      const serverToolResultMessages = serverToolResults.map((tr) => {
+        const aiContent = buildToolResultForAI(tr.tool, tr.result, tr.args);
+        const content = typeof aiContent === "string" ? aiContent : JSON.stringify(serializeToolResultContent(aiContent));
+        return {
+          role: "tool",
+          content,
+          tool_call_id: tr.id
+        };
+      });
+      if (serverToolResults.length > 0 && clientToolCalls.length > 0) {
+        if (debug) {
+          console.log(
+            `[Copilot SDK] Mixed turn: ${serverToolResults.length} server + ${clientToolCalls.length} client tool(s). Suspending for client tools.`
+          );
+        }
+        const assistantMessage = {
+          role: "assistant",
+          content: accumulatedText || null,
+          tool_calls: toolCalls.map((tc) => ({
+            id: tc.id,
+            type: "function",
+            function: {
+              name: tc.name,
+              arguments: JSON.stringify(tc.args)
+            },
+            ...tc.extra_content ? { extra_content: tc.extra_content } : {}
+          }))
+        };
+        newMessages.push(assistantMessage);
+        newMessages.push(...serverToolResultMessages);
+        yield {
+          type: "tool_calls",
+          toolCalls: clientToolCalls,
+          assistantMessage
+        };
+        yield {
+          type: "done",
+          requiresAction: true,
+          messages: newMessages,
+          usage: adapterUsage
+        };
+        return;
+      }
       if (serverToolResults.length > 0) {
         if (debug) {
           console.log(
@@ -2373,17 +2424,7 @@ var Runtime = class {
             };
           })
         };
-        const toolResultMessages = serverToolResults.map(
-          (tr) => {
-            const aiContent = buildToolResultForAI(tr.tool, tr.result, tr.args);
-            const content = typeof aiContent === "string" ? aiContent : JSON.stringify(serializeToolResultContent(aiContent));
-            return {
-              role: "tool",
-              content,
-              tool_call_id: tr.id
-            };
-          }
-        );
+        const toolResultMessages = serverToolResultMessages;
         newMessages.push(assistantWithToolCalls);
         newMessages.push(...toolResultMessages);
         const messagesWithResults = [
@@ -2638,6 +2679,48 @@ var Runtime = class {
               }
             }
           }
+          const serverToolResultMessages = serverToolResults.map((tr) => {
+            const aiContent = buildToolResultForAI(
+              tr.tool,
+              tr.result,
+              tr.args
+            );
+            const content = typeof aiContent === "string" ? aiContent : JSON.stringify(serializeToolResultContent(aiContent));
+            return {
+              role: "tool",
+              content,
+              tool_call_id: tr.id
+            };
+          });
+          if (serverToolResults.length > 0 && clientToolCalls.length > 0) {
+            const assistantMessage = {
+              role: "assistant",
+              content: result.content || null,
+              tool_calls: result.toolCalls.map((tc) => ({
+                id: tc.id,
+                type: "function",
+                function: {
+                  name: tc.name,
+                  arguments: JSON.stringify(tc.args)
+                },
+                ...tc.extra_content ? { extra_content: tc.extra_content } : {}
+              }))
+            };
+            newMessages.push(assistantMessage);
+            newMessages.push(...serverToolResultMessages);
+            yield {
+              type: "tool_calls",
+              toolCalls: clientToolCalls,
+              assistantMessage
+            };
+            yield {
+              type: "done",
+              requiresAction: true,
+              messages: newMessages,
+              usage: accumulatedUsage.total_tokens > 0 ? accumulatedUsage : void 0
+            };
+            return;
+          }
           if (serverToolResults.length > 0) {
             const assistantWithToolCalls = {
               role: "assistant",
@@ -2652,19 +2735,7 @@ var Runtime = class {
                 ...tc.extra_content ? { extra_content: tc.extra_content } : {}
               }))
             };
-            const toolResultMessages = serverToolResults.map((tr) => {
-              const aiContent = buildToolResultForAI(
-                tr.tool,
-                tr.result,
-                tr.args
-              );
-              const content = typeof aiContent === "string" ? aiContent : JSON.stringify(serializeToolResultContent(aiContent));
-              return {
-                role: "tool",
-                content,
-                tool_call_id: tr.id
-              };
-            });
+            const toolResultMessages = serverToolResultMessages;
             newMessages.push(assistantWithToolCalls);
             newMessages.push(...toolResultMessages);
             conversationMessages = [
@@ -3003,10 +3074,23 @@ var Runtime = class {
               result: event.result || event.error
             });
             break;
-          case "done":
+          case "done": {
             messages = event.messages || [];
             requiresAction = event.requiresAction || false;
+            if (requiresAction) {
+              const resolvedToolIds = new Set(
+                messages.filter((m) => m.role === "tool" && m.tool_call_id).map((m) => m.tool_call_id)
+              );
+              if (resolvedToolIds.size > 0) {
+                for (let i = toolCalls.length - 1; i >= 0; i--) {
+                  if (resolvedToolIds.has(toolCalls[i].id)) {
+                    toolCalls.splice(i, 1);
+                  }
+                }
+              }
+            }
             break;
+          }
           case "error":
             error = { message: event.message, code: event.code };
             break;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@yourgpt/llm-sdk",
-  "version": "2.5.1-beta.5",
+  "version": "2.5.1-beta.6",
   "description": "AI SDK for building AI Agents with any LLM",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",