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

package/dist/adapters/index.js

@@ -213,6 +213,12 @@ function toGeminiSchema(rf) {
     GEMINI_UNSUPPORTED_KEYS
   );
 }
+function parameterToGeminiSchema(param) {
+  return stripSchemaKeys(
+    parameterToJsonSchema(param),
+    GEMINI_UNSUPPORTED_KEYS
+  );
+}
 function toOllamaFormat(rf) {
   if (!rf) return void 0;
   if (rf.type === "json_object") return "json";
@@ -1188,11 +1194,7 @@ var AnthropicAdapter = class {
         properties: action.parameters ? Object.fromEntries(
           Object.entries(action.parameters).map(([key, param]) => [
             key,
-            {
-              type: param.type,
-              description: param.description,
-              enum: param.enum
-            }
+            parameterToJsonSchema(param)
           ])
         ) : {},
         required: action.parameters ? Object.entries(action.parameters).filter(([, param]) => param.required).map(([key]) => key) : []
@@ -1305,6 +1307,11 @@ var AnthropicAdapter = class {
         content,
         toolCalls,
         thinking: thinking || void 0,
+        usage: response.usage ? {
+          promptTokens: response.usage.input_tokens ?? 0,
+          completionTokens: response.usage.output_tokens ?? 0,
+          totalTokens: (response.usage.input_tokens ?? 0) + (response.usage.output_tokens ?? 0)
+        } : void 0,
         rawResponse: response
       };
     } catch (error) {
@@ -1823,11 +1830,7 @@ function formatToolsForGemini(actions) {
         properties: Object.fromEntries(
           Object.entries(action.parameters).map(([key, param]) => [
             key,
-            {
-              type: param.type,
-              description: param.description,
-              enum: param.enum
-            }
+            parameterToGeminiSchema(param)
           ])
         ),
         required: Object.entries(action.parameters).filter(([, param]) => param.required).map(([key]) => key)
@@ -2163,6 +2166,11 @@ var GoogleAdapter = class {
     return {
       content: textContent,
       toolCalls,
+      usage: response.usageMetadata ? {
+        promptTokens: response.usageMetadata.promptTokenCount ?? 0,
+        completionTokens: (response.usageMetadata.candidatesTokenCount ?? 0) + (response.usageMetadata.thoughtsTokenCount ?? 0),
+        totalTokens: response.usageMetadata.totalTokenCount ?? 0
+      } : void 0,
       rawResponse: response
     };
   }
@@ -2391,6 +2399,11 @@ var AzureAdapter = class {
     return {
       content: message?.content || "",
       toolCalls,
+      usage: response.usage ? {
+        promptTokens: response.usage.prompt_tokens ?? 0,
+        completionTokens: response.usage.completion_tokens ?? 0,
+        totalTokens: response.usage.total_tokens ?? (response.usage.prompt_tokens ?? 0) + (response.usage.completion_tokens ?? 0)
+      } : void 0,
       rawResponse: response
     };
   }

package/dist/adapters/index.mjs

@@ -211,6 +211,12 @@ function toGeminiSchema(rf) {
     GEMINI_UNSUPPORTED_KEYS
   );
 }
+function parameterToGeminiSchema(param) {
+  return stripSchemaKeys(
+    parameterToJsonSchema(param),
+    GEMINI_UNSUPPORTED_KEYS
+  );
+}
 function toOllamaFormat(rf) {
   if (!rf) return void 0;
   if (rf.type === "json_object") return "json";
@@ -1186,11 +1192,7 @@ var AnthropicAdapter = class {
         properties: action.parameters ? Object.fromEntries(
           Object.entries(action.parameters).map(([key, param]) => [
             key,
-            {
-              type: param.type,
-              description: param.description,
-              enum: param.enum
-            }
+            parameterToJsonSchema(param)
           ])
         ) : {},
         required: action.parameters ? Object.entries(action.parameters).filter(([, param]) => param.required).map(([key]) => key) : []
@@ -1303,6 +1305,11 @@ var AnthropicAdapter = class {
         content,
         toolCalls,
         thinking: thinking || void 0,
+        usage: response.usage ? {
+          promptTokens: response.usage.input_tokens ?? 0,
+          completionTokens: response.usage.output_tokens ?? 0,
+          totalTokens: (response.usage.input_tokens ?? 0) + (response.usage.output_tokens ?? 0)
+        } : void 0,
         rawResponse: response
       };
     } catch (error) {
@@ -1821,11 +1828,7 @@ function formatToolsForGemini(actions) {
         properties: Object.fromEntries(
           Object.entries(action.parameters).map(([key, param]) => [
             key,
-            {
-              type: param.type,
-              description: param.description,
-              enum: param.enum
-            }
+            parameterToGeminiSchema(param)
           ])
         ),
         required: Object.entries(action.parameters).filter(([, param]) => param.required).map(([key]) => key)
@@ -2161,6 +2164,11 @@ var GoogleAdapter = class {
     return {
       content: textContent,
       toolCalls,
+      usage: response.usageMetadata ? {
+        promptTokens: response.usageMetadata.promptTokenCount ?? 0,
+        completionTokens: (response.usageMetadata.candidatesTokenCount ?? 0) + (response.usageMetadata.thoughtsTokenCount ?? 0),
+        totalTokens: response.usageMetadata.totalTokenCount ?? 0
+      } : void 0,
       rawResponse: response
     };
   }
@@ -2389,6 +2397,11 @@ var AzureAdapter = class {
     return {
       content: message?.content || "",
       toolCalls,
+      usage: response.usage ? {
+        promptTokens: response.usage.prompt_tokens ?? 0,
+        completionTokens: response.usage.completion_tokens ?? 0,
+        totalTokens: response.usage.total_tokens ?? (response.usage.prompt_tokens ?? 0) + (response.usage.completion_tokens ?? 0)
+      } : void 0,
       rawResponse: response
     };
   }

package/dist/index.d.mts

@@ -1001,7 +1001,7 @@ declare class Runtime {
      * 5. Loop continues until no more tool calls or max iterations reached
      * 6. Returns all new messages in the done event for client to append
      */
-    processChatWithLoop(request: ChatRequest, signal?: AbortSignal, _accumulatedMessages?: DoneEventMessage[], _isRecursive?: boolean, _httpRequest?: Request, _toolSearchState?: ToolSearchState): AsyncGenerator<StreamEvent>;
+    processChatWithLoop(request: ChatRequest, signal?: AbortSignal, _accumulatedMessages?: DoneEventMessage[], _isRecursive?: boolean, _httpRequest?: Request, _toolSearchState?: ToolSearchState, _iteration?: number): AsyncGenerator<StreamEvent>;
     /**
      * Non-streaming agent loop implementation
      *

package/dist/index.d.ts

@@ -1001,7 +1001,7 @@ declare class Runtime {
      * 5. Loop continues until no more tool calls or max iterations reached
      * 6. Returns all new messages in the done event for client to append
      */
-    processChatWithLoop(request: ChatRequest, signal?: AbortSignal, _accumulatedMessages?: DoneEventMessage[], _isRecursive?: boolean, _httpRequest?: Request, _toolSearchState?: ToolSearchState): AsyncGenerator<StreamEvent>;
+    processChatWithLoop(request: ChatRequest, signal?: AbortSignal, _accumulatedMessages?: DoneEventMessage[], _isRecursive?: boolean, _httpRequest?: Request, _toolSearchState?: ToolSearchState, _iteration?: number): AsyncGenerator<StreamEvent>;
     /**
      * Non-streaming agent loop implementation
      *

package/dist/index.js

@@ -2112,7 +2112,7 @@ var Runtime = class {
    * 5. Loop continues until no more tool calls or max iterations reached
    * 6. Returns all new messages in the done event for client to append
    */
-  async *processChatWithLoop(request, signal, _accumulatedMessages, _isRecursive, _httpRequest, _toolSearchState) {
+  async *processChatWithLoop(request, signal, _accumulatedMessages, _isRecursive, _httpRequest, _toolSearchState, _iteration = 0) {
     const debug = this.config.debug;
     if (request.streaming === false) {
       if (debug) {
@@ -2131,7 +2131,25 @@ var Runtime = class {
       return;
     }
     const newMessages = _accumulatedMessages || [];
-    this.config.maxIterations ?? 20;
+    const maxIterations = this.config.maxIterations ?? 20;
+    if (signal?.aborted) {
+      yield {
+        type: "error",
+        message: "Aborted",
+        code: "ABORTED"
+      };
+      return;
+    }
+    if (_iteration >= maxIterations) {
+      if (debug) {
+        console.log(`[Copilot SDK] Max iterations (${maxIterations}) reached`);
+      }
+      yield {
+        type: "done",
+        messages: newMessages.length > 0 ? newMessages : void 0
+      };
+      return;
+    }
     const allTools = this.collectToolsForRequest(request);
     const nativeToolSearch = this.resolveNativeToolSearchForRequest(request);
     const nativeToolCatalog = nativeToolSearch ? this.buildNativeToolCatalogForRequest(request, allTools) : null;
@@ -2393,7 +2411,8 @@ var Runtime = class {
           true,
           // Mark as recursive
           _httpRequest,
-          nextToolSearchState
+          nextToolSearchState,
+          _iteration + 1
         )) {
           yield event;
         }
@@ -2490,7 +2509,9 @@ var Runtime = class {
           _accumulatedMessages,
           _isRecursive,
           _httpRequest,
-          toolSearchState
+          toolSearchState,
+          iteration
+          // carry the non-streaming loop's depth into the streaming sub-call
         )) {
           yield event;
         }

package/dist/index.mjs

@@ -2110,7 +2110,7 @@ var Runtime = class {
    * 5. Loop continues until no more tool calls or max iterations reached
    * 6. Returns all new messages in the done event for client to append
    */
-  async *processChatWithLoop(request, signal, _accumulatedMessages, _isRecursive, _httpRequest, _toolSearchState) {
+  async *processChatWithLoop(request, signal, _accumulatedMessages, _isRecursive, _httpRequest, _toolSearchState, _iteration = 0) {
     const debug = this.config.debug;
     if (request.streaming === false) {
       if (debug) {
@@ -2129,7 +2129,25 @@ var Runtime = class {
       return;
     }
     const newMessages = _accumulatedMessages || [];
-    this.config.maxIterations ?? 20;
+    const maxIterations = this.config.maxIterations ?? 20;
+    if (signal?.aborted) {
+      yield {
+        type: "error",
+        message: "Aborted",
+        code: "ABORTED"
+      };
+      return;
+    }
+    if (_iteration >= maxIterations) {
+      if (debug) {
+        console.log(`[Copilot SDK] Max iterations (${maxIterations}) reached`);
+      }
+      yield {
+        type: "done",
+        messages: newMessages.length > 0 ? newMessages : void 0
+      };
+      return;
+    }
     const allTools = this.collectToolsForRequest(request);
     const nativeToolSearch = this.resolveNativeToolSearchForRequest(request);
     const nativeToolCatalog = nativeToolSearch ? this.buildNativeToolCatalogForRequest(request, allTools) : null;
@@ -2391,7 +2409,8 @@ var Runtime = class {
           true,
           // Mark as recursive
           _httpRequest,
-          nextToolSearchState
+          nextToolSearchState,
+          _iteration + 1
         )) {
           yield event;
         }
@@ -2488,7 +2507,9 @@ var Runtime = class {
           _accumulatedMessages,
           _isRecursive,
           _httpRequest,
-          toolSearchState
+          toolSearchState,
+          iteration
+          // carry the non-streaming loop's depth into the streaming sub-call
         )) {
           yield event;
         }

package/dist/providers/anthropic/index.js

@@ -39,6 +39,34 @@ ${stringifyForDebug(payload)}`
     );
   }
 }
+function parameterToJsonSchema(param) {
+  const schema = {
+    type: param.type
+  };
+  if (param.description) {
+    schema.description = param.description;
+  }
+  if (param.enum) {
+    schema.enum = param.enum;
+  }
+  if (param.type === "array" && param.items) {
+    schema.items = parameterToJsonSchema(
+      param.items
+    );
+  }
+  if (param.type === "object" && param.properties) {
+    schema.properties = Object.fromEntries(
+      Object.entries(param.properties).map(([key, prop]) => [
+        key,
+        parameterToJsonSchema(
+          prop
+        )
+      ])
+    );
+    schema.additionalProperties = false;
+  }
+  return schema;
+}
 function stripSchemaKeys(schema, keysToDrop, options = {}) {
   if (Array.isArray(schema)) {
     return schema.map((item) => stripSchemaKeys(item, keysToDrop, options));
@@ -863,11 +891,7 @@ var AnthropicAdapter = class {
         properties: action.parameters ? Object.fromEntries(
           Object.entries(action.parameters).map(([key, param]) => [
             key,
-            {
-              type: param.type,
-              description: param.description,
-              enum: param.enum
-            }
+            parameterToJsonSchema(param)
           ])
         ) : {},
         required: action.parameters ? Object.entries(action.parameters).filter(([, param]) => param.required).map(([key]) => key) : []
@@ -980,6 +1004,11 @@ var AnthropicAdapter = class {
         content,
         toolCalls,
         thinking: thinking || void 0,
+        usage: response.usage ? {
+          promptTokens: response.usage.input_tokens ?? 0,
+          completionTokens: response.usage.output_tokens ?? 0,
+          totalTokens: (response.usage.input_tokens ?? 0) + (response.usage.output_tokens ?? 0)
+        } : void 0,
         rawResponse: response
       };
     } catch (error) {

package/dist/providers/anthropic/index.mjs

@@ -37,6 +37,34 @@ ${stringifyForDebug(payload)}`
     );
   }
 }
+function parameterToJsonSchema(param) {
+  const schema = {
+    type: param.type
+  };
+  if (param.description) {
+    schema.description = param.description;
+  }
+  if (param.enum) {
+    schema.enum = param.enum;
+  }
+  if (param.type === "array" && param.items) {
+    schema.items = parameterToJsonSchema(
+      param.items
+    );
+  }
+  if (param.type === "object" && param.properties) {
+    schema.properties = Object.fromEntries(
+      Object.entries(param.properties).map(([key, prop]) => [
+        key,
+        parameterToJsonSchema(
+          prop
+        )
+      ])
+    );
+    schema.additionalProperties = false;
+  }
+  return schema;
+}
 function stripSchemaKeys(schema, keysToDrop, options = {}) {
   if (Array.isArray(schema)) {
     return schema.map((item) => stripSchemaKeys(item, keysToDrop, options));
@@ -861,11 +889,7 @@ var AnthropicAdapter = class {
         properties: action.parameters ? Object.fromEntries(
           Object.entries(action.parameters).map(([key, param]) => [
             key,
-            {
-              type: param.type,
-              description: param.description,
-              enum: param.enum
-            }
+            parameterToJsonSchema(param)
           ])
         ) : {},
         required: action.parameters ? Object.entries(action.parameters).filter(([, param]) => param.required).map(([key]) => key) : []
@@ -978,6 +1002,11 @@ var AnthropicAdapter = class {
         content,
         toolCalls,
         thinking: thinking || void 0,
+        usage: response.usage ? {
+          promptTokens: response.usage.input_tokens ?? 0,
+          completionTokens: response.usage.output_tokens ?? 0,
+          totalTokens: (response.usage.input_tokens ?? 0) + (response.usage.output_tokens ?? 0)
+        } : void 0,
         rawResponse: response
       };
     } catch (error) {

package/dist/providers/azure/index.js

@@ -419,6 +419,11 @@ var AzureAdapter = class {
     return {
       content: message?.content || "",
       toolCalls,
+      usage: response.usage ? {
+        promptTokens: response.usage.prompt_tokens ?? 0,
+        completionTokens: response.usage.completion_tokens ?? 0,
+        totalTokens: response.usage.total_tokens ?? (response.usage.prompt_tokens ?? 0) + (response.usage.completion_tokens ?? 0)
+      } : void 0,
       rawResponse: response
     };
   }

package/dist/providers/azure/index.mjs

@@ -417,6 +417,11 @@ var AzureAdapter = class {
     return {
       content: message?.content || "",
       toolCalls,
+      usage: response.usage ? {
+        promptTokens: response.usage.prompt_tokens ?? 0,
+        completionTokens: response.usage.completion_tokens ?? 0,
+        totalTokens: response.usage.total_tokens ?? (response.usage.prompt_tokens ?? 0) + (response.usage.completion_tokens ?? 0)
+      } : void 0,
       rawResponse: response
     };
   }

package/package.json

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