@mastra/server 1.58.0-alpha.4 → 1.58.0-alpha.5

package/dist/{dist-C2-SedDQ.cjs → dist-fvOsjRn_.cjs}

@@ -5962,7 +5962,7 @@ function splitLines(text) {
 	return result;
 }
 //#endregion
-//#region ../memory/dist/src-CdqJP57F.js
+//#region ../memory/dist/src-MScpLVRh.js
 var __defProp$3 = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
 	let target = {};
@@ -24383,33 +24383,62 @@ var TokenCounter = class TokenCounter {
 		if (isImageAttachment) await resolveImageDimensionsAsync(part);
 		return this.countAttachmentPartSync(part);
 	}
+	/**
+	* Count the name and the arguments of a tool call. Every state before the tool produces an
+	* output holds the same call signature in the context window, so all of those states share
+	* these cache kinds. `buildEstimateKey` hashes the text, so a shared kind stays correct and
+	* keeps the estimate warm while the invocation moves from one state to the next.
+	*/
+	countToolCallSignature(part, invocation) {
+		let tokens = 0;
+		let overheadDelta = 0;
+		if (invocation.toolName) tokens += this.readOrPersistPartEstimate(part, "tool-call-name", invocation.toolName);
+		if (invocation.args) if (typeof invocation.args === "string") tokens += this.readOrPersistPartEstimate(part, "tool-call-args", invocation.args);
+		else {
+			const argsJson = JSON.stringify(invocation.args);
+			tokens += this.readOrPersistPartEstimate(part, "tool-call-args-json", argsJson);
+			overheadDelta -= 12;
+		}
+		return {
+			tokens,
+			overheadDelta
+		};
+	}
 	countNonAttachmentPart(part) {
 		let overheadDelta = 0;
-		let toolResultDelta = 0;
+		let extraMessageDelta = 0;
 		if (part.type === "text") return {
 			tokens: this.readOrPersistPartEstimate(part, "text", part.text),
 			overheadDelta,
-			toolResultDelta
+			extraMessageDelta
 		};
 		if (part.type === "tool-invocation") {
 			const invocation = part.toolInvocation;
+			const state = invocation.state;
 			let tokens = 0;
-			if (invocation.state === "call" || invocation.state === "partial-call") {
-				if (invocation.toolName) tokens += this.readOrPersistPartEstimate(part, `tool-${invocation.state}-name`, invocation.toolName);
-				if (invocation.args) if (typeof invocation.args === "string") tokens += this.readOrPersistPartEstimate(part, `tool-${invocation.state}-args`, invocation.args);
-				else {
-					const argsJson = JSON.stringify(invocation.args);
-					tokens += this.readOrPersistPartEstimate(part, `tool-${invocation.state}-args-json`, argsJson);
-					overheadDelta -= 12;
-				}
+			if (state === "call" || state === "partial-call" || state === "approval-requested") {
+				const signature = this.countToolCallSignature(part, invocation);
+				return {
+					tokens: signature.tokens,
+					overheadDelta: overheadDelta + signature.overheadDelta,
+					extraMessageDelta
+				};
+			}
+			if (state === "approval-responded") {
+				extraMessageDelta++;
+				const signature = this.countToolCallSignature(part, invocation);
+				tokens += signature.tokens;
+				overheadDelta += signature.overheadDelta;
+				const reason = invocation.approval?.reason;
+				if (reason) tokens += this.readOrPersistPartEstimate(part, "tool-approval-reason", reason);
 				return {
 					tokens,
 					overheadDelta,
-					toolResultDelta
+					extraMessageDelta
 				};
 			}
-			if (invocation.state === "result") {
-				toolResultDelta++;
+			if (state === "result") {
+				extraMessageDelta++;
 				const { value: resultForCounting, usingStoredModelOutput } = this.resolveToolResultForTokenCounting(part, invocation.result);
 				if (resultForCounting !== void 0) {
 					const contentTokens = this.countMultimodalToolResultContent(part, resultForCounting);
@@ -24423,47 +24452,45 @@ var TokenCounter = class TokenCounter {
 				return {
 					tokens,
 					overheadDelta,
-					toolResultDelta
+					extraMessageDelta
 				};
 			}
-			if (invocation.state === "output-denied") {
-				toolResultDelta++;
+			if (state === "output-denied") {
+				extraMessageDelta++;
 				const reason = invocation.approval?.reason ?? "Tool call was not approved by the user";
 				tokens += this.readOrPersistPartEstimate(part, "tool-result-denied", reason);
 				return {
 					tokens,
 					overheadDelta,
-					toolResultDelta
+					extraMessageDelta
 				};
 			}
-			if (invocation.state === "output-error") {
-				toolResultDelta++;
-				const errorText = invocation.errorText;
-				const errorMessage = typeof errorText === "string" ? errorText : "Tool execution failed";
+			if (state === "output-error") {
+				extraMessageDelta++;
+				const errorMessage = typeof invocation.errorText === "string" ? invocation.errorText : "Tool execution failed";
 				tokens += this.readOrPersistPartEstimate(part, "tool-result-error", errorMessage);
 				return {
 					tokens,
 					overheadDelta,
-					toolResultDelta
+					extraMessageDelta
 				};
 			}
-			throw new Error(`Unhandled tool-invocation state '${part.toolInvocation?.state}' in token counting for part type '${part.type}'`);
 		}
 		if (typeof part.type === "string" && part.type.startsWith("data-")) return {
 			tokens: 0,
 			overheadDelta,
-			toolResultDelta
+			extraMessageDelta
 		};
 		if (part.type === "reasoning") return {
 			tokens: 0,
 			overheadDelta,
-			toolResultDelta
+			extraMessageDelta
 		};
 		const serialized = serializePartForTokenCounting(part);
 		return {
 			tokens: this.readOrPersistPartEstimate(part, `part-${part.type}`, serialized),
 			overheadDelta,
-			toolResultDelta
+			extraMessageDelta
 		};
 	}
 	/**
@@ -24472,7 +24499,7 @@ var TokenCounter = class TokenCounter {
 	countMessage(message) {
 		let payloadTokens = this.countString(message.role);
 		let overhead = TokenCounter.TOKENS_PER_MESSAGE;
-		let toolResultCount = 0;
+		let extraMessageCount = 0;
 		if (typeof message.content === "string") payloadTokens += this.readOrPersistMessageEstimate(message, "message-content", message.content);
 		else if (message.content && typeof message.content === "object") {
 			if (message.content.content && !Array.isArray(message.content.parts)) payloadTokens += this.readOrPersistMessageEstimate(message, "content-content", message.content.content);
@@ -24485,16 +24512,16 @@ var TokenCounter = class TokenCounter {
 				const result = this.countNonAttachmentPart(part);
 				payloadTokens += result.tokens;
 				overhead += result.overheadDelta;
-				toolResultCount += result.toolResultDelta;
+				extraMessageCount += result.extraMessageDelta;
 			}
 		}
-		if (toolResultCount > 0) overhead += toolResultCount * TokenCounter.TOKENS_PER_MESSAGE;
+		if (extraMessageCount > 0) overhead += extraMessageCount * TokenCounter.TOKENS_PER_MESSAGE;
 		return Math.round(payloadTokens + overhead);
 	}
 	async countMessageAsync(message) {
 		let payloadTokens = this.countString(message.role);
 		let overhead = TokenCounter.TOKENS_PER_MESSAGE;
-		let toolResultCount = 0;
+		let extraMessageCount = 0;
 		if (typeof message.content === "string") payloadTokens += this.readOrPersistMessageEstimate(message, "message-content", message.content);
 		else if (message.content && typeof message.content === "object") {
 			if (message.content.content && !Array.isArray(message.content.parts)) payloadTokens += this.readOrPersistMessageEstimate(message, "content-content", message.content.content);
@@ -24507,10 +24534,10 @@ var TokenCounter = class TokenCounter {
 				const result = this.countNonAttachmentPart(part);
 				payloadTokens += result.tokens;
 				overhead += result.overheadDelta;
-				toolResultCount += result.toolResultDelta;
+				extraMessageCount += result.extraMessageDelta;
 			}
 		}
-		if (toolResultCount > 0) overhead += toolResultCount * TokenCounter.TOKENS_PER_MESSAGE;
+		if (extraMessageCount > 0) overhead += extraMessageCount * TokenCounter.TOKENS_PER_MESSAGE;
 		return Math.round(payloadTokens + overhead);
 	}
 	/**
@@ -25605,6 +25632,7 @@ function deepMergeWorkingMemory(existing, update) {
 	for (const key of Object.keys(update)) {
 		const updateValue = update[key];
 		const existingValue = result[key];
+		if (updateValue === void 0) continue;
 		if (updateValue === null) delete result[key];
 		else if (Array.isArray(updateValue)) result[key] = updateValue;
 		else if (typeof updateValue === "object" && updateValue !== null && typeof existingValue === "object" && existingValue !== null && !Array.isArray(existingValue)) result[key] = deepMergeWorkingMemory(existingValue, updateValue);
@@ -25657,7 +25685,7 @@ const updateWorkingMemoryTool = (memoryConfig) => {
 			version: 1,
 			vendor: "mastra",
 			validate: (value) => {
-				const memoryValue = !!value && typeof value === "object" && !Array.isArray(value) && "memory" in value ? value.memory : stripNullsFromOptional(value, jsonSchema);
+				const memoryValue = stripNullsFromOptional(!!value && typeof value === "object" && !Array.isArray(value) && "memory" in value ? value.memory : value, jsonSchema);
 				const result = validateMemory(memoryValue);
 				return result instanceof Promise ? result.then(toWrappedResult) : toWrappedResult(result);
 			},
@@ -25674,6 +25702,7 @@ const updateWorkingMemoryTool = (memoryConfig) => {
 		id: "update-working-memory",
 		description: schema ? useStateSignals ? `${stateSignalsPreamble} Data is merged with existing memory — only include fields you want to add or update.` : `Update the working memory with new information. Data is merged with existing memory - only include fields you want to add or update. To preserve existing data, omit the field entirely. Arrays are replaced entirely when provided, so pass the complete array or omit it to keep the existing values.` : useStateSignals ? `${stateSignalsPreamble} Pass the full updated Markdown blob as a string in the memory field.` : `Update the working memory with new information. Any data not included will be overwritten. Always pass data as string to the memory field. Never pass an object.`,
 		inputSchema,
+		...usesMergeSemantics ? { strict: false } : {},
 		execute: async (inputData, context) => {
 			const workingMemoryInput = inputData;
 			const threadId = context?.agent?.threadId;
@@ -44749,4 +44778,4 @@ const agentBuilderWorkflows = {
 //#endregion
 exports.agentBuilderWorkflows = agentBuilderWorkflows;
 
-//# sourceMappingURL=dist-C2-SedDQ.cjs.map
+//# sourceMappingURL=dist-fvOsjRn_.cjs.map