@mastra/observability 1.21.0-alpha.1 → 1.21.0-alpha.2

package/dist/index.cjs

@@ -2845,6 +2845,26 @@ var ModelSpanTracker = class {
 		this.#stepIndex++;
 	}
 	/**
+	* A suspended step emits no step-finish; its suspension chunk carries the
+	* step usage instead. Close MODEL_INFERENCE and MODEL_STEP with that usage so
+	* the suspended call is not reported without tokens.
+	*/
+	#endSuspendedStep(chunk) {
+		if (chunk.type !== "tool-call-suspended" && chunk.type !== "tool-call-approval") return;
+		const usage = chunk.payload.usage;
+		if (!usage) return;
+		this.#inModelResponse = false;
+		this.#endStepSpan({
+			output: { usage },
+			stepResult: {
+				reason: "suspended",
+				isContinued: false,
+				warnings: []
+			},
+			metadata: {}
+		});
+	}
+	/**
 	* Returns the parent span for chunks. Chunks parent under MODEL_INFERENCE
 	* (the provider call) when available, falling back to MODEL_STEP only if
 	* startStep() was bypassed.
@@ -3016,8 +3036,8 @@ var ModelSpanTracker = class {
 	#handleToolApprovalChunk(chunk) {
 		if (chunk.type !== "tool-call-approval") return;
 		const payload = chunk.payload;
-		this.#ensureStepAndInference();
-		if (this.#chunkParent()?.createEventSpan({
+		if (payload.usage || this.#currentStepSpan) this.#ensureStepAndInference();
+		if ((this.#chunkParent() ?? this.#modelSpan)?.createEventSpan({
 			name: `chunk: 'tool-call-approval'`,
 			type: _mastra_core_observability.SpanType.MODEL_CHUNK,
 			attributes: {
@@ -3037,6 +3057,10 @@ var ModelSpanTracker = class {
 	wrapStream(stream) {
 		return stream.pipeThrough(new stream_web.TransformStream({ transform: (chunk, controller) => {
 			if ((this.#inModelResponse || this.#deferStepClose) && MODEL_RESPONSE_CHUNK_TYPES.has(chunk.type)) this.#captureCompletionStartTime();
+			if (chunk.type === "tool-call-suspended" || chunk.type === "tool-call-approval") {
+				if (chunk.type === "tool-call-approval") this.#handleToolApprovalChunk(chunk);
+				this.#endSuspendedStep(chunk);
+			}
 			controller.enqueue(chunk);
 			switch (chunk.type) {
 				case "text-start":
@@ -3084,13 +3108,11 @@ var ModelSpanTracker = class {
 				case "tripwire":
 				case "watch":
 				case "tool-error":
-				case "tool-call-suspended":
 				case "reasoning-signature":
 				case "redacted-reasoning":
 				case "step-output": break;
-				case "tool-call-approval":
-					this.#handleToolApprovalChunk(chunk);
-					break;
+				case "tool-call-suspended":
+				case "tool-call-approval": break;
 				case "tool-output": break;
 				case "tool-result": {
 					const { toolCallId, toolName, isError, dynamic, providerExecuted, providerMetadata, result, args: _args } = chunk.payload || {};