Your first definition would include Wikipedia (or even a printed encyclopedia or other reference material, technically it would include a tape-measure, sorry.). Is Wikipedia intelligent? It is likely both Artificial and General so I think we are there, Skynet is upon us and it is user editable!
This is the difficulty of any definition of intelligence: it fails as soon as it is applied...
Then we can try to measure Intelligence.
Then we might be able to add, define and measure the other parts.
Since we cannot even define intelligence, we are a long way from measuring AGI.