@standardagents/builder 0.13.1 → 0.14.0

package/dist/index.js

@@ -1,7 +1,7 @@
 import { ProviderError, mapReasoningLevel, defineTool } from '@standardagents/spec';
 export { ProviderError, belongsToPackage, defineAgent, defineHook, defineModel, definePrompt, defineTool, isPacked, isVisibleInNamespace, mapReasoningLevel } from '@standardagents/spec';
 import { z } from 'zod';
-import { sip } from '@standardagents/sip';
+import { transform, collect } from '@standardagents/sip';
 import * as fs4 from 'fs';
 import fs4__default from 'fs';
 import * as path8 from 'path';
@@ -193,6 +193,274 @@ var init_StreamManager = __esm({
     };
   }
 });
+
+// src/agents/pricing.ts
+function getGoogleFallbackPricing(modelId) {
+  const normalized = normalizeGoogleModelId(modelId);
+  const exact = GOOGLE_MODEL_PRICING[normalized];
+  if (exact) return { ...exact, source: "google-static" };
+  const prefixMatch = GOOGLE_MODEL_PRICING_PREFIXES.find((entry) => normalized.startsWith(entry.prefix));
+  if (prefixMatch) return { ...prefixMatch.pricing, source: "google-static" };
+  return null;
+}
+function getGroqFallbackPricing(modelId) {
+  const pricing = GROQ_MODEL_PRICING[normalizeModelId(modelId)];
+  return pricing ? { ...pricing, source: "groq-static" } : null;
+}
+function getXAIFallbackPricing(modelId) {
+  const pricing = XAI_MODEL_PRICING[normalizeModelId(modelId)];
+  return pricing ? { ...pricing, source: "xai-static" } : null;
+}
+function normalizeModelId(modelId) {
+  return (modelId || "").trim().toLowerCase();
+}
+function normalizeGoogleModelId(modelId) {
+  return normalizeModelId(modelId).replace(/^google\//, "").replace(/^models\//, "").replace(/^publishers\/google\/models\//, "");
+}
+function roundCost(value) {
+  return Number(value.toFixed(12));
+}
+function getCerebrasFallbackPricing(modelId) {
+  const pricing = CEREBRAS_MODEL_PRICING[normalizeModelId(modelId)];
+  return pricing ? { ...pricing, source: "cerebras-static" } : null;
+}
+function resolveModelPricing(modelDef, providerName) {
+  if (typeof modelDef.inputPrice === "number" && typeof modelDef.outputPrice === "number") {
+    return {
+      inputPrice: modelDef.inputPrice,
+      outputPrice: modelDef.outputPrice,
+      cachedPrice: modelDef.cachedPrice,
+      source: "model"
+    };
+  }
+  if (providerName === "cerebras") {
+    return getCerebrasFallbackPricing(modelDef.model);
+  }
+  if (providerName === "google") {
+    return getGoogleFallbackPricing(modelDef.model);
+  }
+  if (providerName === "groq") {
+    return getGroqFallbackPricing(modelDef.model);
+  }
+  if (providerName === "xai") {
+    return getXAIFallbackPricing(modelDef.model);
+  }
+  return null;
+}
+function calculateUsageCost(usage, pricing) {
+  if (!pricing) {
+    return null;
+  }
+  const cachedTokens = Math.max(usage.prompt_tokens_details?.cached_tokens || 0, 0);
+  const promptTokens = Math.max(usage.prompt_tokens || 0, 0);
+  const completionTokens = Math.max(usage.completion_tokens || 0, 0);
+  const reasoningTokens = pricing.source === "google-static" ? Math.max(usage.completion_tokens_details?.reasoning_tokens || 0, 0) : 0;
+  const billableOutputTokens = completionTokens + reasoningTokens;
+  const uncachedPromptTokens = Math.max(promptTokens - cachedTokens, 0);
+  const cachedTokenPrice = pricing.cachedPrice ?? pricing.inputPrice;
+  const costInput = roundCost(
+    (uncachedPromptTokens * pricing.inputPrice + cachedTokens * cachedTokenPrice) / TOKENS_PER_MILLION
+  );
+  const costOutput = roundCost(billableOutputTokens * pricing.outputPrice / TOKENS_PER_MILLION);
+  return {
+    costInput,
+    costOutput,
+    costTotal: roundCost(costInput + costOutput)
+  };
+}
+var TOKENS_PER_MILLION, CEREBRAS_MODEL_PRICING, GOOGLE_MODEL_PRICING, GOOGLE_MODEL_PRICING_PREFIXES, GROQ_MODEL_PRICING, XAI_MODEL_PRICING;
+var init_pricing = __esm({
+  "src/agents/pricing.ts"() {
+    TOKENS_PER_MILLION = 1e6;
+    CEREBRAS_MODEL_PRICING = {
+      "zai-glm-4.7": {
+        inputPrice: 2.25,
+        outputPrice: 2.75
+      },
+      "gpt-oss-120b": {
+        inputPrice: 0.35,
+        outputPrice: 0.75
+      },
+      "llama3.1-8b": {
+        inputPrice: 0.1,
+        outputPrice: 0.1
+      },
+      "qwen-3-235b-a22b-instruct-2507": {
+        inputPrice: 0.6,
+        outputPrice: 1.2
+      }
+    };
+    GOOGLE_MODEL_PRICING = {
+      "gemini-3-pro-preview": {
+        inputPrice: 2,
+        outputPrice: 12,
+        cachedPrice: 0.2
+      },
+      "gemini-3.1-pro-preview": {
+        inputPrice: 2,
+        outputPrice: 12,
+        cachedPrice: 0.2
+      },
+      "gemini-2.5-pro": {
+        inputPrice: 1.25,
+        outputPrice: 10,
+        cachedPrice: 0.125
+      },
+      "gemini-2.5-flash": {
+        inputPrice: 0.3,
+        outputPrice: 2.5,
+        cachedPrice: 0.03
+      },
+      "gemini-2.5-flash-lite": {
+        inputPrice: 0.1,
+        outputPrice: 0.4,
+        cachedPrice: 0.01
+      },
+      "gemini-3-flash-preview": {
+        inputPrice: 0.5,
+        outputPrice: 3,
+        cachedPrice: 0.05
+      },
+      "gemini-3.1-flash-lite-preview": {
+        inputPrice: 0.25,
+        outputPrice: 1.5,
+        cachedPrice: 0.025
+      },
+      "deep-research-pro-preview-12-2025": {
+        inputPrice: 2,
+        outputPrice: 12,
+        cachedPrice: 0.2
+      },
+      "gemini-2.0-flash": {
+        inputPrice: 0.1,
+        outputPrice: 0.4,
+        cachedPrice: 0.025
+      },
+      "gemini-2.0-flash-001": {
+        inputPrice: 0.1,
+        outputPrice: 0.4,
+        cachedPrice: 0.025
+      },
+      "gemini-2.0-flash-lite": {
+        inputPrice: 0.075,
+        outputPrice: 0.3
+      },
+      "gemini-2.0-flash-lite-001": {
+        inputPrice: 0.075,
+        outputPrice: 0.3
+      },
+      "gemini-2.5-computer-use-preview-10-2025": {
+        inputPrice: 1.25,
+        outputPrice: 10
+      },
+      "gemini-2.5-flash-image": {
+        inputPrice: 0.3,
+        outputPrice: 0
+      },
+      "gemini-3.1-flash-image-preview": {
+        inputPrice: 0.5,
+        outputPrice: 3
+      },
+      "gemini-3-pro-image-preview": {
+        inputPrice: 2,
+        outputPrice: 0
+      },
+      "nano-banana-pro-preview": {
+        inputPrice: 2,
+        outputPrice: 0
+      },
+      "gemma-4-31b-it": {
+        inputPrice: 0,
+        outputPrice: 0,
+        cachedPrice: 0
+      }
+    };
+    GOOGLE_MODEL_PRICING_PREFIXES = [
+      {
+        prefix: "gemini-3.1-pro-preview",
+        pricing: GOOGLE_MODEL_PRICING["gemini-3.1-pro-preview"]
+      },
+      {
+        prefix: "gemini-3-pro-preview",
+        pricing: GOOGLE_MODEL_PRICING["gemini-3-pro-preview"]
+      },
+      {
+        prefix: "gemini-3-flash-preview",
+        pricing: GOOGLE_MODEL_PRICING["gemini-3-flash-preview"]
+      },
+      {
+        prefix: "gemini-3.1-flash-lite-preview",
+        pricing: GOOGLE_MODEL_PRICING["gemini-3.1-flash-lite-preview"]
+      },
+      {
+        prefix: "gemini-2.5-flash-lite-preview-",
+        pricing: GOOGLE_MODEL_PRICING["gemini-2.5-flash-lite"]
+      },
+      {
+        prefix: "gemini-flash-latest",
+        pricing: GOOGLE_MODEL_PRICING["gemini-2.5-flash"]
+      },
+      {
+        prefix: "gemini-flash-lite-latest",
+        pricing: GOOGLE_MODEL_PRICING["gemini-2.5-flash-lite"]
+      },
+      {
+        prefix: "gemini-pro-latest",
+        pricing: GOOGLE_MODEL_PRICING["gemini-2.5-pro"]
+      },
+      {
+        prefix: "gemma-4-",
+        pricing: {
+          inputPrice: 0,
+          outputPrice: 0,
+          cachedPrice: 0
+        }
+      },
+      {
+        prefix: "gemma-3-",
+        pricing: {
+          inputPrice: 0,
+          outputPrice: 0,
+          cachedPrice: 0
+        }
+      },
+      {
+        prefix: "gemma-3n-",
+        pricing: {
+          inputPrice: 0,
+          outputPrice: 0,
+          cachedPrice: 0
+        }
+      }
+    ];
+    GROQ_MODEL_PRICING = {
+      "llama-3.1-8b-instant": { inputPrice: 0.05, outputPrice: 0.08 },
+      "llama-3.3-70b-versatile": { inputPrice: 0.59, outputPrice: 0.79 },
+      "meta-llama/llama-4-scout-17b-16e-instruct": { inputPrice: 0.11, outputPrice: 0.34 },
+      "moonshotai/kimi-k2-instruct": { inputPrice: 1, outputPrice: 3 },
+      "openai/gpt-oss-120b": { inputPrice: 0.15, cachedPrice: 0.075, outputPrice: 0.6 },
+      "openai/gpt-oss-20b": { inputPrice: 0.075, cachedPrice: 0.037, outputPrice: 0.3 },
+      "qwen/qwen3-32b": { inputPrice: 0.29, outputPrice: 0.59 }
+    };
+    XAI_MODEL_PRICING = {
+      "grok-4-0709": { inputPrice: 30, cachedPrice: 7.5, outputPrice: 150 },
+      "grok-4": { inputPrice: 30, cachedPrice: 7.5, outputPrice: 150 },
+      "grok-4-latest": { inputPrice: 30, cachedPrice: 7.5, outputPrice: 150 },
+      "grok-4-fast-reasoning": { inputPrice: 2, cachedPrice: 0.5, outputPrice: 5 },
+      "grok-4-fast-non-reasoning": { inputPrice: 2, cachedPrice: 0.5, outputPrice: 5 },
+      "grok-4-1-fast-reasoning": { inputPrice: 2, cachedPrice: 0.5, outputPrice: 5 },
+      "grok-4-1-fast-non-reasoning": { inputPrice: 2, cachedPrice: 0.5, outputPrice: 5 },
+      "grok-4.20-0309-reasoning": { inputPrice: 20, cachedPrice: 2, outputPrice: 60 },
+      "grok-4.20-0309-non-reasoning": { inputPrice: 20, cachedPrice: 2, outputPrice: 60 },
+      "grok-4.20-multi-agent-0309": { inputPrice: 20, cachedPrice: 2, outputPrice: 60 },
+      "grok-code-fast-1": { inputPrice: 2, cachedPrice: 0.2, outputPrice: 15 },
+      "grok-3": { inputPrice: 30, cachedPrice: 7.5, outputPrice: 150 },
+      "grok-3-latest": { inputPrice: 30, cachedPrice: 7.5, outputPrice: 150 },
+      "grok-3-mini": { inputPrice: 3, cachedPrice: 0.75, outputPrice: 5 },
+      "grok-3-mini-latest": { inputPrice: 3, cachedPrice: 0.75, outputPrice: 5 }
+    };
+  }
+});
 var init_types2 = __esm({
   "src/agents/providers/types.ts"() {
   }
@@ -648,6 +916,12 @@ var init_ProviderRegistry = __esm({
         if (modelDef.providerOptions?.baseUrl) {
           config.baseUrl = modelDef.providerOptions.baseUrl;
         }
+        if (providerName === "cloudflare" && !config.baseUrl && env.CLOUDFLARE_ACCOUNT_ID) {
+          config.baseUrl = `https://api.cloudflare.com/client/v4/accounts/${env.CLOUDFLARE_ACCOUNT_ID}/ai/v1`;
+        }
+        if (providerName === "cloudflare" && env.CLOUDFLARE_ACCOUNT_ID) {
+          config.accountId = env.CLOUDFLARE_ACCOUNT_ID;
+        }
         return this.cacheAndReturn(modelName, providerFactory(config), modelDef);
       }
       buildResult(provider, modelDef) {
@@ -662,11 +936,14 @@ var init_ProviderRegistry = __esm({
        */
       getApiKeyForProvider(providerName, env) {
         const apiKeyEnvVarMap = {
+          cloudflare: "CLOUDFLARE_API_TOKEN",
           cerebras: "CEREBRAS_API_KEY",
+          google: "GOOGLE_API_KEY",
+          groq: "GROQ_API_KEY",
           openai: "OPENAI_API_KEY",
           openrouter: "OPENROUTER_API_KEY",
           anthropic: "ANTHROPIC_API_KEY",
-          google: "GOOGLE_API_KEY"
+          xai: "XAI_API_KEY"
         };
         const envVar = apiKeyEnvVarMap[providerName.toLowerCase()];
         if (envVar && env[envVar]) {
@@ -716,6 +993,13 @@ function modelSupportsImageInput(modelDef) {
   }
   return true;
 }
+function modelSupportsToolCalls(modelDef) {
+  const supportsToolCalls = modelDef.capabilities?.supportsToolCalls;
+  if (typeof supportsToolCalls === "boolean") {
+    return supportsToolCalls;
+  }
+  return true;
+}
 function filterImagesFromProviderMessages(messages) {
   let removedUserImageParts = 0;
   let removedToolImageAttachments = 0;
@@ -767,6 +1051,77 @@ function filterImagesFromProviderMessages(messages) {
     removedToolImageAttachments
   };
 }
+function filterEmptyAssistantProviderMessages(messages) {
+  return messages.filter((message) => {
+    if (message.role !== "assistant") return true;
+    const hasToolCalls = Array.isArray(message.toolCalls) && message.toolCalls.length > 0;
+    const hasReasoning = typeof message.reasoning === "string" ? message.reasoning.trim().length > 0 : Boolean(message.reasoningDetails);
+    const hasContent = typeof message.content === "string" ? message.content.trim().length > 0 : message.content !== null;
+    return hasToolCalls || hasReasoning || hasContent;
+  });
+}
+function buildSyntheticMissingToolResult(toolCall) {
+  return {
+    role: "tool",
+    tool_call_id: toolCall.id,
+    name: toolCall.function.name,
+    toolName: toolCall.function.name,
+    content: `Tool result missing from conversation history for prior call "${toolCall.function.name}". Treat this as a failed tool call.`
+  };
+}
+function normalizeToolCallMessageSequence(messages) {
+  const normalized = [];
+  let pending = null;
+  const flushPending = () => {
+    if (!pending) {
+      return;
+    }
+    normalized.push(pending.assistantMessage);
+    for (const toolCall of pending.expectedToolCalls) {
+      const matchedResult = pending.matchedResults.get(toolCall.id);
+      normalized.push(matchedResult ?? buildSyntheticMissingToolResult(toolCall));
+    }
+    if (pending.deferredMessages.length > 0) {
+      normalized.push(...normalizeToolCallMessageSequence(pending.deferredMessages));
+    }
+    pending = null;
+  };
+  for (const message of messages) {
+    const isAssistantToolCallMessage = message.role === "assistant" && Array.isArray(message.tool_calls) && message.tool_calls.length > 0;
+    if (!pending) {
+      if (!isAssistantToolCallMessage) {
+        normalized.push(message);
+        continue;
+      }
+      const toolCalls = message.tool_calls ?? [];
+      const expectedToolCalls = toolCalls.filter(
+        (toolCall) => Boolean(toolCall && typeof toolCall.id === "string" && toolCall.function?.name)
+      );
+      if (expectedToolCalls.length === 0) {
+        normalized.push(message);
+        continue;
+      }
+      pending = {
+        assistantMessage: message,
+        expectedToolCalls,
+        matchedResults: /* @__PURE__ */ new Map(),
+        deferredMessages: []
+      };
+      continue;
+    }
+    const matchesPendingToolResult = message.role === "tool" && typeof message.tool_call_id === "string" && pending.expectedToolCalls.some((toolCall) => toolCall.id === message.tool_call_id) && !pending.matchedResults.has(message.tool_call_id);
+    if (matchesPendingToolResult) {
+      pending.matchedResults.set(message.tool_call_id, message);
+      if (pending.matchedResults.size === pending.expectedToolCalls.length) {
+        flushPending();
+      }
+      continue;
+    }
+    pending.deferredMessages.push(message);
+  }
+  flushPending();
+  return normalized;
+}
 function stripBase64FromMessages(messages, imagePathMap) {
   return messages.map((msg) => {
     if (msg.role === "user" && Array.isArray(msg.content)) {
@@ -910,27 +1265,34 @@ function transformToolChoice(toolChoice) {
   return void 0;
 }
 function buildRequestBody(context, modelDef) {
-  const transformedMessages = transformMessages(context.messages);
+  const normalizedMessages = normalizeToolCallMessageSequence(context.messages);
+  const transformedMessages = transformMessages(normalizedMessages);
   const supportsImageInput = modelSupportsImageInput(modelDef);
+  const supportsToolCalls = modelSupportsToolCalls(modelDef);
   let requestMessages = transformedMessages;
   let visionFiltering;
   if (!supportsImageInput) {
     const filtered = filterImagesFromProviderMessages(transformedMessages);
     requestMessages = filtered.messages;
-    visionFiltering = {
-      enabled: true,
-      reason: "model_no_vision",
-      removedUserImageParts: filtered.removedUserImageParts,
-      removedToolImageAttachments: filtered.removedToolImageAttachments
-    };
+    if (filtered.removedUserImageParts > 0 || filtered.removedToolImageAttachments > 0) {
+      visionFiltering = {
+        enabled: true,
+        reason: "model_no_vision",
+        removedUserImageParts: filtered.removedUserImageParts,
+        removedToolImageAttachments: filtered.removedToolImageAttachments
+      };
+    }
   }
+  requestMessages = filterEmptyAssistantProviderMessages(requestMessages);
+  const tools = supportsToolCalls ? transformTools(context.tools) : void 0;
+  const toolChoice = supportsToolCalls ? transformToolChoice(context.tool_choice) : void 0;
   return {
     requestBody: {
       model: modelDef.model,
       messages: requestMessages,
-      tools: transformTools(context.tools),
-      toolChoice: transformToolChoice(context.tool_choice),
-      parallelToolCalls: context.parallel_tool_calls,
+      tools,
+      toolChoice,
+      parallelToolCalls: supportsToolCalls ? context.parallel_tool_calls : void 0,
       reasoning: context.reasoning ? {
         level: reasoningEffortToLevel(context.reasoning.effort),
         maxTokens: context.reasoning.max_tokens,
@@ -972,6 +1334,7 @@ function convertUsage(usage) {
 var NON_VISION_PLACEHOLDER_TEXT, LLMRequest;
 var init_LLMRequest = __esm({
   "src/agents/LLMRequest.ts"() {
+    init_pricing();
     init_types();
     NON_VISION_PLACEHOLDER_TEXT = "[Image omitted: model does not support vision]";
     LLMRequest = class {
@@ -1081,7 +1444,7 @@ var init_LLMRequest = __esm({
               timestamp: Date.now()
             });
             const response = await this.callModel(actualModelId, context, state, logId);
-            await this.logSuccess(response, state, actualModelId, startTime, context, logId);
+            await this.logSuccess(response, state, actualModelId, startTime, context, logId, modelDef);
             state.emitTelemetry?.({
               type: "llm_response",
               tokens: response.usage.total_tokens,
@@ -1406,10 +1769,14 @@ var init_LLMRequest = __esm({
       /**
        * Update log with successful response data (best-effort, non-blocking)
        */
-      static async logSuccess(response, state, modelId, startTime, context, logId) {
+      static async logSuccess(response, state, modelId, startTime, context, logId, modelDef) {
         try {
           const toolsCalled = response.tool_calls ? JSON.stringify(response.tool_calls.map((tc) => tc.function.name)) : null;
-          const cost_total = response.usage.cost ? parseFloat(response.usage.cost) : null;
+          const providerName = response._provider?.name;
+          const resolvedPricing = resolveModelPricing(modelDef, providerName);
+          const calculatedCost = calculateUsageCost(response.usage, resolvedPricing);
+          const providerReportedCost = typeof response.usage.cost === "number" ? response.usage.cost : typeof response.usage.cost === "string" ? parseFloat(response.usage.cost) : null;
+          const cost_total = providerReportedCost != null && !Number.isNaN(providerReportedCost) ? providerReportedCost : calculatedCost?.costTotal ?? null;
           const actualProvider = response.usage.provider;
           const aggregateResponse = response._aggregate_response;
           const responseBody = aggregateResponse ? JSON.stringify(aggregateResponse) : JSON.stringify(response);
@@ -1450,6 +1817,8 @@ var init_LLMRequest = __esm({
             output_tokens: response.usage.completion_tokens,
             reasoning_tokens: response.usage.completion_tokens_details?.reasoning_tokens || 0,
             total_tokens: response.usage.total_tokens,
+            cost_input: calculatedCost?.costInput,
+            cost_output: calculatedCost?.costOutput,
             latency_ms: Date.now() - startTime,
             finish_reason: response.finish_reason,
             tools_called: toolsCalled ?? void 0,
@@ -1474,15 +1843,17 @@ var init_LLMRequest = __esm({
               output_tokens = ?4,
               reasoning_tokens = ?5,
               total_tokens = ?6,
-              latency_ms = ?7,
-              finish_reason = ?8,
-              tools_called = ?9,
-              cost_total = ?10,
-              is_complete = ?11,
-              reasoning_content = ?12,
-              provider_tools = ?13,
-              actual_provider = ?14
-            WHERE id = ?15
+              cost_input = ?7,
+              cost_output = ?8,
+              latency_ms = ?9,
+              finish_reason = ?10,
+              tools_called = ?11,
+              cost_total = ?12,
+              is_complete = ?13,
+              reasoning_content = ?14,
+              provider_tools = ?15,
+              actual_provider = ?16
+            WHERE id = ?17
           `,
                 logData.response_body,
                 logData.input_tokens,
@@ -1490,6 +1861,8 @@ var init_LLMRequest = __esm({
                 logData.output_tokens,
                 logData.reasoning_tokens,
                 logData.total_tokens,
+                logData.cost_input ?? null,
+                logData.cost_output ?? null,
                 logData.latency_ms,
                 logData.finish_reason,
                 logData.tools_called,
@@ -1836,7 +2209,7 @@ function parseBindingObject(binding) {
     attachmentsProperty: typeof binding.attachmentsProperty === "string" ? binding.attachmentsProperty : null
   };
 }
-function resolveSessionToolBinding(binding, legacyTool) {
+function resolveSessionToolBinding(binding) {
   if (typeof binding === "string") {
     return {
       toolName: binding,
@@ -1851,7 +2224,7 @@ function resolveSessionToolBinding(binding, legacyTool) {
     }
   }
   return {
-    toolName: typeof legacyTool === "string" ? legacyTool : null,
+    toolName: null,
     messageProperty: null,
     attachmentsProperty: null
   };
@@ -1859,60 +2232,51 @@ function resolveSessionToolBinding(binding, legacyTool) {
 function getResolvedSessionBindingsFromSide(side) {
   const config = side ?? {};
   return {
-    stop: resolveSessionToolBinding(
-      config.sessionStop,
-      config.endSessionTool
-    ),
-    fail: resolveSessionToolBinding(
-      config.sessionFail,
-      config.failSessionTool
-    ),
-    status: resolveSessionToolBinding(
-      config.sessionStatus,
-      config.statusTool
-    )
+    stop: resolveSessionToolBinding(config.sessionStop),
+    fail: resolveSessionToolBinding(config.sessionFail),
+    status: resolveSessionToolBinding(config.sessionStatus)
   };
 }
 function getAgentSessionBinding(agent, side, kind) {
   if (side === "a") {
     if (kind === "stop") {
       return {
-        toolName: agent.side_a_end_session_tool,
-        messageProperty: agent.side_a_end_session_message_property,
-        attachmentsProperty: agent.side_a_end_session_attachments_property
+        toolName: agent.side_a_session_stop_tool,
+        messageProperty: agent.side_a_session_stop_message_property,
+        attachmentsProperty: agent.side_a_session_stop_attachments_property
       };
     }
     if (kind === "fail") {
       return {
-        toolName: agent.side_a_fail_session_tool,
-        messageProperty: agent.side_a_fail_session_message_property,
-        attachmentsProperty: agent.side_a_fail_session_attachments_property
+        toolName: agent.side_a_session_fail_tool,
+        messageProperty: agent.side_a_session_fail_message_property,
+        attachmentsProperty: agent.side_a_session_fail_attachments_property
       };
     }
     return {
-      toolName: agent.side_a_status_tool,
-      messageProperty: agent.side_a_status_message_property,
-      attachmentsProperty: agent.side_a_status_attachments_property
+      toolName: agent.side_a_session_status_tool,
+      messageProperty: agent.side_a_session_status_message_property,
+      attachmentsProperty: agent.side_a_session_status_attachments_property
     };
   }
   if (kind === "stop") {
     return {
-      toolName: agent.side_b_end_session_tool,
-      messageProperty: agent.side_b_end_session_message_property,
-      attachmentsProperty: agent.side_b_end_session_attachments_property
+      toolName: agent.side_b_session_stop_tool,
+      messageProperty: agent.side_b_session_stop_message_property,
+      attachmentsProperty: agent.side_b_session_stop_attachments_property
     };
   }
   if (kind === "fail") {
     return {
-      toolName: agent.side_b_fail_session_tool,
-      messageProperty: agent.side_b_fail_session_message_property,
-      attachmentsProperty: agent.side_b_fail_session_attachments_property
+      toolName: agent.side_b_session_fail_tool,
+      messageProperty: agent.side_b_session_fail_message_property,
+      attachmentsProperty: agent.side_b_session_fail_attachments_property
     };
   }
   return {
-    toolName: agent.side_b_status_tool,
-    messageProperty: agent.side_b_status_message_property,
-    attachmentsProperty: agent.side_b_status_attachments_property
+    toolName: agent.side_b_session_status_tool,
+    messageProperty: agent.side_b_session_status_message_property,
+    attachmentsProperty: agent.side_b_session_status_attachments_property
   };
 }
 var init_sessionTools = __esm({
@@ -2939,15 +3303,15 @@ var init_ToolExecutor = __esm({
             side_a_stop_tool: null,
             side_a_stop_tool_response_property: null,
             side_a_max_steps: null,
-            side_a_end_session_tool: null,
-            side_a_end_session_message_property: null,
-            side_a_end_session_attachments_property: null,
-            side_a_fail_session_tool: null,
-            side_a_fail_session_message_property: null,
-            side_a_fail_session_attachments_property: null,
-            side_a_status_tool: null,
-            side_a_status_message_property: null,
-            side_a_status_attachments_property: null,
+            side_a_session_stop_tool: null,
+            side_a_session_stop_message_property: null,
+            side_a_session_stop_attachments_property: null,
+            side_a_session_fail_tool: null,
+            side_a_session_fail_message_property: null,
+            side_a_session_fail_attachments_property: null,
+            side_a_session_status_tool: null,
+            side_a_session_status_message_property: null,
+            side_a_session_status_attachments_property: null,
             // Side B configuration (unused for prompt tools)
             side_b_label: null,
             side_b_agent_prompt: null,
@@ -2955,15 +3319,15 @@ var init_ToolExecutor = __esm({
             side_b_stop_tool: null,
             side_b_stop_tool_response_property: null,
             side_b_max_steps: null,
-            side_b_end_session_tool: null,
-            side_b_end_session_message_property: null,
-            side_b_end_session_attachments_property: null,
-            side_b_fail_session_tool: null,
-            side_b_fail_session_message_property: null,
-            side_b_fail_session_attachments_property: null,
-            side_b_status_tool: null,
-            side_b_status_message_property: null,
-            side_b_status_attachments_property: null
+            side_b_session_stop_tool: null,
+            side_b_session_stop_message_property: null,
+            side_b_session_stop_attachments_property: null,
+            side_b_session_fail_tool: null,
+            side_b_session_fail_message_property: null,
+            side_b_session_fail_attachments_property: null,
+            side_b_session_status_tool: null,
+            side_b_session_status_message_property: null,
+            side_b_session_status_attachments_property: null
           };
           let userMessageContent;
           let userMessageAttachments;
@@ -4176,8 +4540,8 @@ ${result ?? error ?? "No result content."}${attachmentSummary}`;
           state.currentSide,
           "status"
         );
-        const statusTool = statusBinding.toolName;
-        if (!statusTool || statusTool !== toolName) {
+        const sessionStatusToolName = statusBinding.toolName;
+        if (!sessionStatusToolName || sessionStatusToolName !== toolName) {
           return;
         }
         const mappedValue = statusBinding.messageProperty && args ? args[statusBinding.messageProperty] : void 0;
@@ -4361,9 +4725,9 @@ ${result ?? error ?? "No result content."}${attachmentSummary}`;
             const baseError = processedResult.error?.trim() || "Tool execution failed";
             content = `Failed to execute tool: ${baseError}`;
           }
-          const endSessionTool = stopBinding.toolName;
-          const failSessionTool = failBinding.toolName;
-          const shouldAppendAttachmentPaths = (!endSessionTool || call.function.name !== endSessionTool) && (!failSessionTool || call.function.name !== failSessionTool);
+          const sessionStopToolName = stopBinding.toolName;
+          const sessionFailToolName = failBinding.toolName;
+          const shouldAppendAttachmentPaths = (!sessionStopToolName || call.function.name !== sessionStopToolName) && (!sessionFailToolName || call.function.name !== sessionFailToolName);
           if (shouldAppendAttachmentPaths && attachmentRefs && attachmentRefs.length > 0) {
             const attachmentPaths = attachmentRefs.map((ref) => `Attachment path for "${ref.name}": ${ref.path}`).join("\n");
             content += `
@@ -5559,10 +5923,16 @@ function svgToDataUri(svg) {
   const encoded = encodeURIComponent(svg).replace(/'/g, "%27").replace(/"/g, "%22");
   return `data:image/svg+xml,${encoded}`;
 }
+function normalizeIcon(icon) {
+  if (icon.startsWith("data:") || icon.endsWith(".svg") || icon.includes(".svg?")) {
+    return icon;
+  }
+  return svgToDataUri(icon);
+}
 function getOpenAIIconDataUri() {
-  return svgToDataUri(OPENAI_ICON);
+  return normalizeIcon(OPENAI_ICON);
 }
-var DEFAULT_REASONING_LEVELS, OPENAI_NATIVE_TOOLS, OPENAI_ICON, OpenAIProvider, openaiProviderOptions, openai;
+var DEFAULT_REASONING_LEVELS, OPENAI_NATIVE_TOOLS, openai_default, OPENAI_ICON, OpenAIProvider, openaiProviderOptions, openai;
 var init_dist = __esm({
   "../openai/dist/index.js"() {
     DEFAULT_REASONING_LEVELS = {
@@ -5577,10 +5947,8 @@ var init_dist = __esm({
       "code_interpreter",
       "file_search"
     ]);
-    OPENAI_ICON = `<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48" fill="none">
-<rect width="48" height="48" rx="24" fill="white"/>
-<path d="M19.3418 18.5599V14.7599C19.3418 14.4399 19.4608 14.1998 19.7382 14.04L27.3102 9.63997C28.3409 9.03999 29.5699 8.76014 30.8383 8.76014C35.5954 8.76014 38.6085 12.4802 38.6085 16.4401C38.6085 16.72 38.6085 17.04 38.5687 17.3601L30.7194 12.72C30.2437 12.4401 29.7678 12.4401 29.2922 12.72L19.3418 18.5599ZM37.0226 33.36V24.2799C37.0226 23.7197 36.7846 23.3197 36.309 23.0398L26.3586 17.1998L29.6093 15.3197C29.8868 15.1599 30.1247 15.1599 30.4022 15.3197L37.9741 19.7197C40.1547 20.9999 41.6213 23.7197 41.6213 26.3596C41.6213 29.3995 39.8375 32.1999 37.0226 33.36ZM17.0029 25.3601L13.7522 23.4402C13.4748 23.2804 13.3557 23.0402 13.3557 22.7202V13.9203C13.3557 9.64039 16.6065 6.40016 21.0069 6.40016C22.6722 6.40016 24.2179 6.96029 25.5265 7.96025L17.7168 12.5204C17.2412 12.8003 17.0033 13.2002 17.0033 13.7605L17.0029 25.3601ZM24 29.44L19.3418 26.8001V21.2003L24 18.5604L28.6578 21.2003V26.8001L24 29.44ZM26.993 41.6002C25.3278 41.6002 23.7821 41.04 22.4735 40.0402L30.2831 35.4799C30.7588 35.2001 30.9967 34.8001 30.9967 34.2399V22.6399L34.2873 24.5598C34.5646 24.7196 34.6837 24.9597 34.6837 25.2798V34.0797C34.6837 38.3596 31.3931 41.6002 26.993 41.6002ZM17.5975 32.6802L10.0255 28.2803C7.84493 27.0001 6.37833 24.2803 6.37833 21.6404C6.37833 18.5604 8.20193 15.8004 11.0164 14.6403V23.7602C11.0164 24.3204 11.2544 24.7204 11.73 25.0003L21.641 30.8001L18.3902 32.6802C18.1129 32.84 17.8749 32.84 17.5975 32.6802ZM17.1617 39.2402C12.682 39.2402 9.39151 35.8402 9.39151 31.6401C9.39151 31.3201 9.43125 31.0001 9.47066 30.68L17.2803 35.2402C17.7559 35.5201 18.2319 35.5201 18.7074 35.2402L28.6578 29.4404V33.2404C28.6578 33.5605 28.5388 33.8005 28.2614 33.9604L20.6894 38.3604C19.6586 38.9603 18.4301 39.2402 17.1617 39.2402ZM26.993 44C31.7899 44 35.7936 40.5601 36.7057 36C41.1457 34.8399 44 30.6399 44 26.36C44 23.5598 42.8108 20.8401 40.6701 18.88C40.8683 18.0399 40.9872 17.1998 40.9872 16.3602C40.9872 10.6403 36.3885 6.35998 31.0763 6.35998C30.0062 6.35998 28.9754 6.51979 27.9446 6.88001C26.1604 5.11992 23.7025 4 21.0069 4C16.2101 4 12.2064 7.4398 11.2943 12C6.8543 13.1601 4 17.3601 4 21.6399C4 24.4401 5.18916 27.1599 7.32995 29.1199C7.13174 29.96 7.01277 30.8001 7.01277 31.6398C7.01277 37.3597 11.6114 41.6399 16.9236 41.6399C17.9938 41.6399 19.0246 41.4801 20.0554 41.1199C21.8392 42.88 24.2971 44 26.993 44Z" fill="black"/>
-</svg>`;
+    openai_default = 'data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" fill="none" viewBox="0 0 128 128"><g clip-path="url(%23clip0_2138_504)"><g clip-path="url(%23clip1_2138_504)"><path fill="%23000" d="M118.824 52.388a31.9 31.9 0 0 0-2.74-26.192 32.25 32.25 0 0 0-34.736-15.472A31.9 31.9 0 0 0 57.296 0C43.28-.032 30.844 8.992 26.532 22.328A31.9 31.9 0 0 0 5.208 37.796C-1.828 49.924-.224 65.212 9.176 75.612a31.9 31.9 0 0 0 2.74 26.192 32.25 32.25 0 0 0 34.736 15.472 31.88 31.88 0 0 0 24.052 10.72c14.024.036 26.464-8.996 30.776-22.344a31.9 31.9 0 0 0 21.324-15.468 32.26 32.26 0 0 0-3.976-37.804zm-48.112 67.244a23.9 23.9 0 0 1-15.356-5.552c.196-.104.536-.292.756-.428L81.6 98.932a4.14 4.14 0 0 0 2.096-3.628V59.372l10.772 6.22a.38.38 0 0 1 .208.296v29.756c-.016 13.232-10.732 23.96-23.964 23.988M19.176 97.62a23.88 23.88 0 0 1-2.86-16.072c.188.112.52.316.756.452L42.56 96.72a4.15 4.15 0 0 0 4.188 0l31.116-17.968v12.44a.4.4 0 0 1-.152.332L51.948 106.4c-11.476 6.608-26.132 2.68-32.768-8.78zm-6.708-55.636a23.9 23.9 0 0 1 12.484-10.516c0 .22-.012.608-.012.88v29.444a4.15 4.15 0 0 0 2.092 3.624L58.148 83.38 47.376 89.6a.38.38 0 0 1-.364.032L21.244 74.744c-11.452-6.632-15.38-21.284-8.78-32.756zm88.504 20.596L69.856 44.612l10.772-6.216a.38.38 0 0 1 .364-.032L106.76 53.24c11.472 6.628 15.404 21.304 8.776 32.776a23.98 23.98 0 0 1-12.48 10.512V66.204a4.14 4.14 0 0 0-2.08-3.624zm10.72-16.136c-.188-.116-.52-.316-.756-.452l-25.488-14.72a4.15 4.15 0 0 0-4.188 0L50.144 49.24V36.8a.4.4 0 0 1 .152-.332L76.06 21.604c11.476-6.62 26.148-2.68 32.764 8.8a23.98 23.98 0 0 1 2.86 16.04zM44.288 68.616l-10.776-6.22a.38.38 0 0 1-.208-.296V32.344C33.312 19.096 44.06 8.36 57.308 8.368a23.98 23.98 0 0 1 15.336 5.552c-.196.104-.532.292-.756.428L46.4 29.068a4.14 4.14 0 0 0-2.096 3.624l-.016 35.916zM50.14 56 64 47.996l13.86 8V72L64 80l-13.86-8z"/></g></g><defs><clipPath id="clip0_2138_504"><path fill="%23fff" d="M0 0h128v128H0z"/></clipPath><clipPath id="clip1_2138_504"><path fill="%23fff" d="M0 0h128v128H0z"/></clipPath></defs></svg>';
+    OPENAI_ICON = openai_default;
     OpenAIProvider = class _OpenAIProvider {
       name = "openai";
       specificationVersion = "1";
@@ -6588,30 +6956,30 @@ var init_FlowEngine = __esm({
             side_a_stop_tool: newAgentDef.sideA?.stopTool ?? null,
             side_a_stop_tool_response_property: newAgentDef.sideA?.stopToolResponseProperty ?? null,
             side_a_max_steps: newAgentDef.sideA?.maxSteps ?? null,
-            side_a_end_session_tool: sideASession.stop.toolName,
-            side_a_end_session_message_property: sideASession.stop.messageProperty,
-            side_a_end_session_attachments_property: sideASession.stop.attachmentsProperty,
-            side_a_fail_session_tool: sideASession.fail.toolName,
-            side_a_fail_session_message_property: sideASession.fail.messageProperty,
-            side_a_fail_session_attachments_property: sideASession.fail.attachmentsProperty,
-            side_a_status_tool: sideASession.status.toolName,
-            side_a_status_message_property: sideASession.status.messageProperty,
-            side_a_status_attachments_property: sideASession.status.attachmentsProperty,
+            side_a_session_stop_tool: sideASession.stop.toolName,
+            side_a_session_stop_message_property: sideASession.stop.messageProperty,
+            side_a_session_stop_attachments_property: sideASession.stop.attachmentsProperty,
+            side_a_session_fail_tool: sideASession.fail.toolName,
+            side_a_session_fail_message_property: sideASession.fail.messageProperty,
+            side_a_session_fail_attachments_property: sideASession.fail.attachmentsProperty,
+            side_a_session_status_tool: sideASession.status.toolName,
+            side_a_session_status_message_property: sideASession.status.messageProperty,
+            side_a_session_status_attachments_property: sideASession.status.attachmentsProperty,
             side_b_label: newAgentDef.sideB?.label ?? null,
             side_b_agent_prompt: newAgentDef.sideB?.prompt ?? null,
             side_b_stop_on_response: newAgentDef.sideB?.stopOnResponse ?? false,
             side_b_stop_tool: newAgentDef.sideB?.stopTool ?? null,
             side_b_stop_tool_response_property: newAgentDef.sideB?.stopToolResponseProperty ?? null,
             side_b_max_steps: newAgentDef.sideB?.maxSteps ?? null,
-            side_b_end_session_tool: sideBSession.stop.toolName,
-            side_b_end_session_message_property: sideBSession.stop.messageProperty,
-            side_b_end_session_attachments_property: sideBSession.stop.attachmentsProperty,
-            side_b_fail_session_tool: sideBSession.fail.toolName,
-            side_b_fail_session_message_property: sideBSession.fail.messageProperty,
-            side_b_fail_session_attachments_property: sideBSession.fail.attachmentsProperty,
-            side_b_status_tool: sideBSession.status.toolName,
-            side_b_status_message_property: sideBSession.status.messageProperty,
-            side_b_status_attachments_property: sideBSession.status.attachmentsProperty
+            side_b_session_stop_tool: sideBSession.stop.toolName,
+            side_b_session_stop_message_property: sideBSession.stop.messageProperty,
+            side_b_session_stop_attachments_property: sideBSession.stop.attachmentsProperty,
+            side_b_session_fail_tool: sideBSession.fail.toolName,
+            side_b_session_fail_message_property: sideBSession.fail.messageProperty,
+            side_b_session_fail_attachments_property: sideBSession.fail.attachmentsProperty,
+            side_b_session_status_tool: sideBSession.status.toolName,
+            side_b_session_status_message_property: sideBSession.status.messageProperty,
+            side_b_session_status_attachments_property: sideBSession.status.attachmentsProperty
           };
           const { sideAPrompt, sideBPrompt } = await this.loadAgentAndPrompts(
             agentConfig,
@@ -7402,7 +7770,7 @@ var init_FlowEngine = __esm({
               role: row.role,
               content: row.content,
               created_at: row.created_at,
-              silent: row.silent === 1,
+              silent: this.isSilentMessageRow(row.silent),
               attachments: row.attachments,
               metadata: parsedMetadata,
               subagent_id: this.extractSubagentIdFromMetadata(row.metadata)
@@ -7555,12 +7923,6 @@ var init_FlowEngine = __esm({
         const completedMessages = state.messageHistory.filter(
           (msg) => msg.status !== "pending"
         );
-        const toolCallsWithResponses = /* @__PURE__ */ new Set();
-        for (const msg of completedMessages) {
-          if (msg.role === "tool" && msg.tool_call_id) {
-            toolCallsWithResponses.add(msg.tool_call_id);
-          }
-        }
         const recentMessageThreshold = state.prompt.recentImageThreshold ?? 10;
         const oldMessageThreshold = completedMessages.length - recentMessageThreshold;
         let messageIndex = 0;
@@ -7623,11 +7985,12 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
             messageContent = msg.content || "";
           }
           messageIndex++;
+          const shouldIncludeAssistantToolCalls = includePastTools && role === "assistant" && Boolean(msg.tool_calls);
           const messageToAdd = {
             role,
             content: messageContent,
-            tool_calls: includePastTools && msg.tool_calls ? JSON.parse(msg.tool_calls) : void 0,
-            tool_call_id: includePastTools && msg.tool_call_id ? msg.tool_call_id : void 0,
+            tool_calls: shouldIncludeAssistantToolCalls ? JSON.parse(msg.tool_calls) : void 0,
+            tool_call_id: includePastTools && msg.role === "tool" && msg.tool_call_id ? msg.tool_call_id : void 0,
             name: msg.name || void 0,
             // For tool messages, also set toolName for provider transformers (e.g., OpenAI image_generation)
             toolName: msg.role === "tool" ? msg.name : void 0
@@ -7677,24 +8040,7 @@ ${msg.content}` : `${imageDescriptions}${nonImageList}`;
               messageToAdd.reasoning_details = reasoningDetailsArray;
             }
           }
-          if (includePastTools && msg.role === "assistant" && msg.tool_calls) {
-            const toolCalls = JSON.parse(msg.tool_calls);
-            const matchedToolCalls = toolCalls.filter(
-              (toolCall) => toolCallsWithResponses.has(toolCall.id)
-            );
-            if (msg.content || matchedToolCalls.length > 0) {
-              if (matchedToolCalls.length === 0) {
-                delete messageToAdd.tool_calls;
-              } else if (matchedToolCalls.length !== toolCalls.length) {
-                messageToAdd.tool_calls = matchedToolCalls;
-              }
-              messages.push(messageToAdd);
-            } else {
-              console.warn(`[FlowEngine] Skipping assistant message ${msg.id} - no content and no tool calls with responses`);
-            }
-          } else {
-            messages.push(messageToAdd);
-          }
+          messages.push(messageToAdd);
         }
         const maxSteps = state.currentSide === "a" ? state.agentConfig.side_a_max_steps : state.agentConfig.side_b_max_steps;
         if (typeof maxSteps === "number" && !isNaN(maxSteps)) {
@@ -9360,14 +9706,14 @@ ${lines.join("\n\n")}`
        * Check if stop condition is met
        */
       static checkStopCondition(state, response) {
-        const failSessionTool = getAgentSessionBinding(
+        const sessionFailToolName = getAgentSessionBinding(
           state.agentConfig,
           state.currentSide,
           "fail"
         ).toolName;
-        if (failSessionTool) {
+        if (sessionFailToolName) {
           const matchingFailSessionCalls = response.tool_calls?.filter(
-            (call) => call.function.name === failSessionTool
+            (call) => call.function.name === sessionFailToolName
           ) ?? [];
           if (matchingFailSessionCalls.length > 0) {
             const hasSuccessfulFailSessionCall = matchingFailSessionCalls.some(
@@ -9376,11 +9722,11 @@ ${lines.join("\n\n")}`
             if (hasSuccessfulFailSessionCall) {
               state.stopped = true;
               state.stoppedBy = state.currentSide;
-              state.stopReason = `Fail session tool called: ${failSessionTool}`;
+              state.stopReason = `sessionFail tool called: ${sessionFailToolName}`;
               state.stopReasonCode = "session_fail";
               state.emitTelemetry?.({
                 type: "stopped",
-                reason: `Fail session tool called: ${failSessionTool}`,
+                reason: `sessionFail tool called: ${sessionFailToolName}`,
                 side: state.currentSide,
                 timestamp: Date.now()
               });
@@ -9395,14 +9741,14 @@ ${lines.join("\n\n")}`
             };
           }
         }
-        const endSessionTool = getAgentSessionBinding(
+        const sessionStopToolName = getAgentSessionBinding(
           state.agentConfig,
           state.currentSide,
           "stop"
         ).toolName;
-        if (endSessionTool) {
+        if (sessionStopToolName) {
           const matchingEndSessionCalls = response.tool_calls?.filter(
-            (call) => call.function.name === endSessionTool
+            (call) => call.function.name === sessionStopToolName
           ) ?? [];
           if (matchingEndSessionCalls.length > 0) {
             const hasSuccessfulEndSessionCall = matchingEndSessionCalls.some(
@@ -9411,11 +9757,11 @@ ${lines.join("\n\n")}`
             if (hasSuccessfulEndSessionCall) {
               state.stopped = true;
               state.stoppedBy = state.currentSide;
-              state.stopReason = `End session tool called: ${endSessionTool}`;
+              state.stopReason = `sessionStop tool called: ${sessionStopToolName}`;
               state.stopReasonCode = "session_stop";
               state.emitTelemetry?.({
                 type: "stopped",
-                reason: `End session tool called: ${endSessionTool}`,
+                reason: `sessionStop tool called: ${sessionStopToolName}`,
                 side: state.currentSide,
                 timestamp: Date.now()
               });
@@ -9507,16 +9853,13 @@ ${lines.join("\n\n")}`
         )?.[1];
         return msg.role === "tool" && referencedSubagentId !== void 0 && (typeof msg.subagent_id === "string" && msg.subagent_id.trim().length > 0 || typeof msg.name === "string");
       }
+      static isSilentMessageRow(value) {
+        return value === 1 || value === true;
+      }
       static filterOrphanedToolCalls(messages) {
-        const toolResultIds = /* @__PURE__ */ new Set();
-        for (const msg of messages) {
-          if (msg.role === "tool" && msg.tool_call_id) {
-            toolResultIds.add(msg.tool_call_id);
-          }
-        }
         const assistantToolCallIds = /* @__PURE__ */ new Set();
         for (const msg of messages) {
-          if (msg.role === "assistant" && msg.tool_calls) {
+          if ((msg.role === "assistant" || msg.role === "user") && msg.tool_calls) {
             try {
               const toolCalls = JSON.parse(msg.tool_calls);
               for (const call of toolCalls) {
@@ -9542,40 +9885,6 @@ ${lines.join("\n\n")}`
               continue;
             }
           }
-          if (msg.role === "assistant" && msg.tool_calls) {
-            try {
-              const toolCalls = JSON.parse(msg.tool_calls);
-              const matchedToolCalls = toolCalls.filter(
-                (call) => toolResultIds.has(call.id)
-              );
-              if (matchedToolCalls.length === 0 && toolCalls.length > 0) {
-                if (msg.content) {
-                  console.warn(`[FlowEngine] Filtering tool_calls from message ${msg.id} - no matching tool results`);
-                  warnedRemovedCount += 1;
-                  filtered.push({
-                    ...msg,
-                    tool_calls: null
-                  });
-                  continue;
-                } else {
-                  console.warn(`[FlowEngine] Filtering assistant message ${msg.id} - no content and no tool calls with results`);
-                  warnedRemovedCount += 1;
-                  continue;
-                }
-              }
-              if (matchedToolCalls.length !== toolCalls.length) {
-                console.warn(`[FlowEngine] Filtering ${toolCalls.length - matchedToolCalls.length} orphaned tool_calls from message ${msg.id}`);
-                warnedRemovedCount += 1;
-                filtered.push({
-                  ...msg,
-                  tool_calls: JSON.stringify(matchedToolCalls)
-                });
-                continue;
-              }
-            } catch (error) {
-              console.error(`Failed to parse tool_calls for message ${msg.id}:`, error);
-            }
-          }
           filtered.push(msg);
         }
         const removedCount = messages.length - filtered.length;
@@ -9646,14 +9955,18 @@ ${lines.join("\n\n")}`
             request_sent_at: row.request_sent_at,
             response_completed_at: row.response_completed_at,
             status: row.status,
-            silent: row.silent === 1,
+            silent: this.isSilentMessageRow(row.silent),
             tool_status: row.tool_status,
             parent_id: row.parent_id,
             depth: row.depth,
             reasoning_content: row.reasoning_content,
             reasoning_details: row.reasoning_details
           }));
-          return this.runFilterMessagesHook(thread.instance, state, this.filterOrphanedToolCalls(messages));
+          return this.runFilterMessagesHook(
+            thread.instance,
+            state,
+            this.filterOrphanedToolCalls(messages)
+          );
         } catch (error) {
           console.error("Error loading message history:", error);
           return [];
@@ -10871,22 +11184,42 @@ __export(image_processing_exports, {
   needsProcessing: () => needsProcessing,
   processImage: () => processImage
 });
+function clampQuality(quality) {
+  return Math.max(1, Math.min(100, Math.round(quality)));
+}
+async function collectTransformedImage(input, width, height, quality) {
+  const image = transform(input, { width, height, quality: clampQuality(quality) });
+  const { data, info } = await collect(image);
+  return {
+    data,
+    mimeType: "image/jpeg",
+    width: info.width,
+    height: info.height
+  };
+}
+async function transformToTargetSize(input, maxWidth, maxHeight, maxBytes, quality) {
+  let currentQuality = clampQuality(quality);
+  let result = await collectTransformedImage(input, maxWidth, maxHeight, currentQuality);
+  while (result.data.byteLength > maxBytes && currentQuality > MIN_QUALITY) {
+    currentQuality -= 10;
+    result = await collectTransformedImage(input, maxWidth, maxHeight, currentQuality);
+  }
+  while (result.data.byteLength > maxBytes) {
+    const scaleFactor = Math.sqrt(maxBytes / result.data.byteLength) * 0.9;
+    const nextWidth = Math.max(1, Math.min(result.width - 1, Math.round(result.width * scaleFactor)));
+    const nextHeight = Math.max(1, Math.min(result.height - 1, Math.round(result.height * scaleFactor)));
+    if (nextWidth >= result.width && nextHeight >= result.height) {
+      break;
+    }
+    result = await collectTransformedImage(input, nextWidth, nextHeight, currentQuality);
+  }
+  return result;
+}
 async function processImage(input, inputMimeType) {
   if (input.byteLength > MAX_INPUT_SIZE) {
     throw new Error(`Image too large: ${input.byteLength} bytes exceeds ${MAX_INPUT_SIZE} byte limit`);
   }
-  const result = await sip.process(input, {
-    maxWidth: MAX_DIMENSION,
-    maxHeight: MAX_DIMENSION,
-    maxBytes: MAX_SIZE,
-    quality: 85
-  });
-  return {
-    data: result.data,
-    mimeType: "image/jpeg",
-    width: result.width,
-    height: result.height
-  };
+  return await transformToTargetSize(input, MAX_DIMENSION, MAX_DIMENSION, MAX_SIZE, 85);
 }
 function needsProcessing(data, mimeType) {
   const binaryLength = Math.ceil(data.length * 3 / 4);
@@ -10908,12 +11241,13 @@ function arrayBufferToBase64(buffer) {
   }
   return btoa(binary);
 }
-var MAX_SIZE, MAX_DIMENSION, MAX_INPUT_SIZE;
+var MAX_SIZE, MAX_DIMENSION, MAX_INPUT_SIZE, MIN_QUALITY;
 var init_image_processing = __esm({
   "src/image-processing/index.ts"() {
     MAX_SIZE = 1.5 * 1024 * 1024;
     MAX_DIMENSION = 4096;
     MAX_INPUT_SIZE = 20 * 1024 * 1024;
+    MIN_QUALITY = 45;
   }
 });
 var TSCONFIG_CONTENT = `{
@@ -11093,7 +11427,6 @@ function generateTypesContent(config) {
   const agents = agentResults.map((a) => a.name);
   const callables = [...prompts, ...agents, ...tools];
   return `// Auto-generated by @standardagents/builder - DO NOT EDIT
-// Generated at: ${(/* @__PURE__ */ new Date()).toISOString()}
 //
 // This file augments the StandardAgentSpec namespace declared in @standardagents/spec
 // to provide type-safe references for your models, prompts, agents, tools, and hooks.
@@ -11382,7 +11715,7 @@ declare module 'virtual:@standardagents/builder' {
       offset?: number,
       order?: 'ASC' | 'DESC'
     ): Promise<GetLogsResult>;
-    getLogDetails(logId: string): Promise<ThreadLogDetails>;
+    getLogDetails(logId: string): Promise<ThreadLogDetails | null>;
 
     // Thread management methods
     getThreadMeta(threadId: string): Promise<ThreadMetaResult>;
@@ -11638,14 +11971,23 @@ function ensureDir(dir) {
     fs4__default.mkdirSync(dir, { recursive: true });
   }
 }
+function writeFileIfChanged(filePath, content) {
+  if (fs4__default.existsSync(filePath)) {
+    const existing = fs4__default.readFileSync(filePath, "utf-8");
+    if (existing === content) {
+      return;
+    }
+  }
+  fs4__default.writeFileSync(filePath, content);
+}
 function generateTypes(config) {
   ensureDir(config.outputDir);
   const typesContent = generateTypesContent(config);
-  fs4__default.writeFileSync(path8__default.join(config.outputDir, "types.d.ts"), typesContent);
+  writeFileIfChanged(path8__default.join(config.outputDir, "types.d.ts"), typesContent);
   const virtualModuleContent = generateVirtualModuleContent();
-  fs4__default.writeFileSync(path8__default.join(config.outputDir, "virtual-module.d.ts"), virtualModuleContent);
-  fs4__default.writeFileSync(path8__default.join(config.outputDir, "tsconfig.json"), TSCONFIG_CONTENT);
-  fs4__default.writeFileSync(path8__default.join(config.outputDir, ".gitignore"), "*\n");
+  writeFileIfChanged(path8__default.join(config.outputDir, "virtual-module.d.ts"), virtualModuleContent);
+  writeFileIfChanged(path8__default.join(config.outputDir, "tsconfig.json"), TSCONFIG_CONTENT);
+  writeFileIfChanged(path8__default.join(config.outputDir, ".gitignore"), "*\n");
 }
 function needsRegeneration(config) {
   const typesPath = path8__default.join(config.outputDir, "types.d.ts");
@@ -12254,18 +12596,12 @@ function formatSideConfig(config) {
   }
   if (config.sessionStop) {
     parts.push(`    sessionStop: ${formatSessionBinding(config.sessionStop)},`);
-  } else if (config.endSessionTool) {
-    parts.push(`    endSessionTool: '${escapeString3(config.endSessionTool)}',`);
   }
   if (config.sessionFail) {
     parts.push(`    sessionFail: ${formatSessionBinding(config.sessionFail)},`);
-  } else if (config.failSessionTool) {
-    parts.push(`    failSessionTool: '${escapeString3(config.failSessionTool)}',`);
   }
   if (config.sessionStatus) {
     parts.push(`    sessionStatus: ${formatSessionBinding(config.sessionStatus)},`);
-  } else if (config.statusTool) {
-    parts.push(`    statusTool: '${escapeString3(config.statusTool)}',`);
   }
   if (config.manualStopCondition) {
     parts.push(`    manualStopCondition: ${config.manualStopCondition},`);
@@ -12292,23 +12628,47 @@ function formatSessionBinding(binding) {
 
 // src/providers/catalog.ts
 var FIRST_PARTY_PROVIDERS = [
+  {
+    name: "cloudflare",
+    package: "@standardagents/cloudflare",
+    label: "Cloudflare Workers AI",
+    envKeys: ["CLOUDFLARE_API_TOKEN", "CLOUDFLARE_ACCOUNT_ID"]
+  },
   {
     name: "cerebras",
     package: "@standardagents/cerebras",
     label: "Cerebras",
-    envKey: "CEREBRAS_API_KEY"
+    envKeys: ["CEREBRAS_API_KEY"]
+  },
+  {
+    name: "google",
+    package: "@standardagents/google",
+    label: "Google Gemini",
+    envKeys: ["GOOGLE_API_KEY"]
+  },
+  {
+    name: "groq",
+    package: "@standardagents/groq",
+    label: "Groq",
+    envKeys: ["GROQ_API_KEY"]
   },
   {
     name: "openai",
     package: "@standardagents/openai",
     label: "OpenAI",
-    envKey: "OPENAI_API_KEY"
+    envKeys: ["OPENAI_API_KEY"]
   },
   {
     name: "openrouter",
     package: "@standardagents/openrouter",
     label: "OpenRouter",
-    envKey: "OPENROUTER_API_KEY"
+    envKeys: ["OPENROUTER_API_KEY"]
+  },
+  {
+    name: "xai",
+    package: "@standardagents/xai",
+    label: "xAI",
+    envKeys: ["XAI_API_KEY"]
   }
 ];
 function humanizeProviderName(name) {
@@ -12320,7 +12680,7 @@ function packageToCustomProvider(pkg) {
     name,
     package: pkg,
     label: humanizeProviderName(name),
-    envKey: `${name.toUpperCase().replace(/-/g, "_")}_API_KEY`,
+    envKeys: [`${name.toUpperCase().replace(/-/g, "_")}_API_KEY`],
     isCustom: true
   };
 }
@@ -12910,34 +13270,28 @@ function transformAgentData(data) {
     transformed.sideA.maxSteps = data.side_a_max_steps;
   }
   const sideASessionStop = toSessionBinding(
-    data.side_a_session_stop_tool ?? data.side_a_end_session_tool,
+    data.side_a_session_stop_tool,
     data.side_a_session_stop_message_property,
     data.side_a_session_stop_attachments_property
   );
   if (sideASessionStop !== void 0) {
     transformed.sideA.sessionStop = sideASessionStop;
-  } else if (data.side_a_end_session_tool) {
-    transformed.sideA.endSessionTool = data.side_a_end_session_tool;
   }
   const sideASessionFail = toSessionBinding(
-    data.side_a_session_fail_tool ?? data.side_a_fail_session_tool,
+    data.side_a_session_fail_tool,
     data.side_a_session_fail_message_property,
     data.side_a_session_fail_attachments_property
   );
   if (sideASessionFail !== void 0) {
     transformed.sideA.sessionFail = sideASessionFail;
-  } else if (data.side_a_fail_session_tool) {
-    transformed.sideA.failSessionTool = data.side_a_fail_session_tool;
   }
   const sideASessionStatus = toSessionBinding(
-    data.side_a_session_status_tool ?? data.side_a_status_tool,
+    data.side_a_session_status_tool,
     data.side_a_session_status_message_property,
     data.side_a_session_status_attachments_property
   );
   if (sideASessionStatus !== void 0) {
     transformed.sideA.sessionStatus = sideASessionStatus;
-  } else if (data.side_a_status_tool) {
-    transformed.sideA.statusTool = data.side_a_status_tool;
   }
   if (data.side_a_manual_stop_condition !== void 0) {
     transformed.sideA.manualStopCondition = data.side_a_manual_stop_condition;
@@ -12962,34 +13316,28 @@ function transformAgentData(data) {
       transformed.sideB.maxSteps = data.side_b_max_steps;
     }
     const sideBSessionStop = toSessionBinding(
-      data.side_b_session_stop_tool ?? data.side_b_end_session_tool,
+      data.side_b_session_stop_tool,
       data.side_b_session_stop_message_property,
       data.side_b_session_stop_attachments_property
     );
     if (sideBSessionStop !== void 0) {
       transformed.sideB.sessionStop = sideBSessionStop;
-    } else if (data.side_b_end_session_tool) {
-      transformed.sideB.endSessionTool = data.side_b_end_session_tool;
     }
     const sideBSessionFail = toSessionBinding(
-      data.side_b_session_fail_tool ?? data.side_b_fail_session_tool,
+      data.side_b_session_fail_tool,
       data.side_b_session_fail_message_property,
       data.side_b_session_fail_attachments_property
     );
     if (sideBSessionFail !== void 0) {
       transformed.sideB.sessionFail = sideBSessionFail;
-    } else if (data.side_b_fail_session_tool) {
-      transformed.sideB.failSessionTool = data.side_b_fail_session_tool;
     }
     const sideBSessionStatus = toSessionBinding(
-      data.side_b_session_status_tool ?? data.side_b_status_tool,
+      data.side_b_session_status_tool,
       data.side_b_session_status_message_property,
       data.side_b_session_status_attachments_property
     );
     if (sideBSessionStatus !== void 0) {
       transformed.sideB.sessionStatus = sideBSessionStatus;
-    } else if (data.side_b_status_tool) {
-      transformed.sideB.statusTool = data.side_b_status_tool;
     }
     if (data.side_b_manual_stop_condition !== void 0) {
       transformed.sideB.manualStopCondition = data.side_b_manual_stop_condition;
@@ -17500,11 +17848,11 @@ export function getVisibleToolNames() {
 import { DurableThread as _BaseDurableThread } from '@standardagents/builder/runtime';
 import { DurableAgentBuilder as _BaseDurableAgentBuilder } from '@standardagents/builder/runtime';
 
-// Import sip WASM module and initializer
+// Import sip WASM module and readiness helper
 // Static import allows workerd to pre-compile the WASM at bundle time
 // WASM is bundled in builder's dist to avoid transitive dependency resolution issues
 import _sipWasm from '@standardagents/builder/dist/sip.wasm';
-import { initWithWasmModule as _initSipWasm } from '@standardagents/sip';
+import { ready as _initSipWasm } from '@standardagents/sip';
 
 // Re-export router from virtual:@standardagents-routes
 export { router } from 'virtual:@standardagents-routes';
@@ -17548,7 +17896,7 @@ export class DurableThread extends _BaseDurableThread {
     // blockConcurrencyWhile ensures WASM is ready before handling any requests
     // Pass the statically imported WASM module for workerd to pre-compile
     ctx.blockConcurrencyWhile(async () => {
-      await _initSipWasm(_sipWasm);
+      await _initSipWasm({ wasm: _sipWasm });
     });
   }
 
@@ -20717,7 +21065,7 @@ var DurableThread = class extends DurableObject {
       true
     );
     const terminalToolNames = await this.getTerminalSessionToolNames(agentId);
-    const failSessionToolNames = terminalToolNames.fail;
+    const sessionFailToolNames = terminalToolNames.fail;
     const hasTerminalSessionTools = terminalToolNames.all.size > 0;
     const latestInRunCursor = await this.ctx.storage.sql.exec(
       `
@@ -20772,7 +21120,7 @@ var DurableThread = class extends DurableObject {
       return { status: "success", result: "Subagent completed." };
     }
     const attachments = hasTerminalSessionTools && !selectedTerminalRow ? void 0 : this.parseAttachmentRefsJson(row.attachments);
-    const isFailSessionTerminal = row.role === "tool" && !!row.name && failSessionToolNames.has(row.name);
+    const isFailSessionTerminal = row.role === "tool" && !!row.name && sessionFailToolNames.has(row.name);
     const isSuccessfulTerminalSessionCall = selectedTerminalRow && row.role === "tool" && !!row.name && terminalToolNames.all.has(row.name) && row.tool_status !== "error";
     if (isFailSessionTerminal) {
       await emitParentHandoffStatus("failure");
@@ -21160,7 +21508,7 @@ ${paths.join("\n")}`;
       return;
     }
     const terminalToolNames = await this.getTerminalSessionToolNames(agentName);
-    const failSessionToolNames = terminalToolNames.fail;
+    const sessionFailToolNames = terminalToolNames.fail;
     const hasTerminalSessionTools = terminalToolNames.all.size > 0;
     const latest = await this.getLatestTopLevelMessage();
     if (!latest && !hasTerminalSessionTools) {
@@ -21170,7 +21518,7 @@ ${paths.join("\n")}`;
       return;
     }
     const isTerminalSessionMessage = !!latest && latest.role === "tool" && !!latest.name && terminalToolNames.all.has(latest.name);
-    const isFailSessionTerminal = isTerminalSessionMessage && !!latest.name && failSessionToolNames.has(latest.name);
+    const isFailSessionTerminal = isTerminalSessionMessage && !!latest.name && sessionFailToolNames.has(latest.name);
     const isSuccessfulTerminalSessionMessage = isTerminalSessionMessage && latest?.tool_status !== "error";
     const isFailureWithoutTerminalMessage = hasTerminalSessionTools && !isSuccessfulTerminalSessionMessage;
     const isErrorTerminal = latest?.tool_status === "error" || isFailSessionTerminal || isFailureWithoutTerminalMessage;
@@ -21728,9 +22076,9 @@ ${resultContent}${attachmentSummary}`;
       `,
         logId
       );
-      const row = result.one();
+      const row = result.toArray()[0] ?? null;
       if (!row) {
-        throw new Error(`Log not found: ${logId}`);
+        return null;
       }
       let messageHistory = null;
       if (row.request_body) {
@@ -22186,30 +22534,30 @@ ${resultContent}${attachmentSummary}`;
         side_a_stop_tool: agentDef.sideA?.stopTool,
         side_a_stop_tool_response_property: agentDef.sideA?.stopToolResponseProperty,
         side_a_max_steps: agentDef.sideA?.maxSteps,
-        side_a_end_session_tool: sideASession.stop.toolName,
-        side_a_end_session_message_property: sideASession.stop.messageProperty,
-        side_a_end_session_attachments_property: sideASession.stop.attachmentsProperty,
-        side_a_fail_session_tool: sideASession.fail.toolName,
-        side_a_fail_session_message_property: sideASession.fail.messageProperty,
-        side_a_fail_session_attachments_property: sideASession.fail.attachmentsProperty,
-        side_a_status_tool: sideASession.status.toolName,
-        side_a_status_message_property: sideASession.status.messageProperty,
-        side_a_status_attachments_property: sideASession.status.attachmentsProperty,
+        side_a_session_stop_tool: sideASession.stop.toolName,
+        side_a_session_stop_message_property: sideASession.stop.messageProperty,
+        side_a_session_stop_attachments_property: sideASession.stop.attachmentsProperty,
+        side_a_session_fail_tool: sideASession.fail.toolName,
+        side_a_session_fail_message_property: sideASession.fail.messageProperty,
+        side_a_session_fail_attachments_property: sideASession.fail.attachmentsProperty,
+        side_a_session_status_tool: sideASession.status.toolName,
+        side_a_session_status_message_property: sideASession.status.messageProperty,
+        side_a_session_status_attachments_property: sideASession.status.attachmentsProperty,
         side_b_label: agentDef.sideB?.label,
         side_b_agent_prompt: qualifyPromptName(agentDef.sideB?.prompt),
         side_b_stop_on_response: agentDef.sideB?.stopOnResponse ?? false,
         side_b_stop_tool: agentDef.sideB?.stopTool,
         side_b_stop_tool_response_property: agentDef.sideB?.stopToolResponseProperty,
         side_b_max_steps: agentDef.sideB?.maxSteps,
-        side_b_end_session_tool: sideBSession.stop.toolName,
-        side_b_end_session_message_property: sideBSession.stop.messageProperty,
-        side_b_end_session_attachments_property: sideBSession.stop.attachmentsProperty,
-        side_b_fail_session_tool: sideBSession.fail.toolName,
-        side_b_fail_session_message_property: sideBSession.fail.messageProperty,
-        side_b_fail_session_attachments_property: sideBSession.fail.attachmentsProperty,
-        side_b_status_tool: sideBSession.status.toolName,
-        side_b_status_message_property: sideBSession.status.messageProperty,
-        side_b_status_attachments_property: sideBSession.status.attachmentsProperty
+        side_b_session_stop_tool: sideBSession.stop.toolName,
+        side_b_session_stop_message_property: sideBSession.stop.messageProperty,
+        side_b_session_stop_attachments_property: sideBSession.stop.attachmentsProperty,
+        side_b_session_fail_tool: sideBSession.fail.toolName,
+        side_b_session_fail_message_property: sideBSession.fail.messageProperty,
+        side_b_session_fail_attachments_property: sideBSession.fail.attachmentsProperty,
+        side_b_session_status_tool: sideBSession.status.toolName,
+        side_b_session_status_message_property: sideBSession.status.messageProperty,
+        side_b_session_status_attachments_property: sideBSession.status.attachmentsProperty
       };
       const agentBuilderId = this.env.AGENT_BUILDER.idFromName("singleton");
       const agentBuilder = this.env.AGENT_BUILDER.get(agentBuilderId);
@@ -22372,30 +22720,30 @@ ${resultContent}${attachmentSummary}`;
         side_a_stop_tool: agentDef.sideA?.stopTool,
         side_a_stop_tool_response_property: agentDef.sideA?.stopToolResponseProperty,
         side_a_max_steps: agentDef.sideA?.maxSteps,
-        side_a_end_session_tool: sideASession.stop.toolName,
-        side_a_end_session_message_property: sideASession.stop.messageProperty,
-        side_a_end_session_attachments_property: sideASession.stop.attachmentsProperty,
-        side_a_fail_session_tool: sideASession.fail.toolName,
-        side_a_fail_session_message_property: sideASession.fail.messageProperty,
-        side_a_fail_session_attachments_property: sideASession.fail.attachmentsProperty,
-        side_a_status_tool: sideASession.status.toolName,
-        side_a_status_message_property: sideASession.status.messageProperty,
-        side_a_status_attachments_property: sideASession.status.attachmentsProperty,
+        side_a_session_stop_tool: sideASession.stop.toolName,
+        side_a_session_stop_message_property: sideASession.stop.messageProperty,
+        side_a_session_stop_attachments_property: sideASession.stop.attachmentsProperty,
+        side_a_session_fail_tool: sideASession.fail.toolName,
+        side_a_session_fail_message_property: sideASession.fail.messageProperty,
+        side_a_session_fail_attachments_property: sideASession.fail.attachmentsProperty,
+        side_a_session_status_tool: sideASession.status.toolName,
+        side_a_session_status_message_property: sideASession.status.messageProperty,
+        side_a_session_status_attachments_property: sideASession.status.attachmentsProperty,
         side_b_label: agentDef.sideB?.label,
         side_b_agent_prompt: qualifyPromptName(agentDef.sideB?.prompt),
         side_b_stop_on_response: agentDef.sideB?.stopOnResponse ?? false,
         side_b_stop_tool: agentDef.sideB?.stopTool,
         side_b_stop_tool_response_property: agentDef.sideB?.stopToolResponseProperty,
         side_b_max_steps: agentDef.sideB?.maxSteps,
-        side_b_end_session_tool: sideBSession.stop.toolName,
-        side_b_end_session_message_property: sideBSession.stop.messageProperty,
-        side_b_end_session_attachments_property: sideBSession.stop.attachmentsProperty,
-        side_b_fail_session_tool: sideBSession.fail.toolName,
-        side_b_fail_session_message_property: sideBSession.fail.messageProperty,
-        side_b_fail_session_attachments_property: sideBSession.fail.attachmentsProperty,
-        side_b_status_tool: sideBSession.status.toolName,
-        side_b_status_message_property: sideBSession.status.messageProperty,
-        side_b_status_attachments_property: sideBSession.status.attachmentsProperty
+        side_b_session_stop_tool: sideBSession.stop.toolName,
+        side_b_session_stop_message_property: sideBSession.stop.messageProperty,
+        side_b_session_stop_attachments_property: sideBSession.stop.attachmentsProperty,
+        side_b_session_fail_tool: sideBSession.fail.toolName,
+        side_b_session_fail_message_property: sideBSession.fail.messageProperty,
+        side_b_session_fail_attachments_property: sideBSession.fail.attachmentsProperty,
+        side_b_session_status_tool: sideBSession.status.toolName,
+        side_b_session_status_message_property: sideBSession.status.messageProperty,
+        side_b_session_status_attachments_property: sideBSession.status.attachmentsProperty
       };
       const messageId = crypto.randomUUID();
       const timestamp = Date.now() * 1e3;
@@ -22517,30 +22865,30 @@ ${resultContent}${attachmentSummary}`;
         side_a_stop_tool: agentDef.sideA?.stopTool,
         side_a_stop_tool_response_property: agentDef.sideA?.stopToolResponseProperty,
         side_a_max_steps: agentDef.sideA?.maxSteps,
-        side_a_end_session_tool: sideASession.stop.toolName,
-        side_a_end_session_message_property: sideASession.stop.messageProperty,
-        side_a_end_session_attachments_property: sideASession.stop.attachmentsProperty,
-        side_a_fail_session_tool: sideASession.fail.toolName,
-        side_a_fail_session_message_property: sideASession.fail.messageProperty,
-        side_a_fail_session_attachments_property: sideASession.fail.attachmentsProperty,
-        side_a_status_tool: sideASession.status.toolName,
-        side_a_status_message_property: sideASession.status.messageProperty,
-        side_a_status_attachments_property: sideASession.status.attachmentsProperty,
+        side_a_session_stop_tool: sideASession.stop.toolName,
+        side_a_session_stop_message_property: sideASession.stop.messageProperty,
+        side_a_session_stop_attachments_property: sideASession.stop.attachmentsProperty,
+        side_a_session_fail_tool: sideASession.fail.toolName,
+        side_a_session_fail_message_property: sideASession.fail.messageProperty,
+        side_a_session_fail_attachments_property: sideASession.fail.attachmentsProperty,
+        side_a_session_status_tool: sideASession.status.toolName,
+        side_a_session_status_message_property: sideASession.status.messageProperty,
+        side_a_session_status_attachments_property: sideASession.status.attachmentsProperty,
         side_b_label: agentDef.sideB?.label,
         side_b_agent_prompt: qualifyPromptName(agentDef.sideB?.prompt),
         side_b_stop_on_response: agentDef.sideB?.stopOnResponse ?? false,
         side_b_stop_tool: agentDef.sideB?.stopTool,
         side_b_stop_tool_response_property: agentDef.sideB?.stopToolResponseProperty,
         side_b_max_steps: agentDef.sideB?.maxSteps,
-        side_b_end_session_tool: sideBSession.stop.toolName,
-        side_b_end_session_message_property: sideBSession.stop.messageProperty,
-        side_b_end_session_attachments_property: sideBSession.stop.attachmentsProperty,
-        side_b_fail_session_tool: sideBSession.fail.toolName,
-        side_b_fail_session_message_property: sideBSession.fail.messageProperty,
-        side_b_fail_session_attachments_property: sideBSession.fail.attachmentsProperty,
-        side_b_status_tool: sideBSession.status.toolName,
-        side_b_status_message_property: sideBSession.status.messageProperty,
-        side_b_status_attachments_property: sideBSession.status.attachmentsProperty
+        side_b_session_stop_tool: sideBSession.stop.toolName,
+        side_b_session_stop_message_property: sideBSession.stop.messageProperty,
+        side_b_session_stop_attachments_property: sideBSession.stop.attachmentsProperty,
+        side_b_session_fail_tool: sideBSession.fail.toolName,
+        side_b_session_fail_message_property: sideBSession.fail.messageProperty,
+        side_b_session_fail_attachments_property: sideBSession.fail.attachmentsProperty,
+        side_b_session_status_tool: sideBSession.status.toolName,
+        side_b_session_status_message_property: sideBSession.status.messageProperty,
+        side_b_session_status_attachments_property: sideBSession.status.attachmentsProperty
       };
       const { StreamManager: StreamManager2 } = await Promise.resolve().then(() => (init_StreamManager(), StreamManager_exports));
       const stream = new StreamManager2();