What to do with short-curcuit 18650
No, you are not supposed to do any of that.
It is not good idea to solder directly to li-ion battery, as li-ion batteries really hate heat.
And it is not good idea to extinguish li-ion battery by water. You can use sand.