@dexto/core 1.7.2 → 1.8.0

package/dist/llm/executor/stream-processor.cjs

@@ -21,29 +21,26 @@ __export(stream_processor_exports, {
   StreamProcessor: () => StreamProcessor
 });
 module.exports = __toCommonJS(stream_processor_exports);
-var import_tool_output_truncator = require("./tool-output-truncator.js");
-var import_utils = require("../../context/utils.js");
 var import_types2 = require("../../logger/v2/types.js");
 var import_usage_metadata = require("../usage-metadata.js");
+function finiteUsageCount(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
 class StreamProcessor {
   /**
    * @param contextManager Context manager for message persistence
    * @param eventBus Event bus for emitting events
-   * @param resourceManager Resource manager for blob storage
    * @param abortSignal Abort signal for cancellation
    * @param config Provider/model configuration
    * @param logger Logger instance
    * @param streaming If true, emits llm:chunk events. Default true.
-   * @param toolCallMetadata Map of tool call IDs to tool-call metadata (approval + presentation)
    */
-  constructor(contextManager, eventBus, resourceManager, abortSignal, config, logger, streaming = true, toolCallMetadata) {
+  constructor(contextManager, eventBus, abortSignal, config, logger, streaming = true) {
     this.contextManager = contextManager;
     this.eventBus = eventBus;
-    this.resourceManager = resourceManager;
     this.abortSignal = abortSignal;
     this.config = config;
     this.streaming = streaming;
-    this.toolCallMetadata = toolCallMetadata;
     this.logger = logger.createChild(import_types2.DextoLogComponent.EXECUTOR);
     this.usageScopeId = config.usageScopeId;
   }
@@ -56,6 +53,7 @@ class StreamProcessor {
   logger;
   hasStepUsage = false;
   usageScopeId;
+  modelToolCalls = [];
   /**
    * Track pending tool calls (added to context but no result yet).
    * On cancel/abort, we add synthetic "cancelled" results to maintain tool_use/tool_result pairing.
@@ -170,60 +168,14 @@ class StreamProcessor {
               };
             }
             await this.contextManager.addToolCall(this.assistantMessageId, toolCall);
-            this.pendingToolCalls.set(event.toolCallId, {
-              toolName: event.toolName
-            });
-            this.partialToolCalls.delete(event.toolCallId);
-            break;
-          }
-          case "tool-result": {
-            const rawResult = event.output;
-            this.logger.debug("Tool result received", {
-              toolName: event.toolName,
+            this.modelToolCalls.push({
               toolCallId: event.toolCallId,
-              rawResult
-            });
-            const sanitized = await (0, import_utils.sanitizeToolResult)(
-              rawResult,
-              {
-                blobStore: this.resourceManager.getBlobStore(),
-                toolName: event.toolName,
-                toolCallId: event.toolCallId,
-                success: true
-              },
-              this.logger
-            );
-            const truncated = (0, import_tool_output_truncator.truncateToolResult)(sanitized);
-            const metadata = this.toolCallMetadata?.get(event.toolCallId);
-            await this.contextManager.addToolResult(
-              event.toolCallId,
-              event.toolName,
-              truncated,
-              // Includes meta.success from sanitization
-              metadata
-              // Only tool-call metadata if present
-            );
-            this.eventBus.emit("llm:tool-result", {
               toolName: event.toolName,
-              ...metadata?.presentationSnapshot !== void 0 && {
-                presentationSnapshot: metadata.presentationSnapshot
-              },
-              ...metadata?.meta !== void 0 && {
-                meta: metadata.meta
-              },
-              callId: event.toolCallId,
-              success: true,
-              sanitized: truncated,
-              rawResult,
-              ...metadata?.requireApproval !== void 0 && {
-                requireApproval: metadata.requireApproval
-              },
-              ...metadata?.approvalStatus !== void 0 && {
-                approvalStatus: metadata.approvalStatus
-              }
+              input: event.input
+            });
+            this.pendingToolCalls.set(event.toolCallId, {
+              toolName: event.toolName
             });
-            this.toolCallMetadata?.delete(event.toolCallId);
-            this.pendingToolCalls.delete(event.toolCallId);
             this.partialToolCalls.delete(event.toolCallId);
             break;
           }
@@ -314,58 +266,6 @@ class StreamProcessor {
             }
             break;
           }
-          case "tool-error": {
-            this.logger.error("Tool execution failed", {
-              toolName: event.toolName,
-              toolCallId: event.toolCallId,
-              error: event.error
-            });
-            const errorMessage = event.error instanceof Error ? event.error.message : String(event.error);
-            const metadata = this.toolCallMetadata?.get(event.toolCallId);
-            const errorResult = {
-              content: [{ type: "text", text: `Error: ${errorMessage}` }],
-              meta: {
-                toolName: event.toolName,
-                toolCallId: event.toolCallId,
-                success: false
-              }
-            };
-            await this.contextManager.addToolResult(
-              event.toolCallId,
-              event.toolName,
-              errorResult,
-              metadata
-            );
-            this.eventBus.emit("llm:tool-result", {
-              toolName: event.toolName,
-              ...metadata?.presentationSnapshot !== void 0 && {
-                presentationSnapshot: metadata.presentationSnapshot
-              },
-              ...metadata?.meta !== void 0 && {
-                meta: metadata.meta
-              },
-              callId: event.toolCallId,
-              success: false,
-              error: errorMessage,
-              ...metadata?.requireApproval !== void 0 && {
-                requireApproval: metadata.requireApproval
-              },
-              ...metadata?.approvalStatus !== void 0 && {
-                approvalStatus: metadata.approvalStatus
-              }
-            });
-            this.eventBus.emit("llm:error", {
-              error: event.error instanceof Error ? event.error : new Error(String(event.error)),
-              context: `Tool execution failed: ${event.toolName}`,
-              toolCallId: event.toolCallId,
-              recoverable: true
-              // Tool errors are typically recoverable
-            });
-            this.toolCallMetadata?.delete(event.toolCallId);
-            this.pendingToolCalls.delete(event.toolCallId);
-            this.partialToolCalls.delete(event.toolCallId);
-            break;
-          }
           case "error": {
             const err = event.error instanceof Error ? event.error : new Error(String(event.error));
             await this.persistFailedToolResults(err.message);
@@ -392,7 +292,8 @@ class StreamProcessor {
             return {
               text: this.accumulatedText,
               finishReason: "cancelled",
-              usage: this.actualTokens
+              usage: this.actualTokens,
+              toolCalls: this.modelToolCalls
             };
           }
         }
@@ -420,7 +321,8 @@ class StreamProcessor {
         return {
           text: this.accumulatedText,
           finishReason: "cancelled",
-          usage: this.actualTokens
+          usage: this.actualTokens,
+          toolCalls: this.modelToolCalls
         };
       }
       this.logger.error("Stream processing failed", { error });
@@ -429,28 +331,29 @@ class StreamProcessor {
     return {
       text: this.accumulatedText,
       finishReason: this.finishReason,
-      usage: this.actualTokens
+      usage: this.actualTokens,
+      toolCalls: this.modelToolCalls
     };
   }
   getCacheTokensFromProviderMetadata(providerMetadata) {
     const anthropicMeta = providerMetadata?.["anthropic"];
     const bedrockMeta = providerMetadata?.["bedrock"];
-    const cacheWriteTokens = anthropicMeta?.["cacheCreationInputTokens"] ?? bedrockMeta?.usage?.["cacheWriteInputTokens"] ?? 0;
-    const cacheReadTokens = anthropicMeta?.["cacheReadInputTokens"] ?? bedrockMeta?.usage?.["cacheReadInputTokens"] ?? 0;
+    const cacheWriteTokens = finiteUsageCount(anthropicMeta?.["cacheCreationInputTokens"]) ?? finiteUsageCount(bedrockMeta?.usage?.["cacheWriteInputTokens"]) ?? 0;
+    const cacheReadTokens = finiteUsageCount(anthropicMeta?.["cacheReadInputTokens"]) ?? finiteUsageCount(bedrockMeta?.usage?.["cacheReadInputTokens"]) ?? 0;
     return { cacheReadTokens, cacheWriteTokens };
   }
   normalizeUsage(usage, providerMetadata) {
-    const inputTokensRaw = usage?.inputTokens ?? 0;
-    const outputTokens = usage?.outputTokens ?? 0;
-    const totalTokens = usage?.totalTokens ?? 0;
-    const reasoningTokens = usage?.reasoningTokens;
-    const cachedInputTokens = usage?.cachedInputTokens;
+    const inputTokensRaw = finiteUsageCount(usage?.inputTokens) ?? 0;
+    const outputTokens = finiteUsageCount(usage?.outputTokens) ?? 0;
+    const totalTokens = finiteUsageCount(usage?.totalTokens) ?? 0;
+    const reasoningTokens = finiteUsageCount(usage?.reasoningTokens);
+    const cachedInputTokens = finiteUsageCount(usage?.cachedInputTokens);
     const inputTokenDetails = usage?.inputTokenDetails;
     const providerCache = this.getCacheTokensFromProviderMetadata(providerMetadata);
-    const cacheReadTokens = inputTokenDetails?.cacheReadTokens ?? cachedInputTokens ?? providerCache.cacheReadTokens ?? 0;
-    const cacheWriteTokens = inputTokenDetails?.cacheWriteTokens ?? providerCache.cacheWriteTokens ?? 0;
+    const cacheReadTokens = finiteUsageCount(inputTokenDetails?.cacheReadTokens) ?? cachedInputTokens ?? providerCache.cacheReadTokens ?? 0;
+    const cacheWriteTokens = finiteUsageCount(inputTokenDetails?.cacheWriteTokens) ?? providerCache.cacheWriteTokens ?? 0;
     const needsCacheWriteAdjustment = inputTokenDetails === void 0 && cachedInputTokens !== void 0 && providerCache.cacheWriteTokens > 0;
-    const noCacheTokens = inputTokenDetails?.noCacheTokens ?? (cachedInputTokens !== void 0 ? inputTokensRaw - cachedInputTokens - (needsCacheWriteAdjustment ? providerCache.cacheWriteTokens : 0) : inputTokensRaw);
+    const noCacheTokens = finiteUsageCount(inputTokenDetails?.noCacheTokens) ?? (cachedInputTokens !== void 0 ? inputTokensRaw - cachedInputTokens - (needsCacheWriteAdjustment ? providerCache.cacheWriteTokens : 0) : inputTokensRaw);
     return {
       inputTokens: Math.max(0, noCacheTokens),
       outputTokens,
@@ -581,7 +484,6 @@ class StreamProcessor {
       `Persisting ${options.logLabel} results for ${this.pendingToolCalls.size} pending tool call(s)`
     );
     for (const [toolCallId, { toolName }] of this.pendingToolCalls) {
-      const metadata = this.toolCallMetadata?.get(toolCallId);
       const syntheticResult = {
         content: [{ type: "text", text: options.resultText }],
         meta: {
@@ -594,27 +496,14 @@ class StreamProcessor {
         toolCallId,
         toolName,
         syntheticResult,
-        metadata
+        void 0
       );
       this.eventBus.emit("llm:tool-result", {
         toolName,
-        ...metadata?.presentationSnapshot !== void 0 && {
-          presentationSnapshot: metadata.presentationSnapshot
-        },
-        ...metadata?.meta !== void 0 && {
-          meta: metadata.meta
-        },
         callId: toolCallId,
         success: false,
-        error: options.errorMessage,
-        ...metadata?.requireApproval !== void 0 && {
-          requireApproval: metadata.requireApproval
-        },
-        ...metadata?.approvalStatus !== void 0 && {
-          approvalStatus: metadata.approvalStatus
-        }
+        error: options.errorMessage
       });
-      this.toolCallMetadata?.delete(toolCallId);
     }
     this.pendingToolCalls.clear();
   }

package/dist/llm/executor/stream-processor.d.ts

@@ -1,11 +1,8 @@
 import { StreamTextResult, ToolSet as VercelToolSet } from 'ai';
 import { ContextManager } from '../../context/manager.js';
 import { SessionEventBus } from '../../events/index.js';
-import { ResourceManager } from '../../resources/index.js';
 import { StreamProcessorResult } from './types.js';
 import type { Logger } from '../../logger/v2/types.js';
-import type { ToolPresentationSnapshotV1 } from '../../tools/types.js';
-import type { ToolCallMetadata } from '../../tools/tool-call-metadata.js';
 import type { LLMProvider, ReasoningVariant } from '../types.js';
 export interface StreamProcessorConfig {
     provider: LLMProvider;
@@ -21,11 +18,9 @@ export interface StreamProcessorConfig {
 export declare class StreamProcessor {
     private contextManager;
     private eventBus;
-    private resourceManager;
     private abortSignal;
     private config;
     private streaming;
-    private toolCallMetadata?;
     private assistantMessageId;
     private actualTokens;
     private finishReason;
@@ -35,6 +30,7 @@ export declare class StreamProcessor {
     private logger;
     private hasStepUsage;
     private readonly usageScopeId;
+    private modelToolCalls;
     /**
      * Track pending tool calls (added to context but no result yet).
      * On cancel/abort, we add synthetic "cancelled" results to maintain tool_use/tool_result pairing.
@@ -44,19 +40,12 @@ export declare class StreamProcessor {
     /**
      * @param contextManager Context manager for message persistence
      * @param eventBus Event bus for emitting events
-     * @param resourceManager Resource manager for blob storage
      * @param abortSignal Abort signal for cancellation
      * @param config Provider/model configuration
      * @param logger Logger instance
      * @param streaming If true, emits llm:chunk events. Default true.
-     * @param toolCallMetadata Map of tool call IDs to tool-call metadata (approval + presentation)
      */
-    constructor(contextManager: ContextManager, eventBus: SessionEventBus, resourceManager: ResourceManager, abortSignal: AbortSignal, config: StreamProcessorConfig, logger: Logger, streaming?: boolean, toolCallMetadata?: Map<string, {
-        presentationSnapshot?: ToolPresentationSnapshotV1;
-        meta?: ToolCallMetadata;
-        requireApproval?: boolean;
-        approvalStatus?: "approved" | "rejected";
-    }> | undefined);
+    constructor(contextManager: ContextManager, eventBus: SessionEventBus, abortSignal: AbortSignal, config: StreamProcessorConfig, logger: Logger, streaming?: boolean);
     process(streamFn: () => StreamTextResult<VercelToolSet, unknown>): Promise<StreamProcessorResult>;
     private getCacheTokensFromProviderMetadata;
     private normalizeUsage;

package/dist/llm/executor/stream-processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream-processor.d.ts","sourceRoot":"","sources":["../../../src/llm/executor/stream-processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,IAAI,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAmB,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAGnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAG1E,OAAO,KAAK,EAAE,WAAW,EAAoB,gBAAgB,EAAc,MAAM,aAAa,CAAC;AA4C/F,MAAM,WAAW,qBAAqB;IAClC,QAAQ,EAAE,WAAW,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yEAAyE;IACzE,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,0EAA0E;IAC1E,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,gFAAgF;IAChF,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAClC;AAED,qBAAa,eAAe;IA4BpB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,gBAAgB,CAAC;IAlC7B,OAAO,CAAC,kBAAkB,CAAuB;IACjD,OAAO,CAAC,YAAY,CAAmE;IACvF,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,iBAAiB,CAAsC;IAC/D,OAAO,CAAC,eAAe,CAAc;IACrC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAClD;;;OAGG;IACH,OAAO,CAAC,gBAAgB,CAAgD;IACxE,OAAO,CAAC,gBAAgB,CAAkE;IAE1F;;;;;;;;;OASG;gBAES,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,eAAe,EACzB,eAAe,EAAE,eAAe,EAChC,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,qBAAqB,EACrC,MAAM,EAAE,MAAM,EACN,SAAS,GAAE,OAAc,EACzB,gBAAgB,CAAC,EAAE,GAAG,CAC1B,MAAM,EACN;QACI,oBAAoB,CAAC,EAAE,0BAA0B,CAAC;QAClD,IAAI,CAAC,EAAE,gBAAgB,CAAC;QACxB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,cAAc,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;KAC5C,CACJ,YAAA;IAMC,OAAO,CACT,QAAQ,EAAE,MAAM,gBAAgB,CAAC,aAAa,EAAE,OAAO,CAAC,GACzD,OAAO,CAAC,qBAAqB,CAAC;IA+fjC,OAAO,CAAC,kCAAkC;IAoB1C,OAAO,CAAC,cAAc;IA0CtB,OAAO,CAAC,mBAAmB;IAa3B,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,eAAe;YA8BT,gCAAgC;IA0B9C,OAAO,CAAC,sBAAsB;YAwChB,sBAAsB;YAKtB,gBAAgB;IAO9B;;;;OAIG;YACW,2BAA2B;IAQzC;;OAEG;YACW,wBAAwB;YAQxB,yBAAyB;CAqD1C"}
+{"version":3,"file":"stream-processor.d.ts","sourceRoot":"","sources":["../../../src/llm/executor/stream-processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,IAAI,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAmB,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAKvD,OAAO,KAAK,EAAE,WAAW,EAAoB,gBAAgB,EAAc,MAAM,aAAa,CAAC;AAgD/F,MAAM,WAAW,qBAAqB;IAClC,QAAQ,EAAE,WAAW,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yEAAyE;IACzE,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,0EAA0E;IAC1E,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,gFAAgF;IAChF,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAClC;AAED,qBAAa,eAAe;IA2BpB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,SAAS;IA/BrB,OAAO,CAAC,kBAAkB,CAAuB;IACjD,OAAO,CAAC,YAAY,CAAmE;IACvF,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,iBAAiB,CAAsC;IAC/D,OAAO,CAAC,eAAe,CAAc;IACrC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAClD,OAAO,CAAC,cAAc,CAAuB;IAC7C;;;OAGG;IACH,OAAO,CAAC,gBAAgB,CAAgD;IACxE,OAAO,CAAC,gBAAgB,CAAkE;IAE1F;;;;;;;OAOG;gBAES,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,eAAe,EACzB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,qBAAqB,EACrC,MAAM,EAAE,MAAM,EACN,SAAS,GAAE,OAAc;IAM/B,OAAO,CACT,QAAQ,EAAE,MAAM,gBAAgB,CAAC,aAAa,EAAE,OAAO,CAAC,GACzD,OAAO,CAAC,qBAAqB,CAAC;IAiYjC,OAAO,CAAC,kCAAkC;IAoB1C,OAAO,CAAC,cAAc;IA4CtB,OAAO,CAAC,mBAAmB;IAa3B,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,eAAe;YA8BT,gCAAgC;IA0B9C,OAAO,CAAC,sBAAsB;YAwChB,sBAAsB;YAKtB,gBAAgB;IAO9B;;;;OAIG;YACW,2BAA2B;IAQzC;;OAEG;YACW,wBAAwB;YAQxB,yBAAyB;CAuC1C"}

package/dist/llm/executor/stream-processor.js

@@ -1,27 +1,24 @@
-import "../../chunk-PTJYTZNU.js";
-import { truncateToolResult } from "./tool-output-truncator.js";
-import { sanitizeToolResult } from "../../context/utils.js";
+import "../../chunk-C6A6W6XS.js";
 import { DextoLogComponent } from "../../logger/v2/types.js";
 import { getUsagePricingMetadata } from "../usage-metadata.js";
+function finiteUsageCount(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
 class StreamProcessor {
   /**
    * @param contextManager Context manager for message persistence
    * @param eventBus Event bus for emitting events
-   * @param resourceManager Resource manager for blob storage
    * @param abortSignal Abort signal for cancellation
    * @param config Provider/model configuration
    * @param logger Logger instance
    * @param streaming If true, emits llm:chunk events. Default true.
-   * @param toolCallMetadata Map of tool call IDs to tool-call metadata (approval + presentation)
    */
-  constructor(contextManager, eventBus, resourceManager, abortSignal, config, logger, streaming = true, toolCallMetadata) {
+  constructor(contextManager, eventBus, abortSignal, config, logger, streaming = true) {
     this.contextManager = contextManager;
     this.eventBus = eventBus;
-    this.resourceManager = resourceManager;
     this.abortSignal = abortSignal;
     this.config = config;
     this.streaming = streaming;
-    this.toolCallMetadata = toolCallMetadata;
     this.logger = logger.createChild(DextoLogComponent.EXECUTOR);
     this.usageScopeId = config.usageScopeId;
   }
@@ -34,6 +31,7 @@ class StreamProcessor {
   logger;
   hasStepUsage = false;
   usageScopeId;
+  modelToolCalls = [];
   /**
    * Track pending tool calls (added to context but no result yet).
    * On cancel/abort, we add synthetic "cancelled" results to maintain tool_use/tool_result pairing.
@@ -148,60 +146,14 @@ class StreamProcessor {
               };
             }
             await this.contextManager.addToolCall(this.assistantMessageId, toolCall);
-            this.pendingToolCalls.set(event.toolCallId, {
-              toolName: event.toolName
-            });
-            this.partialToolCalls.delete(event.toolCallId);
-            break;
-          }
-          case "tool-result": {
-            const rawResult = event.output;
-            this.logger.debug("Tool result received", {
-              toolName: event.toolName,
+            this.modelToolCalls.push({
               toolCallId: event.toolCallId,
-              rawResult
-            });
-            const sanitized = await sanitizeToolResult(
-              rawResult,
-              {
-                blobStore: this.resourceManager.getBlobStore(),
-                toolName: event.toolName,
-                toolCallId: event.toolCallId,
-                success: true
-              },
-              this.logger
-            );
-            const truncated = truncateToolResult(sanitized);
-            const metadata = this.toolCallMetadata?.get(event.toolCallId);
-            await this.contextManager.addToolResult(
-              event.toolCallId,
-              event.toolName,
-              truncated,
-              // Includes meta.success from sanitization
-              metadata
-              // Only tool-call metadata if present
-            );
-            this.eventBus.emit("llm:tool-result", {
               toolName: event.toolName,
-              ...metadata?.presentationSnapshot !== void 0 && {
-                presentationSnapshot: metadata.presentationSnapshot
-              },
-              ...metadata?.meta !== void 0 && {
-                meta: metadata.meta
-              },
-              callId: event.toolCallId,
-              success: true,
-              sanitized: truncated,
-              rawResult,
-              ...metadata?.requireApproval !== void 0 && {
-                requireApproval: metadata.requireApproval
-              },
-              ...metadata?.approvalStatus !== void 0 && {
-                approvalStatus: metadata.approvalStatus
-              }
+              input: event.input
+            });
+            this.pendingToolCalls.set(event.toolCallId, {
+              toolName: event.toolName
             });
-            this.toolCallMetadata?.delete(event.toolCallId);
-            this.pendingToolCalls.delete(event.toolCallId);
             this.partialToolCalls.delete(event.toolCallId);
             break;
           }
@@ -292,58 +244,6 @@ class StreamProcessor {
             }
             break;
           }
-          case "tool-error": {
-            this.logger.error("Tool execution failed", {
-              toolName: event.toolName,
-              toolCallId: event.toolCallId,
-              error: event.error
-            });
-            const errorMessage = event.error instanceof Error ? event.error.message : String(event.error);
-            const metadata = this.toolCallMetadata?.get(event.toolCallId);
-            const errorResult = {
-              content: [{ type: "text", text: `Error: ${errorMessage}` }],
-              meta: {
-                toolName: event.toolName,
-                toolCallId: event.toolCallId,
-                success: false
-              }
-            };
-            await this.contextManager.addToolResult(
-              event.toolCallId,
-              event.toolName,
-              errorResult,
-              metadata
-            );
-            this.eventBus.emit("llm:tool-result", {
-              toolName: event.toolName,
-              ...metadata?.presentationSnapshot !== void 0 && {
-                presentationSnapshot: metadata.presentationSnapshot
-              },
-              ...metadata?.meta !== void 0 && {
-                meta: metadata.meta
-              },
-              callId: event.toolCallId,
-              success: false,
-              error: errorMessage,
-              ...metadata?.requireApproval !== void 0 && {
-                requireApproval: metadata.requireApproval
-              },
-              ...metadata?.approvalStatus !== void 0 && {
-                approvalStatus: metadata.approvalStatus
-              }
-            });
-            this.eventBus.emit("llm:error", {
-              error: event.error instanceof Error ? event.error : new Error(String(event.error)),
-              context: `Tool execution failed: ${event.toolName}`,
-              toolCallId: event.toolCallId,
-              recoverable: true
-              // Tool errors are typically recoverable
-            });
-            this.toolCallMetadata?.delete(event.toolCallId);
-            this.pendingToolCalls.delete(event.toolCallId);
-            this.partialToolCalls.delete(event.toolCallId);
-            break;
-          }
           case "error": {
             const err = event.error instanceof Error ? event.error : new Error(String(event.error));
             await this.persistFailedToolResults(err.message);
@@ -370,7 +270,8 @@ class StreamProcessor {
             return {
               text: this.accumulatedText,
               finishReason: "cancelled",
-              usage: this.actualTokens
+              usage: this.actualTokens,
+              toolCalls: this.modelToolCalls
             };
           }
         }
@@ -398,7 +299,8 @@ class StreamProcessor {
         return {
           text: this.accumulatedText,
           finishReason: "cancelled",
-          usage: this.actualTokens
+          usage: this.actualTokens,
+          toolCalls: this.modelToolCalls
         };
       }
       this.logger.error("Stream processing failed", { error });
@@ -407,28 +309,29 @@ class StreamProcessor {
     return {
       text: this.accumulatedText,
       finishReason: this.finishReason,
-      usage: this.actualTokens
+      usage: this.actualTokens,
+      toolCalls: this.modelToolCalls
     };
   }
   getCacheTokensFromProviderMetadata(providerMetadata) {
     const anthropicMeta = providerMetadata?.["anthropic"];
     const bedrockMeta = providerMetadata?.["bedrock"];
-    const cacheWriteTokens = anthropicMeta?.["cacheCreationInputTokens"] ?? bedrockMeta?.usage?.["cacheWriteInputTokens"] ?? 0;
-    const cacheReadTokens = anthropicMeta?.["cacheReadInputTokens"] ?? bedrockMeta?.usage?.["cacheReadInputTokens"] ?? 0;
+    const cacheWriteTokens = finiteUsageCount(anthropicMeta?.["cacheCreationInputTokens"]) ?? finiteUsageCount(bedrockMeta?.usage?.["cacheWriteInputTokens"]) ?? 0;
+    const cacheReadTokens = finiteUsageCount(anthropicMeta?.["cacheReadInputTokens"]) ?? finiteUsageCount(bedrockMeta?.usage?.["cacheReadInputTokens"]) ?? 0;
     return { cacheReadTokens, cacheWriteTokens };
   }
   normalizeUsage(usage, providerMetadata) {
-    const inputTokensRaw = usage?.inputTokens ?? 0;
-    const outputTokens = usage?.outputTokens ?? 0;
-    const totalTokens = usage?.totalTokens ?? 0;
-    const reasoningTokens = usage?.reasoningTokens;
-    const cachedInputTokens = usage?.cachedInputTokens;
+    const inputTokensRaw = finiteUsageCount(usage?.inputTokens) ?? 0;
+    const outputTokens = finiteUsageCount(usage?.outputTokens) ?? 0;
+    const totalTokens = finiteUsageCount(usage?.totalTokens) ?? 0;
+    const reasoningTokens = finiteUsageCount(usage?.reasoningTokens);
+    const cachedInputTokens = finiteUsageCount(usage?.cachedInputTokens);
     const inputTokenDetails = usage?.inputTokenDetails;
     const providerCache = this.getCacheTokensFromProviderMetadata(providerMetadata);
-    const cacheReadTokens = inputTokenDetails?.cacheReadTokens ?? cachedInputTokens ?? providerCache.cacheReadTokens ?? 0;
-    const cacheWriteTokens = inputTokenDetails?.cacheWriteTokens ?? providerCache.cacheWriteTokens ?? 0;
+    const cacheReadTokens = finiteUsageCount(inputTokenDetails?.cacheReadTokens) ?? cachedInputTokens ?? providerCache.cacheReadTokens ?? 0;
+    const cacheWriteTokens = finiteUsageCount(inputTokenDetails?.cacheWriteTokens) ?? providerCache.cacheWriteTokens ?? 0;
     const needsCacheWriteAdjustment = inputTokenDetails === void 0 && cachedInputTokens !== void 0 && providerCache.cacheWriteTokens > 0;
-    const noCacheTokens = inputTokenDetails?.noCacheTokens ?? (cachedInputTokens !== void 0 ? inputTokensRaw - cachedInputTokens - (needsCacheWriteAdjustment ? providerCache.cacheWriteTokens : 0) : inputTokensRaw);
+    const noCacheTokens = finiteUsageCount(inputTokenDetails?.noCacheTokens) ?? (cachedInputTokens !== void 0 ? inputTokensRaw - cachedInputTokens - (needsCacheWriteAdjustment ? providerCache.cacheWriteTokens : 0) : inputTokensRaw);
     return {
       inputTokens: Math.max(0, noCacheTokens),
       outputTokens,
@@ -559,7 +462,6 @@ class StreamProcessor {
       `Persisting ${options.logLabel} results for ${this.pendingToolCalls.size} pending tool call(s)`
     );
     for (const [toolCallId, { toolName }] of this.pendingToolCalls) {
-      const metadata = this.toolCallMetadata?.get(toolCallId);
       const syntheticResult = {
         content: [{ type: "text", text: options.resultText }],
         meta: {
@@ -572,27 +474,14 @@ class StreamProcessor {
         toolCallId,
         toolName,
         syntheticResult,
-        metadata
+        void 0
       );
       this.eventBus.emit("llm:tool-result", {
         toolName,
-        ...metadata?.presentationSnapshot !== void 0 && {
-          presentationSnapshot: metadata.presentationSnapshot
-        },
-        ...metadata?.meta !== void 0 && {
-          meta: metadata.meta
-        },
         callId: toolCallId,
         success: false,
-        error: options.errorMessage,
-        ...metadata?.requireApproval !== void 0 && {
-          requireApproval: metadata.requireApproval
-        },
-        ...metadata?.approvalStatus !== void 0 && {
-          approvalStatus: metadata.approvalStatus
-        }
+        error: options.errorMessage
       });
-      this.toolCallMetadata?.delete(toolCallId);
     }
     this.pendingToolCalls.clear();
   }

package/dist/{session/history/memory.cjs → llm/executor/tool-definitions.cjs}

@@ -16,42 +16,30 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var memory_exports = {};
-__export(memory_exports, {
-  MemoryHistoryProvider: () => MemoryHistoryProvider
+var tool_definitions_exports = {};
+__export(tool_definitions_exports, {
+  createModelToolDefinitions: () => createModelToolDefinitions
 });
-module.exports = __toCommonJS(memory_exports);
-class MemoryHistoryProvider {
-  constructor(logger) {
-    this.logger = logger;
-  }
-  messages = [];
-  async getHistory() {
-    return [...this.messages];
-  }
-  async saveMessage(message) {
-    this.messages.push(message);
-  }
-  async updateMessage(message) {
-    if (!message.id) {
-      this.logger.warn("MemoryHistoryProvider: Ignoring update for message without id");
-      return;
-    }
-    const index = this.messages.findIndex((m) => m.id === message.id);
-    if (index !== -1) {
-      this.messages[index] = message;
-    }
-  }
-  async clearHistory() {
-    this.messages = [];
-  }
-  /**
-   * No-op for in-memory provider - all operations are already "flushed".
-   */
-  async flush() {
+module.exports = __toCommonJS(tool_definitions_exports);
+var import_ai = require("ai");
+const modelToolResultSchema = (0, import_ai.jsonSchema)({});
+function createToolDefinitionBase(tool) {
+  return {
+    inputSchema: (0, import_ai.jsonSchema)(tool.parameters),
+    ...tool.description ? { description: tool.description } : {}
+  };
+}
+function createModelToolDefinitions(tools) {
+  const definitions = {};
+  for (const [toolName, tool] of Object.entries(tools)) {
+    definitions[toolName] = {
+      ...createToolDefinitionBase(tool),
+      outputSchema: modelToolResultSchema
+    };
   }
+  return definitions;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  MemoryHistoryProvider
+  createModelToolDefinitions
 });

package/dist/llm/executor/tool-definitions.d.ts

@@ -0,0 +1,4 @@
+import { type ToolSet as VercelToolSet } from 'ai';
+import type { ToolSet } from '../../tools/types.js';
+export declare function createModelToolDefinitions(tools: ToolSet): VercelToolSet;
+//# sourceMappingURL=tool-definitions.d.ts.map

package/dist/llm/executor/tool-definitions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-definitions.d.ts","sourceRoot":"","sources":["../../../src/llm/executor/tool-definitions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,OAAO,IAAI,aAAa,EAAE,MAAM,IAAI,CAAC;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAWpD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,OAAO,GAAG,aAAa,CASxE"}