@desplega.ai/agent-swarm 1.152.2 → 1.153.0

package/dist/{openai-codex-responses-wy6a43wd.js → openai-codex-responses-4vjqzvjp.js}

@@ -1,11 +1,8 @@
-import {
-  splitDeferredTools
-} from "./cli-vfcth11k.js";
 import {
   convertResponsesMessages,
   convertResponsesTools,
   processResponsesStream
-} from "./cli-r2fpe7cx.js";
+} from "./cli-00w2c66p.js";
 import {
   clampOpenAIPromptCacheKey
 } from "./cli-mrptpp86.js";
@@ -27,22 +24,28 @@ import {
 import {
   buildBaseOptions,
   createGrammarToolInputProperties
-} from "./cli-j8dggbcr.js";
+} from "./cli-k0g1sjzm.js";
 import"./cli-y2apkfe2.js";
 import {
   headersToRecord
 } from "./cli-vapyk8sw.js";
-import {
-  clampThinkingLevel
-} from "./cli-rgvp6r2x.js";
 import"./cli-btbzvq95.js";
 import"./cli-1m2e086m.js";
+import {
+  clampThinkingLevel,
+  getDeclaredTools,
+  getInitialSystemMessage,
+  getSystemMessageText,
+  normalizeContext,
+  resolveTranscript,
+  resolveTranscriptTools
+} from "./cli-mcnhgnn1.js";
 import {
   AssistantMessageEventStream,
   appendAssistantMessageDiagnostic,
   createAssistantMessageDiagnostic,
   formatThrownValue
-} from "./cli-8wrympd7.js";
+} from "./cli-bzr0ftht.js";
 import"./cli-bc05qbss.js";
 
 // node_modules/@earendil-works/pi-ai/dist/utils/abort-signals.js
