@yourgpt/llm-sdk 2.1.5 → 2.1.6

package/dist/index.js

@@ -2165,6 +2165,8 @@ var Runtime = class {
     let accumulatedText = "";
     const toolCalls = [];
     let currentToolCall = null;
+    const serverToolResults = [];
+    const toolContextData = "toolContext" in this.config ? this.config.toolContext : void 0;
     let adapterUsage;
     const completionRequest = {
       messages: [],
@@ -2183,6 +2185,8 @@ var Runtime = class {
     for await (const event of stream) {
       switch (event.type) {
         case "message:start":
+          yield event;
+          break;
         case "message:end":
           yield event;
           break;
@@ -2191,7 +2195,12 @@ var Runtime = class {
           yield event;
           break;
         case "action:start":
-          currentToolCall = { id: event.id, name: event.name, args: "" };
+          currentToolCall = {
+            id: event.id,
+            name: event.name,
+            args: "",
+            ...event.extra_content ? { extra_content: event.extra_content } : {}
+          };
           if (debug) {
             console.log(`[Copilot SDK] Tool call started: ${event.name}`);
           }
@@ -2210,7 +2219,8 @@ var Runtime = class {
               toolCalls.push({
                 id: currentToolCall.id,
                 name: currentToolCall.name,
-                args: parsedArgs
+                args: parsedArgs,
+                ...currentToolCall.extra_content ? { extra_content: currentToolCall.extra_content } : {}
               });
             } catch (e) {
               console.error(
@@ -2221,13 +2231,71 @@ var Runtime = class {
               toolCalls.push({
                 id: currentToolCall.id,
                 name: currentToolCall.name,
-                args: {}
+                args: {},
+                ...currentToolCall.extra_content ? { extra_content: currentToolCall.extra_content } : {}
               });
             }
             currentToolCall = null;
           }
           yield event;
           break;
+        case "action:end": {
+          const toolName = event.name;
+          const tool2 = toolName ? selectedToolMap.get(toolName) : void 0;
+          if (tool2?.location === "server" && tool2.handler) {
+            if (debug) {
+              console.log(
+                `[Copilot SDK] Executing server-side tool: ${toolName}`
+              );
+            }
+            const tc = toolCalls.find((t) => t.id === event.id);
+            const args = tc?.args ?? {};
+            const toolContext = buildToolContext(
+              event.id,
+              signal,
+              request.threadId,
+              _httpRequest,
+              toolContextData
+            );
+            try {
+              const result = await tool2.handler(args, toolContext);
+              serverToolResults.push({
+                id: event.id,
+                name: toolName,
+                args,
+                result,
+                tool: tool2
+              });
+              yield {
+                type: "action:end",
+                id: event.id,
+                name: toolName,
+                result
+              };
+            } catch (error) {
+              const errorResult = {
+                success: false,
+                error: error instanceof Error ? error.message : "Tool execution failed"
+              };
+              serverToolResults.push({
+                id: event.id,
+                name: toolName,
+                args,
+                result: errorResult,
+                tool: tool2
+              });
+              yield {
+                type: "action:end",
+                id: event.id,
+                name: toolName,
+                error: error instanceof Error ? error.message : "Tool execution failed"
+              };
+            }
+          } else {
+            yield event;
+          }
+          break;
+        }
         case "citation":
           yield event;
           break;
@@ -2251,67 +2319,10 @@ var Runtime = class {
           toolCalls.map((t) => t.name)
         );
       }
-      const serverToolCalls = [];
-      const clientToolCalls = [];
-      for (const tc of toolCalls) {
-        const tool2 = selectedToolMap.get(tc.name);
-        if (tool2?.location === "server" && tool2.handler) {
-          serverToolCalls.push(tc);
-        } else {
-          clientToolCalls.push(tc);
-        }
-      }
-      const serverToolResults = [];
-      const toolContextData = "toolContext" in this.config ? this.config.toolContext : void 0;
-      for (const tc of serverToolCalls) {
-        const tool2 = selectedToolMap.get(tc.name);
-        if (tool2?.handler) {
-          if (debug) {
-            console.log(`[Copilot SDK] Executing server-side tool: ${tc.name}`);
-          }
-          const toolContext = buildToolContext(
-            tc.id,
-            signal,
-            request.threadId,
-            _httpRequest,
-            toolContextData
-          );
-          try {
-            const result = await tool2.handler(tc.args, toolContext);
-            serverToolResults.push({
-              id: tc.id,
-              name: tc.name,
-              args: tc.args,
-              result,
-              tool: tool2
-            });
-            yield {
-              type: "action:end",
-              id: tc.id,
-              name: tc.name,
-              result
-            };
-          } catch (error) {
-            const errorResult = {
-              success: false,
-              error: error instanceof Error ? error.message : "Tool execution failed"
-            };
-            serverToolResults.push({
-              id: tc.id,
-              name: tc.name,
-              args: tc.args,
-              result: errorResult,
-              tool: tool2
-            });
-            yield {
-              type: "action:end",
-              id: tc.id,
-              name: tc.name,
-              error: error instanceof Error ? error.message : "Tool execution failed"
-            };
-          }
-        }
-      }
+      const serverToolIds = new Set(serverToolResults.map((r) => r.id));
+      const clientToolCalls = toolCalls.filter(
+        (tc) => !serverToolIds.has(tc.id)
+      );
       if (serverToolResults.length > 0) {
         if (debug) {
           console.log(
@@ -2321,14 +2332,18 @@ var Runtime = class {
         const assistantWithToolCalls = {
           role: "assistant",
           content: accumulatedText || null,
-          tool_calls: serverToolCalls.map((tc) => ({
-            id: tc.id,
-            type: "function",
-            function: {
-              name: tc.name,
-              arguments: JSON.stringify(tc.args)
-            }
-          }))
+          tool_calls: serverToolResults.map((tr) => {
+            const tc = toolCalls.find((t) => t.id === tr.id);
+            return {
+              id: tr.id,
+              type: "function",
+              function: {
+                name: tr.name,
+                arguments: JSON.stringify(tr.args)
+              },
+              ...tc?.extra_content ? { extra_content: tc.extra_content } : {}
+            };
+          })
         };
         const toolResultMessages = serverToolResults.map(
           (tr) => {
@@ -2359,7 +2374,6 @@ var Runtime = class {
             result: result.result
           }))
         );
-        yield { type: "message:end" };
         for await (const event of this.processChatWithLoop(
           nextRequest,
           signal,
@@ -2383,7 +2397,8 @@ var Runtime = class {
             function: {
               name: tc.name,
               arguments: JSON.stringify(tc.args)
-            }
+            },
+            ...tc.extra_content ? { extra_content: tc.extra_content } : {}
           }))
         };
         newMessages.push(assistantMessage);
@@ -2602,7 +2617,8 @@ var Runtime = class {
                 function: {
                   name: tc.name,
                   arguments: JSON.stringify(tc.args)
-                }
+                },
+                ...tc.extra_content ? { extra_content: tc.extra_content } : {}
               }))
             };
             const toolResultMessages = serverToolResults.map((tr) => {
@@ -2644,7 +2660,8 @@ var Runtime = class {
                 function: {
                   name: tc.name,
                   arguments: JSON.stringify(tc.args)
-                }
+                },
+                ...tc.extra_content ? { extra_content: tc.extra_content } : {}
               }))
             };
             newMessages.push(assistantMessage);
@@ -2820,6 +2837,9 @@ var Runtime = class {
           storageHealthy = false;
         }
       }
