@mastra/memory 1.20.1-alpha.0 → 1.20.1-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @mastra/memory
 
+## 1.20.1-alpha.1
+
+### Patch Changes
+
+- Fixed observational memory replaying previously observed assistant responses during reprocessing, so past assistant messages no longer reappear in later turns. ([#17338](https://github.com/mastra-ai/mastra/pull/17338))
+
+- Fixed a crash in Cloudflare Workers when using a Zod schema for working memory. Working-memory input is now validated directly by the provided schema validator, which avoids runtime restrictions in Cloudflare Workers. ([#17327](https://github.com/mastra-ai/mastra/pull/17327))
+
+- Preserve system-reminder filtering for normalized reactive signal metadata. ([#17191](https://github.com/mastra-ai/mastra/pull/17191))
+
+- Fixed `Memory.saveMessages` not populating `role`, `content`, and `created_at` in the vector store metadata. Calls to `GET /api/memory/search` now return matches with the full message shape regardless of whether messages were saved through `agent.generate`/`agent.stream` or written directly via `Memory.saveMessages` (for example through the `POST /api/memory/save-messages` HTTP route used by external agents). ([#16381](https://github.com/mastra-ai/mastra/pull/16381))
+
+- Updated dependencies [[`00eca42`](https://github.com/mastra-ai/mastra/commit/00eca4252393aa114dc8c9a5e1da68df91fa06cf), [`8ace89d`](https://github.com/mastra-ai/mastra/commit/8ace89df77f762e622d3b9f7f65ad7524350d050), [`fa63872`](https://github.com/mastra-ai/mastra/commit/fa6387280954e6b667bec5714b55ba082bc627ff), [`f07b646`](https://github.com/mastra-ai/mastra/commit/f07b64604ab7d25391179790b7fd4823df9e2dff), [`d8838ae`](https://github.com/mastra-ai/mastra/commit/d8838ae80b69780361693d27098f7f6684af12fe), [`40f9297`](https://github.com/mastra-ai/mastra/commit/40f9297003b921c62373d3e8d3a4bda76c9f6de3), [`0f0d1ba`](https://github.com/mastra-ai/mastra/commit/0f0d1ba67bfcb2204e571401662f1eceefc03357), [`8c31bcd`](https://github.com/mastra-ai/mastra/commit/8c31bcdb00e597880d5939b1b7d7566fbe5dacae), [`95b14cd`](https://github.com/mastra-ai/mastra/commit/95b14cdd820e86d97ac05fe568424c513a252e31), [`aa36be2`](https://github.com/mastra-ai/mastra/commit/aa36be23aa513b7dc53cb8ca16b7fab8f20e43ad), [`212c635`](https://github.com/mastra-ai/mastra/commit/212c635203e61d036ab41db8ff86c3893dc795b3), [`d8838ae`](https://github.com/mastra-ai/mastra/commit/d8838ae80b69780361693d27098f7f6684af12fe), [`9aa5a73`](https://github.com/mastra-ai/mastra/commit/9aa5a73e7e110f6e9365eec69364a33d5f03bb56), [`f73c789`](https://github.com/mastra-ai/mastra/commit/f73c789e8ef21561580395d2c410119cab5848c8), [`8bd16da`](https://github.com/mastra-ai/mastra/commit/8bd16da73a4cb874d739373643dbd6a6e7f88684), [`c8630f8`](https://github.com/mastra-ai/mastra/commit/c8630f80d4f40cb5d22e60ab162b618b1907167a), [`47f71dc`](https://github.com/mastra-ai/mastra/commit/47f71dc6fbcbd12d71e21a979e676e20a02bd77d), [`50ceae2`](https://github.com/mastra-ai/mastra/commit/50ceae270878e2f8fb2b2c6c2faab09df0007c8a), [`8cdde58`](https://github.com/mastra-ai/mastra/commit/8cdde5875bbba6702d9df226f2b20232b8d75d6c), [`847ff1e`](https://github.com/mastra-ai/mastra/commit/847ff1e0d94368d94b2e173e4e0908e115568ef3), [`259d409`](https://github.com/mastra-ai/mastra/commit/259d409a514174299dbde1ff5e1121209b3ba850), [`9e16c68`](https://github.com/mastra-ai/mastra/commit/9e16c6818b6485ccb43df28aba6f3a2219d28662), [`cefca33`](https://github.com/mastra-ai/mastra/commit/cefca33ae666e69810c935fedf95a929c173d1d7), [`d00e8c5`](https://github.com/mastra-ai/mastra/commit/d00e8c50daebe5bce5bf2f48bde39c86fc3d2fe4), [`36fa7e2`](https://github.com/mastra-ai/mastra/commit/36fa7e24d14e58a1eb46147097b32f583e5b8775), [`87e9774`](https://github.com/mastra-ai/mastra/commit/87e97741c1e493cd6d62f478eb810b49bda4d57c), [`65a72e7`](https://github.com/mastra-ai/mastra/commit/65a72e70c25eedea8ff985a6624b96be2850236b), [`0f77241`](https://github.com/mastra-ai/mastra/commit/0f7724108806703799a8ba80ad0f09414afd5066), [`92ff509`](https://github.com/mastra-ai/mastra/commit/92ff5098ef8a990438ca038077021a5f7541ec1d), [`3fce5e7`](https://github.com/mastra-ai/mastra/commit/3fce5e70d011d289043e75003ef3336ed4aa43c3), [`a763592`](https://github.com/mastra-ai/mastra/commit/a763592c3db46963ef1011cfe16fe372816e775e), [`80c7737`](https://github.com/mastra-ai/mastra/commit/80c7737e32d7917b5f356957d67c169d01744fd3), [`3f1cf47`](https://github.com/mastra-ai/mastra/commit/3f1cf476f74c1e4cc2df908837e05853a5347e31), [`ff9d743`](https://github.com/mastra-ai/mastra/commit/ff9d743f71d7e072927725c0d700632aca0c1fee)]:
+  - @mastra/schema-compat@1.2.11-alpha.0
+  - @mastra/core@1.38.0-alpha.3
+
 ## 1.20.1-alpha.0
 
 ### Patch Changes

package/dist/_types/@internal_ai-sdk-v4/dist/index.d.ts

@@ -1,3 +1,4 @@
+import { JSONSchema7 } from 'json-schema';
 import { ServerResponse } from 'http';
 import { ServerResponse as ServerResponse_2 } from 'node:http';
 import { z } from 'zod';
@@ -3324,165 +3325,6 @@ export declare function jsonSchema<OBJECT = unknown>(jsonSchema: JSONSchema7, {
     };
 }): Schema<OBJECT>;
 
-declare interface JSONSchema7 {
-    $id?: string | undefined;
-    $ref?: string | undefined;
-    $schema?: JSONSchema7Version | undefined;
-    $comment?: string | undefined;
-
-    /**
-     * @see https://datatracker.ietf.org/doc/html/draft-bhutton-json-schema-00#section-8.2.4
-     * @see https://datatracker.ietf.org/doc/html/draft-bhutton-json-schema-validation-00#appendix-A
-     */
-    $defs?: {
-        [key: string]: JSONSchema7Definition;
-    } | undefined;
-
-    /**
-     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.1
-     */
-    type?: JSONSchema7TypeName | JSONSchema7TypeName[] | undefined;
-    enum?: JSONSchema7Type[] | undefined;
-    const?: JSONSchema7Type | undefined;
-
-    /**
-     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.2
-     */
-    multipleOf?: number | undefined;
-    maximum?: number | undefined;
-    exclusiveMaximum?: number | undefined;
-    minimum?: number | undefined;
-    exclusiveMinimum?: number | undefined;
-
-    /**
-     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.3
-     */
-    maxLength?: number | undefined;
-    minLength?: number | undefined;
-    pattern?: string | undefined;
-
-    /**
-     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.4
-     */
-    items?: JSONSchema7Definition | JSONSchema7Definition[] | undefined;
-    additionalItems?: JSONSchema7Definition | undefined;
-    maxItems?: number | undefined;
-    minItems?: number | undefined;
-    uniqueItems?: boolean | undefined;
-    contains?: JSONSchema7Definition | undefined;
-
-    /**
-     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.5
-     */
-    maxProperties?: number | undefined;
-    minProperties?: number | undefined;
-    required?: string[] | undefined;
-    properties?: {
-        [key: string]: JSONSchema7Definition;
-    } | undefined;
-    patternProperties?: {
-        [key: string]: JSONSchema7Definition;
-    } | undefined;
-    additionalProperties?: JSONSchema7Definition | undefined;
-    dependencies?: {
-        [key: string]: JSONSchema7Definition | string[];
-    } | undefined;
-    propertyNames?: JSONSchema7Definition | undefined;
-
-    /**
-     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.6
-     */
-    if?: JSONSchema7Definition | undefined;
-    then?: JSONSchema7Definition | undefined;
-    else?: JSONSchema7Definition | undefined;
-
-    /**
-     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.7
-     */
-    allOf?: JSONSchema7Definition[] | undefined;
-    anyOf?: JSONSchema7Definition[] | undefined;
-    oneOf?: JSONSchema7Definition[] | undefined;
-    not?: JSONSchema7Definition | undefined;
-
-    /**
-     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-7
-     */
-    format?: string | undefined;
-
-    /**
-     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-8
-     */
-    contentMediaType?: string | undefined;
-    contentEncoding?: string | undefined;
-
-    /**
-     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-9
-     */
-    definitions?: {
-        [key: string]: JSONSchema7Definition;
-    } | undefined;
-
-    /**
-     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-10
-     */
-    title?: string | undefined;
-    description?: string | undefined;
-    default?: JSONSchema7Type | undefined;
-    readOnly?: boolean | undefined;
-    writeOnly?: boolean | undefined;
-    examples?: JSONSchema7Type | undefined;
-}
-
-declare interface JSONSchema7Array extends Array<JSONSchema7Type> {}
-
-/**
- * JSON Schema v7
- * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01
- */
-declare type JSONSchema7Definition = JSONSchema7 | boolean;
-
-declare interface JSONSchema7Object {
-    [key: string]: JSONSchema7Type;
-}
-
-/**
- * Primitive type
- * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.1.1
- */
-declare type JSONSchema7Type =
-| string //
-| number
-| boolean
-| JSONSchema7Object
-| JSONSchema7Array
-| null;
-
-/**
- * Primitive type
- * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.1.1
- */
-declare type JSONSchema7TypeName =
-| "string" //
-| "number"
-| "integer"
-| "boolean"
-| "object"
-| "array"
-| "null";
-
-/**
- * Meta schema
- *
- * Recommended values:
- * - 'http://json-schema.org/schema#'
- * - 'http://json-schema.org/hyper-schema#'
- * - 'http://json-schema.org/draft-07/schema#'
- * - 'http://json-schema.org/draft-07/hyper-schema#'
- *
- * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-5
- */
-declare type JSONSchema7Version = string;
-
 /**
  A JSON value can be a string, number, boolean, object, array, or null.
  JSON values can be serialized and deserialized by the JSON.stringify and JSON.parse methods.
@@ -7605,4 +7447,4 @@ export declare function zodSchema<OBJECT>(zodSchema: z.Schema<OBJECT, z.ZodTypeD
 }): Schema<OBJECT>;
 
 export { }
-export { LanguageModelV1Message as LanguageModelV1Message, LanguageModelV1CallSettings as LanguageModelV1CallSettings, LanguageModelV1FunctionTool as LanguageModelV1FunctionTool, LanguageModelV1ProviderDefinedTool as LanguageModelV1ProviderDefinedTool, LanguageModelV1ToolChoice as LanguageModelV1ToolChoice, LanguageModelV1ObjectGenerationMode as LanguageModelV1ObjectGenerationMode, LanguageModelV1FunctionToolCall as LanguageModelV1FunctionToolCall, LanguageModelV1Source as LanguageModelV1Source, LanguageModelV1LogProbs as LanguageModelV1LogProbs, FetchFunction as FetchFunction, TextUIPart as TextUIPart, ReasoningUIPart as ReasoningUIPart, ToolInvocationUIPart as ToolInvocationUIPart, SourceUIPart as SourceUIPart, FileUIPart as FileUIPart, StepStartUIPart as StepStartUIPart, AssistantStreamPartType as AssistantStreamPartType, AssistantStreamPartValueType as AssistantStreamPartValueType, AssistantStreamString as AssistantStreamString, DataStreamPartType as DataStreamPartType, DataStreamPartValueType as DataStreamPartValueType, DeepPartialInternal as DeepPartialInternal, Validator as Validator, JSONSchema7 as JSONSchema7, LanguageModelV1FinishReason as LanguageModelV1FinishReason, LanguageModelV1CallWarning as LanguageModelV1CallWarning, JSONValue_2 as JSONValue_2, Source as Source, DataStreamString as DataStreamString, AttributeValue as AttributeValue, Tracer as Tracer, EmbeddingModelV1 as EmbeddingModelV1, EmbeddingModelV1Embedding as EmbeddingModelV1Embedding, ImageModelV1CallWarning as ImageModelV1CallWarning, TranscriptionModelV1CallWarning as TranscriptionModelV1CallWarning, SpeechModelV1CallWarning as SpeechModelV1CallWarning, ProviderOptions as ProviderOptions, ReasoningPart as ReasoningPart, RedactedReasoningPart as RedactedReasoningPart, ToolResultContent as ToolResultContent, inferParameters as inferParameters, ToolParameters as ToolParameters, JSONRPCRequestSchema as JSONRPCRequestSchema, JSONRPCResponseSchema as JSONRPCResponseSchema, JSONRPCErrorSchema as JSONRPCErrorSchema, JSONRPCNotificationSchema as JSONRPCNotificationSchema, JSONRPCMessageSchema as JSONRPCMessageSchema, MCPClientConfig as MCPClientConfig, MCPClient as MCPClient, ValueOf as ValueOf, ToToolResultObject as ToToolResultObject, ToToolsWithDefinedExecute as ToToolsWithDefinedExecute, ToToolsWithExecute as ToToolsWithExecute, ReasoningDetail as ReasoningDetail, ToolCallArray as ToolCallArray, ToolResultArray as ToolResultArray, ResponseMessage as ResponseMessage, Output_2 as Output_2, ConsumeStreamOptions as ConsumeStreamOptions, ImageModelV1 as ImageModelV1, CallSettings as CallSettings, Prompt as Prompt, StreamObjectOnErrorCallback as StreamObjectOnErrorCallback, AsyncIterableStream as AsyncIterableStream, SpeechModelV1 as SpeechModelV1, TranscriptionModelV1 as TranscriptionModelV1, LanguageModelV1ProviderMetadata as LanguageModelV1ProviderMetadata, ExtractModelId as ExtractModelId, ExtractLiteralUnion as ExtractLiteralUnion, ProviderV1 as ProviderV1, SingleRequestTextStreamPart as SingleRequestTextStreamPart, RetryErrorReason as RetryErrorReason, AssistantResponseSettings as AssistantResponseSettings, AssistantResponseCallback as AssistantResponseCallback };
+export { LanguageModelV1Message as LanguageModelV1Message, LanguageModelV1CallSettings as LanguageModelV1CallSettings, LanguageModelV1FunctionTool as LanguageModelV1FunctionTool, LanguageModelV1ProviderDefinedTool as LanguageModelV1ProviderDefinedTool, LanguageModelV1ToolChoice as LanguageModelV1ToolChoice, LanguageModelV1ObjectGenerationMode as LanguageModelV1ObjectGenerationMode, LanguageModelV1FunctionToolCall as LanguageModelV1FunctionToolCall, LanguageModelV1Source as LanguageModelV1Source, LanguageModelV1LogProbs as LanguageModelV1LogProbs, FetchFunction as FetchFunction, TextUIPart as TextUIPart, ReasoningUIPart as ReasoningUIPart, ToolInvocationUIPart as ToolInvocationUIPart, SourceUIPart as SourceUIPart, FileUIPart as FileUIPart, StepStartUIPart as StepStartUIPart, AssistantStreamPartType as AssistantStreamPartType, AssistantStreamPartValueType as AssistantStreamPartValueType, AssistantStreamString as AssistantStreamString, DataStreamPartType as DataStreamPartType, DataStreamPartValueType as DataStreamPartValueType, DeepPartialInternal as DeepPartialInternal, Validator as Validator, LanguageModelV1FinishReason as LanguageModelV1FinishReason, LanguageModelV1CallWarning as LanguageModelV1CallWarning, JSONValue_2 as JSONValue_2, Source as Source, DataStreamString as DataStreamString, AttributeValue as AttributeValue, Tracer as Tracer, EmbeddingModelV1 as EmbeddingModelV1, EmbeddingModelV1Embedding as EmbeddingModelV1Embedding, ImageModelV1CallWarning as ImageModelV1CallWarning, TranscriptionModelV1CallWarning as TranscriptionModelV1CallWarning, SpeechModelV1CallWarning as SpeechModelV1CallWarning, ProviderOptions as ProviderOptions, ReasoningPart as ReasoningPart, RedactedReasoningPart as RedactedReasoningPart, ToolResultContent as ToolResultContent, inferParameters as inferParameters, ToolParameters as ToolParameters, JSONRPCRequestSchema as JSONRPCRequestSchema, JSONRPCResponseSchema as JSONRPCResponseSchema, JSONRPCErrorSchema as JSONRPCErrorSchema, JSONRPCNotificationSchema as JSONRPCNotificationSchema, JSONRPCMessageSchema as JSONRPCMessageSchema, MCPClientConfig as MCPClientConfig, MCPClient as MCPClient, ValueOf as ValueOf, ToToolResultObject as ToToolResultObject, ToToolsWithDefinedExecute as ToToolsWithDefinedExecute, ToToolsWithExecute as ToToolsWithExecute, ReasoningDetail as ReasoningDetail, ToolCallArray as ToolCallArray, ToolResultArray as ToolResultArray, ResponseMessage as ResponseMessage, Output_2 as Output_2, ConsumeStreamOptions as ConsumeStreamOptions, ImageModelV1 as ImageModelV1, CallSettings as CallSettings, Prompt as Prompt, StreamObjectOnErrorCallback as StreamObjectOnErrorCallback, AsyncIterableStream as AsyncIterableStream, SpeechModelV1 as SpeechModelV1, TranscriptionModelV1 as TranscriptionModelV1, LanguageModelV1ProviderMetadata as LanguageModelV1ProviderMetadata, ExtractModelId as ExtractModelId, ExtractLiteralUnion as ExtractLiteralUnion, ProviderV1 as ProviderV1, SingleRequestTextStreamPart as SingleRequestTextStreamPart, RetryErrorReason as RetryErrorReason, AssistantResponseSettings as AssistantResponseSettings, AssistantResponseCallback as AssistantResponseCallback };

package/dist/{chunk-LXU26UVM.js → chunk-KMJQDCCZ.js}

@@ -6,7 +6,7 @@ import { MessageHistory } from '@mastra/core/processors';
 import xxhash from 'xxhash-wasm';
 import { appendFileSync, writeFileSync, mkdirSync } from 'fs';
 import { join } from 'path';
-import { randomBytes, createHash, randomUUID } from 'crypto';
+import { createHash, randomBytes, randomUUID } from 'crypto';
 import { estimateTokenCount } from 'tokenx';
 import { Agent } from '@mastra/core/agent';
 import { getOrCreateSpan, EntityType, SpanType, createObservabilityContext } from '@mastra/core/observability';
@@ -5755,7 +5755,7 @@ function ensureMessageMastraMetadata(message) {
   return typedMessage.metadata.mastra;
 }
 function buildEstimateKey(kind, text) {
-  const payloadHash = createHash("sha1").update(text).digest("hex");
+  const payloadHash = createHash("sha256").update(text).digest("hex");
   return `${kind}:${payloadHash}`;
 }
 function resolveEstimatorId() {
@@ -6298,7 +6298,7 @@ function getAttachmentFingerprint(asset) {
   }
   const base64 = encodeAttachmentBase64(asset);
   if (base64) {
-    return { contentHash: createHash("sha1").update(base64).digest("hex") };
+    return { contentHash: createHash("sha256").update(base64).digest("hex") };
   }
   return {};
 }
@@ -6577,6 +6577,116 @@ var TokenCounter = class _TokenCounter {
   resolveToolResultForTokenCounting(part, invocationResult) {
     return resolveToolResultValue(part, invocationResult);
   }
+  countMultimodalToolResultContent(part, toolResult) {
+    if (!toolResult || typeof toolResult !== "object") {
+      return void 0;
+    }
+    const output = toolResult;
+    const content = output.type === "content" && Array.isArray(output.value) ? output.value : output.content;
+    if (!Array.isArray(content)) {
+      return void 0;
+    }
+    let hasAttachment = false;
+    let tokens = 0;
+    const cacheParts = [];
+    const countJsonContentPart = (contentPart) => {
+      const formatted = formatToolResultForObserver(contentPart);
+      tokens += this.countString(formatted);
+      cacheParts.push({ type: "json", valueHash: createHash("sha256").update(formatted).digest("hex") });
+    };
+    for (const item of content) {
+      if (!item || typeof item !== "object") {
+        continue;
+      }
+      const contentPart = item;
+      const partType = contentPart.type;
+      if (partType === "text") {
+        const text = typeof contentPart.text === "string" ? contentPart.text : String(contentPart.value ?? "");
+        tokens += this.countString(text);
+        cacheParts.push({ type: "text", textHash: createHash("sha256").update(text).digest("hex") });
+        continue;
+      }
+      if (partType === "image" || partType === "image-data" || partType === "media" && String(contentPart.mediaType ?? "").startsWith("image/")) {
+        if (typeof contentPart.data !== "string") {
+          countJsonContentPart(contentPart);
+          continue;
+        }
+        hasAttachment = true;
+        const imagePart = {
+          type: "image",
+          image: contentPart.data,
+          mimeType: contentPart.mediaType ?? contentPart.mimeType,
+          providerOptions: contentPart.providerOptions,
+          providerMetadata: contentPart.providerMetadata
+        };
+        const clientEstimate = getClientPartTokenEstimate(imagePart);
+        if (clientEstimate) {
+          tokens += clientEstimate.tokens;
+          cacheParts.push({
+            type: "image-data-client-estimate",
+            key: clientEstimate.key,
+            tokens: clientEstimate.tokens
+          });
+          continue;
+        }
+        const estimate = this.estimateImageTokens(imagePart);
+        tokens += estimate.tokens;
+        cacheParts.push({ type: "image-data", estimate: JSON.parse(estimate.cachePayload) });
+        continue;
+      }
+      if (partType === "audio" || partType === "file-data" || partType === "media") {
+        if (typeof contentPart.data !== "string") {
+          countJsonContentPart(contentPart);
+          continue;
+        }
+        hasAttachment = true;
+        const filePart = {
+          type: "file",
+          data: contentPart.data,
+          mimeType: contentPart.mediaType ?? contentPart.mimeType,
+          filename: contentPart.filename,
+          providerOptions: contentPart.providerOptions,
+          providerMetadata: contentPart.providerMetadata
+        };
+        const clientEstimate = getClientPartTokenEstimate(filePart);
+        if (clientEstimate) {
+          tokens += clientEstimate.tokens;
+          cacheParts.push({
+            type: "file-data-client-estimate",
+            key: clientEstimate.key,
+            tokens: clientEstimate.tokens
+          });
+          continue;
+        }
+        if (isImageLikeFilePart(filePart)) {
+          const estimate = this.estimateImageLikeFileTokens(filePart);
+          tokens += estimate.tokens;
+          cacheParts.push({ type: "image-like-file-data", estimate: JSON.parse(estimate.cachePayload) });
+          continue;
+        }
+        const byteEstimate = estimateNonImageFileTokens(this.getModelContext(), filePart);
+        if (byteEstimate) {
+          tokens += byteEstimate.tokens;
+          cacheParts.push({ type: "file-data", estimate: JSON.parse(byteEstimate.cachePayload) });
+          continue;
+        }
+        const descriptor = serializeNonImageFilePartForTokenCounting(filePart);
+        tokens += this.countString(descriptor);
+        cacheParts.push({ type: "file-data-descriptor", descriptor });
+        continue;
+      }
+      countJsonContentPart(contentPart);
+    }
+    if (!hasAttachment) {
+      return void 0;
+    }
+    return this.readOrPersistFixedPartEstimate(
+      part,
+      "tool-result-multimodal-content",
+      JSON.stringify({ type: "content", value: cacheParts }),
+      tokens
+    );
+  }
   estimateImageAssetTokens(part, asset, kind) {
     const modelContext = this.getModelContext();
     const provider = resolveProviderId(modelContext);
@@ -6835,12 +6945,17 @@ var TokenCounter = class _TokenCounter {
           invocation.result
         );
         if (resultForCounting !== void 0) {
-          const formattedResult = formatToolResultForObserver(resultForCounting);
-          tokens += this.readOrPersistPartEstimate(
-            part,
-            usingStoredModelOutput ? "tool-result-model-output-json" : "tool-result-json",
-            formattedResult
-          );
+          const contentTokens = this.countMultimodalToolResultContent(part, resultForCounting);
+          if (contentTokens !== void 0) {
+            tokens += contentTokens;
+          } else {
+            const formattedResult = formatToolResultForObserver(resultForCounting);
+            tokens += this.readOrPersistPartEstimate(
+              part,
+              usingStoredModelOutput ? "tool-result-model-output-json" : "tool-result-json",
+              formattedResult
+            );
+          }
           if (typeof resultForCounting !== "string") {
             overheadDelta -= 12;
           }
@@ -9576,7 +9691,8 @@ async function insertTemporalGapMarkers({
   }
   await sendSignal?.({
     id: `__temporal_gap_${crypto.randomUUID()}`,
-    type: "system-reminder",
+    type: "reactive",
+    tagName: "system-reminder",
     contents: getTemporalGapReminderText(gapText, timestamp),
     createdAt: new Date(timestamp - 1),
     acceptedAt: new Date(timestamp),
@@ -9864,5 +9980,5 @@ function getObservationsAsOf(activeObservations, asOf) {
 }
 
 export { ModelByInputTokens, OBSERVER_SYSTEM_PROMPT, ObservationalMemory, ObservationalMemoryProcessor, TokenCounter, buildObserverPrompt, buildObserverSystemPrompt, combineObservationGroupRanges, deriveObservationGroupProvenance, extractCurrentTask, formatMessagesForObserver, formatToolResultForObserver, getObservationsAsOf, hasCurrentTaskSection, injectAnchorIds, optimizeObservationsForContext, parseAnchorId, parseObservationGroups, parseObserverOutput, reconcileObservationGroupsFromReflection, renderObservationGroupsForReflection, resolveToolResultValue, stripEphemeralAnchorIds, stripObservationGroups, truncateStringByTokens, wrapInObservationGroup };
-//# sourceMappingURL=chunk-LXU26UVM.js.map
-//# sourceMappingURL=chunk-LXU26UVM.js.map
+//# sourceMappingURL=chunk-KMJQDCCZ.js.map
+//# sourceMappingURL=chunk-KMJQDCCZ.js.map