fix: adjust resolve parts so that when messages with multiple @ references occur, the tool calls are properly ordered