@@ -195,6 +198,7 @@ function compressRequestBodyZstd(bodyJson) {
 }
 var stream = (model, context, options) => {
   const stream2 = new AssistantMessageEventStream;
+  const normalizedContext = resolveTranscript(context, model.compat?.supportsMidConvoSystemMessages);
   (async () => {
     const output = {
       role: "assistant",
@@ -219,10 +223,10 @@ var stream = (model, context, options) => {
         throw new Error(`No API key for provider: ${model.provider}`);
       }
       const accountId = extractAccountId(apiKey);
-      const grammarToolInputProperties = createGrammarToolInputProperties(context.tools, model.compat?.supportsOpenAIGrammarTools ?? false);
+      const grammarToolInputProperties = createGrammarToolInputProperties(getDeclaredTools(normalizedContext.messages), model.compat?.supportsOpenAIGrammarTools ?? false);
       const cacheSessionId = options?.cacheRetention === "none" ? undefined : options?.sessionId;
       const codexSessionId = clampOpenAIPromptCacheKey(cacheSessionId);
-      let body = buildRequestBody(model, context, options, codexSessionId, grammarToolInputProperties);
+      let body = buildRequestBody(model, normalizedContext, options, codexSessionId, grammarToolInputProperties);
       const nextBody = await options?.onPayload?.(body, model);
       if (nextBody !== undefined) {
         body = nextBody;
@@ -281,7 +285,7 @@ var stream = (model, context, options) => {
             }
             appendAssistantMessageDiagnostic(output, createAssistantMessageDiagnostic("provider_transport_failure", error, {
               configuredTransport: transport,
-              fallbackTransport: websocketStarted ? undefined : "sse",
+              ...websocketStarted ? {} : { fallbackTransport: "sse" },
               eventsEmitted: websocketStarted,
               phase: websocketStarted ? "after_message_stream_start" : "before_message_stream_start",
               requestBytes: new TextEncoder().encode(bodyJson).byteLength
@@ -403,27 +407,27 @@ var streamSimple = (model, context, options) => {
     reasoningEffort
   });
 };
-function buildRequestBody(model, context, options, cacheSessionId, grammarToolInputProperties = createGrammarToolInputProperties(context.tools, model.compat?.supportsOpenAIGrammarTools ?? false)) {
+function buildRequestBody(model, context, options, cacheSessionId, grammarToolInputProperties = createGrammarToolInputProperties(getDeclaredTools(context.messages), model.compat?.supportsOpenAIGrammarTools ?? false)) {
   const supportsStrictMode = model.compat?.supportsStrictMode ?? true;
   const supportsOpenAIGrammarTools = model.compat?.supportsOpenAIGrammarTools ?? false;
-  const deferredToolsMode = model.compat?.supportsAdditionalTools ? "additional-tools" : model.compat?.supportsToolSearch ? "tool-search" : undefined;
-  const toolPlacement = splitDeferredTools(context, deferredToolsMode !== undefined);
+  const supportsAdditionalTools = model.compat?.supportsAdditionalTools ?? false;
+  const supportsToolSearch = model.compat?.supportsToolSearch ?? false;
+  const transcriptTools = resolveTranscriptTools(context.messages, supportsAdditionalTools || supportsToolSearch);
   const messages = convertResponsesMessages(model, context, CODEX_TOOL_CALL_PROVIDERS, {
     includeSystemPrompt: false,
     grammarToolInputProperties,
-    deferredTools: toolPlacement.deferred,
-    deferredToolsMode,
-    toolOptions: {
-      strict: null,
-      supportsStrictMode,
-      supportsOpenAIGrammarTools
-    }
+    supportsMidConvoSystemMessages: model.compat?.supportsMidConvoSystemMessages ?? false,
+    supportsAdditionalTools,
+    supportsToolSearch,
+    toolOptions: { strict: null, supportsStrictMode, supportsOpenAIGrammarTools }
   });
+  const initialSystemMessage = getInitialSystemMessage(context.messages);
+  const instructions = initialSystemMessage ? getSystemMessageText(initialSystemMessage) : "";
   const body = {
     model: model.id,
     store: false,
     stream: true,
-    instructions: context.systemPrompt || "You are a helpful assistant.",
+    instructions: instructions || "You are a helpful assistant.",
     input: messages,
     text: { verbosity: options?.textVerbosity || "low" },
     include: ["reasoning.encrypted_content"],
@@ -437,21 +441,23 @@ function buildRequestBody(model, context, options, cacheSessionId, grammarToolIn
   if (options?.serviceTier !== undefined) {
     body.service_tier = options.serviceTier;
   }
-  if (toolPlacement.immediate.length > 0) {
-    body.tools = convertResponsesTools(toolPlacement.immediate, {
+  if (transcriptTools.requestTools.length > 0) {
+    body.tools = convertResponsesTools(transcriptTools.requestTools, {
       strict: null,
       supportsStrictMode,
       supportsOpenAIGrammarTools
     });
   }
   if (options?.reasoningEffort !== undefined) {
-    const effort = options.reasoningEffort === "none" ? model.thinkingLevelMap?.off ?? "none" : model.thinkingLevelMap?.[options.reasoningEffort] ?? options.reasoningEffort;
+    const effort = options.reasoningEffort === "none" ? model.thinkingLevelMap?.off === undefined ? "none" : model.thinkingLevelMap.off : model.thinkingLevelMap?.[options.reasoningEffort] ?? options.reasoningEffort;
     if (effort !== null) {
       body.reasoning = {
         effort,
         summary: options.reasoningSummary ?? "auto"
       };
     }
+  } else if (model.reasoning && model.thinkingLevelMap?.off !== null) {
+    body.reasoning = { effort: model.thinkingLevelMap?.off ?? "none" };
   }
   return body;
 }
@@ -1197,7 +1203,7 @@ async function processWebSocketStream(url, body, headers, output, stream2, model
     if (options?.signal?.aborted) {
       keepConnection = false;
     } else if (useCachedContext && entry && output.responseId) {
-      const responseItems = convertResponsesMessages(model, { messages: [output] }, CODEX_TOOL_CALL_PROVIDERS, {
+      const responseItems = convertResponsesMessages(model, normalizeContext({ messages: [output] }), CODEX_TOOL_CALL_PROVIDERS, {
         includeSystemPrompt: false,
         grammarToolInputProperties
       }).filter((item) => item.type !== "function_call_output" && item.type !== "custom_tool_call_output");

package/dist/{openai-completions-32rdwmze.js → openai-completions-pxsmym7g.js}

@@ -5,12 +5,12 @@ import {
 import {
   clampOpenAIPromptCacheKey
 } from "./cli-mrptpp86.js";
-import {
-  shortHash
-} from "./cli-5m9j2spm.js";
 import {
   retryProviderRequest
 } from "./cli-s8s499xy.js";
+import {
+  shortHash
+} from "./cli-5m9j2spm.js";
 import {
   getPiUserAgent
 } from "./cli-et1bbwqf.js";
@@ -33,26 +33,31 @@ import {
   resolveJsonSchemaStrictSampling,
   thinkingBudgetForLevel,
   transformMessages
-} from "./cli-j8dggbcr.js";
+} from "./cli-k0g1sjzm.js";
 import {
   sanitizeSurrogates
 } from "./cli-y2apkfe2.js";
 import {
   headersToRecord
 } from "./cli-vapyk8sw.js";
-import {
-  calculateCost,
-  clampThinkingLevel
-} from "./cli-rgvp6r2x.js";
 import {
   getProviderEnvValue
 } from "./cli-btbzvq95.js";
 import {
   parseStreamingJson
 } from "./cli-1m2e086m.js";
+import {
+  calculateCost,
+  clampThinkingLevel,
+  getDeclaredTools,
+  getSystemMessageText,
+  renderSystemMessageUpdate,
+  resolveTranscript,
+  resolveTranscriptTools
+} from "./cli-mcnhgnn1.js";
 import {
   AssistantMessageEventStream
-} from "./cli-8wrympd7.js";
+} from "./cli-bzr0ftht.js";
 import"./cli-bc05qbss.js";
 
 // node_modules/@earendil-works/pi-ai/dist/api/openai-completions.js
@@ -87,23 +92,6 @@ function hasToolHistory(messages) {
   }
   return false;
 }
-function getDeferredToolNames(messages) {
-  const names = new Set;
-  for (const message of messages) {
-    if (message.role === "toolResult") {
-      for (const name of message.addedToolNames ?? []) {
-        names.add(name);
-      }
-    }
-  }
-  return names;
-}
-function getToolsByName(tools, names) {
-  if (!tools)
-    return [];
-  const toolsByName = new Map(tools.map((tool) => [tool.name, tool]));
-  return Array.from(names).map((name) => toolsByName.get(name)).filter((tool) => tool !== undefined);
-}
 function isTextContentBlock(block) {
   return block.type === "text";
 }
@@ -192,6 +180,7 @@ function resolveCacheRetention(cacheRetention, env) {
 }
 var stream = (model, context, options) => {
   const stream2 = new AssistantMessageEventStream;
+  const normalizedContext = resolveTranscript(context, getCompat(model).supportsMidConvoSystemMessages);
   (async () => {
     const output = {
       role: "assistant",
@@ -219,11 +208,11 @@ var stream = (model, context, options) => {
     try {
       const apiKey = getClientApiKey(model.provider, options?.apiKey, options?.headers);
       const compat = getCompat(model);
-      const grammarToolInputProperties = createGrammarToolInputProperties(context.tools, compat.supportsOpenAIGrammarTools);
+      const grammarToolInputProperties = createGrammarToolInputProperties(getDeclaredTools(normalizedContext.messages), compat.supportsOpenAIGrammarTools);
       const cacheRetention = resolveCacheRetention(options?.cacheRetention, options?.env);
       const cacheSessionId = cacheRetention === "none" ? undefined : options?.sessionId;
-      const client = createClient(model, context, apiKey, options?.headers, options?.fetch, cacheSessionId, compat);
-      let params = buildParams(model, context, options, compat, cacheRetention, grammarToolInputProperties);
+      const client = createClient(model, normalizedContext, apiKey, options?.headers, options?.fetch, cacheSessionId, compat);
+      let params = buildParams(model, normalizedContext, options, compat, cacheRetention, grammarToolInputProperties);
       const nextParams = await options?.onPayload?.(params, model);
       if (nextParams !== undefined) {
         params = nextParams;
@@ -569,8 +558,11 @@ function createClient(model, context, apiKey, optionsHeaders, fetch, sessionId,
     defaultHeaders: headers
   });
 }
-function buildParams(model, context, options, compat = getCompat(model), cacheRetention = resolveCacheRetention(options?.cacheRetention, options?.env), grammarToolInputProperties = createGrammarToolInputProperties(context.tools, compat.supportsOpenAIGrammarTools)) {
-  const messages = convertMessages(model, context, compat, { grammarToolInputProperties });
+function buildParams(model, context, options, compat = getCompat(model), cacheRetention = resolveCacheRetention(options?.cacheRetention, options?.env), grammarToolInputProperties = createGrammarToolInputProperties(getDeclaredTools(context.messages), compat.supportsOpenAIGrammarTools)) {
+  const transcriptTools = resolveTranscriptTools(context.messages, compat.supportsMidConvoSystemMessages === true && compat.supportsMidConvoToolAdditions === true);
+  const messages = convertMessages(model, context, compat, {
+    grammarToolInputProperties
+  });
   const cacheControl = getCompatCacheControl(compat, cacheRetention);
   const params = {
     model: model.id,
@@ -595,10 +587,8 @@ function buildParams(model, context, options, compat = getCompat(model), cacheRe
   if (options?.temperature !== undefined) {
     params.temperature = options.temperature;
   }
-  const deferredToolNames = compat.deferredToolsMode === "kimi" ? getDeferredToolNames(context.messages) : new Set;
-  const activeTools = context.tools?.filter((tool) => !deferredToolNames.has(tool.name));
-  if (activeTools && activeTools.length > 0) {
-    params.tools = convertTools(activeTools, compat);
+  if (transcriptTools.requestTools.length > 0) {
+    params.tools = convertTools(transcriptTools.requestTools, compat);
     if (compat.zaiToolStream) {
       params.tool_stream = true;
     }
@@ -840,6 +830,7 @@ function addCacheControlToTextContent(message, cacheControl) {
   return false;
 }
 function convertMessages(model, context, compat, options) {
+  const normalizedContext = resolveTranscript(context, compat.supportsMidConvoSystemMessages);
   const params = [];
   const normalizeToolCallId = (id) => {
     if (id.includes("|")) {
@@ -858,12 +849,9 @@ function convertMessages(model, context, compat, options) {
       return id.length > 40 ? id.slice(0, 40) : id;
     return id;
   };
-  const transformedMessages = transformMessages(context.messages, model, (id) => normalizeToolCallId(id));
-  if (context.systemPrompt) {
-    const useDeveloperRole = model.reasoning && compat.supportsDeveloperRole;
-    const role = useDeveloperRole ? "developer" : "system";
-    params.push({ role, content: sanitizeSurrogates(context.systemPrompt) });
-  }
+  const transformedMessages = transformMessages(normalizedContext.messages, model, (id) => normalizeToolCallId(id));
+  const transcriptTools = resolveTranscriptTools(normalizedContext.messages, compat.supportsMidConvoSystemMessages === true && compat.supportsMidConvoToolAdditions === true);
+  const instructionRole = model.reasoning && compat.supportsDeveloperRole ? "developer" : "system";
   let lastRole = null;
   for (let i = 0;i < transformedMessages.length; i++) {
     const msg = transformedMessages[i];
@@ -873,14 +861,27 @@ function convertMessages(model, context, compat, options) {
         content: "I have processed the tool results."
       });
     }
-    if (msg.role === "user") {
+    if (msg.role === "system") {
+      const addedTools = i > 0 && transcriptTools.anchorsAdditions ? msg.toolsAdded ?? [] : [];
+      if (addedTools.length > 0) {
+        const kimiToolMessage = {
+          role: "system",
+          tools: convertTools(addedTools, compat)
+        };
+        params.push(kimiToolMessage);
+      }
+      const text = i === 0 ? getSystemMessageText(msg) : renderSystemMessageUpdate(msg);
+      if (text.length > 0) {
+        params.push({ role: instructionRole, content: sanitizeSurrogates(text) });
+      }
+    } else if (msg.role === "user") {
       if (typeof msg.content === "string") {
         params.push({
           role: "user",
           content: sanitizeSurrogates(msg.content)
         });
       } else {
-        const content = msg.content.map((item) => {
+        const content = msg.content.filter((item) => item.type !== "text" || item.text.length > 0).map((item) => {
           if (item.type === "text") {
             return {
               type: "text",
@@ -979,7 +980,6 @@ function convertMessages(model, context, compat, options) {
       params.push(assistantMsg);
     } else if (msg.role === "toolResult") {
       const imageBlocks = [];
-      const deferredToolNames = new Set;
       let j = i;
       for (;j < transformedMessages.length && transformedMessages[j].role === "toolResult"; j++) {
         const toolMsg = transformedMessages[j];
@@ -997,11 +997,6 @@ function convertMessages(model, context, compat, options) {
           toolResultMsg.name = toolMsg.toolName;
         }
         params.push(toolResultMsg);
-        if (compat.deferredToolsMode === "kimi") {
-          for (const name of toolMsg.addedToolNames ?? []) {
-            deferredToolNames.add(name);
-          }
-        }
         if (hasImages && model.input.includes("image")) {
           for (const block of toolMsg.content) {
             if (isImageContentBlock(block)) {
@@ -1037,16 +1032,6 @@ function convertMessages(model, context, compat, options) {
       } else {
         lastRole = "toolResult";
       }
-      if (deferredToolNames.size > 0) {
-        const deferredTools = getToolsByName(context.tools, deferredToolNames);
-        if (deferredTools.length > 0) {
-          const kimiToolMessage = {
-            role: "system",
-            tools: convertTools(deferredTools, compat)
-          };
-          params.push(kimiToolMessage);
-        }
-      }
       continue;
     }
     lastRole = msg.role;
@@ -1136,8 +1121,9 @@ function detectCompat(model) {
   const isCloudflareAiGateway = provider === "cloudflare-ai-gateway" || baseUrl.includes("gateway.ai.cloudflare.com");
   const isNvidia = provider === "nvidia" || baseUrl.includes("integrate.api.nvidia.com");
   const isAntLing = provider === "ant-ling" || baseUrl.includes("api.ant-ling.com");
+  const isCerebras = provider === "cerebras" || baseUrl.includes("cerebras.ai");
   const isDeepSeek = provider === "deepseek" || baseUrl.toLowerCase().includes("deepseek.com");
-  const isNonStandard = isNvidia || provider === "cerebras" || baseUrl.includes("cerebras.ai") || provider === "xai" || baseUrl.includes("api.x.ai") || isTogether || baseUrl.includes("chutes.ai") || isDeepSeek || isZai || isMoonshot || provider === "opencode" || baseUrl.includes("opencode.ai") || isCloudflareWorkersAI || isCloudflareAiGateway || isAntLing;
+  const isNonStandard = isNvidia || isCerebras || provider === "xai" || baseUrl.includes("api.x.ai") || isTogether || baseUrl.includes("chutes.ai") || isDeepSeek || isZai || isMoonshot || provider === "opencode" || baseUrl.includes("opencode.ai") || isCloudflareWorkersAI || isCloudflareAiGateway || isAntLing;
   const useMaxTokens = baseUrl.includes("chutes.ai") || isDeepSeek || isMoonshot || isCloudflareAiGateway || isTogether || isNvidia || isAntLing || isZai;
   const isGrok = provider === "xai" || baseUrl.includes("api.x.ai");
   const isOpenRouterDeveloperRoleModel = isOpenRouter && (model.id.startsWith("anthropic/") || model.id.startsWith("openai/"));
@@ -1161,11 +1147,12 @@ function detectCompat(model) {
     zaiToolStream: false,
     supportsThinkingTokenBudget: false,
     thinkingTokenBudgetField: undefined,
-    supportsStrictMode: !isMoonshot && !isTogether && !isCloudflareAiGateway && !isNvidia,
+    supportsStrictMode: false,
     supportsOpenAIGrammarTools: false,
+    supportsMidConvoSystemMessages: false,
+    supportsMidConvoToolAdditions: false,
     cacheControlFormat,
-    sendSessionAffinityHeaders: false,
-    deferredToolsMode: undefined,
+    sendSessionAffinityHeaders: isOpenRouter,
     sessionAffinityFormat: isOpenRouter ? "openrouter" : "openai",
     supportsLongCacheRetention: !(isTogether || isCloudflareWorkersAI || isCloudflareAiGateway || isNvidia || isAntLing)
   };
@@ -1195,9 +1182,10 @@ function getCompat(model) {
     thinkingTokenBudgetField: model.compat.thinkingTokenBudgetField ?? detected.thinkingTokenBudgetField,
     supportsStrictMode: model.compat.supportsStrictMode ?? detected.supportsStrictMode,
     supportsOpenAIGrammarTools: model.compat.supportsOpenAIGrammarTools ?? detected.supportsOpenAIGrammarTools,
+    supportsMidConvoSystemMessages: model.compat.supportsMidConvoSystemMessages ?? detected.supportsMidConvoSystemMessages,
+    supportsMidConvoToolAdditions: model.compat.supportsMidConvoToolAdditions ?? detected.supportsMidConvoToolAdditions,
     cacheControlFormat: model.compat.cacheControlFormat ?? detected.cacheControlFormat,
     sendSessionAffinityHeaders: model.compat.sendSessionAffinityHeaders ?? detected.sendSessionAffinityHeaders,
-    deferredToolsMode: model.compat.deferredToolsMode ?? detected.deferredToolsMode,
     sessionAffinityFormat: model.compat.sessionAffinityFormat ?? detected.sessionAffinityFormat,
     supportsLongCacheRetention: model.compat.supportsLongCacheRetention ?? detected.supportsLongCacheRetention,
     vllmPriority: model.compat.vllmPriority

package/dist/{openai-responses-6xwf7bzg.js → openai-responses-tmn0rqp0.js}

@@ -1,6 +1,3 @@
-import {
-  splitDeferredTools
-} from "./cli-vfcth11k.js";
 import {
   buildCopilotDynamicHeaders,
   hasCopilotVisionInput
@@ -9,14 +6,14 @@ import {
   convertResponsesMessages,
   convertResponsesTools,
   processResponsesStream
-} from "./cli-r2fpe7cx.js";
+} from "./cli-00w2c66p.js";
 import {
   clampOpenAIPromptCacheKey
 } from "./cli-mrptpp86.js";
-import"./cli-5m9j2spm.js";
 import {
   retryProviderRequest
 } from "./cli-s8s499xy.js";
+import"./cli-5m9j2spm.js";
 import {
   getPiUserAgent
 } from "./cli-et1bbwqf.js";
@@ -31,21 +28,24 @@ import {
 import {
   buildBaseOptions,
   createGrammarToolInputProperties
-} from "./cli-j8dggbcr.js";
+} from "./cli-k0g1sjzm.js";
 import"./cli-y2apkfe2.js";
 import {
   headersToRecord
 } from "./cli-vapyk8sw.js";
-import {
-  clampThinkingLevel
-} from "./cli-rgvp6r2x.js";
 import {
   getProviderEnvValue
 } from "./cli-btbzvq95.js";
 import"./cli-1m2e086m.js";
+import {
+  clampThinkingLevel,
+  getDeclaredTools,
+  resolveTranscript,
+  resolveTranscriptTools
+} from "./cli-mcnhgnn1.js";
 import {
   AssistantMessageEventStream
-} from "./cli-8wrympd7.js";
+} from "./cli-bzr0ftht.js";
 import"./cli-bc05qbss.js";
 
 // node_modules/@earendil-works/pi-ai/dist/api/openai-responses.js
@@ -84,6 +84,7 @@ function resolveCacheRetention(cacheRetention, env) {
 function getCompat(model) {
   return {
     supportsDeveloperRole: model.compat?.supportsDeveloperRole ?? true,
+    supportsMidConvoSystemMessages: model.compat?.supportsMidConvoSystemMessages ?? false,
     sessionAffinityFormat: model.compat?.sessionAffinityFormat ?? detectSessionAffinityFormat(model),
     supportsLongCacheRetention: model.compat?.supportsLongCacheRetention ?? true,
     supportsStrictMode: model.compat?.supportsStrictMode ?? false,
@@ -106,11 +107,9 @@ function getPromptCacheOptions(compat, cacheRetention) {
     return { ttl: "30m" };
   return;
 }
-function formatOpenAIResponsesError(error) {
-  return formatProviderError(normalizeProviderError(error), "OpenAI API error");
-}
 var stream = (model, context, options) => {
   const stream2 = new AssistantMessageEventStream;
+  const normalizedContext = resolveTranscript(context, getCompat(model).supportsMidConvoSystemMessages);
   (async () => {
     const output = {
       role: "assistant",
@@ -134,9 +133,9 @@ var stream = (model, context, options) => {
       const cacheRetention = resolveCacheRetention(options?.cacheRetention, options?.env);
       const cacheSessionId = cacheRetention === "none" ? undefined : options?.sessionId;
       const compat = getCompat(model);
-      const grammarToolInputProperties = createGrammarToolInputProperties(context.tools, compat.supportsOpenAIGrammarTools);
-      const client = createClient(model, context, apiKey, options?.headers, options?.fetch, cacheSessionId);
-      let params = buildParams(model, context, options, compat, grammarToolInputProperties);
+      const grammarToolInputProperties = createGrammarToolInputProperties(getDeclaredTools(normalizedContext.messages), compat.supportsOpenAIGrammarTools);
+      const client = createClient(model, normalizedContext, apiKey, options?.headers, options?.fetch, cacheSessionId);
+      let params = buildParams(model, normalizedContext, options, compat, grammarToolInputProperties);
       const nextParams = await options?.onPayload?.(params, model);
       if (nextParams !== undefined) {
         params = nextParams;
@@ -176,7 +175,7 @@ var stream = (model, context, options) => {
         delete block.customInput;
       }
       output.stopReason = options?.signal?.aborted ? "aborted" : "error";
-      output.errorMessage = formatOpenAIResponsesError(error);
+      output.errorMessage = formatProviderError(normalizeProviderError(error), `${model.provider === "openai" ? "OpenAI" : model.provider} API error`);
       stream2.push({ type: "error", reason: output.stopReason, error: output });
       stream2.end();
     }
@@ -228,13 +227,13 @@ function createClient(model, context, apiKey, optionsHeaders, fetch, sessionId)
     defaultHeaders: headers
   });
 }
-function buildParams(model, context, options, compat = getCompat(model), grammarToolInputProperties = createGrammarToolInputProperties(context.tools, compat.supportsOpenAIGrammarTools)) {
-  const deferredToolsMode = compat.supportsAdditionalTools ? "additional-tools" : compat.supportsToolSearch ? "tool-search" : undefined;
-  const toolPlacement = splitDeferredTools(context, deferredToolsMode !== undefined);
+function buildParams(model, context, options, compat = getCompat(model), grammarToolInputProperties = createGrammarToolInputProperties(getDeclaredTools(context.messages), compat.supportsOpenAIGrammarTools)) {
+  const transcriptTools = resolveTranscriptTools(context.messages, compat.supportsAdditionalTools || compat.supportsToolSearch);
   const messages = convertResponsesMessages(model, context, OPENAI_TOOL_CALL_PROVIDERS, {
     grammarToolInputProperties,
-    deferredTools: toolPlacement.deferred,
-    deferredToolsMode,
+    supportsMidConvoSystemMessages: compat.supportsMidConvoSystemMessages,
+    supportsAdditionalTools: compat.supportsAdditionalTools,
+    supportsToolSearch: compat.supportsToolSearch,
     toolOptions: {
       supportsStrictMode: compat.supportsStrictMode,
       supportsOpenAIGrammarTools: compat.supportsOpenAIGrammarTools
@@ -259,8 +258,8 @@ function buildParams(model, context, options, compat = getCompat(model), grammar
   if (options?.serviceTier !== undefined) {
     params.service_tier = options.serviceTier;
   }
-  if (toolPlacement.immediate.length > 0) {
-    params.tools = convertResponsesTools(toolPlacement.immediate, {
+  if (transcriptTools.requestTools.length > 0) {
+    params.tools = convertResponsesTools(transcriptTools.requestTools, {
       supportsStrictMode: compat.supportsStrictMode,
       supportsOpenAIGrammarTools: compat.supportsOpenAIGrammarTools
     });

package/dist/{opencode-adapter-28axqa09.js → opencode-adapter-qbmv4tpy.js}

@@ -5,17 +5,17 @@ import {
   applyOpenRouterBaseUrlOverride,
   checkOpencodeCredentials,
   resolveContextModePluginPath
-} from "./cli-d3p82erb.js";
-import"./cli-tng3131n.js";
+} from "./cli-18amys3y.js";
 import"./cli-5bfdm1ah.js";
 import"./cli-r94z9p1z.js";
-import"./cli-zm7njwzd.js";
-import"./cli-s25avqg9.js";
 import"./cli-2djtr51b.js";
-import"./cli-4yc5d8fk.js";
+import"./cli-tng3131n.js";
+import"./cli-zm7njwzd.js";
+import"./cli-e781c6f9.js";
+import"./cli-avkd6mqv.js";
 import"./cli-re8z5p8p.js";
 import"./cli-3dpj7atn.js";
-import"./cli-c2mk1kgf.js";
+import"./cli-v4en75c5.js";
 import"./cli-ej6gbxfb.js";
 import"./cli-r2ap2czm.js";
 import"./cli-bc05qbss.js";

package/dist/{otel-impl-vdqge2nt.js → otel-impl-srjy4be4.js}

@@ -4,18 +4,18 @@ import {
 import {
   init_package,
   package_default
-} from "./cli-zvkq5csn.js";
+} from "./cli-ybpp1srm.js";
 import {
   init_secret_scrubber,
   scrubSecrets
 } from "./cli-r2ap2czm.js";
-import {
-  require_src
-} from "./cli-knd276ed.js";
 import {
   exports_supports_color,
   init_supports_color
 } from "./cli-bd957dgb.js";
+import {
+  require_src
+} from "./cli-knd276ed.js";
 import {
   __commonJS,
   __require,

package/dist/{pi-messages-b1mbr6gp.js → pi-messages-txpjj39q.js}

@@ -12,7 +12,7 @@ import {
   AssistantMessageEventStream,
   appendAssistantMessageDiagnostic,
   createAssistantMessageDiagnostic
-} from "./cli-8wrympd7.js";
+} from "./cli-bzr0ftht.js";
 import"./cli-bc05qbss.js";
 
 // node_modules/@earendil-works/pi-ai/dist/api/pi-messages.js
@@ -56,8 +56,8 @@ function createPiMessagesResponseError(model, url, response, body) {
     url: url.toString(),
     status: response.status,
     statusText: response.statusText,
-    error: errorBody?.error,
-    body: errorBody ? undefined : truncateDiagnosticString(body),
+    ...errorBody?.error === undefined ? {} : { error: errorBody.error },
+    ...errorBody ? {} : { body: truncateDiagnosticString(body) },
     timestampMs: Date.now()
   });
 }