@standardagents/builder 0.13.2 → 0.14.1

package/dist/index.js

@@ -1060,6 +1060,68 @@ function filterEmptyAssistantProviderMessages(messages) {
     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)) {
@@ -1203,7 +1265,8 @@ 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;
@@ -2146,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,
@@ -2161,7 +2224,7 @@ function resolveSessionToolBinding(binding, legacyTool) {
     }
   }
   return {
-    toolName: typeof legacyTool === "string" ? legacyTool : null,
+    toolName: null,
     messageProperty: null,
     attachmentsProperty: null
   };
@@ -2169,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({
@@ -3249,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,
@@ -3265,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;
@@ -4486,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;
@@ -4671,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 += `
@@ -6902,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,
@@ -7716,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)
@@ -7869,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;
@@ -7937,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
@@ -7991,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)) {
@@ -9674,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(
@@ -9690,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()
               });
@@ -9709,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(
@@ -9725,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()
               });
@@ -9821,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) {
@@ -9856,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;
@@ -9960,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 [];
@@ -11428,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.
@@ -11717,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>;
@@ -11973,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");
@@ -12589,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},`);
@@ -13269,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;
@@ -13321,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;
@@ -21076,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(
       `
@@ -21131,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");
@@ -21519,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) {
@@ -21529,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;
@@ -22087,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) {
@@ -22545,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);
@@ -22731,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;
@@ -22876,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();