claude: merge a caller's --settings instead of clobbering ucode's#189

Edwinhe03 merged 3 commits into

maindatabricks/ucode:mainfrom

edwin-he/claude-settings-mergedatabricks/ucode:edwin-he/claude-settings-mergeCopy head branch name to clipboard