Fix thinking budget and rag strategy marshaling/unmarshaling

Fix thinking budget and rag strategy marshaling/unmarshaling #1911