@desplega.ai/agent-swarm 1.152.1 → 1.153.0

package/README.md

@@ -14,11 +14,12 @@ agent-swarm.dev is an open-source operating system for AI work. A lead agent del
 - A lead agent that receives work from Slack, repositories, issue trackers, email, or the API
 - [Schema-validated task results](./MCP.md#send-task) for callers that need structured JSON output
 - [Deferred tasks](./MCP.md#defer-task) that wake when all or any watched tasks reach an outcome, or a deadline arrives
+- [Inline tool-result images](https://docs.agent-swarm.dev/docs/ui#tool-result-images) in task logs, with previews that open at full size
 - [Dashboard file attachments](https://docs.agent-swarm.dev/docs/ui#file-attachments) by paste, drag-and-drop, or file picker
 - Workers in isolated Docker containers with development environments
 - Memory and identity that persist across sessions
 - Workflows, schedules, scripts, and apps for recurring work
-- [Extensions](https://docs.agent-swarm.dev/docs/guides/extensions) for trusted TypeScript hooks, installed as drafts and activated by a trusted lead or operator
+- [Extensions](https://docs.agent-swarm.dev/docs/guides/extensions) for trusted TypeScript hooks, installed as agent-owned inert drafts and activated by a trusted lead, operator, or dashboard user
 - [Realtime rooms](./runbooks/realtime-rooms.md) for shared page state, presence, and live channels
 - Your choice of harness and models: Claude Code, Codex, pi, opencode, Devin, or ACP agents
 

package/dist/{acp-adapter-4s7q25ft.js → acp-adapter-ahmjxhek.js}

@@ -1,10 +1,10 @@
-import {
-  fetchInstalledMcpServers
-} from "./cli-tng3131n.js";
 import {
   getAcpTargetCatalogEntry,
   isAcpTarget
 } from "./cli-dgnj0zcc.js";
+import {
+  fetchInstalledMcpServers
+} from "./cli-tng3131n.js";
 import"./cli-dpvkp2et.js";
 import {
   detachedProcessGroup,
@@ -29,7 +29,7 @@ import {
 import {
   init_package,
   package_default
-} from "./cli-gfez0qmk.js";
+} from "./cli-ybpp1srm.js";
 import {
   init_secret_scrubber,
   scrubSecrets

package/dist/{actions-cs6rhmvc.js → actions-jzrfpkmn.js}

@@ -1,26 +1,31 @@
 import {
   resolveSlackUserId
-} from "./cli-b4dyetqt.js";
+} from "./cli-eazstkad.js";
 import {
   createTaskWithSiblingAwareness
-} from "./cli-72tgtzr1.js";
+} from "./cli-qrqhc31j.js";
 import"./cli-0z2v4nhw.js";
-import"./cli-4wppfkcm.js";
+import"./cli-7g9s78jf.js";
 import"./cli-e7d20cty.js";
 import"./cli-re8z5p8p.js";
 import"./cli-3dpj7atn.js";
-import"./cli-kf8qp2vf.js";
-import"./cli-jytf5mw9.js";
-import"./cli-zfzznn7c.js";
-import"./cli-dsyg66vt.js";
+import"./cli-d6hk10xx.js";
+import"./cli-vw03hg5t.js";
+import"./cli-tdh4hjr2.js";
+import"./cli-83wkg402.js";
+import"./cli-ytxs7mn1.js";
+import"./cli-6ks9xf1n.js";
 import"./cli-epan13p1.js";
 import"./cli-y89t4nca.js";
 import"./cli-f14fvzag.js";
-import"./cli-fad8m16k.js";
-import"./cli-vbk025fm.js";
-import"./cli-7bwaerjt.js";
+import"./cli-r8tdds6s.js";
 import"./cli-bsakbbkm.js";
-import"./cli-gxf2ebyz.js";
+import"./cli-fad8m16k.js";
+import"./cli-jsp14b6c.js";
+import"./cli-ysc1kbet.js";
+import"./cli-7pnz2v6s.js";
+import"./cli-0d9nbqxf.js";
+import"./cli-aehm1rbq.js";
 import"./cli-51tf7ac3.js";
 import {
   buildCancelledBlocks,
@@ -29,14 +34,11 @@ import {
   getAgentEmoji,
   getTaskLink,
   isSlackRenderV2Enabled
-} from "./cli-wfve107r.js";
+} from "./cli-n0q9b7j4.js";
 import"./cli-q51yprfq.js";
+import"./cli-3er6gcsn.js";
 import"./cli-yatxqynm.js";
-import"./cli-jtvs5m8q.js";
-import"./cli-fm4ytsdk.js";
-import"./cli-aehm1rbq.js";
 import"./cli-2658f6at.js";
-import"./cli-jsp14b6c.js";
 import {
   cancelTask,
   getAgentById,
@@ -45,25 +47,27 @@ import {
   init_context_key,
   init_db,
   slackContextKey
-} from "./cli-bdt7w021.js";
-import"./cli-ht5rs63n.js";
+} from "./cli-djvxhnc4.js";
+import"./cli-zcsyfw2z.js";
+import"./cli-b2g6mzjc.js";
 import"./cli-z61ykvam.js";
+import"./cli-v4en75c5.js";
 import"./cli-dv6cdjs2.js";
-import"./cli-c2mk1kgf.js";
+import"./cli-n7h1kqpf.js";
 import"./cli-ej6gbxfb.js";
 import"./cli-sd0mxa3c.js";
 import"./cli-w5e1d1vv.js";
-import"./cli-gfez0qmk.js";
+import"./cli-ybpp1srm.js";
 import"./cli-r2ap2czm.js";
-import"./cli-pzxba7gw.js";
-import"./cli-f7kvq46p.js";
-import"./cli-zf8jjwex.js";
-import"./cli-c4eeb5q2.js";
-import"./cli-rgvp6r2x.js";
+import"./cli-5b6b62tz.js";
 import"./cli-btbzvq95.js";
 import"./cli-1m2e086m.js";
-import"./cli-8wrympd7.js";
+import"./cli-mcnhgnn1.js";
+import"./cli-bzr0ftht.js";
 import"./cli-bd957dgb.js";
+import"./cli-pzxba7gw.js";
+import"./cli-f7kvq46p.js";
+import"./cli-zf8jjwex.js";
 import"./cli-bc05qbss.js";
 
 // src/slack/actions.ts

package/dist/{anthropic-messages-2y8nktar.js → anthropic-messages-9vqsbznt.js}

@@ -1,19 +1,16 @@
-import {
-  splitDeferredTools
-} from "./cli-vfcth11k.js";
 import {
   buildCopilotDynamicHeaders,
   hasCopilotVisionInput
 } from "./cli-67bad0ze.js";
-import {
-  Anthropic
-} from "./cli-9xvdm3bx.js";
 import {
   retryProviderRequest
 } from "./cli-s8s499xy.js";
 import {
   getPiUserAgent
 } from "./cli-et1bbwqf.js";
+import {
+  Anthropic
+} from "./cli-h60qfasa.js";
 import"./cli-51tf7ac3.js";
 import {
   adjustMaxTokensForThinking,
@@ -22,16 +19,13 @@ import {
   getJsonSchemaToolParameters,
   resolveJsonSchemaStrictSampling,
   transformMessages
-} from "./cli-j8dggbcr.js";
+} from "./cli-k0g1sjzm.js";
 import {
   sanitizeSurrogates
 } from "./cli-y2apkfe2.js";
 import {
   headersToRecord
 } from "./cli-vapyk8sw.js";
-import {
-  calculateCost
-} from "./cli-rgvp6r2x.js";
 import {
   getProviderEnvValue
 } from "./cli-btbzvq95.js";
@@ -39,10 +33,20 @@ import {
   parseJsonWithRepair,
   parseStreamingJson
 } from "./cli-1m2e086m.js";
+import {
+  calculateCost,
+  getCurrentTools,
+  getDeclaredTools,
+  getInitialSystemMessage,
+  getSystemMessageText,
+  hasToolRedefinitions,
+  renderSystemMessageUpdate,
+  resolveTranscript
+} from "./cli-mcnhgnn1.js";
 import {
   AssistantMessageEventStream,
   appendAssistantMessageDiagnostic
-} from "./cli-8wrympd7.js";
+} from "./cli-bzr0ftht.js";
 import"./cli-bc05qbss.js";
 
 // node_modules/@earendil-works/pi-ai/dist/api/anthropic-messages.js
@@ -66,7 +70,7 @@ function getCacheControl(model, cacheRetention, env) {
     cacheControl: { type: "ephemeral", ...ttl && { ttl } }
   };
 }
-var claudeCodeVersion = "2.1.251";
+var claudeCodeVersion = "2.1.280";
 var claudeCodeTools = [
   "Read",
   "Write",
@@ -133,31 +137,31 @@ var INTERLEAVED_THINKING_BETA = "interleaved-thinking-2025-05-14";
 var SERVER_SIDE_FALLBACK_BETA = "server-side-fallback-2026-07-01";
 var MID_CONVERSATION_OUTPUT_CONFIG_BETA = "mid-conversation-output-config-2026-07-01";
 var THINKING_BINDING_CONTROLS_BETA = "thinking-binding-controls-2026-08-01";
+var MID_CONVERSATION_TOOL_CHANGES_BETA = "mid-conversation-tool-changes-2026-07-01";
+var DEFERRED_TOOL_PLACEHOLDER = {
+  name: "__pi_deferred_placeholder__",
+  description: "Reserved placeholder. Never available. Never call this.",
+  input_schema: { type: "object", properties: {}, required: [] },
+  defer_loading: true
+};
 function shouldUseServerSideFallbackBeta(model) {
   return (model.compat?.allowedFallbackModels?.length ?? 0) > 0;
 }
 function getAnthropicCompat(model) {
+  const isOpenRouter = model.provider === "openrouter" || model.baseUrl.includes("openrouter.ai");
   return {
     supportsEagerToolInputStreaming: model.compat?.supportsEagerToolInputStreaming ?? true,
     supportsLongCacheRetention: model.compat?.supportsLongCacheRetention ?? true,
-    sendSessionAffinityHeaders: model.compat?.sendSessionAffinityHeaders ?? false,
+    sendSessionAffinityHeaders: model.compat?.sendSessionAffinityHeaders ?? isOpenRouter,
+    sessionAffinityFormat: model.compat?.sessionAffinityFormat ?? (isOpenRouter ? "openrouter" : undefined),
     supportsCacheControlOnTools: model.compat?.supportsCacheControlOnTools ?? true,
     supportsTemperature: model.compat?.supportsTemperature ?? true,
     allowEmptySignature: model.compat?.allowEmptySignature ?? false,
     supportsStrictTools: model.compat?.supportsStrictTools ?? false,
-    supportsToolReferences: model.compat?.supportsToolReferences ?? defaultSupportsToolReferences(model)
+    supportsMidConvoSystemMessages: model.compat?.supportsMidConvoSystemMessages ?? false,
+    supportsMidConvoToolChanges: model.compat?.supportsMidConvoToolChanges ?? false
   };
 }
-function defaultSupportsToolReferences(model) {
-  if (model.provider !== "anthropic" || model.id.includes("haiku"))
-    return false;
-  const version = model.id.match(/^claude-(?:opus|sonnet|fable)-(\d+)(?:-(\d+))?(?:-|$)/);
-  if (!version)
-    return false;
-  const major = Number(version[1]);
-  const minor = version[2] && version[2].length < 8 ? Number(version[2]) : 0;
-  return major > 4 || major === 4 && minor >= 5;
-}
 function mergeHeaders(...headerSources) {
   const merged = {};
   for (const headers of headerSources) {
@@ -340,6 +344,8 @@ async function* iterateAnthropicEvents(response, signal) {
 }
 var stream = (model, context, options) => {
   const stream2 = new AssistantMessageEventStream;
+  const normalizedContext = resolveTranscript(context, getAnthropicCompat(model).supportsMidConvoSystemMessages);
+  const currentTools = getCurrentTools(normalizedContext.messages);
   (async () => {
     const providerThinkingLevel = model.compat?.supportsMidConvoEffort ? options?.effort ?? "high" : undefined;
     const output = {
@@ -373,9 +379,9 @@ var stream = (model, context, options) => {
         assertRequestAuth(model.provider, apiKey, options?.headers);
         let copilotDynamicHeaders;
         if (model.provider === "github-copilot") {
-          const hasImages = hasCopilotVisionInput(context.messages);
+          const hasImages = hasCopilotVisionInput(normalizedContext.messages);
           copilotDynamicHeaders = buildCopilotDynamicHeaders({
-            messages: context.messages,
+            messages: normalizedContext.messages,
             hasImages
           });
         }
@@ -385,7 +391,7 @@ var stream = (model, context, options) => {
         client = created.client;
         isOAuth = created.isOAuthToken;
       }
-      let params = buildParams(model, context, isOAuth, options);
+      let params = buildParams(model, normalizedContext, isOAuth, options);
       const nextParams = await options?.onPayload?.(params, model);
       if (nextParams !== undefined) {
         params = { ...nextParams, stream: true };
@@ -409,9 +415,11 @@ var stream = (model, context, options) => {
           const transformations = event.message.input_transformations;
           if (Array.isArray(transformations))
             inputTransformations = transformations;
-          output.model = event.message.model;
-          const fallbackCost = output.model === model.id ? undefined : model.compat?.allowedFallbackModels?.find((fallback) => fallback.provider === model.provider && fallback.model === output.model)?.cost;
-          usageModel = fallbackCost ? { ...model, id: output.model, cost: fallbackCost } : model;
+          const responseModel = event.message.model;
+          if (responseModel !== model.id)
+            output.responseModel = responseModel;
+          const fallbackCost = responseModel === model.id ? undefined : model.compat?.allowedFallbackModels?.find((fallback) => fallback.provider === model.provider && fallback.model === responseModel)?.cost;
+          usageModel = fallbackCost ? { ...model, id: responseModel, cost: fallbackCost } : model;
           output.usage.input = event.message.usage.input_tokens || 0;
           output.usage.output = event.message.usage.output_tokens || 0;
           output.usage.cacheRead = event.message.usage.cache_read_input_tokens || 0;
@@ -457,7 +465,7 @@ var stream = (model, context, options) => {
             const block = {
               type: "toolCall",
               id: event.content_block.id,
-              name: isOAuth ? fromClaudeCodeName(event.content_block.name, context.tools) : event.content_block.name,
+              name: isOAuth ? fromClaudeCodeName(event.content_block.name, currentTools) : event.content_block.name,
               arguments: event.content_block.input ?? {},
               partialJson: "",
               index: event.index
@@ -691,7 +699,12 @@ function createClient(model, apiKey, optionsHeaders, fetch, dynamicHeaders, sess
     });
     return { client: client2, isOAuthToken: true };
   }
-  const sessionAffinityHeaders = sessionId && getAnthropicCompat(model).sendSessionAffinityHeaders ? { "x-session-affinity": sessionId } : {};
+  const compat = getAnthropicCompat(model);
+  const sessionAffinityHeaders = {};
+  if (sessionId && compat.sendSessionAffinityHeaders) {
+    const header = compat.sessionAffinityFormat === "openrouter" ? "x-session-id" : "x-session-affinity";
+    sessionAffinityHeaders[header] = sessionId;
+  }
   const defaultHeaders = mergeClientHeaders({
     accept: "application/json",
     "anthropic-dangerous-direct-browser-access": "true"
@@ -706,7 +719,7 @@ function createClient(model, apiKey, optionsHeaders, fetch, dynamicHeaders, sess
   });
   return { client, isOAuthToken: false };
 }
-function getBetaFeatures(model, context, isOAuthToken2, options) {
+function getBetaFeatures(model, context, isOAuthToken2, nativeToolChanges, options) {
   let configuredFeatures;
   for (const headers of [model.headers, options?.headers]) {
     for (const [name, value] of Object.entries(headers ?? {})) {
@@ -734,24 +747,22 @@ function getBetaFeatures(model, context, isOAuthToken2, options) {
   if (model.compat?.supportsMidConvoEffort === true) {
     features.push(MID_CONVERSATION_OUTPUT_CONFIG_BETA, THINKING_BINDING_CONTROLS_BETA);
   }
+  if (nativeToolChanges)
+    features.push(MID_CONVERSATION_TOOL_CHANGES_BETA);
   return [...new Set(features)];
 }
 function buildParams(model, context, isOAuthToken2, options) {
   const { cacheControl } = getCacheControl(model, options?.cacheRetention, options?.env);
   const compat = getAnthropicCompat(model);
+  const initialSystemMessage = getInitialSystemMessage(context.messages);
+  const initialSystemText = initialSystemMessage ? getSystemMessageText(initialSystemMessage) : "";
   const transformedMessages = transformMessages(context.messages, model, normalizeToolCallId);
-  const normalizeToolName = isOAuthToken2 ? toClaudeCodeName : (name) => name;
-  const toolPlacement = splitDeferredTools({ ...context, messages: transformedMessages }, compat.supportsToolReferences, normalizeToolName);
-  let immediateTools = toolPlacement.immediate;
-  let deferredTools = [...toolPlacement.deferred.values()];
-  if (immediateTools.length === 0 && deferredTools.length > 0) {
-    immediateTools = deferredTools;
-    deferredTools = [];
-  }
-  const deferredToolNames = new Set(deferredTools.map((tool) => normalizeToolName(tool.name)));
-  const converted = convertMessages(transformedMessages, isOAuthToken2, cacheControl, compat.allowEmptySignature, deferredToolNames, normalizeToolName, model.compat?.supportsMidConvoEffort === true ? model.provider : undefined);
+  const conversationMessages = initialSystemMessage ? transformedMessages.slice(1) : transformedMessages;
+  const initialTools = initialSystemMessage?.toolsAdded ?? [];
+  const nativeToolChanges = compat.supportsMidConvoSystemMessages && compat.supportsMidConvoToolChanges && initialTools.length > 0 && !hasToolRedefinitions(context.messages);
+  const converted = convertMessages(conversationMessages, isOAuthToken2, cacheControl, compat.allowEmptySignature, model.compat?.supportsMidConvoEffort === true ? model.provider : undefined, nativeToolChanges);
   const activeEffort = options?.effort ?? "high";
-  const betaFeatures = getBetaFeatures(model, context, isOAuthToken2, options);
+  const betaFeatures = getBetaFeatures(model, context, isOAuthToken2, nativeToolChanges, options);
   const params = {
     model: model.id,
     messages: model.compat?.supportsMidConvoEffort === true ? insertThinkingLevelMessages(converted, activeEffort) : converted.messages,
@@ -767,18 +778,18 @@ function buildParams(model, context, isOAuthToken2, options) {
         ...cacheControl ? { cache_control: cacheControl } : {}
       }
     ];
-    if (context.systemPrompt) {
+    if (initialSystemText) {
       params.system.push({
         type: "text",
-        text: sanitizeSurrogates(context.systemPrompt),
+        text: sanitizeSurrogates(initialSystemText),
         ...cacheControl ? { cache_control: cacheControl } : {}
       });
     }
-  } else if (context.systemPrompt) {
+  } else if (initialSystemText) {
     params.system = [
       {
         type: "text",
-        text: sanitizeSurrogates(context.systemPrompt),
+        text: sanitizeSurrogates(initialSystemText),
         ...cacheControl ? { cache_control: cacheControl } : {}
       }
     ];
@@ -786,11 +797,20 @@ function buildParams(model, context, isOAuthToken2, options) {
   if (options?.temperature !== undefined && !options?.thinkingEnabled && model.compat?.supportsMidConvoEffort !== true && compat.supportsTemperature) {
     params.temperature = options.temperature;
   }
-  if (immediateTools.length > 0 || deferredTools.length > 0) {
+  const toolCacheControl = compat.supportsCacheControlOnTools ? cacheControl : undefined;
+  if (nativeToolChanges) {
+    const initialNames = new Set(initialTools.map((tool) => tool.name));
+    const laterTools = getDeclaredTools(context.messages).filter((tool) => !initialNames.has(tool.name));
     params.tools = [
-      ...convertTools(immediateTools, isOAuthToken2, compat.supportsEagerToolInputStreaming, compat.supportsStrictTools, compat.supportsCacheControlOnTools ? cacheControl : undefined),
-      ...convertTools(deferredTools, isOAuthToken2, compat.supportsEagerToolInputStreaming, compat.supportsStrictTools, undefined, true)
+      ...convertTools(initialTools, isOAuthToken2, compat.supportsEagerToolInputStreaming, compat.supportsStrictTools, toolCacheControl),
+      DEFERRED_TOOL_PLACEHOLDER,
+      ...convertTools(laterTools, isOAuthToken2, compat.supportsEagerToolInputStreaming, compat.supportsStrictTools).map((tool) => ({ ...tool, defer_loading: true }))
     ];
+  } else {
+    const tools = getCurrentTools(context.messages);
+    if (tools.length > 0) {
+      params.tools = convertTools(tools, isOAuthToken2, compat.supportsEagerToolInputStreaming, compat.supportsStrictTools, toolCacheControl);
+    }
   }
   if (model.compat?.supportsMidConvoEffort === true) {
     params.thinking = {
@@ -840,36 +860,46 @@ function buildParams(model, context, isOAuthToken2, options) {
 function normalizeToolCallId(id) {
   return id.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 64);
 }
-function convertToolResult(msg, isOAuthToken2, deferredToolNames, loadedToolNames, normalizeToolName) {
-  const references = [];
-  for (const name of msg.addedToolNames ?? []) {
-    const normalizedName = normalizeToolName(name);
-    if (!deferredToolNames.has(normalizedName) || loadedToolNames.has(normalizedName))
-      continue;
-    loadedToolNames.add(normalizedName);
-    references.push({
-      type: "tool_reference",
-      tool_name: isOAuthToken2 ? toClaudeCodeName(name) : name
-    });
-  }
-  const convertedContent = convertContentBlocks(msg.content);
+function convertToolResult(msg) {
   return {
-    toolResult: {
-      type: "tool_result",
-      tool_use_id: msg.toolCallId,
-      content: references.length > 0 ? references : convertedContent,
-      is_error: msg.isError
-    },
-    siblingContent: references.length === 0 ? [] : typeof convertedContent === "string" ? [{ type: "text", text: convertedContent }] : convertedContent
+    type: "tool_result",
+    tool_use_id: msg.toolCallId,
+    content: convertContentBlocks(msg.content),
+    is_error: msg.isError
   };
 }
-function convertMessages(transformedMessages, isOAuthToken2, cacheControl, allowEmptySignature = false, deferredToolNames = new Set, normalizeToolName = (name) => name, managedProvider) {
+function convertMessages(transformedMessages, isOAuthToken2, cacheControl, allowEmptySignature = false, managedProvider, nativeToolChanges = false) {
   const params = [];
   const assistantLevels = new Map;
-  const loadedToolNames = new Set;
+  const pendingSystemMessages = [];
+  const flushPendingSystemMessages = () => {
+    params.push(...pendingSystemMessages);
+    pendingSystemMessages.length = 0;
+  };
   for (let i = 0;i < transformedMessages.length; i++) {
     const msg = transformedMessages[i];
-    if (msg.role === "user") {
+    if (msg.role === "system") {
+      const text = renderSystemMessageUpdate(msg);
+      const blocks = [];
+      if (text.length > 0)
+        blocks.push({ type: "text", text: sanitizeSurrogates(text) });
+      if (nativeToolChanges) {
+        for (const tool of msg.toolsRemoved ?? []) {
+          blocks.push({
+            type: "tool_removal",
+            tool: { type: "tool_reference", name: isOAuthToken2 ? toClaudeCodeName(tool.name) : tool.name }
+          });
+        }
+        for (const tool of msg.toolsAdded ?? []) {
+          blocks.push({
+            type: "tool_addition",
+            tool: { type: "tool_reference", name: isOAuthToken2 ? toClaudeCodeName(tool.name) : tool.name }
+          });
+        }
+      }
+      if (blocks.length > 0)
+        pendingSystemMessages.push({ role: "system", content: blocks });
+    } else if (msg.role === "user") {
       if (typeof msg.content === "string") {
         if (msg.content.trim().length > 0) {
           params.push({
@@ -909,6 +939,7 @@ function convertMessages(transformedMessages, isOAuthToken2, cacheControl, allow
         });
       }
     } else if (msg.role === "assistant") {
+      flushPendingSystemMessages();
       const blocks = [];
       for (const block of msg.content) {
         if (block.type === "text") {
@@ -967,27 +998,25 @@ function convertMessages(transformedMessages, isOAuthToken2, cacheControl, allow
       }
     } else if (msg.role === "toolResult") {
       const toolResults = [];
-      const siblingContent = [];
       let j = i;
       while (j < transformedMessages.length && transformedMessages[j].role === "toolResult") {
-        const converted = convertToolResult(transformedMessages[j], isOAuthToken2, deferredToolNames, loadedToolNames, normalizeToolName);
-        toolResults.push(converted.toolResult);
-        siblingContent.push(...converted.siblingContent);
+        toolResults.push(convertToolResult(transformedMessages[j]));
         j++;
       }
       i = j - 1;
       params.push({
         role: "user",
-        content: [...toolResults, ...siblingContent]
+        content: toolResults
       });
     }
   }
+  flushPendingSystemMessages();
   if (cacheControl && params.length > 0) {
     const lastMessage = params[params.length - 1];
-    if (lastMessage.role === "user") {
+    if (lastMessage.role === "user" || lastMessage.role === "system") {
       if (Array.isArray(lastMessage.content)) {
         const lastBlock = lastMessage.content[lastMessage.content.length - 1];
-        if (lastBlock && (lastBlock.type === "text" || lastBlock.type === "image" || lastBlock.type === "tool_result")) {
+        if (lastBlock && (lastBlock.type === "text" || lastBlock.type === "image" || lastBlock.type === "tool_result" || lastBlock.type === "tool_addition" || lastBlock.type === "tool_removal")) {
           lastBlock.cache_control = cacheControl;
         }
       } else if (typeof lastMessage.content === "string") {
@@ -1019,9 +1048,9 @@ function insertThinkingLevelMessages(converted, activeEffort) {
   return messages;
 }
 function shouldUseFineGrainedToolStreamingBeta(model, context) {
-  return !!context.tools?.length && !getAnthropicCompat(model).supportsEagerToolInputStreaming;
+  return getCurrentTools(context.messages).length > 0 && !getAnthropicCompat(model).supportsEagerToolInputStreaming;
 }
-function convertTools(tools, isOAuthToken2, supportsEagerToolInputStreaming, supportsStrictTools, cacheControl, deferLoading = false) {
+function convertTools(tools, isOAuthToken2, supportsEagerToolInputStreaming, supportsStrictTools, cacheControl) {
   if (!tools)
     return [];
   return tools.map((tool, index) => {
@@ -1043,7 +1072,6 @@ function convertTools(tools, isOAuthToken2, supportsEagerToolInputStreaming, sup
       ...supportsEagerToolInputStreaming ? { eager_input_streaming: true } : {},
       ...strict === true ? { strict: true } : {},
       input_schema: inputSchema,
-      ...deferLoading ? { defer_loading: true } : {},
       ...cacheControl && index === tools.length - 1 ? { cache_control: cacheControl } : {}
     };
   });

package/dist/{app-j54aq0dj.js → app-03na2vwb.js}

@@ -3,23 +3,26 @@ import {
   initSlackApp,
   startSlackApp,
   stopSlackApp
-} from "./cli-wfve107r.js";
+} from "./cli-n0q9b7j4.js";
 import"./cli-q51yprfq.js";
+import"./cli-3er6gcsn.js";
 import"./cli-yatxqynm.js";
 import"./cli-2658f6at.js";
-import"./cli-bdt7w021.js";
-import"./cli-ht5rs63n.js";
+import"./cli-djvxhnc4.js";
+import"./cli-zcsyfw2z.js";
+import"./cli-b2g6mzjc.js";
 import"./cli-z61ykvam.js";
+import"./cli-v4en75c5.js";
 import"./cli-dv6cdjs2.js";
-import"./cli-c2mk1kgf.js";
+import"./cli-n7h1kqpf.js";
 import"./cli-ej6gbxfb.js";
 import"./cli-sd0mxa3c.js";
 import"./cli-w5e1d1vv.js";
-import"./cli-gfez0qmk.js";
+import"./cli-ybpp1srm.js";
 import"./cli-r2ap2czm.js";
+import"./cli-bd957dgb.js";
 import"./cli-pzxba7gw.js";
 import"./cli-zf8jjwex.js";
-import"./cli-bd957dgb.js";
 import"./cli-bc05qbss.js";
 export {
   getSlackApp,