+      if (resolvedThreadId) {
+        yield { type: "thread:created", threadId: resolvedThreadId };
+      }
       if (resolvedThreadId && storageHealthy) {
         try {
           const inputMsgs = extractInputMessages(request.messages);

package/dist/index.mjs

@@ -2163,6 +2163,8 @@ var Runtime = class {
     let accumulatedText = "";
     const toolCalls = [];
     let currentToolCall = null;
+    const serverToolResults = [];
+    const toolContextData = "toolContext" in this.config ? this.config.toolContext : void 0;
     let adapterUsage;
     const completionRequest = {
       messages: [],
@@ -2181,6 +2183,8 @@ var Runtime = class {
     for await (const event of stream) {
       switch (event.type) {
         case "message:start":
+          yield event;
+          break;
         case "message:end":
           yield event;
           break;
@@ -2189,7 +2193,12 @@ var Runtime = class {
           yield event;
           break;
         case "action:start":
-          currentToolCall = { id: event.id, name: event.name, args: "" };
+          currentToolCall = {
+            id: event.id,
+            name: event.name,
+            args: "",
+            ...event.extra_content ? { extra_content: event.extra_content } : {}
+          };
           if (debug) {
             console.log(`[Copilot SDK] Tool call started: ${event.name}`);
           }
@@ -2208,7 +2217,8 @@ var Runtime = class {
               toolCalls.push({
                 id: currentToolCall.id,
                 name: currentToolCall.name,
-                args: parsedArgs
+                args: parsedArgs,
+                ...currentToolCall.extra_content ? { extra_content: currentToolCall.extra_content } : {}
               });
             } catch (e) {
               console.error(
@@ -2219,13 +2229,71 @@ var Runtime = class {
               toolCalls.push({
                 id: currentToolCall.id,
                 name: currentToolCall.name,
-                args: {}
+                args: {},
+                ...currentToolCall.extra_content ? { extra_content: currentToolCall.extra_content } : {}
               });
             }
             currentToolCall = null;
           }
           yield event;
           break;
+        case "action:end": {
+          const toolName = event.name;
+          const tool2 = toolName ? selectedToolMap.get(toolName) : void 0;
+          if (tool2?.location === "server" && tool2.handler) {
+            if (debug) {
+              console.log(
+                `[Copilot SDK] Executing server-side tool: ${toolName}`
+              );
+            }
+            const tc = toolCalls.find((t) => t.id === event.id);
+            const args = tc?.args ?? {};
+            const toolContext = buildToolContext(
+              event.id,
+              signal,
+              request.threadId,
+              _httpRequest,
+              toolContextData
+            );
+            try {
+              const result = await tool2.handler(args, toolContext);
+              serverToolResults.push({
+                id: event.id,
+                name: toolName,
+                args,
+                result,
+                tool: tool2
+              });
+              yield {
+                type: "action:end",
+                id: event.id,
+                name: toolName,
+                result
+              };
+            } catch (error) {
+              const errorResult = {
+                success: false,
+                error: error instanceof Error ? error.message : "Tool execution failed"
+              };
+              serverToolResults.push({
+                id: event.id,
+                name: toolName,
+                args,
+                result: errorResult,
+                tool: tool2
+              });
+              yield {
+                type: "action:end",
+                id: event.id,
+                name: toolName,
+                error: error instanceof Error ? error.message : "Tool execution failed"
+              };
+            }
+          } else {
+            yield event;
+          }
+          break;
+        }
         case "citation":
           yield event;
           break;
@@ -2249,67 +2317,10 @@ var Runtime = class {
           toolCalls.map((t) => t.name)
         );
       }
-      const serverToolCalls = [];
-      const clientToolCalls = [];
-      for (const tc of toolCalls) {
-        const tool2 = selectedToolMap.get(tc.name);
-        if (tool2?.location === "server" && tool2.handler) {
-          serverToolCalls.push(tc);
-        } else {
-          clientToolCalls.push(tc);
-        }
-      }
-      const serverToolResults = [];
-      const toolContextData = "toolContext" in this.config ? this.config.toolContext : void 0;
-      for (const tc of serverToolCalls) {
-        const tool2 = selectedToolMap.get(tc.name);
-        if (tool2?.handler) {
-          if (debug) {
-            console.log(`[Copilot SDK] Executing server-side tool: ${tc.name}`);
-          }
-          const toolContext = buildToolContext(
-            tc.id,
-            signal,
-            request.threadId,
-            _httpRequest,
-            toolContextData
-          );
-          try {
-            const result = await tool2.handler(tc.args, toolContext);
-            serverToolResults.push({
-              id: tc.id,
-              name: tc.name,
-              args: tc.args,
-              result,
-              tool: tool2
-            });
-            yield {
-              type: "action:end",
-              id: tc.id,
-              name: tc.name,
-              result
-            };
-          } catch (error) {
-            const errorResult = {
-              success: false,
-              error: error instanceof Error ? error.message : "Tool execution failed"
-            };
-            serverToolResults.push({
-              id: tc.id,
-              name: tc.name,
-              args: tc.args,
-              result: errorResult,
-              tool: tool2
-            });
-            yield {
-              type: "action:end",
-              id: tc.id,
-              name: tc.name,
-              error: error instanceof Error ? error.message : "Tool execution failed"
-            };
-          }
-        }
-      }
+      const serverToolIds = new Set(serverToolResults.map((r) => r.id));
+      const clientToolCalls = toolCalls.filter(
+        (tc) => !serverToolIds.has(tc.id)
+      );
       if (serverToolResults.length > 0) {
         if (debug) {
           console.log(
@@ -2319,14 +2330,18 @@ var Runtime = class {
         const assistantWithToolCalls = {
           role: "assistant",
           content: accumulatedText || null,
-          tool_calls: serverToolCalls.map((tc) => ({
-            id: tc.id,
-            type: "function",
-            function: {
-              name: tc.name,
-              arguments: JSON.stringify(tc.args)
-            }
-          }))
+          tool_calls: serverToolResults.map((tr) => {
+            const tc = toolCalls.find((t) => t.id === tr.id);
+            return {
+              id: tr.id,
+              type: "function",
+              function: {
+                name: tr.name,
+                arguments: JSON.stringify(tr.args)
+              },
+              ...tc?.extra_content ? { extra_content: tc.extra_content } : {}
+            };
+          })
         };
         const toolResultMessages = serverToolResults.map(
           (tr) => {
@@ -2357,7 +2372,6 @@ var Runtime = class {
             result: result.result
           }))
         );
-        yield { type: "message:end" };
         for await (const event of this.processChatWithLoop(
           nextRequest,
           signal,
@@ -2381,7 +2395,8 @@ var Runtime = class {
             function: {
               name: tc.name,
               arguments: JSON.stringify(tc.args)
-            }
+            },
+            ...tc.extra_content ? { extra_content: tc.extra_content } : {}
           }))
         };
         newMessages.push(assistantMessage);
@@ -2600,7 +2615,8 @@ var Runtime = class {
                 function: {
                   name: tc.name,
                   arguments: JSON.stringify(tc.args)
-                }
+                },
+                ...tc.extra_content ? { extra_content: tc.extra_content } : {}
               }))
             };
             const toolResultMessages = serverToolResults.map((tr) => {
@@ -2642,7 +2658,8 @@ var Runtime = class {
                 function: {
                   name: tc.name,
                   arguments: JSON.stringify(tc.args)
-                }
+                },
+                ...tc.extra_content ? { extra_content: tc.extra_content } : {}
               }))
             };
             newMessages.push(assistantMessage);
@@ -2818,6 +2835,9 @@ var Runtime = class {
           storageHealthy = false;
         }
       }
+      if (resolvedThreadId) {
+        yield { type: "thread:created", threadId: resolvedThreadId };
+      }
       if (resolvedThreadId && storageHealthy) {
         try {
           const inputMsgs = extractInputMessages(request.messages);

package/dist/providers/anthropic/index.d.mts

@@ -1,7 +1,7 @@
 import { L as LanguageModel } from '../../types-CR8mi9I0.mjs';
-import { a as AnthropicProviderConfig, A as AIProvider } from '../../types-VDgiUvH2.mjs';
+import { a as AnthropicProviderConfig, A as AIProvider } from '../../types-DRqxMIjF.mjs';
 import 'zod';
-import '../../base-5n-UuPfS.mjs';
+import '../../base-D-U61JaB.mjs';
 
 /**
  * Anthropic Provider - Modern Pattern

package/dist/providers/anthropic/index.d.ts

@@ -1,7 +1,7 @@
 import { L as LanguageModel } from '../../types-CR8mi9I0.js';
-import { a as AnthropicProviderConfig, A as AIProvider } from '../../types-C0vLXzuw.js';
+import { a as AnthropicProviderConfig, A as AIProvider } from '../../types-BctsnC3g.js';
 import 'zod';
-import '../../base-Di31iy_8.js';
+import '../../base-iGi9Va6Z.js';
 
 /**
  * Anthropic Provider - Modern Pattern

package/dist/providers/azure/index.d.mts

@@ -1,5 +1,5 @@
-import { b as AzureProviderConfig, A as AIProvider } from '../../types-VDgiUvH2.mjs';
-import '../../base-5n-UuPfS.mjs';
+import { b as AzureProviderConfig, A as AIProvider } from '../../types-DRqxMIjF.mjs';
+import '../../base-D-U61JaB.mjs';
 import '../../types-CR8mi9I0.mjs';
 import 'zod';
 

package/dist/providers/azure/index.d.ts

@@ -1,5 +1,5 @@
-import { b as AzureProviderConfig, A as AIProvider } from '../../types-C0vLXzuw.js';
-import '../../base-Di31iy_8.js';
+import { b as AzureProviderConfig, A as AIProvider } from '../../types-BctsnC3g.js';
+import '../../base-iGi9Va6Z.js';
 import '../../types-CR8mi9I0.js';
 import 'zod';
 

package/dist/providers/azure/index.js

@@ -151,11 +151,13 @@ function formatMessagesForOpenAI(messages, systemPrompt) {
         content: messageToOpenAIContent(msg)
       });
     } else if (msg.role === "assistant") {
+      const hasToolCalls = msg.tool_calls && msg.tool_calls.length > 0;
       const assistantMsg = {
         role: "assistant",
-        content: msg.content
+        // Gemini/xAI (OpenAI-compatible) reject content: "" on assistant messages with tool_calls
+        content: hasToolCalls ? msg.content || null : msg.content
       };
-      if (msg.tool_calls && msg.tool_calls.length > 0) {
+      if (hasToolCalls) {
         assistantMsg.tool_calls = msg.tool_calls;
       }
       formatted.push(assistantMsg);

package/dist/providers/azure/index.mjs

@@ -149,11 +149,13 @@ function formatMessagesForOpenAI(messages, systemPrompt) {
         content: messageToOpenAIContent(msg)
       });
     } else if (msg.role === "assistant") {
+      const hasToolCalls = msg.tool_calls && msg.tool_calls.length > 0;
       const assistantMsg = {
         role: "assistant",
-        content: msg.content
+        // Gemini/xAI (OpenAI-compatible) reject content: "" on assistant messages with tool_calls
+        content: hasToolCalls ? msg.content || null : msg.content
       };
-      if (msg.tool_calls && msg.tool_calls.length > 0) {
+      if (hasToolCalls) {
         assistantMsg.tool_calls = msg.tool_calls;
       }
       formatted.push(assistantMsg);

package/dist/providers/google/index.d.mts

@@ -1,7 +1,7 @@
 import { L as LanguageModel } from '../../types-CR8mi9I0.mjs';
-import { G as GoogleProviderConfig, A as AIProvider } from '../../types-VDgiUvH2.mjs';
+import { G as GoogleProviderConfig, A as AIProvider } from '../../types-DRqxMIjF.mjs';
 import 'zod';
-import '../../base-5n-UuPfS.mjs';
+import '../../base-D-U61JaB.mjs';
 
 /**
  * Google Provider - OpenAI-Compatible

package/dist/providers/google/index.d.ts

@@ -1,7 +1,7 @@
 import { L as LanguageModel } from '../../types-CR8mi9I0.js';
-import { G as GoogleProviderConfig, A as AIProvider } from '../../types-C0vLXzuw.js';
+import { G as GoogleProviderConfig, A as AIProvider } from '../../types-BctsnC3g.js';
 import 'zod';
-import '../../base-Di31iy_8.js';
+import '../../base-iGi9Va6Z.js';
 
 /**
  * Google Provider - OpenAI-Compatible