@yourgpt/llm-sdk 2.5.1-beta.6 → 2.6.0-beta.1

package/dist/index.js

@@ -132,6 +132,14 @@ function formatToolsForGoogle(tools) {
   ];
 }
 
+// src/core/provider-error.ts
+function throwIfAborted(signal) {
+  if (!signal?.aborted) return;
+  const error = new Error("The operation was aborted");
+  error.name = "AbortError";
+  throw error;
+}
+
 // src/core/generate-text.ts
 async function generateText(params) {
   const { model, tools, maxSteps = 1, signal } = params;
@@ -145,22 +153,23 @@ async function generateText(params) {
   const allToolCalls = [];
   const allToolResults = [];
   for (let step = 0; step < maxSteps; step++) {
-    if (signal?.aborted) {
-      throw new Error("Generation aborted");
-    }
+    throwIfAborted(signal);
     const formattedTools = tools ? formatToolsForProvider(tools, model.provider) : void 0;
     const result = await model.doGenerate({
       messages,
       tools: formattedTools,
       temperature: params.temperature,
+      reasoningEffort: params.reasoningEffort,
       maxTokens: params.maxTokens,
       responseFormat: params.responseFormat,
       signal
     });
+    throwIfAborted(signal);
     const stepToolResults = [];
     if (result.toolCalls && result.toolCalls.length > 0 && tools) {
       allToolCalls.push(...result.toolCalls);
       for (const call of result.toolCalls) {
+        throwIfAborted(signal);
         const toolDef = tools[call.name];
         if (!toolDef) {
           const errorResult = {
@@ -178,6 +187,7 @@ async function generateText(params) {
             abortSignal: signal,
             messages
           });
+          throwIfAborted(signal);
           const result2 = {
             toolCallId: call.id,
             result: toolResult
@@ -185,6 +195,7 @@ async function generateText(params) {
           stepToolResults.push(result2);
           allToolResults.push(result2);
         } catch (error) {
+          throwIfAborted(signal);
           const errorResult = {
             toolCallId: call.id,
             result: {
@@ -301,10 +312,12 @@ async function streamText(params) {
           messages,
           tools: formattedTools,
           temperature: params.temperature,
+          reasoningEffort: params.reasoningEffort,
           maxTokens: params.maxTokens,
           responseFormat: params.responseFormat,
           signal
         })) {
+          throwIfAborted(signal);
           switch (chunk.type) {
             case "text-delta":
               stepText += chunk.text;
@@ -352,6 +365,7 @@ async function streamText(params) {
       };
       messages = [...messages, assistantMessage];
       for (const call of toolCalls) {
+        throwIfAborted(signal);
         const toolDef = tools[call.name];
         if (!toolDef) {
           const errorResult = { error: `Tool not found: ${call.name}` };
@@ -377,6 +391,7 @@ async function streamText(params) {
             abortSignal: signal,
             messages
           });
+          throwIfAborted(signal);
           yield { type: "tool-result", toolCallId: call.id, result };
           messages = [
             ...messages,
@@ -387,6 +402,7 @@ async function streamText(params) {
             }
           ];
         } catch (error) {
+          throwIfAborted(signal);
           const errorResult = {
             error: error instanceof Error ? error.message : "Tool execution failed"
           };
@@ -412,40 +428,63 @@ async function streamText(params) {
       usage: finalUsage
     };
   }
-  async function* createTextStream() {
-    for await (const part of createFullStream()) {
-      if (part.type === "text-delta") {
-        yield part.text;
-      }
+  const source = createFullStream();
+  const parts = [];
+  let finished = false;
+  let failure;
+  let pending;
+  async function advance() {
+    if (!pending) {
+      pending = (async () => {
+        try {
+          const next = await source.next();
+          if (next.done) finished = true;
+          else parts.push(next.value);
+        } catch (error) {
+          failure = error;
+          finished = true;
+        }
+      })();
+    }
+    const current = pending;
+    await current;
+    if (pending === current) pending = void 0;
+  }
+  async function* sharedStream() {
+    let index = 0;
+    while (true) {
+      if (index < parts.length) yield parts[index++];
+      else if (finished) {
+        if (failure) throw failure;
+        return;
+      } else await advance();
     }
   }
-  let textPromise;
-  let usagePromise;
-  let finishReasonPromise;
-  async function consumeStream() {
-    for await (const _ of createFullStream()) {
+  async function* createTextStream() {
+    for await (const part of sharedStream()) {
+      if (part.type === "error") throw part.error;
+      if (part.type === "text-delta") yield part.text;
     }
   }
+  let completion;
+  function consumeStream() {
+    return completion ?? (completion = (async () => {
+      for await (const part of sharedStream()) {
+        if (part.type === "error") throw part.error;
+      }
+    })());
+  }
   return {
     textStream: createTextStream(),
-    fullStream: createFullStream(),
+    fullStream: sharedStream(),
     get text() {
-      if (!textPromise) {
-        textPromise = consumeStream().then(() => fullText);
-      }
-      return textPromise;
+      return consumeStream().then(() => fullText);
     },
     get usage() {
-      if (!usagePromise) {
-        usagePromise = consumeStream().then(() => finalUsage);
-      }
-      return usagePromise;
+      return consumeStream().then(() => finalUsage);
     },
     get finishReason() {
-      if (!finishReasonPromise) {
-        finishReasonPromise = consumeStream().then(() => finalFinishReason);
-      }
-      return finishReasonPromise;
+      return consumeStream().then(() => finalFinishReason);
     },
     toTextStreamResponse(options) {
       const stream = createTextStreamReadable(createTextStream());
@@ -460,7 +499,7 @@ async function streamText(params) {
       });
     },
     toDataStreamResponse(options) {
-      const stream = createDataStreamReadable(createFullStream());
+      const stream = createDataStreamReadable(sharedStream());
       return new Response(stream, {
         status: options?.status ?? 200,
         headers: {
@@ -1840,14 +1879,21 @@ var Runtime = class {
           );
         }
       }
+      const resolvedToolIds = new Set(
+        (messages ?? []).filter((message) => message.role === "tool" && message.tool_call_id).map((message) => message.tool_call_id)
+      );
+      const responseToolCalls = requiresAction ? toolCalls.filter((call) => !resolvedToolIds.has(call.id)) : toolCalls;
       const response = {
         success: !error,
         content,
-        toolCalls: toolCalls.length > 0 ? toolCalls : void 0,
+        toolCalls: responseToolCalls.length > 0 ? responseToolCalls : void 0,
         toolResults: toolResults.length > 0 ? toolResults : void 0,
         messages,
         requiresAction,
         error,
+        // Copilot's HTTP transport reads a top-level message for HTTP errors.
+        // Retain the structured error as well for existing API consumers.
+        ...error ? { message: error.message } : {},
         // Include raw events for debugging
         _events: this.config.debug ? events : void 0
       };
@@ -1871,6 +1917,7 @@ var Runtime = class {
       return new Response(
         JSON.stringify({
           success: false,
+          message: err instanceof Error ? err.message : "Unknown error",
           error: {
             message: err instanceof Error ? err.message : "Unknown error"
           }
@@ -2211,7 +2258,13 @@ var Runtime = class {
       // Not used when rawMessages is provided
       rawMessages: request.messages,
       actions: nativeToolSearch ? void 0 : this.convertToolsToActions(effectiveSelectedTools),
-      toolDefinitions: nativeToolSearch ? effectiveSelectedTools : void 0,
+      // Always supplied. `actions` drives the Chat Completions path; adapters
+      // that must use /v1/responses (native tool search, or gpt-5.4+ where
+      // Chat Completions rejects function tools alongside reasoning) need the
+      // richer ToolDefinition shape. Gating this on nativeToolSearch meant the
+      // reasoning-model route could never see any tools, so it silently never
+      // engaged and those requests still 400'd on Chat Completions.
+      toolDefinitions: effectiveSelectedTools,
       systemPrompt,
       config: request.config,
       signal,
@@ -2573,7 +2626,13 @@ var Runtime = class {
         messages: [],
         rawMessages: conversationMessages,
         actions: nativeToolSearch ? void 0 : this.convertToolsToActions(effectiveSelectedTools),
-        toolDefinitions: nativeToolSearch ? effectiveSelectedTools : void 0,
+        // Always supplied. `actions` drives the Chat Completions path; adapters
+        // that must use /v1/responses (native tool search, or gpt-5.4+ where
+        // Chat Completions rejects function tools alongside reasoning) need the
+        // richer ToolDefinition shape. Gating this on nativeToolSearch meant the
+        // reasoning-model route could never see any tools, so it silently never
+        // engaged and those requests still 400'd on Chat Completions.
+        toolDefinitions: effectiveSelectedTools,
         systemPrompt,
         config: request.config,
         signal,

package/dist/index.mjs

@@ -130,6 +130,14 @@ function formatToolsForGoogle(tools) {
   ];
 }
 
+// src/core/provider-error.ts
+function throwIfAborted(signal) {
+  if (!signal?.aborted) return;
+  const error = new Error("The operation was aborted");
+  error.name = "AbortError";
+  throw error;
+}
+
 // src/core/generate-text.ts
 async function generateText(params) {
   const { model, tools, maxSteps = 1, signal } = params;
@@ -143,22 +151,23 @@ async function generateText(params) {
   const allToolCalls = [];
   const allToolResults = [];
   for (let step = 0; step < maxSteps; step++) {
-    if (signal?.aborted) {
-      throw new Error("Generation aborted");
-    }
+    throwIfAborted(signal);
     const formattedTools = tools ? formatToolsForProvider(tools, model.provider) : void 0;
     const result = await model.doGenerate({
       messages,
       tools: formattedTools,
       temperature: params.temperature,
+      reasoningEffort: params.reasoningEffort,
       maxTokens: params.maxTokens,
       responseFormat: params.responseFormat,
       signal
     });
+    throwIfAborted(signal);
     const stepToolResults = [];
     if (result.toolCalls && result.toolCalls.length > 0 && tools) {
       allToolCalls.push(...result.toolCalls);
       for (const call of result.toolCalls) {
+        throwIfAborted(signal);
         const toolDef = tools[call.name];
         if (!toolDef) {
           const errorResult = {
@@ -176,6 +185,7 @@ async function generateText(params) {
             abortSignal: signal,
             messages
           });
+          throwIfAborted(signal);
           const result2 = {
             toolCallId: call.id,
             result: toolResult
@@ -183,6 +193,7 @@ async function generateText(params) {
           stepToolResults.push(result2);
           allToolResults.push(result2);
         } catch (error) {
+          throwIfAborted(signal);
           const errorResult = {
             toolCallId: call.id,
             result: {
@@ -299,10 +310,12 @@ async function streamText(params) {
           messages,
           tools: formattedTools,
           temperature: params.temperature,
+          reasoningEffort: params.reasoningEffort,
           maxTokens: params.maxTokens,
           responseFormat: params.responseFormat,
           signal
         })) {
+          throwIfAborted(signal);
           switch (chunk.type) {
             case "text-delta":
               stepText += chunk.text;
@@ -350,6 +363,7 @@ async function streamText(params) {
       };
       messages = [...messages, assistantMessage];
       for (const call of toolCalls) {
+        throwIfAborted(signal);
         const toolDef = tools[call.name];
         if (!toolDef) {
           const errorResult = { error: `Tool not found: ${call.name}` };
@@ -375,6 +389,7 @@ async function streamText(params) {
             abortSignal: signal,
             messages
           });
+          throwIfAborted(signal);
           yield { type: "tool-result", toolCallId: call.id, result };
           messages = [
             ...messages,
@@ -385,6 +400,7 @@ async function streamText(params) {
             }
           ];
         } catch (error) {
+          throwIfAborted(signal);
           const errorResult = {
             error: error instanceof Error ? error.message : "Tool execution failed"
           };
@@ -410,40 +426,63 @@ async function streamText(params) {
       usage: finalUsage
     };
   }
-  async function* createTextStream() {
-    for await (const part of createFullStream()) {
-      if (part.type === "text-delta") {
-        yield part.text;
-      }
+  const source = createFullStream();
+  const parts = [];
+  let finished = false;
+  let failure;
+  let pending;
+  async function advance() {
+    if (!pending) {
+      pending = (async () => {
+        try {
+          const next = await source.next();
+          if (next.done) finished = true;
+          else parts.push(next.value);
+        } catch (error) {
+          failure = error;
+          finished = true;
+        }
+      })();
+    }
+    const current = pending;
+    await current;
+    if (pending === current) pending = void 0;
+  }
+  async function* sharedStream() {
+    let index = 0;
+    while (true) {
+      if (index < parts.length) yield parts[index++];
+      else if (finished) {
+        if (failure) throw failure;
+        return;
+      } else await advance();
     }
   }
-  let textPromise;
-  let usagePromise;
-  let finishReasonPromise;
-  async function consumeStream() {
-    for await (const _ of createFullStream()) {
+  async function* createTextStream() {
+    for await (const part of sharedStream()) {
+      if (part.type === "error") throw part.error;
+      if (part.type === "text-delta") yield part.text;
     }
   }
+  let completion;
+  function consumeStream() {
+    return completion ?? (completion = (async () => {
+      for await (const part of sharedStream()) {
+        if (part.type === "error") throw part.error;
+      }
+    })());
+  }
   return {
     textStream: createTextStream(),
-    fullStream: createFullStream(),
+    fullStream: sharedStream(),
     get text() {
-      if (!textPromise) {
-        textPromise = consumeStream().then(() => fullText);
-      }
-      return textPromise;
+      return consumeStream().then(() => fullText);
     },
     get usage() {
-      if (!usagePromise) {
-        usagePromise = consumeStream().then(() => finalUsage);
-      }
-      return usagePromise;
+      return consumeStream().then(() => finalUsage);
     },
     get finishReason() {
-      if (!finishReasonPromise) {
-        finishReasonPromise = consumeStream().then(() => finalFinishReason);
-      }
-      return finishReasonPromise;
+      return consumeStream().then(() => finalFinishReason);
     },
     toTextStreamResponse(options) {
       const stream = createTextStreamReadable(createTextStream());
@@ -458,7 +497,7 @@ async function streamText(params) {
       });
     },
     toDataStreamResponse(options) {
-      const stream = createDataStreamReadable(createFullStream());
+      const stream = createDataStreamReadable(sharedStream());
       return new Response(stream, {
         status: options?.status ?? 200,
         headers: {
@@ -1838,14 +1877,21 @@ var Runtime = class {
           );
         }
       }
+      const resolvedToolIds = new Set(
+        (messages ?? []).filter((message) => message.role === "tool" && message.tool_call_id).map((message) => message.tool_call_id)
+      );
+      const responseToolCalls = requiresAction ? toolCalls.filter((call) => !resolvedToolIds.has(call.id)) : toolCalls;
       const response = {
         success: !error,
         content,
-        toolCalls: toolCalls.length > 0 ? toolCalls : void 0,
+        toolCalls: responseToolCalls.length > 0 ? responseToolCalls : void 0,
         toolResults: toolResults.length > 0 ? toolResults : void 0,
         messages,
         requiresAction,
         error,
+        // Copilot's HTTP transport reads a top-level message for HTTP errors.
+        // Retain the structured error as well for existing API consumers.
+        ...error ? { message: error.message } : {},
         // Include raw events for debugging
         _events: this.config.debug ? events : void 0
       };
@@ -1869,6 +1915,7 @@ var Runtime = class {
       return new Response(
         JSON.stringify({
           success: false,
+          message: err instanceof Error ? err.message : "Unknown error",
           error: {
             message: err instanceof Error ? err.message : "Unknown error"
           }
@@ -2209,7 +2256,13 @@ var Runtime = class {
       // Not used when rawMessages is provided
       rawMessages: request.messages,
       actions: nativeToolSearch ? void 0 : this.convertToolsToActions(effectiveSelectedTools),
-      toolDefinitions: nativeToolSearch ? effectiveSelectedTools : void 0,
+      // Always supplied. `actions` drives the Chat Completions path; adapters
+      // that must use /v1/responses (native tool search, or gpt-5.4+ where
+      // Chat Completions rejects function tools alongside reasoning) need the
+      // richer ToolDefinition shape. Gating this on nativeToolSearch meant the
+      // reasoning-model route could never see any tools, so it silently never
+      // engaged and those requests still 400'd on Chat Completions.
+      toolDefinitions: effectiveSelectedTools,
       systemPrompt,
       config: request.config,
       signal,
@@ -2571,7 +2624,13 @@ var Runtime = class {
         messages: [],
         rawMessages: conversationMessages,
         actions: nativeToolSearch ? void 0 : this.convertToolsToActions(effectiveSelectedTools),
-        toolDefinitions: nativeToolSearch ? effectiveSelectedTools : void 0,
+        // Always supplied. `actions` drives the Chat Completions path; adapters
+        // that must use /v1/responses (native tool search, or gpt-5.4+ where
+        // Chat Completions rejects function tools alongside reasoning) need the
+        // richer ToolDefinition shape. Gating this on nativeToolSearch meant the
+        // reasoning-model route could never see any tools, so it silently never
+        // engaged and those requests still 400'd on Chat Completions.
+        toolDefinitions: effectiveSelectedTools,
         systemPrompt,
         config: request.config,
         signal,

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

@@ -1,7 +1,7 @@
-import { L as LanguageModel } from '../../types-BkQCSiIt.mjs';
-import { a as AnthropicProviderConfig, A as AIProvider } from '../../types-BSSiJW2o.mjs';
+import { L as LanguageModel } from '../../types-BW3csYo5.mjs';
+import { a as AnthropicProviderConfig, A as AIProvider } from '../../types-NOswlhm9.mjs';
 import 'zod';
-import '../../base-tNgbBaSo.mjs';
+import '../../base-CkeT7u-O.mjs';
 
 /**
  * Anthropic Provider - Modern Pattern

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

@@ -1,7 +1,7 @@
-import { L as LanguageModel } from '../../types-BkQCSiIt.js';
-import { a as AnthropicProviderConfig, A as AIProvider } from '../../types-BQ31QIsA.js';
+import { L as LanguageModel } from '../../types-BW3csYo5.js';
+import { a as AnthropicProviderConfig, A as AIProvider } from '../../types-DA54bSmX.js';
 import 'zod';
-import '../../base-C58Dsr9p.js';
+import '../../base-BdTpUAWI.js';
 
 /**
  * Anthropic Provider - Modern Pattern

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

@@ -1,7 +1,7 @@
-import { b as AzureProviderConfig, A as AIProvider } from '../../types-BSSiJW2o.mjs';
-import '../../types-BkQCSiIt.mjs';
+import { b as AzureProviderConfig, A as AIProvider } from '../../types-NOswlhm9.mjs';
+import '../../types-BW3csYo5.mjs';
 import 'zod';
-import '../../base-tNgbBaSo.mjs';
+import '../../base-CkeT7u-O.mjs';
 
 /**
  * Azure OpenAI Provider

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

@@ -1,7 +1,7 @@
-import { b as AzureProviderConfig, A as AIProvider } from '../../types-BQ31QIsA.js';
-import '../../types-BkQCSiIt.js';
+import { b as AzureProviderConfig, A as AIProvider } from '../../types-DA54bSmX.js';
+import '../../types-BW3csYo5.js';
 import 'zod';
-import '../../base-C58Dsr9p.js';
+import '../../base-BdTpUAWI.js';
 
 /**
  * Azure OpenAI Provider

package/dist/providers/azure/index.js

@@ -99,14 +99,19 @@ function normalizeObjectJsonSchema(schema) {
       (value) => typeof value === "string"
     ) : [];
     normalized.required = Array.from(/* @__PURE__ */ new Set([...required, ...propertyKeys]));
-    if (normalized.additionalProperties === void 0) {
-      normalized.additionalProperties = false;
-    }
+    normalized.additionalProperties = false;
   } else if (type === "array" && normalized.items && typeof normalized.items === "object") {
     normalized.items = normalizeObjectJsonSchema(
       normalized.items
     );
   }
+  for (const keyword of ["anyOf", "oneOf", "allOf"]) {
+    const branches = normalized[keyword];
+    if (!Array.isArray(branches)) continue;
+    normalized[keyword] = branches.map(
+      (branch) => branch && typeof branch === "object" ? normalizeObjectJsonSchema(branch) : branch
+    );
+  }
   return normalized;
 }
 function toOpenAIResponseFormat(rf) {

package/dist/providers/azure/index.mjs

@@ -97,14 +97,19 @@ function normalizeObjectJsonSchema(schema) {
       (value) => typeof value === "string"
     ) : [];
     normalized.required = Array.from(/* @__PURE__ */ new Set([...required, ...propertyKeys]));
-    if (normalized.additionalProperties === void 0) {
-      normalized.additionalProperties = false;
-    }
+    normalized.additionalProperties = false;
   } else if (type === "array" && normalized.items && typeof normalized.items === "object") {
     normalized.items = normalizeObjectJsonSchema(
       normalized.items
     );
   }
+  for (const keyword of ["anyOf", "oneOf", "allOf"]) {
+    const branches = normalized[keyword];
+    if (!Array.isArray(branches)) continue;
+    normalized[keyword] = branches.map(
+      (branch) => branch && typeof branch === "object" ? normalizeObjectJsonSchema(branch) : branch
+    );
+  }
   return normalized;
 }
 function toOpenAIResponseFormat(rf) {

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

@@ -1,7 +1,7 @@
-import { L as LanguageModel } from '../../types-BkQCSiIt.mjs';
-import { A as AIProvider } from '../../types-BSSiJW2o.mjs';
+import { L as LanguageModel } from '../../types-BW3csYo5.mjs';
+import { A as AIProvider } from '../../types-NOswlhm9.mjs';
 import 'zod';
-import '../../base-tNgbBaSo.mjs';
+import '../../base-CkeT7u-O.mjs';
 
 /**
  * Fireworks Provider

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

@@ -1,7 +1,7 @@
-import { L as LanguageModel } from '../../types-BkQCSiIt.js';
-import { A as AIProvider } from '../../types-BQ31QIsA.js';
+import { L as LanguageModel } from '../../types-BW3csYo5.js';
+import { A as AIProvider } from '../../types-DA54bSmX.js';
 import 'zod';
-import '../../base-C58Dsr9p.js';
+import '../../base-BdTpUAWI.js';
 
 /**
  * Fireworks Provider