@dexto/core 1.2.4 → 1.2.6

package/dist/llm/formatters/openai.cjs

@@ -22,8 +22,12 @@ __export(openai_exports, {
 });
 module.exports = __toCommonJS(openai_exports);
 var import_utils = require("../../context/utils.cjs");
-var import_logger = require("../../logger/index.cjs");
+var import_types4 = require("../../logger/v2/types.cjs");
 class OpenAIMessageFormatter {
+  logger;
+  constructor(logger) {
+    this.logger = logger.createChild(import_types4.DextoLogComponent.LLM);
+  }
   /**
    * Formats internal messages into OpenAI's Chat Completion API format
    *
@@ -35,9 +39,11 @@ class OpenAIMessageFormatter {
     const formatted = [];
     let filteredHistory;
     try {
-      filteredHistory = (0, import_utils.filterMessagesByLLMCapabilities)([...history], context);
+      filteredHistory = (0, import_utils.filterMessagesByLLMCapabilities)([...history], context, this.logger);
     } catch (error) {
-      import_logger.logger.warn(`Failed to apply capability filtering, using original history: ${error}`);
+      this.logger.warn(
+        `Failed to apply capability filtering, using original history: ${error}`
+      );
       filteredHistory = [...history];
     }
     if (systemPrompt) {
@@ -46,6 +52,7 @@ class OpenAIMessageFormatter {
         content: systemPrompt
       });
     }
+    const pendingToolCallIds = /* @__PURE__ */ new Set();
     for (const msg of filteredHistory) {
       switch (msg.role) {
         case "system":
@@ -67,6 +74,9 @@ class OpenAIMessageFormatter {
               content: String(msg.content || ""),
               tool_calls: msg.toolCalls
             });
+            for (const toolCall of msg.toolCalls) {
+              pendingToolCallIds.add(toolCall.id);
+            }
           } else {
             formatted.push({
               role: "assistant",
@@ -75,14 +85,33 @@ class OpenAIMessageFormatter {
           }
           break;
         case "tool":
-          formatted.push({
-            role: "tool",
-            content: (0, import_utils.toTextForToolMessage)(msg.content),
-            tool_call_id: msg.toolCallId || ""
-          });
+          if (msg.toolCallId && pendingToolCallIds.has(msg.toolCallId)) {
+            formatted.push({
+              role: "tool",
+              content: (0, import_utils.toTextForToolMessage)(msg.content),
+              tool_call_id: msg.toolCallId
+            });
+            pendingToolCallIds.delete(msg.toolCallId);
+          } else {
+            this.logger.warn(
+              `Skipping orphaned tool result ${msg.toolCallId} (no matching tool call found) - cannot send to OpenAI without corresponding tool_calls`
+            );
+          }
           break;
       }
     }
+    if (pendingToolCallIds.size > 0) {
+      for (const toolCallId of pendingToolCallIds) {
+        formatted.push({
+          role: "tool",
+          content: "Error: Tool execution was interrupted (session crashed or cancelled before completion)",
+          tool_call_id: toolCallId
+        });
+        this.logger.warn(
+          `Tool call ${toolCallId} had no matching tool result - added synthetic error result to prevent API errors`
+        );
+      }
+    }
     return formatted;
   }
   /**
@@ -149,7 +178,7 @@ class OpenAIMessageFormatter {
         return { type: "text", text: part.text };
       }
       if (part.type === "image") {
-        const raw = (0, import_utils.getImageData)(part);
+        const raw = (0, import_utils.getImageData)(part, this.logger);
         const url = raw.startsWith("http://") || raw.startsWith("https://") || raw.startsWith("data:") ? raw : `data:${part.mimeType || "application/octet-stream"};base64,${raw}`;
         return { type: "image_url", image_url: { url } };
       }

package/dist/llm/formatters/openai.d.ts

@@ -2,6 +2,7 @@ import { ChatCompletionMessageParam } from 'openai/resources';
 import { IMessageFormatter } from './types.js';
 import { LLMContext } from '../types.js';
 import { InternalMessage } from '../../context/types.js';
+import type { IDextoLogger } from '../../logger/v2/types.js';
 /**
  * Message formatter for OpenAI's Chat Completion API.
  *
@@ -11,6 +12,8 @@ import { InternalMessage } from '../../context/types.js';
  * - Tool results use the 'tool' role with tool_call_id and name
  */
 export declare class OpenAIMessageFormatter implements IMessageFormatter {
+    private logger;
+    constructor(logger: IDextoLogger);
     /**
      * Formats internal messages into OpenAI's Chat Completion API format
      *

package/dist/llm/formatters/openai.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../../src/llm/formatters/openai.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAA6B,MAAM,kBAAkB,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAQzD;;;;;;;GAOG;AACH,qBAAa,sBAAuB,YAAW,iBAAiB;IAC5D;;;;;;OAMG;IACH,MAAM,CACF,OAAO,EAAE,QAAQ,CAAC,eAAe,EAAE,CAAC,EACpC,OAAO,EAAE,UAAU,EACnB,YAAY,EAAE,MAAM,GAAG,IAAI,GAC5B,0BAA0B,EAAE;IAqE/B;;;;;;OAMG;IACH,kBAAkB,IAAI,IAAI;IAI1B;;OAEG;IACH,aAAa,CAAC,QAAQ,EAAE,OAAO,GAAG,eAAe,EAAE;IAiDnD,OAAO,CAAC,iBAAiB;CA+B5B"}
+{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../../src/llm/formatters/openai.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAA6B,MAAM,kBAAkB,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAMzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAG7D;;;;;;;GAOG;AACH,qBAAa,sBAAuB,YAAW,iBAAiB;IAC5D,OAAO,CAAC,MAAM,CAAe;gBAEjB,MAAM,EAAE,YAAY;IAGhC;;;;;;OAMG;IACH,MAAM,CACF,OAAO,EAAE,QAAQ,CAAC,eAAe,EAAE,CAAC,EACpC,OAAO,EAAE,UAAU,EACnB,YAAY,EAAE,MAAM,GAAG,IAAI,GAC5B,0BAA0B,EAAE;IAyG/B;;;;;;OAMG;IACH,kBAAkB,IAAI,IAAI;IAI1B;;OAEG;IACH,aAAa,CAAC,QAAQ,EAAE,OAAO,GAAG,eAAe,EAAE;IAiDnD,OAAO,CAAC,iBAAiB;CA+B5B"}

package/dist/llm/formatters/openai.js

@@ -4,8 +4,12 @@ import {
   filterMessagesByLLMCapabilities,
   toTextForToolMessage
 } from "../../context/utils.js";
-import { logger } from "../../logger/index.js";
+import { DextoLogComponent } from "../../logger/v2/types.js";
 class OpenAIMessageFormatter {
+  logger;
+  constructor(logger) {
+    this.logger = logger.createChild(DextoLogComponent.LLM);
+  }
   /**
    * Formats internal messages into OpenAI's Chat Completion API format
    *
@@ -17,9 +21,11 @@ class OpenAIMessageFormatter {
     const formatted = [];
     let filteredHistory;
     try {
-      filteredHistory = filterMessagesByLLMCapabilities([...history], context);
+      filteredHistory = filterMessagesByLLMCapabilities([...history], context, this.logger);
     } catch (error) {
-      logger.warn(`Failed to apply capability filtering, using original history: ${error}`);
+      this.logger.warn(
+        `Failed to apply capability filtering, using original history: ${error}`
+      );
       filteredHistory = [...history];
     }
     if (systemPrompt) {
@@ -28,6 +34,7 @@ class OpenAIMessageFormatter {
         content: systemPrompt
       });
     }
+    const pendingToolCallIds = /* @__PURE__ */ new Set();
     for (const msg of filteredHistory) {
       switch (msg.role) {
         case "system":
@@ -49,6 +56,9 @@ class OpenAIMessageFormatter {
               content: String(msg.content || ""),
               tool_calls: msg.toolCalls
             });
+            for (const toolCall of msg.toolCalls) {
+              pendingToolCallIds.add(toolCall.id);
+            }
           } else {
             formatted.push({
               role: "assistant",
@@ -57,14 +67,33 @@ class OpenAIMessageFormatter {
           }
           break;
         case "tool":
-          formatted.push({
-            role: "tool",
-            content: toTextForToolMessage(msg.content),
-            tool_call_id: msg.toolCallId || ""
-          });
+          if (msg.toolCallId && pendingToolCallIds.has(msg.toolCallId)) {
+            formatted.push({
+              role: "tool",
+              content: toTextForToolMessage(msg.content),
+              tool_call_id: msg.toolCallId
+            });
+            pendingToolCallIds.delete(msg.toolCallId);
+          } else {
+            this.logger.warn(
+              `Skipping orphaned tool result ${msg.toolCallId} (no matching tool call found) - cannot send to OpenAI without corresponding tool_calls`
+            );
+          }
           break;
       }
     }
+    if (pendingToolCallIds.size > 0) {
+      for (const toolCallId of pendingToolCallIds) {
+        formatted.push({
+          role: "tool",
+          content: "Error: Tool execution was interrupted (session crashed or cancelled before completion)",
+          tool_call_id: toolCallId
+        });
+        this.logger.warn(
+          `Tool call ${toolCallId} had no matching tool result - added synthetic error result to prevent API errors`
+        );
+      }
+    }
     return formatted;
   }
   /**
@@ -131,7 +160,7 @@ class OpenAIMessageFormatter {
         return { type: "text", text: part.text };
       }
       if (part.type === "image") {
-        const raw = getImageData(part);
+        const raw = getImageData(part, this.logger);
         const url = raw.startsWith("http://") || raw.startsWith("https://") || raw.startsWith("data:") ? raw : `data:${part.mimeType || "application/octet-stream"};base64,${raw}`;
         return { type: "image_url", image_url: { url } };
       }

package/dist/llm/formatters/vercel.cjs

@@ -22,8 +22,12 @@ __export(vercel_exports, {
 });
 module.exports = __toCommonJS(vercel_exports);
 var import_utils = require("../../context/utils.cjs");
-var import_logger = require("../../logger/index.cjs");
+var import_types4 = require("../../logger/v2/types.cjs");
 class VercelMessageFormatter {
+  logger;
+  constructor(logger) {
+    this.logger = logger.createChild(import_types4.DextoLogComponent.LLM);
+  }
   /**
    * Formats internal messages into Vercel AI SDK format
    *
@@ -35,11 +39,13 @@ class VercelMessageFormatter {
     const formatted = [];
     let filteredHistory;
     try {
-      filteredHistory = (0, import_utils.filterMessagesByLLMCapabilities)([...history], context);
+      filteredHistory = (0, import_utils.filterMessagesByLLMCapabilities)([...history], context, this.logger);
       const modelInfo = `${context.provider}/${context.model}`;
-      import_logger.logger.debug(`Applied Vercel filtering for ${modelInfo}`);
+      this.logger.debug(`Applied Vercel filtering for ${modelInfo}`);
     } catch (error) {
-      import_logger.logger.warn(`Failed to apply capability filtering, using original history: ${error}`);
+      this.logger.warn(
+        `Failed to apply capability filtering, using original history: ${error}`
+      );
       filteredHistory = [...history];
     }
     if (systemPrompt) {
@@ -48,6 +54,7 @@ class VercelMessageFormatter {
         content: systemPrompt
       });
     }
+    const pendingToolCalls = /* @__PURE__ */ new Map();
     for (const msg of filteredHistory) {
       switch (msg.role) {
         case "user":
@@ -87,12 +94,46 @@ class VercelMessageFormatter {
           break;
         case "assistant":
           formatted.push({ role: "assistant", ...this.formatAssistantMessage(msg) });
+          if (msg.toolCalls && msg.toolCalls.length > 0) {
+            for (const toolCall of msg.toolCalls) {
+              pendingToolCalls.set(toolCall.id, toolCall.function.name);
+            }
+          }
           break;
         case "tool":
-          formatted.push({ role: "tool", ...this.formatToolMessage(msg) });
+          if (msg.toolCallId && pendingToolCalls.has(msg.toolCallId)) {
+            formatted.push({ role: "tool", ...this.formatToolMessage(msg) });
+            pendingToolCalls.delete(msg.toolCallId);
+          } else {
+            this.logger.warn(
+              `Skipping orphaned tool result ${msg.toolCallId} (no matching tool call found) - cannot send to Vercel AI SDK without corresponding tool-call`
+            );
+          }
           break;
       }
     }
+    if (pendingToolCalls.size > 0) {
+      for (const [toolCallId, toolName] of pendingToolCalls.entries()) {
+        formatted.push({
+          role: "tool",
+          content: [
+            {
+              type: "tool-result",
+              toolCallId,
+              toolName,
+              output: {
+                type: "text",
+                value: "Error: Tool execution was interrupted (session crashed or cancelled before completion)"
+              },
+              isError: true
+            }
+          ]
+        });
+        this.logger.warn(
+          `Tool call ${toolCallId} (${toolName}) had no matching tool result - added synthetic error result to prevent API errors`
+        );
+      }
+    }
     return formatted;
   }
   /**
@@ -301,7 +342,7 @@ class VercelMessageFormatter {
             parsed = JSON.parse(rawArgs);
           } catch {
             parsed = {};
-            import_logger.logger.warn(
+            this.logger.warn(
               `Vercel formatter: invalid tool args JSON for ${toolCall.function.name}`
             );
           }
@@ -345,7 +386,7 @@ class VercelMessageFormatter {
     if (Array.isArray(msg.content)) {
       if (msg.content[0]?.type === "image") {
         const imagePart = msg.content[0];
-        const imageDataBase64 = (0, import_utils.getImageData)(imagePart);
+        const imageDataBase64 = (0, import_utils.getImageData)(imagePart, this.logger);
         toolResultPart = {
           type: "tool-result",
           toolCallId: msg.toolCallId,
@@ -363,7 +404,7 @@ class VercelMessageFormatter {
         };
       } else if (msg.content[0]?.type === "file") {
         const filePart = msg.content[0];
-        const fileDataBase64 = (0, import_utils.getFileData)(filePart);
+        const fileDataBase64 = (0, import_utils.getFileData)(filePart, this.logger);
         toolResultPart = {
           type: "tool-result",
           toolCallId: msg.toolCallId,

package/dist/llm/formatters/vercel.d.ts

@@ -3,6 +3,7 @@ import { IMessageFormatter } from './types.js';
 import { LLMContext } from '../types.js';
 import { InternalMessage } from '../../context/types.js';
 import type { GenerateTextResult, StreamTextResult, ToolSet as VercelToolSet } from 'ai';
+import type { IDextoLogger } from '../../logger/v2/types.js';
 /**
  * Message formatter for Vercel AI SDK.
  *
@@ -15,6 +16,8 @@ import type { GenerateTextResult, StreamTextResult, ToolSet as VercelToolSet } f
  * particularly in its handling of function calls and responses.
  */
 export declare class VercelMessageFormatter implements IMessageFormatter {
+    private logger;
+    constructor(logger: IDextoLogger);
     /**
      * Formats internal messages into Vercel AI SDK format
      *

package/dist/llm/formatters/vercel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vercel.d.ts","sourceRoot":"","sources":["../../../src/llm/formatters/vercel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,YAAY,EAOf,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,IAAI,CAAC;AAIzF;;;;;;;;;;GAUG;AACH,qBAAa,sBAAuB,YAAW,iBAAiB;IAC5D;;;;;;OAMG;IACH,MAAM,CACF,OAAO,EAAE,QAAQ,CAAC,eAAe,EAAE,CAAC,EACpC,OAAO,EAAE,UAAU,EACnB,YAAY,EAAE,MAAM,GAAG,IAAI,GAC5B,YAAY,EAAE;IAkFjB;;;;;;OAMG;IACH,kBAAkB,IAAI,IAAI;IAI1B;;;OAGG;IACG,mBAAmB,CACrB,QAAQ,EAAE,gBAAgB,CAAC,aAAa,EAAE,OAAO,CAAC,GACnD,OAAO,CAAC,eAAe,EAAE,CAAC;IAwC7B;;;OAGG;IACH,aAAa,CAAC,QAAQ,EAAE,kBAAkB,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,eAAe,EAAE;IAsJtF,OAAO,CAAC,sBAAsB;IAuE9B,OAAO,CAAC,iBAAiB;CAoE5B"}
+{"version":3,"file":"vercel.d.ts","sourceRoot":"","sources":["../../../src/llm/formatters/vercel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,YAAY,EAOf,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,IAAI,CAAC;AAEzF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAG7D;;;;;;;;;;GAUG;AACH,qBAAa,sBAAuB,YAAW,iBAAiB;IAC5D,OAAO,CAAC,MAAM,CAAe;gBAEjB,MAAM,EAAE,YAAY;IAGhC;;;;;;OAMG;IACH,MAAM,CACF,OAAO,EAAE,QAAQ,CAAC,eAAe,EAAE,CAAC,EACpC,OAAO,EAAE,UAAU,EACnB,YAAY,EAAE,MAAM,GAAG,IAAI,GAC5B,YAAY,EAAE;IAmIjB;;;;;;OAMG;IACH,kBAAkB,IAAI,IAAI;IAI1B;;;OAGG;IACG,mBAAmB,CACrB,QAAQ,EAAE,gBAAgB,CAAC,aAAa,EAAE,OAAO,CAAC,GACnD,OAAO,CAAC,eAAe,EAAE,CAAC;IAwC7B;;;OAGG;IACH,aAAa,CAAC,QAAQ,EAAE,kBAAkB,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,eAAe,EAAE;IAsJtF,OAAO,CAAC,sBAAsB;IAuE9B,OAAO,CAAC,iBAAiB;CAoE5B"}

package/dist/llm/formatters/vercel.js

@@ -1,7 +1,11 @@
 import "../../chunk-C6A6W6XS.js";
 import { getImageData, getFileData, filterMessagesByLLMCapabilities } from "../../context/utils.js";
-import { logger } from "../../logger/index.js";
+import { DextoLogComponent } from "../../logger/v2/types.js";
 class VercelMessageFormatter {
+  logger;
+  constructor(logger) {
+    this.logger = logger.createChild(DextoLogComponent.LLM);
+  }
   /**
    * Formats internal messages into Vercel AI SDK format
    *
@@ -13,11 +17,13 @@ class VercelMessageFormatter {
     const formatted = [];
     let filteredHistory;
     try {
-      filteredHistory = filterMessagesByLLMCapabilities([...history], context);
+      filteredHistory = filterMessagesByLLMCapabilities([...history], context, this.logger);
       const modelInfo = `${context.provider}/${context.model}`;
-      logger.debug(`Applied Vercel filtering for ${modelInfo}`);
+      this.logger.debug(`Applied Vercel filtering for ${modelInfo}`);
     } catch (error) {
-      logger.warn(`Failed to apply capability filtering, using original history: ${error}`);
+      this.logger.warn(
+        `Failed to apply capability filtering, using original history: ${error}`
+      );
       filteredHistory = [...history];
     }
     if (systemPrompt) {
@@ -26,6 +32,7 @@ class VercelMessageFormatter {
         content: systemPrompt
       });
     }
+    const pendingToolCalls = /* @__PURE__ */ new Map();
     for (const msg of filteredHistory) {
       switch (msg.role) {
         case "user":
@@ -65,12 +72,46 @@ class VercelMessageFormatter {
           break;
         case "assistant":
           formatted.push({ role: "assistant", ...this.formatAssistantMessage(msg) });
+          if (msg.toolCalls && msg.toolCalls.length > 0) {
+            for (const toolCall of msg.toolCalls) {
+              pendingToolCalls.set(toolCall.id, toolCall.function.name);
+            }
+          }
           break;
         case "tool":
-          formatted.push({ role: "tool", ...this.formatToolMessage(msg) });
+          if (msg.toolCallId && pendingToolCalls.has(msg.toolCallId)) {
+            formatted.push({ role: "tool", ...this.formatToolMessage(msg) });
+            pendingToolCalls.delete(msg.toolCallId);
+          } else {
+            this.logger.warn(
+              `Skipping orphaned tool result ${msg.toolCallId} (no matching tool call found) - cannot send to Vercel AI SDK without corresponding tool-call`
+            );
+          }
           break;
       }
     }
+    if (pendingToolCalls.size > 0) {
+      for (const [toolCallId, toolName] of pendingToolCalls.entries()) {
+        formatted.push({
+          role: "tool",
+          content: [
+            {
+              type: "tool-result",
+              toolCallId,
+              toolName,
+              output: {
+                type: "text",
+                value: "Error: Tool execution was interrupted (session crashed or cancelled before completion)"
+              },
+              isError: true
+            }
+          ]
+        });
+        this.logger.warn(
+          `Tool call ${toolCallId} (${toolName}) had no matching tool result - added synthetic error result to prevent API errors`
+        );
+      }
+    }
     return formatted;
   }
   /**
@@ -279,7 +320,7 @@ class VercelMessageFormatter {
             parsed = JSON.parse(rawArgs);
           } catch {
             parsed = {};
-            logger.warn(
+            this.logger.warn(
               `Vercel formatter: invalid tool args JSON for ${toolCall.function.name}`
             );
           }
@@ -323,7 +364,7 @@ class VercelMessageFormatter {
     if (Array.isArray(msg.content)) {
       if (msg.content[0]?.type === "image") {
         const imagePart = msg.content[0];
-        const imageDataBase64 = getImageData(imagePart);
+        const imageDataBase64 = getImageData(imagePart, this.logger);
         toolResultPart = {
           type: "tool-result",
           toolCallId: msg.toolCallId,
@@ -341,7 +382,7 @@ class VercelMessageFormatter {
         };
       } else if (msg.content[0]?.type === "file") {
         const filePart = msg.content[0];
-        const fileDataBase64 = getFileData(filePart);
+        const fileDataBase64 = getFileData(filePart, this.logger);
         toolResultPart = {
           type: "tool-result",
           toolCallId: msg.toolCallId,