feat: add upstream improvements from PRs 131, 189, 186#3

eulicesl merged 3 commits into

maineulicesl/enchanted:mainfrom

claude/review-upstream-improvements-01Er6FSay4ot7btdZkakf5Nneulicesl/enchanted:claude/review-upstream-improvements-01Er6FSay4ot7btdZkakf5NnCopy head branch name to clipboard