From what I know, the novel went for the "happy" ending.
Anyway, *SPOILER ALERT* in the "general" ending, the ayes have it, war is averted and Tolwyn is punished. However, rather than cutting to Banshees flying from the Intrepid and happy, triumphant music playing whilst Blair talks...